Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted
continuous-integration/drone/push Build is passing Details

ServeurDeTest
Noé GARNIER 2 years ago
commit 26d40cae24

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

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

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