Modif beauté

migrations/Version20231127141946.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231127141946 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE avis (id INT AUTO_INCREMENT NOT NULL, note INT DEFAULT NULL, com VARCHAR(255) NOT NULL, id_ticket INT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE menu (id INT AUTO_INCREMENT NOT NULL, entre VARCHAR(255) DEFAULT NULL, plat VARCHAR(255) DEFAULT NULL, dessert VARCHAR(255) DEFAULT NULL, id_resto INT NOT NULL, id_users INT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE resa (id INT AUTO_INCREMENT NOT NULL, id_resto INT NOT NULL, nb_user INT NOT NULL, date_heur DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE resto (id INT AUTO_INCREMENT NOT NULL, pay VARCHAR(255) NOT NULL, ville VARCHAR(255) NOT NULL, address VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE ticket (id INT AUTO_INCREMENT NOT NULL, id_resto INT NOT NULL, id_users INT NOT NULL, payement VARCHAR(50) NOT NULL, id_menu INT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE user (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) NOT NULL, name VARCHAR(200) NOT NULL, fullname VARCHAR(200) NOT NULL, address VARCHAR(255) DEFAULT NULL, id_resto INT DEFAULT NULL, grade VARCHAR(50) DEFAULT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP TABLE avis');
+        $this->addSql('DROP TABLE menu');
+        $this->addSql('DROP TABLE resa');
+        $this->addSql('DROP TABLE resto');
+        $this->addSql('DROP TABLE ticket');
+        $this->addSql('DROP TABLE user');
+    }
+}

public/css/style.css

@@ -4,3 +4,44 @@ body .center {
   width: 95%;
   font: 18px/1.5 sans-serif;
 }
+
+nav {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px;
+}
+
+.logo-image,
+.account-image {
+  width: 50px; /* Ajustez la taille des images */
+  height: 50px; /* Ajoutez cette propriété pour maintenir la proportion */
+  object-fit: cover; /* Pour ajuster l'image sans déformer la proportion */
+  border-radius: 50%; /* Pour un effet de cercle */
+}
+
+.user-account {
+  position: relative;
+  display: inline-block;
+}
+
+.hover-text {
+  display: none;
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  padding: 10px;
+  background-color: #18232c;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
+}
+
+.user-account:hover .hover-text {
+  display: block;
+}
+
+.list {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}

src/Entity/User.php

@@ -45,7 +45,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     private ?int $id_resto = null;
 
     #[ORM\Column(length: 50, nullable: true)]
-    private ?string $grade = "client";
+    private ?string $grade = "Client";
 
     public function getId(): ?int
     {

templates/avis/new.html.twig

@@ -3,9 +3,13 @@
 {% block title %}New Avis{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Create new Avis</h1>
 
+    <article>
         {{ include('avis/_form.html.twig') }}
 
         <a href="{{ path('app_avis_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/avis/show.html.twig

@@ -3,8 +3,10 @@
 {% block title %}Avis{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Avis</h1>
 
+    <article>
         <table class="table">
             <tbody>
                 <tr>
@@ -27,4 +29,6 @@
         </table>
 
         <a href="{{ path('app_avis_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/base.html.twig

@@ -14,6 +14,42 @@
         {% endblock %}
     </head>
     <body>
+        <nav class="center">
+            <a href="/" class="logo">
+                <img src="https://www.edigitalagency.com.au/wp-content/uploads/McDonalds-logo-png.png" alt="Logo McDonald's" class="logo-image" />
+            </a>
+            McDo
+            <div class="user-account">
+                <img src="https://icon-library.com/images/profile-icon-white/profile-icon-white-22.jpg" alt="Image de compte utilisateur" class="account-image" />
+                <div class="hover-text">
+                    {% if not app.user %}
+                        <div class="list">
+                            <span><a href="/user/login">Connexion</a></span>
+                            <span><a href="/user/signup">Inscription</a></span>
+                        </div>
+                    {% else %}
+                        <div class="list">
+                            <span>{{ app.user.email }}</span>
+                            {% set roles = app.user.roles %}
+                            {% if 'ROLE_Root' in roles or 'ROLE_Waiter' in roles or 'ROLE_Chef' in roles %}
+                                <span><a href="/service/ticket">Ticket</a></span>
+                                <span><a href="/service/resa">Réservation</a></span>
+                            {% endif %}
+                            {% if 'ROLE_Root' in roles or 'ROLE_Chef' in roles %}
+                                <span><a href="/chef/menu">Menu</a></span>
+                            {% endif %}
+                            {% if 'ROLE_Root' in roles %}
+                                <span><a href="/admin/user">User</a></span>
+                                <span><a href="/admin/resto">Restaurant</a></span>
+                            {% endif %}
+                            <span><a href="/avis">Avis</a></span>
+                            <span><a href="/user/logout">Logout</a></span>
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </nav>
+
         {% block body %}{% endblock %}
     </body>
 </html>

templates/home/index.html.twig

@@ -5,10 +5,9 @@
 {% block body %}
 
 <div class="center">
-    <h1>Bienvenue chez McDoPlus !</h1>
     
 {% if not app.user %}
-    <p>compte utilisateur c'est <code><a href="/user">ici</a></code></p>
+    <h1>Bienvenue chez McDoPlus !</h1>
     <h5>Menu par Resto :</h5>
     <ul>
     {% for resto in restos %}
@@ -16,7 +15,7 @@
     {% endfor %}
     </ul>
 {% else %}
-    <p>Laisser un avis <code><a href="/avis">ici</a></code></p>
+    <h1>Salut {{ app.user.email }}</h1>
     <h5>Réserver/Commander :</h5>
     <ul>
     {% for resto in restos %}

templates/menu_chef/edit.html.twig

@@ -3,11 +3,13 @@
 {% block title %}Edit Menu{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Edit Menu</h1>
-
+    <article>
         {{ include('menu_chef/_form.html.twig', {'button_label': 'Update'}) }}
 
-    <a href="{{ path('app_menu_chef_index') }}">back to list</a>
-
         {{ include('menu_chef/_delete_form.html.twig') }}
+        <a href="{{ path('app_menu_chef_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/menu_chef/new.html.twig

@@ -3,9 +3,13 @@
 {% block title %}New Menu{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Create new Menu</h1>
     
+    <article>
         {{ include('menu_chef/_form.html.twig') }}
 
         <a href="{{ path('app_menu_chef_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/menu_chef/show.html.twig

@@ -3,8 +3,10 @@
 {% block title %}Menu{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Menu</h1>
 
+    <article>
         <table class="table">
             <tbody>
                 <tr>
@@ -33,10 +35,10 @@
                 </tr>
             </tbody>
         </table>
-
+        <p><a href="{{ path('app_menu_chef_edit', {'id': menu.id}) }}">edit</a></p>
-    <a href="{{ path('app_menu_chef_index') }}">back to list</a>
-
-    <a href="{{ path('app_menu_chef_edit', {'id': menu.id}) }}">edit</a>
 
         {{ include('menu_chef/_delete_form.html.twig') }}
+        <p><a href="{{ path('app_menu_chef_index') }}">back to list</a></p>
+    </article>
+</div>
 {% endblock %}

templates/resto_admin/edit.html.twig

@@ -3,11 +3,15 @@
 {% block title %}Edit Resto{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Edit Resto</h1>
 
+    <article>
         {{ include('resto_admin/_form.html.twig', {'button_label': 'Update'}) }}
 
-    <a href="{{ path('app_resto_admin_index') }}">back to list</a>
-
         {{ include('resto_admin/_delete_form.html.twig') }}
+
+        <a href="{{ path('app_resto_admin_index') }}">back to list</a>
+    </article
+</div>
 {% endblock %}

templates/resto_admin/new.html.twig

@@ -3,9 +3,13 @@
 {% block title %}New Resto{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Create new Resto</h1>
 
+    <article>
         {{ include('resto_admin/_form.html.twig') }}
 
         <a href="{{ path('app_resto_admin_index') }}">back to list</a>
+    </article
+</div>
 {% endblock %}

templates/resto_admin/show.html.twig

@@ -3,8 +3,10 @@
 {% block title %}Resto{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Resto</h1>
 
+    <article>
         <table class="table">
             <tbody>
                 <tr>
@@ -26,9 +28,11 @@
             </tbody>
         </table>
 
-    <a href="{{ path('app_resto_admin_index') }}">back to list</a>
+        <p><a href="{{ path('app_resto_admin_edit', {'id': resto.id}) }}">edit</a></p>
-
-    <a href="{{ path('app_resto_admin_edit', {'id': resto.id}) }}">edit</a>
 
         {{ include('resto_admin/_delete_form.html.twig') }}
+
+        <a href="{{ path('app_resto_admin_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/ticket_service/edit.html.twig

@@ -3,11 +3,15 @@
 {% block title %}Edit Ticket{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Edit Ticket</h1>
 
+    <article>
         {{ include('ticket_service/_form.html.twig', {'button_label': 'Update'}) }}
 
-    <a href="{{ path('app_ticket_service_index') }}">back to list</a>
-
         {{ include('ticket_service/_delete_form.html.twig') }}
+
+        <a href="{{ path('app_ticket_service_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/ticket_service/new.html.twig

@@ -3,9 +3,13 @@
 {% block title %}New Ticket{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Create new Ticket</h1>
 
+    <article>
         {{ include('ticket_service/_form.html.twig') }}
 
         <a href="{{ path('app_ticket_service_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/ticket_service/show.html.twig

@@ -3,8 +3,10 @@
 {% block title %}Ticket{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Ticket</h1>
 
+    <article>
         <table class="table">
             <tbody>
                 <tr>
@@ -30,9 +32,11 @@
             </tbody>
         </table>
 
-    <a href="{{ path('app_ticket_service_index') }}">back to list</a>
+        <p><a href="{{ path('app_ticket_service_edit', {'id': ticket.id}) }}">edit</a></p>
-
-    <a href="{{ path('app_ticket_service_edit', {'id': ticket.id}) }}">edit</a>
 
         {{ include('ticket_service/_delete_form.html.twig') }}
+
+        <a href="{{ path('app_ticket_service_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/user_admin/new.html.twig

@@ -3,9 +3,13 @@
 {% block title %}New User{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>Create new User</h1>
 
+    <article>
         {{ include('user_admin/_form.html.twig') }}
 
         <a href="{{ path('app_user_admin_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}

templates/user_admin/show.html.twig

@@ -3,8 +3,10 @@
 {% block title %}User{% endblock %}
 
 {% block body %}
+<div class="center">
     <h1>User</h1>
 
+    <article>
         <table class="table">
             <tbody>
                 <tr>
@@ -42,9 +44,11 @@
             </tbody>
         </table>
 
-    <a href="{{ path('app_user_admin_index') }}">back to list</a>
+        <p><a href="{{ path('app_user_admin_edit', {'id': user.id}) }}">edit</a></p>
-
-    <a href="{{ path('app_user_admin_edit', {'id': user.id}) }}">edit</a>
 
         {{ include('user_admin/_delete_form.html.twig') }}
+        
+        <a href="{{ path('app_user_admin_index') }}">back to list</a>
+    </article>
+</div>
 {% endblock %}