séparation bloc / mise en page, bloc spécial pour les actus, renommage de classes, fichiers, etc

16 files changed, 153 insertions, 73 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index 3b39335..078754a 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -49,7 +49,7 @@ class ArticleController
                                 $date->setTimestamp($timestamp);
 
                                 $article = new Article($content, $date); // le "current" timestamp est obtenu par la BDD
-                                $article_node = new Node('article', 'i' . (string)$timestamp, [], count($node->getChildren()) + 1, $node, $node->getPage(), $article);  
+                                $article_node = new Node('post', 'i' . (string)$timestamp, [], count($node->getChildren()) + 1, $node, $node->getPage(), $article);     
                         }
 
                         $entityManager->persist($article_node);
diff --git a/src/controller/PageManagementController.php b/src/controller/PageManagementController.php
index f84c528..50ce193 100644
--- a/src/controller/PageManagementController.php
+++ b/src/controller/PageManagementController.php
@@ -6,6 +6,7 @@ declare(strict_types=1);
 use App\Entity\Page;
 use App\Entity\Node;
 use App\Entity\NodeData;
+use App\Entity\Presentation;
 //use App\Entity\Image;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
@@ -136,8 +137,7 @@ class PageManagementController
             $main = $director->getNode();
             $position = count($main->getChildren()) + 1; // position dans la fraterie
 
-            $blocks = ['blog', 'grid', 'calendar', 'galery', 'form']; // même liste dans FormBuilder.php
-            if(!in_array($_POST["bloc_select"], $blocks, true)) // 3è param: contrôle du type
+            if(!in_array($_POST["bloc_select"], Blocks::getNameList(), true)) // 3è param: contrôle du type
             {
                 header("Location: " . new URL(['page' => $_GET['page'], 'error' => 'bad_bloc_type']));
                 die;
@@ -163,7 +163,7 @@ class PageManagementController
                 $entityManager->persist($bulk_data[0]);
             }
 
-            $bloc = new Node(
+            $block = new Node(
                 $_POST["bloc_select"],
                 null, [],
                 $position,
@@ -171,9 +171,17 @@ class PageManagementController
                 $page);
             $data = new NodeData(
                 ['title' => trim(htmlspecialchars($_POST["bloc_title"]))],
-                $bloc);
+                $block);
 
-            $entityManager->persist($bloc);
+            // valeurs par défaut
+            if($_POST["bloc_select"] === 'post_block'){
+                $data->setPresentation($entityManager->find('App\Entity\Presentation', 1)); // pas génial l'utilisation de l'index dans la table
+            }
+            elseif($_POST["bloc_select"] === 'news_block'){
+                $data->setPresentation($entityManager->find('App\Entity\Presentation', 2));
+            }
+
+            $entityManager->persist($block);
             $entityManager->persist($data);
             $entityManager->flush();
             header("Location: " . new URL(['page' => $_GET['page'], 'action' => 'modif_page']));
diff --git a/src/installation.php b/src/installation.php
index 5adb697..dd3aa35 100644
--- a/src/installation.php
+++ b/src/installation.php
@@ -7,6 +7,7 @@ use App\Entity\Page;
 use App\Entity\Node;
 use App\Entity\NodeData;
 use App\Entity\Image;
+use App\Entity\Presentation;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManager;
 
@@ -116,6 +117,10 @@ function makeStartPage(EntityManager $entityManager){
         $head_new_page = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'new_page', 'foot'], 'js_array' => ['main', 'new_page']], 1, NULL, $new_page, NULL);
         $bloc_new_page = new Node('new_page', NULL, [], 1, $main, $new_page, NULL);
 
+        /* -- table presentation -- */
+        $list = new Presentation('list');
+        $grid = new Presentation('grid');
+
         /* -- table image -- */
         // paramètres: file_name, file_path, file_path_mini, mime_type, alt
         $favicon = new Image("favicon48x48.png", NULL, "assets/favicon48x48.png", "image/png", "favicon");
