Homepage hub: Activity / Fund / Proposals shared shell

app/(home)/fund/loading.tsx

@@ -0,0 +1,16 @@
+import { FeedItemSkeleton } from '@/components/Feed/FeedItemSkeleton';
+
+export default function FundLoading() {
+  return (
+    <div>
+      <div className="flex items-center justify-end mt-2 sm:mt-4 mb-2">
+        <div className="h-5 w-24 rounded bg-gray-200 animate-pulse" />
+      </div>
+      <div className="mt-4 space-y-8">
+        {Array.from({ length: 3 }, (_, i) => (
+          <FeedItemSkeleton key={i} variant="grant" />
+        ))}
+      </div>
+    </div>
+  );
+}

app/fund/page.tsx → app/(home)/fund/page.tsx

@@ -1,44 +1,16 @@
-import { Suspense } from 'react';
 import { Metadata } from 'next';
 import { buildOpenGraphMetadata } from '@/lib/metadata';
-import { PageLayout } from '@/app/layouts/PageLayout';
-import { FundingSidebarServer } from '@/components/Funding/FundingSidebarServer';
-import { ActivitySidebarSkeleton } from '@/components/Funding/ActivitySidebarSkeleton';
-import { HeroHeader } from '@/components/ui/HeroHeader';
-import { FundGrantsPageContent } from './FundGrantsPageContent';
-import { MarketplaceCards } from '@/components/Funding/MarketplaceCards';
-import { FundingHeroPanel } from '@/components/Funding/FundingHeroPanel';
-import { OpenFundingOpportunityCTA } from './OpenFundingOpportunityCTA';
+import { FundGrantsPageContent } from '@/app/fund/FundGrantsPageContent';
 
 export const metadata: Metadata = buildOpenGraphMetadata({
-  title: 'Funding Opportunities',
+  title: 'Fund',
   description: 'Apply for funding opportunities via proposals.',
   url: '/fund',
 });
 
