From bdb8613be4542647533ff1c6bb78dcf9b7318be8 Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Thu, 20 Jun 2024 09:50:39 +0200
Subject: [PATCH] nav - don't show empty categories

---
 assets/css/src/generic.css          |   6 +-
 assets/css/style.css                |  20 +--
 site/collections/categories.php     |  30 +++-
 site/snippets/desktop-nav.php       |  55 ++++++
 site/snippets/header.php            |   2 +-
 site/snippets/nav.php               |  17 ++
 site/snippets/panel--categories.php |  90 ++++++++++
 site/snippets/panel--years.php      |  97 +++++++++++
 site/snippets/panels.php            | 254 ----------------------------
 9 files changed, 295 insertions(+), 276 deletions(-)
 create mode 100644 site/snippets/desktop-nav.php
 create mode 100644 site/snippets/nav.php
 create mode 100644 site/snippets/panel--categories.php
 create mode 100644 site/snippets/panel--years.php
 delete mode 100644 site/snippets/panels.php

diff --git a/assets/css/src/generic.css b/assets/css/src/generic.css
index e7452aa..255179c 100644
--- a/assets/css/src/generic.css
+++ b/assets/css/src/generic.css
@@ -6,17 +6,17 @@ body {
   background-size: var(--unit--horizontal) var(--unit--vertical);
   background-image: linear-gradient(
       to right,
-      var(--color-secondary--x-light) 1px,
+      var(--color-tertiary--x-light) 1px,
       transparent 1px
     ),
     linear-gradient(
       to bottom,
-      var(--color-secondary--light) 1px,
+      var(--color-tertiary--light) 1px,
       transparent 1px
     ),
     linear-gradient(
       to bottom,
-      var(--color-secondary--x-light) 1px,
+      var(--color-tertiary--x-light) 1px,
       transparent 1px
     );
   background-position: 0 0, 0 0, 0 calc(var(--unit--vertical) / 2);
diff --git a/assets/css/style.css b/assets/css/style.css
index ec56b9c..ec23316 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -14,9 +14,16 @@
   --color-background: #000;
   --color-primary: #ffffff;
   --color-primary--transparent: rgba(255, 255, 255, 0.86);
-  --color-secondary: rgb(120, 171, 150, 0.86);
-  --color-secondary--light: rgb(119, 177, 157, 0.2);
-  --color-secondary--x-light: rgb(119, 177, 157, 0.1);
+
+  --color-secondary-rgb: 120, 171, 150;
+  --color-secondary: rgba(var(--color-secondary-rgb), 0.86);
+  --color-secondary--light: rgba(var(--color-secondary-rgb), 0.2);
+  --color-secondary--x-light: rgb(var(--color-secondary-rgb), 0.1);
+
+  --color-tertiary-rgb: 253, 68, 26;
+  --color-tertiary: rgba(var(--color-tertiary-rgb), 0.86);
+  --color-tertiary--light: rgba(var(--color-tertiary-rgb), 0.2);
+  --color-tertiary--x-light: rgb(var(--color-tertiary-rgb), 0.1);
 
   --unit--horizontal: 5vw;
   --unit--vertical: 1.7rem;
@@ -41,13 +48,6 @@
 
 @media screen and (min-width: 640px) {
   :root {
-    --color-background: #000;
-    --color-primary: #ffffff;
-    --color-primary--transparent: rgba(255, 255, 255, 0.86);
-    --color-secondary: rgb(120, 171, 150, 0.86);
-    --color-secondary--light: rgb(119, 177, 157, 0.25);
-    --color-secondary--x-light: rgb(119, 177, 157, 0.15);
-
     --unit--horizontal: 2.5vw;
     --unit--vertical: 1.7rem;
 
diff --git a/site/collections/categories.php b/site/collections/categories.php
index ad4645a..4d425ed 100644
--- a/site/collections/categories.php
+++ b/site/collections/categories.php
@@ -1,27 +1,41 @@
 <?php
 
-return function ($site) {
-    $textsPage = $site->find('texts');
-    $years = $textsPage->children();
-    $texts = $years->children()->index();
-
+function createCategories($textsPage) {
     $categories = array();
-
     foreach ($textsPage->categories()->split() as $category) {
         $categories[$category] = array(
           'title' => $category,
           'texts' => array()
         );
     }
+    return $categories;
+}
 
+function fillCategoriesWithTexts($emptyCategories, $texts) {
+    $filledCategories = $emptyCategories;
     foreach ($texts as $text) {
         try {
-            $categories[$text->category()->value()]['texts'][] = $text;
+            $textCategory = $text->category()->value();
+            $filledCategories[$textCategory]['texts'][] = $text;
         } catch (\Throwable $th) {
             throw new Exception(json_encode($th->getFile() . ' : ' . $th->getMessage()));
         }
     }
 
-    return $categories;
+    // exclude empty categories
+    return array_filter($filledCategories, function($category) {
+        return count($category['texts']) > 0;
+    });
+}
 
+return function ($site) {
+    $textsPage = $site->find('texts');
+    $years = $textsPage->children();
+    $texts = $years->children()->index();
+
+    $emptyCategories = createCategories($textsPage);
+
+    $filledCategories = fillCategoriesWithTexts($emptyCategories, $texts);
+
+    return $filledCategories;
 };
diff --git a/site/snippets/desktop-nav.php b/site/snippets/desktop-nav.php
new file mode 100644
index 0000000..72b0e7e
--- /dev/null
+++ b/site/snippets/desktop-nav.php
@@ -0,0 +1,55 @@
+<?php
+  $firstCol = rand(0, 8);
+  $secondCol = rand(0, 8)
+?>
+
+<sidebar id="desktop-nav">
+  <ul>
+    <li 
+      class="left top" 
+      style="
+        --left: <?= e($page->fullWidth() != 'true', $firstCol, 0) ?>; 
+        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
+      "
+    >
+      <button class="toggle-btn toggle-btn--left" onclick="togglePanel('left', event)">
+        années
+      </button>
+    </li>
+    <li 
+      class="left top" 
+      style="
+        --left: <?= e($page->fullWidth() != 'true', $secondCol, 0) ?>; 
+        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
+      "
+    >
+      <button class="toggle-btn toggle-btn--left" onclick="togglePanel('right', event)">
+        catégories
+      </button>
+    </li>
+    <li class="empty
+    "></li>
+    <li 
+      class="left top" 
+      style="
+        --left: <?= e($page->fullWidth() != 'true', $firstCol, 0) ?>; 
+        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
+      "
+    >
+      <a href="#">
+        s'abonner
+      </a>
+    </li>
+    <li 
+      class="left top" 
+      style="
+        --left: <?= e($page->fullWidth() != 'true', $secondCol, 0) ?>; 
+        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
+      "
+    >
+      <a href="<?= $site->find('a-propos')->url() ?>">
+        à propos
+      </a>
+    </li>
+  </ul>
+</sidebar>
\ No newline at end of file
diff --git a/site/snippets/header.php b/site/snippets/header.php
index 9b8fadf..525e46a 100644
--- a/site/snippets/header.php
+++ b/site/snippets/header.php
@@ -25,4 +25,4 @@ $entryTopPos = $entryTopPos ?? 20;
         </a>
       </div>
     </header>
-    <?php snippet('panels') ?>
\ No newline at end of file
+    <?php snippet('nav') ?>
\ No newline at end of file
diff --git a/site/snippets/nav.php b/site/snippets/nav.php
new file mode 100644
index 0000000..dbc2303
--- /dev/null
+++ b/site/snippets/nav.php
@@ -0,0 +1,17 @@
+<?php snippet('desktop-nav') ?>
+
+<?php snippet('panel--years') ?>
+  
+  <button 
+    onclick="togglePanel('years')" 
+    class="panel-close"
+  >fermer</button>
+</nav>
+
+<?php snippet('panel--categories') ?>
+  
+  <button 
+    onclick="togglePanel('categories')" 
+    class="panel-close"
+  >fermer</button>
+</nav>
\ No newline at end of file
diff --git a/site/snippets/panel--categories.php b/site/snippets/panel--categories.php
new file mode 100644
index 0000000..f19b425
--- /dev/null
+++ b/site/snippets/panel--categories.php
@@ -0,0 +1,90 @@
+<nav 
+  class="panel panel--right"
+  x-data="{search: ''}"
+>
+  <div class="search">
+    <input 
+      class="search__input" 
+      type="text" 
+      placeholder="titre / auteur / année / catégorie" 
+      x-model="search"
+    >
+    <img 
+      x-show="search.length === 0"
+      src="<?= url('assets/images/icons/search.svg') ?>" 
+      class="search__icon"
+      alt="Icône loupe indiquant le champ de recherche."
+    >
+    <button 
+      x-show="search.length > 0"
+      @click="search = ''"
+      class="search__icon"
+    >
+      <img src="<?= url('assets/images/icons/close.svg') ?>" alt="">
+    </button>
+  </div>
+  <ul class="panel__items">
+    <?php
+      $categories = $kirby->collection('categories');
+      shuffle($categories);
+      foreach($categories as $category): 
+    ?>
+    <li 
+      class="panel__item "
+      x-data='{ isOpen: false }'
+    >
+      <a class="no-line" href="#<?= $category['title'] ?>" id="<?= $category['title'] ?>">
+        <button 
+          class="panel__toggle-btn"
+          :class="isOpen ? '' : 'short'"
+          @click="isOpen = !isOpen" 
+        >
+          <h3><?= $category['title'] ?></h3>
+          <div 
+            class="panel__toggle-icon" 
+            x-text="isOpen || search.length > 0 ? '-' : '+'"
+          ></div>
+        </button>
+      </a>
+      <div
+        class="panel-item-content"
+        x-show="isOpen || search.length > 0"
+      >
+        <ul class="panel-item-content__texts">
+          <?php
+            shuffle($category['texts']);
+            foreach($category['texts'] as $article): 
+          ?>
+            <li 
+              class="text"
+              x-data="{ 
+                title: '<?= str_replace("'", "\'", $article->title()->value()) ?>',
+                author: '<?= $article->author()->toUser()->name() ?>',
+                yearParent: '<?= $article->parent()->title()->value() ?>',
+                category: '<?= $article->category() ?>',
+              }"
+              x-show="
+                title.toLowerCase().includes(search.toLowerCase()) 
+                || author.toLowerCase().includes(search.toLowerCase())
+                || yearParent.toLowerCase().includes(search.toLowerCase())
+                || category.toLowerCase().includes(search.toLowerCase())
+              "
+            >
+              <a href="<?= $article->url() ?>" class="text__title no-line">
+                <h4><?= $article->title() ?></h4>
+              </a>
+              <div class="text__infos">
+                <p>
+                    <span class="light">par</span>
+                    <a class="author" href="/auteurs/<?= Str::slug($article->author()->toUser()->name()) ?>"><?= $article->author()->toUser()->name() ?></a><br>
+                    <span class="light">publié le </span><?= $article->published()->toDate('d/m/Y') ?><br>
+                    <span class="light">dans</span> <a href="<?= $article->parent()->url() ?>"><?= $article->parent()->title() ?></a> / <a href="/categories/<?= $article->category() ?>"><?= $article->category() ?></a>
+                </p>
+              </div>
+            </li>
+          <?php endforeach ?>
+        </ul>
+      </div>
+    </li>
+    <?php endforeach ?>
+  </ul>
\ No newline at end of file
diff --git a/site/snippets/panel--years.php b/site/snippets/panel--years.php
new file mode 100644
index 0000000..9f2faac
--- /dev/null
+++ b/site/snippets/panel--years.php
@@ -0,0 +1,97 @@
+<nav 
+  class="panel panel--left"
+  x-data="{search: ''}"
+>
+  <div class="search">
+    <input 
+      class="search__input" 
+      type="text" 
+      placeholder="titre / auteur / année / catégorie" 
+      x-model="search"
+    >
+    <img 
+      x-show="search.length === 0"
+      src="<?= url('assets/images/icons/search.svg') ?>" 
+      class="search__icon"
+      alt="Icône loupe indiquant le champ de recherche."
+    >
+    <button 
+      x-show="search.length > 0"
+      @click="search = ''"
+      class="search__icon"
+    >
+      <img src="<?= url('assets/images/icons/close.svg') ?>" alt="">
+    </button>
+  </div>
+  <ul class="panel__items">
+    <?php foreach($kirby->collection('years') as $year): ?>
+    <li 
+      class="panel__item "
+      x-data='{ isOpen: false }'
+    >
+      <a class="no-line" href="#<?= $year->slug() ?>" id="<?= $year->slug() ?>">
+        <button 
+          class="panel__toggle-btn"
+          :class="isOpen ? '' : 'short'"
+          @click="isOpen = !isOpen" 
+        >
+          <h3><?= $year->title() ?></h3>
+          <div 
+            class="panel__toggle-icon" 
+            x-text="isOpen || search.length > 0 ? '-' : '+'"
+          ></div>
+        </button>
+      </a>
+      <div
+        class="panel-item-content"
+        x-show="isOpen || search.length > 0"
+        x-data='{ edito: false }'
+      >
+        <div 
+          class="panel-item-content__edito"
+          :class="edito ? '' : 'short'"
+          x-show="search.length === 0"
+        >
+          <?= $year->edito() ?>
+        </div>
+        <button 
+          :class="edito ? 'open' : 'close'"
+          x-show="search.length === 0"
+          class="see-more toggle-btn toggle-btn--left" 
+          @click="edito = !edito"
+        >Lire</button>
+        <ul class="panel-item-content__texts">
+          <?php foreach($year->children()->shuffle() as $article): ?>
+            <li 
+              class="text"
+              x-data="{ 
+                title: '<?= str_replace("'", "\'", $article->title()->value()) ?>',
+                author: '<?= $article->author()->toUser()->name() ?>',
+                yearParent: '<?= $article->parent()->title()->value() ?>',
+                category: '<?= $article->category() ?>',
+              }"
+              x-show="
+                title.toLowerCase().includes(search.toLowerCase()) 
+                || author.toLowerCase().includes(search.toLowerCase())
+                || yearParent.toLowerCase().includes(search.toLowerCase())
+                || category.toLowerCase().includes(search.toLowerCase())
+              "
+            >
+              <a href="<?= $article->url() ?>" class="text__title no-line">
+                <h4><?= $article->title() ?></h4>
+              </a>
+              <div class="text__infos">
+                <p>
+                    <span class="light">par</span>
+                    <a class="author" href="/auteurs/<?= Str::slug($article->author()->toUser()->name()) ?>"><?= $article->author()->toUser()->name() ?></a><br>
+                    <span class="light">publié le </span><?= $article->published()->toDate('d/m/Y') ?><br>
+                    <span class="light">dans</span> <a href="<?= $article->parent()->url() ?>"><?= $article->parent()->title() ?></a> / <a href="/categories/<?= $article->category() ?>"><?= $article->category() ?></a>
+                </p>
+              </div>
+            </li>
+          <?php endforeach ?>
+        </ul>
+      </div>
+    </li>
+    <?php endforeach ?>
+  </ul>
\ No newline at end of file
diff --git a/site/snippets/panels.php b/site/snippets/panels.php
deleted file mode 100644
index b79075a..0000000
--- a/site/snippets/panels.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-$firstCol = rand(0, 8);
-$secondCol = rand(0, 8)
-?>
-
-<sidebar id="desktop-nav">
-  <ul>
-    <li 
-      class="left top" 
-      style="
-        --left: <?= e($page->fullWidth() != 'true', $firstCol, 0) ?>; 
-        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
-      "
-    >
-      <button class="toggle-btn toggle-btn--left" onclick="togglePanel('left', event)">
-        années
-      </button>
-    </li>
-    <li 
-      class="left top" 
-      style="
-        --left: <?= e($page->fullWidth() != 'true', $secondCol, 0) ?>; 
-        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
-      "
-    >
-      <button class="toggle-btn toggle-btn--left" onclick="togglePanel('right', event)">
-        catégories
-      </button>
-    </li>
-    <li class="empty
-    "></li>
-    <li 
-      class="left top" 
-      style="
-        --left: <?= e($page->fullWidth() != 'true', $firstCol, 0) ?>; 
-        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
-      "
-    >
-      <a href="#">
-        s'abonner
-      </a>
-    </li>
-    <li 
-      class="left top" 
-      style="
-        --left: <?= e($page->fullWidth() != 'true', $secondCol, 0) ?>; 
-        --top: <?= e($page->fullWidth() != 'true', rand(0, 6), 0) ?>
-      "
-    >
-      <a href="<?= $site->find('a-propos')->url() ?>">
-        à propos
-      </a>
-    </li>
-  </ul>
-</sidebar>
-
-<nav 
-  class="panel panel--left"
-  x-data="{search: ''}"
->
-  <div class="search">
-    <input 
-      class="search__input" 
-      type="text" 
-      placeholder="titre / auteur / année / catégorie" 
-      x-model="search"
-    >
-    <img 
-      x-show="search.length === 0"
-      src="<?= url('assets/images/icons/search.svg') ?>" 
-      class="search__icon"
-      alt="Icône loupe indiquant le champ de recherche."
-    >
-    <button 
-      x-show="search.length > 0"
-      @click="search = ''"
-      class="search__icon"
-    >
-      <img src="<?= url('assets/images/icons/close.svg') ?>" alt="">
-    </button>
-  </div>
-  <ul class="panel__items">
-    <?php foreach($kirby->collection('years') as $year): ?>
-    <li 
-      class="panel__item "
-      x-data='{ isOpen: false }'
-    >
-      <a class="no-line" href="#<?= $year->slug() ?>" id="<?= $year->slug() ?>">
-        <button 
-          class="panel__toggle-btn"
-          :class="isOpen ? '' : 'short'"
-          @click="isOpen = !isOpen" 
-        >
-          <h3><?= $year->title() ?></h3>
-          <div 
-            class="panel__toggle-icon" 
-            x-text="isOpen || search.length > 0 ? '-' : '+'"
-          ></div>
-        </button>
-      </a>
-      <div
-        class="panel-item-content"
-        x-show="isOpen || search.length > 0"
-        x-data='{ edito: false }'
-      >
-        <div 
-          class="panel-item-content__edito"
-          :class="edito ? '' : 'short'"
-          x-show="search.length === 0"
-        >
-          <?= $year->edito() ?>
-        </div>
-        <button 
-          :class="edito ? 'open' : 'close'"
-          x-show="search.length === 0"
-          class="see-more toggle-btn toggle-btn--left" 
-          @click="edito = !edito"
-        >Lire</button>
-        <ul class="panel-item-content__texts">
-          <?php foreach($year->children()->shuffle() as $article): ?>
-            <li 
-              class="text"
-              x-data="{ 
-                title: '<?= str_replace("'", "\'", $article->title()->value()) ?>',
-                author: '<?= $article->author()->toUser()->name() ?>',
-                yearParent: '<?= $article->parent()->title()->value() ?>',
-                category: '<?= $article->category() ?>',
-              }"
-              x-show="
-                title.toLowerCase().includes(search.toLowerCase()) 
-                || author.toLowerCase().includes(search.toLowerCase())
-                || yearParent.toLowerCase().includes(search.toLowerCase())
-                || category.toLowerCase().includes(search.toLowerCase())
-              "
-            >
-              <a href="<?= $article->url() ?>" class="text__title no-line">
-                <h4><?= $article->title() ?></h4>
-              </a>
-              <div class="text__infos">
-                <p>
-                    <span class="light">par</span>
-                    <a class="author" href="/auteurs/<?= Str::slug($article->author()->toUser()->name()) ?>"><?= $article->author()->toUser()->name() ?></a><br>
-                    <span class="light">publié le </span><?= $article->published()->toDate('d/m/Y') ?><br>
-                    <span class="light">dans</span> <a href="<?= $article->parent()->url() ?>"><?= $article->parent()->title() ?></a> / <a href="/categories/<?= $article->category() ?>"><?= $article->category() ?></a>
-                </p>
-              </div>
-            </li>
-          <?php endforeach ?>
-        </ul>
-      </div>
-    </li>
-    <?php endforeach ?>
-  </ul>
-  
-  <button 
-    onclick="togglePanel('left')" 
-    class="panel-close"
-  >fermer</button>
-</nav>
-
-<nav 
-  class="panel panel--right"
-  x-data="{search: ''}"
->
-  <div class="search">
-    <input 
-      class="search__input" 
-      type="text" 
-      placeholder="titre / auteur / année / catégorie" 
-      x-model="search"
-    >
-    <img 
-      x-show="search.length === 0"
-      src="<?= url('assets/images/icons/search.svg') ?>" 
-      class="search__icon"
-      alt="Icône loupe indiquant le champ de recherche."
-    >
-    <button 
-      x-show="search.length > 0"
-      @click="search = ''"
-      class="search__icon"
-    >
-      <img src="<?= url('assets/images/icons/close.svg') ?>" alt="">
-    </button>
-  </div>
-  <ul class="panel__items">
-    <?php
-      $categories = $kirby->collection('categories');
-shuffle($categories);
-foreach($categories as $category): ?>
-    <li 
-      class="panel__item "
-      x-data='{ isOpen: false }'
-    >
-      <a class="no-line" href="#<?= $category['title'] ?>" id="<?= $category['title'] ?>">
-        <button 
-          class="panel__toggle-btn"
-          :class="isOpen ? '' : 'short'"
-          @click="isOpen = !isOpen" 
-        >
-          <h3><?= $category['title'] ?></h3>
-          <div 
-            class="panel__toggle-icon" 
-            x-text="isOpen || search.length > 0 ? '-' : '+'"
-          ></div>
-        </button>
-      </a>
-      <div
-        class="panel-item-content"
-        x-show="isOpen || search.length > 0"
-      >
-        <ul class="panel-item-content__texts">
-          <?php
-    shuffle($category['texts']);
-    foreach($category['texts'] as $article): ?>
-            <li 
-              class="text"
-              x-data="{ 
-                title: '<?= str_replace("'", "\'", $article->title()->value()) ?>',
-                author: '<?= $article->author()->toUser()->name() ?>',
-                yearParent: '<?= $article->parent()->title()->value() ?>',
-                category: '<?= $article->category() ?>',
-              }"
-              x-show="
-                title.toLowerCase().includes(search.toLowerCase()) 
-                || author.toLowerCase().includes(search.toLowerCase())
-                || yearParent.toLowerCase().includes(search.toLowerCase())
-                || category.toLowerCase().includes(search.toLowerCase())
-              "
-            >
-              <a href="<?= $article->url() ?>" class="text__title no-line">
-                <h4><?= $article->title() ?></h4>
-              </a>
-              <div class="text__infos">
-                <p>
-                    <span class="light">par</span>
-                    <a class="author" href="/auteurs/<?= Str::slug($article->author()->toUser()->name()) ?>"><?= $article->author()->toUser()->name() ?></a><br>
-                    <span class="light">publié le </span><?= $article->published()->toDate('d/m/Y') ?><br>
-                    <span class="light">dans</span> <a href="<?= $article->parent()->url() ?>"><?= $article->parent()->title() ?></a> / <a href="/categories/<?= $article->category() ?>"><?= $article->category() ?></a>
-                </p>
-              </div>
-            </li>
-          <?php endforeach ?>
-        </ul>
-      </div>
-    </li>
-    <?php endforeach ?>
-  </ul>
-  
-  <button 
-    onclick="togglePanel('right')" 
-    class="panel-close"
-  >fermer</button>
-</nav>
\ No newline at end of file