renommage des présentations,modif présentation des blocs et largeur min (donc nb de colonnes) en mode grid, corrections de bugs et erreurs 404, le param page_modif n'est plus une action, légère symfonyfication du routeur

8 files changed, 97 insertions, 40 deletions

diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index eda5be1..cf88476 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -24,21 +24,16 @@ class FooterBuilder extends AbstractBuilder
 
             // zone admin
             $empty_admin_zone = '';
-            //$zone_admin = '';
             if($_SESSION['admin'])
             {
                 $empty_admin_zone = 'empty_admin_zone';
-                $link_edit_page = CURRENT_PAGE === 'article' ? new URL(['page' => 'accueil']) : new URL(['page' => CURRENT_PAGE]);
                 if(MainBuilder::$modif_mode){
                     $mode = 'modification de page';
                     $div_admin = 'logged_in modif_mode';
-                    $link_edit_label = 'Sortir du mode modification';
                 }
                 else{
                     $mode = 'administrateur';
                     $div_admin = 'logged_in';
-                    $link_edit_page->addParams(['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']);
@@ -51,9 +46,9 @@ class FooterBuilder extends AbstractBuilder
 
                 $zone_admin = '<div class="admin_buttons_zone">
                     <p>Vous êtes en mode ' . $mode . ".</p>\n" . 
-                    '<div><a href="' . $link_new_page . '"><button>Nouvelle page</button></a></div>' . "\n" . 
-                    '<div><a href="' . $link_edit_page . '"><button>' . $link_edit_label . '</button></a></div>' . "\n" . 
-                    '<div><a href="' . $link_change_paths . '"><button>Menu et chemins</button></a></div>' . "\n" . 
+                    '<div><a href="' . $link_new_page . '"><button>Nouvelle page</button></a></div>' . "\n";
+                $zone_admin .= $this->makePageModifModeButton();
+                $zone_admin .= '<div><a href="' . $link_change_paths . '"><button>Menu et chemins</button></a></div>' . "\n" . 
                     '<div><a href="' . $link_change_password . '"><button>Mon compte</button></a></div>' . "\n" . 
                     '<div><a href="' . $link_logout . '"><button>Déconnexion</button></a></div>' . "\n" . 
                 '</div>' . "\n";
@@ -73,4 +68,22 @@ class FooterBuilder extends AbstractBuilder
             $this->html = ob_get_clean();
         }
     }
