diff --git a/app/(pages)/(hackers)/(hub)/schedule/page.tsx b/app/(pages)/(hackers)/(hub)/schedule/page.tsx index a34af4dcb..fe5de9b13 100644 --- a/app/(pages)/(hackers)/(hub)/schedule/page.tsx +++ b/app/(pages)/(hackers)/(hub)/schedule/page.tsx @@ -1,7 +1,6 @@ 'use client'; import { useState, useEffect, useMemo } from 'react'; import CalendarItem from '../../_components/Schedule/CalendarItem'; -import Loader from '@components/Loader/Loader'; import Footer from '@components/Footer/Footer'; import Image from 'next/image'; import headerGrass from '@public/hackers/schedule/header_grass.svg'; @@ -51,7 +50,6 @@ export default function Page() { const [activeFilters, setActiveFilters] = useState(['ALL']); const [isMobileFilterOpen, setIsMobileFilterOpen] = useState(false); const [scheduleData, setScheduleData] = useState(null); - const [isActionInProgress, setIsActionInProgress] = useState(false); const changeActiveDay = (day: '9' | '10') => { setActiveDay(day); @@ -70,7 +68,6 @@ export default function Page() { // Function to handle adding to personal schedule with loading state const handleAddToSchedule = async (eventId: string) => { - setIsActionInProgress(true); const success = await addToPersonalSchedule(eventId); if (success) { @@ -98,13 +95,10 @@ export default function Page() { } } } - - setIsActionInProgress(false); }; // Function to handle removing from personal schedule with loading state const handleRemoveFromSchedule = async (eventId: string) => { - setIsActionInProgress(true); const success = await removeFromPersonalSchedule(eventId); if (success) { @@ -132,8 +126,6 @@ export default function Page() { } } } - - setIsActionInProgress(false); }; // Force refresh events when user data changes @@ -146,7 +138,7 @@ export default function Page() { // Update the existing useEffect - simplify to just set the schedule data without virtual events useEffect(() => { if (!eventsLoading && !personalEventsLoading) { - // Group events by day key - "19" or "20". + // Group events by day key - "09" or "10". const groupedByDay = eventData.reduce( (acc: ScheduleData, eventWithCount) => { const event = eventWithCount.event; @@ -303,20 +295,11 @@ export default function Page() { setActiveFilters([...withoutAll, label]); }; - // Update the loading state to include eventsLoading - const isLoading = - userLoading || personalEventsLoading || eventsLoading || isActionInProgress; + // Loading state only when initially loading data, not when performing add/remove actions (requested by design) + const isInitialLoad = userLoading; const isError = personalEventsError || eventsError; - // Determine if we're in a loading state - if (isLoading) - return ( -
- -
- ); - if (isError) return (
-
+
- {sortedGroupedEntries.length > 0 ? ( + {isInitialLoad ? ( +
+

loading...

+
+ ) : sortedGroupedEntries.length > 0 ? ( sortedGroupedEntries.map(([timeKey, events]) => (
@@ -464,27 +451,29 @@ export default function Page() {
)) ) : ( -
- {activeTab === 'personal' ? ( -
-

- No events in your personal schedule yet. -

- -
- ) : ( - 'No events found for this day and filter(s).' - )} -
+ +
+ ) : ( + 'No events found for this day and filter(s).' + )} +
+ ) )}
diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx index 4ec770984..f7921c77b 100644 --- a/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx +++ b/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx @@ -1,7 +1,7 @@ import Image from 'next/image'; -import grass_top from 'public/hackers/mvp/beginners/grass_top.svg'; -import mobile_grass_top from 'public/hackers/mvp/beginners/mobile_grass_top.svg'; -import mascots from 'public/hackers/mvp/beginners/mascots.svg'; +import grass_top from 'public/hackers/beginners/grass_top.svg'; +import mobile_grass_top from 'public/hackers/beginners/mobile_grass_top.svg'; +import mascots from 'public/hackers/beginners/mascots.svg'; import TextCard from './TextCard'; export default function BeginnersSection() { @@ -17,13 +17,14 @@ export default function BeginnersSection() { alt="grass detail lining top of section" className="md:hidden w-full h-auto" /> -
+
four hackdavis mascots looking at a computer
diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx index 0177ca010..311922597 100644 --- a/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx +++ b/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx @@ -1,6 +1,6 @@ import Link from 'next/link'; import Image from 'next/image'; -import button_arrow from 'public/hackers/mvp/beginners/button_arrow.svg'; +import button_arrow from 'public/hackers/beginners/button_arrow.svg'; interface TextCardProps { short_text: string; @@ -36,10 +36,20 @@ export default function TextCard({ >
diff --git a/app/(pages)/(hackers)/_components/MentorAndDirectorHelp/MDHelpCards.tsx b/app/(pages)/(hackers)/_components/MentorAndDirectorHelp/MDHelpCards.tsx index 2009a94e0..90f115f0f 100644 --- a/app/(pages)/(hackers)/_components/MentorAndDirectorHelp/MDHelpCards.tsx +++ b/app/(pages)/(hackers)/_components/MentorAndDirectorHelp/MDHelpCards.tsx @@ -60,20 +60,25 @@ export const Card: React.FC = ({ {/* Card Links */}
diff --git a/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx b/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx index a3f936c83..c9cf0cfc8 100644 --- a/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx +++ b/app/(pages)/(hackers)/_components/Schedule/CalendarItem.tsx @@ -122,7 +122,7 @@ export function CalendarItem({
{displayType !== 'GENERAL' && displayType !== 'MEALS' && (
)} -
+
+ +
{!isMobileFilterOpen && (
diff --git a/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx b/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx index c96141e1b..97a915e7d 100644 --- a/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx +++ b/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx @@ -1,5 +1,5 @@ import Image from 'next/image'; -import bunny_phone from 'public/hackers/mvp/discord/bunny_phone.svg'; +import bunny_phone from 'public/hackers/discord/bunny_phone.svg'; import TextCard from '../BeginnersSection/TextCard'; export default function Discord() { @@ -23,6 +23,7 @@ export default function Discord() { width={424} height={611} alt="large phone with hackdavis bunny mascot" + className="w-auto h-auto max-w-full" />
diff --git a/app/(pages)/_components/Loader/Loader.tsx b/app/(pages)/_components/Loader/Loader.tsx index 3ade46346..eff611e56 100644 --- a/app/(pages)/_components/Loader/Loader.tsx +++ b/app/(pages)/_components/Loader/Loader.tsx @@ -9,7 +9,7 @@ export default function Loader({ modal = false, message = '' }: LoaderProps) { className={`w-full h-full flex flex-col items-center justify-center text-center ${ modal ? '' - : 'absolute inset-0 min-w-screen min-h-screen bg-[rgba(136, 136, 136, 0.50)] backdrop-blur' + : 'absolute inset-0 min-w-screen min-h-screen bg-[var(--background-light)]' }`} >

{message}

diff --git a/app/(pages)/_components/Navbar/Navbar.tsx b/app/(pages)/_components/Navbar/Navbar.tsx index be0d1177b..2b789e150 100644 --- a/app/(pages)/_components/Navbar/Navbar.tsx +++ b/app/(pages)/_components/Navbar/Navbar.tsx @@ -41,13 +41,13 @@ const sections = [ // activeColor: '#7FB732', // background: 'rgba(255, 255, 255, 0.50)', // }, - { - id: 'starter-kit', - page: '/starter-kit', - baseColor: '#1589BE', - activeColor: '#AFD157', - background: 'rgba(255, 255, 255, 0.50)', - }, + // { + // id: 'starter-kit', + // page: '/starter-kit', + // baseColor: '#1589BE', + // activeColor: '#AFD157', + // background: 'rgba(255, 255, 255, 0.50)', + // }, ]; export default function Navbar() { @@ -78,12 +78,12 @@ export default function Navbar() { page: '/schedule', path: '/schedule', }, - { - ids: ['starter-kit'], - body: 'Starter Kit', - page: '/starter-kit', - path: '/starter-kit', - }, + // { + // ids: ['starter-kit'], + // body: 'Starter Kit', + // page: '/starter-kit', + // path: '/starter-kit', + // }, // { // ids: ['project-info'], // body: 'Project Info', diff --git a/app/(pages)/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay.tsx b/app/(pages)/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay.tsx index cdbca2117..04ffda3ed 100644 --- a/app/(pages)/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay.tsx +++ b/app/(pages)/_components/TimeProtectedDisplay/ClientTimeProtectedDisplay.tsx @@ -1,5 +1,6 @@ 'use client'; +import Loader from '../Loader/Loader'; import TimeTriggerEntity from './TimeTriggerEntity'; import { useFeatureAvailability } from '@pages/_hooks/useFeatureAvailability'; @@ -19,7 +20,7 @@ export default function ClientTimeProtectedDisplay({ // initial loading state if (loading && !rollout) { - return 'loading...'; + return ; } // error or no rollout info, then don't render 24 hr timer diff --git a/public/hackers/beginners/button_arrow.svg b/public/hackers/beginners/button_arrow.svg new file mode 100644 index 000000000..2604cefd6 --- /dev/null +++ b/public/hackers/beginners/button_arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/hackers/mvp/beginners/grass_top.svg b/public/hackers/beginners/grass_top.svg similarity index 100% rename from public/hackers/mvp/beginners/grass_top.svg rename to public/hackers/beginners/grass_top.svg diff --git a/public/hackers/mvp/beginners/mascots.svg b/public/hackers/beginners/mascots.svg similarity index 100% rename from public/hackers/mvp/beginners/mascots.svg rename to public/hackers/beginners/mascots.svg diff --git a/public/hackers/mvp/beginners/mobile_grass_top.svg b/public/hackers/beginners/mobile_grass_top.svg similarity index 100% rename from public/hackers/mvp/beginners/mobile_grass_top.svg rename to public/hackers/beginners/mobile_grass_top.svg diff --git a/public/hackers/mvp/discord/bunny_phone.svg b/public/hackers/discord/bunny_phone.svg similarity index 100% rename from public/hackers/mvp/discord/bunny_phone.svg rename to public/hackers/discord/bunny_phone.svg diff --git a/public/hackers/mvp/beginners/button_arrow.svg b/public/hackers/mvp/beginners/button_arrow.svg deleted file mode 100644 index 9ef686627..000000000 --- a/public/hackers/mvp/beginners/button_arrow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -