diff --git a/.idea/HegreEtConfort.iml b/.idea/HegreEtConfort.iml index af6cce8..f4221e4 100644 --- a/.idea/HegreEtConfort.iml +++ b/.idea/HegreEtConfort.iml @@ -3,7 +3,6 @@ - diff --git a/assets/styles/css/intervention.css b/assets/styles/css/intervention.css index e69de29..2121fcd 100644 --- a/assets/styles/css/intervention.css +++ b/assets/styles/css/intervention.css @@ -0,0 +1,36 @@ +body { + background: #A6CD9E !important; +} + +.background { + background-color: #7D9599; + position: absolute; + width: 100%; + height: 80%; +} +.background-intervention { + background-color: #A0C2C8; + position: absolute; + box-shadow: 0 0 30px 1px black; + border-radius: 5%; + + margin: 2% 0 0 20%; + width: 60%; + height: 70%; +} + +.logoCalendar { + position: absolute; + margin: 1% 0 0 5%; + width: 5%; +} + +h1 { + position: absolute; + margin: 5% 0 0 11%; +} + +.from { + position: absolute; + margin: 15% 15% 15% 15%; +} \ No newline at end of file diff --git a/assets/styles/css/login.css b/assets/styles/css/login.css index c8fb87d..3acf4b0 100644 --- a/assets/styles/css/login.css +++ b/assets/styles/css/login.css @@ -1,5 +1,5 @@ body { - background: url("../image/fond.png") center center / cover no-repeat; + background: url("../image/fond.png") center center / cover no-repeat !important; } .logo { @@ -28,14 +28,14 @@ body { margin: 27% 0 0 36%; height: 10%; } -.profile { +#profile { position: absolute; border-radius: 2%; margin: 20% 0 0 42%; width: 22%; height: 5%; } -.password { +#password { position: absolute; border-radius: 2%; margin: 27% 0 0 42%; diff --git a/assets/styles/image/calendar.png b/assets/styles/image/calendar.png new file mode 100644 index 0000000..8dbf226 Binary files /dev/null and b/assets/styles/image/calendar.png differ diff --git a/src/Controller/AuthenticationController.php b/src/Controller/AuthenticationController.php index c6be245..d8e6b43 100644 --- a/src/Controller/AuthenticationController.php +++ b/src/Controller/AuthenticationController.php @@ -18,7 +18,7 @@ class AuthenticationController extends AbstractController // last username entered by the user $lastUsername = $authenticationUtils->getLastUsername(); - return $this->render('authentication/index.html.twig', [ + return $this->render('login/index.html.twig', [ 'last_username' => $lastUsername, 'error' => $error, ]); diff --git a/templates/intervention/add.html.twig b/templates/intervention/add.html.twig index 72b0f43..75d67d8 100644 --- a/templates/intervention/add.html.twig +++ b/templates/intervention/add.html.twig @@ -1,10 +1,26 @@ -{# templates/user/add.html.twig #} -{% extends 'base.html.twig' %} + + + + + Créer Une Intervention + + + -{% block title %}Ajouter une intervention {% endblock %} + -{% block body %} -

Ajouter une intervention

+ {% block stylesheets %} + {% endblock %} + + +
+ Logo Calendrier +

Créer Une Intervention

- {{ form(form) }} -{% endblock %} +
+
{{ form(form) }}
+
+ + diff --git a/templates/login/index.html.twig b/templates/login/index.html.twig index 86898e2..46d3c81 100644 --- a/templates/login/index.html.twig +++ b/templates/login/index.html.twig @@ -11,7 +11,6 @@ - {% block stylesheets %} {% endblock %} @@ -25,12 +24,26 @@ Logo Profil Logo Password - +
+ {% if error %} +
{{ error.messageKey|trans(error.messageData, 'security') }}
+ {% endif %} + + {% if app.user %} +
+ Vous êtes connecté en tant que {{ app.user.userIdentifier }}, Déconnexion +
+ {% endif %} + +