8 files changed, 132 insertions, 32 deletions

diff --git a/src/controller/Director.php b/src/controller/Director.php
index 56a90cb..b154432 100644
--- a/src/controller/Director.php
+++ b/src/controller/Director.php
@@ -36,6 +36,7 @@ class Director
         return $this->article;
     }
 
+    // affichage d'une page ordinaire
         public function makeRootNode(string $id = ''): void
     {
         // on récupère toutes les entrées
@@ -91,6 +92,12 @@ class Director
         }
     }
 
+    // le basique
+    public function findNodeById(int $id): void
+    {
+        $this->node = $this->entityManager->find('App\Entity\Node', $id);
+    }
+
     // récupération d'un article pour modification
     public function makeArticleNode(string $id = '', bool $get_section = false): bool
     {
@@ -112,7 +119,8 @@ class Director
 
         if($get_section){
             $this->article = $bulk_data[0];
-            $this->makeSectionNode($bulk_data[0]->getParent()->getId());
+            $this->findNodeById($bulk_data[0]->getParent()->getId());
+            $this->makeSectionNode();
         }
         else{
             $this->article = $bulk_data[0];
@@ -122,31 +130,30 @@ class Director
     }
 
     // récupération des articles d'un bloc <section> à la création d'un article
-    public function makeSectionNode(int $section_id): bool
+    public function makeSectionNode(): bool
     {
-        $section = $this->entityManager->find('App\Entity\Node', (string)$section_id);
-        
         $bulk_data = $this->entityManager
             ->createQuery('SELECT n FROM App\Entity\Node n WHERE n.parent = :parent')
-            ->setParameter('parent', $section)
+            ->setParameter('parent', $this->node)
             ->getResult();
 
         foreach($bulk_data as $article){
-            $section->addChild($article); // pas de flush, on ne va pas écrire dans la BDD à chaque nouvelle page
+            $this->node->addChild($article); // pas de flush, on ne va pas écrire dans la BDD à chaque nouvelle page
         }
-        $this->node = $section;
         return true;
     }
 
-    public function findNodeByName(string $name): void
+    public function findUniqueNodeByName(string $name): void // = unique en BDD, donc sans "page" associée
     {
         $bulk_data = $this->entityManager
             ->createQuery('SELECT n FROM App\Entity\Node n WHERE n.name_node = :name')
             ->setParameter('name', $name)
             ->getResult();
         $this->node = $bulk_data[0];
-        echo $this->page->getPageName() . ' ';
+    }
 
+    public function findItsChildren(): void
+    {
         $bulk_data = $this->entityManager
             ->createQuery('SELECT n FROM App\Entity\Node n WHERE n.parent = :parent AND n.page = :page')
             ->setParameter('parent', $this->node)
@@ -154,7 +161,6 @@ class Director
             ->getResult();
         foreach($bulk_data as $child){
             $this->node->addChild($child);
-            echo $child->getName() . ' ';
         }
     }
 }
