-
-
- Equipe : {name}
-
-
- {gameSettings?.waitingMessage}
-
-
-
Uploadez une photo où tous les membres de l'équipe sont visibles
-
-
- Envoyer
-
-
- {teamId &&
import('./components/map').then((mod) => mod.LiveMap), {
- ssr: false
-});
-const PlacementMap = dynamic(() => import('./components/map').then((mod) => mod.PlacementMap), {
- ssr: false
-});
-
-export default function Track() {
- const { gameState, captured } = useGame();
- const { gameSettings} = useTeamContext()
- const { useProtect } = useTeamConnexion();
- const { teamSocket: socket } = useSocket();
- useProtect();
- return <>
-
- {gameState == GameState.SETUP &&
}
- {gameState == GameState.PLAYING && !captured &&
- }
- {gameState == GameState.PLAYING && captured &&
-
Vous avez été capturé
-
{gameSettings?.capturedMessage}
-
}
- {gameState == GameState.PLACEMENT &&
-
- }
- {gameState == GameState.FINISHED &&
-
-
Partie terminée
- {captured &&
{gameSettings?.loserEndGameMessage}
}
- {!captured &&
{gameSettings?.winnerEndGameMessage}
}
-
- }
-
-}
diff --git a/traque-front/components/button.jsx b/traque-front/components/button.jsx
index c4b8307..2d4f279 100644
--- a/traque-front/components/button.jsx
+++ b/traque-front/components/button.jsx
@@ -1,5 +1,3 @@
-import { useTeamConnexion } from "@/context/teamConnexionContext";
-
export function BlueButton({ children, ...props }) {
return (
)
}
-
-export function LogoutButton() {
- const { logout } = useTeamConnexion();
- return
-}
diff --git a/traque-front/context/socketContext.jsx b/traque-front/context/socketContext.jsx
index 7413ed5..4b55452 100644
--- a/traque-front/context/socketContext.jsx
+++ b/traque-front/context/socketContext.jsx
@@ -5,13 +5,8 @@ import { io } from 'socket.io-client';
const NEXT_PUBLIC_SOCKET_HOST = env("NEXT_PUBLIC_SOCKET_HOST");
const SOCKET_URL = (NEXT_PUBLIC_SOCKET_HOST == "localhost" ? "ws://" : "wss://") + NEXT_PUBLIC_SOCKET_HOST;
-const USER_SOCKET_URL = SOCKET_URL + "/player";
const ADMIN_SOCKET_URL = SOCKET_URL + "/admin";
-export const teamSocket = io(USER_SOCKET_URL, {
- path: "/back/socket.io",
-});
-
export const adminSocket = io(ADMIN_SOCKET_URL, {
path: "/back/socket.io",
});
@@ -19,7 +14,8 @@ export const adminSocket = io(ADMIN_SOCKET_URL, {
export const SocketContext = createContext();
export default function SocketProvider({ children }) {
- const value = useMemo(() => ({ teamSocket, adminSocket }), [teamSocket, adminSocket]);
+ const value = useMemo(() => ({ adminSocket }), [adminSocket]);
+
return (
{children}
);
diff --git a/traque-front/context/teamConnexionContext.jsx b/traque-front/context/teamConnexionContext.jsx
deleted file mode 100644
index 09be1c6..0000000
--- a/traque-front/context/teamConnexionContext.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-"use client";
-import { createContext, useContext, useMemo } from "react";
-import { useSocket } from "./socketContext";
-import useSocketAuth from "@/hook/useSocketAuth";
-import usePasswordProtect from "@/hook/usePasswordProtect";
-
-const teamConnexionContext = createContext();
-
-export function TeamConnexionProvider({ children }) {
- const { teamSocket } = useSocket();
- const { login, password: teamId, loggedIn, loading, logout } = useSocketAuth(teamSocket, "team_password");
- const useProtect = () => usePasswordProtect("/team", "/team/track", loading, loggedIn);
-
- const value = useMemo(() => ({ teamId, login, logout, loggedIn, loading, useProtect}), [teamId, login, loggedIn, loading]);
-
- return (
-
- {children}
-
- );
-}
-
-export function useTeamConnexion() {
- return useContext(teamConnexionContext);
-}
diff --git a/traque-front/context/teamContext.jsx b/traque-front/context/teamContext.jsx
deleted file mode 100644
index 30af732..0000000
--- a/traque-front/context/teamContext.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-"use client";
-import useLocation from "@/hook/useLocation";
-import useSocketListener from "@/hook/useSocketListener";
-import { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
-import { useSocket } from "./socketContext";
-import { useTeamConnexion } from "./teamConnexionContext";
-import { GameState } from "@/util/gameState";
-
-const teamContext = createContext();
-
-export function TeamProvider({children}) {
- const [teamInfos, setTeamInfos] = useState({});
- const [gameState, setGameState] = useState(GameState.SETUP);
- const [gameSettings, setGameSettings] = useState(null);
- const [zone, setZone] = useState(null);
- const [zoneExtremities, setZoneExtremities] = useState(null);
- const measuredLocation = useLocation(5000);
- const {teamSocket} = useSocket();
- const {loggedIn} = useTeamConnexion();
- const teamInfosRef = useRef();
-
- teamInfosRef.current = teamInfos;
-
- useSocketListener(teamSocket, "update_team", (newTeamInfos) => setTeamInfos({...teamInfosRef.current, ...newTeamInfos}) );
- useSocketListener(teamSocket, "game_state", setGameState);
- useSocketListener(teamSocket, "zone", setZone);
- useSocketListener(teamSocket, "new_zone", setZoneExtremities);
- useSocketListener(teamSocket, "game_settings", setGameSettings);
-
- //Send the current position to the server when the user is logged in
- useEffect(() => {
- console.log("sending position", measuredLocation);
- if(loggedIn) {
- teamSocket.emit("update_position", measuredLocation);
- }
- }, [loggedIn, measuredLocation]);
-
- const value = useMemo(() => ({teamInfos, gameState, zone, zoneExtremities, gameSettings}), [gameSettings, teamInfos, gameState, zone, zoneExtremities]);
- return (
-
- {children}
-
- );
-}
-
-export function useTeamContext() {
- return useContext(teamContext);
-}
diff --git a/traque-front/hook/useGame.jsx b/traque-front/hook/useGame.jsx
deleted file mode 100644
index a6b3831..0000000
--- a/traque-front/hook/useGame.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-"use client";
-import { useSocket } from "@/context/socketContext";
-import { useTeamConnexion } from "@/context/teamConnexionContext";
-import { useTeamContext } from "@/context/teamContext";
-
-export default function useGame() {
- const { teamSocket } = useSocket();
- const { teamId } = useTeamConnexion();
- const { teamInfos, gameState } = useTeamContext();
-
- function sendCurrentPosition() {
- teamSocket.emit("send_position");
- }
-
- function capture(captureCode) {
- teamSocket.emit("capture", captureCode);
- }
-
- return {...teamInfos, sendCurrentPosition, capture, teamId, gameState};
-}
diff --git a/traque-front/next.config.mjs b/traque-front/next.config.mjs
index f75af37..1068432 100644
--- a/traque-front/next.config.mjs
+++ b/traque-front/next.config.mjs
@@ -1,4 +1,5 @@
/** @type {import('next').NextConfig} */
+
const nextConfig = {
output: 'standalone',
@@ -7,14 +8,12 @@ const nextConfig = {
return [
{
source: '/',
- destination: '/team',
- permanent: true,
+ destination: '/admin',
+ permanent: true, // The browser will save the redirect in its cache, empty the cache to change the redirect
},
]
},
};
-
-
export default nextConfig;
setVisible(!visible)} />
- {visible &&