diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index 0f773a6a..3ce8574e 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -25,7 +25,11 @@ $vues['main'] = 'View/src/pages/Main.php'; $vues['presentation'] = 'View/src/pages/Presentation.html'; $vues['login'] = '/View/src/pages/LogSign/Login.php'; $vues['signUp'] = 'View/src/pages/LogSign/SignUp.php'; -$vues['enigme'] = 'View/src/pages/Palindrome.html'; +$vues['test'] = 'View/src/pages/FirstTests/FirstTest1.html'; +$vues['next'] = 'View/src/pages/FirstTests/FirstTest'; +// Enigme +$vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html'; +$vues['chouette'] = 'View/src/pages/Enigme/Chouette.html'; //Error $vues['erreur'] = 'View/src/pages/Erreur.php'; diff --git a/WEB/Controller/FrontController.php b/WEB/Controller/FrontController.php index 48bf7884..6970090c 100644 --- a/WEB/Controller/FrontController.php +++ b/WEB/Controller/FrontController.php @@ -18,10 +18,10 @@ class FrontController if ($action == NULL) { new UserController(); } - else if (method_exists('UserModel', $action) == false) { - $error = "Action non valide " . $action; - require($rep . $view['erreur']); - } else { + // else if (method_exists('UserModel', $action) == false) { + // $error = "Action non valide " . $action; + // require($rep . $view['erreur']); + else { new UserController(); } } else { diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 1881b51c..7331bc7c 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -20,12 +20,21 @@ class UserController case "goToHome": $model->goToHome(); break; + case "goToTest": + $model->goToTest(); + break; case "goToEnigme": $model->goToEnigme(); break; + case "goToChouette" : + $model->goToChouette(); + break; case "goToQueue": $model->goToQueue(); break; + case "goToNext": + $model->goToNext(); + break; case "logout": $model->logout(); break; diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php index 6bfdb2ad..8a57cfd7 100644 --- a/WEB/Model/UserModel.php +++ b/WEB/Model/UserModel.php @@ -51,6 +51,39 @@ class UserModel } } + public function goToChouette() + { + global $rep, $vues, $error; + try { + require($rep . $vues['chouette']); + } catch (Exception $e) { + $error = "404"; + require($rep . $vues['erreur']); + } + } + + public function goToTest() + { + global $rep, $vues, $error; + try { + require($rep . $vues['test']); + } catch (Exception $e) { + $error = "404"; + require($rep . $vues['erreur']); + } + } + + public function goToNext() + { + global $rep, $vues, $error; + try { + require($rep . $vues['next'].$_REQUEST['num'].".html"); + } catch (Exception $e) { + $error = "Erreur Inconnue"; + require($rep . $vues['erreur']); + } + } + public function goToQueue() { global $rep, $vues, $error; diff --git a/WEB/View/assets/img/ImgMain.png b/WEB/View/assets/img/ImgMain.png new file mode 100644 index 00000000..b2adc342 Binary files /dev/null and b/WEB/View/assets/img/ImgMain.png differ diff --git a/WEB/View/src/CSS/FirstTest.css b/WEB/View/src/CSS/FirstTest.css index 1008917b..f02fed44 100644 --- a/WEB/View/src/CSS/FirstTest.css +++ b/WEB/View/src/CSS/FirstTest.css @@ -24,6 +24,11 @@ p { font-size: 14px; } +li { + font-family: "Fauna", sans-serif; + font-size: 14px; +} + #editor { width: 100%; min-height: 80vh; diff --git a/WEB/View/src/CSS/Main2.css b/WEB/View/src/CSS/Main2.css new file mode 100644 index 00000000..6a4b6bb9 --- /dev/null +++ b/WEB/View/src/CSS/Main2.css @@ -0,0 +1,22 @@ +body { + min-height: 100vh; + font-family: "Orbitron", sans-serif; + color: white; + scroll-behavior: smooth; + height: 100vh; + background-image: radial-gradient( + circle, + #312c42, + #2e2a3d, + #2a2738, + #272434, + #24222f, + #22202c, + #1f1f29, + #1d1d26, + #1b1b23, + #191a21, + #17181e, + #15161c + ); +} diff --git a/WEB/View/src/JS/FirstFunction.js b/WEB/View/src/JS/FirstFunction.js index 82e1670d..0a830ef6 100644 --- a/WEB/View/src/JS/FirstFunction.js +++ b/WEB/View/src/JS/FirstFunction.js @@ -5,14 +5,14 @@ async function submit(){ import random as r def multiVerif(a,b): - return a+b + return a*b def multiTest(x): - multi(1,1) + multiplication(1,1) for i in range(x): a=r.randint(0,100) b=r.randint(0,100) - if(multi(a,b) != multiVerif(a,b)): + if(multiplication(a,b) != multiVerif(a,b)): return False return True diff --git a/WEB/View/src/JS/If.js b/WEB/View/src/JS/If.js index e69de29b..3b756a24 100644 --- a/WEB/View/src/JS/If.js +++ b/WEB/View/src/JS/If.js @@ -0,0 +1,41 @@ +//~ Function that test the user code + +async function submit(){ + var test = editor.getValue()+`\n +import random as r + +def conditionVerif(list,a): + for i in list: + if(i == 1): + a += 1 + elif(i != 2): + a -=1 + elif(i < 3): + a *= a + elif(i > 6): + a +=4 + else: + a +=5 + return a + +def conditionTest(x): + condition([],0) + list=[] + for i in range(x): + for i in range(r.randint(1,10)): + list.append(r.randint(1,10)) + a=r.randint(1,10) + if(condition(list,a)!=conditionVerif(list,a)): + return False + return True + +print(conditionTest(5)) + `; + exec("print('True')", "code"); + exec(test, "solution"); + result.innerHTML = "Test en cours..."; + await new Promise(r => setTimeout(r, 1500)); + check(); + } + + \ No newline at end of file diff --git a/WEB/View/src/pages/Enigme/Chouette.html b/WEB/View/src/pages/Enigme/Chouette.html index ca2950b8..1ec15cd7 100644 --- a/WEB/View/src/pages/Enigme/Chouette.html +++ b/WEB/View/src/pages/Enigme/Chouette.html @@ -1,93 +1,193 @@ - - - - - - Cul de Chouette - - - - - - -
-
-
- home + + + + + Chouette + + + + + + + +
+ +
+
+ home +
+
-
-

