From fdd2b33f1fac50d2757af0706197118cd4b8a616 Mon Sep 17 00:00:00 2001 From: Daniel Klein Date: Mon, 23 Sep 2024 21:14:17 +0200 Subject: [PATCH 1/4] fix:(project-image): hydratation --- components/Card.vue | 22 ++++++++-------- components/Project/ProjectHeading.vue | 36 ++++++++++++++++++++------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/components/Card.vue b/components/Card.vue index 2d0ed41..55dcd65 100644 --- a/components/Card.vue +++ b/components/Card.vue @@ -40,16 +40,18 @@ const projectItems: { label: string | string[], type: string, rating?: ProjectRa h="48px lg:64px" :class="switcher ? '' : 'lg:max-w-full! lg:w-full '" > - + + +
- + +
+ +
+ + SUNSET +

+
+
+
-
+
Date: Mon, 23 Sep 2024 21:14:34 +0200 Subject: [PATCH 2/4] chore(update): update pnpm --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf56524..3b6625c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "develitesse-nuxt", "private": true, - "packageManager": "pnpm@9.10.0", + "packageManager": "pnpm@9.11.0", "scripts": { "build": "nuxt build", "cleanup": "nuxt cleanup", From 73fb1e3fdc481443c028e97a54919d3733a06e37 Mon Sep 17 00:00:00 2001 From: Daniel Klein Date: Mon, 23 Sep 2024 21:14:59 +0200 Subject: [PATCH 3/4] feat(sunset): add and fix sunset logic --- components/CategorySelectBox.vue | 3 ++- composables/useData.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/components/CategorySelectBox.vue b/components/CategorySelectBox.vue index ff606a7..f7fa559 100644 --- a/components/CategorySelectBox.vue +++ b/components/CategorySelectBox.vue @@ -27,6 +27,7 @@ function onOptionSelected(value: string | number) {
{{ isOptionSelected?.label }}
  • { const data = await $fetch<{ categories: Category[] projects: Project[] - project_phase: { id: string, name: string }[] - asset_custody_type: { id: string, name: string }[] - sign_in_type_requirments: { id: string, name: string }[] + phases: { id: string, name: string }[] + custodys: { id: string, name: string }[] + requirements: { id: string, name: string }[] usecases: Usecase[] ecosystems: Ecosystem[] assets: Asset[] @@ -73,9 +73,9 @@ export const useData = defineStore('data', () => { features.value = data.features ranks.value = data.ranks - projectPhase.value = data.project_phase?.map(p => ({ id: p.id.toLowerCase(), name: p.name })) - assetCustody.value = data.asset_custody_type.map(a => ({ id: a.id.toLowerCase(), name: a.name })) - signInRequirments.value = data.sign_in_type_requirments.map(s => ({ id: s.id.toLowerCase(), name: s.name })) + projectPhase.value = data.phases?.map(p => ({ id: p.id.toLowerCase(), name: p.name })) + assetCustody.value = data.custodys.map(a => ({ id: a.id.toLowerCase(), name: a.name })) + signInRequirments.value = data.requirements.map(s => ({ id: s.id.toLowerCase(), name: s.name })) } catch (e) { console.error(e) @@ -129,7 +129,7 @@ export const useData = defineStore('data', () => { selectedCategoryId.value !== 'all' ? project.categories.includes(selectedCategoryId.value) : true, ) .filter(project => - selectedUsecaseId.value !== 'all' ? project.usecases?.map(u => u.toLowerCase()).includes(selectedUsecaseId.value.toLowerCase()) : true, + selectedUsecaseId.value !== 'all' ? selectedUsecaseId.value === 'sunset' ? project.sunset : project.usecases?.map(u => u.toLowerCase()).includes(selectedUsecaseId.value.toLowerCase()) : true, ) .filter(project => selectedEcosystemId.value !== 'all' ? project.ecosystem?.map(e => e.toLowerCase()).includes(selectedEcosystemId.value.toLowerCase()) : true, @@ -204,7 +204,7 @@ export const useData = defineStore('data', () => { } }).sort((a, b) => b.projects.length - a.projects.length) - return groupedProjects + return groupedProjects.filter(group => group.projects.length > 0) }) const filteredProjectsCount = computed(() => filteredProjects.value.length) From 8feee29d067df82d923b5292da417dfa5c2be2b1 Mon Sep 17 00:00:00 2001 From: Daniel Klein Date: Mon, 23 Sep 2024 21:15:37 +0200 Subject: [PATCH 4/4] feat(projects-listing): fix spacing and remove excess console log on site --- components/Project/ProjectGrid.vue | 2 +- layouts/default.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/Project/ProjectGrid.vue b/components/Project/ProjectGrid.vue index aeaf143..09c325c 100644 --- a/components/Project/ProjectGrid.vue +++ b/components/Project/ProjectGrid.vue @@ -49,7 +49,6 @@ const cardTitles = ref< { label: string, sortKey: string, togglable?: boolean }[ items-center gap-x-12px w-full - mb="8px lg:16px" >

    { />

    • - {{ selectedAssetsUsedId }}