Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

WEB/Config/Config.php

@@ -39,7 +39,7 @@ $vues['hanoi'] = 'View/src/pages/Enigme/Hanoi.html';
 $vues['trianglePascal'] = 'View/src/pages/Enigme/TrianglePascal.html';
 $vues['doubleElement'] = 'View/src/pages/Enigme/DoubleElement.html';
 // Server
-$server = 'server.js';
+$server = './server.js';
 
 //Error
 $vues['erreur'] = 'View/src/pages/Erreur.php';

WEB/Controller/UserController.php

@@ -1,5 +1,5 @@
 <?php
-
+require("server.js");
 class UserController
 {
     function __construct()
@@ -8,7 +8,6 @@ class UserController
             global $dsn, $rep, $vues, $error, $server;
             $action = $_REQUEST['action'];
             echo $action;
-            require $rep . $server;
             switch ($action) {
                 case NULL:
                     $this->goToHome();

WEB/server.js

@@ -19,10 +19,9 @@ io.on('launchGame' , function () {
     console.log('launch the game');
     location.reload();
 })
+
 module.exports = {
-    get_io: function() {
-      return io;
-    }
-  };
+    io: io
+    };
 
 console.log('iolisten');