Timeline fix

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

@@ -10,9 +10,9 @@ import { HackathonBanner } from '@/components/hackathons/hackathonBanner';
 import { HackathonNavTabs } from '@/components/hackathons/hackathonNavTabs';
 import { HackathonOverview } from '@/components/hackathons/overview/hackathonOverview';
 import { HackathonParticipants } from '@/components/hackathons/participants/hackathonParticipant';
-import { HackathonResources } from '@/components/hackathons/resources/resources';
+// import { HackathonResources } from '@/components/hackathons/resources/resources';
 import SubmissionTab from '@/components/hackathons/submissions/submissionTab';
-import { HackathonDiscussions } from '@/components/hackathons/discussion/comment';
+// import { HackathonDiscussions } from '@/components/hackathons/discussion/comment';
 import { TeamFormationTab } from '@/components/hackathons/team-formation/TeamFormationTab';
 import LoadingScreen from '@/components/landing-page/project/CreateProjectModal/LoadingScreen';
 import { useTimelineEvents } from '@/hooks/hackathon/use-timeline-events';
@@ -33,18 +33,29 @@ export default function HackathonPage() {
     includeEndDate: false,
     dateFormat: { month: 'short', day: 'numeric', year: 'numeric' },
   });
-
   const hackathonTabs = useMemo(() => {
+    const hasParticipants = participants.length > 0;
+    // const hasSubmissions = submissions.filter(p => p.status === 'Approved').length > 0;
+
     const tabs = [
       { id: 'overview', label: 'Overview' },
-      { id: 'participants', label: 'Participants', badge: participants.length },
-      { id: 'resources', label: 'Resources' },
+      ...(hasParticipants
+        ? [
+            {
+              id: 'participants',
+              label: 'Participants',
+              badge: participants.length,
+            },
+          ]
+        : []),
+      // { id: 'resources', label: 'Resources' },
+
       {
         id: 'submission',
         label: 'Submissions',
         badge: submissions.filter(p => p.status === 'Approved').length,
       },
-      { id: 'discussions', label: 'Discussions' },
+      // { id: 'discussions', label: 'Discussions' },
     ];
 
     const participantType = currentHackathon?.participation?.participantType;
@@ -77,7 +88,14 @@ export default function HackathonPage() {
     autoCheck: !!hackathonId,
   });
 
-  const isEnded = currentHackathon?.status === 'ended';
+  const isEnded = useMemo(() => {
+    if (!currentHackathon?.deadline) return false;
+
+    const deadline = new Date(currentHackathon.deadline);
+    const now = new Date();
+
+    return now > deadline;
+  }, [currentHackathon?.deadline]);
 
   // Check if team formation is available
   const isTeamHackathon =
@@ -180,6 +198,12 @@ export default function HackathonPage() {
           hackathonSlugOrId={hackathonId}
           organizationId={undefined}
           onSuccess={handleRegisterSuccess}
+          participantType={
+            (currentHackathon?.participantType as
+              | 'team'
+              | 'individual'
+              | 'team_or_individual') ?? 'individual'
+          }
         />
       )}
 
@@ -202,19 +226,23 @@ export default function HackathonPage() {
           />
         )}
 
