From b983fabd887f9ee645edaad6f7748dda0c16cd0c Mon Sep 17 00:00:00 2001
From: karapuce <typhaine.demangeon@gmail.com>
Date: Fri, 15 May 2020 10:56:07 +0200
Subject: [PATCH 1/3] maj des titres

---
 src/View/Account/index.html.twig      | 4 ++++
 src/View/Bouquet/index.html.twig      | 2 +-
 src/View/Bouquet/show.html.twig       | 2 +-
 src/View/Front/bouquets.html.twig     | 2 +-
 src/View/Galerie/index.html.twig      | 2 +-
 src/View/Layout/navbarAdmin.html.twig | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/View/Account/index.html.twig b/src/View/Account/index.html.twig
index 114fa05..071b81e 100644
--- a/src/View/Account/index.html.twig
+++ b/src/View/Account/index.html.twig
@@ -1,5 +1,9 @@
 {% extends 'layoutp.html.twig' %}
 
+{% block title %}
+    {{ parent() }} Connexion
+{% endblock %}
+
 {% block content %}
     <section class="uk-container uk-padding-large" id="login">
         <form action="" class="uk-margin uk-width-large uk-margin-auto uk-card uk-card-default uk-card-body uk-box-shadow-large" method="post">
diff --git a/src/View/Bouquet/index.html.twig b/src/View/Bouquet/index.html.twig
index 1b1a1d3..915cb3a 100644
--- a/src/View/Bouquet/index.html.twig
+++ b/src/View/Bouquet/index.html.twig
@@ -1,6 +1,6 @@
 {% extends 'layout.html.twig' %}
 {% block title %}
-    {{ parent() }} Bouquet
+    {{ parent() }} Bouquets
 {% endblock %}
 
 {% block content %}
diff --git a/src/View/Bouquet/show.html.twig b/src/View/Bouquet/show.html.twig
index 44cca5c..d7dd5ea 100644
--- a/src/View/Bouquet/show.html.twig
+++ b/src/View/Bouquet/show.html.twig
@@ -10,7 +10,7 @@
             </div>
             <div>
                 <div class="uk-card-body">
-                    <h3 class="uk-card-title">Fiche produit bouquet</h3>
+                    <h3 class="uk-card-title">Fiche produit du bouquet</h3>
                     <ul>
                         <li class="uk-margin">Nom : {{ bouquet.nom }}</li>
                         <li class="uk-margin">Prix : {{ bouquet.prix }} €</li>
diff --git a/src/View/Front/bouquets.html.twig b/src/View/Front/bouquets.html.twig
index 2bfecd9..c719e21 100644
--- a/src/View/Front/bouquets.html.twig
+++ b/src/View/Front/bouquets.html.twig
@@ -1,6 +1,6 @@
 {% extends 'layoutp.html.twig' %}
 {% block title %}
-    {{ parent()}} Accueil
+    {{ parent()}} Bouquets
 {% endblock %}
 {% block content %}
     {% if bouquets == null %}
diff --git a/src/View/Galerie/index.html.twig b/src/View/Galerie/index.html.twig
index 6d1d0bd..15505bf 100644
--- a/src/View/Galerie/index.html.twig
+++ b/src/View/Galerie/index.html.twig
@@ -1,6 +1,6 @@
 {% extends 'layout.html.twig' %}
 {% block title %}
-    {{ parent() }} Bouquet
+    {{ parent() }} Galerie
 {% endblock %}
 
 {% block content %}
diff --git a/src/View/Layout/navbarAdmin.html.twig b/src/View/Layout/navbarAdmin.html.twig
index 9ca53ba..ec9e392 100644
--- a/src/View/Layout/navbarAdmin.html.twig
+++ b/src/View/Layout/navbarAdmin.html.twig
@@ -1,7 +1,7 @@
 <nav id="navbar">
     <ul id="admin">
         <li><a href="/Home/index/"><span uk-icon="home"></span> Accueil</a></li>
