From a1d945a8abc5a58f1f9dc881bc746244d739ee8e Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Fri, 21 Feb 2025 13:08:53 +0100
Subject: [PATCH] fix category page

---
 assets/css/src/header.css               | 11 ++++-
 site/config/routes/virtual-category.php | 20 ++++++--
 site/models/category.php                | 23 ---------
 site/templates/category.php             | 64 ++++++++++---------------
 site/templates/linear.php               |  2 +-
 5 files changed, 51 insertions(+), 69 deletions(-)
 delete mode 100644 site/models/category.php

diff --git a/assets/css/src/header.css b/assets/css/src/header.css
index d1e5e03..f3e9ff7 100644
--- a/assets/css/src/header.css
+++ b/assets/css/src/header.css
@@ -59,11 +59,15 @@ main article > div {
   transform: translateX(-1px) translateY(-1px) !important;
 }
 
+.page-cover,
+article > h1 {
+  padding-top: calc(50vw);
+}
+
 .page-cover {
   position: relative;
   height: 100svh;
   box-sizing: border-box;
-  padding-top: calc(50vw);
 
   display: flex;
   flex-direction: column;
@@ -142,8 +146,11 @@ button.toggle.right::before {
     height: 100vh;
   }
 
-  .page-cover {
+  .page-cover,
+  article > h1 {
     padding-top: 15vw;
+  }
+  .page-cover {
     min-height: calc(22 * var(--unit--vertical));
   }
 
diff --git a/site/config/routes/virtual-category.php b/site/config/routes/virtual-category.php
index 37bb2fe..782e4d4 100644
--- a/site/config/routes/virtual-category.php
+++ b/site/config/routes/virtual-category.php
@@ -1,4 +1,3 @@
-
 <?php
 
 use Kirby\Uuid\Uuid;
@@ -6,14 +5,29 @@ use Kirby\Uuid\Uuid;
 return [
   'pattern' => 'categories/(:any)',
   'action'  => function ($category) {
+
+      $allTexts = page('textes')->grandChildren();
+      $textsInCategory = $allTexts->filter(
+          fn($text) => Str::slug($text->category()) === $category
+      );
+
+      $children = new Pages();
+
+      foreach ($textsInCategory as $text) {
+          $children->add($text);
+      }
+
+      $title = $textsInCategory->first()->category();
+
       return Page::factory([
           'slug'     => Str::slug($category) . '-' . Uuid::generate(),
           'template' => 'category',
           'model'    => 'category',
           'content'  => [
-              'title' => $category,
+              'title' => $title,
               'uuid'  => Uuid::generate(),
           ],
+          'children' => $children->toArray(),
       ]);
-  }
+  },
 ];
diff --git a/site/models/category.php b/site/models/category.php
deleted file mode 100644
index bb60265..0000000
--- a/site/models/category.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Kirby\Cms\Pages;
-use Kirby\Cms\Page;
-use Kirby\Uuid\Uuid;
-
-class CategoryPage extends Page
-{
-    public function children(): Pages
-    {
-        $category = $this->title()->value();
-        $allTexts = page("textes")->grandChildren();
-        $textsInCategory = $allTexts->filterBy('category', $category);
-
-        $children = new Pages();
-
-        foreach ($textsInCategory as $text) {
-            $children->add($text);
-        }
-
-        return $children; 
-    }
-}
diff --git a/site/templates/category.php b/site/templates/category.php
index e55c9a5..48f2878 100644
--- a/site/templates/category.php
+++ b/site/templates/category.php
@@ -1,56 +1,40 @@
 <?php snippet('header') ?>
 <main id="<?= $page->template() ?>">
   <article>
-    <?php snippet('cover', array('isOpen' => true), slots: true) ?>
-      <?php slot('title') ?>
-      <h1 class="main-title"><?= $page->title() ?></h1>
-      <?php endslot() ?>
-    <?php endsnippet() ?>
-    
-    <div id="main-content"
-      x-data="{
+    <h1 class="main-title"><?= $page->title() ?></h1>
+
+    <div id="main-content" x-data="{
         edito: false
-      }"
-    >
-      <?php if ($page->edito()->isNotEmpty()): ?>  
-        <div 
-          id="edito"
-          :class="edito ? '' : 'short'"
-        >
-          <?= $page->edito() ?>
-        </div>
-        <button 
-          :class="edito ? 'open' : 'close'"
-          class="see-more toggle-btn toggle-btn--left" 
-          @click="edito = !edito"
-        >Lire</button>
+      }">
+      <?php if ($page->edito()->isNotEmpty()): ?>
+      <div id="edito" :class="edito ? '' : 'short'">
+        <?= $page->edito() ?>
+      </div>
+      <button :class="edito ? 'open' : 'close'" class="see-more toggle-btn toggle-btn--left"
+        @click="edito = !edito">Lire</button>
       <?php endif ?>
       <ul class="texts">
-      <?php foreach($page->children() as $article): ?>
-        <li 
-          class="text"
-        >
-          <a href="<?= $article->url() ?>" class="text__title no-underline">
+        <?php foreach($page->children() as $article): ?>
+        <li class="text">
+          <a href="<?= $article->url() ?>"
+            class="text__title no-underline">
             <h4><?= $article->title() ?></h4>
           </a>
           <div class="text__infos">
             <p>
-                <span class="light">par</span>
-                <?php
-                  try {
-                    echo $article->author()->toPage()->title();
-                  } catch (\Throwable $th) {
-                    throw new Exception(json_encode($article->author()), 1);
-                    
-                  }
-                ?>
-                <a class="author" href="/auteurs/<?= Str::slug($article->author()->toPage()->title()) ?>"><?= $article->author()->toPage()->title() ?></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>
+              <span class="light">par</span>
+              <a class="author"
+                href="/auteurs/<?= Str::slug($article->author()->toPage()->title()) ?>"><?= $article->author()->toPage()->title() ?></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 ?>
+        <?php endforeach ?>
     </div>
   </article>
 </main>
diff --git a/site/templates/linear.php b/site/templates/linear.php
index 675eec9..beab9b3 100644
--- a/site/templates/linear.php
+++ b/site/templates/linear.php
@@ -17,7 +17,7 @@
       <span class="light">dans</span> <a
         href="<?= $page->parent()->url() ?>"
         title="voir les textes liés à l'année <?= $page->parent()->title() ?>"><?= $page->parent()->title() ?></a>
-      / <a href="/categories/<?= $page->category() ?>"
+      / <a href="/categories/<?= Str::slug($page->category()) ?>"
         title="voir les textes de la catégorie <?= $page->category() ?>"><?= $page->category() ?></a>
     </p>
     <?php endslot() ?>