oupson
/
cc34
mirror of https://pdicost.univ-orleans.fr/git/scm/wfcc/cc34.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 in WFCC/cc34 from 11-Embellissement to master 

* commit 'be231eac3c35d3874b05bbae14a607bf54a7adab':
  Ajout des bouton (Connexion/Déconnexion) dans le navbar pour la question 11
This commit is contained in:
Zhu Francois 2023-02-08 18:53:31 +01:00
parent 26e80c5475 be231eac3c
commit c6920ba713
3 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/AtelierController.php
View File

@ -82,7 +82,7 @@ class AtelierController extends AbstractController
if ($atelier->getInstructeur() !== $this->getUser()) { if ($atelier->getInstructeur() !== $this->getUser()) {
return $this->render("error.html.twig", [], new Response(null, Response::HTTP_FORBIDDEN)); return $this->render("error.html.twig", [], new Response(null, Response::HTTP_FORBIDDEN));
} }
if ($this->isCsrfTokenValid('delete' . $atelier->getId(), $request->request->get('_token'))) { if ($this->isCsrfTokenValid('delete' . $atelier->getId(), $request->request->get('_token'))) {
$atelierRepository->remove($atelier, true); $atelierRepository->remove($atelier, true);
} }

11
templates/base.html.twig
View File

@ -16,7 +16,7 @@
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#">CC34</a> <a class="navbar-brand" href="#">CC34</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@ -32,8 +32,15 @@
</li> </li>
</ul> </ul>
</div> </div>
{% if app.user %}
<div class="me-2">
<span class="navbar-text">{{ app.user.nom }} {{ app.user.prenom }}</span>
</div>
<a class="btn btn-secondary" href="{{ path('app_logout') }}">Se déconnecter</a>
{% elseif not app.user %}
<a class="btn btn-success" href="{{ path('app_login') }}">Se connecter</a>
{% endif %}
</div> </div>
</nav> </nav>
<div class="container">{% block body %}{% endblock %}</div> <div class="container">{% block body %}{% endblock %}</div>

84
templates/security/login.html.twig
View File

@ -1,42 +1,42 @@
{% extends 'base.html.twig' %} {% extends 'base.html.twig' %}
{% block title %}Log in!{% endblock %} {% block title %}Log in!{% endblock %}
{% block body %} {% block body %}
<form method="post"> <form method="post">
{% if error %} {% if error %}
<div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div> <div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
{% endif %} {% endif %}
{% if app.user %} {% if app.user %}
<div class="mb-3"> <div class="mb-3">
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a> You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a>
</div> </div>
{% endif %} {% endif %}
<h1 class="h3 mb-3 font-weight-normal">Please sign in</h1> <h1 class="h3 mb-3 font-weight-normal">Veuillez-vous connecter</h1>
<label for="inputEmail">Email</label> <label for="inputEmail">Email</label>
<input type="email" value="{{ last_username }}" name="email" id="inputEmail" class="form-control" autocomplete="email" required autofocus> <input type="email" value="{{ last_username }}" name="email" id="inputEmail" class="form-control" autocomplete="email" required autofocus>
<label for="inputPassword">Password</label> <label for="inputPassword">Mot de passe</label>
<input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password" required> <input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password" required>
<input type="hidden" name="_csrf_token" <input type="hidden" name="_csrf_token"
value="{{ csrf_token('authenticate') }}" value="{{ csrf_token('authenticate') }}"
> >
{# {#
Uncomment this section and add a remember_me option below your firewall to activate remember me functionality. Uncomment this section and add a remember_me option below your firewall to activate remember me functionality.
See https://symfony.com/doc/current/security/remember_me.html See https://symfony.com/doc/current/security/remember_me.html
<div class="checkbox mb-3"> <div class="checkbox mb-3">
<label> <label>
<input type="checkbox" name="_remember_me"> Remember me <input type="checkbox" name="_remember_me"> Remember me
</label> </label>
</div> </div>
#} #}
<button class="btn btn-lg btn-primary" type="submit"> <button class="btn btn-primary mt-4" type="submit">
Sign in Se connecter
</button> </button>
</form> </form>
{% endblock %} {% endblock %}