Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/(pages)/(hackers)/(hub)/schedule/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default function Page() {
setIsMobileFilterOpen={schedule.setIsMobileFilterOpen}
/>

<div className="w-full md:col-start-2 md:row-start-3 mb-[100px] mt-2 md:mt-[24px] lg:mt-[48px] flex flex-col gap-[12px] md:gap-[20px]">
<div className="w-full md:col-start-2 md:row-start-3 mb-[60px] flex flex-col gap-[12px] md:gap-[20px]">
{schedule.isInitialLoad ? (
<div>
<p>loading...</p>
Expand Down
11 changes: 6 additions & 5 deletions app/(pages)/(hackers)/_components/HomeHacking/HeroHacking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { GoArrowRight } from 'react-icons/go';
import Countdown from './_components/Countdown';
import clouds from '@public/hackers/hero/Clouds.svg';
import starLeft from '@public/hackers/hero/StarLeft.svg';
import startRight from '@public/hackers/hero/StarRight.svg';

interface HeroHackingProps {
rolloutTime?: number;
Expand Down Expand Up @@ -62,7 +63,7 @@ export default function HeroHacking({
{/* Decorative stars */}
<Image
src={starLeft}
alt=""
alt="sparkling star"
width={120}
height={120}
className="
Expand All @@ -75,14 +76,14 @@ export default function HeroHacking({
/>

<Image
src="/hackers/hero/StarRight.svg"
alt=""
src={startRight}
alt="sparkling star"
width={120}
height={120}
className="
pointer-events-none select-none
absolute z-20
-right-2 top-[10%]
-right-2 top-[0%]
w-[56px] sm:w-[70px] md:w-[84px] lg:w-[96px]
rotate-[10deg]
"
Expand Down Expand Up @@ -240,7 +241,7 @@ export default function HeroHacking({
<span
className="text-white font-medium tracking-[4.601px]"
style={{
fontSize: 'clamp(28px, 6vw, 90px)',
fontSize: 'clamp(30px, 10.2vw, 195px)', // a bit smaller than to countown timer font
textShadow: '0 0 31.729px rgba(255, 255, 255, 0.30)',
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export function CalendarItem({
}}
variant="ghost"
>
<p className="font-semibold relative z-10 inline-flex items-center gap-2">
<p className="font-semibold relative text-[14px] z-10 inline-flex items-center gap-2">
<span
aria-hidden
className="inline-block w-4 h-4"
Expand Down
4 changes: 3 additions & 1 deletion app/(pages)/(hackers)/_components/Schedule/DayNavButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export default function DayNavButtons({
>
{'\u2022'}
</span>
<span className="font-dm-mono pl-5">{DAY_LABELS[dayKey]}</span>
<span className="font-dm-mono text-[16px] pl-5">
{DAY_LABELS[dayKey]}
</span>
</button>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ export default function ScheduleControls({
</div>

<div className="hidden md:contents">
<div className="min-w-0 flex-1 md:col-start-2 md:row-start-2 md:mt-8">
<div className="min-w-0 flex-1 md:col-start-2 md:row-start-2 md:my-[1.25rem]">
<Filters toggleFilter={toggleFilter} activeFilters={activeFilters} />
</div>

<div className="shrink-0 md:col-start-1 md:row-start-2 md:mt-8 sticky top-20">
<div className="shrink-0 md:col-start-1 md:row-start-2 md:mt-0 sticky top-20">
<DayNavButtons
activeDay={activeDay}
onSelectDay={changeActiveDay}
Expand Down
3 changes: 2 additions & 1 deletion app/(pages)/_hooks/useScheduleData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ export function useScheduleData(): UseScheduleDataResult {
setActiveFilters([...withoutAll, label]);
};

const isInitialLoad = userLoading; // only show loading state for initial rendering; avoid non ui-friendly refresh after data has loaded
const isInitialLoad =
userLoading || (activeTab === 'schedule' && scheduleData === null); // only show loading state for initial rendering; avoid non ui-friendly refresh after data has loaded
const isError = Boolean(personalEventsError || eventsError);

return {
Expand Down
Loading