Merge branch 'master' of https://codefirst.iut.uca.fr/git/Crypteam/Cryptid into deduc2

.drone.yml

@@ -47,7 +47,7 @@ steps:
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
     environment:
-       REACT_APP_BASE_PATH: "/containers/Crypteam-website"
+       BASEPATH: "/containers/Crypteam-website"
     #depends_on: [ build ]
       
 

cryptide_project/Dockerfile

@@ -30,3 +30,4 @@ EXPOSE 80
 
 # Définissez ENTRYPOINT pour démarrer Nginx lorsque le conteneur est lancé
 ENTRYPOINT ["nginx", "-g", "daemon off;"]
+#

cryptide_project/src/App.tsx

@@ -41,10 +41,10 @@ import messagesEn from './Translations/en.json';
 /* Gestion d' erreur */
 import ErrorBoundary from './Error/ErrorBoundary';
 import ErrorPage from './Error/ErrorPage';
-
-const basePath = process.env.REACT_APP_BASE_PATH || '';
 import DeducCheck from './Pages/DeducCheck';
 
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
+
 const messages = {
   fr: messagesFr,
   en: messagesEn,

cryptide_project/src/Components/GraphContainer.tsx

@@ -67,8 +67,7 @@ let cptBug = 0
 let cptUseEffect = 0
 let testPlayers: Player[] = []
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, handleTurnBarTextChange, playerTouched, setPlayerTouched, changecptTour, solo, isDaily, isEasy, addToHistory, showLast, setNetwork, setNetworkEnigme, setPlayerIndex, askedWrong, setAskedWrong, importToPdf, setImportToPdf}) => {
   let cptTour: number = 0
@@ -1020,7 +1019,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
                     catch(error){
                       console.log(error);
                     }
-                    navigate(`${basePath}/endgame?solo=true+${isDaily}`)
+                    navigate(`${basePath}/endgame?solo=true&daily=${isDaily}`)
                   }
                   
                 }

cryptide_project/src/Components/LobbyContainer.tsx

