fix on routes
continuous-integration/drone/push Build is passing Details

pull/19/head^2
Vivien DUFOUR 1 year ago committed by maxime.batista
parent 038686e2ed
commit 851aa72e2c

@ -14,10 +14,12 @@ use Twig\Error\RuntimeError;
use Twig\Error\SyntaxError;
use Twig\Loader\FilesystemLoader;
class FrontController {
class FrontController
{
private AltoRouter $router;
public function __construct(string $basePath) {
public function __construct(string $basePath)
{
$this->router = $this->createRouter($basePath);
$this->initializeRouterMap();
}
@ -27,7 +29,8 @@ class FrontController {
*
* @return void
*/
public function run(): void {
public function run(): void
{
$match = $this->router->match();
if ($match != null) {
$this->handleMatch($match);
@ -42,7 +45,8 @@ class FrontController {
* @param string $basePath
* @return AltoRouter
*/
public function createRouter(string $basePath): AltoRouter {
public function createRouter(string $basePath): AltoRouter
{
$router = new AltoRouter();
$router->setBasePath($basePath);
return $router;
@ -53,17 +57,19 @@ class FrontController {
*
* @return void
*/
private function initializeRouterMap(): void {
private function initializeRouterMap(): void
{
$this->router->map("GET", "/", "UserController");
$this->router->map("GET", "/[a:action]?", "UserController");
$this->router->map("GET", "/tactic/[a:action]/[i:idTactic]?", "UserController");
$this->router->map("GET|POST", "/[a:action]?/[i:id]", "UserController");
$this->router->map("GET|POST", "/tactic/[a:action]/[i:idTactic]?", "UserController");
}
/**
* @param array<string, mixed> $match
* @return void
*/
private function handleMatch(array $match): void {
private function handleMatch(array $match): void
{
$tag = $match['target'];
$action = $this->getAction($match);
@ -78,17 +84,14 @@ class FrontController {
* @param array<int, mixed> $params
* @return HttpResponse
*/
private function tryToCall(string $controller, string $action, array $params): HttpResponse {
private function tryToCall(string $controller, string $action, array $params): HttpResponse
{
$controller = $this->getController($controller);
try {
if (is_callable([$controller, $action])) {
return call_user_func_array([$controller, $action], $params);
} else {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
}
} catch (Exception $e) {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
}
}
/**
@ -97,7 +100,8 @@ class FrontController {
* @param array<string, mixed> $match
* @return string
*/
private function getAction(array $match): string {
private function getAction(array $match): string
{
if (isset($match["params"]["action"])) {
return $match["params"]["action"];
}
@ -110,7 +114,8 @@ class FrontController {
* @param string $controller
* @return mixed
*/
private function getController(string $controller) {
private function getController(string $controller)
{
$namespace = "\\App\\Controller\\";
$controller = $namespace . $controller;
return new $controller();
@ -122,7 +127,8 @@ class FrontController {
* @param HttpResponse $response
* @return void
*/
private function handleResponseByType(HttpResponse $response): void {
private function handleResponseByType(HttpResponse $response): void
{
http_response_code($response->getCode());
if ($response instanceof ViewHttpResponse) {
$this->displayViewByKind($response);
@ -138,7 +144,8 @@ class FrontController {
* @param ViewHttpResponse $response
* @return void
*/
private function displayViewByKind(ViewHttpResponse $response): void {
private function displayViewByKind(ViewHttpResponse $response): void
{
$file = $response->getFile();
$args = $response->getArguments();

@ -14,8 +14,8 @@ use App\Model\TacticModel;
class EditorController {
private TacticModel $model;
public function __construct() {
$this->model = new TacticModel(new TacticInfoGateway(new Connexion(get_database())));
public function __construct(TacticModel $model) {
$this->model = $model;
}
private function openEditor(TacticInfo $tactic): HttpResponse {

@ -1,6 +1,6 @@
<?php
namespace App\Controller;
namespace App\Controller\Sub;
use App\Http\HttpRequest;
use App\Http\HttpResponse;

@ -5,10 +5,12 @@ namespace App\Controller;
use App\Connexion;
use App\Gateway\AuthGateway;
use App\Gateway\TacticInfoGateway;
use App\Gateway\TeamGateway;
use App\Http\HttpResponse;
use App\Http\ViewHttpResponse;
use App\Model\AuthModel;
use App\Model\TacticModel;
use App\Model\TeamModel;
class UserController {
public function home(): HttpResponse {
@ -45,4 +47,28 @@ class UserController {
$model = new TacticModel(new TacticInfoGateway(new Connexion(get_database())));
return (new Sub\EditorController($model))->createNew();
}
public function createTeam(): HttpResponse {
$model = new TeamModel(new TeamGateway(new Connexion(get_database())));
$ctrl = new Sub\TeamController($model);
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
return $ctrl->displaySubmitTeam();
}
return $ctrl->submitTeam($_POST);
}
public function listTeams(): HttpResponse {
$model = new TeamModel(new TeamGateway(new Connexion(get_database())));
$ctrl = new Sub\TeamController($model);
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
return $ctrl->displayListTeamByName();
}
return $ctrl->listTeamByName($_POST);
}
public function getTeam(int $id): HttpResponse {
$model = new TeamModel(new TeamGateway(new Connexion(get_database())));
$ctrl = new Sub\TeamController($model);
return $ctrl->getTeam($id);
}
}

@ -10,7 +10,7 @@
<p>Aucune équipe n'a été trouvée</p>
<div class="container">
<h2>Chercher une équipe</h2>
<form action="/team/list" method="post">
<form action="/listTea" method="post">
<div class="form-group">
<label for="name">Nom de l'équipe :</label>
<input type="text" id="name" name="name" required>
@ -22,7 +22,7 @@
</div>
{% else %}
{% for t in teams %}
<div class="team" onclick="window.location.href = '/team/{{ t.id }}'">
<div class="team" onclick="window.location.href = '/getTeam/{{ t.id }}'">
<p>Nom de l'équipe : {{ t.name }}</p>
<img src="{{ t.picture }}" alt="logo de l'équipe">
</div>

@ -64,7 +64,7 @@
<div class="container">
<h2>Créer une équipe</h2>
<form action="/team/new" method="post">
<form action="/createTeam" method="post">
<div class="form-group">
<label for="name">Nom de l'équipe :</label>
<input type="text" id="name" name="name" required>

@ -62,7 +62,7 @@
<div class="container">
<h2>Chercher une équipe</h2>
<form action="/team/list" method="post">
<form action="/listTeams" method="post">
<div class="form-group">
<label for="name">Nom de l'équipe :</label>
<input type="text" id="name" name="name" required>

Loading…
Cancel
Save