From b0e94843c5ec9a33c472e6bd428ad1c068173d7f Mon Sep 17 00:00:00 2001 From: michelleyeoh Date: Fri, 20 Feb 2026 11:36:15 -0800 Subject: [PATCH 1/8] fixed schedule sticky --- app/(pages)/(hackers)/(hub)/schedule/page.tsx | 3 ++- .../(hackers)/_components/Schedule/ScheduleMobileControls.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/(pages)/(hackers)/(hub)/schedule/page.tsx b/app/(pages)/(hackers)/(hub)/schedule/page.tsx index a34af4dcb..f8396c6bb 100644 --- a/app/(pages)/(hackers)/(hub)/schedule/page.tsx +++ b/app/(pages)/(hackers)/(hub)/schedule/page.tsx @@ -137,6 +137,7 @@ export default function Page() { }; // Force refresh events when user data changes + // TODO: dont refesh whole page, just update the relevant events in the schedule data state useEffect(() => { if (user && !userLoading) { refreshEvents(); @@ -404,7 +405,7 @@ export default function Page() { /> -
+
)) ) : ( - isInitialLoad ) && ( -
- {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/Schedule/ScheduleMobileControls.tsx b/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx index f2057e599..33f272407 100644 --- a/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx +++ b/app/(pages)/(hackers)/_components/Schedule/ScheduleMobileControls.tsx @@ -1,5 +1,6 @@ import Image from 'next/image'; import { pageFilters, ScheduleFilter } from '@typeDefs/filters'; +import { useEffect, useState } from 'react'; const MOBILE_FILTER_BG_DEFAULT = '#F3F3FC'; const MOBILE_FILTER_TEXT_DEFAULT = '#3F3F3F'; @@ -28,6 +29,18 @@ export default function ScheduleMobileControls({ const hasSelectedFilters = activeFilters.some((filter) => filter !== 'ALL'); const selectedFilterDots = activeFilters.filter((filter) => filter !== 'ALL'); + const [isScrolled, setIsScrolled] = useState(false); + + // Allows for filter button to disspear when user scroll down + useEffect(() => { + const handleScroll = () => { + // If scrolled more than 110px, hide filter button + setIsScrolled(window.scrollY > 110); + }; + window.addEventListener('scroll', handleScroll); + return () => window.removeEventListener('scroll', handleScroll); + }, []); + const renderDayButton = (day: '9' | '10', label: string) => ( + + {!isMobileFilterOpen && (
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', From 5a9f64d3e1e9df8f9a1d28553a5bde15f38814d3 Mon Sep 17 00:00:00 2001 From: michelleyeoh Date: Fri, 20 Feb 2026 13:46:12 -0800 Subject: [PATCH 5/8] md help animation arrow done --- .../MentorAndDirectorHelp/MDHelpCards.tsx | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) 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 */}
- {image} - - {linkName} + + + + + + {linkName} +
From 44125a858913c2d2de3bd6ace39b0dffacc5b129 Mon Sep 17 00:00:00 2001 From: michelleyeoh Date: Fri, 20 Feb 2026 13:58:18 -0800 Subject: [PATCH 6/8] discord and beginer section img size fix --- .../_components/BeginnersSection/BeginnersSection.tsx | 3 ++- app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx index 4ec770984..12da1b1f7 100644 --- a/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx +++ b/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx @@ -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/StayUpToDate/Discord.tsx b/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx index c96141e1b..61ecfb732 100644 --- a/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx +++ b/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx @@ -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" />
From 5869b18f7e12f0ffe45a45552cbf619e54d73f44 Mon Sep 17 00:00:00 2001 From: michelleyeoh Date: Fri, 20 Feb 2026 14:17:11 -0800 Subject: [PATCH 7/8] button hover transition wroking --- .../BeginnersSection/BeginnersSection.tsx | 6 +++--- .../_components/BeginnersSection/TextCard.tsx | 17 ++++++++++++++--- .../_components/StayUpToDate/Discord.tsx | 2 +- public/hackers/beginners/button_arrow.svg | 3 +++ .../hackers/{mvp => }/beginners/grass_top.svg | 0 public/hackers/{mvp => }/beginners/mascots.svg | 0 .../{mvp => }/beginners/mobile_grass_top.svg | 0 .../hackers/{mvp => }/discord/bunny_phone.svg | 0 public/hackers/mvp/beginners/button_arrow.svg | 3 --- 9 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 public/hackers/beginners/button_arrow.svg rename public/hackers/{mvp => }/beginners/grass_top.svg (100%) rename public/hackers/{mvp => }/beginners/mascots.svg (100%) rename public/hackers/{mvp => }/beginners/mobile_grass_top.svg (100%) rename public/hackers/{mvp => }/discord/bunny_phone.svg (100%) delete mode 100644 public/hackers/mvp/beginners/button_arrow.svg diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/BeginnersSection.tsx index 12da1b1f7..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() { diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx index 0177ca010..b9ea6c508 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,21 @@ export default function TextCard({ >
diff --git a/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx b/app/(pages)/(hackers)/_components/StayUpToDate/Discord.tsx index 61ecfb732..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() { 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 @@ - - - From 009d7be35d87af57a0c3251a264c4628a1326593 Mon Sep 17 00:00:00 2001 From: michelleyeoh Date: Fri, 20 Feb 2026 14:19:06 -0800 Subject: [PATCH 8/8] rem comment --- app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx b/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx index b9ea6c508..311922597 100644 --- a/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx +++ b/app/(pages)/(hackers)/_components/BeginnersSection/TextCard.tsx @@ -40,7 +40,6 @@ export default function TextCard({ > {button_text}
- {/* 2. Changed -translate-x-4 to -translate-x-7 to hide 1rem (approx 16px) more of the tail */}