Refactor activity feed cards for financial events and related-work API updates

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,19 @@
+import { ReactNode } from 'react';
+import { PageLayout } from '@/app/layouts/PageLayout';
+import { FundSidebar } from '@/components/Funding/FundSidebar';
+import { HomeTabs } from '@/components/Funding/HomeTabs';
+
+/**
+ * Shared shell for homepage hub tabs (Activity / Fund / Proposals).
+ * Keeps PageLayout, HomeTabs, and FundSidebar mounted while only the feed slot swaps.
+ *
+ * `/fund/dashboard` lives outside this group and keeps its own layout.
+ */
+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/activity/page.tsx

@@ -8,7 +8,7 @@
 import { HeroHeader } from '@/components/ui/HeroHeader';
 import { PillTabs } from '@/components/ui/PillTabs';
 import { ActivityCardFull } from '@/components/Activity/ActivityCardFull';
-import { ActivityCardSkeletonList } from '@/components/Activity/ActivityCardSkeleton';
+import { ActivityCardSkeleton } from '@/components/Activity/ActivityCardSkeleton';
 import { useActivityFeed, ActivityTab } from '@/hooks/useActivityFeed';
 import { ActivityScope } from '@/services/activity.service';
 import { GrantService } from '@/services/grant.service';
@@ -106,7 +106,8 @@
             <ActivityCardFull key={entry.id} entry={entry} />
           ))}
 
-          {(isLoading || isLoadingMore) && <ActivityCardSkeletonList />}
+          {(isLoading || isLoadingMore) &&
+            [...Array(6)].map((_, i) => <ActivityCardSkeleton key={i} />)}
 
           {!isLoading && !isLoadingMore && entries.length === 0 && (
             <div className="py-12 text-center">

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/grant/[id]/[slug]/page.tsx

@@ -38,15 +38,10 @@
   const work = await getGrant(id);
 
   const grant = work.note?.post?.grant;
   const grantId = grant?.id ?? undefined;
 
   return (
-    <GrantContentSwitcher
-      content={work.previewContent}
-      imageUrl={work.image}
-      hasDescription={!!grant?.description}
-      grantId={grantId}
-    >
+    <GrantContentSwitcher content={work.previewContent} imageUrl={work.image}>
       {grant?.description && <ProposalSortAndFilters />}
       <ProposalFeed />
     </GrantContentSwitcher>