diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 00000000..7b1de33f --- /dev/null +++ b/.drone.yml @@ -0,0 +1,13 @@ +kind: pipeline +name: Scripted_Pipeline + +trigger: + event: + - push + +steps: +- name: start + image: node + commands: + - npm install + # - find -name "*.js"| grep -v "node_modules" | xargs node -c \ No newline at end of file diff --git a/.gitignore b/.gitignore index 8c19ada1..a5bdaf7c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ # Built Visual Studio Code Extensions *.vsix -/node_modules/ \ No newline at end of file +/node_modules/ + +/.idea \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e09..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/Scripted.iml b/.idea/Scripted.iml deleted file mode 100644 index c956989b..00000000 --- a/.idea/Scripted.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index 5cb703ee..00000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index be4b2867..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 6200ce1b..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 97a38d70..00000000 --- a/.idea/php.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/WEB/Config/Autoload.php b/WEB/Config/Autoload.php new file mode 100644 index 00000000..c67bf2f5 --- /dev/null +++ b/WEB/Config/Autoload.php @@ -0,0 +1,51 @@ + \ No newline at end of file diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index ce30a946..67b8ee8f 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -1,16 +1,28 @@ signUp(); @@ -36,6 +35,9 @@ class Controller case "goToSignUp": $this->goToSignUp(); break; + case "goToEnigme": + $this->goToEnigme(); + break; } } catch (PDOException $e) { @@ -54,7 +56,7 @@ class Controller $joueur = new Joueur($_REQUEST['email'], $_REQUEST['username'], $_REQUEST['password']); $gateway->insert($joueur); $_SESSION['connected'] = 'true'; - require ('./View/src/pages/Main.php'); + require ($rep.$vues['main']);; }catch (Exception $e){ require($rep.$vues['erreurSignUp']); } @@ -72,7 +74,7 @@ class Controller throw new InvalidMdpException("Mot de passe invalide"); } $_SESSION['connected'] = 'true'; - require ('./View/src/pages/Main.php'); + require ($rep.$vues['main']); }catch (JoueurNotFoundException $e){ require($rep.$vues['erreurLoginEmail']); }catch (InvalidMdpException $m) { @@ -83,7 +85,7 @@ class Controller private function goToPresentation() { global $rep, $vues; try { - require ('./View/src/pages/Presentation.html'); + require ($rep.$vues['presenation']); }catch (Exception $e){ require($rep.$vues['erreur404']); } @@ -92,7 +94,7 @@ class Controller private function goToHome() { global $rep, $vues; try { - require ('./View/src/pages/Main.php'); + require ($rep.$vues['main']); }catch (Exception $e){ require($rep.$vues['erreur404']); } @@ -101,7 +103,7 @@ class Controller private function goToLogin() { global $rep, $vues; try { - require ('./View/src/pages/LogSign/Login.php'); + require ($rep.$vues['login']); }catch (Exception $e){ require($rep.$vues['erreur404']); } @@ -110,7 +112,16 @@ class Controller private function goToSignUp() { global $rep, $vues; try { - require ('./View/src/pages/LogSign/SignUp.php'); + require ($rep.$vues['signUp']); + }catch (Exception $e){ + require($rep.$vues['erreur404']); + } + } + + private function goToEnigme() { + global $rep, $vues; + try { + require ($rep.$vues['enigme']); }catch (Exception $e){ require($rep.$vues['erreur404']); } diff --git a/WEB/Controller/PartieGateway.php b/WEB/Controller/PartieGateway.php index 1b0ccaf8..7d35c6ff 100644 --- a/WEB/Controller/PartieGateway.php +++ b/WEB/Controller/PartieGateway.php @@ -1,8 +1,4 @@ { + entries.forEach(entry => { + console.log(entry); + if (entry.isIntersecting) { + entry.target.classList.add('show'); + } else { + entry.target.classList.remove('show'); + } + }); +}); + + +const hiddenElements = document.querySelectorAll('.hidden'); +hiddenElements.forEach(element => observer.observe(element)); \ No newline at end of file diff --git a/WEB/View/src/pages/Home.html b/WEB/View/src/pages/Home.html deleted file mode 100644 index b681e926..00000000 --- a/WEB/View/src/pages/Home.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - Home - - -
-
-

- s - crip - t - ed -

-
-
- -
- - - - - - Énigme - -
-
- - - - - - Multi - -
-
-
- - \ No newline at end of file diff --git a/WEB/View/src/pages/Pres.html b/WEB/View/src/pages/Pres.html index 3bc899ce..aecf14a0 100644 --- a/WEB/View/src/pages/Pres.html +++ b/WEB/View/src/pages/Pres.html @@ -21,15 +21,19 @@ integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/" crossorigin="anonymous" > + -