- {!isLoading && me?.badges ? (
- me?.badges.map((badge, i) => (
-
- Aucun badge
- )} -
-
- );
-}
diff --git a/app/(auth)/sign-in/page.tsx b/app/(auth)/sign-in/page.tsx
deleted file mode 100644
index 862ffdc..0000000
--- a/app/(auth)/sign-in/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import UserAuthForm from '@/components/ui/UserAuthForm';
-
-export default function Page() {
- return (
- <>
- {children}
-
-
-
- );
-}
diff --git a/app/(auth)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx
deleted file mode 100644
index 4fe95fd..0000000
--- a/app/(auth)/sign-up/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import UserAuthForm from '@/components/ui/UserAuthForm';
-
-export default function Page() {
- return (
- <>
- Connexion
-
-
-
- );
-}
diff --git a/app/(legal)/privacy-policy/page.tsx b/app/(legal)/privacy-policy/page.tsx
deleted file mode 100644
index cb8cab1..0000000
--- a/app/(legal)/privacy-policy/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-export default function Page() {
- return (
- Créer un compte
-
-
- );
-}
diff --git a/app/dashboard/badges/page.tsx b/app/dashboard/badges/page.tsx
deleted file mode 100644
index 7b64bdc..0000000
--- a/app/dashboard/badges/page.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-'use client';
-
-import { useUser } from '@/context/user';
-
-import Badge from '@/components/ui/Badge';
-import { Separator } from '@/components/ui/Separator';
-
-export default function Page() {
- const { data: me, isLoading } = useUser();
- return (
-
-
- - Amuse toi avec Next.js et{' '} - Tailwindcss ! -
-Mes badges
-- Vos badges sont affichés ici, vous pouvez les partager avec vos amis -
-
-
- {children}
-
-
- );
-}
diff --git a/app/dashboard/leaderboard/page.tsx b/app/dashboard/leaderboard/page.tsx
deleted file mode 100644
index 3233c59..0000000
--- a/app/dashboard/leaderboard/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import Leaderboard from '@/components/ui/Leaderboard';
-import { cookies } from 'next/headers';
-
-export const metadata = {
- title: 'Tableau des scores'
-};
-
-export default async function Page() {
- const token = cookies().get('token')?.value;
- return Tableau de bord
-Ceci est la page d'accueil du dashboard
-
-
-
-
-
-
-
-
- Derniers puzzles
-- Voici les derniers puzzles que vous avez résolus ou essayer de résoudres -
-
-
- -
- {me?.completionsList && me.completionsList.length > 0 ? (
- me?.completionsList
- .sort(
- (a, b) =>
- a.score - b.score ||
- a.tries - b.tries ||
- a.puzzleName.localeCompare(b.puzzleName)
- )
- .map((completion, key) => {
- return (
-
-
- --- {completion.puzzleName} ----- - Essai{completion.tries > 1 ? 's' : ''} - - - {completion.tries} - --- Score - - {completion.score} - --
- );
- })
- ) : (
-
- - - {isLoading ? 'Chargement en cours...' : 'Aucun puzzles'} - - - )} -
-
- );
- } else {
- return (
- Oh non! Un François 404
-
-
- );
- }
-}
diff --git a/app/dashboard/puzzles/[id]/page.tsx b/app/dashboard/puzzles/[id]/page.tsx
deleted file mode 100644
index c0dfee2..0000000
--- a/app/dashboard/puzzles/[id]/page.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { Metadata } from 'next';
-import { cookies } from 'next/headers';
-import { notFound } from 'next/navigation';
-
-import { getPuzzle } from '@/lib/puzzles';
-
-import Puzzle from '@/components/ui/Puzzle';
-import SWRFallback from '@/components/ui/SWRFallback';
-
-export async function generateMetadata({ params }: { params: { id: number } }): PromiseOh non! Ce puzzle est introuvable
-Mon profil
-- C'est ici que vous pouvez modifier votre profil. -
-
-
- );
- })}
- {group.name}
-- Chapitre : {group.chapter} - Puzzle : {group.puzzle} -
-
-
- );
-}
diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx
deleted file mode 100644
index ae90bd5..0000000
--- a/components/ui/Button.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as React from 'react';
-import { Slot } from '@radix-ui/react-slot';
-import { cva, type VariantProps } from 'class-variance-authority';
-
-import { cn } from '@/lib/utils';
-
-const buttonVariants = cva(
- 'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
- {
- variants: {
- variant: {
- default: 'bg-primary text-primary-foreground hover:bg-primary/90',
- destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
- outline: 'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
- secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
- ghost: 'hover:bg-accent hover:text-accent-foreground',
- link: 'text-primary underline-offset-4 hover:underline',
- brand: 'bg-gradient-to-tl from-brand to-brand-accent transition-opacity hover:opacity-90'
- },
- size: {
- default: 'h-10 px-4 py-2',
- sm: 'h-9 rounded-md px-3',
- lg: 'h-11 rounded-md px-8',
- icon: 'h-10 w-10'
- }
- },
- defaultVariants: {
- variant: 'default',
- size: 'default'
- }
- }
-);
-
-export interface ButtonProps
- extends React.ButtonHTMLAttributes
-
- );
-
- return (
-
-
-
-
-
-
- );
-}
diff --git a/components/ui/Dialog.tsx b/components/ui/Dialog.tsx
deleted file mode 100644
index 685ad6e..0000000
--- a/components/ui/Dialog.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { cn } from '@/lib/utils';
-import * as DialogPrimitive from '@radix-ui/react-dialog';
-import type { ReactNode } from 'react';
-import { Icon, Icons } from '@/components/ui/Icon';
-// import Tooltip from './Tooltip';
-
-type DialogProps = {
- title?: ReactNode;
- tooltip?: ReactNode;
- trigger: ReactNode;
- children: ReactNode;
- open?: boolean;
- fullscreen?: boolean;
- className?: string;
- onOpenChange?: (open: boolean) => void;
-};
-
-export default function Dialog({
- title,
- tooltip,
- trigger,
- children,
- open,
- fullscreen,
- className,
- onOpenChange
-}: DialogProps) {
- return (
-
-
-
- )}
-
-
-
- {link && (
- {data}
-{title}
-
- {title}
-
-
-
- )}
- {children}
- {children}
; -} diff --git a/components/ui/Form.tsx b/components/ui/Form.tsx deleted file mode 100644 index 97b2aa6..0000000 --- a/components/ui/Form.tsx +++ /dev/null @@ -1,161 +0,0 @@ -import type * as LabelPrimitive from '@radix-ui/react-label'; -import { Slot } from '@radix-ui/react-slot'; -import * as React from 'react'; -import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form'; -import { Controller, FormProvider, useFormContext } from 'react-hook-form'; - -import { Label } from '@/components/ui/Label'; -import { cn } from '@/lib/utils'; - -const Form = FormProvider; - -type FormFieldContextValue< - TFieldValues extends FieldValues = FieldValues, - TName extends FieldPath- {body} -
- ); -}); -FormMessage.displayName = 'FormMessage'; - -export { - Form, - FormControl, - FormDescription, - FormField, - FormItem, - FormLabel, - FormMessage, - useFormField -}; diff --git a/components/ui/Icon.tsx b/components/ui/Icon.tsx deleted file mode 100644 index cee2150..0000000 --- a/components/ui/Icon.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { cn } from '@/lib/utils'; - -export function Icon({ name, className }: { name: string; className?: string }) { - return ; -} - -export const Icons = { - gitHub: () => ( - - ) -}; diff --git a/components/ui/Icons.tsx b/components/ui/Icons.tsx deleted file mode 100644 index 0b3aee1..0000000 --- a/components/ui/Icons.tsx +++ /dev/null @@ -1,16 +0,0 @@ -type IconProps = React.HTMLAttributes
-
- Tableau des scores
-Suivez la progression des élèves en direct
-
-
- {group.rank}
-
-
-
-
-
- {group.name}
-
- {group.players && group.players.length > 1
- ? group.players
- .map((player) => player.pseudo || 'Anonyme')
- .sort((a, b) => a.localeCompare(b))
- .join(', ')
- : group.players[0].pseudo}
-
-
-
- {/*
-
- Puzzle{puzzles > 1 ? 's' : ''}
- {puzzles}
-
*/}
-
- Essai{tries > 1 ? 's' : ''}
- {tries}
-
-
- Score
-
- {group.players.reduce((a, b) => a + b.score, 0)}
-
-
-
-
- );
-}
-
-const InputFormSchema = z.object({
- answer: z.string().nonempty().trim(),
- code_file: z.any().optional()
-});
-
-function InputForm({ puzzle }: { puzzle?: Puzzle }) {
- const form = useForm- {puzzle.name}{' '} - ({puzzle.scoreMax} points) -
-
-
- {!puzzle.score ? (
-
-
- )}
-
-
-
- - Tentative{puzzle.tries && puzzle.tries > 1 ? 's' : ''} :{' '} - {puzzle.tries} -
-- Score : {puzzle.score} -
-
-
- ))) || (
-
-
- {isInEventGroup(chapter) && (
-
-
- {chapter.name}
- {!isInEventGroup(chapter) && isBeforeStart(chapter) && ( - - )} -
- {chapter.startDate && chapter.endDate ? (
-
-
- {/*
- ) : (
-
-
-
- )}
-
- {isInEventGroup(chapter) && (
- <>
-
- -
- {filteredData &&
- filteredData
- .sort((a, b) => a.scoreMax - b.scoreMax)
- .map((puzzle) => (
-
- {[...Array(3).keys()].map((i) => (
-
- )}
-
- );
-}
-
-function PuzzleProp({ puzzle, chapter }: { puzzle: Puzzle; chapter: Chapter }) {
- function isStarted(chapter: Chapter) {
- if (!chapter.startDate || !chapter.endDate) {
- return false;
- }
- const startDate = new Date(chapter.startDate);
- const now = new Date();
- return now > startDate;
- }
- return (
-
-
- ))}
-
-
-
-
- -
- {[...Array(6).keys()].map((j) => (
-
- ))}
-
-
- {puzzle.name}{' '}
-
- ({puzzle.score ? `${puzzle.score}` : '?'}/{puzzle.scoreMax} points)
-
-
-
-
- {puzzle.tags?.length && (
-
-
- {puzzle.tags
- .filter((tag) => !['easy', 'medium', 'hard'].includes(tag.name))
- .map((tag, i) => (
-
- {tag.name}
-
- ))}
-
- )}
-
-
- )}
-
-
- {puzzle.name}{' '}
-
- ({puzzle.score ? `${puzzle.score}` : '?'}/{puzzle.scoreMax} points)
-
-
-
-
- {puzzle.tags?.length && (
-
-
- {puzzle.tags
- .filter((tag) => !['easy', 'medium', 'hard'].includes(tag.name))
- .map((tag, i) => (
-
- {tag.name}
-
- ))}
-
- )}
-
-
- );
-}
diff --git a/components/ui/SWRFallback.tsx b/components/ui/SWRFallback.tsx
deleted file mode 100644
index ba5d09d..0000000
--- a/components/ui/SWRFallback.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-'use client';
-
-import { SWRConfig } from 'swr';
-
-export default function SWRFallback({
- children,
- fallback
-}: {
- children: React.ReactNode;
- fallback: {
- [key: string]: unknown;
- };
-}) {
- return
-
-
-
-
-
-
-
- -
-
- );
-}
diff --git a/components/ui/ToHTML.tsx b/components/ui/ToHTML.tsx
deleted file mode 100644
index d4396e0..0000000
--- a/components/ui/ToHTML.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client';
-
-import { cn } from '@/lib/utils';
-import Mardown from 'react-markdown';
-import remarkBreaks from 'remark-breaks';
-import remarkGfm from 'remark-gfm';
-
-export default function ToHTML({ data, className }: { data: string; className?: string }) {
- return (
- {text}
-
- (
-
- ),
- code: ({ node, ...props }) => (
-
-
- );
-}
diff --git a/components/ui/dashboard/Sidenav.tsx b/components/ui/dashboard/Sidenav.tsx
deleted file mode 100644
index 1c2fd5a..0000000
--- a/components/ui/dashboard/Sidenav.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-'use client';
-
-import { Github } from 'lucide-react';
-import Image from 'next/image';
-import { useSelectedLayoutSegment } from 'next/navigation';
-
-import { NavItem, navItems } from '@/lib/nav-items';
-import { cn } from '@/lib/utils';
-
-import AppLink from '@/components/ui/AppLink';
-import { Icons } from '@/components/ui/Icons';
-
-export default function Sidenav({ isOpen, toggle }: { isOpen: boolean; toggle: () => void }) {
- return (
-
- );
-}
-
-function NavItem({
- item,
- isOpen,
- onClick
-}: {
- item: NavItem;
- isOpen: boolean;
- onClick?: () => void;
-}) {
- const segment = useSelectedLayoutSegment();
- const isHttp = item.slug.includes('http');
- const pathname = item.slug.split('/').pop();
- const isActive = segment === pathname || (segment === null && pathname === 'dashboard');
- return (
-
-
-
-
- );
-}
diff --git a/components/ui/dashboard/Wrapper.tsx b/components/ui/dashboard/Wrapper.tsx
deleted file mode 100644
index 7411fff..0000000
--- a/components/ui/dashboard/Wrapper.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client';
-
-import { useState, type ReactNode } from 'react';
-
-import Sidenav from './Sidenav';
-import Usernav from './Usernav';
-
-export default function Wrapper({ children }: { children: ReactNode }) {
- const [isOpen, setIsOpen] = useState(false);
- const toggle = () => setIsOpen(!isOpen);
-
- return (
-
-
-
-
-
- {segment && (
-
- {titleCase(segment)}
-
- )}
-
- {!isLoading && me ? (
-
-
- ) : (
-
-
-
- )}
-
-
-
-
-
-
- );
-}
diff --git a/components/ui/events/Leaderboard.tsx b/components/ui/events/Leaderboard.tsx
deleted file mode 100644
index cc0b987..0000000
--- a/components/ui/events/Leaderboard.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-'use client';
-
-import { cn } from '@/lib/utils';
-// import { Timer } from '../Timer';
-import type { ScoreEvent } from '@/lib/leaderboard';
-import type { SWRSubscription } from 'swr/subscription';
-import useSWRSubscription from 'swr/subscription';
-import Podium from './podium/Podium';
-import { Timer } from '../Timer';
-
-const SCORE_COLORS = ['text-yellow-400', 'text-gray-400', 'text-orange-400'];
-
-export default function EventLeaderboard({ id }: { token: string; id: number }) {
- const subscription: SWRSubscription
-
-
- {children}
-
- -
- {data?.groups.map((group, key) => (
-
-
- - - {group.rank} - ----- {group.name} - - {group.players && group.players.length > 1 - ? group.players - .map((player) => player.pseudo || 'Anonyme') - .sort((a, b) => a.localeCompare(b)) - .join(', ') - : group.players[0].pseudo} - --- {/*-- Puzzles - - {group.players.reduce((a, b) => a + b.completions, 0)} - -*/} -- Score - - {group.players.reduce((a, b) => a + b.score, 0)} - --
- ))}
-
- {podium.map((group: any, index: number) => (
-
- );
-}
diff --git a/components/ui/events/podium/PodiumStep.tsx b/components/ui/events/podium/PodiumStep.tsx
deleted file mode 100644
index 37edbcb..0000000
--- a/components/ui/events/podium/PodiumStep.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { motion } from 'framer-motion';
-
-export const positions: Record
- ({
- opacity: 1,
- transition: {
- delay: podium.length - group.place + 0.5,
- duration: 0.75
- }
- }),
- hidden: { opacity: 0 }
- }}
- className="w-16 items-center justify-center text-center"
- >
- {group.name}
-
- ({
- height: 200 * ((podium.length - group.place) / podium.length),
- opacity: 2,
- transition: {
- delay: podium.length - group.place - 0.5,
- duration: 1.25,
- ease: 'backInOut'
- }
- }),
- hidden: { opacity: 0, height: 0 }
- }}
- className="flex w-16 cursor-pointer place-content-center rounded-t-lg bg-brand shadow-lg hover:bg-opacity-80"
- style={{
- marginBottom: -1,
- filter: `opacity(${0.1 + (podium.length - group.place) / podium.length})`
- }}
- >
- {positions[group.place]}
-
-
- );
-}
diff --git a/context/user.tsx b/context/user.tsx
deleted file mode 100644
index 715bb14..0000000
--- a/context/user.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-'use client';
-
-import { useMe } from '@/lib/hooks/use-players';
-import type { Player } from '@/lib/players';
-import { createContext, useContext, type ReactNode } from 'react';
-
-export const UserContext = createContext<{
- data: Player | null | undefined;
- isLoading: boolean;
- error: Error | null;
-}>({
- data: null,
- isLoading: true,
- error: null
-});
-
-/**
- * Custom hook to get the user data from the context.
- *
- * @returns {Player | null | undefined} The user data.
- */
-export const useUser = () => {
- const context = useContext(UserContext);
- if (context === undefined) {
- throw new Error('useUser must be used within a UserProvider');
- }
- return context;
-};
-
-export const UserProvider = ({ token, children }: { token: string; children: ReactNode }) => {
- const { data, isLoading, error } = useMe({ token });
- return
+ 
+ {name}
+
diff --git a/src/lib/components/Card.svelte b/src/lib/components/Card.svelte
new file mode 100644
index 0000000..3882f19
--- /dev/null
+++ b/src/lib/components/Card.svelte
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/src/lib/components/Chapter.svelte b/src/lib/components/Chapter.svelte
new file mode 100644
index 0000000..5754117
--- /dev/null
+++ b/src/lib/components/Chapter.svelte
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+ {data}
+{title}
+
+
+
+ + {chapter.name} +
+ +
+
diff --git a/src/lib/components/Puzzle.svelte b/src/lib/components/Puzzle.svelte
new file mode 100644
index 0000000..926c7a5
--- /dev/null
+++ b/src/lib/components/Puzzle.svelte
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+ {#if !isOpen && segments.length}
+
+ {#each breadcrumb as segment}
+ {@const last = segment === breadcrumb[breadcrumb.length - 1]}
+
+ {segment.name}
+
+ {#if !last}
+ /
+ {/if}
+ {/each}
+
+ {/if}
+
+
+
+
+
+
+ + {puzzle.name} + + ({puzzle.score ? `${puzzle.score}` : '?'}/{puzzle.scoreMax} points) + +
+
+ {#if puzzle.tags?.length}
+
+
+ {#each puzzle.tags as tag}
+
+ {tag.name}
+
+ {/each}
+
+ {/if}
+
+
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
new file mode 100644
index 0000000..c30b98f
--- /dev/null
+++ b/src/routes/dashboard/+page.svelte
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+ Tableau de bord
+Ceci est la page d'accueil du dashboard
+
+
+
+
+
+
+
+
+ Derniers puzzles
++ Voici les derniers puzzles que vous avez résolus ou essayer de résoudres +
+
+
+ -
+ {#if user?.completionsList && user.completionsList.length > 0}
+ {#each user.completionsList as completion, key}
+
-
+ +++ {completion.puzzleName} +++++ + Essai{completion.tries > 1 ? 's' : ''} + + + {completion.tries} + +++ Score + + {completion.score} + ++
+ {/each}
+ {:else}
+
- + Aucun puzzles + + {/if} +
Mes badges
+Vos badges sont affichés ici, vous pouvez les partager avec vos amis
+
+ {#if user?.badges}
+ {#each user.badges as badge}
+
+ Aucun badge
+ {/if} +
+
+ Chaptires
++ Les chapitres sont les différentes parties du jeu. Chaque chapitre est composé de plusieurs + puzzles. +
+
+
+
+
+
+
+ {chapter.name}
+ +
+ {#if chapter.startDate && chapter.endDate}
+
+
+
+
+ {new Date(chapter.startDate).toLocaleDateString('fr-FR', {
+ day: 'numeric',
+ month: 'long',
+ year: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric'
+ })}{' '}
+ -{' '}
+ {new Date(chapter.endDate).toLocaleDateString('fr-FR', {
+ day: 'numeric',
+ month: 'long',
+ year: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric'
+ })}
+
+
+ {:else}
+
+
+
+ {/if}
+
+
+
+ -
+ {#each chapter.puzzles as puzzle}
+
+
diff --git a/src/routes/dashboard/leaderboard/+page.server.ts b/src/routes/dashboard/leaderboard/+page.server.ts
new file mode 100644
index 0000000..97a70d5
--- /dev/null
+++ b/src/routes/dashboard/leaderboard/+page.server.ts
@@ -0,0 +1,29 @@
+import { API_URL } from '$env/static/private';
+import type { LeaderboardEvent } from '$lib/types';
+
+import type { PageServerLoad } from './$types';
+
+export const load = (async ({ parent, fetch, cookies }) => {
+ await parent();
+
+ const session = cookies.get('session');
+
+ // TODO: change this
+ const res = await fetch(`${API_URL}/leaderboard/1`, {
+ headers: {
+ Authorization: `Bearer ${session}`
+ }
+ });
+
+ if (!res.ok) {
+ return {
+ leaderboard: {} as LeaderboardEvent
+ };
+ }
+
+ const leaderboard = (await res.json()) as LeaderboardEvent;
+
+ return {
+ leaderboard
+ };
+}) satisfies PageServerLoad;
diff --git a/src/routes/dashboard/leaderboard/+page.svelte b/src/routes/dashboard/leaderboard/+page.svelte
new file mode 100644
index 0000000..3f25b37
--- /dev/null
+++ b/src/routes/dashboard/leaderboard/+page.svelte
@@ -0,0 +1,72 @@
+
+
++ {puzzle.name} + ({puzzle.scoreMax} points) +
+ +
+ {@html marked(puzzle.content, options)}
+
+ {#if !puzzle.score}
+
+
+ {:else}
+
+
+ {/if}
+
+
+
+
+ + Tentative{puzzle.tries && puzzle.tries > 1 ? 's' : ''} :{' '} + {puzzle.tries} +
++ Score : {puzzle.score} +
+
+
+ Tableau des scores
+Suivez la progression des élèves en direct
+-
+ {#each groups as group}
+ {@const players = group.players.sort((a, b) => b.score - a.score)}
+ {@const last = players[players.length - 1]}
+
-
+ + + {group.rank} + +++++ {group.name} + + {#if players.length > 1} + {#each players as player} + {player.pseudo || 'Anonyme'}{#if player !== last}, {/if} + {' '} + {/each} + {:else} + {group.players[0].pseudo} + {/if} + +++++ Essai{group.players.reduce((a, b) => a + b.tries, 0) || 0 ? 's' : ''} + {group.players.reduce((a, b) => a + b.tries, 0) || 0} +++ Score + + {group.players.reduce((a, b) => a + b.score, 0)} + ++
+ {/each}
+
+
+ {/each}
+
+
+
+
+ {chapter.name}
+ +
+ {#if chapter.startDate && chapter.endDate}
+
+
+
+
+ {new Date(chapter.startDate).toLocaleDateString('fr-FR', {
+ day: 'numeric',
+ month: 'long',
+ year: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric'
+ })}{' '}
+ -{' '}
+ {new Date(chapter.endDate).toLocaleDateString('fr-FR', {
+ day: 'numeric',
+ month: 'long',
+ year: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric'
+ })}
+
+
+ {:else}
+
+
+
+ {/if}
+
+
+
+ -
+ {#each chapter.puzzles as puzzle}
+
+
diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/sign-up/+page.server.ts
new file mode 100644
index 0000000..df5acd9
--- /dev/null
+++ b/src/routes/sign-up/+page.server.ts
@@ -0,0 +1,86 @@
+import { redirect, type Actions, fail } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+import { API_URL } from '$env/static/private';
+
+import { z } from 'zod';
+
+export const load = (async ({ locals: { user } }) => {
+ if (user) throw redirect(303, '/dashboard');
+}) satisfies PageServerLoad;
+
+const schema = z.object({
+ email: z
+ .string()
+ .email({
+ message: 'Email invalide'
+ })
+ .trim(),
+ firstname: z.string().trim(),
+ lastname: z.string().trim(),
+ pseudo: z.string().trim(),
+ passwd: z.string(),
+ description: z.string().nullable(),
+ sgroup: z.string().nullable(),
+ avatar: z.string().nullable()
+});
+
+export const actions = {
+ default: async (event) => {
+ const data = await event.request.formData();
+
+ const parse = schema.safeParse(Object.fromEntries(data.entries()));
+
+ if (!parse.success) {
+ const errors = parse.error.errors.map((error) => {
+ const { path, message } = error;
+ return { field: path[0], message };
+ });
+ return fail(400, { errors });
+ }
+
+ const res = await fetch(`${API_URL}/register`, {
+ method: 'POST',
+ body: JSON.stringify({
+ ...parse.data
+ })
+ });
+
+ if (res.ok) {
+ const token = res.headers.get('Authorization')?.split(' ')[1];
+
+ if (!token) throw new Error('No token found');
+
+ event.cookies.set('session', token, {
+ path: '/'
+ });
+
+ throw redirect(303, '/dashboard');
+ }
+
+ if (res.status === 400) {
+ const { username_valid, email_valid } = await res.json();
+
+ const errors = [];
+
+ if (!username_valid) {
+ errors.push({
+ field: 'pseudo',
+ message: 'Ce pseudo est déjà utilisé'
+ });
+ }
+
+ if (!email_valid) {
+ errors.push({
+ field: 'email',
+ message: 'Cet email est déjà utilisé'
+ });
+ }
+
+ return fail(400, { errors });
+ }
+
+ return fail(400, {
+ errors: [{ field: 'passwd', message: "Une erreur s'est produite" }]
+ });
+ }
+} satisfies Actions;
diff --git a/src/routes/sign-up/+page.svelte b/src/routes/sign-up/+page.svelte
new file mode 100644
index 0000000..2dee1d5
--- /dev/null
+++ b/src/routes/sign-up/+page.svelte
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+ Connexion
+ +-
+
- + S'inscrire + + +
+
diff --git a/public/assets/brand/peerat.png b/static/assets/brand/peerat.png
similarity index 100%
rename from public/assets/brand/peerat.png
rename to static/assets/brand/peerat.png
diff --git a/public/assets/icons/android-chrome-192x192.png b/static/assets/icons/android-chrome-192x192.png
similarity index 100%
rename from public/assets/icons/android-chrome-192x192.png
rename to static/assets/icons/android-chrome-192x192.png
diff --git a/public/assets/icons/android-chrome-512x512.png b/static/assets/icons/android-chrome-512x512.png
similarity index 100%
rename from public/assets/icons/android-chrome-512x512.png
rename to static/assets/icons/android-chrome-512x512.png
diff --git a/public/assets/icons/apple-touch-icon.png b/static/assets/icons/apple-touch-icon.png
similarity index 100%
rename from public/assets/icons/apple-touch-icon.png
rename to static/assets/icons/apple-touch-icon.png
diff --git a/public/assets/icons/favicon-16x16.png b/static/assets/icons/favicon-16x16.png
similarity index 100%
rename from public/assets/icons/favicon-16x16.png
rename to static/assets/icons/favicon-16x16.png
diff --git a/public/assets/icons/favicon-32x32.png b/static/assets/icons/favicon-32x32.png
similarity index 100%
rename from public/assets/icons/favicon-32x32.png
rename to static/assets/icons/favicon-32x32.png
diff --git a/public/favicon.ico b/static/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to static/favicon.ico
diff --git a/static/fonts/FiraCode.woff2 b/static/fonts/FiraCode.woff2
new file mode 100644
index 0000000..c856e7b
Binary files /dev/null and b/static/fonts/FiraCode.woff2 differ
diff --git a/app/fonts/Karrik.woff2 b/static/fonts/Karrik.woff2
similarity index 100%
rename from app/fonts/Karrik.woff2
rename to static/fonts/Karrik.woff2
diff --git a/svelte.config.js b/svelte.config.js
new file mode 100644
index 0000000..2214c60
--- /dev/null
+++ b/svelte.config.js
@@ -0,0 +1,18 @@
+import adapter from '@sveltejs/adapter-node';
+import { vitePreprocess } from '@sveltejs/kit/vite';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+ // Consult https://kit.svelte.dev/docs/integrations#preprocessors
+ // for more information about preprocessors
+ preprocess: vitePreprocess(),
+
+ kit: {
+ // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
+ // If your environment is not supported or you settled on a specific environment, switch out the adapter.
+ // See https://kit.svelte.dev/docs/adapters for more information about adapters.
+ adapter: adapter()
+ }
+};
+
+export default config;
diff --git a/tailwind.config.js b/tailwind.config.js
index c64f960..a2d61d8 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,150 +1,117 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const defaultTheme = require('tailwindcss/defaultTheme');
+import { fontFamily } from 'tailwindcss/defaultTheme';
/** @type {import('tailwindcss').Config} */
-module.exports = {
- darkMode: ['class'],
- content: [
- './pages/**/*.{ts,tsx}',
- './components/**/*.{ts,tsx}',
- './app/**/*.{ts,tsx}',
- './src/**/*.{ts,tsx}'
- ],
- theme: {
- container: {
- center: true,
- padding: '2rem',
- screens: {
- '2xl': '1400px'
- }
- },
- extend: {
- fontFamily: {
- sans: ['var(--font-sans)', ...defaultTheme.fontFamily.sans],
- code: ['var(--font-code)', ...defaultTheme.fontFamily.serif]
- },
- colors: {
- border: 'hsl(var(--border))',
- input: 'hsl(var(--input))',
- ring: 'hsl(var(--ring))',
- background: 'hsl(var(--background))',
- foreground: 'hsl(var(--foreground))',
- primary: {
- DEFAULT: 'hsl(var(--primary))',
- foreground: 'hsl(var(--primary-foreground))'
- },
- secondary: {
- DEFAULT: 'hsl(var(--secondary))',
- foreground: 'hsl(var(--secondary-foreground))'
- },
- destructive: {
- DEFAULT: 'hsl(var(--destructive))',
- foreground: 'hsl(var(--destructive-foreground))'
- },
- muted: {
- DEFAULT: 'hsl(var(--muted))',
- foreground: 'hsl(var(--muted-foreground))'
- },
- accent: {
- DEFAULT: 'hsl(var(--accent))',
- foreground: 'hsl(var(--accent-foreground))'
- },
- popover: {
- DEFAULT: 'hsl(var(--popover))',
- foreground: 'hsl(var(--popover-foreground))'
- },
- card: {
- DEFAULT: 'hsl(var(--card))',
- foreground: 'hsl(var(--card-foreground))'
- },
- primary: {
- 900: 'hsl(258deg 15% 7%)',
- 800: 'hsl(258deg 15% 11%)',
- 700: 'hsl(258deg 15% 15%)',
- 600: 'hsl(258deg 15% 20%)',
- 500: 'hsl(258deg 15% 25%)',
- 400: 'hsl(258deg 14% 35%)',
- 300: 'hsl(258deg 13% 45%)',
- 200: 'hsl(258deg 13% 55%)',
- 100: 'hsl(258deg 10% 65%)',
- 50: 'hsl(258deg 8% 85%)',
- 0: 'hsl(258deg 8% 100%)'
- },
- brand: {
- DEFAULT: '#5049ca',
- accent: '#913fb6'
- },
- success: {
- DEFAULT: 'hsl(104deg 39% 59%)',
- secondary: '#b5e4ca',
- background: '#60a747'
- },
- info: {
- DEFAULT: 'hsl(258deg 78% 77%)',
- secondary: '#ccb8f9',
- background: '#9878de'
- },
- warning: {
- DEFAULT: 'hsl(39deg 100% 67%)',
- secondary: '#ffd88d',
- background: '#da9b34'
- },
- error: {
- DEFAULT: 'hsl(7deg 100% 67%)',
- secondary: '#ffbc99',
- background: '#cd4634'
- },
- highlight: {
- primary: 'hsl(258deg 15% 17%)',
- secondary: 'hsl(258deg 10% 46%)'
- }
- },
- backgroundColor: {
- primary: {
- DEFAULT: 'hsl(258deg 15% 7%)',
- 900: 'hsl(258deg 15% 7%)',
- 800: 'hsl(258deg 15% 11%)',
- 700: 'hsl(258deg 15% 15%)',
- 600: 'hsl(258deg 15% 20%)',
- 500: 'hsl(258deg 15% 25%)',
- 400: 'hsl(258deg 14% 35%)',
- 300: 'hsl(258deg 13% 45%)',
- 200: 'hsl(258deg 13% 55%)',
- 100: 'hsl(258deg 10% 65%)',
- 50: 'hsl(258deg 8% 85%)',
- 0: 'hsl(258deg 8% 100%)'
- },
- secondary: 'hsl(258deg 15% 11%)',
- tertiary: 'hsl(258deg 15% 17%)',
- contrast: '#4f5450'
- },
- textColor: {
- primary: 'hsl(258deg 8% 100%)',
- secondary: 'hsl(258deg 8% 84%)',
- tertiary: 'hsl(258deg 8% 65%)',
- secondaryAccent: '#e2e8f0',
- muted: 'hsl(258deg 7% 46%)'
- },
- borderRadius: {
- lg: 'var(--radius)',
- md: 'calc(var(--radius) - 2px)',
- sm: 'calc(var(--radius) - 4px)'
- },
- keyframes: {
- 'accordion-down': {
- from: { height: 0 },
- to: { height: 'var(--radix-accordion-content-height)' }
- },
- 'accordion-up': {
- from: { height: 'var(--radix-accordion-content-height)' },
- to: { height: 0 }
- }
- },
- animation: {
- 'accordion-down': 'accordion-down 0.2s ease-out',
- 'accordion-up': 'accordion-up 0.2s ease-out'
- }
- }
- },
- plugins: [require('tailwindcss-animate'), require('tailwindcss'), require('autoprefixer')]
+export default {
+ content: ['./src/**/*.{html,js,svelte,ts}'],
+ theme: {
+ extend: {
+ fontFamily: {
+ sans: ['Karrik', ...fontFamily.sans],
+ fira: ['Fira Code', ...fontFamily.sans]
+ },
+ colors: {
+ border: 'hsl(var(--border))',
+ input: 'hsl(var(--input))',
+ ring: 'hsl(var(--ring))',
+ background: 'hsl(var(--background))',
+ foreground: 'hsl(var(--foreground))',
+ // primary: {
+ // DEFAULT: 'hsl(var(--primary))',
+ // foreground: 'hsl(var(--primary-foreground))'
+ // },
+ secondary: {
+ DEFAULT: 'hsl(var(--secondary))',
+ foreground: 'hsl(var(--secondary-foreground))'
+ },
+ destructive: {
+ DEFAULT: 'hsl(var(--destructive))',
+ foreground: 'hsl(var(--destructive-foreground))'
+ },
+ muted: {
+ DEFAULT: 'hsl(var(--muted))',
+ foreground: 'hsl(var(--muted-foreground))'
+ },
+ accent: {
+ DEFAULT: 'hsl(var(--accent))',
+ foreground: 'hsl(var(--accent-foreground))'
+ },
+ popover: {
+ DEFAULT: 'hsl(var(--popover))',
+ foreground: 'hsl(var(--popover-foreground))'
+ },
+ card: {
+ DEFAULT: 'hsl(var(--card))',
+ foreground: 'hsl(var(--card-foreground))'
+ },
+ primary: {
+ 900: 'hsl(258deg 15% 7%)',
+ 800: 'hsl(258deg 15% 11%)',
+ 700: 'hsl(258deg 15% 15%)',
+ 600: 'hsl(258deg 15% 20%)',
+ 500: 'hsl(258deg 15% 25%)',
+ 400: 'hsl(258deg 14% 35%)',
+ 300: 'hsl(258deg 13% 45%)',
+ 200: 'hsl(258deg 13% 55%)',
+ 100: 'hsl(258deg 10% 65%)',
+ 50: 'hsl(258deg 8% 85%)',
+ 0: 'hsl(258deg 8% 100%)'
+ },
+ brand: {
+ DEFAULT: '#5049ca',
+ accent: '#913fb6'
+ },
+ success: {
+ DEFAULT: 'hsl(104deg 39% 59%)',
+ secondary: '#b5e4ca',
+ background: '#60a747'
+ },
+ info: {
+ DEFAULT: 'hsl(258deg 78% 77%)',
+ secondary: '#ccb8f9',
+ background: '#9878de'
+ },
+ warning: {
+ DEFAULT: 'hsl(39deg 100% 67%)',
+ secondary: '#ffd88d',
+ background: '#da9b34'
+ },
+ error: {
+ DEFAULT: 'hsl(7deg 100% 67%)',
+ secondary: '#ffbc99',
+ background: '#cd4634'
+ },
+ highlight: {
+ primary: 'hsl(258deg 15% 17%)',
+ secondary: 'hsl(258deg 10% 46%)'
+ }
+ },
+ backgroundColor: {
+ primary: {
+ DEFAULT: 'hsl(258deg 15% 7%)',
+ 900: 'hsl(258deg 15% 7%)',
+ 800: 'hsl(258deg 15% 11%)',
+ 700: 'hsl(258deg 15% 15%)',
+ 600: 'hsl(258deg 15% 20%)',
+ 500: 'hsl(258deg 15% 25%)',
+ 400: 'hsl(258deg 14% 35%)',
+ 300: 'hsl(258deg 13% 45%)',
+ 200: 'hsl(258deg 13% 55%)',
+ 100: 'hsl(258deg 10% 65%)',
+ 50: 'hsl(258deg 8% 85%)',
+ 0: 'hsl(258deg 8% 100%)'
+ },
+ secondary: 'hsl(258deg 15% 11%)',
+ tertiary: 'hsl(258deg 15% 17%)',
+ contrast: '#4f5450'
+ },
+ textColor: {
+ primary: 'hsl(258deg 8% 100%)',
+ secondary: 'hsl(258deg 8% 84%)',
+ tertiary: 'hsl(258deg 8% 65%)',
+ secondaryAccent: '#e2e8f0',
+ muted: 'hsl(258deg 7% 46%)'
+ }
+ }
+ },
+ plugins: []
};
diff --git a/tests/index.test.ts b/tests/index.test.ts
new file mode 100644
index 0000000..bd67bfd
--- /dev/null
+++ b/tests/index.test.ts
@@ -0,0 +1,51 @@
+import { expect, test } from '@playwright/test';
+
+test('index page redirects to login page', async ({ page }) => {
+ await page.goto('/');
+
+ await page.waitForURL('/sign-in');
+
+ await expect(page.url()).toContain('/sign-in');
+});
+
+test('sign-in page has a sign-up link that redirects to the sign-up page', async ({ page }) => {
+ await page.goto('/sign-in');
+
+ const link = await page.$('a[href*="/sign-up"]');
+
+ await link?.click();
+
+ await page.waitForURL('/sign-up');
+
+ await expect(page.url()).toContain('/sign-up');
+});
+
+test('sign-up page has a sign-in link that redirects to the sign-in page', async ({ page }) => {
+ await page.goto('/sign-up');
+
+ const link = await page.$('a[href*="/sign-in"]');
+
+ await link?.click();
+
+ await page.waitForURL('/sign-in');
+
+ await expect(page.url()).toContain('/sign-in');
+});
+
+test('dashboard page redirects to sign-in page if user is not logged in', async ({ page }) => {
+ await page.goto('/dashboard');
+ await expect(page.url()).toContain('/sign-in');
+});
+
+test('login form accepts valid credentials', async ({ page }) => {
+ await page.context().clearCookies();
+
+ await page.goto('/sign-in');
+
+ await page.fill('input[name="pseudo"]', 'glazk0');
+ await page.fill('input[name="passwd"]', 'Cookies Are #Miam42');
+
+ await Promise.all([page.getByRole('button').click(), page.waitForURL('/dashboard')]);
+
+ await expect(page.url()).toContain('/dashboard');
+});
diff --git a/tsconfig.json b/tsconfig.json
index 8eac0d6..6ae0c8c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,30 +1,17 @@
{
- "compilerOptions": {
- "target": "es5",
- "lib": ["dom", "dom.iterable", "esnext"],
- "allowJs": true,
- "skipLibCheck": true,
- "strict": true,
- "forceConsistentCasingInFileNames": true,
- "noEmit": true,
- "esModuleInterop": true,
- "module": "esnext",
- "moduleResolution": "node",
- "resolveJsonModule": true,
- "isolatedModules": true,
- "jsx": "preserve",
- "incremental": true,
- "downlevelIteration": true,
- "plugins": [
- {
- "name": "next"
- }
- ],
- "baseUrl": ".",
- "paths": {
- "@/*": ["./*"]
- }
- },
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
+ "extends": "./.svelte-kit/tsconfig.json",
+ "compilerOptions": {
+ "allowJs": true,
+ "checkJs": true,
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "sourceMap": true,
+ "strict": true
+ }
+ // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
+ //
+ // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
+ // from the referenced tsconfig.json - TypeScript does not merge them in
}
diff --git a/vite.config.ts b/vite.config.ts
new file mode 100644
index 0000000..37b6a84
--- /dev/null
+++ b/vite.config.ts
@@ -0,0 +1,9 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+ plugins: [sveltekit()],
+ test: {
+ include: ['src/**/*.{test,spec}.{js,ts}']
+ }
+});
+
+
+
+ Inscription
+ +-
+
- + Se connecter + +