-        <li><a href="/Bouquet/index"><span uk-icon="lifesaver"></span> Bouquet</a></li>
+        <li><a href="/Bouquet/index"><span uk-icon="lifesaver"></span> Bouquets</a></li>
         <li><a href="/CatalogueU/index"><span uk-icon="thumbnails"></span> Catalogue Unitaire</a></li>
         <li><a href="/User/index"><span uk-icon="users"></span> Utilisateurs</a></li>
         <li><a href="/Galerie/index"><span uk-icon="image"></span> Galerie</a></li>

From a6419de9d80805e2232228ea7c38a5b34d594906 Mon Sep 17 00:00:00 2001
From: karapuce <typhaine.demangeon@gmail.com>
Date: Fri, 15 May 2020 11:14:47 +0200
Subject: [PATCH 2/3] admin recap

---
 src/Controller/UserController.php | 33 ++++++++++++++-
 src/View/User/index.html.twig     |  8 ++--
 src/View/User/showAdmin.html.twig | 68 +++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 src/View/User/showAdmin.html.twig

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 17f7a7f..f86a8f2 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -51,7 +51,7 @@ public function add()
                     $user = [
                         'firstname' => ucfirst($_POST['firstname']),
                         'lastname' => strtoupper($_POST['lastname']),
-                        'password' => password_hash($_POST['password'], PASSWORD_BCRYPT),
+                        'password' => $_POST['password'],
                         'mail' => strtolower($_POST['mail']),
                         'tel' => $_POST['tel'],
                     ];
@@ -99,7 +99,7 @@ public function update(int $id)
                 et contenir au moins une majuscule et un chiffre";
                         return $this->twig->render('User/update.html.twig', ['user' => $user, 'message' => $message]);
                     } else {
-                        $user['password'] = password_hash($_POST['password'], PASSWORD_BCRYPT);
+                        $user['password'] =$_POST['password'];
                         $userManager->update($user);
                         $user = $userManager->selectOneById($id);
                         $cartid = $cartManager->historiqueID($id);
@@ -175,6 +175,35 @@ public function show(int $id)
         }
     }
 
+    public function showAd($id)
+    {
+        if ($_SESSION["role"] == "admin") {
+            $userManager = new UserManager();
+            $cartManager = new CartManager();
+
+            $user = $userManager->selectOneById($id);
+            $cartid = $cartManager->historiqueID($id);
+            if ($cartid) {
+                $cartid = $cartid['id'];
+                $cart = $cartManager->showCartContent($cartid);
+                $concepts = $cartManager->conceptInCart($cartid);
+                $recap = $cartManager->showPriceCart($cartid);
+                return $this->twig->render('User/showAdmin.html.twig', [
+                    'user' => $user,
+                    "cart" => $cart,
+                    "concepts"=>$concepts,
+                    "recap"=>$recap,
+                ]);
+            } else {
+                return $this->twig->render('User/showAdmin.html.twig', [
+                    'user' => $user,
+                ]);
+            }
+        } else {
+            header('location:/Account/login/');
+        }
+    }
+
     /**
      * @param int $id
      */
diff --git a/src/View/User/index.html.twig b/src/View/User/index.html.twig
index 34650b9..1934f64 100644
--- a/src/View/User/index.html.twig
+++ b/src/View/User/index.html.twig
@@ -17,8 +17,7 @@
         <th>Prénom</th>
         <th>Mail</th>
         <th>Téléphone</th>
-        <th>Dernière commande</th>
-        <th class="uk-table-expand"></th>
+        <th class="uk-table-expand">Actions</th>
         </thead>
         <tbody>
 
@@ -42,8 +41,9 @@
             <td>{{ user.firstname }}</td>
             <td>{{ user.mail }}</td>
             <td>{{ user.num_Tel }}
-            <td class="uk-table-expand">{{ user.historique }}</td>
-            <td><a href="/User/update/{{ user.id }}"><span uk-icon="pencil"></span></a>
+            <td>
+                <a href="/User/showAd/{{user.id}}"><span uk-icon="info"></span></a>
+                <a href="/User/update/{{ user.id }}"><span uk-icon="pencil"></span></a>
                 <a href="#modal-example-{{ user.id }}" uk-toggle><span uk-icon="trash"></span></a>
             </td>
         </tr>