-        {activeTab === 'participants' && <HackathonParticipants />}
-
-        {activeTab === 'resources' && (
-          <HackathonResources hackathonSlugOrId={hackathonId} />
+        {activeTab === 'participants' && participants.length > 0 && (
+          <HackathonParticipants />
         )}
+        {/* {activeTab === 'resources' && (
+          <HackathonResources hackathonSlugOrId={hackathonId} />
+        )} */}
 
         {activeTab === 'submission' && (
-          <SubmissionTab hackathonSlugOrId={hackathonId} />
+          <SubmissionTab
+            hackathonSlugOrId={hackathonId}
+            isRegistered={isRegistered}
+          />
         )}
 
-        {activeTab === 'discussions' && (
+        {/* {activeTab === 'discussions' && (
           <HackathonDiscussions hackathonId={hackathonId} />
-        )}
+        )} */}
 
         {activeTab === 'team-formation' && (
           <TeamFormationTab hackathonSlugOrId={hackathonId} />

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

@@ -66,11 +66,11 @@ export default function HackathonPage() {
           <h1 className='text-3xl font-light tracking-tight text-white sm:text-4xl'>
             {currentHackathon?.title || 'Hackathon Dashboard'}
           </h1>
-          {currentHackathon?.information?.description && (
+          {/* {currentHackathon?.information?.description && (
             <p className='mt-3 max-w-2xl text-sm text-gray-400'>
               {currentHackathon.information.description}
             </p>
-          )}
+          )} */}
         </div>
       </div>
 

components/hackathons/HackathonsPageHero.tsx

@@ -41,7 +41,7 @@ export default function HackathonsPageHero() {
   };
 
   const handleCreateHackathon = () => {
-    router.push('/hackathons/create');
+    router.push('/organizations');
   };
 
   return (

components/hackathons/hackathonBanner.tsx

@@ -6,6 +6,8 @@ import { Button } from '@/components/ui/button';
 import { formatDate } from '@/lib/utils';
 import { useEffect, useState, useRef } from 'react';
 import { FileText, Users, ArrowRight } from 'lucide-react';
+import { useAuthStatus } from '@/hooks/use-auth';
+import { useRouter } from 'next/navigation';
 // import { sanitizeHtml } from '@/lib/utils/renderHtml';
 
 interface HackathonBannerProps {
@@ -139,6 +141,9 @@ export function HackathonBanner({
     total: 0,
   });
 
+  const { isAuthenticated } = useAuthStatus();
+  const router = useRouter();
+
   const getStatusColor = () => {
     switch (status) {
       case 'Ongoing':
@@ -157,6 +162,10 @@ export function HackathonBanner({
     }
   };
 
+  const handleRedirectToAuthScreen = () => {
+    router.push('/auth?mode=signin');
+  };
+
   const getDeadlineInfo = () => {
     const days = timeRemaining.days;
 
@@ -333,30 +342,59 @@ export function HackathonBanner({
             )}
 
             {/* Action Buttons */}
-            {!isEnded && (
-              <div className='mt-2 flex flex-wrap items-center gap-3'>
-                {!isRegistered && onJoinClick && (
-                  <Button
-                    onClick={onJoinClick}
-                    className='bg-[#a7f950] font-semibold text-black hover:bg-[#8fd93f]'
-                  >
-                    Join Hackathon
-                    <ArrowRight className='ml-2 h-4 w-4' />
-                  </Button>
-                )}
+            {/* Action Buttons */}
+            <div className='mt-2 flex flex-wrap items-center gap-3'>
+              {/* Hackathon Ended → Disabled button */}
+              {isEnded && (
+                <Button
+                  disabled
+                  className='cursor-not-allowed bg-gray-600/50 text-gray-300 opacity-60'
+                >
+                  Ended
+                </Button>
+              )}
 
-                {isRegistered && !hasSubmitted && onSubmitClick && (
-                  <Button
-                    onClick={onSubmitClick}
-                    className='bg-[#a7f950] font-semibold text-black hover:bg-[#8fd93f]'
-                  >
-                    <FileText className='mr-2 h-4 w-4' />
-                    Submit Project
-                    <ArrowRight className='ml-2 h-4 w-4' />
-                  </Button>
-                )}
+              {/* Hackathon Ongoing → Not registered → Join */}
+              {!isEnded && !isRegistered && onJoinClick && (
+                <Button
+                  onClick={
+                    !isAuthenticated ? handleRedirectToAuthScreen : onJoinClick
+                  }
+                  className='bg-[#a7f950] font-semibold text-black hover:bg-[#8fd93f]'
+                >
+                  Join Hackathon
+                  <ArrowRight className='ml-2 h-4 w-4' />
+                </Button>
+              )}
+
+              {/* Hackathon Ongoing → Registered → Leave */}
+              {!isEnded && isRegistered && (
+                <Button
+                  onClick={onJoinClick}
+                  variant='outline'
+                  className='border-red-500/50 text-red-400 hover:bg-red-500/20'
+                >
+                  Leave Hackathon
+                </Button>
+              )}
+
+              {/* Submit Project */}
+              {!isEnded && isRegistered && !hasSubmitted && onSubmitClick && (
+                <Button
+                  onClick={onSubmitClick}
+                  className='bg-[#a7f950] font-semibold text-black hover:bg-[#8fd93f]'
+                >
+                  <FileText className='mr-2 h-4 w-4' />
+                  Submit Project
+                  <ArrowRight className='ml-2 h-4 w-4' />
+                </Button>
+              )}
 
-                {isRegistered && hasSubmitted && onViewSubmissionClick && (
+              {/* View Submission */}
+              {!isEnded &&
+                isRegistered &&
+                hasSubmitted &&
+                onViewSubmissionClick && (
                   <Button
                     onClick={onViewSubmissionClick}
                     className='bg-[#a7f950] font-semibold text-black hover:bg-[#8fd93f]'
@@ -366,7 +404,11 @@ export function HackathonBanner({
                   </Button>
                 )}
 
-                {isRegistered && isTeamFormationEnabled && onFindTeamClick && (
+              {/* Find Team */}
+              {!isEnded &&
+                isRegistered &&
+                isTeamFormationEnabled &&
+                onFindTeamClick && (
                   <Button
                     onClick={onFindTeamClick}
                     variant='outline'
@@ -376,8 +418,7 @@ export function HackathonBanner({
                     Find Team
                   </Button>
                 )}
-              </div>
-            )}
+            </div>
           </div>
         </div>
       </div>