diff --git a/Project/php/assets/img/carte.png b/Project/php/assets/img/carte.png new file mode 100644 index 0000000..0703b47 Binary files /dev/null and b/Project/php/assets/img/carte.png differ diff --git a/Project/php/assets/img/logo.png b/Project/php/assets/img/logo.png new file mode 100644 index 0000000..8ca9793 Binary files /dev/null and b/Project/php/assets/img/logo.png differ diff --git a/Project/php/controller/AdminController.php b/Project/php/controller/AdminController.php index c4a1474..43d7b39 100755 --- a/Project/php/controller/AdminController.php +++ b/Project/php/controller/AdminController.php @@ -6,7 +6,7 @@ use config\Validation; use model\MdlAdmin; use Exception; -class AdminController extends AbsController +class AdminController { public function showAllUsers(): void { global $twig; diff --git a/Project/php/controller/FrontController.php b/Project/php/controller/FrontController.php index 720edbd..cd24ccb 100755 --- a/Project/php/controller/FrontController.php +++ b/Project/php/controller/FrontController.php @@ -23,8 +23,8 @@ class FrontController $router->map('GET|POST', '/admin/[i:id]/[a:action]?', 'Admin'); $router->map('GET|POST', '/teacher/[i:id]/[a:action]?', 'Teacher'); $router->map('GET|POST', '/student/[i:id]/[a:action]?', 'Student'); - $router->map('GET|POST', '/abs/[a:action]?', 'Abs'); - $router->map('GET|POST', '/abs/[a:action]/[i:id]', 'Abs'); + $router->map('GET|POST', '/user/[a:action]?', 'User'); + $router->map('GET|POST', '/user/[a:action]/[i:id]', 'User'); $twig->addGlobal('base', $altorouterPath); @@ -38,10 +38,10 @@ class FrontController $action = Validation::val_action($match['params']['action'] ?? null); $id = $match['params']['id'] ?? null; - if ($target == 'Abs') { - $abs = new AbsController(); - if (is_callable(array($abs, $action))) - call_user_func_array(array($abs, $action), array($match['params'])); + if ($target == 'User') { + $userCtrl = new UserController(); + if (is_callable(array($userCtrl, $action))) + call_user_func_array(array($userCtrl, $action), array($match['params'])); } else { switch ($action) { @@ -75,7 +75,7 @@ class FrontController break; } - else (new AbsController())->login(); + else (new UserController())->login(); } } } diff --git a/Project/php/controller/TeacherController.php b/Project/php/controller/TeacherController.php index ed1fb94..da42c5e 100755 --- a/Project/php/controller/TeacherController.php +++ b/Project/php/controller/TeacherController.php @@ -6,7 +6,7 @@ use model\MdlTeacher; use gateway\VocabularyListGateway; use Exception; -class TeacherController extends AbsController +class TeacherController { public function affAllStudent(): void { diff --git a/Project/php/controller/AbsController.php b/Project/php/controller/UserController.php similarity index 99% rename from Project/php/controller/AbsController.php rename to Project/php/controller/UserController.php index 324cbfe..cd43abb 100755 --- a/Project/php/controller/AbsController.php +++ b/Project/php/controller/UserController.php @@ -10,7 +10,7 @@ use model\MdlStudent; use model\VocabularyList; use model\Translation; -class AbsController +class UserController { public function showAccountInfos(): void { diff --git a/Project/php/css/memory.css b/Project/php/css/memory.css index eba5827..4a503bb 100755 --- a/Project/php/css/memory.css +++ b/Project/php/css/memory.css @@ -34,10 +34,7 @@ body { } .flipped { - background: url("../assets/img/quizz.jpeg"); - background-position: center; - background-repeat: no-repeat; - background-attachment: scroll; + background: url("../assets/img/carte.png") no-repeat scroll center; background-size: cover; } diff --git a/Project/php/css/styles.css b/Project/php/css/styles.css index 40e1e83..a4ed05f 100644 --- a/Project/php/css/styles.css +++ b/Project/php/css/styles.css @@ -614,6 +614,11 @@ progress { line-height: 1; } +.logo { + margin-top: 10%; + height: 10vh; +} + .figure-caption { font-size: 0.875em; color: #6c757d; @@ -11333,10 +11338,4 @@ body { .app-badge { height: 3rem; -} - -/* .separateur{ - display: block; - margin: 0 auto; - width: 20%; -} */ \ No newline at end of file +} \ No newline at end of file diff --git a/Project/php/templates/home.html b/Project/php/templates/home.html index 26309bd..44fbf8b 100755 --- a/Project/php/templates/home.html +++ b/Project/php/templates/home.html @@ -22,8 +22,8 @@