Merge pull request #2 from edbourque0/dev

edbourque0 · Feb 13, 2024 · fea6d94 · fea6d94
2 parents 3acc0cd + df9df96
commit fea6d94
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 6 deletions.
diff --git a/app.py b/app.py
@@ -61,7 +61,6 @@ def reset_param():
         tricheur = ''
         init_points()
         round_number = 0
-        print('Nouvelle partie crée')
 
 def check_if_connected():
     #Regarde si tout les clients sont déconnectés et reset une partie
@@ -120,6 +119,7 @@ def home():
 @app.route('/reset', methods=['POST'])
 def reset():
     reset_param()
+    socketio.emit('Nouvelle partie crée')
     return redirect(url_for('home'))
 
 @app.route('/salle_attente')

diff --git a/static/style.css b/static/style.css
@@ -192,3 +192,30 @@ button.bouton_retourne {
     width: 100%;
     justify-content: center;
 }
+
+.loader {
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+    display: inline-block;
+    position: relative;
+    background: linear-gradient(0deg, rgba(255, 61, 0, 0.2) 33%, #ff3d00 100%);
+    box-sizing: border-box;
+    animation: rotation 1s linear infinite;
+  }
+  .loader::after {
+    content: '';  
+    box-sizing: border-box;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 44px;
+    height: 44px;
+    border-radius: 50%;
+    background: #263238;
+  }
+  @keyframes rotation {
+    0% { transform: rotate(0deg) }
+    100% { transform: rotate(360deg)}
+  } 
diff --git a/templates/index.html b/templates/index.html
@@ -2,7 +2,7 @@
 <html lang="fr">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
 <script type="text/javascript">
-    const socket = io.connect("https://game.ebourque.com");
+    const socket = io.connect("http://192.168.2.39:2827");
 </script>
 <head>
     <meta charset="UTF-8">

diff --git a/templates/partie.html b/templates/partie.html
@@ -2,7 +2,7 @@
 <html lang="fr">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
 <script type="text/javascript">
-    const socket = io.connect("https://game.ebourque.com");
+    const socket = io.connect("http://192.168.2.39:2827");
     socket.on('Tricheur revélé', function() {
         window.location.href = '/resultat';
     });

diff --git a/templates/resultat.html b/templates/resultat.html
@@ -2,11 +2,11 @@
 <html lang="fr">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
 <script type="text/javascript">
-    const socket = io.connect("https://game.ebourque.com");
+    const socket = io.connect("http://192.168.2.39:2827");
     socket.on('Nouvelle round', function() {
         location.reload();
     });
-    socket.on('Nouvelle partie', function() {
+    socket.on('Nouvelle partie crée', function() {
         window.location.href = '/';
     });
 </script>

diff --git a/templates/salle_attente.html b/templates/salle_attente.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
     <script type="text/javascript">
-    const socket = io.connect("https://game.ebourque.com");
+    const socket = io.connect("http://192.168.2.39:2827");
     socket.on('Joueur en attente', function(joueurs) {
         const listeJoueurs = document.querySelector('ul');
         listeJoueurs.innerHTML = ''; // Vide la liste actuelle
@@ -21,6 +21,18 @@
     socket.on('Partie commencée', function() {
         location.reload();
     });
+    socket.on('Nouvelle partie crée', function() {
+        window.location.href = '/';
+    });
+    document.onreadystatechange = function() {
+        if (document.readyState !== "complete") {
+            document.querySelector(
+              "loader").style.visibility = "visible";
+        } else {
+            document.querySelector(
+              "loader").style.display = "none";
+        }
+    };
     </script>
 </head>
 <body>