From e6563f2da56ea154cfc9d39003468a74c9d11c62 Mon Sep 17 00:00:00 2001
From: Quentin Roussel <contact@quentinrsl.com>
Date: Tue, 26 Mar 2024 14:35:10 +0100
Subject: [PATCH] fixed udpate position functionnality

---
 traque-back/game.js                           |  6 -----
 traque-back/index.js                          | 17 ++++++++----
 traque-front/app/team/track/page.js           | 10 ++++---
 traque-front/components/team/map.jsx          |  2 +-
 traque-front/components/util/button.jsx       |  2 +-
 .../context/adminConnexionContext.jsx         | 12 +++++++--
 traque-front/hook/useGame.jsx                 |  2 +-
 traque-front/hook/useLocalStorage.jsx         | 27 +++++++++++++++++++
 8 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 traque-front/hook/useLocalStorage.jsx

diff --git a/traque-back/game.js b/traque-back/game.js
index 2011d97..ff7c370 100644
--- a/traque-back/game.js
+++ b/traque-back/game.js
@@ -69,9 +69,6 @@ export default class Game {
     }
 
     updateLocation(teamId, location) {
-        if(!this.started) {
-            return false;
-        }
         let team = this.getTeam(teamId);
         if(team == undefined) {
             return false;
@@ -81,9 +78,6 @@ export default class Game {
     }
 
     sendLocation(teamId) {
-        if(!this.started) {
-            return false;
-        }
         let team = this.getTeam(teamId);
         if(team == undefined) {
             return false;
diff --git a/traque-back/index.js b/traque-back/index.js
index af0ae89..57622be 100644
--- a/traque-back/index.js
+++ b/traque-back/index.js
@@ -163,12 +163,13 @@ io.of("player").on("connection", (socket) => {
     }
   });
 
-  socket.on("login", (teamId) => {
-    if(game.getTeam(teamId) === undefined) {
+  socket.on("login", (loginTeamId) => {
+    if(game.getTeam(loginTeamId) === undefined) {
       socket.emit("login_response", false);
       return;
     }
-    game.getTeam(teamId).sockets.push(socket.id);
+    teamId = loginTeamId;
+    game.getTeam(loginTeamId).sockets.push(socket.id);
     socket.emit("login_response", true);
   });
 
@@ -178,8 +179,14 @@ io.of("player").on("connection", (socket) => {
   
   socket.on("send_position", () => {
     game.sendLocation(teamId);
-    game.getTeam(teamId).sockets.forEach(s => {
-      io.of("player").to(s).emit("enemy_position", game.getTeam(teamId).enemyLocation);
+    let team = game.getTeam(teamId);
+    if(team === undefined) {
+      socket.emit("error", "Team not found");
+      return;
+    }
+    game.updateTeamChasing();
+    team.sockets.forEach(s => {
+      io.of("player").to(s).emit("enemy_position", team.enemyLocation);
     });
   });
 });
diff --git a/traque-front/app/team/track/page.js b/traque-front/app/team/track/page.js
index 8f6bf3b..df90b3a 100644
--- a/traque-front/app/team/track/page.js
+++ b/traque-front/app/team/track/page.js
@@ -20,9 +20,13 @@ export default function Track() {
 
 
     return (
-        <div className='h-full flex flex-col justify-between'>
-            <LiveMap currentPosition={currentPosition} enemyPosition={enemyPosition} className="h-4/5" />
-            <Button onClick={sendCurrentPosition}>Update position</Button>
+        <div className='h-full flex flex-col justify-between justify-items-stretch'>
+            <div className='h-5/6'>
+                <LiveMap currentPosition={currentPosition} enemyPosition={enemyPosition}/>
+            </div>
+            <div className="h-1/6">
+                <Button onClick={sendCurrentPosition}>Update position</Button>
+            </div>
             <div className='shadow-lg m-5 p-2 flex flex-col text-center mx-auto w-4/5 rounded'>
                 <p className='text-xl text-black'>30min</p>
                 <p className='text-gray-700'> before penalty</p>
diff --git a/traque-front/components/team/map.jsx b/traque-front/components/team/map.jsx
index 085167d..9b98f75 100644
--- a/traque-front/components/team/map.jsx
+++ b/traque-front/components/team/map.jsx
@@ -26,7 +26,7 @@ function MapPan(props) {
 export default function LiveMap({enemyPosition, currentPosition, ...props}) {
 
     return (
-        <MapContainer  {...props} center={[0,0]} zoom={0} scrollWheelZoom={true}>
+        <MapContainer  {...props} className='min-h-full' center={[0,0]} zoom={0} scrollWheelZoom={true}>
             <TileLayer
                 attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
                 url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
diff --git a/traque-front/components/util/button.jsx b/traque-front/components/util/button.jsx
index 3678a84..ece3ee0 100644
--- a/traque-front/components/util/button.jsx
+++ b/traque-front/components/util/button.jsx
@@ -1,5 +1,5 @@
 export default function Button({ children, ...props }) {
-    return (<button {...props} className="bg-blue-600 hover:bg-blue-500 ease-out duration-200 text-white w-full p-4 shadow-sm rounded">
+    return (<button {...props} className="bg-blue-600 hover:bg-blue-500 ease-out duration-200 text-white w-full h-full p-4 shadow-sm rounded">
         {children}
     </button>)
 }
\ No newline at end of file
diff --git a/traque-front/context/adminConnexionContext.jsx b/traque-front/context/adminConnexionContext.jsx
index 506c049..d2949ad 100644
--- a/traque-front/context/adminConnexionContext.jsx
+++ b/traque-front/context/adminConnexionContext.jsx
@@ -1,15 +1,23 @@
 "use client";
-import { createContext, useContext, useMemo, useState } from "react";
+import { createContext, useContext, useEffect, useMemo, useState } from "react";
 import { useSocket } from "./socketContext";
 import { useSocketListener } from "@/hook/useSocketListener";
+import { useLocalStorage } from "@/hook/useLocalStorage";
 
 const adminContext = createContext();
 const AdminConnexionProvider = ({ children }) => {
     const [loggedIn, setLoggedIn] = useState(false);
+    const [savedPassword, setSavedPassword] = useLocalStorage("admin_password", null);
     const { adminSocket } = useSocket();
 
+    useEffect(() => {
+        if (savedPassword && !loggedIn) {
+            adminSocket.emit("login", savedPassword);
+        }
+    }, [savedPassword]);
+
     function login(password) {
-        adminSocket.emit("login", password);
+        setSavedPassword(password)
     }
 
     useSocketListener(adminSocket, "login_response", setLoggedIn);
diff --git a/traque-front/hook/useGame.jsx b/traque-front/hook/useGame.jsx
index 67fe9ef..b9e200b 100644
--- a/traque-front/hook/useGame.jsx
+++ b/traque-front/hook/useGame.jsx
@@ -10,7 +10,7 @@ export default function useGame() {
     const {currentPosition, enemyPosition} = useTeamContext();
 
     function sendCurrentPosition() {
-        teamSocket.emit("send_position", currentPosition);
+        teamSocket.emit("send_position");
     }
 
     return { sendCurrentPosition, login, enemyPosition, currentPosition, loggedIn, teamId };
diff --git a/traque-front/hook/useLocalStorage.jsx b/traque-front/hook/useLocalStorage.jsx
new file mode 100644
index 0000000..103da22
--- /dev/null
+++ b/traque-front/hook/useLocalStorage.jsx
@@ -0,0 +1,27 @@
+"use client";
+import { useEffect, useState } from "react";
+
+export function useLocalStorage(key, initialValue) {
+    const [storedValue, setStoredValue] = useState(initialValue);
+
+    useEffect(() => {
+        try {
+            const item = window.localStorage.getItem(key);
+            setStoredValue(item ? JSON.parse(item) : initialValue);
+        } catch (error) {
+            console.log(error);
+        }
+    }, []);
+
+    const setValue = value => {
+        try {
+            const valueToStore = value instanceof Function ? value(storedValue) : value;
+            setStoredValue(valueToStore);
+            window.localStorage.setItem(key, JSON.stringify(valueToStore));
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    return [storedValue, setValue];
+}
\ No newline at end of file