chore(analytics): merge main into feature branch

Author: Sendi0011

COMMENT_SYSTEM_README.md

@@ -0,0 +1,4 @@
+Completed: Redesign Project Detail Page — Simpler, clearer UI/UX
+
+https://www.figma.com/design/EMNGAQl1SGObXcsoa24krt/Boundless_Project-Details?node-id=0-1&t=CY7XUp5OWWoJ8qpK-1
+

Redesign Project Detail Page

@@ -167,6 +167,33 @@ export default function HackathonPageClient() {
       });
     }
 
+    // Filter tabs against enabledTabs so only explicitly enabled tabs are shown.
+    // 'overview' is always kept as it is the default fallback tab.
+    // If enabledTabs is undefined/null (not configured), all tabs are shown as before.
+    // Map UI tab ids to backend enabledTabs keys where they differ.
+    const tabIdToEnabledKey: Record<string, string> = {
+      'team-formation': 'joinATeamTab',
+      winners: 'winnersTab',
+      resources: 'resourcesTab',
+      participants: 'participantsTab',
+      announcements: 'announcementsTab',
+      submission: 'submissionTab',
+      discussions: 'discussionTab',
+    };
+
+    type EnabledTab = NonNullable<
+      typeof currentHackathon
+    >['enabledTabs'][number];
+    const enabledTabs = currentHackathon?.enabledTabs;
+
+    if (Array.isArray(enabledTabs)) {
+      const enabledSet = new Set(enabledTabs);
+      return tabs.filter(tab => {
+        if (tab.id === 'overview') return true;
+        const key = (tabIdToEnabledKey[tab.id] ?? tab.id) as EnabledTab;
+        return enabledSet.has(key);
+      });
+    }
     return tabs;
   }, [
     currentHackathon?.participants,
@@ -273,12 +300,29 @@ export default function HackathonPageClient() {
   }, [hackathonId, setCurrentHackathon]);
 
   // Handle tab changes from URL
+  // Now also defaults to 'overview' if the URL tab is not in the filtered hackathonTabs list.
+  // This handles direct URL access to a disabled tab — user is silently redirected to overview.
   useEffect(() => {
     const tabFromUrl = searchParams.get('tab');
-    if (tabFromUrl && hackathonTabs.some(tab => tab.id === tabFromUrl)) {
+
+    // No tab in URL — default to overview
+    if (!tabFromUrl) {
+      setActiveTab('overview');
+      return;
+    }
+
+    if (hackathonTabs.some(tab => tab.id === tabFromUrl)) {
+      // Tab exists in filtered list — activate it normally
       setActiveTab(tabFromUrl);
+      return;
     }
-  }, [searchParams, hackathonTabs]);
+
+    // Tab is disabled or unrecognised — fall back to overview
+    setActiveTab('overview');
+    const queryParams = new URLSearchParams(searchParams.toString());
+    queryParams.set('tab', 'overview');
+    router.replace(`?${queryParams.toString()}`, { scroll: false });
+  }, [searchParams, hackathonTabs, router]);
 
   const handleTabChange = (tabId: string) => {
     setActiveTab(tabId);
@@ -308,17 +352,21 @@ export default function HackathonPageClient() {
     );
   }
 
