diff --git a/Bd/bd.sql b/Bd/bd.sql deleted file mode 100644 index 41998372..00000000 --- a/Bd/bd.sql +++ /dev/null @@ -1,38 +0,0 @@ -DROP TABLE - - -CREATE TABLE Admin( -email varchar(50) PRIMARY KEY, -pseudo varchar(50), -mdp varchar(500) -); - -CREATE TABLE Enigme( -idEnigme char(5) PRIMARY KEY, -admin varchar(50) REFERENCES Admin(email), -enonce varchar(250) NOT NULL, -aide varchar(250), -rappel varchar(250), -solution varchar(250) NOT NULL, -test varchar(250) NOT NULL, -tempsDeResolution numeric CHECK (tempsDeResolution >0) -); - -CREATE TABLE Joueur( -email varchar(50) PRIMARY KEY, -enigmeEnCours varchar(50) REFERENCES Enigme(idEnigme), -pseudo varchar(50), -mdp varchar(500) -); - -CREATE TABLE Partie( -idPartie char(5) NOT NULL, -joueur varchar(50) REFERENCES Joueur(email), -enigme char(5) REFERENCES Enigme(idEnigme), -points numeric CHECK (points >0), -PRIMARY KEY(idGame, joueur, enigme) -); - -CREATE TABLE DetailPartie( - -); \ No newline at end of file diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index bc5331c8..3fbd14dd 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -3,14 +3,21 @@ $rep = __DIR__ . '/../'; //BD -$dsn = 'mysql:host=londres.uca.local; dbname=dbnogarnier1'; -$user = 'nogarnier1'; -$password = 'achanger'; +// $dsn = 'mysql:host=londres.uca.local; dbname=dbnogarnier1'; +// $user = 'nogarnier1'; +// $password = 'achanger'; + +// scripted.db // $dsn = 'mysql:host=localhost; dbname=scripted'; // $user = 'root'; // $password = 'p'; +// SQULITE3 +$dsn = 'sqlite3:' . $rep . 'Model/scripted.db'; +$user = null; +$password = null; + //Sel de hashage $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong"; @@ -18,7 +25,7 @@ $sel = "JeSuisUnSeldeHashageEtJeSuisUniqueEtTresSecuriseEtJeSuisTresLong"; //Page $vues['main'] = 'View/src/pages/Main.php'; $vues['presentation'] = 'View/src/pages/Presentation.html'; -$vues['login'] = 'View/src/pages/LogSign/Login.php'; +$vues['login'] = '../View/src/pages/LogSign/Login.php'; $vues['signUp'] = 'View/src/pages/LogSign/SignUp.php'; $vues['enigme'] = 'View/src/pages/Enigme/palindrome.html'; diff --git a/WEB/Model/bd.sql b/WEB/Model/bd.sql index 70f4a9f0..8beae28b 100644 --- a/WEB/Model/bd.sql +++ b/WEB/Model/bd.sql @@ -4,57 +4,43 @@ -- USE scripted; DROP TABLE Contenir; -DROP TABLE Gerer; -DROP TABLE ResoudreMulti; DROP TABLE Participer; -DROP TABLE ResoudreEnSolo; +DROP TABLE Resoudre; DROP TABLE Enigme; DROP TABLE Partie; -DROP TABLE Admin; -DROP TABLE Joueur; +DROP TABLE Utilisateur; -CREATE TABLE Joueur( +CREATE TABLE Utilisateur( email varchar(50) PRIMARY KEY, pseudo varchar(50), -mdp varchar(50) -); - -CREATE TABLE Admin( -email varchar(50) PRIMARY KEY, -pseudo varchar(50), -mdp varchar(50) +mdp varchar(50), +estAdmin boolean ); CREATE TABLE Enigme( id int PRIMARY KEY AUTO_INCREMENT, -admin varchar(50) REFERENCES Admin(email), enonce varchar(250) NOT NULL, aide varchar(250), rappel varchar(250), solution varchar(250) NOT NULL, test varchar(250) NOT NULL, tempsDeResolution numeric CHECK (tempsDeResolution >0), -points numeric +points numeric CHECK (points >0) ); CREATE TABLE Partie( id int PRIMARY KEY AUTO_INCREMENT, +dateDebut date NOT NULL ); -CREATE TABLE ResoudreEnSolo( -joueur varchar(50) REFERENCES Joueur(email), -enigme varchar(5) REFERENCES Enigme(id), -indexEnigme numeric UNIQUE, -PRIMARY KEY(joueur, enigme) -); - -CREATE TABLE PasserEnMulti( -joueur varchar(50) REFERENCES Joueur(email), -enigme char(5) REFERENCES Enigme(id), -partie char(5) REFERENCES Partie(id), -passer bool NOT NULL, -points numeric NOT NULL, -temps time, +CREATE TABLE Resoudre( +joueur varchar(50) REFERENCES Utilisateur(email), +enigme int REFERENCES Enigme(id), +partie int REFERENCES Partie(id), +classement int CHECK (classement >0), +indexEnigme int CHECK (indexEnigme >0), +temps numeric CHECK (temps >0), +enMulti boolean, PRIMARY KEY(joueur, enigme, partie) ); @@ -68,10 +54,6 @@ PRIMARY KEY(partie, enigme) CREATE TABLE Participer( partie int REFERENCES Partie(id), joueur varchar(50) REFERENCES Joueur(email), + enCours boolean, PRIMARY KEY(partie, joueur) -); - -CREATE TABLE Gerer( - admin varchar(50) REFERENCES Admin(id), - enigme int REFERENCES Enigme(id) -); +); \ No newline at end of file diff --git a/WEB/View/src/CSS/Eni.css b/WEB/View/src/CSS/Eni.css new file mode 100644 index 00000000..95894038 --- /dev/null +++ b/WEB/View/src/CSS/Eni.css @@ -0,0 +1,48 @@ +@font-face { + font-family: Fauna; + src: url("../../assets/fonts/Fauna.ttf"); +} +@font-face { + font-family: Equinox; + src: url("../../assets/fonts/Equinox.otf"); +} + +body { + min-height: 100vh; + font-family: "Equinox", sans-serif; + color: white; + scroll-behavior: smooth; + height: 100vh; + background-position: center center; + background-attachment: fixed; + background-repeat: no-repeat; + background-size: cover; + background-color: #222831; +} + +p, +a, +li, +button, +ul { + margin: 0; + padding: 0; + line-height: normal; + text-decoration: none !important; +} + +#editor { + width: 100%; + min-height: 80vh; + height: 100%; +} + +#console { + font-size: 0.8rem; + letter-spacing: 1px; + background-color: #050e15; + color: #fff; + border: solid 1px #414141; + border-radius: 5px; + resize: none; +} diff --git a/WEB/View/src/JS/Presentation.js b/WEB/View/src/JS/Presentation.js index 84d5664a..73eb19ab 100644 --- a/WEB/View/src/JS/Presentation.js +++ b/WEB/View/src/JS/Presentation.js @@ -17,7 +17,7 @@ hiddenElements.forEach((element) => observer.observe(element)); const fox = document.querySelector(".moving-fox"); window.addEventListener("scroll", () => { - const scrollValue = window.scrollY - 600; - fox.style.top = `${scrollValue / 1.2}px`; - fox.style.opacity = `${window.scrollY / 500}`; + const scrollValue = window.scrollY - 700; + fox.style.top = `${scrollValue / 1.3}px`; + fox.style.opacity = `${window.scrollY / 700}`; }); diff --git a/WEB/View/src/pages/Enigme.html b/WEB/View/src/pages/Enigme.html new file mode 100644 index 00000000..039e43db --- /dev/null +++ b/WEB/View/src/pages/Enigme.html @@ -0,0 +1,68 @@ + + + + + + Bootstrap Site + + + + + + + +
+
+ home +
+
+
+

Palindrome

+ + +
+
+
+
+
+ +
+
+
+ + + + + + +