nouvelle "news"

3 files changed, 56 insertions, 29 deletions

diff --git a/src/view/GridBuilder.php b/src/view/GridBuilder.php
index e183e6f..fdc5426 100644
--- a/src/view/GridBuilder.php
+++ b/src/view/GridBuilder.php
@@ -27,9 +27,9 @@ class GridBuilder extends AbstractBuilder
                 $share_button = '<p class="share hidden"><img class="action_icon" src="assets/share.svg"></p>';
                 $html = '';
 
-                if(CURRENT_PAGE === 'accueil'){
+                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/book-open.svg">Nouvel article</button></a></p>';
+                        <button><img class="action_icon" src="assets/edit.svg">Nouvel article</button></a></p>';
                 }
                 else{
                     $new_button = '<p id="new-' . $id . '">' . "\n" . 
diff --git a/src/view/MainBuilder.php b/src/view/MainBuilder.php
index a44570b..ea7b8c3 100644
--- a/src/view/MainBuilder.php
+++ b/src/view/MainBuilder.php
@@ -1,6 +1,7 @@
 <?php
 // src/view/MainBuilder.php
 
+use App\Entity\Article;
 use App\Entity\Node;
 
 class MainBuilder extends AbstractBuilder
@@ -10,11 +11,22 @@ class MainBuilder extends AbstractBuilder
         $this->html .= "<main>\n";
 
         if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
-            if($node->getTempChild() == null){
-                $new = new Node;
+            // pas censé arriver
+            if(!isset($_GET['id'])){
+                header('Location: ' . new URL);
+                die;
+            }
+
+            if($node->getAdoptedChild() == null){
+                // on pourrait raccourcir ça
+                $timestamp = time(); // int
+                $date = new \DateTime;
+                $date->setTimestamp($timestamp); // \DateTime
+                $article = new Article('', $date);
+                $new = new Node('new', 'i' . (string)$timestamp, [], 0, null, null, $article);
             }
             else{
-                $new = $node->getTempChild();
+                $new = $node->getAdoptedChild();
             }
             //$builder_name = $this->snakeToPascalCase($new->getName()) . 'Builder';
             $builder_name = 'NewBuilder';
diff --git a/src/view/NewBuilder.php b/src/view/NewBuilder.php
index acde8b4..a862a08 100644
--- a/src/view/NewBuilder.php
+++ b/src/view/NewBuilder.php
@@ -5,7 +5,7 @@ use App\Entity\Node;
 
 class NewBuilder extends AbstractBuilder
 {
-    public function __construct(Node $node)
+    public function __construct(Node $node, )
     {
         $viewFile = self::VIEWS_PATH . $node->getName() . '.php';
 
@@ -50,10 +50,15 @@ class NewBuilder extends AbstractBuilder
             //$date = str_replace(':', 'h', $date_object->format('d-m-Y à H:i'));
 
             // partage
-            $share_link = new URL(['page' => CURRENT_PAGE], $id);
-            isset($_GET['id']) ? $share_link->addParams(['id' => $_GET['id']]) : '';
+            $share_link = new URL(['page' => 'article', 'id' => $id]);
             $share_js = 'onclick="copyInClipBoard(\'' . $share_link . '\')"';
-            $share_button = '<a class="share" href="' . $share_link . '" ' . $share_js . '><img class="action_icon" src="assets/share.svg"></a>' . "\n";
+            if(isset($_GET['id']) && $_GET['id'][0] === 'n'){
+                $class = 'class="share hidden"';
+            }
+            else{
+                $class = 'class="share"';
+            }
+            $share_button = '<p ' . $class . ' ' . $share_js . '><img class="action_icon" src="assets/share.svg"></p>' . "\n";
 
             // modifier un article
             $title_buttons = '';
@@ -65,53 +70,64 @@ class NewBuilder extends AbstractBuilder
             {
                 if(Director::$page_path->getLast()->getEndOfPath() === 'article'){
                     $title_js = 'onclick="openEditor(\'' . $id_title . '\', \'article\')"';
-                    $modify_title = '<p id="edit-' . $id_title . '"><a href="#"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></a></p>' . "\n";
+                    $modify_title = '<p id="edit-' . $id_title . '"><button ' . $title_js . '><img class="action_icon" src="assets/edit.svg">Titre</button></p>' . "\n";
                     $close_js_title = 'onclick="closeEditor(\'' . $id_title . '\', \'article\', \'preview\')"';
-                    $close_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><a href="#"><button ' . $close_js_title . '>Annuler</button></a></p>';
+                    $close_editor_title = '<p id="cancel-' . $id_title . '" class="hidden"><button ' . $close_js_title . '>Annuler</button></p>';
                     $submit_js_title = 'onclick="submitArticle(\'' . $id_title . '\', \'article\')"';
-                    $submit_title = '<p id="submit-' . $id_title . '" class="hidden"><a href="#"><button ' . $submit_js_title . '>Valider</button></a></p>';
+                    $submit_title = '<p id="submit-' . $id_title . '" class="hidden"><button ' . $submit_js_title . '>Valider</button></p>';
                     $title_buttons = '<div class="button_zone">' . $modify_title . $close_editor_title . $submit_title . '</div>';
 
                     $preview_js = 'onclick="openEditor(\'' . $id_preview . '\', \'article\')"';
-                    $modify_preview = '<p id="edit-' . $id_preview . '"><a href="#"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";
+                    $modify_preview = '<p id="edit-' . $id_preview . '"><button ' . $preview_js . '><img class="action_icon" src="assets/edit.svg">Aperçu</button></a></p>' . "\n";
                     $close_js_preview = 'onclick="closeEditor(\'' . $id_preview . '\', \'article\', \'preview\')"';
-                    $close_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><a href="#"><button ' . $close_js_preview . '>Annuler</button></a></p>';
+                    $close_editor_preview = '<p id="cancel-' . $id_preview . '" class="hidden"><button ' . $close_js_preview . '>Annuler</button></p>';
                     $submit_js_preview = 'onclick="submitArticle(\'' . $id_preview . '\', \'article\')"';
-                    $submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><a href="#"><button ' . $submit_js_preview . '>Valider</button></a></p>';
+                    $submit_preview = '<p id="submit-' . $id_preview . '" class="hidden"><button ' . $submit_js_preview . '>Valider</button></p>';
                     $preview_buttons = '<div class="button_zone">' . $modify_preview . $close_editor_preview . $submit_preview . '</div>';
 
                     $article_js = 'onclick="openEditor(\'' . $id . '\', \'article\')"';
-                    $modify_article = '<p id="edit-' . $id . '"><a href="#"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></a></p>' . "\n";
+                    $modify_article = '<p id="edit-' . $id . '"><button ' . $article_js . '><img class="action_icon" src="assets/edit.svg">Article</button></p>' . "\n";
                     $close_js_article = 'onclick="closeEditor(\'' . $id . '\', \'article\')"';
-                    $close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><a href="#"><button ' . $close_js_article . '>Annuler</button></a></p>';
+                    $close_editor_article = '<p id="cancel-' . $id . '" class="hidden"><button ' . $close_js_article . '>Annuler</button></p>';
                     $submit_js_article = 'onclick="submitArticle(\'' . $id . '\', \'article\')"';
-                    $submit_article = '<p id="submit-' . $id . '" class="hidden"><a href="#"><button ' . $submit_js_article . '>Valider</button></a></p>';
+                    $submit_article = '<p id="submit-' . $id . '" class="hidden"><button ' . $submit_js_article . '>Valider</button></p>';
                     $article_buttons = '<div class="button_zone">' . $modify_article . $close_editor_article . $submit_article . '</div>';
 
                     $date_js = 'onclick="changeDate(\'' . $id_date . '\', \'article\');';
-                    $modify_date = '<p id="edit-' . $id_date . '"><a href="#"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></a></p>' . "\n";
+                    $modify_date = '<p id="edit-' . $id_date . '"><button ' . $date_js . '"><img class="action_icon" src="assets/edit.svg">Date</button></p>' . "\n";
                     $close_js_date = 'onclick="closeInput(\'' . $id_date . '\')"';
-                    $close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><a href="#"><button ' . $close_js_date . '>Annuler</button></a></p>';
+                    $close_editor_date = '<p id="cancel-' . $id_date . '" class="hidden"><button ' . $close_js_date . '>Annuler</button></p>';
                     $submit_js_date = 'onclick="submitDate(\'' . $id_date . '\')"';
-                    $submit_date = '<p id="submit-' . $id_date . '" class="hidden"><a href="#"><button ' . $submit_js_date . '>Valider</button></a></p>';
+                    $submit_date = '<p id="submit-' . $id_date . '" class="hidden"><button ' . $submit_js_date . '>Valider</button></p>';
                     $date_buttons = '<div class="button_zone">' . $modify_date . $close_editor_date . $submit_date . '</div>';
 
-                    $delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . CURRENT_PAGE . '\')"';
-                    $delete_article = '<p id="delete-' . $id . '"><a href="#"><button ' . $delete_js . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></a></p>' . "\n";
-
-                    $admin_buttons = $delete_article;
+                    $delete_article = '';
+                    $submit_article = '';
+                    // modification: bouton "supprimer"
+                    if($_GET['id'][0] === 'i'){
+                        $delete_js = 'onclick="deleteArticle(\'' . $id . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
+                        $delete_article = '<p id="delete-' . $id . '"><button ' . $delete_js . '><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '>Retirer<br>la publication</button></p>' . "\n";
+                    }
+                    // nouvel article: bouton pour valider la création d'un nouvel article
+                    else{
+                        $submit_js = 'onclick="submitArticle(\'' . $_GET['id'] . '\', \'' . Director::$page_path->getLast()->getEndOfPath() . '\')"';
+                        $submit_article = '<p id="submit-' . $id . '"><button ' . $submit_js . '><img class="action_icon" src="assets/edit.svg">Tout<br>enregistrer</button></p>' . "\n";
+                    }
+                    
+                    $admin_buttons = $delete_article . $submit_article;
                 }
+                // page d'accueil
                 else{
                     $modify_article = '<p id="edit-' . $id . '"></p>' . "\n";
 
                     $up_js = 'onclick="switchPositions(\'' . $id . '\', \'up\')"';
-                    $up_button = '<p id="position_up-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></a></p>' . "\n";
+                    $up_button = '<p id="position_up-' . $id . '"><img class="action_icon" src="assets/arrow-up.svg" ' . $up_js . '></p>' . "\n";
                     
                     $down_js = 'onclick="switchPositions(\'' . $id . '\', \'down\')"';
-                    $down_button = '<p id="position_down-' . $id . '"><a href="#"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></a></p>' . "\n";
+                    $down_button = '<p id="position_down-' . $id . '"><img class="action_icon" src="assets/arrow-down.svg" ' . $down_js . '></p>' . "\n";
 
                     $delete_js = 'onclick="deleteArticle(\'' . $id . '\')"';
-                    $delete_article = '<p id="delete-' . $id . '"><a href="#"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></a></p>' . "\n";
+                    $delete_article = '<p id="delete-' . $id . '"><img class="action_icon" src="assets/delete-bin.svg" ' . $delete_js . '></p>' . "\n";
 
                     $close_editor = '<p id="cancel-' . $id . '" class="hidden"></p>';
                     $submit_article = '<p id="submit-' . $id . '" class="hidden"></p>';
@@ -120,7 +136,6 @@ class NewBuilder extends AbstractBuilder
 
                     $admin_buttons = $modify_article . $up_button . $down_button . $delete_article . $close_editor . $submit_article;
                 }
-                
             }
 
             ob_start();