@@ -162,6 +167,10 @@ function makeStartPage(EntityManager $entityManager){
         $entityManager->persist($bloc_edit_menu);
         $entityManager->persist($head_new_page);
         $entityManager->persist($bloc_new_page);
+
+        /* -- table presentation -- */
+        $entityManager->persist($list);
+        $entityManager->persist($grid);
         
         /* -- table image -- */
         $entityManager->persist($favicon);
diff --git a/src/model/Blocks.php b/src/model/Blocks.php
new file mode 100644
index 0000000..f6475cd
--- /dev/null
+++ b/src/model/Blocks.php
@@ -0,0 +1,38 @@
+<?php
+// src/Blocks.php
+
+class Blocks{
+    /*private array $types = ['blog', 'grid', 'calendar', 'galery', 'form'];*/
+    static private array $types = ['post_block', 'news_block', 'calendar', 'galery', 'form'];
+
+    /*private array $names = ['Blog', 'Grille', 'Calendrier', 'Galerie', 'Formulaire'];*/
+    static private array $names = ['Articles libres', 'Actualités', 'Calendrier', 'Galerie', 'Formulaire'];
+
+    static public function getNameList(): array
+    {
+        $blocks = [];
+        foreach(self::$types as $type){
+            $blocks[] = $type;
+        }
+        return $blocks;
+    }
+
+    static public function getTypeNamePairs(): array
+    {
+        $blocks = [];
+        for($i = 0; $i < count(self::$types); $i++){
+            $blocks[] = ['type' => self::$types[$i], 'name' => self::$names[$i]];
+        }
+        return $blocks;
+    }
+
+    static public function getNameFromType(string $type): string
+    {
+        for($i=0; $i < count(self::$types); $i++){ 
+            if(self::$types[$i] === $type){
+                return self::$names[$i];
+            }
+        }
+        return 'server side error';
+    }
+}
\ No newline at end of file
diff --git a/src/model/entities/Article.php b/src/model/entities/Article.php
index 14028ec..5412497 100644
--- a/src/model/entities/Article.php
+++ b/src/model/entities/Article.php
@@ -1,5 +1,7 @@
 <?php
 // src/model/entities/Article.php
+//
+// entité commune pour les "post" (articles simples) et les "news" (complexes avec titre, aperçu et contenu)
 
 declare(strict_types=1);
 
diff --git a/src/model/entities/NodeData.php b/src/model/entities/NodeData.php
index 758ccb7..c835727 100644
--- a/src/model/entities/NodeData.php
+++ b/src/model/entities/NodeData.php
@@ -24,6 +24,10 @@ class NodeData
     #[ORM\JoinColumn(name: "node_id", referencedColumnName: "id_node", onDelete: "CASCADE")]
     private Node $node;
 
+    #[ORM\ManyToOne(targetEntity: Presentation::class)]
+    #[ORM\JoinColumn(name: "presentation_id", referencedColumnName: "id_presentation", nullable: true)]
+    private Presentation $presentation;
+
     #[ORM\Column(type: "json")]
     private array $data;
 
@@ -47,6 +51,14 @@ class NodeData
     {
         return $this->id_node_data;
     }
+    public function getPresentation(): Presentation
+    {
+        return $this->presentation;
+    }
+    public function setPresentation(Presentation $presentation): void
+    {
+        $this->presentation = $presentation;
+    }
     public function getData(): array
     {
         return $this->data;
diff --git a/src/model/entities/Presentation.php b/src/model/entities/Presentation.php
new file mode 100644
index 0000000..73b6a6a
--- /dev/null
+++ b/src/model/entities/Presentation.php
@@ -0,0 +1,31 @@
+<?php
+// src/model/entities/Presentation.php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: TABLE_PREFIX . "presentation")]
+class Presentation
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: "integer")]
+    private int $id_presentation;
+
+    #[ORM\Column(type: "string", length: 255)]
+    private string $name_presentation;
+
+    public function __construct(string $name)
+    {
+        $this->name_presentation = $name;
+    }
+
+    public function getName(): string
+    {
+        return $this->name_presentation;
+    }
+}
\ No newline at end of file
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