From bec036f65f868d4fdea1a7fb12d4c13a31cbb092 Mon Sep 17 00:00:00 2001 From: Len Verstijnen <35574315+lenverstijnen@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:20:29 +0100 Subject: [PATCH 01/15] Add uniq --- src/frontend/package-lock.json | 1 + src/frontend/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index 26c21e0f..80cc1b8f 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -11,6 +11,7 @@ "@pinia/nuxt": "^0.5.1", "date-fns": "^3.3.1", "gsap": "^3.12.5", + "lodash.uniq": "^4.5.0", "nuxt": "^3.10.1", "pinia": "^2.1.7", "slugify": "^1.6.6", diff --git a/src/frontend/package.json b/src/frontend/package.json index fdc45da5..1c16012a 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -19,6 +19,7 @@ "@pinia/nuxt": "^0.5.1", "date-fns": "^3.3.1", "gsap": "^3.12.5", + "lodash.uniq": "^4.5.0", "nuxt": "^3.10.1", "pinia": "^2.1.7", "slugify": "^1.6.6", From 7e5dfe53d9a78fa9026d27a7d77f46ea20d595da Mon Sep 17 00:00:00 2001 From: Len Verstijnen <35574315+lenverstijnen@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:51:41 +0100 Subject: [PATCH 02/15] Update types --- src/common/apiSchema/present.ts | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/apiSchema/present.ts b/src/common/apiSchema/present.ts index 150b4cf1..aaa79b10 100644 --- a/src/common/apiSchema/present.ts +++ b/src/common/apiSchema/present.ts @@ -1,26 +1,26 @@ -import { BaseView, BaseDataEntity, BaseSliderEntry, ImageRef } from "./shared"; +import { BaseView, BaseDataEntity, BaseSliderEntry, ImageRef } from './shared'; -export type GeoLevel = "straat" | "buurt" | "wijk" | "stadsdeel"; +export type GeoLevel = 'straat' | 'buurt' | 'wijk' | 'stadsdeel'; export type PresentEntityType = - | "outdoorArt" - | "cultureMulti" - | "musicVenue" - | "heritage" - | "dance" - | "visualArts" - | "photography" - | "cinema" - | "literary" - | "creativeIndustries" - | "theatre" - | "TVandRadio" - | "architecture" - | "newMedia" - | "debate" - | "aggregate_trees" - | "aggregate_tree_species" - | "aggregate_bees"; + | 'outdoorArt' + | 'cultureMulti' + | 'musicVenue' + | 'heritage' + | 'dance' + | 'visualArts' + | 'photography' + | 'cinema' + | 'literary' + | 'creativeIndustries' + | 'theatre' + | 'TVandRadio' + | 'architecture' + | 'newMedia' + | 'debate' + | 'aggregate_trees' + | 'aggregate_tree_species' + | 'aggregate_bees'; export interface PresentData extends BaseView { slider: (DistanceViewEntry | DistanceViewAggregateEntry)[]; // The entries for on the slider @@ -35,9 +35,9 @@ export interface DistanceViewEntry extends BaseSliderEntry { } export interface DistanceViewAggregateEntry - extends Omit { - data: Record; // The data for the aggregate, where the key is the name of the buurt, wijk, stadsdeel etc. - type: "aggregate_trees" | "aggregate_tree_species" | "aggregate_bees"; + extends Omit { + data: { areaName: string; count: number }; + type: 'aggregate_trees' | 'aggregate_tree_species' | 'aggregate_bees'; } export interface AgendaItem extends BaseDataEntity { From 3eb839ea88e687d328ba7a52b3a3affb65570b12 Mon Sep 17 00:00:00 2001 From: Len Verstijnen <35574315+lenverstijnen@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:53:27 +0100 Subject: [PATCH 03/15] Update aggregate card --- src/frontend/components/UI/ListView/index.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/frontend/components/UI/ListView/index.vue b/src/frontend/components/UI/ListView/index.vue index 1bc3ab1a..12b45557 100644 --- a/src/frontend/components/UI/ListView/index.vue +++ b/src/frontend/components/UI/ListView/index.vue @@ -5,7 +5,7 @@ { - return entry.data[Object.keys(entry.data)[0]] -} \ No newline at end of file