9 files changed, 47 insertions, 67 deletions

diff --git a/src/view/GaleryBuilder.php b/src/view/GaleryBuilder.php
index f2dafc2..749cb30 100644
--- a/src/view/GaleryBuilder.php
+++ b/src/view/GaleryBuilder.php
@@ -54,7 +54,7 @@ class GaleryBuilder extends AbstractBuilder
 
                 // squelette d'un nouvel article
                 ob_start();
-                require self::VIEWS_PATH . 'article.php';
+                require self::VIEWS_PATH . 'post.php';
                 $new_article = ob_get_clean();
             }
 
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index 889df37..d7a0dfa 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -36,13 +36,13 @@ class MainBuilder extends AbstractBuilder
             $this->html .= $builder->render();
         }
         else{
-            // si action = "modif_page", affiche des commandes pour modifier
+            // si action = "modif_page", affiche des commandes supplémentaires
             if($_SESSION['admin'] && self::$modif_mode){
                 // ajouter un contrôle du champ in_menu
                 $this->viewEditBlocks($node);
             }
 
-            // cas normal
+            // dans tous les cas
             $this->useChildrenBuilder($node);
         }
 
@@ -53,42 +53,18 @@ class MainBuilder extends AbstractBuilder
     private function viewEditBlocks($node): void
     {
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php'; // mode modification uniquement
-
-        // blocs disponibles, même liste dans post.php
-        $blocks = [ // créer une classe pour ça?
-            ['type' => 'blog', 'name' => 'Blog'],
-            ['type' => 'grid', 'name' => 'Grille'],
-            ['type' => 'calendar', 'name' => 'Calendrier'],
-            ['type' => 'galery', 'name' => 'Galerie'],
-            ['type' => 'form', 'name' => 'Formulaire']];
-
-        function getBlockName(array $blocks, string $type){ // créer une classe pour ça?
-            for($i=0; $i < count($blocks); $i++){ 
-                if($blocks[$i]['type'] === $type){
-                    return $blocks[$i]['name'];
-                }
-            }
-        }
+        $blocks = Blocks::getTypeNamePairs();
 
         $options = '';
         for($i = 0; $i < count($blocks); $i++){
             $options .= '<option value= "' . $blocks[$i]['type'] . '">' . $blocks[$i]['name'] . "</option>\n";
         }
 
-        // blabla
-        /*$this->html .= '<aside class="modif_page_explanations">
-            <p>Modification de la structure d\'une page:</p>
-            <div>
-                <p><img></p>
-                <p><img></p>
-            </div>
-        </aside>' . "\n";*/
-
         //$page_id = Director::$page_path->getLast()->getId();
         $head_node = null;
         foreach(ViewController::$root_node->getChildren() as $first_level_node){
             if($first_level_node->getName() === 'head'){
-                $head_node = $first_level_node; // normallement c'est le 1er enfant
+                $head_node = $first_level_node; // normalement c'est le 1er enfant
                 break;
             }
         }
@@ -97,7 +73,7 @@ class MainBuilder extends AbstractBuilder
         foreach($node->getChildren() as $child_node){
             // renommage d'un bloc
             $bloc_edit .= '<div id="bloc_edit_' . $child_node->getId() . '">
-                <p><label for="bloc_rename_' . $child_node->getId() . '"><b>' . getBlockName($blocks, $child_node->getName()) . '</b></label>
+                <p><label for="bloc_rename_' . $child_node->getId() . '"><b>' . Blocks::getNameFromType($child_node->getName()) . '</b></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
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index c410eb7..fc6ade6 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -35,21 +35,18 @@ class NewBuilder extends AbstractBuilder
             $content = '';
 
             // page article unique
-            if(Director::$page_path->getLast()->getEndOfPath() === 'article')
-            {
+            if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
                 $content = $node->getArticle()->getContent();
-                $from_to_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'accueil']) . '"><button>Page<br>d\'accueil</button></a></p>';
+                $from_to_button = '<p><a class="link_to_article" href="' . new URL(isset($_GET['from']) ? ['page' => $_GET['from']] : []) . '"><button>Page<br>précédente</button></a></p>';
             }
             // page d'accueil (avec des news)