@@ -20,7 +20,7 @@ interface LobbyContainerProps {
     //? mettre un "nbplayermax" si le nombre de joueur max peut etre fixé ?
 }
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 const LobbyContainer: React.FC<LobbyContainerProps> = ({roomNum, HeadPlayer, nbPlayer, setFirst, started}) => {
     const theme=useTheme();

cryptide_project/src/Components/NavBar.tsx

@@ -25,8 +25,7 @@ import { useTheme } from '../Style/ThemeContext';
 import { useAuth } from '../Contexts/AuthContext';
 import { useNavigate } from 'react-router-dom';
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 // @ts-ignore
 function AppNavbar({changeLocale}) {
@@ -53,13 +52,13 @@ function AppNavbar({changeLocale}) {
                 <Navbar.Toggle aria-controls="basic-navbar-nav" />
                 <Navbar.Collapse id="basic-navbar-nav">
                     <Nav className="me-auto">
-                        <Nav.Link href="/" style={{ color: theme.colors.text }}>
+                        <Nav.Link href={`${basePath}/`} style={{ color: theme.colors.text }}>
                             Jouer
                         </Nav.Link>
-                        <Nav.Link href="/presentation" style={{ color: theme.colors.text }}>
+                        <Nav.Link href={`${basePath}/presentation`} style={{ color: theme.colors.text }}>
                             Présentation
                         </Nav.Link>
-                        <Nav.Link href="/info" style={{ color: theme.colors.text }}>
+                        <Nav.Link href={`${basePath}/info`} style={{ color: theme.colors.text }}>
                             Info
                         </Nav.Link>
                     </Nav>

cryptide_project/src/Error/ErrorPage.tsx

@@ -6,8 +6,7 @@ import './ErrorStyle.css';
 import { FormattedMessage } from 'react-intl';
 import { Button } from 'react-bootstrap';
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 //@ts-ignore
 function ErrorPage({ code = "", msg = "Something is wrong"}) {

cryptide_project/src/Pages/Home.tsx

@@ -13,6 +13,9 @@ import { socket } from '../SocketConfig';
 import JSONParser from '../JSONParser';
 
 
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
+
+
 // @ts-ignore
 function Home() {
     const theme=useTheme();
@@ -100,7 +103,7 @@ function Home() {
             {/* <h3> <u><FormattedMessage id="game.illustratedBy"/></u><br/> Kwanchai Moriya</h3> */}
             {/* <button>Jouer au jeu</button> */}
             <br/>
-            <Link to="/play" className='button' 
+            <Link to={`${basePath}/`} className='button' 
                 style={{ 
                     backgroundColor: theme.colors.primary,
                     borderColor: theme.colors.secondary

cryptide_project/src/Pages/InGame.css

@@ -137,21 +137,43 @@
 
 /** Historique*/
 
-.historique{
+.historique {
     position: absolute;
     z-index: 1;
     bottom: 2%;
     left: 2%;
-
     display: flex;
     flex-direction: column;
-    /* justify-content: end; */
-
     padding: 15px 25px;
-    background-color: #d9d9d9;
-    border-radius: 15px;
-
+    border: solid;
+    border-width: 0.5px 0.5px 5px 0.5px;
+    border-color: whitesmoke lightgray gray whitesmoke;
+    border-radius: 0 5% 15px 0;
     height: 250px;
     width: 20%;
-    overflow-y:auto;
+
+    direction: rtl;
+    overflow-y: auto;
+}
+
+.historique div{
+    direction: ltr;
+}
+
+
+.historique::-webkit-scrollbar {
+    width: 10px;
+}
+
+.historique::-webkit-scrollbar-thumb {
+    background-color: lightgray;
+    border-radius: 5px;
+}
+
+.historique::-webkit-scrollbar-track {
+    background-color: whitesmoke;
+}
+
+.historique::-webkit-scrollbar-corner {
+    background-color: whitesmoke;
 }

cryptide_project/src/Pages/InGame.tsx

@@ -52,7 +52,7 @@ import Indice from '../model/Indices/Indice';
 
 let cptNavigation = 0
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 //@ts-ignore
 const InGame = ({locale, changeLocale}) => {
@@ -68,7 +68,7 @@ const InGame = ({locale, changeLocale}) => {
     if (cptNavigation % 2 == 0){
         if (navigationType.toString() == "POP"){
             socket.emit("player quit")
-            navigate(`${basePath}/play`)
+            navigate(`/${basePath}/play`)
         }
     }
   

cryptide_project/src/Pages/Lobby.tsx

@@ -50,8 +50,7 @@ import { DataSet } from 'vis-network';
 
 let gameStarted = false
 let firstLaunch = true
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 function Lobby() {
     const theme=useTheme();

cryptide_project/src/Pages/LoginForm.tsx

@@ -5,7 +5,7 @@ import { useAuth } from '../Contexts/AuthContext';
 import AuthService from '../services/AuthService';
 import '../Style/Global.css';
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 const SignIn = () => {
     const navigate = useNavigate();

cryptide_project/src/Pages/NewPlay.tsx

@@ -34,8 +34,7 @@ import Lobbies from './Lobbies';
 
 let cptNavigation = 0
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 
 function NewPlay() {

cryptide_project/src/Pages/Play.tsx

@@ -32,8 +32,7 @@ import Info from '../res/icon/infoGreen.png';
 
 let cptNavigation = 0
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
-
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 function Play() {
     let first = true

cryptide_project/src/Pages/Profile.tsx

@@ -25,7 +25,7 @@ import Form from 'react-bootstrap/Form';
 import ProgressBar from 'react-bootstrap/ProgressBar';
 
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 //@ts-ignore
 const Profile = () => {

cryptide_project/src/Pages/SignUpForm.tsx

@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import AuthService from '../services/AuthService';
 import '../Style/Global.css';
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
 
 
 const SignUp = () => {