iut/silex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://codefirst.iut.uca.fr/git/clement.freville2/silex

Browse Source
This commit is contained in:
Colin FRIZOT
2022-11-30 11:43:29 +01:00
parent f8959acae7 d6a3a7938a
commit 7e732bfb71
14 changed files with 145 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.php
View File

@@ -16,4 +16,5 @@ $router->get('/^recent\/(?<page>\d+)$/', [$user, 'index']);
$router->get('/^news\/(?<id>\d+)$/', [$user, 'viewPost']);
$router->get('/^comments\/(?<id>[\w-]+)$/', [$user, 'viewPostComments']);
$router->match('/^login$/', [$security, 'login']);
$router->run(new \Silex\DI\DI($router))->render(__DIR__ . '/../' . VIEW_PATH);
$router->match('/^register$/', [$security, 'register']);
$router->run(new \Silex\DI\DI($router))->render($router, __DIR__ . '/../' . VIEW_PATH);

19
src/Silex/Controller/SecurityController.php
View File

@@ -6,6 +6,7 @@ namespace Silex\Controller;
use Silex\DI\DI;
use Silex\Http\HttpResponse;
use Silex\Model\User;
class SecurityController
{
@@ -19,9 +20,23 @@ class SecurityController
header('Location: ' . $di->getRouter()->url(''));
exit();
}
var_dump($success);
$fail = !$success;
}
return HttpResponse::found('login', ['fail' => $fail]);
}
}
public function register(DI $di): HttpResponse
{
$fail = false;
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$user = $di->getSecurity()->register(User::fromRawPassword($_POST['login'], $_POST['password']));
if ($user !== null) {
http_response_code(303);
header('Location: ' . $di->getRouter()->url(''));
exit();
}
$fail = $user === null;
}
return HttpResponse::found('register', ['fail' => $fail]);
}
}

2
src/Silex/Controller/UserController.php
View File

@@ -28,7 +28,7 @@ class UserController
} else {
$nbCommentsByUser = 0;
}
return new HttpResponse(200, 'home', ['news' => $news, 'page' => $page, 'nbPages' => $nbPages, 'router' => $di->getRouter(), 'nbComments' => $nbComments, 'nbCommentsByUser' => $nbCommentsByUser]);
return new HttpResponse(200, 'home', ['news' => $news, 'page' => $page, 'nbPages' => $nbPages, 'nbComments' => $nbComments, 'nbCommentsByUser' => $nbCommentsByUser]);
}
public function viewPost(DI $di, array $params): HttpResponse

4
src/Silex/Gateway/NewsGateway.php
View File

@@ -24,7 +24,7 @@ class NewsGateway
*/
public function getPaginatedRecentNews(int $page = 1, int $limit = 10): array
{
$req = $this->pdo->prepare('SELECT title, LEFT(content, ' . self::EXCERPT_LENGTH . ') content, publication_date FROM news ORDER BY publication_date DESC LIMIT :limit OFFSET :offset;');
$req = $this->pdo->prepare('SELECT id_news, title, LEFT(content, ' . self::EXCERPT_LENGTH . ') content, publication_date FROM news ORDER BY publication_date DESC LIMIT :limit OFFSET :offset;');
$req->bindValue('limit', $limit, PDO::PARAM_INT);
$req->bindValue('offset', ($page - 1) * $limit, PDO::PARAM_INT);
if (!$req->execute()) {
@@ -61,6 +61,6 @@ class NewsGateway
private function createNews(array $data): News
{
return new News($data['title'], $data['content'], DateTime::createFromFormat('Y-m-d H:i:s', $data['publication_date']));
return new News(intval($data['id_news']), $data['title'], $data['content'], DateTime::createFromFormat('Y-m-d H:i:s', $data['publication_date']));
}
}

8
src/Silex/Gateway/UserGateway.php
View File

@@ -33,4 +33,12 @@ class UserGateway
$user = $req->fetch();
return $user === false ? null : $user;
}
public function insert(User $user): bool
{
$req = $this->pdo->prepare('INSERT INTO registered_user (login, password, role) VALUES (:login, :password, :role);');
$req->execute(['login' => $user->getLogin(), 'password' => $user->getPasswordHash(), 'role' => $user->getRole()]);
$user->setId(intval($this->pdo->lastInsertId()));
return true;
}
}

