diff --git a/app/(pages)/(hackers)/(hub)/(index)/page.tsx b/app/(pages)/(hackers)/(hub)/page.tsx similarity index 81% rename from app/(pages)/(hackers)/(hub)/(index)/page.tsx rename to app/(pages)/(hackers)/(hub)/page.tsx index dda5800d..a1b9a1d4 100644 --- a/app/(pages)/(hackers)/(hub)/(index)/page.tsx +++ b/app/(pages)/(hackers)/(hub)/page.tsx @@ -1,7 +1,7 @@ -import Waterfall from '../../_components/Waterfall/Waterfall'; -import BigVinyl from '../../_components/BigVinyl/BigVinyl'; -import PrizeTracks from '../../_components/PrizeTracks/PrizeTracks'; -import BeginnersSection from '../../_components/BeginnersSection/BeginnersSection'; +import Waterfall from '@pages/(hackers)/_components/Waterfall/Waterfall'; +import BigVinyl from '@pages/(hackers)/_components/BigVinyl/BigVinyl'; +import PrizeTracks from '@pages/(hackers)/_components/PrizeTracks/PrizeTracks'; +import BeginnersSection from '@pages/(hackers)/_components/BeginnersSection/BeginnersSection'; import Footer from '@components/Footer/Footer'; import Contact from '@pages/(hackers)/_components/Contact/Contact'; import IndexHero from '@pages/(hackers)/_components/IndexHero/IndexHero'; diff --git a/app/(pages)/(hackers)/(hub)/schedule/page.tsx b/app/(pages)/(hackers)/(hub)/schedule/page.tsx index e9fc0d34..a3721832 100644 --- a/app/(pages)/(hackers)/(hub)/schedule/page.tsx +++ b/app/(pages)/(hackers)/(hub)/schedule/page.tsx @@ -145,7 +145,7 @@ export default function Page() { // Update the existing useEffect - simplify to just set the schedule data without virtual events useEffect(() => { - if (eventData.length > 0 && !personalEventsLoading) { + if (!eventsLoading && !personalEventsLoading) { // Group events by day key - "19" or "20". const groupedByDay = eventData.reduce( (acc: ScheduleData, eventWithCount) => { @@ -174,7 +174,13 @@ export default function Page() { setScheduleData(groupedByDay); } - }, [eventData, personalEvents, isInPersonalSchedule, personalEventsLoading]); + }, [ + eventData, + personalEvents, + isInPersonalSchedule, + personalEventsLoading, + eventsLoading, + ]); useEffect(() => { if (activeTab === 'personal') { @@ -290,11 +296,7 @@ export default function Page() { // Update the loading state to include eventsLoading const isLoading = - userLoading || - personalEventsLoading || - eventsLoading || - !scheduleData || - isActionInProgress; + userLoading || personalEventsLoading || eventsLoading || isActionInProgress; const isError = personalEventsError || eventsError; diff --git a/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.module.scss b/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.module.scss index c11af8f0..29ec127d 100644 --- a/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.module.scss +++ b/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.module.scss @@ -143,6 +143,7 @@ max-width: none; height: 600px; transform: translateX(7.5%); + object-fit: 'cover'; @include desktop-m { height: 400px; diff --git a/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.tsx b/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.tsx index c73c7aa4..ec82b68e 100644 --- a/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.tsx +++ b/app/(pages)/(hackers)/_components/ProjectInfo/SubmissionInfo/SubmissionSteps/DevpostSubmission/SubmissionTips.tsx @@ -43,13 +43,13 @@ export default function SubmissionTips() { Animals Peeping Behind Wall
arrow

diff --git a/public/hackers/project-info/radio.svg b/public/hackers/project-info/radio.svg index 184d387f..aa9e8314 100644 --- a/public/hackers/project-info/radio.svg +++ b/public/hackers/project-info/radio.svg @@ -1,39 +1,22 @@ - -<<<<<<< HEAD - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - ->>>>>>> live_schedule + + + + + + + + + + + + + + + - - + +