From 900203c845af7a907ee81278528be970f59861b1 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Fri, 14 Mar 2025 07:40:30 +0100 Subject: [PATCH 1/9] fix: ref_only_access was inverted --- pages/[...slug].vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/[...slug].vue b/pages/[...slug].vue index f92caad..0e81540 100644 --- a/pages/[...slug].vue +++ b/pages/[...slug].vue @@ -48,7 +48,7 @@ const { data: pages } = await useAsyncData("pages", () => }, }, filters: { - ...(active_page_id.value == "" ? { slug: params[0], ref_only_access: true } : {}), + ...(active_page_id.value == "" ? { slug: params[0], ref_only_access: false } : {}), }, }) ); From 5e2fd6f682f8a657588c7da454061b3215a9af27 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sun, 6 Apr 2025 14:16:04 +0200 Subject: [PATCH 2/9] change: full path urls --- components/Header.vue | 2 +- pages/[...slug].vue | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/Header.vue b/components/Header.vue index 9deea5d..5973b3e 100644 --- a/components/Header.vue +++ b/components/Header.vue @@ -54,7 +54,7 @@ v-for="sublink in navbar_sub_items" :key="sublink.id" :to="`/${params?.[0]}/${sublink.URL}`" - :class="sublink.URL == params?.[1] && !params[2] ? 'active' : ''" + :class="sublink.URL == params?.[1] ? 'active' : ''" class="w-fit" > {{ sublink.name }} diff --git a/pages/[...slug].vue b/pages/[...slug].vue index 0e81540..ea7b66c 100644 --- a/pages/[...slug].vue +++ b/pages/[...slug].vue @@ -1,4 +1,5 @@ diff --git a/components/Header.vue b/components/Header.vue index 5973b3e..22cf62c 100644 --- a/components/Header.vue +++ b/components/Header.vue @@ -64,8 +64,6 @@ diff --git a/components/base/ListImageItem.vue b/components/base/ListImageItem.vue index fc4ac3b..432d2e5 100644 --- a/components/base/ListImageItem.vue +++ b/components/base/ListImageItem.vue @@ -4,10 +4,10 @@ :class="allowNavigation ? '' : 'pointer-events-none'" :to="`${urlOverwrite ?? $route.path}/${data?.slug}`" > -
+
@@ -20,11 +20,11 @@
-
+

{{ data?.title }}

-

+

{{ itemDate }}

@@ -42,7 +42,7 @@ import type Lookup from "../../types/collection/lookup"; const runtimeConfig = useRuntimeConfig(); const baseUrl = runtimeConfig.public.strapi.url; -const { logo } = await provideGlobal(); +const { logo } = useGlobal(); const props = defineProps({ data: Object as PropType, diff --git a/components/shared/EmphasiseArticle.vue b/components/shared/EmphasiseArticle.vue index ade964f..8d99d1e 100644 --- a/components/shared/EmphasiseArticle.vue +++ b/components/shared/EmphasiseArticle.vue @@ -25,7 +25,7 @@ import type SharedEmphasiseArticle from "../../types/component/shared/emphasiseA import type Lookup from "../../types/collection/lookup"; const { find } = useStrapi(); -const { data: lookup } = await useAsyncData("lookup", () => +const { data: lookup } = await useAsyncData(() => find("collection-lookups", { filters: { collection: "articles", diff --git a/components/shared/List.vue b/components/shared/List.vue index 40b2348..b04ce21 100644 --- a/components/shared/List.vue +++ b/components/shared/List.vue @@ -113,13 +113,13 @@ const pagination = ref({ page: 0, pageSize: 0, pageCount: 0, total: 0 }); const activeYear = ref(0); if (props.data?.lookup.list_with_date != "none") { - const { data: year } = await useAsyncData>("distinct-years", () => + const { data: year } = await useAsyncData>(() => $fetch(`${baseUrl}/api/custom/${props.data?.lookup.collection}/distinct-years`) ); years.value = year.value ?? []; activeYear.value = years.value[0] ?? 0; } -const { data: collections } = await useAsyncData("collection", () => +const { data: collections } = await useAsyncData(() => find(props.data?.lookup.collection ?? "", { ...(props.data?.lookup?.list_with_date != "none" ? { @@ -235,7 +235,7 @@ async function changeTimedData(year: number) { withCount: true, }, }); - console.log(data); + collection.value = data?.data; pagination.value = (data?.meta.pagination as unknown as { page: number; diff --git a/composables/calculateTitle.ts b/composables/calculateTitle.ts deleted file mode 100644 index 2b9ab75..0000000 --- a/composables/calculateTitle.ts +++ /dev/null @@ -1,11 +0,0 @@ -import provideGlobal from "./provideGlobal"; - -export default async function () { - const runtimeConfig = useRuntimeConfig(); - const appTitle = runtimeConfig.public.app.title; - - const { SEO } = await provideGlobal(); - const { metaTitle } = SEO ?? {}; - - return metaTitle ?? appTitle; -} diff --git a/composables/provideGlobal.ts b/composables/provideGlobal.ts deleted file mode 100644 index 61beaf8..0000000 --- a/composables/provideGlobal.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type Global from "../types/single/global"; - -export default async function () { - const { findOne } = useStrapi(); - const { data: global } = await useAsyncData("global", () => findOne("global")); - const { logo, navbar, footer, SEO } = global.value?.data ?? {}; - - return { logo, navbar, footer, SEO }; -} diff --git a/composables/useGlobal.ts b/composables/useGlobal.ts new file mode 100644 index 0000000..922c1f5 --- /dev/null +++ b/composables/useGlobal.ts @@ -0,0 +1,26 @@ +import type BaseFile from "../types/component/baseFile"; +import type Footer from "../types/component/global/footer"; +import type Navbar from "../types/component/global/navbar"; +import type SEO from "../types/component/global/seo"; +import type Global from "../types/single/global"; + +export const useGlobal = () => { + const global = useState("global"); + const runtimeConfig = useRuntimeConfig(); + const appTitle = runtimeConfig.public.app.title; + + const logo = computed(() => global.value?.logo ?? null); + const navbar = computed(() => global.value?.navbar ?? null); + const footer = computed