4
src/Silex/Http/HttpResponse.php
View File

@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace Silex\Http;
use Silex\Router\Router;
class HttpResponse
{
private int $status;
@@ -24,7 +26,7 @@ class HttpResponse
return new HttpResponse(200, $viewPath, $viewParams);
}
public function render(string $viewBasePath)
public function render(Router $router, string $viewBasePath)
{
$params = $this->viewParams;
ob_start();

9
src/Silex/Model/News.php
View File

@@ -8,17 +8,24 @@ use DateTime;
class News
{
private int $id;
private string $title;
private string $content;
private DateTime $publicationDate;
public function __construct(string $title, string $content, DateTime $publicationDate)
public function __construct(int $id, string $title, string $content, DateTime $publicationDate)
{
$this->id = $id;
$this->title = $title;
$this->content = $content;
$this->publicationDate = $publicationDate;
}
public function getId(): int
{
return $this->id;
}
public function getTitle(): string
{
return $this->title;

8
src/Silex/Model/User.php
View File

@@ -11,11 +11,12 @@ class User
private string $password;
private int $role;
public static function fromRawPassword(string $login, string $password): User
public static function fromRawPassword(string $login, string $password, int $role = 0): User
{
$user = new User();
$user->login = $login;
$user->password = password_hash($password, PASSWORD_DEFAULT);
$user->role = $role;
return $user;
}
@@ -38,4 +39,9 @@ class User
{
return $this->role;
}
public function setId(int $id)
{
$this->id_user = $id;
}
}

7
src/Silex/Router/Router.php
View File

@@ -56,7 +56,12 @@ class Router
public function url(string $url): string
{
return $this->basePath . '/' . $url;
if ($this->basePath !== '') {
return "/" . $this->basePath . '/' . $url;
} else {
return $this->basePath . '/' . $url;
}
}
public function run(DI $di): HttpResponse

10
src/Silex/Security/Security.php
View File

@@ -45,4 +45,14 @@ class Security
}
return $this->user;
}
public function register(User $user): ?User
{
if (!$this->userGateway->insert($user)) {
return null;
}
$this->session[USER] = $user->getId();
$this->user = $user;
return $user;
}
}

34
views/home.php
View File

