From 262fa6180e9ea0b6ba992fdf86db58f23007a10d Mon Sep 17 00:00:00 2001 From: "mael.daim" Date: Wed, 22 Nov 2023 08:40:15 +0100 Subject: [PATCH] applied suggestions --- public/index.php | 2 +- src/Controller/TeamController.php | 10 +++------- src/Data/Color.php | 1 + src/Data/MemberRole.php | 4 ++-- src/Views/display_team.html.twig | 7 ++++++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/public/index.php b/public/index.php index cc63837..abc1a50 100644 --- a/public/index.php +++ b/public/index.php @@ -46,7 +46,7 @@ $router->map("POST","/team/new", fn()=>$teamController->SubmitTeam($_POST)); $router->map("GET","/team/list", fn()=>$teamController->displayListTeamByName()); $router->map("POST","/team/list", fn()=>$teamController->ListTeamByName($_POST)); -$router->map("GET","/team/[i:id]", fn(int $id)=>$teamController->displayTeam($id)); +$router->map("GET","/team/[i:id]", fn(int $id)=>$teamController->getTeam($id)); $match = $router->match(); diff --git a/src/Controller/TeamController.php b/src/Controller/TeamController.php index 288e733..d4c7bfe 100644 --- a/src/Controller/TeamController.php +++ b/src/Controller/TeamController.php @@ -13,15 +13,12 @@ use \Twig\Environment; class TeamController { private TeamModel $model; - private Environment $twig; /** * @param TeamModel $model - * @param Environment $twig */ - public function __construct(TeamModel $model, Environment $twig) { + public function __construct(TeamModel $model) { $this->model = $model; - $this->twig = $twig; } public function displaySubmitTeam() : HttpResponse { @@ -29,7 +26,6 @@ class TeamController } public function submitTeam(array $request): HttpResponse { - $errors = []; $request = HttpRequest::from($request, $errors, [ @@ -47,7 +43,7 @@ class TeamController } return ViewHttpResponse::twig('insert_team.html.twig', ['bad_fields' => $badFields]); } - return $this->displayTeam($this->model->createTeam($request['name'], $request['picture'], $request['mainColor'], $request['secondColor'])); + return $this->getTeam($this->model->createTeam($request['name'], $request['picture'], $request['mainColor'], $request['secondColor'])); } public function displayListTeamByName(): HttpResponse { @@ -74,7 +70,7 @@ class TeamController return ViewHttpResponse::twig('display_teams.html.twig', ['teams' => $results]); } - public function displayTeam(int $id): HttpResponse { + public function getTeam(int $id): HttpResponse { $result = $this->model->displayTeam($id); return ViewHttpResponse::twig('display_team.html.twig', ['team' => $result]); } diff --git a/src/Data/Color.php b/src/Data/Color.php index 2e934c0..d32d81f 100755 --- a/src/Data/Color.php +++ b/src/Data/Color.php @@ -28,6 +28,7 @@ class Color { public static function from(string $value): Color { $color = self::tryFrom($value); if ($color == null) { + var_dump($value); throw new InvalidArgumentException("The string is not an hexadecimal code"); } return $color; diff --git a/src/Data/MemberRole.php b/src/Data/MemberRole.php index bd8add3..3bc9d56 100755 --- a/src/Data/MemberRole.php +++ b/src/Data/MemberRole.php @@ -12,8 +12,8 @@ use http\Exception\InvalidArgumentException; */ final class MemberRole { - public const ROLE_PLAYER = 0; - public const ROLE_COACH = 1; + private const ROLE_PLAYER = 0; + private const ROLE_COACH = 1; private const MIN = self::ROLE_PLAYER; private const MAX = self::ROLE_COACH; diff --git a/src/Views/display_team.html.twig b/src/Views/display_team.html.twig index f7bb02b..9783fe2 100644 --- a/src/Views/display_team.html.twig +++ b/src/Views/display_team.html.twig @@ -8,10 +8,11 @@ background-color: #f1f1f1; display: flex; flex-direction: column; + align-items: center; } section{ - width: 80%; + width: 60%; } .square{ @@ -32,6 +33,10 @@ .team{ border-color: darkgrey; border-radius: 20px; + align-items: center; + } + .team.h1{ + }