Merge branch 'develop' into features/background

src/Service/UserManager.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Entity\Profile;
 use App\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
@@ -29,6 +30,7 @@ class UserManager
     public function createUser($username, $password, $nom, $prenom, $mail, $roles, $activated)
     {
         $user = new User();
+        $options = new Profile();
         $user->setUsername($username);
         $user->setPrenom($prenom);
         $user->setNom($nom);
@@ -36,6 +38,7 @@ class UserManager
         $user->setRoles($roles);
         $user->setActivated($activated);
         $user->setPassword($password);
+        $user->setProfile($options);
         $this->enregistrerUser($user);
     }
 
@@ -57,6 +60,11 @@ class UserManager
         $encoded = $this->passwordEncoder->hashPassword($user, $user->getPassword());
         $user->setPassword($encoded);
         $this->generateToken($user);
+        if ($user->getProfile() === null)
+        {
+            $options = new Profile();
+            $user->setProfile($options);
+        }
         $this->em->persist($user);
         $this->em->flush();
     }

templates/genre/ajouter.html.twig

@@ -5,7 +5,7 @@
 {% block body %}
     {{  form_start(form) }}
     {{ form_rest(form) }}
-	<button class="btn btn-primary" type="submit" formmethod="post">Enregistrer</button>
+	<button class="btn btn-primary my-3" type="submit" formmethod="post">Enregistrer</button>
     {{  form_end(form) }}
 
 {% endblock %}

templates/navbar.html.twig

@@ -105,11 +105,11 @@
                     <a class="nav-link dropdown-toggle" href="#" id="navbarUserDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         {{ app.user.nomComplet }}
                     </a>
-                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarUserDropdown">
-                        <a class="dropdown-item" href="{{ path('user_profil') }}">Profil</a>
-                        <a class="dropdown-item" href="{{ path('user_preferences') }}">Préférences</a>
+                    <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarUserDropdown">
+                        <a class="dropdown-item" href="{{ path('user_profil') }}"><i class="fa fa-user"></i> Profil</a>
+                        <a class="dropdown-item" href="{{ path('user_preferences') }}"><i class="fa fa-cog"></i> Préférences</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="{{ path('app_logout') }}">Se déconnecter</a>
+                        <a class="dropdown-item" href="{{ path('app_logout') }}"><i class="fa fa-sign-out"></i> Se déconnecter</a>
                     </div>
                 </li>
             </ul>

templates/realisateur/ajouter.html.twig

@@ -5,7 +5,7 @@
 {% block body %}
     {{  form_start(form) }}
     {{ form_rest(form) }}
-	<button class="btn btn-primary" type="submit" formmethod="post">Enregistrer</button>
+	<button class="btn btn-primary my-3" type="submit" formmethod="post">Enregistrer</button>
     {{  form_end(form) }}
 
 {% endblock %}

templates/realisateur/liste.html.twig

@@ -28,9 +28,9 @@
 			</td>
 			<td>
 				{% if is_granted('ROLE_ADMIN') %}
-				<a href="{{ path('realisateur_supprimer', {'id': realisateur.id})  }}"><i class="fa fa-trash fa-lg", style="color:Tomato;"></i></a>
+				<a href="{{ path('realisateur_supprimer', {'id': realisateur.id})  }}"><i class="fa fa-trash fa-lg text-danger"></i></a>
 				{% endif %}
-				<a href="{{ path('realisateur_modifier', {'id': realisateur.id})  }}"><i class="fa fa-edit fa-lg", style="color:DodgerBlue;"></i></a>
+				<a href="{{ path('realisateur_modifier', {'id': realisateur.id})  }}"><i class="fa fa-edit fa-lg text-primary"></i></a>
 
 
 			</td>

templates/realisateur/modifier.html.twig

@@ -4,14 +4,14 @@
 {% block titre %}Réalisateurs - Modifier{% endblock %}
 
 {% block body %}
-	<div class="row">
-		<div class="col">
+	<div class="d-flex justify-content-around">
+		<div class="">
 			{{  form_start(form) }}
 			{{ form_rest(form) }}
-			<button class="btn btn-primary" type="submit" formmethod="post">Enregistrer</button>
+			<button class="btn btn-primary my-3" type="submit" formmethod="post">Enregistrer</button>
 			{{  form_end(form) }}
 		</div>
-		<div class="col">
+		<div class="">
 			<h2>Liste des films de ce réalisateur</h2>
 			<ul>
 				{% for film in realisateur.films %}

templates/videotheque/liste_vignettes.html.twig

@@ -9,26 +9,30 @@
 {% endblock %}
 
 {% block body %}
-	<div class="row">
-		{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
-		<p><a class="btn btn-primary" role="button" href="{{ path('videotheque_ajouter') }}"><i class="fa fa-plus-square fa-lg"></i> Ajouter un film</a></p>
-		{% endif %}
-		<p>Filtrer par film au dessus de
-		<input class="rating"
-			data-disabled="false"
-			data-language="fr"
-			data-show-clear="true"
-			data-show-caption="false"
-			data-theme="krajee-fa"
-			data-toggle="star-filter"
-			data-path="#tableFilms"
-			style="display:none;"
-			min=0
-			max=5
-			data-step=1
-			data-size="sm"
-			value="0">
-		</p>
+	<div class="d-flex justify-content-between">
+		<div class="">
+			{% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
+			<p><a class="btn btn-primary" role="button" href="{{ path('videotheque_ajouter') }}"><i class="fa fa-plus-square fa-lg"></i> Ajouter un film</a></p>
+			{% endif %}
+		</div>
+		<div class="">
+			<p>Filtrer par film au dessus de
+			<input class="rating"
+				data-disabled="false"
+				data-language="fr"
+				data-show-clear="true"
+				data-show-caption="false"
+				data-theme="krajee-fa"
+				data-toggle="star-filter"
+				data-path="#tableFilms"
+				style="display:none;"
+				min=0
+				max=5
+				data-step=1
+				data-size="sm"
+				value="0">
+			</p>
+		</div>
 	</div>