-            else
-            {
-                $from_to_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'article', 'id' => $id]) . '"><button><img class="action_icon" src="assets/book-open.svg">Lire la suite</button></a></p>';
+            else{
+                $from_to_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'article', 'id' => $id, 'from' => CURRENT_PAGE]) . '"><button><img class="action_icon" src="assets/book-open.svg">Lire la suite</button></a></p>';
             }
 
             
             $date_object = $node->getArticle()->getDateTime(); // class DateTime
             $date = 'le ' . str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));
-            //$date = str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));
 
             // partage
             $share_link = new URL(['page' => 'article', 'id' => $id]);
diff --git a/src/view/GridBuilder.php b/src/view/NewsBlockBuilder.php
index 30a9040..eebeadb 100644
--- a/src/view/GridBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -1,16 +1,18 @@
 <?php
-// src/view/GridBuilder.php
+// src/view/NewsBlockBuilder.php
 
 declare(strict_types=1);
 
 use App\Entity\Node;
 
-class GridBuilder extends AbstractBuilder
+class NewsBlockBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
         parent::__construct($node);
-        $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
+
+        // à remplacer par list.php/grid.php (une vue par stratégie) le jour ou ou a besoin de les différencier
+        $viewFile = self::VIEWS_PATH . $node->getName() . '.php'; // = news_block.php, actuellement identique à post_block.php
         
         if(file_exists($viewFile))
         {
@@ -19,24 +21,21 @@ class GridBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
+            $presentation = $node->getNodeData()->getPresentation()->getName(); // affichage list ou grid
+
+            // exécution de la stratégie (utilisation d'une méthode ou d'une classe)
+            $section_class = $presentation;
+            $section_child_class = $presentation === 'grid' ? 'grid_columns' : '';
+
             // ajouter un article
             $new_article = '';
             if($_SESSION['admin'])
             {
                 $id = 'n' . $this->id_node;
-                $js = 'onclick="openEditor(\'' . $id . '\')"';
 
                 $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
-                $html = '';
 
-                if(Director::$page_path->getLast()->getEndOfPath() === 'accueil'){
-                    $new_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'article', 'id' => $id]) . '">
-                        <button><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
-                }
-                else{
-                    $new_button = '<p id="new-' . $id . '">' . "\n" . 
-                        '<button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
-                }
+                $new_button = '<p><a class="link_to_article" href="' . new URL(['page' => 'article', 'id' => $id]) . '"><button><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
 
                 $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
                 $modify_article = '<p id="edit-' . $id . '" class="hidden"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
@@ -56,11 +55,12 @@ class GridBuilder extends AbstractBuilder
                 $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
                 $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
+                $html = '';
                 $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
 
-                // squelette d'un nouvel article
+                // post vide mis là pour le bouton "Nouvel article" => déplace vers page "article"
                 ob_start();
-                require self::VIEWS_PATH . 'article.php';
+                require self::VIEWS_PATH . 'post.php'; // nécéssite $admin_buttons et $html
                 $new_article = ob_get_clean();
             }
 
diff --git a/src/view/BlogBuilder.php b/src/view/PostBlockBuilder.php
index d646d5f..fadae31 100644
--- a/src/view/BlogBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -1,16 +1,19 @@
 <?php
-// src/view/BlogBuilder.php
+// src/view/PostBlockBuilder.php
 
 declare(strict_types=1);
 
 use App\Entity\Node;
 
-class BlogBuilder extends AbstractBuilder
+class PostBlockBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
         parent::__construct($node);
