-
-
{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}
+
+
+ {data?.groups.map((group, key) => {
+ const tries = group.players.reduce((a, b) => a + b.tries, 0) || 0;
+ const puzzles = group.players.reduce((a, b) => a + b.completion, 0) || 0;
+ return (
+
+
+
+ {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)}
-
-
- Essai{tries > 1 ? 's' : ''}
- {tries}
-
- {/*
- Puzzles
-
- {group.players.reduce((a, b) => a + b.completion, 0)}
-
-
*/}
-
- Score
-
- {group.players.reduce((a, b) => a + b.score, 0)}
-
-
-
-
- );
- }) ||
- [...Array(20).keys()].map((i) => (
-
- ))}
-
+
+ );
+ }) ||
+ [...Array(20).keys()].map((i) => (
+
+ ))}
+
+
);
diff --git a/ui/Puzzle.tsx b/ui/Puzzle.tsx
index 745a4b2..53632ca 100644
--- a/ui/Puzzle.tsx
+++ b/ui/Puzzle.tsx
@@ -2,16 +2,17 @@
import cookies from 'js-cookie';
import { notFound, useRouter } from 'next/navigation';
-import { useState } from 'react';
+import { useContext, useState } from 'react';
import { useForm } from 'react-hook-form';
import { useSWRConfig } from 'swr';
import { usePuzzle } from '@/lib/hooks/use-puzzles';
+import { UserContext } from '@/context/user';
+import { getURL } from '@/lib/utils';
import Button from './Button';
import Input from './Input';
import ToHTML from './ToHTML';
-import { getURL } from '@/lib/utils';
type PuzzleData = {
answer: string;
@@ -27,6 +28,7 @@ type Granted = {
};
export default function Puzzle({ token, id }: { token: string; id: number }) {
+ const { data: me } = useContext(UserContext);
const [granted, setGranted] = useState
(null);
const { data: puzzle, isLoading } = usePuzzle({ token, id });
const { mutate } = useSWRConfig();
@@ -81,6 +83,11 @@ export default function Puzzle({ token, id }: { token: string; id: number }) {
notFound();
}
+ // TODO : add a check to see if the user is in the group of the puzzle
+ if (me?.groups.length === 0) {
+ router.push('/dashboard/puzzles');
+ }
+
return (
diff --git a/ui/Timer.tsx b/ui/Timer.tsx
index fb0a181..8e35b47 100644
--- a/ui/Timer.tsx
+++ b/ui/Timer.tsx
@@ -1,5 +1,7 @@
import clsx from 'clsx';
import { useEffect, useReducer } from 'react';
+import { useWindowSize } from 'react-use';
+import Confetti from 'react-confetti';
type State = {
hours: number;
@@ -22,6 +24,8 @@ function reducer(state: State, action: Action): State {
}
export function Timer({ targetDate, className }: { targetDate: Date; className?: string }) {
+ const { width, height } = useWindowSize();
+
const [timeRemaining, dispatch] = useReducer(reducer, {
hours: 0,
minutes: 0,
@@ -46,7 +50,12 @@ export function Timer({ targetDate, className }: { targetDate: Date; className?:
}, [targetDate]);
if (timeRemaining.hours < 0) {
- return Terminé;
+ return (
+ <>
+
+ Terminé
+
+ );
}
return (
diff --git a/ui/dashboard/Usernav.tsx b/ui/dashboard/Usernav.tsx
index 5252420..d4554d3 100644
--- a/ui/dashboard/Usernav.tsx
+++ b/ui/dashboard/Usernav.tsx
@@ -2,7 +2,6 @@
import { UserContext } from '@/context/user';
import { titleCase } from '@/lib/utils';
-import cookies from 'js-cookie';
import { useRouter, useSelectedLayoutSegment } from 'next/navigation';
import { useContext, useEffect, useState } from 'react';
import AvatarComponent from '../Avatar';
@@ -22,11 +21,6 @@ export default function Usernav({ isOpen, toggle }: { isOpen: boolean; toggle: (
}
}, [isOpen]);
- async function handleLogout() {
- cookies.remove('token');
- router.replace('/');
- }
-
return (
@@ -56,7 +50,7 @@ export default function Usernav({ isOpen, toggle }: { isOpen: boolean; toggle: (