Merge pull request #827 from elammertsma/dev

Simplified Announcements and made minor updates to homepage

surfsense_web/components/announcements/AnnouncementToastProvider.tsx

@@ -10,6 +10,8 @@ import {
 	markAnnouncementRead,
 	markAnnouncementToasted,
 } from "@/lib/announcements/announcements-storage";
+import { getActiveAnnouncements } from "@/lib/announcements/announcements-utils";
+import { isAuthenticated } from "@/lib/auth-utils";
 
 /** Map announcement category to the Sonner toast method */
 const categoryToVariant: Record<string, "info" | "warning" | "success"> = {
@@ -52,34 +54,33 @@ function showAnnouncementToast(announcement: Announcement) {
  * Global provider that shows important announcements as toast notifications.
  *
  * Place this component once at the root layout level (alongside <Toaster />).
- * On mount, it checks for unread important announcements that haven't been
- * shown as toasts yet, and displays them with a short stagger delay.
+ * On mount, it checks for active, audience-matched, unread important
+ * announcements that haven't been shown as toasts yet, and displays them
+ * with a short stagger delay.
  */
 export function AnnouncementToastProvider() {
 	const hasChecked = useRef(false);
 
 	useEffect(() => {
-		// Only run once per page load
 		if (hasChecked.current) return;
 		hasChecked.current = true;
 
-		// Small delay to let the page settle before showing toasts
 		const timer = setTimeout(() => {
-			const importantUntoasted = announcements.filter(
-				(a) => a.isImportant && !isAnnouncementToasted(a.id)
+			const authed = isAuthenticated();
+			const active = getActiveAnnouncements(announcements, authed);
+			const importantUntoasted = active.filter(
+				(a) => a.isImportant && !isAnnouncementToasted(a.id),
 			);
 
-			// Show each important announcement as a toast with stagger
 			for (let i = 0; i < importantUntoasted.length; i++) {
 				const announcement = importantUntoasted[i];
 				setTimeout(() => showAnnouncementToast(announcement), i * 800);
 			}
-		}, 1500); // Initial delay for page to settle
+		}, 1500);
 
 		return () => clearTimeout(timer);
 	}, []);
 
-	// This component renders nothing — it only triggers side effects
 	return null;
 }
 

surfsense_web/components/homepage/hero-section.tsx

@@ -41,7 +41,7 @@ export function HeroSection() {
 	return (
 		<div
 			ref={parentRef}
-			className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden px-4 py-12 md:px-8 md:py-24"
+			className="relative flex min-h-screen flex-col items-center justify-center overflow-hidden px-4 py-24 md:px-8 md:py-48"
 		>
 			<BackgroundGrids />
 			<CollisionMechanism
@@ -81,7 +81,7 @@ export function HeroSection() {
 				}}
 			/>
 
-			<h2 className="relative z-50 mx-auto mb-4 mt-4 max-w-4xl text-balance text-center text-3xl font-semibold tracking-tight text-gray-700 md:text-7xl dark:text-neutral-300">
+			<h2 className="relative z-50 mx-auto mb-4 mt-8 max-w-4xl text-balance text-center text-3xl font-semibold tracking-tight text-gray-700 md:text-7xl dark:text-neutral-300">
 				{isNotebookLMVariant ? (
 					<div className="relative mx-auto inline-block w-max filter-[drop-shadow(0px_1px_3px_rgba(27,37,80,0.14))]">
 						<div className="text-black [text-shadow:0_0_rgba(0,0,0,0.1)] dark:text-white">
@@ -98,14 +98,14 @@ export function HeroSection() {
 			</h2>
 			{/* // TODO:aCTUAL DESCRITION */}
 			<p className="relative z-50 mx-auto mt-4 max-w-lg px-4 text-center text-base/6 text-gray-600 dark:text-gray-200">
-				Connect any AI to your documents and knowledge sources.
+				Connect any AI to your documents, Drive, Notion and more,
 			</p>
 			<p className="relative z-50 mx-auto mt-0 max-w-lg px-4 text-center text-base/6 text-gray-600 dark:text-gray-200">
-				Then chat with it in real-time, even alongside your team.
+				then chat with it, invite your team, or generate podcasts and reports.
 			</p>
 			<div className="mb-6 mt-6 flex w-full flex-col items-center justify-center gap-4 px-8 sm:flex-row md:mb-10">
 				<GetStartedButton />
-				<ContactSalesButton />
+				{/* <ContactSalesButton /> */}
 			</div>
 			<div ref={containerRef} className="relative w-full">
 				<WalkthroughScroll />

surfsense_web/components/homepage/navbar.tsx

@@ -22,9 +22,9 @@ export const Navbar = () => {
 
 	const navItems = [
 		{ name: "Pricing", link: "/pricing" },
-		{ name: "Contact\u00A0Us", link: "/contact" },
 		{ name: "Changelog", link: "/changelog" },
 		{ name: "Docs", link: "/docs" },
+		{ name: "Contact\u00A0Us", link: "/contact" },
 	];
 
 	useEffect(() => {