Merge branch 'main' of https://github.com/cepdnaclk/e19-3yp-impact-tr…

…acker
cepdnaclk · Jan 25, 2024 · 00dbd59 · 00dbd59
2 parents bc83be6 + a3c6106
commit 00dbd59
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/code/client/impax/src/components/PlayerManagement/PlayerManagement.tsx b/code/client/impax/src/components/PlayerManagement/PlayerManagement.tsx
@@ -173,7 +173,12 @@ const PlayerManagement = () => {
     const responseData = await response.json();
     if (response.ok) {
       console.log("response OK", responseData);
-      addPlayer(data.jersey_number, data.name, data.email);
+      addPlayer(
+        data.jersey_number,
+        data.name,
+        data.email,
+        responseData.isVerified
+      );
     }
 
     reset();

diff --git a/code/client/impax/src/services/httpClient.ts b/code/client/impax/src/services/httpClient.ts
@@ -47,7 +47,7 @@ export const getPlayers = async () => {
       },
     });
     const playersData: Players = await playersResponse.json();
-
+    console.log(playersData);
     updatePlayersDetails(playersData);
   } catch (error) {
     console.log(error);

diff --git a/code/client/impax/src/states/appState.ts b/code/client/impax/src/states/appState.ts
@@ -15,6 +15,7 @@ import {
 import { players } from "../data/players";
 import { deleteByValue } from "../utils/utils";
 import MqttClient from "../services/mqttClient";
+import { Verification, Verification } from "../components/PlayerManagement/PlayersTable/Verification/Verification";
 
 interface AppState {
   activePage: activePage;
@@ -42,7 +43,8 @@ interface AppState {
   addPlayer: (
     jersey_number: number,
     player_name: string,
-    player_email: string
+    player_email: string,
+    Verification:Verification
   ) => void;
   removePlayer: (player_id: number) => void;
   editPlayer: (
@@ -105,7 +107,7 @@ export const useAppState = create<AppState>()((set) => ({
   playersImpactHistory: {} as PlayerImpactHistory,
 
   //TODO: Clashing of players with other dashbaords
-  playerDetails: players,
+  playerDetails: {} as Players,
   setPlayerDetails: (players: Players) => {
     set({ playerDetails: players });
     const timestamp = new Date().getTime();
@@ -156,15 +158,16 @@ export const useAppState = create<AppState>()((set) => ({
   addPlayer: (
     jersey_number: number,
     player_name: string,
-    player_email: string
+    player_email: string,
+    verification:Verification
   ) =>
     set((prevState) => {
       const playerDetails = {
         ...prevState.playerDetails,
         [jersey_number]: {
           name: player_name,
           email: player_email,
-          verification: "pending" as Verification,
+          verification: verification,
         },
       };