diff --git a/src/View/User/showAdmin.html.twig b/src/View/User/showAdmin.html.twig
new file mode 100644
index 0000000..5b5e6ff
--- /dev/null
+++ b/src/View/User/showAdmin.html.twig
@@ -0,0 +1,68 @@
+{% extends 'layout.html.twig' %}
+{% block title %}
+    {{ parent()}} Profil
+{% endblock %}
+{% block content %}
+    <div class="uk-container uk-margin-top">
+        <h3 class="uk-text-center">Profil de {{ user.firstname }} {{ user.lastname }}</h3>
+        <div class="uk-card uk-card-default uk-width-1-1@m">
+            <div class="uk-card-header uk-background-muted">
+                <div class="uk-grid-small uk-flex-middle" uk-grid>
+                    <div class="uk-width-expand">
+                        <p class="uk-text-meta uk-margin-remove-top">Adresse mail: {{ user.mail }}</p>
+                        <p class="uk-text-meta uk-margin-remove-top">Numéro de téléphone: {{ user.num_Tel }}</p>
+
+                    </div>
+                </div>
+            </div>
+            <div class="uk-card-body">
+                <h3>Commande la plus récente </h3>
+                <table class="uk-table ">
+                    {% if recap == null %}
+                    <tr> Aucune commande récente </tr>
+                    {% else %}
+
+                    <thead class="uk-background-muted">
+                    <tr>
+                        <th>DATE</th>
+                        <th>PRIX</th>
+                    </tr>
+                    </thead>
+                    <tr>
+                        <td>{{ recap.date }}</td>
+                        <td>{{ recap.prix_total }}</td>
+                    </tr>
+                    <tr>
+                        <th colspan="2" class="uk-background-muted">CONTENU</th>
+                    </tr>
+                    {% for item in cart %}
+                        <tr>
+                            <td>{{ item.quantite }} * {{ item.nom }}</td>
+                        </tr>
+                    {% endfor %}
+                        {% if concepts != null %}
+                            <tr>
+                                <th colspan="2" class="uk-text-center">Bouquet personnalisé</th>
+                            </tr>
+                            {% for concept in concepts %}
+
+                                <tr>
+                                    <td class="uk-text-center">1</td>
+                                    <td class="uk-text-center">
+                                        {{ concept.produit }}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        {% endif %}
+                    {% endif %}
+                </table>
+            </div>
+            <div class="uk-card-footer uk-text-center">
+                <a class="uk-button uk-button-secondary" href="/User/index">Retour</a>
+            </div>
+        </div>
+    </div>
+
+
+
+{% endblock %}
\ No newline at end of file

From 53d4287d28957fc05bb24f2f5d35fbff33d9f16c Mon Sep 17 00:00:00 2001
From: Kara <47446005+karapuce@users.noreply.github.com>
Date: Fri, 15 May 2020 11:18:30 +0200
Subject: [PATCH 3/3] Update UserController.php

---
 src/Controller/UserController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index f86a8f2..e82dca5 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -51,7 +51,7 @@ public function add()
                     $user = [
                         'firstname' => ucfirst($_POST['firstname']),
                         'lastname' => strtoupper($_POST['lastname']),
-                        'password' => $_POST['password'],
+                        'password' => password_hash($_POST['password'], PASSWORD_BCRYPT),
                         'mail' => strtolower($_POST['mail']),
                         'tel' => $_POST['tel'],
                     ];
@@ -99,7 +99,7 @@ public function update(int $id)
                 et contenir au moins une majuscule et un chiffre";
                         return $this->twig->render('User/update.html.twig', ['user' => $user, 'message' => $message]);
                     } else {
-                        $user['password'] =$_POST['password'];
+                        $user['password'] = password_hash($_POST['password'], PASSWORD_BCRYPT);
                         $userManager->update($user);
                         $user = $userManager->selectOneById($id);
                         $cartid = $cartManager->historiqueID($id);