From ad660161158e1963e3095a172877927b84b5e3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <43091603+glazk0@users.noreply.github.com> Date: Wed, 5 Jul 2023 18:48:59 +0200 Subject: [PATCH] misc: updates & shit --- app/(auth)/sign-in/page.tsx | 2 +- app/(auth)/sign-up/page.tsx | 2 +- app/dashboard/badges/page.tsx | 2 +- app/dashboard/layout.tsx | 2 +- app/dashboard/leaderboard/page.tsx | 2 +- app/dashboard/page.tsx | 2 +- app/dashboard/puzzles/[id]/page.tsx | 4 +- app/dashboard/puzzles/page.tsx | 4 +- app/layout.tsx | 34 +- app/page.tsx | 4 +- components.json | 15 + lib/hooks/use-toast.ts | 187 ++ lib/nav-items.ts | 3 + lib/players.ts | 2 +- next.config.js | 3 - package.json | 19 +- pnpm-lock.yaml | 2918 ++++++++++++++++----------- styles/global.css | 93 + styles/globals.css | 18 - tailwind.config.js | 74 +- 20 files changed, 2087 insertions(+), 1303 deletions(-) create mode 100644 components.json create mode 100644 lib/hooks/use-toast.ts create mode 100644 styles/global.css delete mode 100644 styles/globals.css diff --git a/app/(auth)/sign-in/page.tsx b/app/(auth)/sign-in/page.tsx index b00d5c5..862ffdc 100644 --- a/app/(auth)/sign-in/page.tsx +++ b/app/(auth)/sign-in/page.tsx @@ -1,4 +1,4 @@ -import UserAuthForm from '@/ui/UserAuthForm'; +import UserAuthForm from '@/components/ui/UserAuthForm'; export default function Page() { return ( diff --git a/app/(auth)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx index cf2ee5e..4fe95fd 100644 --- a/app/(auth)/sign-up/page.tsx +++ b/app/(auth)/sign-up/page.tsx @@ -1,4 +1,4 @@ -import UserAuthForm from '@/ui/UserAuthForm'; +import UserAuthForm from '@/components/ui/UserAuthForm'; export default function Page() { return ( diff --git a/app/dashboard/badges/page.tsx b/app/dashboard/badges/page.tsx index b70d5ec..07431fd 100644 --- a/app/dashboard/badges/page.tsx +++ b/app/dashboard/badges/page.tsx @@ -4,7 +4,7 @@ import { useContext } from 'react'; import { UserContext } from '@/context/user'; -import Badge from '@/ui/Badge'; +import Badge from '@/components/ui/Badge'; export default function Page() { const { data: me } = useContext(UserContext); diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx index 8721e6b..d9b8ac5 100644 --- a/app/dashboard/layout.tsx +++ b/app/dashboard/layout.tsx @@ -1,7 +1,7 @@ import { type ReactNode } from 'react'; import { UserProvider } from '@/context/user'; -import Wrapper from '@/ui/dashboard/Wrapper'; +import Wrapper from '@/components/ui/dashboard/Wrapper'; import { cookies } from 'next/headers'; export default async function Layout({ children }: { children: ReactNode }) { diff --git a/app/dashboard/leaderboard/page.tsx b/app/dashboard/leaderboard/page.tsx index 068f126..3233c59 100644 --- a/app/dashboard/leaderboard/page.tsx +++ b/app/dashboard/leaderboard/page.tsx @@ -1,4 +1,4 @@ -import Leaderboard from '@/ui/Leaderboard'; +import Leaderboard from '@/components/ui/Leaderboard'; import { cookies } from 'next/headers'; export const metadata = { diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 3fa8b8e..c3c4b32 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -2,8 +2,8 @@ import { useContext } from 'react'; +import Card from '@/components/ui/Card'; import { UserContext } from '@/context/user'; -import Card from '@/ui/Card'; export default function Page() { const { data: me, isLoading } = useContext(UserContext); diff --git a/app/dashboard/puzzles/[id]/page.tsx b/app/dashboard/puzzles/[id]/page.tsx index ca64eea..1a95aee 100644 --- a/app/dashboard/puzzles/[id]/page.tsx +++ b/app/dashboard/puzzles/[id]/page.tsx @@ -1,6 +1,6 @@ import { getPuzzle } from '@/lib/puzzles'; -import Puzzle from '@/ui/Puzzle'; -import SWRFallback from '@/ui/SWRFallback'; +import Puzzle from '@/components/ui/Puzzle'; +import SWRFallback from '@/components/ui/SWRFallback'; import type { Metadata } from 'next'; import { cookies } from 'next/headers'; import { notFound } from 'next/navigation'; diff --git a/app/dashboard/puzzles/page.tsx b/app/dashboard/puzzles/page.tsx index 3a37113..b4d43ac 100644 --- a/app/dashboard/puzzles/page.tsx +++ b/app/dashboard/puzzles/page.tsx @@ -1,7 +1,7 @@ import { cookies } from 'next/headers'; -import Puzzles from '@/ui/Puzzles'; -import SWRFallback from '@/ui/SWRFallback'; +import Puzzles from '@/components/ui/Puzzles'; +import SWRFallback from '@/components/ui/SWRFallback'; import { getPuzzles } from '@/lib/puzzles'; import { notFound } from 'next/navigation'; diff --git a/app/layout.tsx b/app/layout.tsx index 51086dd..32eb395 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,5 +1,4 @@ -import '@/styles/globals.css'; -import 'remixicon/fonts/remixicon.css'; +import '@/styles/global.css'; import { type Metadata } from 'next'; import { Fira_Code } from 'next/font/google'; @@ -8,10 +7,13 @@ import { type ReactNode } from 'react'; import { cn, getURL } from '@/lib/utils'; +import { ThemeProvider } from '@/components/ThemeProvider'; + const sans = localFont({ variable: '--font-sans', src: './fonts/Karrik.woff2', - weight: 'variable' + weight: 'variable', + display: 'swap' }); const code = Fira_Code({ @@ -28,26 +30,6 @@ export const metadata: Metadata = { }, description: "Apprendre la programmation et la cybersécurité en s'amusant.", // manifest: getURL('/favicon/site.webmanifest'), - openGraph: { - title: { - default: 'Peer-at Code', - template: `%s - Peer-at Code` - }, - description: "Apprendre la programmation et la cybersécurité en s'amusant.", - url: getURL(), - siteName: 'Peer-at Code', - // images: getURL('/assets/social.jpg'), - type: 'website' - }, - twitter: { - card: 'summary_large_image', - title: { - default: 'Peer-at Code', - template: `%s - Peer-at Code` - }, - description: "Apprendre la programmation et la cybersécurité en s'amusant." - // images: getURL('/assets/social.jpg'), - }, alternates: { canonical: getURL() }, @@ -74,14 +56,16 @@ export default function RootLayout({ children }: { children: ReactNode }) { lang="fr" dir="ltr" className={cn( - 'scroll-smooth bg-gradient-to-b from-primary-800 to-primary-900 [color-scheme:dark]', + 'scroll-smooth bg-gradient-to-b from-primary-800 to-primary-900', sans.variable, code.variable )} >
-