Connect, collaborate, and grow with a community of TypeScript developers
finish transitions on events page, add partners and years selector (#1660)
PickleNik53d571a33781
diff --git a/apps/aot/src/app/events/[year]/24BgDecorations.tsx b/apps/aot/src/app/events/[year]/24BgDecorations.tsxindex dc43f19a..711b8c6e 100644--- a/apps/aot/src/app/events/[year]/24BgDecorations.tsx+++ b/apps/aot/src/app/events/[year]/24BgDecorations.tsx@@ -1,38 +1,50 @@+'use client';+import { motion } from 'framer-motion';+export default function BgDecorations() {return (<>- <div+ <motion.div+ initial={{ opacity: 0, transform: 'rotateX(69deg) translate(-50%, 115%)' }}+ animate={{ opacity: 1, transform: 'rotateX(69deg) translate(-50%, 135%)' }}+ transition={{ delay: 22 * 0.025, type: 'spring' }}className="absolute bottom-0 left-1/2 h-[30rem] w-[30rem] overflow-hidden rounded-full bg-black/5 dark:bg-white/5"style={{- transform: 'rotateX(69deg) translate(-50%, 135%)',perspective: '1000px',}}/>- <div+ <motion.div+ initial={{ opacity: 0, transform: 'rotateX(69deg) translate(-50%, 125%)' }}+ animate={{ opacity: 1, transform: 'rotateX(69deg) translate(-50%, 145%)' }}+ transition={{ delay: 26 * 0.025, type: 'spring' }}className="absolute bottom-0 left-1/2 h-[35rem] w-[35rem] overflow-hidden rounded-full bg-black/5 dark:bg-white/5"style={{- transform: 'rotateX(69deg) translate(-50%, 145%)',perspective: '1000px',}}/>- <div+ <motion.div+ initial={{ opacity: 0, transform: 'rotateX(69deg) translate(-50%, 135%)' }}+ animate={{ opacity: 1, transform: 'rotateX(69deg) translate(-50%, 155%)' }}+ transition={{ delay: 30 * 0.025, type: 'spring' }}className="absolute bottom-0 left-1/2 h-[40rem] w-[40rem] overflow-hidden rounded-full bg-black/5 dark:bg-white/5"style={{transform: 'rotateX(69deg) translate(-50%, 155%)',perspective: '1000px',}}/>- <div+ <motion.div+ initial={{ opacity: 0, transform: 'rotateX(69deg) translate(-50%, 115%)' }}+ animate={{ opacity: 1, transform: 'rotateX(69deg) translate(-50%, 135%)' }}+ transition={{ delay: 22 * 0.025, type: 'spring' }}className="absolute bottom-0 left-1/2 h-96 w-96 overflow-hidden rounded-full bg-gradient-to-b from-pink-400/10 to-emerald-400/10 blur-xl"style={{- transform: 'rotateX(69deg) translate(-50%, 135%)',perspective: '1000px',}}><div className="absolute left-1/2 top-8 h-24 w-24 rounded-full bg-yellow-400/40 blur-2xl" /><div className="absolute bottom-32 left-1/2 h-24 w-24 rounded-full bg-purple-400/40 blur-2xl" /><div className="absolute bottom-8 left-1/2 h-24 w-24 rounded-full bg-rose-400/40 blur-2xl" />- </div>+ </motion.div></>);}diff --git a/apps/aot/src/app/events/[year]/GiftBox.tsx b/apps/aot/src/app/events/[year]/GiftBox.tsxnew file mode 100644index 00000000..7cda43f5--- /dev/null+++ b/apps/aot/src/app/events/[year]/GiftBox.tsx@@ -0,0 +1,44 @@+'use client';+import { motion } from 'framer-motion';+import Image from 'next/image';+import gift1 from '~/../public/giftbox.png';+import gift2 from '~/../public/giftbox2.png';+import gift3 from '~/../public/giftbox3.png';++const gifts = [gift1, gift2, gift3];++export default function GiftBox({+ day,+ active,+ index,+}: {+ day: number;+ active: boolean;+ index: number;+}) {+ return (+ <motion.div+ initial={{ opacity: 0, translateY: 15 }}+ animate={{ opacity: 1, translateY: 0 }}+ transition={{ delay: day * 0.025, type: 'spring', damping: 3, stiffness: 100 }}+ className={`group relative h-12 w-12 cursor-pointer rounded-2xl duration-300 hover:bg-white/20 ${+ index == 2 && 'ml-20 mr-12'+ }`}+ >+ <Image+ className={`absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 select-none brightness-100 ${+ !active && 'opacity-50 grayscale'+ } group-hover:brightness-90 dark:brightness-50 ${+ index == 0 && '-translate-y-[calc(50%+0.5rem)]'+ }`}+ src={gifts[index]!}+ alt="Day 23"+ width={64}+ height={64}+ />+ <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 font-bold">+ {day}+ </div>+ </motion.div>+ );+}diff --git a/apps/aot/src/app/events/page.tsx b/apps/aot/src/app/events/[year]/YearsSelector.tsxsimilarity index 82%rename from apps/aot/src/app/events/page.tsxrename to apps/aot/src/app/events/[year]/YearsSelector.tsxindex a570c962..2f3ca8e7 100644--- a/apps/aot/src/app/events/page.tsx+++ b/apps/aot/src/app/events/[year]/YearsSelector.tsx@@ -2,16 +2,16 @@ import Link from 'next/link';import { notFound } from 'next/navigation';import { api } from '~/trpc/server';import { getAllFlags } from '~/utils/feature-flag';-import { buildMetaForEventPage } from '~/utils/metadata';+// import { buildMetaForEventPage } from '~/utils/metadata';-export async function generateMetadata() {- return buildMetaForEventPage({- title: 'Advent of Typescript',- description: 'Advent of Typescript',- });-}+// export async function generateMetadata() {+// return buildMetaForEventPage({+// title: 'Advent of Typescript',+// description: 'Advent of Typescript',+// });+// }-export default async function Page() {+export default async function YearsSelector() {const { enableAotPlatform } = await getAllFlags();if (!enableAotPlatform) {return notFound();diff --git a/apps/aot/src/app/events/[year]/day-active.tsx b/apps/aot/src/app/events/[year]/day-active.tsxindex 1fb58598..415e56a2 100644--- a/apps/aot/src/app/events/[year]/day-active.tsx+++ b/apps/aot/src/app/events/[year]/day-active.tsx@@ -19,7 +19,7 @@ export default function DayActive({ day, hasSolved }: { day: number; hasSolved:key={day}initial={{ opacity: 0, translateY: 15 }}animate={{ opacity: 1, translateY: 0 }}- transition={{ delay: day * 0.05, type: 'spring', damping: 3, stiffness: 100 }}+ 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]} p-[1.5px]`}diff --git a/apps/aot/src/app/events/[year]/day-inactive.tsx b/apps/aot/src/app/events/[year]/day-inactive.tsxindex b6d35515..b17b6084 100644--- a/apps/aot/src/app/events/[year]/day-inactive.tsx+++ b/apps/aot/src/app/events/[year]/day-inactive.tsx@@ -17,8 +17,8 @@ export default function DayInactive({ day }: { day: number }) {key={day}initial={{ opacity: 0, translateY: 15 }}animate={{ opacity: 1, translateY: 0 }}- transition={{ delay: day * 0.05, type: 'spring', damping: 3, stiffness: 100 }}- className="group aspect-square rounded-xl bg-gradient-to-b duration-300 hover:scale-110 hover:rounded-2xl"+ transition={{ delay: day * 0.025, type: 'spring', damping: 3, stiffness: 100 }}+ className="group aspect-square rounded-xl bg-gradient-to-b p-[1.5px] duration-300 hover:scale-110 hover:rounded-2xl"><divclassName={`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 ${diff --git a/apps/aot/src/app/events/[year]/page.tsx b/apps/aot/src/app/events/[year]/page.tsxindex 76daf6f6..e9d0838b 100644--- a/apps/aot/src/app/events/[year]/page.tsx+++ b/apps/aot/src/app/events/[year]/page.tsx@@ -1,17 +1,16 @@import Link from 'next/link';-import Image from 'next/image';import { notFound } from 'next/navigation';import { api } from '~/trpc/server';import { buildMetaForEventPage } from '~/utils/metadata';import { isValidAdventYear } from '~/utils/time-utils';-import gift1 from '~/../public/giftbox.png';-import gift2 from '~/../public/giftbox2.png';-import gift3 from '~/../public/giftbox3.png';import DayActive from './day-active';-import BgDecorations from './24BgDecorations';import DayInactive from './day-inactive';import type { RouterOutputs } from '~/trpc/react';import { DailyCountdownTimer } from '~/components/DailyCountdownTimer';+import BgDecorations from './24BgDecorations';+import Partners from '~/components/landing/Partners';+import YearsSelector from './YearsSelector';+import GiftBox from './GiftBox';type Challenge = RouterOutputs['event']['getEventChallengesByYear'][0];interface Props {@@ -27,8 +26,6 @@ export async function generateMetadata() {});}-const GIFTS = [gift1, gift2, gift3];-export default async function EventByYearLandingPage({ params }: Props) {const year = Number(params.year);if (!isValidAdventYear(year)) return notFound();@@ -50,10 +47,9 @@ export default async function EventByYearLandingPage({ params }: Props) {const lastThree = eventChallenges.slice(-3);return (- <div className="-mt-14 flex min-h-screen flex-col justify-center overflow-hidden bg-gradient-to-t from-neutral-400/10 to-transparent">- <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="-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">+ <YearsSelector />+ <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">@@ -81,32 +77,22 @@ export default async function EventByYearLandingPage({ params }: Props) {<div className="-mt-[4.5rem] flex">{lastThree.map((day, index) => (- <Link- href={`/events/${year}/${day.day}`}- key={day.day}- className={`group relative h-12 w-12 cursor-pointer rounded-2xl duration-300 hover:bg-white/20 ${- index == 2 && 'ml-20 mr-12'- }`}- >- <Image- className={`absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 select-none brightness-100 ${- !day.active && 'grayscale'- } group-hover:brightness-90 dark:brightness-50 ${- index == 0 && '-translate-y-[calc(50%+0.5rem)]'- }`}- src={GIFTS[index]!}- alt="Day 23"- width={64}- height={64}- />- <div className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 font-bold">- {day.day}- </div>- </Link>+ <>+ {day.active ? (+ <Link key={day.day} href={`/events/${year}/${day.day}`}>+ <GiftBox day={day.day} active={day.active} index={index} />+ </Link>+ ) : (+ <GiftBox key={day.day} day={day.day} active={day.active} index={index} />+ )}+ </>))}</div></ul></div>+ <div className="mt-20">+ <Partners />+ </div></div>);}diff --git a/apps/aot/src/app/globals.css b/apps/aot/src/app/globals.cssindex 814f7d5a..e6ef3d71 100644--- a/apps/aot/src/app/globals.css+++ b/apps/aot/src/app/globals.css@@ -350,7 +350,7 @@ a {-webkit-mask: linear-gradient(to right, transparent, white 20%, white 80%, transparent);}.infinite-scroll-x {- animation: infinite-scroll-x 120s linear infinite;+ animation: infinite-scroll-x 12s linear infinite;}@media (max-width: 768px) {@@ -363,14 +363,14 @@ a {animation: infinite-scroll-x 120s linear infinite reverse;}-.infinite-scroll-x:hover,+/* .infinite-scroll-x:hover,.infinite-scroll-x-reverse:hover {animation-play-state: paused;-}+} */@keyframes infinite-scroll-x {to {- transform: translateX(-50%);+ transform: translateX(-521.82px);}}@@ -395,12 +395,12 @@ a {-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);- /* animation: 3s rotate linear infinite; */+ animation: 3s rotate-fancy-border linear infinite;mask-composite: exclude;pointer-events: none;}-@keyframes rotate {+@keyframes rotate-fancy-border {to {--angle: 360deg;}diff --git a/apps/aot/src/components/landing/PartnerLink.tsx b/apps/aot/src/components/landing/PartnerLink.tsxindex 62e319b6..490ac634 100644--- a/apps/aot/src/components/landing/PartnerLink.tsx+++ b/apps/aot/src/components/landing/PartnerLink.tsx@@ -17,20 +17,16 @@ export default function PartnerLink({ partner }: PartnerLinkProps) {href={partner.url}target="_blank"rel="noreferrer"- className="group relative flex-shrink-0 px-6 pb-3 pt-6 duration-300 hover:bg-black/5 focus:bg-black/5 active:bg-black/10 active:duration-75 md:flex-shrink md:pb-6 md:[mask-image:linear-gradient(to_bottom,red_calc(100%-2rem),transparent)] dark:hover:bg-white/5 dark:focus:bg-white/5 dark:active:bg-white/10"+ className="group relative min-w-fit flex-shrink-0 p-6 duration-300 hover:bg-black/5 focus:bg-black/5 active:bg-black/10 active:duration-75 md:flex-shrink dark:hover:bg-white/5 dark:focus:bg-white/5 dark:active:bg-white/10"><ExtLink />{partner.darkLogo ? (<>- <Image- src={partner.darkLogo}- alt="TypeHero"- className="hidden h-8 w-fit md:h-8 dark:block"- />- <Image src={partner.logo} alt="TypeHero" className="h-8 w-fit md:h-8 dark:hidden" />+ <Image src={partner.darkLogo} alt="TypeHero" className="hidden h-8 w-fit dark:block" />+ <Image src={partner.logo} alt="TypeHero" className="h-8 w-fit dark:hidden" /></>) : (- <Image src={partner.logo} alt="FrontendMasters" className="h-8 w-fit md:h-8" />+ <Image src={partner.logo} alt="FrontendMasters" className="h-8 w-fit" />)}</a>);diff --git a/apps/aot/src/components/landing/Partners.tsx b/apps/aot/src/components/landing/Partners.tsxindex 30c3e6aa..af5f80f6 100644--- a/apps/aot/src/components/landing/Partners.tsx+++ b/apps/aot/src/components/landing/Partners.tsx@@ -5,16 +5,16 @@ import Sentry from '../../../public/sentry.svg';import PartnerLink from './PartnerLink';const partners = [- {- name: 'FrontendMasters',- url: 'https://frontendmasters.com/learn/typescript/',- logo: FrontendMasters,- },{name: 'Sentry',url: 'https://sentry.io/',logo: Sentry,},+ {+ name: 'FrontendMasters',+ url: 'https://frontendmasters.com/learn/typescript/',+ logo: FrontendMasters,+ },{name: 'TypeHero',url: 'https://typehero.dev/',@@ -25,17 +25,22 @@ const partners = [export default function Partners() {return (- <div className="relative flex w-36 flex-col text-center">+ <div className="relative flex w-36 flex-col pb-20 text-center"><div className="font-extralight opacity-70 dark:opacity-30">Partners</div>{/* divider */}<div className="mt-4 h-[1px] w-full bg-black/40 [mask-image:linear-gradient(to_right,transparent,red,transparent)] dark:bg-white/30" />{/* scroll-wrap for mobile carousel */}- <div className="absolute left-1/2 top-[calc(2.5rem+1px)] w-screen -translate-x-1/2">- <div className="mx-auto flex w-fit flex-nowrap items-center justify-center md:flex-nowrap">+ <div className="absolute left-1/2 top-[calc(2.5rem+1px)] w-screen max-w-[600px] -translate-x-1/2 [mask-image:linear-gradient(to_right,transparent,red,transparent)] md:w-screen md:[mask-image:none]">+ <div className="hidden flex-nowrap items-center justify-center md:flex">{partners.map((partner) => {return <PartnerLink key={partner.name} partner={partner} />;})}</div>+ <div className="infinite-scroll-x flex flex-nowrap items-center md:hidden">+ {[...partners, ...partners].map((partner) => {+ return <PartnerLink key={partner.name} partner={partner} />;+ })}+ </div></div></div>);diff --git a/apps/aot/src/components/navigation/index.tsx b/apps/aot/src/components/navigation/index.tsxindex fb58c7ed..c93e7be1 100644--- a/apps/aot/src/components/navigation/index.tsx+++ b/apps/aot/src/components/navigation/index.tsx@@ -26,7 +26,7 @@ export async function Navigation() {{featureFlags.enableAotPlatform ? (<><NavLink title="About" href="/about" />- <NavLink title="Events" href="/events" />+ <NavLink title="Events" href="/events/2024" /></>) : null}</>