Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

AoT fixes (#1676)

PickleNikd003e86c7221
diff --git a/apps/aot/src/app/events/(leaderboard)/2023/leaderboard/layout.tsx b/apps/aot/src/app/events/(leaderboard)/2023/leaderboard/layout.tsx
index d0ed7580..faec9b30 100644
--- a/apps/aot/src/app/events/(leaderboard)/2023/leaderboard/layout.tsx
+++ b/apps/aot/src/app/events/(leaderboard)/2023/leaderboard/layout.tsx
@@ -17,8 +17,8 @@ export default async function LeaderboardLayout({ children }: { children: React.
if (!hasAdventStarted(YEAR)) return notFound();
return (
- <div className="container mx-auto pt-8">
- <div className="container fixed inset-0 top-20">
+ <div>
+ <div className="top-14">
<DayScroller year={YEAR} />
</div>
{children}
diff --git a/apps/aot/src/app/events/(leaderboard)/_components/day-scroller.tsx b/apps/aot/src/app/events/(leaderboard)/_components/day-scroller.tsx
index 913f4af3..a76dfe63 100644
--- a/apps/aot/src/app/events/(leaderboard)/_components/day-scroller.tsx
+++ b/apps/aot/src/app/events/(leaderboard)/_components/day-scroller.tsx
@@ -55,7 +55,7 @@ export function DayScroller(props: { eventDay?: number; year: number }) {
}
return (
- <div className="flex flex-row space-x-4">
+ <div className="flex flex-row space-x-4 bg-gradient-to-r from-transparent via-neutral-300/50 to-transparent dark:via-neutral-700/50">
<Button variant="ghost" size="icon" className="flex-none" onClick={() => scroll(-1)}>
<ChevronLeft />
</Button>
diff --git a/apps/aot/src/app/events/(leaderboard)/_components/leaderboard-page.tsx b/apps/aot/src/app/events/(leaderboard)/_components/leaderboard-page.tsx
index 63875a64..25361f2e 100644
--- a/apps/aot/src/app/events/(leaderboard)/_components/leaderboard-page.tsx
+++ b/apps/aot/src/app/events/(leaderboard)/_components/leaderboard-page.tsx
@@ -15,7 +15,7 @@ export function LeaderboardPage(props: {
}) {
return (
<div>
- <div className="container fixed inset-0 top-32 ">
+ <div className="container fixed inset-0 top-32">
<div className="top-32 mx-auto h-[220px] px-4 md:left-0 md:h-[330px] md:max-w-full lg:h-[500px]">
<Stage data={props.data.slice(0, 3)} isDayStage={props.isDayPage} />
</div>
diff --git a/apps/aot/src/app/events/[year]/YearsSelector.tsx b/apps/aot/src/app/events/[year]/YearsSelector.tsx
deleted file mode 100644
index 5123cbe1..00000000
--- a/apps/aot/src/app/events/[year]/YearsSelector.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import Link from 'next/link';
-import { notFound } from 'next/navigation';
-import { api } from '~/trpc/server';
-import { getAllFlags } from '~/utils/feature-flag';
-
-export default async function YearsSelector({ selectedYear }: { selectedYear: string }) {
- const { enableAotPlatform } = await getAllFlags();
- if (!enableAotPlatform) {
- return notFound();
- }
-
- const events = await api.event.getAll();
- function isCurrent(year: string) {
- return year === selectedYear;
- }
-
- return (
- <ul className="container mx-auto flex justify-center gap-4">
- {events.reverse().map((event) => {
- const year = event.slug.split('-').at(-1);
- return (
- <li
- className={`flex items-center gap-2 rounded-full border bg-gradient-to-r ${
- year && isCurrent(year)
- ? 'border-red-800 from-red-950 to-red-700'
- : 'border-emerald-800 from-emerald-700 to-emerald-900'
- } px-3 py-1.5 font-medium`}
- key={event.slug}
- >
- {year && isCurrent(year) ? (
- <>
- <div className="h-2 w-2 animate-ping rounded-full bg-red-500" />
- <div className="-ml-4 h-2 w-2 rounded-full bg-red-500" />
- </>
- ) : null}
- <Link href={`/events/${year}`}>{year}</Link>
- </li>
- );
- })}
- </ul>
- );
-}
diff --git a/apps/aot/src/app/events/[year]/day-active.tsx b/apps/aot/src/app/events/[year]/day-active.tsx
index 699d3e7f..0569441e 100644
--- a/apps/aot/src/app/events/[year]/day-active.tsx
+++ b/apps/aot/src/app/events/[year]/day-active.tsx
@@ -21,14 +21,16 @@ export default function DayActive({ day, hasSolved }: { day: number; hasSolved:
initial={{ opacity: 0, translateY: 15 }}
animate={{ opacity: 1, translateY: 0 }}
transition={{ delay: day * 0.025, type: 'spring', damping: 3, stiffness: 100 }}
- className={`group aspect-square rounded-xl bg-gradient-to-b duration-300 hover:scale-110 hover:rounded-2xl ${
- day !== 1 && colorsArray[day % 6]
+ className={`group aspect-square rounded-xl duration-300 hover:scale-110 hover:rounded-2xl ${
+ day !== 1 && `bg-gradient-to-br ${colorsArray[day % 6]}`
} p-[1.5px]`}
>
<div
- className={`relative grid aspect-square h-12 w-12 cursor-pointer place-items-center overflow-hidden rounded-xl bg-white/70 backdrop-blur duration-300 group-hover:rounded-2xl group-hover:bg-white/50 dark:bg-black/70 dark:group-hover:bg-black/50 ${
- day === 22 && 'h-14'
- }`}
+ className={`relative grid aspect-square h-12 w-12 cursor-pointer place-items-center overflow-hidden rounded-xl duration-300 group-hover:rounded-2xl ${
+ day !== 1 &&
+ 'bg-white/70 backdrop-blur group-hover:bg-white/50 dark:bg-black/70 dark:group-hover:bg-black/50'
+ }
+ ${day === 22 && 'h-14'}`}
>
{hasSolved ? (
<Star className="absolute right-1 top-1 z-50 h-3 w-3 select-none fill-yellow-600 text-yellow-600 dark:fill-yellow-300 dark:text-yellow-300" />
diff --git a/apps/aot/src/app/events/[year]/day-inactive.tsx b/apps/aot/src/app/events/[year]/day-inactive.tsx
index ae7ac309..7a3c4a9d 100644
--- a/apps/aot/src/app/events/[year]/day-inactive.tsx
+++ b/apps/aot/src/app/events/[year]/day-inactive.tsx
@@ -2,15 +2,6 @@
import { motion } from 'framer-motion';
-const colorsArray = [
- 'from-blue-200 dark:from-blue-800 via-blue-600 dark:via-blue-400 to-blue-100 dark:to-blue-900',
- 'from-green-200 dark:from-green-800 via-green-600 dark:via-green-400 to-green-100 dark:to-green-900',
- 'from-yellow-200 dark:from-yellow-800 via-yellow-600 dark:via-yellow-400 to-yellow-100 dark:to-yellow-900',
- 'from-red-200 dark:from-red-800 via-red-600 dark:via-red-400 to-red-100 dark:to-red-900',
- 'from-purple-200 dark:from-purple-800 via-purple-600 dark:via-purple-400 to-purple-100 dark:to-purple-900',
- 'from-pink-200 dark:from-pink-800 via-pink-600 dark:via-pink-400 to-pink-100 dark:to-pink-900',
-];
-
export default function DayInactive({ day }: { day: number }) {
return (
<motion.div
@@ -21,10 +12,12 @@ export default function DayInactive({ day }: { day: number }) {
className="group aspect-square rounded-xl p-[1.5px] duration-300 hover:scale-110 hover:rounded-2xl"
>
<div
- className={`relative grid aspect-square h-12 w-12 cursor-wait place-items-center overflow-hidden rounded-xl border-2 border-dashed border-white/30 bg-white/70 backdrop-blur duration-300 group-hover:rounded-2xl group-hover:bg-white/50 dark:bg-black/20 dark:group-hover:bg-black/50 ${
+ className={`relative grid aspect-square h-12 w-12 cursor-wait place-items-center overflow-hidden rounded-xl border-2 border-dashed border-black/30 bg-white/20 backdrop-blur duration-300 group-hover:rounded-2xl group-hover:bg-white/50 dark:border-white/30 dark:bg-black/20 dark:group-hover:bg-black/50 ${
day === 22 && 'h-14'
}`}
>
+ <div className="candy-cane absolute inset-0" />
+
<h1 className="z-10 font-bold">{day}</h1>
</div>
</motion.div>
diff --git a/apps/aot/src/app/events/[year]/page.tsx b/apps/aot/src/app/events/[year]/page.tsx
index 93279e4c..3407c050 100644
--- a/apps/aot/src/app/events/[year]/page.tsx
+++ b/apps/aot/src/app/events/[year]/page.tsx
@@ -10,6 +10,7 @@ import { DailyCountdownTimer } from '~/components/DailyCountdownTimer';
import BgDecorations from './24BgDecorations';
import Partners from '~/components/landing/Partners';
import GiftBox from './GiftBox';
+import { Footsies } from '~/components/footsies';
type Challenge = RouterOutputs['event']['getEventChallengesByYear'][0];
interface Props {
@@ -46,65 +47,74 @@ export default async function EventByYearLandingPage({ params }: Props) {
const lastThree = eventChallenges.slice(-3);
return (
- <div className="-mt-14 flex min-h-screen flex-col items-center justify-between overflow-hidden bg-gradient-to-t from-neutral-400/10 to-transparent py-14">
- <div className="fixed left-0 top-0 -z-10 h-full w-full bg-[url('https://images.pexels.com/photos/724906/pexels-photo-724906.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2')] bg-cover opacity-10 blur-3xl" />
- <div className="container relative mx-auto">
- <BgDecorations />
- {/* <h1 className="mb-16 mt-8 text-center text-3xl font-bold lg:text-6xl">
+ <>
+ <div className="z-10 -mt-14 flex min-h-screen flex-col items-center justify-between overflow-hidden border-b border-neutral-300 bg-gradient-to-t from-neutral-200 to-neutral-50 py-14 dark:border-neutral-700 dark:from-neutral-800 dark:to-neutral-950">
+ <div
+ className={`pointer-events-none fixed left-0 top-0 h-full w-full bg-[url('https://images.pexels.com/photos/724906/pexels-photo-724906.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2')] bg-cover opacity-10 blur-3xl`}
+ />
+ <div className="container relative mx-auto pt-12">
+ <BgDecorations />
+ {/* <h1 className="mb-16 mt-8 text-center text-3xl font-bold lg:text-6xl">
Challenges for {year}
</h1> */}
- <ul className="z-10 flex flex-col items-center gap-2 sm:gap-3 md:gap-4">
- {year === 2024 && (
- <div className="flex flex-col items-center pt-10">
- <DailyCountdownTimer />
- </div>
- )}
- {groupedDays.map((group, index) => (
- <div key={`row-${index}`} className="flex gap-2 first:pt-10 sm:gap-3 md:gap-4">
- {group.map((day) => (
+ <ul className="z-10 flex flex-col items-center gap-2 sm:gap-3 md:gap-4">
+ {year === 2024 ? (
+ <div className="flex flex-col items-center pb-10">
+ <DailyCountdownTimer />
+ </div>
+ ) : (
+ <div className="h-12 pb-10" />
+ )}
+ {groupedDays.map((group, index) => (
+ <div key={`row-${index}`} className="flex gap-2 sm:gap-3 md:gap-4">
+ {group.map((day) => (
+ <>
+ {day.active ? (
+ <Link key={`day-active-${day.day}`} href={`/events/${year}/${day.day}`}>
+ <DayActive day={day.day} hasSolved={day.hasSolved} />
+ </Link>
+ ) : (
+ <DayInactive key={`day-inactive-${day.day}`} day={day.day} />
+ )}
+ </>
+ ))}
+ </div>
+ ))}
+
+ <div className="-mt-[4.5rem] flex">
+ {lastThree.map((day, index) => (
<>
{day.active ? (
- <Link key={`day-active-${day.day}`} href={`/events/${year}/${day.day}`}>
- <DayActive day={day.day} hasSolved={day.hasSolved} />
+ <Link key={day.day} href={`/events/${year}/${day.day}`}>
+ <GiftBox
+ day={day.day}
+ active={day.active}
+ index={index}
+ hasSolved={day.hasSolved}
+ />
</Link>
) : (
- <DayInactive key={`day-inactive-${day.day}`} day={day.day} />
- )}
- </>
- ))}
- </div>
- ))}
-
- <div className="-mt-[4.5rem] flex">
- {lastThree.map((day, index) => (
- <>
- {day.active ? (
- <Link key={day.day} href={`/events/${year}/${day.day}`}>
<GiftBox
+ key={day.day}
day={day.day}
active={day.active}
index={index}
hasSolved={day.hasSolved}
/>
- </Link>
- ) : (
- <GiftBox
- key={day.day}
- day={day.day}
- active={day.active}
- index={index}
- hasSolved={day.hasSolved}
- />
- )}
- </>
- ))}
- </div>
- </ul>
+ )}
+ </>
+ ))}
+ </div>
+ </ul>
+ </div>
+ <div className="mt-20">
+ <Partners />
+ </div>
</div>
- <div className="mt-20">
- <Partners />
+ <div className="sticky bottom-0 -z-10 w-full">
+ <Footsies />
</div>
- </div>
+ </>
);
}
diff --git a/apps/aot/src/app/globals.css b/apps/aot/src/app/globals.css
index e6ef3d71..47a1f37d 100644
--- a/apps/aot/src/app/globals.css
+++ b/apps/aot/src/app/globals.css
@@ -556,3 +556,7 @@ body.mobile-nav-active {
.animate-pulse-fast {
animation: pulse 2s ease-in-out infinite;
}
+
+.candy-cane {
+ background: repeating-linear-gradient(45deg, #fff2, #fff2 10px, #fff0 10px, #fff0 20px);
+}
diff --git a/apps/aot/src/app/page.tsx b/apps/aot/src/app/page.tsx
index 1fb3218b..22c4ec94 100644
--- a/apps/aot/src/app/page.tsx
+++ b/apps/aot/src/app/page.tsx
@@ -3,7 +3,7 @@ import Partners from '~/components/landing/Partners';
import { LandingCountdownTimer } from '~/components/landing/LandingCountdownTimer';
import Snowfall from '../components/landing/Snowfall';
import { buildMetaForEventPage } from '~/utils/metadata';
-import { LandingStartExploringButton } from '~/components/landing/LandingStartExploringButton';
+import { Footsies } from '~/components/footsies';
export async function generateMetadata() {
return buildMetaForEventPage({
@@ -13,17 +13,19 @@ export async function generateMetadata() {
}
export default function Home() {
return (
- <div className="-mt-14 grid min-h-screen grid-rows-4 place-content-center place-items-center overflow-hidden bg-gradient-to-b from-transparent to-transparent to-50% dark:from-emerald-400/40">
- {/* light-mode-only desktop-only background decorations */}
- <div className="absolute right-[10%] top-1/2 -z-10 hidden h-48 w-[32rem] -translate-y-1/2 rotate-45 animate-pulse rounded-full bg-emerald-200 blur-3xl xl:block dark:bg-transparent" />
- <div className="animate-pulse-alternate absolute bottom-1/2 left-[10%] -z-10 hidden h-48 w-[32rem] translate-y-1/2 rotate-45 rounded-full bg-rose-200 blur-3xl xl:block dark:bg-transparent" />
- <Snowfall />
- <LandingCountdownTimer />
- <Hero />
- <LandingStartExploringButton />
- <Partners />
- {/* looks bad on desktop and mobile */}
- {/* <Footsies /> */}
- </div>
+ <>
+ <div className="z-10 -mt-14 grid min-h-screen grid-rows-3 place-content-center place-items-center overflow-hidden border-b border-neutral-300 bg-gradient-to-b from-white to-white to-50% dark:border-neutral-700 dark:from-emerald-400/40 dark:to-black">
+ {/* light-mode-only desktop-only background decorations */}
+ <div className="absolute right-[10%] top-1/2 -z-10 hidden h-48 w-[32rem] -translate-y-1/2 rotate-45 animate-pulse rounded-full bg-emerald-200 blur-3xl xl:block dark:bg-transparent" />
+ <div className="animate-pulse-alternate absolute bottom-1/2 left-[10%] -z-10 hidden h-48 w-[32rem] translate-y-1/2 rotate-45 rounded-full bg-rose-200 blur-3xl xl:block dark:bg-transparent" />
+ <Snowfall />
+ <LandingCountdownTimer />
+ <Hero />
+ <Partners />
+ </div>
+ <div className="sticky bottom-0 -z-10 w-full">
+ <Footsies />
+ </div>
+ </>
);
}
diff --git a/apps/aot/src/components/footsies.tsx b/apps/aot/src/components/footsies.tsx
index 81c3549f..82ee630b 100644
--- a/apps/aot/src/components/footsies.tsx
+++ b/apps/aot/src/components/footsies.tsx
@@ -4,33 +4,35 @@ import { ThemeButton } from './navigation/theme-button';
export async function Footsies() {
return (
- <footer className="flex w-full flex-col items-center gap-2 px-8 pb-12 text-sm font-light sm:px-16 sm:pb-20 sm:pt-6 md:px-0 md:py-12">
- <div className="container flex flex-col-reverse justify-between gap-2 md:flex-row md:items-end">
+ <footer className="flex w-full flex-col items-center gap-2 bg-neutral-50 px-8 py-12 text-sm font-light sm:px-16 md:px-0 dark:bg-neutral-900">
+ <div className="container flex flex-col-reverse justify-between gap-8 md:flex-row md:items-end md:gap-2">
<span>
Built with <Binary className="inline-block h-5 w-5 text-[#31bdc6]" /> by the Trash Devs
community.
</span>
<div className="flex items-center gap-2">
<ThemeButton />
- <span className="px-2">|</span>
- <a
- target="_blank"
- rel="noreferrer"
- className="group rounded-lg p-2"
- href="https://github.com/typehero/typehero"
- >
- <span className="sr-only">TypeHero on GitHub</span>
- <Github className="h-5 w-5 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
- </a>
- <a
- target="_blank"
- rel="noreferrer"
- className="group rounded-lg p-2"
- href="https://twitter.com/typeheroapp"
- >
- <span className="sr-only">TypeHero on Twitter</span>
- <Twitter className="h-5 w-5 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
- </a>
+ <span className="px-2 opacity-50">|</span>
+ <div className="flex items-center rounded-full border bg-white p-0.5 dark:bg-black">
+ <a
+ target="_blank"
+ rel="noreferrer"
+ className="group rounded-full p-1.5 hover:bg-neutral-200 dark:hover:bg-neutral-800"
+ href="https://github.com/typehero/typehero"
+ >
+ <span className="sr-only">TypeHero on GitHub</span>
+ <Github className="h-4 w-4 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
+ </a>
+ <a
+ target="_blank"
+ rel="noreferrer"
+ className="group rounded-full p-1.5 hover:bg-neutral-200 dark:hover:bg-neutral-800"
+ href="https://twitter.com/typeheroapp"
+ >
+ <span className="sr-only">TypeHero on Twitter</span>
+ <Twitter className="h-4 w-4 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
+ </a>
+ </div>
</div>
</div>
<div className="container flex flex-col justify-between gap-2 text-neutral-500 md:flex-row md:items-end dark:text-neutral-400">
diff --git a/apps/aot/src/components/landing/Hero.tsx b/apps/aot/src/components/landing/Hero.tsx
index 64dcb36b..61c140d8 100644
--- a/apps/aot/src/components/landing/Hero.tsx
+++ b/apps/aot/src/components/landing/Hero.tsx
@@ -1,7 +1,9 @@
+import { LandingStartExploringButton } from './LandingStartExploringButton';
+
export default function Hero() {
return (
<div className="container relative flex flex-col font-black italic">
- <div className="animate-rotate absolute -left-12 -top-28 -z-10 origin-[45%] md:-left-24 md:-top-20">
+ <div className="animate-rotate absolute -left-12 -top-28 origin-[45%] md:-left-24 md:-top-20">
<div
className="animate-rotate-reverse h-16 w-52 rounded-xl border border-black/30 bg-white/50 p-2.5 font-mono text-[0.69rem] font-normal not-italic opacity-70 shadow-lg blur-[0.5px] backdrop-blur md:h-24 md:w-72 md:rounded-3xl md:p-6 md:text-sm dark:border-white/30 dark:bg-white/10"
style={{
@@ -48,6 +50,7 @@ export default function Hero() {
<div className="-mr-0.5 ml-auto w-56 text-right text-4xl leading-5 drop-shadow-2xl sm:w-[40rem] sm:text-8xl sm:leading-10">
TypeScript
</div>
+ <LandingStartExploringButton />
</div>
);
}
diff --git a/apps/aot/src/components/landing/LandingStartExploringButton.tsx b/apps/aot/src/components/landing/LandingStartExploringButton.tsx
index e7869b4a..915590ea 100644
--- a/apps/aot/src/components/landing/LandingStartExploringButton.tsx
+++ b/apps/aot/src/components/landing/LandingStartExploringButton.tsx
@@ -10,11 +10,12 @@ export const StartExploringButton = () => {
return (
<Button
asChild
- className="hero-join-button-dark hidden w-fit overflow-hidden rounded-xl p-[1px] font-bold transition-all duration-300 dark:block dark:hover:shadow-[0_0_2rem_-0.5rem_#fff8]"
+ className="hero-join-button-dark group z-10 mx-auto -mb-32 mt-32 w-fit overflow-hidden rounded-xl border-none p-[1px] font-bold shadow-[-2rem_0_2rem_0_#34d39944,2rem_0_2rem_0_#fb718544] transition-all duration-300 hover:shadow-[-6rem_0_2rem_-1.25rem_#34d399,6rem_0_2rem_-1.25rem_#fb7185]"
variant="outline"
>
<Link href="/events/2024">
- <span className="inline-flex h-full w-fit items-center gap-2 rounded-xl px-4 py-2 transition-all duration-300 dark:bg-neutral-900 dark:text-white group-hover:dark:bg-black">
+ <span className="relative flex h-full w-fit items-center gap-2 rounded-[0.66rem] bg-gradient-to-r from-emerald-500 to-rose-500 px-4 py-2 text-white transition-all duration-300 dark:rounded-xl dark:from-neutral-900 dark:to-neutral-950 dark:text-white group-hover:dark:bg-black">
+ <div className="candy-cane absolute inset-0 h-full w-full duration-500 group-hover:bg-[40px_0]" />
Start the Challenge!
</span>
</Link>
diff --git a/apps/aot/src/components/navigation/index.tsx b/apps/aot/src/components/navigation/index.tsx
index be0030b0..c79627eb 100644
--- a/apps/aot/src/components/navigation/index.tsx
+++ b/apps/aot/src/components/navigation/index.tsx
@@ -32,11 +32,10 @@ export async function Navigation() {
<>
{featureFlags.enableAotPlatform ? (
<>
- <YearSwitcher className="hidden md:inline-flex" />
<NavLinksWithYear />
<NavLink href="/about">About</NavLink>
<Link
- className="donate-btn relative w-fit overflow-hidden rounded-full px-4 py-2 text-black duration-300 hover:bg-[#eed15f] md:hidden dark:text-white dark:hover:bg-[#bea74b44]"
+ className="donate-btn relative w-fit overflow-hidden rounded-full px-4 py-2 text-black/50 duration-300 hover:bg-[#eed15f] md:hidden dark:text-white/80 dark:hover:bg-[#bea74b44]"
href="/support"
>
Support Us
@@ -70,7 +69,7 @@ export async function Navigation() {
<div className="flex flex-col gap-5 pl-2 md:hidden">
{TopSectionLinks}
{!session?.user && (
- <div className="flex items-center gap-2">
+ <div className="ml-4 flex items-center gap-2">
<span>Theme</span>
<ThemeButton />
</div>
@@ -95,20 +94,21 @@ export async function Navigation() {
<header className="z-50 w-full">
<NavWrapper>
<div className="flex w-full items-center justify-between">
- <div className="relative flex w-32 gap-3 lg:w-64">
- <Link className="flex items-center space-x-2 duration-300" href="/">
+ <div className="relative flex w-32 items-center gap-3 md:w-64 lg:w-[22rem]">
+ <Link className="flex items-center space-x-2 pb-1 duration-300" href="/">
<Logo />
</Link>
+ <YearSwitcher className="hidden md:flex" />
</div>
<div className="hidden items-center md:flex">{NavLinks}</div>
- <div className="flex flex-row gap-2">
+ <div className="flex gap-4">
<YearSwitcher className="md:hidden" />
- <div className="flex items-center justify-end gap-1">
+ <div className="flex items-center justify-end gap-1 md:w-56 lg:w-[22rem]">
<Button
size="icon"
variant="outline"
asChild
- className="hidden border-none bg-transparent hover:bg-transparent md:flex dark:hover:text-yellow-400"
+ className="hidden border-none bg-transparent hover:bg-transparent lg:flex dark:hover:text-yellow-400"
>
<Link href={DISCORD_INVITE_LINK}>
<Discord />
@@ -118,7 +118,7 @@ export async function Navigation() {
size="icon"
variant="outline"
asChild
- className="hidden border-none bg-transparent hover:bg-transparent md:flex dark:hover:text-yellow-400"
+ className="hidden border-none bg-transparent hover:bg-transparent lg:flex dark:hover:text-yellow-400"
>
<Link href={GITHUB_LINK}>
<Github />
@@ -128,7 +128,7 @@ export async function Navigation() {
size="icon"
variant="outline"
asChild
- className="hidden border-none bg-transparent hover:bg-transparent md:flex dark:hover:text-yellow-400"
+ className="hidden border-none bg-transparent hover:bg-transparent lg:flex dark:hover:text-yellow-400"
>
<Link href={TWITTER_LINK}>
<NewTwitter />
diff --git a/apps/aot/src/components/navigation/mobile-nav.tsx b/apps/aot/src/components/navigation/mobile-nav.tsx
index 50207161..0e3a5558 100644
--- a/apps/aot/src/components/navigation/mobile-nav.tsx
+++ b/apps/aot/src/components/navigation/mobile-nav.tsx
@@ -1,6 +1,5 @@
'use client';
import { cn } from '@repo/ui/cn';
-import { motion } from 'framer-motion';
import { usePathname } from 'next/navigation';
import React, { useEffect } from 'react';
@@ -49,16 +48,16 @@ export function MobileNav({ children }: Props) {
<span className="line mt-2" />
</button>
</div>
- <motion.div
+ <div
key={open ? 'open' : 'close'}
- initial={{ opacity: 0 }}
- animate={{ opacity: 1 }}
- className={`bg-background/30 left-0 top-[55px] z-50 flex h-full w-full flex-1 snap-y flex-col gap-5 justify-self-center border-b p-3 backdrop-blur-md md:mt-0 md:hidden md:pb-0 ${
- open ? 'absolute block w-full' : 'hidden'
+ className={`bg-background/30 absolute left-0 top-[55px] z-50 flex h-full w-full flex-1 snap-y flex-col gap-5 justify-self-center border-b p-3 backdrop-blur-md duration-300 md:mt-0 md:hidden md:pb-0 ${
+ open
+ ? 'pointer-events-auto translate-y-0 opacity-100'
+ : 'pointer-events-none -translate-y-12 opacity-0'
}`}
>
{children}
- </motion.div>
+ </div>
</>
)
);
diff --git a/apps/aot/src/components/navigation/nav-wrapper.tsx b/apps/aot/src/components/navigation/nav-wrapper.tsx
index 12758a73..5bfc8bb1 100644
--- a/apps/aot/src/components/navigation/nav-wrapper.tsx
+++ b/apps/aot/src/components/navigation/nav-wrapper.tsx
@@ -12,7 +12,7 @@ export function NavWrapper({ children }: { children: React.ReactNode }) {
return (
<nav
className={`flex h-14 items-center ${
- pathname?.startsWith('placeholder') ? 'container' : 'px-4'
+ pathname?.includes('2023/') || pathname?.includes('2024/') ? 'px-4' : 'container'
}`}
>
{children}
diff --git a/apps/aot/src/components/navigation/theme-button.tsx b/apps/aot/src/components/navigation/theme-button.tsx
index 8e710afd..09c3b94d 100644
--- a/apps/aot/src/components/navigation/theme-button.tsx
+++ b/apps/aot/src/components/navigation/theme-button.tsx
@@ -18,13 +18,18 @@ export function ThemeButton() {
if (!mounted) return null;
return (
- <div className={cn('flex items-center rounded-full border p-0.5')}>
+ <div className="flex items-center rounded-full border bg-white p-0.5 dark:bg-black">
{themes.map((t) => {
const isActive = theme === t;
return (
<motion.button
key={t}
- className={cn('rounded-full p-1.5', isActive && 'bg-secondary')}
+ className={cn(
+ 'rounded-full p-1.5',
+ isActive
+ ? 'bg-neutral-200 dark:bg-neutral-700'
+ : 'hover:bg-neutral-100 dark:hover:bg-neutral-800',
+ )}
onClick={() => setTheme(t)}
aria-label="theme button"
whileHover={{ scale: 1.1 }}
diff --git a/packages/ui/src/components/year-selector.tsx b/packages/ui/src/components/year-selector.tsx
index 3dc4b085..5f90df8c 100644
--- a/packages/ui/src/components/year-selector.tsx
+++ b/packages/ui/src/components/year-selector.tsx
@@ -6,11 +6,6 @@ import { cn } from '../cn';
const YEARS = ['2024', '2023'];
-const YEAR_COLOR_MAP: Record<string, string> = {
- '2024': 'border-red-800 from-red-950 to-red-700',
- '2023': 'border-emerald-800 from-emerald-700 to-emerald-900',
-};
-
const YEAR_TO_SELECT_ITEMS_MAP: Record<string, (isLive: boolean) => JSX.Element | number> = {
'2024': (isLive: boolean) => {
return (
@@ -35,17 +30,12 @@ export const YearSelector = (props: {
}) => {
return (
<Select.Root value={props.selectedYear} onValueChange={props.setSelectedYear}>
- <Select.Trigger
- className={cn(
- 'inline-flex min-w-24 items-center justify-end gap-1 rounded-full border bg-gradient-to-r px-3 py-1 md:min-w-28 md:py-1.5',
- YEAR_COLOR_MAP[props.selectedYear],
- )}
- >
+ <Select.Trigger className="flex items-center justify-end gap-1 rounded-full px-1.5 text-black/50 duration-300 hover:bg-black/10 hover:text-black dark:text-white/80 dark:hover:bg-white/10 dark:hover:text-white">
<Select.Value>
{YEAR_TO_SELECT_ITEMS_MAP[props.selectedYear]?.(props.showLive)}
</Select.Value>
<Select.Icon>
- <ChevronDownIcon className="h-5 w-6" />
+ <ChevronDownIcon className="h-4 w-4 stroke-2" />
</Select.Icon>
</Select.Trigger>
<Select.Portal>
@@ -74,8 +64,7 @@ const SelectItem = React.forwardRef<
<Select.Item
className={cn(
'cursor-pointer select-none outline-none',
- 'inline-flex items-center justify-end gap-1 rounded-full border bg-gradient-to-r px-3 py-1 md:py-1.5',
- YEAR_COLOR_MAP[props.value],
+ 'inline-flex items-center justify-end gap-1 rounded-full',
className,
)}
{...props}