From 2469823f9de1eb8496ac849fa4ab94c81515f85d Mon Sep 17 00:00:00 2001
From: Capelier-Marla <marla.capelier@etu.univ-amu.fr>
Date: Tue, 17 Jan 2023 12:05:30 +0100
Subject: [PATCH] moved edit page to user view, to replace view.php, and edited
 Controller to show the right page

---
 Controllers/UserController.php   |  2 +-
 Views/{account => user}/edit.php | 20 ++++++++------------
 Views/user/view.php              |  8 --------
 3 files changed, 9 insertions(+), 21 deletions(-)
 rename Views/{account => user}/edit.php (58%)
 delete mode 100644 Views/user/view.php

diff --git a/Controllers/UserController.php b/Controllers/UserController.php
index a959e80..4ea81b0 100644
--- a/Controllers/UserController.php
+++ b/Controllers/UserController.php
@@ -108,6 +108,6 @@ final class UserController
         $O_userModel = new UserModel();
         $A_user = $O_userModel->getUserByID($_SESSION["ID"]);
 
-        return View::show("user/view", $A_user);
+        return View::show("user/edit", $A_user);
     }
 }
diff --git a/Views/account/edit.php b/Views/user/edit.php
similarity index 58%
rename from Views/account/edit.php
rename to Views/user/edit.php
index 41fb170..f4c50ff 100644
--- a/Views/account/edit.php
+++ b/Views/user/edit.php
@@ -1,28 +1,24 @@
-<?php
-    $array_account = array(
-        "username" => "Jean_Michel_du_13",
-        "email" => "jeanmicheldu13@gmail.com"
-    );
-?>
-
 <main>
-    <a href="/disconnect">Se déconnecter</a>
 
-    <form action="/account/disconnect" method="post">
+    <?php if($A_view["ADMIN"]) echo "<p>Compte administrateur</p>"; ?>
+
+    <a href="/user/logout">Se déconnecter</a>
+
+    <form action="/user/edit" method="post">
         <label for="profilPicture">Changer l'image de profil&nbsp;</label>
         <input type="file" name="profilPicture" id="profilPicture" accept="image/*">
 
         <label for="username">Changer le nom d'utilisateur&nbsp;</label>
-        <input type="text" name="username" id="username" placeholder="<?= $array_account["username"] ?>">
+        <input type="text" name="username" id="username" placeholder="<?= $A_view["USERNAME"] ?>">
 
         <label for="email">Changer d'e-mail&nbsp;</label>
-        <input type="email" name="email" id="email" placeholder="<?= $array_account["email"] ?>">
+        <input type="email" name="email" id="email" placeholder="<?= $A_view["EMAIL"] ?>">
 
         <button type="button">Enregistrer</button>
     </form>
 
     <hr>
 
-    <a href="/account/delete">Supprimer le compte ⚠️</a>
+    <a href="/user/delete">Supprimer le compte ⚠️</a>
 
 </main>
diff --git a/Views/user/view.php b/Views/user/view.php
deleted file mode 100644
index d5412b5..0000000
--- a/Views/user/view.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<p> Your account : </p>
-<p> Email : <?= $A_view["EMAIL"] ?> </p>
-<p> Name : <?= $A_view["USERNAME"] ?> </p>
-<p> Admin status : <?= $A_view["ADMIN"] ? "yes" : "no" ?> </p>
-
-<form method="POST" action="/user/logout">
-<input type="submit" value="Se déconnecter">
-</form>