6 files changed, 26 insertions, 30 deletions

diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index 35df010..fcb78e0 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -4,6 +4,7 @@
 declare(strict_types=1);
 
 use App\Entity\Node;
+use App\Entity\Asset;
 
 class FooterBuilder extends AbstractBuilder
 {
@@ -13,12 +14,15 @@ class FooterBuilder extends AbstractBuilder
         
         if(file_exists($viewFile))
         {
-            // $adresses postale et e-mail
-            if(!empty($node->getNodeData()->getData()))
+            $node_data = $node->getNodeData();
+            // nom du contact, adresse et e-mail
+            if(!empty($node_data->getData()))
             {
-                extract($node->getNodeData()->getData());
+                extract($node_data->getData());
             }
 
+            $footer_logo = Asset::USER_PATH . $node_data->getAssetByRole('footer_logo')?->getFileName() ?? '';
+
             $this->useChildrenBuilder($node);
             $breadcrumb = $this->html;
 
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index b3d78aa..fd7f751 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -49,18 +49,9 @@ class HeadBuilder extends AbstractBuilder
             $description = Model::$page_path->getLast()->getDescription();
 
             // favicon
-            /*foreach($node->getNodeData()->getImages() as $image)
-            {
-                if(str_contains($image->getFileName(), 'favicon'))
-                {
-                    $favicon = rtrim($image->getFilePathMini(), '/');
-                    $alt = $image->getAlt();
-                }
-            }*/
-
-            // en dur temporairement
-            $favicon = Asset::USER_PATH . 'favicon48x48.png';
-            $alt = 'favicon';
+            // ?-> est l'opérateur de navigation sécurisée => LOVE!
+            $favicon = Asset::USER_PATH . ($favicon_object = $node->getNodeData()->getAssetByRole('head_favicon'))?->getFileName() ?? '';
+            $favicon_type = $favicon_object?->getMimeType() ?? '';
 
             ob_start();
             require $viewFile;
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 3b45a11..44e244d 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -3,8 +3,8 @@
 
 declare(strict_types=1);
 
-use App\Entity\Asset;
 use App\Entity\Node;
+use App\Entity\Asset;
 
 class HeaderBuilder extends AbstractBuilder
 {
@@ -35,18 +35,18 @@ class HeaderBuilder extends AbstractBuilder
         
         if(file_exists($viewFile))
         {
+            $node_data = $node->getNodeData();
             // titre et description
-            // => retourne $titre, $description et le tableau associatif: $social
-            if(!empty($node->getNodeData()->getData()))
+            if(!empty($node_data->getData()))
             {
-                extract($node->getNodeData()->getData());
+                extract($node_data->getData());
             }
 
             // réseaux sociaux + logo dans l'entête
+            $header_logo = Asset::USER_PATH . $node_data->getAssetByRole('header_logo')?->getFileName() ?? '';
+            $header_background = Asset::USER_PATH . $node_data->getAssetByRole('header_background')?->getFileName() ?? '';
             $keys = array_keys($social);
             $social_networks = '';
-            //$header_logo;
-            //$header_background;
 
             // nécéssite des entrées dans la table node_asset
             /*foreach($node->getNodeData()->getAssets() as $asset)
@@ -80,20 +80,21 @@ class HeaderBuilder extends AbstractBuilder
             
             // boutons mode admin
             if($_SESSION['admin']){
+                // assets dans classe editing_zone
                 $editing_zone_margin = '5px';
-                $favicon = Asset::USER_PATH . 'favicon48x48.png'; // double le code dans HeadBuilder
-                $buttons_favicon = '<button id="head_favicon_open" onclick="head_favicon.open()"><img id="head_favicon_img" class="action_icon" src="' . $favicon . '"> Favicon</button>
+                $buttons_favicon = '<button id="head_favicon_open" onclick="head_favicon.open()"><img id="head_favicon_img" class="action_icon"> Favicon</button>
+                    <script>document.getElementById(\'head_favicon_img\').src = window.Config.favicon;</script>
                     <img id="head_favicon_submit" class="action_icon hidden" src="assets/save.svg" onclick="head_favicon.submit()">
                     <img id="head_favicon_cancel" class="action_icon hidden" src="assets/close.svg" onclick="head_favicon.cancel()">';
-                $background = Asset::USER_PATH . 'fond-piscine.jpg';
-                $buttons_background = '<button id="header_background_open" onclick="header_background.open()"><img id="header_background_img" class="background_button" src="' . $background . '"> Image de fond</button>
+                $buttons_background = '<button id="header_background_open" onclick="header_background.open()"><img id="header_background_img" class="background_button" src="' . $header_background . '"> Image de fond</button>
                     <img id="header_background_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_background.submit()">
                     <img id="header_background_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_background.cancel()">';
 
+                // asset dans classe header_content
                 $buttons_header_logo = '<img id="header_logo_open" class="action_icon" src="assets/edit.svg" onclick="header_logo.open()">
                     <img id="header_logo_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_logo.submit()">
                     <img id="header_logo_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_logo.cancel()">';
-
+                // texte dans classe header_content
                 $buttons_header_title = '<img id="header_title_open" class="action_icon" src="assets/edit.svg" onclick="header_title.open()">
                     <img id="header_title_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_title.submit()">
                     <img id="header_title_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_title.cancel()">';
diff --git a/src/view/templates/footer.php b/src/view/templates/footer.php
index 2bb5a9e..4db38ae 100644
--- a/src/view/templates/footer.php
+++ b/src/view/templates/footer.php
@@ -20,7 +20,7 @@
                         </div>
                     </div>
                     <div id="footer_logo">
-                        <a href="<?= new URL ?>"><img id="footer_logo_img" src="<?= $footer_logo ?>" alt="logo_alt"></a>
+                        <a href="<?= new URL ?>"><img id="footer_logo_img" src="<?= $footer_logo ?? '' ?>" alt="logo_alt"></a>
                         <input type="file" id="footer_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
                         <?= $buttons_footer_logo ?>
                     </div>
diff --git a/src/view/templates/head.php b/src/view/templates/head.php
index 83a0e7c..bce0a19 100644
--- a/src/view/templates/head.php
+++ b/src/view/templates/head.php
@@ -2,12 +2,12 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
+        <script>window.Config = {page: "<?= CURRENT_PAGE ?>", favicon: "<?= $favicon ?>"};</script>
         <meta charset="utf-8">
         <title><?= $title ?></title>
-        <link rel="icon" type="image/png" href="<?= $favicon ?>" alt="<?= $alt ?>">
+        <link rel="icon" type="<?= $favicon_type ?>" href="<?= $favicon ?>">
         <meta name="description" content="<?= $description ?>">
         <meta name="viewport" content="width=device-width">
-        <script>window.Config = {page: "<?= CURRENT_PAGE ?>"};</script>
         <?= $css ?>
         <?= $js ?>
     </head>
\ No newline at end of file
diff --git a/src/view/templates/header.php b/src/view/templates/header.php
index b63aa84..ac8af7f 100644
--- a/src/view/templates/header.php
+++ b/src/view/templates/header.php
@@ -18,7 +18,7 @@
             <div class="header_content">
                 <div class="header_left_col">
                     <div id="header_logo">
-                        <a href="<?= new URL ?>"><img id="header_logo_img" src="<?= $header_logo ?>" alt="logo_alt"></a>
+                        <a href="<?= new URL ?>"><img id="header_logo_img" src="<?= $header_logo ?? '' ?>" alt="header_logo"></a>
                         <input type="file" id="header_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
                         <?= $buttons_header_logo ?>
                     </div>