From 955b8531a1e6c47b1795f9382efaa767a350f22d Mon Sep 17 00:00:00 2001 From: isUnknown Date: Fri, 22 Nov 2024 17:16:58 +0100 Subject: [PATCH] =?UTF-8?q?fix=20#5=20-=20Menu=20:=20dynamize=20inspiratio?= =?UTF-8?q?ns=20'Nouveaut=C3=A9s'=20label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/blueprints/sections/inspirations.yml | 19 +++---------------- public/site/controllers/site.php | 1 + src/components/Menu.vue | 18 +++++++++++------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/public/site/blueprints/sections/inspirations.yml b/public/site/blueprints/sections/inspirations.yml index b575e5f..eaadd6f 100644 --- a/public/site/blueprints/sections/inspirations.yml +++ b/public/site/blueprints/sections/inspirations.yml @@ -1,22 +1,9 @@ type: pages headline: Inspirations template: inspiration -layout: table -columns: - title: - label: Titre - width: 3/12 - date: - label: Date - value: "{{ page.date.toDate('YY/MM') }}" - width: 1/12 - new: - label: Nouveauté - width: 1/12 - description: - width: 7/12 empty: Pas encore d’inspiration -image: +layout: cards +image: query: page.cover.toFile cover: true -search: true \ No newline at end of file +search: true diff --git a/public/site/controllers/site.php b/public/site/controllers/site.php index 0437428..5877617 100644 --- a/public/site/controllers/site.php +++ b/public/site/controllers/site.php @@ -6,6 +6,7 @@ return function ($page, $kirby, $site) { } $data = $page->toArray(); $data['template'] = (string) $page->template(); + $data['newInspirations'] = (bool) page('inspirations')->children()->findBy('new', 'true'); $userData = [ "role" => (string) $kirby->user()->role(), diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 8db8c05..cbf68cd 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -44,9 +44,11 @@ :aria-current="isCurrent(mainItem)" >{{ mainItem.title }} - {{ - mainItem.pill - }} + {{ "Nouveautés" }}
@@ -95,11 +97,13 @@ import { ref } from "vue"; import { useProjectsStore } from "../stores/projects"; import { useRoute } from "vue-router"; import { useUserStore } from "../stores/user"; +import { usePageStore } from "../stores/page"; const route = useRoute(); const isExpanded = ref(true); const { user } = storeToRefs(useUserStore()); const { currentProjects, archivedProjects } = storeToRefs(useProjectsStore()); +const { page } = storeToRefs(usePageStore()); const mainItems = [ { @@ -116,14 +120,12 @@ const mainItems = [ title: "Réunions", path: "/reunions", icon: "calendar", - pill: false, disabled: true, }, { title: "Inspirations", path: "/inspirations", icon: "inspiration", - pill: "Nouveauté", }, ]; @@ -164,7 +166,9 @@ button[aria-controls="menu"][aria-expanded="false"] { padding: 1.125rem; transform: rotate(180deg); } -button[aria-controls="menu"][aria-expanded="false"] + main > header:not([role="tablist"]) { +button[aria-controls="menu"][aria-expanded="false"] + + main + > header:not([role="tablist"]) { margin-left: 4rem; } @@ -190,7 +194,7 @@ button[aria-controls="menu"][aria-expanded="false"] + main > header:not([role="t @media (max-width: 1023px) { button[aria-controls="menu"][aria-expanded="true"] { left: 0; - margin-top: .4rem; + margin-top: 0.4rem; } #menu { position: fixed;