- c - hou - e - tte -

-

-
-

Consigne


-

- Écrire une fonction chouette qui, pour une valeur donnée, renvoie une liste contenant toutes les solutions de somme de 3 dés pouvant donner cette valeur. + + + +

+ +
+

+ Chouette +

+

+ Écrire une fonction chouette qui, pour une valeur donnée, renvoie une liste contenant toutes les solutions de somme de 3 dés pouvant donner cette valeur.
La valeur peut aller de 3 à 18 .
Les solutions doivent être uniques.(1,2,3) et (3,2,1) sont la même solution. -



-

Exemple


-

Entrée : 7

-

Sortie : [[1,1,5],[1,2,4],[1,3,3],[2,2,3]]


-

Aide


-

On cherche à savoir si la somme de 3 dés (trois variables allant de 1 à 6) est égale à une valeur donné.

-

Pour cela on peut utiliser la structure suivante on d1 ( le premier dé) va varier de 1 à 6.

. -

for d1 in range(1, 7):
  for d2 in range (1, 7):
    #Faire...

-
-
def chouette(valeur): - res=list() - for i in range(1, 7): - for j in range(i, 7): - for k in range(j, 7): - if (i+j+k) == valeur: - res.append([i, j, k]) - return res -
-
- -
- +

+

Exemple

+

Entrée : 7

+

Sortie : [[1,1,5],[1,2,4],[1,3,3],[2,2,3]]

+ + +
+ + + +
+
def chouette(valeur):
-
+
+ -