diff --git a/src/controller/ajax.php b/src/controller/ajax.php
index a20bd87..a6786d9 100644
--- a/src/controller/ajax.php
+++ b/src/controller/ajax.php
@@ -35,7 +35,8 @@ if($_SERVER['CONTENT_TYPE'] === 'application/json' && isset($_GET['action']))
                 if($id[0] === 'n')
                 {
                         $section_id = (int)substr($id, 1); // id du bloc <section>
-                        $director->makeSectionNode($section_id);
+                        $director->findNodeById($section_id);
+                        $director->makeSectionNode();
                         $node = $director->getNode(); // = <section>
 
                         if(is_array($content)){
@@ -205,6 +206,8 @@ if(strpos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') !== false && isset($_
     die;
 }
 
+
+/* -- page Menu et chemins -- */
 if($_SERVER['CONTENT_TYPE'] === 'application/json' && isset($_GET['menu_edit']))
 {
         // récupération des données
@@ -347,7 +350,39 @@ if($_SERVER['CONTENT_TYPE'] === 'application/json' && isset($_GET['menu_edit']))
         }
 }
 
-// détection des requêtes de type XHR?, pas d'utilité pour l'instant
+
+/* -- mode Modification d'une page -- */
+if($_SERVER['CONTENT_TYPE'] === 'application/json' && isset($_GET['bloc_edit']))
+{
+        // récupération des données
+        $data = file_get_contents('php://input');
+        $json = json_decode($data, true);
+
+        // renommage d'un bloc
+        if($_GET['bloc_edit'] === 'rename_page_bloc')
+        {
+        if(isset($json['bloc_title']) && $json['bloc_title'] !== null && isset($json['bloc_id']) && is_int($json['bloc_id'])){
+            $director = new Director($entityManager);
+            $director->findNodeById($json['bloc_id']);
+
+            // le titre (du JSON en BDD) est récupéré sous forme de tableau, modifié et renvoyé
+            $data = $director->getNode()->getNodeData()->getData();
+            $data['title'] = htmlspecialchars($json['bloc_title']);
+            $director->getNode()->getNodeData()->setData($data);
+
+            $entityManager->flush();
+            echo json_encode(['success' => true, 'title' => $data['title']]);
+        }
+        else{
+                        echo json_encode(['success' => false]);
+                }
+                die;
+    }
+
+}
+
+
+// détection des requêtes de type XHR?, pas d'utilité à priori
 /*elseif(isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'){
         echo "requête XHR reçue par le serveur";
         die;
diff --git a/src/controller/post.php b/src/controller/post.php
index 76ac72b..d437423 100644
--- a/src/controller/post.php
+++ b/src/controller/post.php
@@ -15,10 +15,13 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
         /* -- mode Modification d'une page -- */
 
         // ajout d'un bloc dans une page
-        if(isset($_POST['bloc_title']) && isset($_POST['bloc_select'])){
+        if(isset($_POST['bloc_title']) && $_POST['bloc_title'] !== null && isset($_POST['bloc_select']) && $_POST['bloc_select'] !== null
+            && isset($_POST['bloc_title_hidden']) && $_POST['bloc_title_hidden'] === '') // contrôle anti-robot avec input hidden
+        {
             $director = new Director($entityManager, true); // on a besoin de page_path qui dépend de menu_data
             $page = Director::$page_path->getLast();
-            $director->findNodeByName('main');
+            $director->findUniqueNodeByName('main');
+            $director->findItsChildren();
             $main = $director->getNode();
             $position = count($main->getChildren()) + 1; // position dans la fraterie
 
@@ -37,7 +40,30 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
             $entityManager->flush();
             header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
         }
+        // suppression d'un bloc de page
+        elseif(isset($_POST['delete_bloc_id']) && $_POST['delete_bloc_id'] !== null
+            && isset($_POST['delete_bloc_hidden']) && $_POST['delete_bloc_hidden'] === '') // contrôle anti-robot avec input hidden
+        {
+            $director = new Director($entityManager, true);
+            $director->findUniqueNodeByName('main');
+            $director->findItsChildren();
+            //$director->findNodeById((int)$_POST['delete_bloc_id']);
+            $main = $director->getNode();
+            $bloc;
+            foreach($main->getChildren() as $child){
+                if($child->getId() === (int)$_POST['delete_bloc_id']){
+                    $bloc = $child;
+                    break;
+                }
+            }
+            $main->removeChild($bloc); // réindex le tableau $children au passage
+            $main->reindexPositions();
 
+            $entityManager->remove($bloc); // suppression en BDD
+            $entityManager->flush();
+            header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
+        }
+        
 
         /* -- page Menu et chemins -- */
 
@@ -60,7 +86,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
                 $parent = Director::$menu_data;
             }
             $parent->addChild($page); // true pour réindexer les positions en BDD
-            $parent->reindex();
+            $parent->reindexPositions();
 
             $entityManager->persist($page);
             $entityManager->flush();
@@ -76,7 +102,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && $_SESSION['admin'] === true)
             }
 
             $parent->removeChild($page); // suppression de $children avant de trier
-            $parent->reindex();
+            $parent->reindexPositions();
 
             $entityManager->remove($page); // suppression en BDD
             $entityManager->flush();
diff --git a/src/model/Position.php b/src/model/Position.php
index b5040df..8035481 100644
--- a/src/model/Position.php
+++ b/src/model/Position.php
@@ -30,12 +30,12 @@ trait Position
         }
 
         if($reindexation){
-            $this->reindex();
+            $this->reindexPositions();
         }
     }
 
     // nouvelles positions (tableau $children => BDD)
