UI fixes #454
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| 'use client'; | ||
|
|
||
| import { use, useEffect } from 'react'; | ||
| import { useRouter } from 'next/navigation'; | ||
| import { useHackathonData } from '@/lib/providers/hackathonProvider'; | ||
| import { useAuthStatus } from '@/hooks/use-auth'; | ||
| import { useSubmission } from '@/hooks/hackathon/use-submission'; | ||
| import { SubmissionFormContent } from '@/components/hackathons/submissions/SubmissionForm'; | ||
| import LoadingScreen from '@/features/projects/components/CreateProjectModal/LoadingScreen'; | ||
| import { Button } from '@/components/ui/button'; | ||
| import { ArrowLeft } from 'lucide-react'; | ||
| import { toast } from 'sonner'; | ||
|
|
||
| export default function SubmitProjectPage({ | ||
| params, | ||
| }: { | ||
| params: Promise<{ slug: string }>; | ||
| }) { | ||
| const router = useRouter(); | ||
| const { isAuthenticated, isLoading } = useAuthStatus(); | ||
|
|
||
| const resolvedParams = use(params); | ||
| const hackathonSlug = resolvedParams.slug; | ||
|
|
||
| const { | ||
| currentHackathon, | ||
| loading: hackathonLoading, | ||
| setCurrentHackathon, | ||
| } = useHackathonData(); | ||
|
|
||
| useEffect(() => { | ||
| if (hackathonSlug) { | ||
| setCurrentHackathon(hackathonSlug); | ||
| } | ||
| }, [hackathonSlug, setCurrentHackathon]); | ||
|
|
||
| const hackathonId = currentHackathon?.id || ''; | ||
| const orgId = currentHackathon?.organizationId || undefined; | ||
|
|
||
| const { | ||
| submission: mySubmission, | ||
| isFetching: isLoadingMySubmission, | ||
| fetchMySubmission, | ||
| } = useSubmission({ | ||
| hackathonSlugOrId: hackathonId || '', | ||
| autoFetch: isAuthenticated && !!hackathonId, | ||
| }); | ||
|
Comment on lines
+31
to
+47
There was a problem hiding this comment. Gate this page on the requested hackathon, not just any hackathon in context.
Suggested fix const {
currentHackathon,
loading: hackathonLoading,
setCurrentHackathon,
} = useHackathonData();
+
+ const isCurrentHackathonReady =
+ currentHackathon?.slug === hackathonSlug;
const hackathonId = currentHackathon?.id || '';
const orgId = currentHackathon?.organizationId || undefined;
const {
submission: mySubmission,
isFetching: isLoadingMySubmission,
fetchMySubmission,
} = useSubmission({
hackathonSlugOrId: hackathonId || '',
- autoFetch: isAuthenticated && !!hackathonId,
+ autoFetch: isAuthenticated && isCurrentHackathonReady && !!hackathonId,
});
@@
- if (
- isLoading ||
- hackathonLoading ||
- isLoadingMySubmission ||
- !currentHackathon
- ) {
+ if (
+ isLoading ||
+ hackathonLoading ||
+ isLoadingMySubmission ||
+ !isCurrentHackathonReady
+ ) {
return <LoadingScreen />;
}Also applies to: 73-80 🤖 Prompt for AI Agents |
||
|
|
||
| // Authentication check | ||
| useEffect(() => { | ||
| if (!isLoading && !isAuthenticated) { | ||
| toast.error('You must be logged in to submit a project'); | ||
| router.push( | ||
| `/auth?mode=signin&callbackUrl=/hackathons/${hackathonSlug}/submit` | ||
| ); | ||
| } | ||
| }, [isAuthenticated, isLoading, router, hackathonSlug]); | ||
|
|
||
| const handleClose = () => { | ||
| router.push(`/hackathons/${hackathonSlug}`); | ||
| }; | ||
|
|
||
| const handleSuccess = () => { | ||
| fetchMySubmission(); | ||
| toast.success( | ||
| mySubmission | ||
| ? 'Submission updated successfully!' | ||
| : 'Project submitted successfully!' | ||
| ); | ||
| router.push(`/hackathons/${hackathonSlug}?tab=submission`); | ||
|
Comment on lines
+63
to
+70
There was a problem hiding this comment. Remove the extra success toast.
🤖 Prompt for AI Agents |
||
| }; | ||
|
|
||
| if ( | ||
| isLoading || | ||
| hackathonLoading || | ||
| isLoadingMySubmission || | ||
| !currentHackathon | ||
| ) { | ||
| return <LoadingScreen />; | ||
| } | ||
|
|
||
| return ( | ||
| <div className='min-h-screen bg-black px-5 py-5 text-white md:px-[50px] lg:px-[100px]'> | ||
| <div className='mx-auto max-w-[1200px] pb-10'> | ||
| <Button | ||
| variant='ghost' | ||
| className='mb-6 pl-0 text-gray-400 hover:text-white' | ||
| onClick={handleClose} | ||
| > | ||
| <ArrowLeft className='mr-2 h-4 w-4' /> | ||
| Back to Hackathon | ||
| </Button> | ||
|
|
||
| <div className='min-h-[700px] overflow-hidden rounded-xl border border-gray-800 bg-gray-900/50 shadow-2xl'> | ||
| <SubmissionFormContent | ||
| hackathonSlugOrId={hackathonId} | ||
| organizationId={orgId} | ||
| submissionId={mySubmission?.id} | ||
| initialData={ | ||
| mySubmission | ||
| ? { | ||
| projectName: mySubmission.projectName, | ||
| category: mySubmission.category, | ||
| description: mySubmission.description, | ||
| logo: mySubmission.logo, | ||
| videoUrl: mySubmission.videoUrl, | ||
| introduction: mySubmission.introduction, | ||
| links: mySubmission.links, | ||
| participationType: (mySubmission as any).participationType, | ||
| } | ||
| : undefined | ||
| } | ||
| onSuccess={handleSuccess} | ||
| onClose={handleClose} | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isInitializingis cleared before the requested hackathon is actually aligned.await setCurrentHackathon(hackathonId)does not synchronize the provider state here, so the newuseSubmissionhook can still auto-fetch against whatevercurrentHackathonwas already in context. On route-to-route transitions, that makeshasSubmittedvulnerable to the previous hackathon's submission until the provider catches up.Also applies to: 322-341
🤖 Prompt for AI Agents