-export default async function FundPage() {
+export default function FundPage() {
   return (
-    <PageLayout
-      topBanner={
-        <HeroHeader
-          title="Funding Opportunities"
-          subtitle={
-            <p className="text-sm sm:text-base text-gray-500">
-              Apply for funding opportunities via proposals.
-            </p>
-          }
-          cta={<FundingHeroPanel primaryCta={<OpenFundingOpportunityCTA />} />}
-          alignTop
-        >
-          <MarketplaceCards selected="grants" />
-        </HeroHeader>
-      }
-      rightSidebar={
-        <Suspense fallback={<ActivitySidebarSkeleton />}>
-          <FundingSidebarServer />
-        </Suspense>
-      }
-    >
+    <>
       <section className="sr-only">
         <p>
           ResearchHub provides direct funding pathways for scientific research. Browse open funding
@@ -75,6 +47,6 @@ export default async function FundPage() {
         </p>
       </section>
       <FundGrantsPageContent />
-    </PageLayout>
+    </>
   );
 }

app/(home)/fund/proposals/loading.tsx

@@ -0,0 +1,16 @@
+import { FeedItemSkeleton } from '@/components/Feed/FeedItemSkeleton';
+
+export default function FundProposalsLoading() {
+  return (
+    <div>
+      <div className="flex items-center justify-end mt-2 sm:mt-4 mb-2">
+        <div className="h-4 w-24 rounded bg-gray-200 animate-pulse" />
+      </div>
+      <div className="mt-4 space-y-8">
+        {Array.from({ length: 3 }, (_, i) => (
+          <FeedItemSkeleton key={i} variant="fundraise" />
+        ))}
+      </div>
+    </div>
+  );
+}

app/(home)/fund/proposals/page.tsx

@@ -0,0 +1,19 @@
+import { Metadata } from 'next';
+import { buildOpenGraphMetadata } from '@/lib/metadata';
+import { ProposalFeed } from '@/components/Funding/ProposalFeed';
+import { ProposalSortAndFilters } from '@/components/Funding/ProposalSortAndFilters';
+
+export const metadata: Metadata = buildOpenGraphMetadata({
+  title: 'Proposals',
+  description: 'Propose research, get reviewed, receive funding.',
+  url: '/fund/proposals',
+});
+
+export default function FundProposalsPage() {
+  return (
+    <div>
+      <ProposalSortAndFilters />
+      <ProposalFeed />
+    </div>
+  );
+}

app/(home)/layout.tsx

@@ -0,0 +1,13 @@
+import { ReactNode } from 'react';
+import { PageLayout } from '@/app/layouts/PageLayout';
+import { FundSidebar } from '@/components/Funding/FundSidebar';
+import { HomeTabs } from '@/components/Funding/HomeTabs';
+
+export default function HomeLayout({ children }: { children: ReactNode }) {
+  return (
+    <PageLayout rightSidebar={<FundSidebar />}>
+      <HomeTabs />
+      {children}
+    </PageLayout>
+  );
+}

app/(home)/loading.tsx

@@ -0,0 +1,11 @@
+import { ActivityCardSkeleton } from '@/components/Activity/ActivityCardSkeleton';
+
+export default function HomeLoading() {
+  return (
+    <div>
+      {[...Array(6)].map((_, i) => (
+        <ActivityCardSkeleton key={i} />
+      ))}
+    </div>
+  );
+}

app/(home)/page.tsx

@@ -0,0 +1,13 @@
+import { Metadata } from 'next';
+import { buildOpenGraphMetadata } from '@/lib/metadata';
+import { FundActivityPageContent } from '@/components/Funding/FundActivityPageContent';
+
+export const metadata: Metadata = buildOpenGraphMetadata({
+  title: 'Activity',
+  description: 'Recent activity across funding opportunities and proposals.',
+  url: '/',
+});
+
+export default function HomeActivityPage() {
+  return <FundActivityPageContent />;
+}

app/about/components/CTASection.tsx

@@ -45,7 +45,7 @@ export const CTASection = () => {
     {
       kind: 'action',
       label: 'Join ResearchHub',
-      onAction: () => showAuthModal(() => router.push('/popular')),
+      onAction: () => showAuthModal(() => router.push('/')),
     },
     { kind: 'link', href: '/fund', label: 'Fund science', external: true },
   ];

app/expert-finder/ExpertFinderClientLayout.tsx

@@ -29,7 +29,7 @@ export default function ExpertFinderClientLayout({ children }: ExpertFinderClien
 
   useEffect(() => {
     if (!isLoading && !canAccessExpertFinder) {
-      router.push('/popular');
+      router.push('/');
     }
   }, [isLoading, canAccessExpertFinder, router]);
 

app/layouts/components/RightSidebarContainer.tsx

@@ -11,7 +11,7 @@ import { RightSidebar } from '../RightSidebar';
 
 function getSidebarInstanceKey(pathname: string, rightSidebar: boolean | ReactNode): string {
   if (typeof rightSidebar !== 'boolean') {
-    return `custom:${pathname}`;
+    return 'custom';
   }
 
   if (pathname.startsWith('/paper/create')) {

app/layouts/topbar/pageRoutes.tsx

@@ -12,22 +12,16 @@ import { Icon } from '@/components/ui/icons';
 import { getTopicEmoji } from '@/components/Topic/TopicEmojis';
 import { toTitleCase } from '@/utils/stringUtils';
 import { getSourceLogo, getPreprintDisplayName } from '@/utils/preprintUtil';
+import { HOME_TAB_PATHS, isHomeTabPath } from '@/hooks/useFundTabs';
 
 export interface PageInfo {
   title: string;
   icon?: React.ReactNode;
 }
 
 export const ROOT_NAVIGATION_PATHS = new Set([
-  '/',
-  '/following',
-  '/latest',
-  '/popular',
-  '/for-you',
-  '/feed',
+  ...HOME_TAB_PATHS,
   '/earn',
-  '/fund',
-  '/fund/proposals',
   '/journal',
   '/notebook',
   '/browse',
@@ -47,7 +41,7 @@ interface RouteRule {
 
 const ROUTE_RULES: RouteRule[] = [
   {
-    match: (p) => ['/', '/following', '/latest', '/popular', '/for-you', '/feed'].includes(p),
+    match: (p) => isHomeTabPath(p),
     getInfo: () => ({
       title: 'Home',
       icon: <FontAwesomeIcon icon={faHouseLight} fontSize={24} color="#000" />,
@@ -152,7 +146,7 @@ const ROUTE_RULES: RouteRule[] = [
     }),
   },
   {
-    match: (p) => p === '/fund' || p.startsWith('/fund/') || p.startsWith('/grant/'),
+    match: (p) => p.startsWith('/fund/') || p.startsWith('/grant/'),
     getInfo: () => ({
       title: 'Fund',
       icon: <Icon name="fund" size={24} className="text-gray-900" />,

app/moderators/ModerationClientLayout.tsx

@@ -26,7 +26,7 @@ export default function ModerationClientLayout({ children }: ModerationClientLay
 
   useEffect(() => {
     if (!isLoading && !isModerator) {
-      router.push('/popular');
+      router.push('/');
     }
   }, [isLoading, isModerator, router]);
 

app/robots.ts

@@ -15,8 +15,6 @@ export default function robots(): MetadataRoute.Robots {
         '/dashboard/',
         '/notifications/',
         '/activity/',
-        '/for-you/',
-        '/following/',
         '/notebook/',
         '/moderators/',
         '/expert-finder/',