diff --git a/Project/php/.htaccess b/Project/php/.htaccess old mode 100644 new mode 100755 diff --git a/Project/php/assets/favicon.ico b/Project/php/assets/favicon.ico old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/app-store-badge.svg b/Project/php/assets/img/app-store-badge.svg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/carte.png b/Project/php/assets/img/carte.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/celeb.png b/Project/php/assets/img/celeb.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/demo-screen.mp4 b/Project/php/assets/img/demo-screen.mp4 old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/google-play-badge.svg b/Project/php/assets/img/google-play-badge.svg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/home.png b/Project/php/assets/img/home.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/ipad.png b/Project/php/assets/img/ipad.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/logo.png b/Project/php/assets/img/logo.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/memory.jpeg b/Project/php/assets/img/memory.jpeg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/nyc.jpg b/Project/php/assets/img/nyc.jpg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/nyc_blur.jpg b/Project/php/assets/img/nyc_blur.jpg old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/points.png b/Project/php/assets/img/points.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/portrait_black.png b/Project/php/assets/img/portrait_black.png old mode 100644 new mode 100755 diff --git a/Project/php/assets/img/quizz.jpeg b/Project/php/assets/img/quizz.jpeg old mode 100644 new mode 100755 diff --git a/Project/php/config/config.php b/Project/php/config/config.php index 0fbb5bc..ae9c833 100755 --- a/Project/php/config/config.php +++ b/Project/php/config/config.php @@ -18,4 +18,4 @@ global $password; $password = 'achanger'; global $altorouterPath; -$altorouterPath = "/SAE_2A_Anglais/Project/php"; +$altorouterPath = "/~lugoigoux1/SAE_2A_Anglais/Project/php"; diff --git a/Project/php/controller/AdminController.php b/Project/php/controller/AdminController.php index 43d7b39..cbc9da9 100755 --- a/Project/php/controller/AdminController.php +++ b/Project/php/controller/AdminController.php @@ -10,37 +10,41 @@ class AdminController { public function showAllUsers(): void { global $twig; + global $user; $model = new MdlAdmin(); $users = $model->getAllUsers(); - echo $twig->render('usersView.html', ['users' => $users]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); } public function showAllAdmins(): void { global $twig; + global $user; $model = new MdlAdmin(); $users = $model->getAllAdmins(); - echo $twig->render('usersView.html', ['users' => $users]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); } public function showAllTeachers(): void { global $twig; + global $user; $model = new MdlAdmin(); $users = $model->getAllTeachers(); - echo $twig->render('usersView.html', ['users' => $users]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); } public function showAllStudents(): void { global $twig; + global $user; $model = new MdlAdmin(); $users = $model->getAllStudents(); - echo $twig->render('usersView.html', ['users' => $users]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); } public function removeUser(): void { try { - $id = Validation::filter_int($_GET['userID'] ?? null); + global $user; $model = new MdlAdmin(); - $model->removeUser($id); + $model->removeUser($user->getId()); $this->showAllUsers(); } catch (Exception $e) { @@ -50,21 +54,24 @@ class AdminController public function showAllGroups(): void { global $twig; + global $user; $model = new MdlAdmin(); $groups = $model->getAllGroups(); $unassignedUsers = $model->getUnassignedUsers(); - echo $twig->render('manageGroupView.html', ['groups' => $groups, 'unassignedUsers' => $unassignedUsers]); + echo $twig->render('manageGroupView.html', ['groups' => $groups, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId()]); } public function showGroupDetails(): void { try { global $twig; + global $user; $selectedGroup = Validation::filter_int($_GET['selectedGroup'] ?? null); $model = new MdlAdmin(); $groups = $model->getAllGroups(); $users = $model->getUsersOfGroup($selectedGroup); $unassignedUsers = $model->getUnassignedUsers(); - echo $twig->render('manageGroupView.html', ['groups' => $groups, 'selectedGroup' => $selectedGroup, 'users' => $users, 'unassignedUsers' => $unassignedUsers]); + + echo $twig->render('manageGroupView.html', ['groups' => $groups, 'selectedGroup' => $selectedGroup, 'users' => $users, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId()]); } catch (Exception $e) { throw new Exception("invalid group ID"); @@ -113,10 +120,10 @@ class AdminController public function addUserToGroup(): void { try { - $user = Validation::filter_int($_GET['userID'] ?? null); + global $user; $group = Validation::filter_int($_GET['groupID'] ?? null); $model = new MdlAdmin(); - $model->addUserToGroup($user, $group); + $model->addUserToGroup($user->getId(), $group); $_GET['selectedGroup'] = $group; $this->showGroupDetails(); } diff --git a/Project/php/controller/FrontController.php b/Project/php/controller/FrontController.php index cd24ccb..5c31005 100755 --- a/Project/php/controller/FrontController.php +++ b/Project/php/controller/FrontController.php @@ -50,7 +50,6 @@ class FrontController break; default : - if ($id != null && !$this->checkIdExist($id)) throw new Exception("identifiant invalide"); if ($target == null) throw new Exception("pas de target"); if (isset($_SESSION['login']) && isset($_SESSION['roles'])) { @@ -62,6 +61,7 @@ class FrontController $mdl = new $mdl; if (is_callable(array($mdl, 'is'))) { + global $user; $user = call_user_func_array(array($mdl, 'is'), array($_SESSION['login'], $_SESSION['roles'])); if (!$user || $user->getId() != $id) throw new Exception("erreur 403 permission denied"); diff --git a/Project/php/css/login.css b/Project/php/css/login.css old mode 100644 new mode 100755 diff --git a/Project/php/css/quiz.css b/Project/php/css/quiz.css old mode 100644 new mode 100755 diff --git a/Project/php/css/styles.css b/Project/php/css/styles.css old mode 100644 new mode 100755 index a4ed05f..af587db --- a/Project/php/css/styles.css +++ b/Project/php/css/styles.css @@ -10996,7 +10996,7 @@ body { padding: 0.9rem 0; } #mainNav .navbar-nav .nav-item:hover { - color: fade(#fff, 80%); + color: #faf4e0; outline: none; background-color: transparent; } @@ -11021,7 +11021,7 @@ body { color: #fff; } #mainNav .nav-link:hover { - color: #a840a3; + color: #faf4e0; } #mainNav .nav-link:active { color: #fff; @@ -11053,7 +11053,7 @@ body { #secondNav { min-height: 3.5rem; - background-color: #940262; + background-color: #7464a1; } #secondNav .navbar-toggler { font-size: 80%; @@ -11095,7 +11095,7 @@ body { color: #fff; } #secondNav .nav-link:hover { - color: #a840a3; + color: #463c61; } #secondNav .nav-link:active { color: #fff; diff --git a/Project/php/js/memory.js b/Project/php/js/memory.js old mode 100644 new mode 100755 diff --git a/Project/php/js/quiz.js b/Project/php/js/quiz.js old mode 100644 new mode 100755 diff --git a/Project/php/js/scripts.js b/Project/php/js/scripts.js old mode 100644 new mode 100755 diff --git a/Project/php/navBar.html b/Project/php/navBar.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/addGroupForm.twig b/Project/php/templates/addGroupForm.twig old mode 100644 new mode 100755 index 3109779..3c0ca32 --- a/Project/php/templates/addGroupForm.twig +++ b/Project/php/templates/addGroupForm.twig @@ -1,4 +1,4 @@ -
+ diff --git a/Project/php/templates/addVocalList.html b/Project/php/templates/addVocalList.html old mode 100644 new mode 100755 index 7bd0c2e..461ebc3 --- a/Project/php/templates/addVocalList.html +++ b/Project/php/templates/addVocalList.html @@ -21,11 +21,10 @@

Add words

{% if user is defined %} - + diff --git a/Project/php/templates/groupContainer.twig b/Project/php/templates/groupContainer.twig old mode 100644 new mode 100755 index 7bdb423..ec79f7a --- a/Project/php/templates/groupContainer.twig +++ b/Project/php/templates/groupContainer.twig @@ -1,4 +1,5 @@
-
+ {{ userID }} {% if groups is defined %} {% for row in groups %} {% if selectedGroup is defined and selectedGroup == row.id %} @@ -21,7 +22,7 @@ {% if 'showGroupDetails' in actions %} @@ -29,7 +30,7 @@ {% if 'removeGroup' in actions %} diff --git a/Project/php/templates/manageGroupView.html b/Project/php/templates/manageGroupView.html old mode 100644 new mode 100755 index 4a25490..fd06196 --- a/Project/php/templates/manageGroupView.html +++ b/Project/php/templates/manageGroupView.html @@ -28,7 +28,6 @@

Group list

{% include 'groupContainer.twig' with {'actions' : ['showGroupDetails', 'removeGroup']} %} -

Users of the group

{% include 'userContainer.twig' with {'users' : users, 'action' : 'removeUserFromGroup'} %} diff --git a/Project/php/templates/modifyPasswordForm.twig b/Project/php/templates/modifyPasswordForm.twig old mode 100644 new mode 100755 index 0b3e503..817c662 --- a/Project/php/templates/modifyPasswordForm.twig +++ b/Project/php/templates/modifyPasswordForm.twig @@ -1,4 +1,4 @@ - + diff --git a/Project/php/templates/myAccountView.html b/Project/php/templates/myAccountView.html old mode 100644 new mode 100755 index a9dfded..d20200b --- a/Project/php/templates/myAccountView.html +++ b/Project/php/templates/myAccountView.html @@ -32,7 +32,7 @@
- + - +
ID : {{user.id}}
Nickname : {{user.nickname}} - + diff --git a/Project/php/templates/navBar.html b/Project/php/templates/navBar.html new file mode 100755 index 0000000..6faa02c --- /dev/null +++ b/Project/php/templates/navBar.html @@ -0,0 +1,33 @@ + + + + + diff --git a/Project/php/templates/navBar.twig b/Project/php/templates/navBar.twig new file mode 100755 index 0000000..af7a3f3 --- /dev/null +++ b/Project/php/templates/navBar.twig @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/Project/php/templates/quizContainer.twig b/Project/php/templates/quizContainer.twig deleted file mode 100755 index 8a9d371..0000000 --- a/Project/php/templates/quizContainer.twig +++ /dev/null @@ -1,61 +0,0 @@ - - - - {% if translations is defined %} - {% for row in translations %} - - - - - - - - - - - Manage groups - - - -
-

Quiz

- - {% if translations is defined %} - {% for translation in translations %} -

{{ translation.word1 }}

- {% set answers = [translation.word2] %} - {% for i in 0..3 %} - {{ answers[i] }}
- {% endfor %} - {% endfor %} - {% endif %} - - - -

Translator

-
- {% if translations is defined %} -
{{ row.id }}{{ row.word1 }}{{ row.word2 }}{{ row.listVocab }}
- - - - - - - {% for translation in translations %} - - - - - - - {% endfor %} -
IDWord 1Word 2List Vocabulary
{{ translation.id }}{{ translation.word1 }}{{ translation.word2 }}{{ translation.listVocab }}
- {% endif %} - - - - - - -
\ No newline at end of file diff --git a/Project/php/templates/quizView.html b/Project/php/templates/quizView.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/resultatsJeux.html b/Project/php/templates/resultatsJeux.html old mode 100644 new mode 100755 diff --git a/Project/php/templates/userContainer.twig b/Project/php/templates/userContainer.twig index fb83c49..d13345b 100755 --- a/Project/php/templates/userContainer.twig +++ b/Project/php/templates/userContainer.twig @@ -24,17 +24,17 @@ {% if action is defined %} {% if action == 'removeUserFromGroup' %} - + {% elseif action == 'addUserToGroup' %} - + {% elseif action == 'removeUser' %} - + {% endif %}