-    public function reindex(): void
+    public function reindexPositions(): void
     {
         $i = 1;
         foreach($this->children as $child){
diff --git a/src/model/entities/NodeData.php b/src/model/entities/NodeData.php
index ddf6083..aaffb6a 100644
--- a/src/model/entities/NodeData.php
+++ b/src/model/entities/NodeData.php
@@ -47,11 +47,11 @@ class NodeData
     {
         return $this->data;
     }
-    /*public function setData(array $data): void
+    public function setData(array $data): void
     {
         $this->data = $data;
     }
-    public function setNode(Node $node): void
+    /*public function setNode(Node $node): void
     {
         $this->node = $node;
     }*/
diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index 8678f56..084e122 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -27,9 +27,19 @@ class FooterBuilder extends AbstractBuilder
             //$zone_admin = '';
             if($_SESSION['admin'])
             {
-                $div_admin = 'logged_in';
                 $empty_admin_zone = 'empty_admin_zone';
-                $link_edit_page = new URL(['page' => CURRENT_PAGE, 'action' => 'modif_page']);
+                if(MainBuilder::$modif_mode){
+                    $mode = 'modification de page';
+                    $div_admin = 'logged_in modif_mode';
+                    $link_edit_page = new URL(['page' => CURRENT_PAGE]);
+                    $link_edit_label = 'Sortir du mode modification';
+                }
+                else{
+                    $mode = 'administrateur';
+                    $div_admin = 'logged_in';
+                    $link_edit_page = new URL(['page' => CURRENT_PAGE, 'action' => 'modif_page']);
+                    $link_edit_label = 'Modifier la page';
+                }
                 $link_new_page = new URL(['page' => 'nouvelle_page']);
                 $link_change_paths = new URL(['page' => 'menu_chemins']);
                 
@@ -39,12 +49,14 @@ class FooterBuilder extends AbstractBuilder
                 $link_logout = new URL(['page' => CURRENT_PAGE, 'action' => 'deconnexion']);
                 isset($_GET['id']) ? $link_logout->addParams(['id' => $_GET['id']]) : '';
 
-                $zone_admin = '<p>Vous êtes en mode administrateur.' . "\n" . 
-                    '<a href="' . $link_edit_page . '"><button>Modifier la page</button></a>' . "\n" . 
-                    '<a href="' . $link_new_page . '"><button>Nouvelle page</button></a>' . "\n" . 
-                    '<a href="' . $link_change_paths . '"><button>Menu et chemins</button></a>' . "\n" . 
-                    '<a href="' . $link_change_password . '"><button>Changer de mot de passe</button></a>' . "\n" . 
-                    '<a href="' . $link_logout . '"><button>Déconnexion</button></a></p>' . "\n";
+                $zone_admin = '<div class="admin_buttons_zone">
+                    <p>Vous êtes en mode ' . $mode . ".</p>\n" . 
+                    '<div><a href="' . $link_edit_page . '"><button>' . $link_edit_label . '</button></a></div>' . "\n" . 
+                    '<div><a href="' . $link_new_page . '"><button>Nouvelle page</button></a></div>' . "\n" . 
+                    '<div><a href="' . $link_change_paths . '"><button>Menu et chemins</button></a></div>' . "\n" . 
+                    '<div><a href="' . $link_change_password . '"><button>Changer de mot de passe</button></a></div>' . "\n" . 
+                    '<div><a href="' . $link_logout . '"><button>Déconnexion</button></a></div>' . "\n" . 
+                '</div>' . "\n";
             }
             else
             {
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index fbdfbdd..4664c17 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -69,8 +69,9 @@ class MainBuilder extends AbstractBuilder
         </aside>' . "\n";*/
 
         // ajout d'un nouveau bloc
-        $this->html .= '<div class="new_bloc">
-            <p>Ajouter un bloc dans la page:</p>
+        $this->html .= '<div class="edit_bloc_zone">
+        <div class="new_bloc">
+            <p>Ajouter un bloc de page</p>
             <form method="post" action="' . new URL(['page' => CURRENT_PAGE]) . '">
                 <p><label for="bloc_title">Titre</label>
                 <input type="text" id="bloc_title" name="bloc_title" required></p>
@@ -78,11 +79,30 @@ class MainBuilder extends AbstractBuilder
                 <select id="bloc_select" name="bloc_select" required>'
                 . $options . 
                 '</select>
+                <input type="hidden" name="bloc_title_hidden">
                 <input type="submit" value="Valider"></p>
             </form>
         </div>' . "\n";
+        $this->html .= '<div class="modify_bloc">
+            <p>Modifier un bloc</p>';
         foreach($node->getChildren() as $child_node){
-            //$this->html .=
+            // renommage d'un bloc
+            $this->html .= '<div>
+                <p><label for="bloc_rename_title">Titre</label>
+                <input type="text" id="bloc_rename_' . $child_node->getId() . '" name="bloc_rename_title" value="' . $child_node->getNodeData()->getdata()['title'] . '" required>
+                <button onclick="renamePageBloc(' . $child_node->getId() . ')">Renommer</button>'. "\n";
+            // déplacement d'un bloc
+            $this->html .= '<img class="action_icon" onclick="switchBlocPositions(' . $child_node->getId() . ', \'up\')" src="assets/arrow-up.svg">
+                <img class="action_icon" onclick="switchBlocPositions(' . $child_node->getId() . ', \'down\')" src="assets/arrow-down.svg">' . "\n";
+            // suppression d'un bloc
+            $this->html .= '<form method="post" action="' . new URL(['page' => CURRENT_PAGE]) . '">
+                    <input type="hidden" name="delete_bloc_id" value="' . $child_node->getId() . '">
+                    <input type="hidden" name="delete_bloc_hidden">
+                    <input type="submit" value="Supprimer"></p>
+                </form>
+            </div>'. "\n";
         }
+        $this->html .= "</div>
+        </div>\n";
     }
 }
diff --git a/src/view/templates/footer.php b/src/view/templates/footer.php
index 52cb1b5..8f6d465 100644
--- a/src/view/templates/footer.php
+++ b/src/view/templates/footer.php
@@ -7,11 +7,12 @@
                         <a href="mailto:<?= $e_mail ?>"><?= $e_mail ?></a></p>
                     <p class="footer_logo"><img src="<?= $logo_footer ?>" alt="logo"><p>
                 </div>
-            </footer>
                 <div class="<?= $empty_admin_zone ?>"></div>
                 <div class="<?= $div_admin ?>">
 <?= $zone_admin ?>
                 </div>
+                <div id="toast"></div>
+            </footer>
         </div>
     </body>
 </html>
\ No newline at end of file