-        $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
+
+        // à remplacer par list.php/grid.php (une vue par stratégie) le jour ou ou a besoin de les différencier
+        //$viewFile = self::VIEWS_PATH . $node->getName() . '.php';
+        $viewFile = self::VIEWS_PATH . 'post_block.php'; // actuellement identique à news_block.php
         
         if(file_exists($viewFile))
         {
@@ -19,18 +22,21 @@ class BlogBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
+            $presentation = $node->getNodeData()->getPresentation()->getName(); // affichage list ou grid
+
+            // exécution de la stratégie (utilisation d'une méthode ou d'une classe)
+            $section_class = $presentation;
+            $section_child_class = $presentation === 'grid' ? 'grid_columns' : '';
+
             // ajouter un article
             $new_article = '';
             if($_SESSION['admin'])
             {
                 $id = 'n' . $this->id_node;
-                $js = 'onclick="openEditor(\'' . $id . '\')"';
 
                 $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
-                $html = '';
-
-                $new_button = '<p id="new-' . $id . '">' . "\n" . 
-                '<button ' . $js . '><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
+                
+                $new_button = '<p id="new-' . $id . '">' . "\n" . '<button onclick="openEditor(\'' . $id . '\')"><img class="action_icon" src="assets/edit.svg">Nouvel article</button></p>';
 
                 $modify_js = 'onclick="openEditor(\'' . $id . '\')"';
                 $modify_article = '<p id="edit-' . $id . '" class="hidden"><img class="action_icon" src="assets/edit.svg" ' . $modify_js . '></p>' . "\n";
@@ -50,11 +56,12 @@ class BlogBuilder extends AbstractBuilder
                 $submit_js = 'onclick="submitArticle(\'' . $id . '\', \'\', clone' . $this->id_node . ')"';
                 $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js . '>Valider</button></p>';
                 
+                $html = '';
                 $admin_buttons = $new_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
 
                 // squelette d'un nouvel article
                 ob_start();
-                require self::VIEWS_PATH . 'article.php';
+                require self::VIEWS_PATH . 'post.php';
                 $new_article = ob_get_clean();
             }
 
diff --git a/src/view/ArticleBuilder.php b/src/view/PostBuilder.php
index 3b9de87..03a6990 100644
--- a/src/view/ArticleBuilder.php
+++ b/src/view/PostBuilder.php
@@ -1,11 +1,11 @@
 <?php
-// src/view/ArticleBuilder.php
+// src/view/PostBuilder.php
 
 declare(strict_types=1);
 
 use App\Entity\Node;
 
-class ArticleBuilder extends AbstractBuilder
+class PostBuilder extends AbstractBuilder
 {
     public function __construct(Node $node)
     {
diff --git a/src/view/templates/blog.php b/src/view/templates/news_block.php
index dfb65b5..d88d780 100644
--- a/src/view/templates/blog.php
+++ b/src/view/templates/news_block.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1); ?>
-<section class="blog" id="<?= $this->id_node ?>">
+<section class="<?= $section_class ?>" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
         <script>
                 var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
         </script>
-        <div>
+        <div class="<?= $section_child_class ?>">
 <?= $content ?>
         </div>
 </section>
\ No newline at end of file
diff --git a/src/view/templates/article.php b/src/view/templates/post.php
index 5cf35c2..5cf35c2 100644
--- a/src/view/templates/article.php
+++ b/src/view/templates/post.php
diff --git a/src/view/templates/grid.php b/src/view/templates/post_block.php
index 71c052b..d88d780 100644
--- a/src/view/templates/grid.php
+++ b/src/view/templates/post_block.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1); ?>
-<section class="grid" id="<?= $this->id_node ?>">
+<section class="<?= $section_class ?>" id="<?= $this->id_node ?>">
         <h3><?= $title ?></h3>
 <?= $new_article ?>
         <script>
                 var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
         </script>
-        <div class="grid_columns">
+        <div class="<?= $section_child_class ?>">
 <?= $content ?>
         </div>
 </section>
\ No newline at end of file