From dbbb3743d8232d8296e7822e9140285a22038771 Mon Sep 17 00:00:00 2001
From: Filip Dragovic <128386451+FroudeDescartes@users.noreply.github.com>
Date: Thu, 28 Nov 2024 02:02:33 +0100
Subject: [PATCH] Issue docs 174 (#421)

* update: announcement set to not visible

* fix: renamed figcaption to div

* init conditions

* fix: not showing irrelevant content & guidelines

* fix: guidelines accessible but not visible in header
---
 components/app/header.vue                     | 16 ++++++++-----
 components/content/sh-guidelines.vue          |  9 +++++++
 components/content/sh-img-container.vue       |  4 ++--
 components/prev-next-page.vue                 | 24 ++++++++++++++++---
 content/announcement.md                       |  2 +-
 .../1.looks-feel/_dir.yaml                    |  0
 .../1.looks-feel/index.md                     |  0
 .../2.components/_dir.yaml                    |  0
 .../2.components/index.md                     |  0
 .../2.components/sh-action-card.md            |  0
 .../2.components/sh-alert.md                  |  0
 .../2.components/sh-avatar.md                 |  0
 .../2.components/sh-badge.md                  |  0
 .../2.components/sh-button.md                 |  0
 .../2.components/sh-card.md                   |  0
 .../2.components/sh-carousel.md               |  0
 .../2.components/sh-column.md                 |  0
 .../2.components/sh-dynamic-table.md          |  0
 .../2.components/sh-faq.md                    |  0
 .../2.components/sh-img-container.md          |  0
 .../2.components/sh-list-cards.md             |  0
 .../2.components/sh-micro-card.md             |  0
 .../2.components/sh-multi-column.md           |  0
 .../2.components/sh-segment.md                |  0
 .../2.components/sh-social.md                 |  0
 .../2.components/sh-text-img.md               |  0
 .../2.components/sh-two-columns.md            |  0
 .../2.components/sh-video.md                  |  0
 .../{_8.guidelines => guidelines}/_dir.yaml   |  0
 .../{_8.guidelines => guidelines}/index.md    |  4 ++--
 30 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 components/content/sh-guidelines.vue
 rename content/{_8.guidelines => guidelines}/1.looks-feel/_dir.yaml (100%)
 rename content/{_8.guidelines => guidelines}/1.looks-feel/index.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/_dir.yaml (100%)
 rename content/{_8.guidelines => guidelines}/2.components/index.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-action-card.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-alert.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-avatar.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-badge.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-button.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-card.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-carousel.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-column.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-dynamic-table.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-faq.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-img-container.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-list-cards.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-micro-card.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-multi-column.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-segment.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-social.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-text-img.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-two-columns.md (100%)
 rename content/{_8.guidelines => guidelines}/2.components/sh-video.md (100%)
 rename content/{_8.guidelines => guidelines}/_dir.yaml (100%)
 rename content/{_8.guidelines => guidelines}/index.md (95%)

diff --git a/components/app/header.vue b/components/app/header.vue
index 9f4722004..849de732e 100644
--- a/components/app/header.vue
+++ b/components/app/header.vue
@@ -141,12 +141,16 @@ const { data: navigation } = await useAsyncData("navigation", () =>
   fetchContentNavigation(),
 );
 
-const topLinks = navigation.value.reduce((previous, current) => {
-  if (current.children) {
-    previous.push(current);
-  }
-  return previous;
-}, []);
+const topLinks = computed(() =>
+  navigation.value.reduce((previous, current) => {
+    // Exclude the /guidelines path
+    if (current.children && !current._path.includes('/guidelines')) {
+      previous.push(current);
+    }
+    return previous;
+  }, [] as typeof navigation.value),
+);
+
 
 const header = useAppConfig().header;
 const route = useRoute();
diff --git a/components/content/sh-guidelines.vue b/components/content/sh-guidelines.vue
new file mode 100644
index 000000000..8335d28c2
--- /dev/null
+++ b/components/content/sh-guidelines.vue
@@ -0,0 +1,9 @@
+<template>
+    {{ guidelines }}
+</template>
+
+<script setup>
+
+const guidelines  = await useAsyncData('guidelines', () => queryContent('/_8.guidelines').where({ _partial: true }).findOne())
+
+</script>
\ No newline at end of file
diff --git a/components/content/sh-img-container.vue b/components/content/sh-img-container.vue
index 489315b7a..1144cdcd1 100644
--- a/components/content/sh-img-container.vue
+++ b/components/content/sh-img-container.vue
@@ -5,9 +5,9 @@
                 <img :src="urlImage" :alt="altImage" :class="ui.image">
             </figure>
         </div>
-        <figcaption :class="ui.figcaption">
+        <div :class="ui.figcaption">
             <MDC :value="figcaption" />
-        </figcaption>
+        </div>
     </div>
 </template>
 
diff --git a/components/prev-next-page.vue b/components/prev-next-page.vue
index dd812d915..c14cc8756 100644
--- a/components/prev-next-page.vue
+++ b/components/prev-next-page.vue
@@ -1,13 +1,13 @@
 <template>
   <hr class="border-2 dark:border-golden rounded-r-xl rounded-l-xl" />
   <div class="grid grid-cols-2 mt-10 mx-auto max-w-max min-w-full not-prose">
-    <NuxtLink v-if="prev" :to="prev._path" :class="['justify-start text-left items-start lg:mr-20 sm:mr-5', ui.button]">
+    <NuxtLink v-if="prev && prev._path !=='/'" :to="prev._path" :class="['col-start-1 justify-start text-left items-start lg:mr-20 sm:mr-5', ui.button]">
       <UIcon name="i-vaadin:chevron-circle-left-o" dynamic :class="ui.icon" />
       <div :class="ui.title">{{ prev.title }}</div>
       <div v-if="showDescription && prev.description" :class="['text-left', ui.description]">{{ prev.description }}
       </div>
     </NuxtLink>
-    <NuxtLink v-if="next" :to="next._path" :class="['justify-end text-right items-end lg:ml-20 sm:ml-5', ui.button]">
+    <NuxtLink v-if="next && next._path !=='/'" :to="next._path" :class="['col-start-2 justify-end text-right items-end lg:ml-20 sm:ml-5', ui.button]">
       <UIcon name="i-vaadin:chevron-circle-right-o" dynamic :class="ui.icon" />
       <div :class="ui.title">{{ next.title }}</div>
       <div v-if="showDescription && next.description" :class="['text-right', ui.description]">{{ next.description }}
@@ -17,9 +17,27 @@
 </template>
 
 <script setup lang="ts">
+
 const route = useRoute();
+const excludedPaths = [
+  "/announcement",
+  "/landing-page-floaters",
+  "/landing-page-menu",
+  "/test-guide",
+  "/guidelines/index"
+];
+const excludedDirectoryRegex = /^\/guidelines(\/|$)/;
+
+// Adjust the query to exclude specific paths
 const [prev, next] = await queryContent()
-  .where({ _path: { $not: /\/_dir$/ }, _partial: false })
+  .where({
+    _path: { $not: /\/_dir$/ }, // Exclude _dir directories
+    _partial: false,           // Exclude partial content (this could be used instead of the _dir exlusion above)
+    $and: [
+      { _path: { $not: { $in: excludedPaths } } }, // Exclude specific files
+      { _path: { $not: excludedDirectoryRegex } }, // Exclude specific diectorie; -> think about adding all of this to app.config.ts
+    ]
+  })
   .findSurround(route.path);
 
 const config = {
diff --git a/content/announcement.md b/content/announcement.md
index d0e624525..873af022b 100644
--- a/content/announcement.md
+++ b/content/announcement.md
@@ -1,5 +1,5 @@
 ---
-visible: true # When set to true, makes Announcement banner visible
+visible: false # When set to true, makes Announcement banner visible
 ---
 
 ::ShTwoColumns
diff --git a/content/_8.guidelines/1.looks-feel/_dir.yaml b/content/guidelines/1.looks-feel/_dir.yaml
similarity index 100%
rename from content/_8.guidelines/1.looks-feel/_dir.yaml
rename to content/guidelines/1.looks-feel/_dir.yaml
diff --git a/content/_8.guidelines/1.looks-feel/index.md b/content/guidelines/1.looks-feel/index.md
similarity index 100%
rename from content/_8.guidelines/1.looks-feel/index.md
rename to content/guidelines/1.looks-feel/index.md
diff --git a/content/_8.guidelines/2.components/_dir.yaml b/content/guidelines/2.components/_dir.yaml
similarity index 100%
rename from content/_8.guidelines/2.components/_dir.yaml
rename to content/guidelines/2.components/_dir.yaml
diff --git a/content/_8.guidelines/2.components/index.md b/content/guidelines/2.components/index.md
similarity index 100%
rename from content/_8.guidelines/2.components/index.md
rename to content/guidelines/2.components/index.md
diff --git a/content/_8.guidelines/2.components/sh-action-card.md b/content/guidelines/2.components/sh-action-card.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-action-card.md
rename to content/guidelines/2.components/sh-action-card.md
diff --git a/content/_8.guidelines/2.components/sh-alert.md b/content/guidelines/2.components/sh-alert.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-alert.md
rename to content/guidelines/2.components/sh-alert.md
diff --git a/content/_8.guidelines/2.components/sh-avatar.md b/content/guidelines/2.components/sh-avatar.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-avatar.md
rename to content/guidelines/2.components/sh-avatar.md
diff --git a/content/_8.guidelines/2.components/sh-badge.md b/content/guidelines/2.components/sh-badge.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-badge.md
rename to content/guidelines/2.components/sh-badge.md
diff --git a/content/_8.guidelines/2.components/sh-button.md b/content/guidelines/2.components/sh-button.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-button.md
rename to content/guidelines/2.components/sh-button.md
diff --git a/content/_8.guidelines/2.components/sh-card.md b/content/guidelines/2.components/sh-card.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-card.md
rename to content/guidelines/2.components/sh-card.md
diff --git a/content/_8.guidelines/2.components/sh-carousel.md b/content/guidelines/2.components/sh-carousel.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-carousel.md
rename to content/guidelines/2.components/sh-carousel.md
diff --git a/content/_8.guidelines/2.components/sh-column.md b/content/guidelines/2.components/sh-column.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-column.md
rename to content/guidelines/2.components/sh-column.md
diff --git a/content/_8.guidelines/2.components/sh-dynamic-table.md b/content/guidelines/2.components/sh-dynamic-table.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-dynamic-table.md
rename to content/guidelines/2.components/sh-dynamic-table.md
diff --git a/content/_8.guidelines/2.components/sh-faq.md b/content/guidelines/2.components/sh-faq.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-faq.md
rename to content/guidelines/2.components/sh-faq.md
diff --git a/content/_8.guidelines/2.components/sh-img-container.md b/content/guidelines/2.components/sh-img-container.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-img-container.md
rename to content/guidelines/2.components/sh-img-container.md
diff --git a/content/_8.guidelines/2.components/sh-list-cards.md b/content/guidelines/2.components/sh-list-cards.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-list-cards.md
rename to content/guidelines/2.components/sh-list-cards.md
diff --git a/content/_8.guidelines/2.components/sh-micro-card.md b/content/guidelines/2.components/sh-micro-card.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-micro-card.md
rename to content/guidelines/2.components/sh-micro-card.md
diff --git a/content/_8.guidelines/2.components/sh-multi-column.md b/content/guidelines/2.components/sh-multi-column.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-multi-column.md
rename to content/guidelines/2.components/sh-multi-column.md
diff --git a/content/_8.guidelines/2.components/sh-segment.md b/content/guidelines/2.components/sh-segment.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-segment.md
rename to content/guidelines/2.components/sh-segment.md
diff --git a/content/_8.guidelines/2.components/sh-social.md b/content/guidelines/2.components/sh-social.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-social.md
rename to content/guidelines/2.components/sh-social.md
diff --git a/content/_8.guidelines/2.components/sh-text-img.md b/content/guidelines/2.components/sh-text-img.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-text-img.md
rename to content/guidelines/2.components/sh-text-img.md
diff --git a/content/_8.guidelines/2.components/sh-two-columns.md b/content/guidelines/2.components/sh-two-columns.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-two-columns.md
rename to content/guidelines/2.components/sh-two-columns.md
diff --git a/content/_8.guidelines/2.components/sh-video.md b/content/guidelines/2.components/sh-video.md
similarity index 100%
rename from content/_8.guidelines/2.components/sh-video.md
rename to content/guidelines/2.components/sh-video.md
diff --git a/content/_8.guidelines/_dir.yaml b/content/guidelines/_dir.yaml
similarity index 100%
rename from content/_8.guidelines/_dir.yaml
rename to content/guidelines/_dir.yaml
diff --git a/content/_8.guidelines/index.md b/content/guidelines/index.md
similarity index 95%
rename from content/_8.guidelines/index.md
rename to content/guidelines/index.md
index 5e4866435..a53af8107 100644
--- a/content/_8.guidelines/index.md
+++ b/content/guidelines/index.md
@@ -13,7 +13,7 @@ This section is constructed out of two sub-sections:
 - [Looks&Feel](/_8.guidelines/looks-feel/)
 - [Components](/_8.guidelines/components/)
 
-List of components:
+<!-- List of components:
 
   - [sh-action-card](/_8.guidelines/components/sh-action-card)
   - [sh-alert](/_8.guidelines/components/sh-alert)
@@ -33,4 +33,4 @@ List of components:
   - [sh-social](/_8.guidelines/components/sh-social)
   - [sh-text-img](/_8.guidelines/components/sh-text-img)
   - [sh-two-columns](/_8.guidelines/components/sh-two-columns)
-  - [sh-video](/_8.guidelines/components/sh-video)
+  - [sh-video](/_8.guidelines/components/sh-video) -->