From fc267d80d12dfcb076fa66834e2b8fa6bcb22e1a Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Mon, 3 Feb 2025 16:32:36 +0100
Subject: [PATCH] fix #15

---
 assets/css/src/article.css              |  8 +++
 site/config/routes/virtual-category.php | 19 +++---
 site/models/category.php                | 23 +++++++
 site/templates/category.php             | 88 +++++++++++++++----------
 site/templates/year.php                 | 23 +++++--
 5 files changed, 110 insertions(+), 51 deletions(-)
 create mode 100644 site/models/category.php

diff --git a/assets/css/src/article.css b/assets/css/src/article.css
index 10bd7a9..e31ea9a 100644
--- a/assets/css/src/article.css
+++ b/assets/css/src/article.css
@@ -9,6 +9,14 @@ article #main-content {
   font-style: italic;
 }
 
+#main-content .texts {
+  margin-top: calc(2 * var(--unit--vertical));
+}
+
+#main-content .see-more {
+  margin-top: calc(var(--unit--vertical) * 0.5);
+}
+
 #chapo em {
   font-style: normal;
 }
diff --git a/site/config/routes/virtual-category.php b/site/config/routes/virtual-category.php
index 95b525c..37bb2fe 100644
--- a/site/config/routes/virtual-category.php
+++ b/site/config/routes/virtual-category.php
@@ -1,3 +1,4 @@
+
 <?php
 
 use Kirby\Uuid\Uuid;
@@ -5,18 +6,14 @@ use Kirby\Uuid\Uuid;
 return [
   'pattern' => 'categories/(:any)',
   'action'  => function ($category) {
-      $kirby = kirby();
-
-      return Page::factory(
-          [
-            'slug' => '',
-            'template' => 'category',
-            'model' => 'categories',
-            'content' => [
+      return Page::factory([
+          'slug'     => Str::slug($category) . '-' . Uuid::generate(),
+          'template' => 'category',
+          'model'    => 'category',
+          'content'  => [
               'title' => $category,
               'uuid'  => Uuid::generate(),
-            ]
-          ]
-      );
+          ],
+      ]);
   }
 ];
diff --git a/site/models/category.php b/site/models/category.php
new file mode 100644
index 0000000..bb60265
--- /dev/null
+++ b/site/models/category.php
@@ -0,0 +1,23 @@
+<?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 6111077..e55c9a5 100644
--- a/site/templates/category.php
+++ b/site/templates/category.php
@@ -1,36 +1,58 @@
-<?php snippet('header'); ?>
-
+<?php snippet('header') ?>
 <main id="<?= $page->template() ?>">
-<article>
-  <?php snippet('cover', slots: true) ?>
-    <?php slot('title') ?>
-    <?php endslot() ?>
-    <?php slot('text') ?>
-      <h2 class="main-title <?= setTitleFontSizeClass($page->title()) ?>"><?= $page->title() ?></h2>
+  <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="{
+        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 endif ?>
       <ul class="texts">
-      <?php foreach($kirby->collection('categories') as $category): ?>
-          <?php if ($category->title() == $page->title()): ?>
-            <?php foreach($category['texts'] 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>
-                      <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 endif ?>
-        </ul>
+      <?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>
+            </p>
+          </div>
+        </li>
       <?php endforeach ?>
-    <?php endslot() ?>
-  <?php endsnippet() ?>
-</article>
-</main>
\ No newline at end of file
+    </div>
+  </article>
+</main>
+
+<?php snippet('footer') ?>
\ No newline at end of file
diff --git a/site/templates/year.php b/site/templates/year.php
index 01861cb..225f0b9 100644
--- a/site/templates/year.php
+++ b/site/templates/year.php
@@ -4,20 +4,29 @@
     <?php snippet('cover', array('isOpen' => true), slots: true) ?>
       <?php slot('title') ?>
       <h1 class="main-title"><?= $page->title() ?></h1>
-      <?php if ($page->subtitle()->isNotEmpty()): ?>
-        <h2 class="main-subtitle fs-l"><?= $page->subtitle()->inline() ?></h2>
-      <?php endif ?>
       <p>
         <span class="light">ouverte depuis le </span><?= $page->openDate()->toDate('d/m/Y') ?>
       </p>
       <?php endslot() ?>
     <?php endsnippet() ?>
     
-    <div id="main-content">
-      <?php if ($page->chapo()->isNotEmpty()): ?>  
-        <div id="chapo">
-          <?= $page->chapo() ?>  
+    <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 endif ?>
       <ul class="texts">
       <?php foreach($page->children() as $article): ?>