+
+    private function makePageModifModeButton(): string
+    {
+        $link_edit_page = new URL(['page' => CURRENT_PAGE]);
+        if(CURRENT_PAGE !== 'article'){
+            if(MainBuilder::$modif_mode){
+                $link_edit_label = 'Sortir du mode modification';
+            }
+            else{
+                $link_edit_page->addParams(['mode' => 'page_modif']);
+                $link_edit_label = 'Modifier la page';
+            }
+            return '<div><a href="' . $link_edit_page . '"><button>' . $link_edit_label . '</button></a></div>' . "\n";
+        }
+        else{
+            return '';
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index d7a0dfa..fc80cd1 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -5,10 +5,11 @@ declare(strict_types=1);
 
 use App\Entity\Article;
 use App\Entity\Node;
+use App\Entity\Presentation;
 
 class MainBuilder extends AbstractBuilder
 {
-    static bool $modif_mode = false;
+    static public bool $modif_mode = false;
 
     public function __construct(Node $node)
     {
@@ -52,7 +53,8 @@ class MainBuilder extends AbstractBuilder
     // mode modification de page uniquement
     private function viewEditBlocks($node): void
     {
-        $viewFile = self::VIEWS_PATH . $node->getName() . '.php'; // mode modification uniquement
+        //$viewFile = self::VIEWS_PATH . $node->getName() . '.php'; // mode modification uniquement
+        $viewFile = self::VIEWS_PATH . 'modify_page.php'; // mode modification uniquement
         $blocks = Blocks::getTypeNamePairs();
 
         $options = '';
@@ -71,25 +73,62 @@ class MainBuilder extends AbstractBuilder
         
         $bloc_edit = '';
         foreach($node->getChildren() as $child_node){
+            // mettre tout ça dans une vue modify_block.php
+            // => pourrait être déplacé au niveau des articles
+
             // renommage d'un bloc
-            $bloc_edit .= '<div id="bloc_edit_' . $child_node->getId() . '">
-                <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";
+            $bloc_edit .= '<div class="modify_one_block" id="bloc_edit_' . $child_node->getId() . '">
+                <div class="block_options">
+                    <label for="bloc_rename_' . $child_node->getId() . '">Type <b>' . Blocks::getNameFromType($child_node->getName()) . '</b></label>
+                    <p>
+                        <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>
+                    </p>'. "\n";
             // déplacement d'un bloc
-            $bloc_edit .= '<img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'up\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-up.svg">
-                <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'down\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-down.svg">' . "\n";
+            $bloc_edit .= '<div style="display: flex; flex-wrap: wrap;">
+                    <p>
+                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'up\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-up.svg">
+                        <img class="action_icon" onclick="switchBlocsPositions(' . $child_node->getId() . ', \'down\', \'' . CURRENT_PAGE . '\')" src="assets/arrow-down.svg">
+                    </p>' . "\n";
             // suppression d'un bloc
             $bloc_edit .= '<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" onclick="return confirm(\'Voulez-vous vraiment supprimer ce bloc?\');"></p>
-                </form>
+                        <input type="hidden" name="delete_bloc_id" value="' . $child_node->getId() . '">
+                        <input type="hidden" name="delete_bloc_hidden">
+                        <input type="submit" value="Supprimer" onclick="return confirm(\'Voulez-vous vraiment supprimer ce bloc?\');">
+                    </form>
+                </div>
             </div>'. "\n";
+            if($child_node->getNodeData()->getPresentation() !== null){
+                // select mode de présentation
+                $bloc_edit .= '<div class="grid_options"><p>
+                    <label for="presentation_select_' . $child_node->getId() . '">Présentation</label>
+                    <select id="presentation_select_' . $child_node->getId() . '" onchange="changePresentation(' . $child_node->getId() . ')">';
+                $bloc_edit .= $this->makePresentationOptions($child_node->getNodeData()->getPresentation()->getName());
+                $bloc_edit .= '</select>';
+                // select largeur minimale colonnes mode grid
+                $bloc_edit .= '<div id="cols_min_width_edit_' . $child_node->getId() . '" class="' . ($child_node->getNodeData()->getPresentation()->getName() === 'grid' ? '' : 'hidden') . '">
+                    <label for="cols_min_width_select_' . $child_node->getId() . '">Largeur minimum </label>';
+                $bloc_edit .= '<input type="number" id="cols_min_width_select_' . $child_node->getId() . '" onchange="changeColsMinWidth(' . $child_node->getId() . ')" min="150" max="400" value="' . $child_node->getNodeData()->getColsMinWidth() . '">';
+                /*$bloc_edit .= '<select id="cols_min_width_select_' . $child_node->getId() . '" onchange="changeColsMinWidth(' . $child_node->getId() . ')">'
+                    . $this->makeColsMinWidthOptions($child_node->getNodeData()->getColsMinWidth())
+                    . '</select>';*/
+                $bloc_edit .= ' pixels</div>
+                    </div>';
+            }
+            $bloc_edit .= "</div>\n";
         }
 
         ob_start();
         require $viewFile;
         $this->html .= ob_get_clean();
     }
+
+    private function makePresentationOptions(string $presentation): string
+    {
+        $options = '';
+        foreach(Presentation::$option_list as $key => $value){
+            $options .= '<option value="' . $key . '" ' . ($presentation === $key ? 'selected' : '') . '>' . $value . '</option>';
+        }
+        return $options;
+    }
 }
\ No newline at end of file
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index 2d30d32..2d66238 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -7,6 +7,8 @@ use App\Entity\Node;
 
 class NewBuilder extends AbstractBuilder
 {
+    static public bool $new_article_mode = false;
+
     public function __construct(Node $node, )
     {
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
@@ -39,7 +41,6 @@ class NewBuilder extends AbstractBuilder
                 $content = $node->getArticle()->getContent();
                 $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, 'from' => CURRENT_PAGE]) . '"><button><img class="action_icon" src="assets/book-open.svg">Lire la suite</button></a></p>';
             }
@@ -101,7 +102,7 @@ class NewBuilder extends AbstractBuilder
                     $date_buttons = '<div class="button_zone">' . $modify_date . $close_editor_date . $submit_date . '</div>';
                     
                     // mode nouvel article
-                    if($_GET['id'][0] != 'i'){
+                    if(self::$new_article_mode){
                         $delete_article = '';
                         // valider la création d'un nouvel article
                         $submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
@@ -109,8 +110,7 @@ class NewBuilder extends AbstractBuilder
                     }
                     // mode article existant
                     else{
-                        // supprimer article existant
-                        $url = new URL(['action' => 'delete_article', 'id' => $_GET['id'], 'from' => $_GET['from']]);
+                        $url = new URL(['action' => 'delete_article', 'id' => $_GET['id'], 'from' => $_GET['from'] ?? '']);
                         $delete_article = '<form id="delete-' . $id . '" method="post" onsubmit="return confirm(\'Voulez-vous vraiment supprimer cet article ?\');" action="' . $url . '">
                             <p><button type="submit">
                                 <img class="action_icon" src="assets/delete-bin.svg">
@@ -122,7 +122,7 @@ class NewBuilder extends AbstractBuilder
                     
                     $admin_buttons = $delete_article . $from_to_button . $submit_article;
                 }
-                // page d'accueil
+                // autre page
                 else{
                     $modify_article = '<p id="edit-' . $id . '"></p>' . "\n";
 
@@ -143,6 +143,9 @@ class NewBuilder extends AbstractBuilder
                     $admin_buttons = $from_to_button . $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
                 }
             }
+            else{
+                $admin_buttons = $from_to_button;
+            }
 
             ob_start();
             require($viewFile);
diff --git a/src/view/NewsBlockBuilder.php b/src/view/NewsBlockBuilder.php
index 6b54196..861949a 100644
--- a/src/view/NewsBlockBuilder.php
+++ b/src/view/NewsBlockBuilder.php
@@ -21,11 +21,12 @@ class NewsBlockBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
-            $presentation = $node->getNodeData()->getPresentation()->getName(); // affichage list ou grid
-
-            // exécution de la stratégie (utilisation de méthodes ou de classe List, Grid, CarouselPresentation)
-            $section_class = $presentation;
-            $section_child_class = $presentation === 'grid' ? 'grid_columns' : '';
+            // stratégie d'affichage du contenu (utilisation de méthodes ou de classe List, GridPresentation, etc)
+            $section_class = $node->getNodeData()->getPresentation()->getName(); // = list, grid , mosaic ou carousel
+            if($section_class === 'grid'){
+                $min_width = (string)$node->getNodeData()->getColsMinWidth();
+                $cols_min_width = 'grid-template-columns: repeat(auto-fit, minmax(' . $min_width . 'px, 1fr));';
+            }
 
             // ajouter un article
             $new_article = '';
diff --git a/src/view/PostBlockBuilder.php b/src/view/PostBlockBuilder.php
index 6ec91f7..8ad0498 100644
--- a/src/view/PostBlockBuilder.php
+++ b/src/view/PostBlockBuilder.php
@@ -21,11 +21,12 @@ class PostBlockBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
-            $presentation = $node->getNodeData()->getPresentation()->getName(); // affichage list ou grid
-
-            // exécution de la stratégie (utilisation de méthodes ou de classe List, Grid, CarouselPresentation)
-            $section_class = $presentation;
-            $section_child_class = $presentation === 'grid' ? 'grid_columns' : '';
+            // stratégie d'affichage du contenu (utilisation de méthodes ou de classe List, GridPresentation, etc)
+            $section_class = $node->getNodeData()->getPresentation()->getName(); // = list, grid , mosaic ou carousel
+            if($section_class === 'grid'){
+                $min_width = (string)$node->getNodeData()->getColsMinWidth();
+                $cols_min_width = 'grid-template-columns: repeat(auto-fit, minmax(' . $min_width . 'px, 1fr));';
+            }
 
             // ajouter un article
             $new_article = '';
diff --git a/src/view/templates/main.php b/src/view/templates/modify_page.php
index 48ada5f..5ab1a95 100644
--- a/src/view/templates/main.php
+++ b/src/view/templates/modify_page.php
@@ -31,8 +31,8 @@
             <input type="submit" value="Supprimer" onclick="return confirm('Voulez-vous vraiment supprimer cette page?');">
         </form>
     </div>
-    <div class="edit_bloc_zone">
-        <div class="new_bloc">
+    <div class="edit_block_zone">
+        <div class="new_block">
             <p>Ajouter un bloc de page</p>
             <form method="post" action="<?= new URL(['page' => CURRENT_PAGE]) ?>">
                 <p><label for="bloc_title">Titre</label>
@@ -45,7 +45,7 @@
                 <input type="submit" value="Valider"></p>
             </form>
         </div>
-        <div class="modify_bloc">
+        <div class="modify_block">
             <p>Modifier un bloc</p>
             <?= $bloc_edit ?>
         </div>
diff --git a/src/view/templates/news_block.php b/src/view/templates/news_block.php
index d88d780..9d01513 100644
--- a/src/view/templates/news_block.php
+++ b/src/view/templates/news_block.php
@@ -5,7 +5,7 @@
         <script>
                 var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
         </script>
-        <div class="<?= $section_child_class ?>">
+        <div class="section_child" style="<?= $cols_min_width ?>">
 <?= $content ?>
         </div>
 </section>
\ No newline at end of file
diff --git a/src/view/templates/post_block.php b/src/view/templates/post_block.php
index d88d780..9d01513 100644
--- a/src/view/templates/post_block.php
+++ b/src/view/templates/post_block.php
@@ -5,7 +5,7 @@
         <script>
                 var clone<?= $this->id_node ?> = document.currentScript.previousElementSibling.cloneNode(true);
         </script>
-        <div class="<?= $section_child_class ?>">
+        <div class="section_child" style="<?= $cols_min_width ?>">
 <?= $content ?>
         </div>
 </section>
\ No newline at end of file