From 5e8d09ccd934db893188f8ad4f07fcff88144d6b Mon Sep 17 00:00:00 2001 From: Lenny11y <148078971+Lenny11y@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:10:02 +0000 Subject: [PATCH 1/8] =?UTF-8?q?Club=20Liste=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 5 +++++ src/components/ContentItem.vue | 4 ++-- src/components/bars/barsItem.vue | 20 ++++++++++++++++++ src/components/bars/barsList.vue | 35 ++++++++++++++++++++++++++++++++ src/components/club/ClubItem.vue | 20 ++++++++++++++++++ src/components/club/ClubList.vue | 35 ++++++++++++++++++++++++++++++++ src/stores/clubItem.ts | 2 +- 7 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 src/components/bars/barsItem.vue create mode 100644 src/components/bars/barsList.vue create mode 100644 src/components/club/ClubItem.vue create mode 100644 src/components/club/ClubList.vue diff --git a/components.d.ts b/components.d.ts index 337ff4e..0d30997 100644 --- a/components.d.ts +++ b/components.d.ts @@ -7,6 +7,8 @@ export {} declare module 'vue' { export interface GlobalComponents { + BarsItem: typeof import('./src/components/bars/barsItem.vue')['default'] + BarsList: typeof import('./src/components/bars/barsList.vue')['default'] BButton: typeof import('bootstrap-vue-next')['BButton'] BCard: typeof import('bootstrap-vue-next')['BCard'] BCardGroup: typeof import('bootstrap-vue-next')['BCardGroup'] @@ -23,6 +25,9 @@ declare module 'vue' { BRow: typeof import('bootstrap-vue-next')['BRow'] BSkeleton: typeof import('bootstrap-vue-next')['BSkeleton'] BSkeletonWrapper: typeof import('bootstrap-vue-next')['BSkeletonWrapper'] + Club1: typeof import('./src/components/club/Club1.vue')['default'] + ClubItem: typeof import('./src/components/club/ClubItem.vue')['default'] + ClubList: typeof import('./src/components/club/ClubList.vue')['default'] ContentItem: typeof import('./src/components/ContentItem.vue')['default'] EventItem: typeof import('./src/components/events/EventItem.vue')['default'] EventList: typeof import('./src/components/events/EventList.vue')['default'] diff --git a/src/components/ContentItem.vue b/src/components/ContentItem.vue index 27fa148..0634253 100644 --- a/src/components/ContentItem.vue +++ b/src/components/ContentItem.vue @@ -4,7 +4,7 @@ Some quick example text to build on the card title and make up the bulk of the card's - content. + content. {{ title }} Go somewhere diff --git a/src/components/bars/barsItem.vue b/src/components/bars/barsItem.vue new file mode 100644 index 0000000..9194362 --- /dev/null +++ b/src/components/bars/barsItem.vue @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/src/components/bars/barsList.vue b/src/components/bars/barsList.vue new file mode 100644 index 0000000..abba5d3 --- /dev/null +++ b/src/components/bars/barsList.vue @@ -0,0 +1,35 @@ + + \ No newline at end of file diff --git a/src/components/club/ClubItem.vue b/src/components/club/ClubItem.vue new file mode 100644 index 0000000..9194362 --- /dev/null +++ b/src/components/club/ClubItem.vue @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/src/components/club/ClubList.vue b/src/components/club/ClubList.vue new file mode 100644 index 0000000..e11a9a6 --- /dev/null +++ b/src/components/club/ClubList.vue @@ -0,0 +1,35 @@ + + \ No newline at end of file diff --git a/src/stores/clubItem.ts b/src/stores/clubItem.ts index 7494068..ea350d1 100644 --- a/src/stores/clubItem.ts +++ b/src/stores/clubItem.ts @@ -15,7 +15,7 @@ export const useClubItemStore = defineStore('club', { getters: { getAll: (state) => state.clubItemList, getById: (state) => (id: string) => - state.clubItemList.find((club: clubItem) => club.id === id), + state.clubItemList.find((club: ClubItem) => club.id === id), }, actions: { async load() { From 875cd6e3f83acf5f50e4e0189f66e7adfff7517b Mon Sep 17 00:00:00 2001 From: Lenny11y <148078971+Lenny11y@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:10:14 +0000 Subject: [PATCH 2/8] =?UTF-8?q?Club=20Liste=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomeContent.vue | 9 ++++++--- src/components/club/ClubItem.vue | 6 +++--- src/components/club/ClubList.vue | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/HomeContent.vue b/src/components/HomeContent.vue index ce9bd4d..fb3962a 100644 --- a/src/components/HomeContent.vue +++ b/src/components/HomeContent.vue @@ -7,10 +7,11 @@ --> - - - +

Clubs

+ + +

Events

@@ -19,6 +20,8 @@ diff --git a/src/components/club/ClubItem.vue b/src/components/club/ClubItem.vue index dc5330e..398cb1e 100644 --- a/src/components/club/ClubItem.vue +++ b/src/components/club/ClubItem.vue @@ -1,12 +1,15 @@ \ No newline at end of file diff --git a/src/models/ClubItem.ts b/src/models/ClubItem.ts index 38dbbe5..ba47e71 100644 --- a/src/models/ClubItem.ts +++ b/src/models/ClubItem.ts @@ -1,7 +1,8 @@ export default interface ClubItem { id: string; name: string; - // bild: bild; + notes: string; + bild: any; adresse: string; plz: string; ort: string; diff --git a/src/router/index.ts b/src/router/index.ts index a49ae50..4be4a0e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -16,6 +16,11 @@ const router = createRouter({ // this generates a separate chunk (About.[hash].js) for this route // which is lazy-loaded when the route is visited. component: () => import('../views/AboutView.vue') + }, + { + path: '/club/:id', + name: 'club-detail', + component: () => import('../views/ClubDetailView.vue') } ] }) diff --git a/src/services/club.service.ts b/src/services/club.service.ts index de19163..6e3457c 100644 --- a/src/services/club.service.ts +++ b/src/services/club.service.ts @@ -18,19 +18,19 @@ const clubService = { // This function (`page`) will get called for each page of records. partialRecords.forEach((partialRecord) => { resultList.push({ - id: partialRecord.id, - name: partialRecord.get('Name') as string, - // bild: partialRecord.get('Bild') as bild, - adresse: partialRecord.get('Adresse') as string, - ort: partialRecord.get('Ort') as string, - plz: partialRecord.get('PLZ') as string, - email: partialRecord.get('E-Mail') as string, - telefon: partialRecord.get('Telefon') as string, - oeffnungstage: partialRecord('Öffnungstage') as string, - oeffnungszeite: partialRecord('Öffnungszieten') as string, - webseite: partialRecord('Webseite') as string, - - + id: partialRecord.id, + name: partialRecord.get('Name') as string, + bild: partialRecord.get('Bild') as string, + notes: partialRecord.get('Notes') as string, + // bild: partialRecord.get('Bild') as bild, + adresse: partialRecord.get('Adresse') as string, + ort: partialRecord.get('Ort') as string, + plz: partialRecord.get('PLZ') as string, + email: partialRecord.get('E-Mail') as string, + telefon: partialRecord.get('Telefon') as string, + oeffnungstage: partialRecord.get('Öffnungstage') as string, + oeffnungszeite: partialRecord.get('Öffnungszieten') as string, + webseite: partialRecord.get('Webseite') as string, }) }) // To fetch the next page of records, call `fetchNextPage`. diff --git a/src/stores/clubItem.ts b/src/stores/clubItem.ts index ea350d1..8dea181 100644 --- a/src/stores/clubItem.ts +++ b/src/stores/clubItem.ts @@ -16,6 +16,14 @@ export const useClubItemStore = defineStore('club', { getAll: (state) => state.clubItemList, getById: (state) => (id: string) => state.clubItemList.find((club: ClubItem) => club.id === id), + imageById: (state) => (id: string) => { + const item = state.clubItemList.find((club: ClubItem) => club.id === id) + if (item && item.bild) { + return item.bild[0].thumbnails.large.url + } else { + return '' + } + } }, actions: { async load() { diff --git a/src/views/ClubDetailView.vue b/src/views/ClubDetailView.vue new file mode 100644 index 0000000..ae20ef6 --- /dev/null +++ b/src/views/ClubDetailView.vue @@ -0,0 +1,33 @@ + + + \ No newline at end of file From 51f5a455830f11adbd09098d57d66a5f81b3dc3e Mon Sep 17 00:00:00 2001 From: Stephan Strittmatter Date: Mon, 27 Nov 2023 14:18:36 +0000 Subject: [PATCH 4/8] remove obsolete components --- src/components/HelloWorld.vue | 41 ---------- src/components/TheWelcome.vue | 88 ---------------------- src/components/WelcomeItem.vue | 87 --------------------- src/components/icons/IconCommunity.vue | 7 -- src/components/icons/IconDocumentation.vue | 7 -- src/components/icons/IconEcosystem.vue | 7 -- src/components/icons/IconSupport.vue | 7 -- src/components/icons/IconTooling.vue | 19 ----- src/services/club.service.ts | 1 - 9 files changed, 264 deletions(-) delete mode 100644 src/components/HelloWorld.vue delete mode 100644 src/components/TheWelcome.vue delete mode 100644 src/components/WelcomeItem.vue delete mode 100644 src/components/icons/IconCommunity.vue delete mode 100644 src/components/icons/IconDocumentation.vue delete mode 100644 src/components/icons/IconEcosystem.vue delete mode 100644 src/components/icons/IconSupport.vue delete mode 100644 src/components/icons/IconTooling.vue diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 38d821e..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/components/TheWelcome.vue b/src/components/TheWelcome.vue deleted file mode 100644 index 49d8f73..0000000 --- a/src/components/TheWelcome.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/src/components/WelcomeItem.vue b/src/components/WelcomeItem.vue deleted file mode 100644 index 6d7086a..0000000 --- a/src/components/WelcomeItem.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - diff --git a/src/components/icons/IconCommunity.vue b/src/components/icons/IconCommunity.vue deleted file mode 100644 index 2dc8b05..0000000 --- a/src/components/icons/IconCommunity.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/components/icons/IconDocumentation.vue b/src/components/icons/IconDocumentation.vue deleted file mode 100644 index 6d4791c..0000000 --- a/src/components/icons/IconDocumentation.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/components/icons/IconEcosystem.vue b/src/components/icons/IconEcosystem.vue deleted file mode 100644 index c3a4f07..0000000 --- a/src/components/icons/IconEcosystem.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/components/icons/IconSupport.vue b/src/components/icons/IconSupport.vue deleted file mode 100644 index 7452834..0000000 --- a/src/components/icons/IconSupport.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/components/icons/IconTooling.vue b/src/components/icons/IconTooling.vue deleted file mode 100644 index 660598d..0000000 --- a/src/components/icons/IconTooling.vue +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/src/services/club.service.ts b/src/services/club.service.ts index 6e3457c..a752009 100644 --- a/src/services/club.service.ts +++ b/src/services/club.service.ts @@ -22,7 +22,6 @@ const clubService = { name: partialRecord.get('Name') as string, bild: partialRecord.get('Bild') as string, notes: partialRecord.get('Notes') as string, - // bild: partialRecord.get('Bild') as bild, adresse: partialRecord.get('Adresse') as string, ort: partialRecord.get('Ort') as string, plz: partialRecord.get('PLZ') as string, From 4725e2a8bdcb672c3004f7b6f0c32b0688fd51b9 Mon Sep 17 00:00:00 2001 From: Elijah-Haeb <148079280+Elijah-Haeb@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:25:20 +0000 Subject: [PATCH 5/8] neu --- src/models/BarItem.ts | 15 +++++++++++++++ src/models/ClubItem.ts | 1 + src/models/RestaurantItem.ts | 14 ++++++++++++++ src/models/UnterkunftItem.ts | 14 ++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 src/models/BarItem.ts create mode 100644 src/models/RestaurantItem.ts create mode 100644 src/models/UnterkunftItem.ts diff --git a/src/models/BarItem.ts b/src/models/BarItem.ts new file mode 100644 index 0000000..42172fc --- /dev/null +++ b/src/models/BarItem.ts @@ -0,0 +1,15 @@ + +export default interface UnterkunftItem{ + id: string; + name: string; + // bild : bild; + //getränkekarte: bild; + adresse: string; + plz: string; + ort: string; + email: string; + telefon: string; + oeffnungstage: string; + oeffnungszeiten: string; + webseite: string; +} \ No newline at end of file diff --git a/src/models/ClubItem.ts b/src/models/ClubItem.ts index 38dbbe5..7f07723 100644 --- a/src/models/ClubItem.ts +++ b/src/models/ClubItem.ts @@ -2,6 +2,7 @@ export default interface ClubItem { id: string; name: string; // bild: bild; + //getränkekarte: bild; adresse: string; plz: string; ort: string; diff --git a/src/models/RestaurantItem.ts b/src/models/RestaurantItem.ts new file mode 100644 index 0000000..3f2b199 --- /dev/null +++ b/src/models/RestaurantItem.ts @@ -0,0 +1,14 @@ +export default interface UnterkunftItem{ + id: string; + name: string; + // bild : bild; + //speisekarte: bild; + adresse: string; + plz: string; + ort: string; + email: string; + telefon: string; + oeffnungstage: string; + oeffnungszeiten: string; + webseite: string; +} \ No newline at end of file diff --git a/src/models/UnterkunftItem.ts b/src/models/UnterkunftItem.ts new file mode 100644 index 0000000..454c3ac --- /dev/null +++ b/src/models/UnterkunftItem.ts @@ -0,0 +1,14 @@ + +export default interface UnterkunftItem{ + id: string; + name: string; + // bild : bild; + adresse: string; + plz: string; + ort: string; + email: string; + telefon: string; + oeffnungstage: string; + oeffnungszeiten: string; + webseite: string; +} \ No newline at end of file From d7ccfa892ec6088aa8cc73f89815696a7f35b518 Mon Sep 17 00:00:00 2001 From: Stephan Strittmatter Date: Mon, 27 Nov 2023 14:55:56 +0000 Subject: [PATCH 6/8] chore: club details added --- components.d.ts | 12 ++++++++++++ src/components/LocaleeHeader.vue | 15 ++++++++++++--- src/views/ClubDetailView.vue | 22 ++++++++++++++++++---- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/components.d.ts b/components.d.ts index a5b15a0..6a844f0 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,17 +9,26 @@ declare module 'vue' { export interface GlobalComponents { BarsItem: typeof import('./src/components/bars/barsItem.vue')['default'] BarsList: typeof import('./src/components/bars/barsList.vue')['default'] + BBreadcrumb: typeof import('bootstrap-vue-next')['BBreadcrumb'] + BBreadcrumbItem: typeof import('bootstrap-vue-next')['BBreadcrumbItem'] BButton: typeof import('bootstrap-vue-next')['BButton'] BCard: typeof import('bootstrap-vue-next')['BCard'] BCardGroup: typeof import('bootstrap-vue-next')['BCardGroup'] BCardText: typeof import('bootstrap-vue-next')['BCardText'] BCardTitle: typeof import('bootstrap-vue-next')['BCardTitle'] BCol: typeof import('bootstrap-vue-next')['BCol'] + BCollapse: typeof import('bootstrap-vue-next')['BCollapse'] BContainer: typeof import('bootstrap-vue-next')['BContainer'] BFormGroup: typeof import('bootstrap-vue-next')['BFormGroup'] BFormInput: typeof import('bootstrap-vue-next')['BFormInput'] BImg: typeof import('bootstrap-vue-next')['BImg'] BInputGroup: typeof import('bootstrap-vue-next')['BInputGroup'] + BNavbar: typeof import('bootstrap-vue-next')['BNavbar'] + BNavbarBrand: typeof import('bootstrap-vue-next')['BNavbarBrand'] + BNavbarNav: typeof import('bootstrap-vue-next')['BNavbarNav'] + BNavbarToggle: typeof import('bootstrap-vue-next')['BNavbarToggle'] + BNavItem: typeof import('bootstrap-vue-next')['BNavItem'] + BNavText: typeof import('bootstrap-vue-next')['BNavText'] BPlaceholder: typeof import('bootstrap-vue-next')['BPlaceholder'] BPlaceholderCard: typeof import('bootstrap-vue-next')['BPlaceholderCard'] BPlaceholderWrapper: typeof import('bootstrap-vue-next')['BPlaceholderWrapper'] @@ -49,4 +58,7 @@ declare module 'vue' { TheWelcome: typeof import('./src/components/TheWelcome.vue')['default'] WelcomeItem: typeof import('./src/components/WelcomeItem.vue')['default'] } + export interface ComponentCustomProperties { + vBColorMode: typeof import('bootstrap-vue-next')['vBColorMode'] + } } diff --git a/src/components/LocaleeHeader.vue b/src/components/LocaleeHeader.vue index d0e02d3..2191b12 100644 --- a/src/components/LocaleeHeader.vue +++ b/src/components/LocaleeHeader.vue @@ -2,9 +2,18 @@ diff --git a/src/views/ClubDetailView.vue b/src/views/ClubDetailView.vue index ae20ef6..5c2a919 100644 --- a/src/views/ClubDetailView.vue +++ b/src/views/ClubDetailView.vue @@ -1,10 +1,24 @@