From 10bfd640aa16d98e9bbcb3b65973eb6119bf60fc Mon Sep 17 00:00:00 2001
From: Pierre Ferreira <p.ferreira1@outlook.fr>
Date: Mon, 13 Nov 2023 10:49:34 +0100
Subject: [PATCH] ajout d'un theme global pour toutes les couleurs primaire,
 secondaire et quelque texte principaux :lipstick:

---
 cryptide_project/src/Pages/InGame.tsx | 1 +
 cryptide_project/src/Pages/Lobby.tsx  | 6 +++++-
 cryptide_project/src/Pages/Play.tsx   | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx
index ce87883..beb246b 100644
--- a/cryptide_project/src/Pages/InGame.tsx
+++ b/cryptide_project/src/Pages/InGame.tsx
@@ -31,6 +31,7 @@ import Stub from '../source/Stub';
 import { HiLanguage } from 'react-icons/hi2';
 import { Nav, NavDropdown } from 'react-bootstrap';
 import { FormattedMessage } from 'react-intl';
+import Color from '../source/Color';
 
 //@ts-ignore
 const InGame = ({locale, changeLocale}) => {
diff --git a/cryptide_project/src/Pages/Lobby.tsx b/cryptide_project/src/Pages/Lobby.tsx
index 1422553..12c389a 100644
--- a/cryptide_project/src/Pages/Lobby.tsx
+++ b/cryptide_project/src/Pages/Lobby.tsx
@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import './Lobby.css';
-import PlayerItemList from '../Components/PlayerItemList'
+import { useTheme } from '../Style/ThemeContext';
+
+/* res */
 import PersonImg from '../res/img/Person.png';
 import Bot from '../res/img/bot.png';
 import param from '../res/icon/param.png';
@@ -22,9 +24,11 @@ import { random } from 'lodash';
 import Player from '../model/Player';
 
 
+import PlayerItemList from '../Components/PlayerItemList'
 
 function Lobby() {
     const navigate = useNavigate();
+    const theme = useTheme()
 
 
     const { indices, setIndicesData, indice, setIndiceData, person, setPersonData, personNetwork, setPersonNetworkData, players, setPlayersData, setActualPlayerIndexData, setRoomData } = useGame();
diff --git a/cryptide_project/src/Pages/Play.tsx b/cryptide_project/src/Pages/Play.tsx
index 2830629..14bb656 100644
--- a/cryptide_project/src/Pages/Play.tsx
+++ b/cryptide_project/src/Pages/Play.tsx
@@ -22,6 +22,7 @@ import { useNavigate } from 'react-router-dom';
 
 
 function Play() {
+<<<<<<< HEAD
 
     const [room, setRoom] = useState(null);
     const navigate = useNavigate();
@@ -56,6 +57,9 @@ function Play() {
 
 
 
+=======
+    const theme=useTheme()
+>>>>>>> faf141d (ajout d'un theme global pour toutes les couleurs primaire, secondaire et quelque texte principaux :lipstick:)
     return (
 
         <div className="MainContainer">