Merge branch 'master' of http://gvipers.imt-lille-douai.fr/thibaut.felten/projet-cdaw into master

backend/MVC/controller/ResultController.class.php

@@ -36,9 +36,6 @@ class ResultController extends Controller {
             
             case 'OPTIONS':
                 return Response::okresponse(json_encode("OPTIONS"));
-                // $data = json_decode(file_get_contents("php://input"),TRUE);
-                // return $this->deleteLine($data);
-                // break;
                             
         }
         return Response::errorResponse("unsupported parameters or method in game");

backend/MVC/model/Online.class.php

@@ -20,8 +20,6 @@ class Online extends Model {
         $idmin = $res[0]->USER_ID;
         if($id == $idmin){
             $game = Online::getIdGame();
-            // print_r($game);
-            // exit;
             if(count($game) == 1){
                 Online::deleteUserOnline(array(":id" => $id));
                 Game::addUserGame(array(":GAME_ID" => $game[0]->GAME_ID, ":USER_ID" => $id));
@@ -30,8 +28,6 @@ class Online extends Model {
             else {
                 $idgame = Game::createGame(array( ":GAME_DESC" => "Desc", ":private" => "0"));
                 Online::deleteUserOnline(array(":id" => $id));
-                // print_r($idgame);
-                // exit;
                 Game::addUserGame(array(":GAME_ID" => $idgame[0]->id, ":USER_ID" => $id));
                 return $idgame[0]->id;
                 

frontend/src/components/LoginNavbar.vue

@@ -29,10 +29,6 @@ export default {
   },
 }
 
-
-
-console.log(user.id);  
-
 </script>
 
 <style scoped>

frontend/src/main.js

@@ -4,7 +4,7 @@ import router from './router'
 
 Vue.config.productionTip = false
 
-sessionStorage.setItem('APIURL', 'http://localhost/projet-cdaw/backend/MVC/api.php')
+sessionStorage.setItem('APIURL', 'http://localhost/felten/projet-cdaw/backend/MVC/api.php')
 
 new Vue({
   router,

frontend/src/views/AdminPrivate.vue

@@ -67,7 +67,6 @@ export default {
                     
             let response = await fetch(url, params)
             let result = await response.json()
-            console.log(result)
             document.getElementById("codeGame").innerHTML = result[0].id;
             game.id = result[0].id;
             // console.log(game.id)
@@ -88,7 +87,6 @@ export default {
         },
         ajoutAdminGame: async function(){
             const url = sessionStorage.getItem('APIURL') + "/gameuser"
-            console.log(game.id)
             let data = {
                 "GAME_ID": game.id,
                 "USER_ID": user.id,
@@ -102,7 +100,6 @@ export default {
         },
         JoueurPresent: async function(){
             let url = sessionStorage.getItem('APIURL') + "/gameuser/game"
-            console.log(game.id)
             url += "/" + game.id;
             var params = {
                 method: "GET"
@@ -119,7 +116,6 @@ export default {
                 return
             }
             setTimeout(() => {if(game.id){this.JoueurPresent()}}, 3000)
-            // setInterval(() => {if(game.id){this.JoueurPresent()}}, 3000)
         },
 
         retour: async function() {

frontend/src/views/Game.vue

@@ -148,9 +148,6 @@ export default {
             let rock = this.rock
             let paper = this.paper
             let scissors = this.scissors
-
-            console.log("ID : " + user.id)
-            console.log("TOKEN : " + user.token)
             await fetch(
                   sessionStorage.getItem('APIURL') + `/user/${user.id}`,
                   {

frontend/src/views/Inscription.vue

@@ -143,9 +143,7 @@ export default {
             var params = {
                 method: 'POST',
                 body : JSON.stringify(data) };
-            
-            console.log(params.body.lastname)
-            
+                        
             fetch(url, params)
             .then(response=>response.json())
             .then(response=> {

frontend/src/views/JoinPrivate.vue

@@ -76,8 +76,7 @@ export default {
                 method: 'POST',
                 body : JSON.stringify(data) };
             game.id=this.idgame;
-            let response = await fetch(url, params)
-            console.log(response)
+            await fetch(url, params)
             this.$router.push("/playerPrivate")
         }
     },

frontend/src/views/Online.vue

@@ -61,24 +61,20 @@ export default {
                 {
                   method: "GET"
                 }
-              )
-            console.log(res)
-              const result = await res.json()
-              console.log(result)
-              if (result.length >= 1) {
-                game.id = result
-                console.log(result)
-                this.goGame(result)
-                return
-              }
-              setTimeout(async () => {
+            )
+            const result = await res.json()
+            if (result.length >= 1) {
+              game.id = result
+              this.goGame(result)
+              return
+            }
+            setTimeout(async () => {
                 await this.findGame()
-              }, 1000)
+            }, 1000)
         },
 
         goGame: async function(gameID) {
           let url = sessionStorage.getItem('APIURL') + "/gameuser/game"
-            console.log(gameID)
             url += "/" + gameID;
             var params = {
                 method: "GET"

frontend/src/views/PlayerPrivate.vue

@@ -38,19 +38,16 @@ export default {
         },
         JoueurPresent: async function(){
             let url = sessionStorage.getItem('APIURL') + "/gameuser/game"
-            console.log(game.id)
             url += "/" + game.id;
             var params = {
                 method: "GET"
             }
             let response = await fetch(url,params)
             let result = await response.json()
-            console.log(result)
             let text = "";
             result.forEach(user => {
                 text += `<tr><h2 class='joueur' id='joueur'>${user.USER_ID}</h2></tr>`
             }); 
-            console.log(text)
             document.getElementById("joueurs").innerHTML = text
             if(result.length >= 2){
                 this.$router.push(`/game/${game.id}`)