+  // Helper: checks if a tab id is present in the filtered hackathonTabs array.
+  // Used below to guard each tab's content from rendering if the tab is disabled.
+  const isTabVisible = (tabId: string) =>
+    hackathonTabs.some(tab => tab.id === tabId);
+
   // Shared props for banner and sticky card
   const sharedActionProps = {
     deadline: currentHackathon.submissionDeadline,
     startDate: currentHackathon.startDate,
     totalPrizePool: currentHackathon.prizeTiers
-      .reduce((acc, prize) => acc + Number(prize.amount || 0), 0)
+      .reduce((acc, prize) => acc + Number(prize.prizeAmount || 0), 0)
       .toString(),
     isRegistered,
     hasSubmitted,
     isTeamFormationEnabled,
-    registrationDeadlinePolicy: currentHackathon.registrationDeadlinePolicy,
     registrationDeadline: currentHackathon.registrationDeadline,
     participantType: currentHackathon.participantType,
     onJoinClick: handleJoinClick,
@@ -359,10 +407,13 @@ export default function HackathonPageClient() {
                   currency: tier.currency,
                   passMark: tier.passMark,
                   description: tier.description,
-                  prizeAmount: tier.amount,
+                  prizeAmount: tier.prizeAmount,
                 }))}
                 totalPrizePool={currentHackathon.prizeTiers
-                  .reduce((acc, prize) => acc + Number(prize.amount || 0), 0)
+                  .reduce(
+                    (acc, prize) => acc + Number(prize.prizeAmount || 0),
+                    0
+                  )
                   .toString()}
                 hackathonSlugOrId={hackathonId}
                 venue={{
@@ -378,48 +429,60 @@ export default function HackathonPageClient() {
               />
             )}
 
+            {/* isTabVisible('resources') guard — HackathonResources will not
+                render at all if 'resources' is not in enabledTabs, even via direct URL */}
             {activeTab === 'resources' &&
+              isTabVisible('resources') &&
               currentHackathon.resources?.length > 0 && <HackathonResources />}
+
+            {/*  isTabVisible('participants') guard */}
             {activeTab === 'participants' &&
+              isTabVisible('participants') &&
               currentHackathon.participants?.length > 0 && (
                 <HackathonParticipants />
               )}
 
-            {activeTab === 'announcements' && announcements.length > 0 && (
-              <AnnouncementsTab
-                announcements={announcements}
-                hackathonSlug={hackathonId}
-              />
-            )}
+            {/*  isTabVisible('announcements') guard */}
+            {activeTab === 'announcements' &&
+              isTabVisible('announcements') &&
+              announcements.length > 0 && (
+                <AnnouncementsTab
+                  announcements={announcements}
+                  hackathonSlug={hackathonId}
+                />
+              )}
 
-            {activeTab === 'submission' && (
+            {/* isTabVisible('submission') guard */}
+            {activeTab === 'submission' && isTabVisible('submission') && (
               <SubmissionTab
                 organizationId={currentHackathon.organizationId}
                 isRegistered={isRegistered}
               />
             )}
 
-            {activeTab === 'discussions' && (
+            {/*  isTabVisible('discussions') guard */}
+            {activeTab === 'discussions' && isTabVisible('discussions') && (
               <HackathonDiscussions
                 hackathonId={hackathonId}
                 isRegistered={isRegistered}
               />
             )}
 
-            {activeTab === 'team-formation' && (
-              <TeamFormationTab
-                hackathonSlugOrId={hackathonId}
-                isRegistered={isRegistered}
-              />
-            )}
+            {/*  isTabVisible('team-formation') guard */}
+            {activeTab === 'team-formation' &&
+              isTabVisible('team-formation') && (
+                <TeamFormationTab
+                  hackathonSlugOrId={hackathonId}
+                  isRegistered={isRegistered}
+                />
+              )}
 
-            {activeTab === 'winners' && (
+            {/* isTabVisible('winners') guard */}
+            {activeTab === 'winners' && isTabVisible('winners') && (
               <WinnersTab winners={winners} hackathonSlug={hackathonId} />
             )}
 
-            {activeTab === 'resources' && currentHackathon?.resources?.[0] && (
-              <HackathonResources />
-            )}
+            {/* Note: duplicate resources render removed — was already covered above */}
           </div>
         </div>
 

app/(landing)/hackathons/[slug]/HackathonPageClient.tsx

@@ -145,36 +145,14 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
             timezone: draft.data.timeline?.timezone || 'UTC',
 
             startDate: draft.data.timeline?.startDate || '',
-            endDate:
-              draft.data.timeline?.winnersAnnouncedAt ||
-              draft.data.timeline?.winnerAnnouncementDate ||
-              draft.data.timeline?.judgingEnd ||
-              draft.data.timeline?.judgingDate ||
-              draft.data.timeline?.judgingStart ||
-              draft.data.timeline?.submissionDeadline ||
-              draft.data.timeline?.startDate ||
-              '',
             submissionDeadline: draft.data.timeline?.submissionDeadline || '',
             registrationDeadline:
-              draft.data.participation?.registrationDeadline || '',
-            judgingStart: draft.data.timeline?.judgingStart || '',
-            judgingEnd: draft.data.timeline?.judgingEnd || '',
-            winnersAnnouncedAt:
-              draft.data.timeline?.winnersAnnouncedAt ||
-              draft.data.timeline?.winnerAnnouncementDate ||
-              '',
-            customRegistrationDeadline:
-              draft.data.participation?.registrationDeadline || null,
+              draft.data.timeline?.registrationDeadline || '',
+            judgingDeadline: draft.data.timeline?.judgingDeadline || '',
 
             registrationOpen: false,
-            registrationDeadlinePolicy:
-              (draft.data.participation?.registrationDeadlinePolicy as
-                | 'BEFORE_START'
-                | 'BEFORE_SUBMISSION_DEADLINE'
-                | 'CUSTOM') || 'BEFORE_SUBMISSION_DEADLINE',
 
             daysUntilStart: 0,
-            daysUntilEnd: 0,
 
             participantType: (draft.data.participation?.participantType ===
             'individual'
@@ -527,7 +505,6 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
         participants={0}
         imageUrl={previewHackathon.banner}
         startDate={previewHackathon.startDate}
-        endDate={previewHackathon.endDate}
       />
 
       {/* Tabs */}

app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx

@@ -85,7 +85,7 @@ export default function OrgProfileClient({ slug }: OrgProfileClientProps) {
   return (
     <section className='mx-auto max-w-[1440px] px-5 py-10 md:px-[50px] lg:px-[100px]'>
       {/* Banner / Header */}
-      <div className='relative mb-8 overflow-hidden rounded-2xl border border-[#a7f950]/20 bg-gradient-to-br from-[#a7f950]/10 via-zinc-900/80 to-zinc-900/40'>
+      <div className='relative mb-8 overflow-hidden rounded-2xl border border-[#a7f950]/20 bg-linear-to-br from-[#a7f950]/10 via-zinc-900/80 to-zinc-900/40'>
         <div className='absolute -top-24 -right-24 h-64 w-64 rounded-full bg-[#a7f950]/5 blur-3xl' />
         <div className='absolute -bottom-16 -left-16 h-48 w-48 rounded-full bg-[#a7f950]/5 blur-3xl' />
 

app/(landing)/org/[id]/org-profile-client.tsx

@@ -158,31 +158,7 @@ export default function HackathonPage() {
                     e => e.phase === 'Winner Announcement'
                   );
 
-                  // Manually append Winner Announcement if missing and date exists
                   const fullTimeline = [...timelineEvents];
-                  if (!hasWinnerAnnouncement && currentHackathon?.endDate) {
-                    const winnerDate = new Date(currentHackathon.endDate);
-                    const now = new Date();
-                    // Simple status logic for single date event
-                    // If date is passed, completed. If today (roughly), ongoing?
-                    // Or just use 'upcoming' if future, 'completed' if past.
-                    // Ideally we'd match the phase logic, but for a single date event:
-                    let status: 'completed' | 'ongoing' | 'upcoming' =
-                      'upcoming';
-                    if (now > winnerDate) {
-                      status = 'completed';
-                    }
-                    // For "Winner Announcement", it might be "ongoing" on the day of?
-                    // keeping simple for now.
-
-                    fullTimeline.push({
-                      phase: 'Winner Announcement',
-                      description:
-                        'Final results published and prizes distributed to winners.',
-                      date: currentHackathon.endDate,
-                      status: status,
-                    });
-                  }
 
                   return fullTimeline.map((phase, index) => {
                     const isLast = index === fullTimeline.length - 1;

app/(landing)/organizations/[id]/hackathons/[hackathonId]/page.tsx

@@ -80,16 +80,16 @@ export default function SettingsPage() {
     if (!h) return undefined;
     return {
       startDate: h.startDate ? new Date(h.startDate) : undefined,
-      endDate: h.endDate ? new Date(h.endDate) : undefined,
       submissionDeadline: h.submissionDeadline
         ? new Date(h.submissionDeadline)
         : undefined,
-      judgingStart: h.judgingStart ? new Date(h.judgingStart) : undefined,
-      judgingEnd: h.judgingEnd ? new Date(h.judgingEnd) : undefined,
-      winnersAnnouncedAt: h.winnersAnnouncedAt
-        ? new Date(h.winnersAnnouncedAt)
-        : undefined,
       timezone: h.timezone || 'UTC',
+      registrationDeadline: h.registrationDeadline
+        ? new Date(h.registrationDeadline)
+        : undefined,
+      judgingDeadline: h.judgingDeadline
+        ? new Date(h.judgingDeadline)
+        : undefined,
       phases: h.phases?.map(p => ({
         ...p,
         startDate: p.startDate ? new Date(p.startDate) : undefined,
@@ -107,9 +107,6 @@ export default function SettingsPage() {
       require_github: h.requireGithub,
       require_demo_video: h.requireDemoVideo,
       require_other_links: h.requireOtherLinks,
-      registrationDeadlinePolicy:
-        h.registrationDeadlinePolicy?.toLowerCase() as any,
-      registrationDeadline: h.customRegistrationDeadline || undefined,
       detailsTab: h.enabledTabs.includes('detailsTab'),
       participantsTab: h.enabledTabs.includes('participantsTab'),
       resourcesTab: h.enabledTabs.includes('resourcesTab'),
@@ -269,7 +266,12 @@ export default function SettingsPage() {
                   await handleSave('General', data);
                 }}
                 isLoading={isSaving}
-                isPublished={hackathon?.status === 'PUBLISHED'}
+                isPublished={[
+                  'UPCOMING',
+                  'ACTIVE',
+                  'JUDGING',
+                  'COMPLETED',
+                ].includes(hackathon?.status ?? '')}
               />
             </TabsContent>
 

app/(landing)/organizations/[id]/hackathons/[hackathonId]/settings/page.tsx

@@ -3,7 +3,7 @@
 import { useParams } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { Loader2, AlertCircle } from 'lucide-react';
-import { useHackathonSubmissions } from '@/hooks/hackathon/use-hackathon-submissions';
+import { useOrganizerSubmissions } from '@/hooks/hackathon/use-organizer-submissions';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 import { AuthGuard } from '@/components/auth';
 import Loading from '@/components/Loading';
@@ -26,7 +26,7 @@ export default function SubmissionsPage() {
     updateFilters,
     goToPage,
     refresh,
-  } = useHackathonSubmissions(hackathonId);
+  } = useOrganizerSubmissions(hackathonId);
 
   const [currentUserId, setCurrentUserId] = useState<string | null>(null);
   const [hackathon, setHackathon] = useState<Hackathon | null>(null);