@@ -7,30 +7,32 @@
</div>
<h1>Hello world!</h1>
<?php foreach ($params['news'] as $news) : ?>
<div class="card">
<header class="card-header">
<p class="card-header-title">
<?= $news->getTitle() ?>
</p>
</header>
<div class="card-content">
<div class="content">
<?= $news->getContent() ?>...
<a href="<?= $router->url('news/' . $news->getId()) ?>">
<div class="card">
<header class="card-header">
<p class="card-header-title">
<?= $news->getTitle() ?>
</p>
</header>
<div class="card-content">
<div class="content">
<?= $news->getContent() ?>...
</div>
</div>
</div>
</div>
</a>
<?php endforeach ?>
<nav class="pagination" role="navigation" aria-label="pagination">
<?php if ($params['page'] > 1) : ?>
<a class="pagination-previous" href="<?= $params['router']->url('recent/' . ($params['page'] - 1)) ?>">Previous</a>
<a class="pagination-previous" href="<?= $router->url('recent/' . ($params['page'] - 1)) ?>">Previous</a>
<?php endif; ?>
<?php if ($params['page'] < $params['nbPages']) : ?>
<a class="pagination-next" href="<?= $params['router']->url('recent/' . ($params['page'] + 1)) ?>">Next page</a>
<a class="pagination-next" href="<?= $router->url('recent/' . ($params['page'] + 1)) ?>">Next page</a>
<?php endif; ?>
<ul class="pagination-list">
<?php if ($params['page'] > 2) : ?>
<li>
<a class="pagination-link" aria-label="Goto page 1" href="<?= $params['router']->url('recent/1') ?>">1</a>
<a class="pagination-link" aria-label="Goto page 1" href="<?= $router->url('recent/1') ?>">1</a>
</li>
<?php if ($params['page'] > 3) : ?>
<li>
@@ -40,7 +42,7 @@
<?php endif; ?>
<?php if ($params['page'] > 1) : ?>
<li>
<a class="pagination-link" aria-label="Goto page <?= $params['page'] - 1 ?>" href="<?= $params['router']->url('recent/' . ($params['page'] - 1)) ?>"><?= $params['page'] - 1 ?></a>
<a class="pagination-link" aria-label="Goto page <?= $params['page'] - 1 ?>" href="<?= $router->url('recent/' . ($params['page'] - 1)) ?>"><?= $params['page'] - 1 ?></a>
</li>
<?php endif; ?>
<li>
@@ -48,7 +50,7 @@
</li>
<?php if ($params['page'] < ($params['nbPages'] - 1)) : ?>
<li>
<a class="pagination-link" aria-label="Goto page <?= $params['page'] + 1 ?>" href="<?= $params['router']->url('recent/' . ($params['page'] + 1)) ?>"><?= $params['page'] + 1 ?></a>
<a class="pagination-link" aria-label="Goto page <?= $params['page'] + 1 ?>" href="<?= $router->url('recent/' . ($params['page'] + 1)) ?>"><?= $params['page'] + 1 ?></a>
</li>
<?php if ($params['page'] < ($params['nbPages'] - 2)) : ?>
<li>
@@ -58,7 +60,7 @@
<?php endif; ?>
<?php if ($params['page'] < $params['nbPages']) : ?>
<li>
<a class="pagination-link" aria-label="Goto page <?= $params['nbPages'] ?>" href="<?= $params['router']->url('recent/' . $params['nbPages']) ?>"><?= $params['nbPages'] ?></a>
<a class="pagination-link" aria-label="Goto page <?= $params['nbPages'] ?>" href="<?= $router->url('recent/' . $params['nbPages']) ?>"><?= $params['nbPages'] ?></a>
</li>
<?php endif; ?>
</ul>

31
views/layout.php
View File

@@ -7,10 +7,29 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
</head>
<body>
<section class="section">
<div class="container">
<?= $content ?>
</div>
</section>
<nav class="navbar" role="navigation" aria-label="main navigation">
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-start">
<a class="navbar-item">Home</a>
</div>
<div class="navbar-end">
<div class="navbar-item">
<div class="buttons">
<a class="button is-primary" href="<?= $router->url('register') ?>">
<strong>Sign up</strong>
</a>
<a class="button is-light" href="<?= $router->url('login') ?>">Log in</a>
</div>
</div>
</div>
</div>
</nav>
<section class="section">
<div class="container">
<?= $content ?>
</div>
</section>
</body>
</html>
</html>

4
views/login.php
View File

@@ -12,13 +12,13 @@
<div class="field">
<label class="label" for="login">Login</label>
<div class="control">
<input class="input" type="text" id="login" name="login">
<input class="input" type="text" id="login" name="login" autocomplete="username">
</div>
</div>
<div class="field">
<label class="label" for="password">Password</label>
<div class="control">
<input class="input" type="password" id="password" name="password">
<input class="input" type="password" id="password" name="password" autocomplete="current-password">
</div>
</div>

36
views/register.php Normal file
View File

@@ -0,0 +1,36 @@
<?php if ($params['fail']) : ?>
<article class="message is-danger">
<div class="message-header">
<p>Registration failed</p>
</div>
<div class="message-body">
Login is already taken.
</div>
</article>
<?php endif ?>
<form action="<?= $_SERVER['REQUEST_URI'] ?>" method="post">
<div class="field">
<label class="label" for="login">Login</label>
<div class="control">
<input class="input" type="text" id="login" name="login" autocomplete="username">
</div>
</div>
<div class="field">
<label class="label" for="password">Password</label>
<div class="control">
<input class="input" type="password" id="password" name="password" autocomplete="new-password">
</div>
</div>
<div class="field">
<label class="label" for="password-confirmation">Password confirmation</label>
<div class="control">
<input class="input" type="password" id="password-confirmation" name="password-confirmation" autocomplete="new-password">
</div>
</div>
<div class="field">
<div class="control">
<button class="button is-link">Submit</button>
</div>
</div>
</form>