From c2a337e0516b6cf0c07d1509cc82c0f29cfc4362 Mon Sep 17 00:00:00 2001
From: TobiZog <developer@zoghaib.de>
Date: Wed, 6 Nov 2024 17:55:18 +0100
Subject: [PATCH] Finish GenresAdminPanel

---
 software/backend/routes/genre.routes.ts       | 50 ++++++++++++++
 software/backend/scripts/databaseHelper.ts    | 24 ++++---
 .../components/basics/cardViewTopImage.vue    |  2 +-
 .../src/components/pageParts/bandListItem.vue |  2 +-
 .../src/components/pageParts/heroImage.vue    |  4 +-
 .../components/pageParts/ticketListItem.vue   |  2 +-
 software/src/data/api/genreApi.ts             | 15 +++++
 software/src/data/enums/bannerStateEnum.ts    | 12 +++-
 software/src/data/models/acts/genreModel.ts   |  2 +-
 .../admin/bandsAdminPage/bandEditDialog.vue   | 15 +++++
 .../admin/genresAdminPage/genreEditDialog.vue |  1 +
 .../src/pages/admin/genresAdminPage/index.vue |  1 +
 .../bands/bandDetailPage/gallerySection.vue   |  2 +-
 .../src/pages/bands/bandDetailPage/index.vue  |  1 -
 software/src/pages/homePage/bandsSection.vue  |  2 +-
 .../homePage/upcomingConcertsSection.vue      |  2 +
 software/src/stores/genre.store.ts            | 65 ++++++++++++++++++-
 17 files changed, 181 insertions(+), 21 deletions(-)

diff --git a/software/backend/routes/genre.routes.ts b/software/backend/routes/genre.routes.ts
index 91273be..a98b4dc 100644
--- a/software/backend/routes/genre.routes.ts
+++ b/software/backend/routes/genre.routes.ts
@@ -14,4 +14,54 @@ genre.get("/", (req: Request, res: Response) => {
     .then(genres => {
       res.status(200).json(genres)
     })
+    .catch(error => {
+      res.status(500).send()
+    })
+})
+
+/**
+ * Update a Genre entry
+ */
+genre.patch("/", (req: Request, res: Response) => {
+  Genre.update(req.body, {
+    where: {
+      id: req.body.id
+    }
+  })
+    .then(result => {
+      res.status(200).json(result)
+    })
+    .catch(error => {
+      res.status(500).send()
+    })
+})
+
+/**
+ * Create a new Genre entry
+ */
+genre.post("/", (req: Request, res: Response) => {
+  Genre.create(req.body)
+    .then(result => {
+      res.status(200).json(result)
+    })
+    .catch(error => {
+      res.status(500).send()
+    })
+})
+
+/**
+ * Delete a Genre entry
+ */
+genre.delete("/", (req: Request, res: Response) => {
+  Genre.destroy({
+    where: {
+      id: req.body.id
+    }
+  })
+    .then(result => {
+      res.status(200).json(result)
+    })
+    .catch(error => {
+      res.status(500).send()
+    })
 })
\ No newline at end of file
diff --git a/software/backend/scripts/databaseHelper.ts b/software/backend/scripts/databaseHelper.ts
index a9cc106..b8e06de 100644
--- a/software/backend/scripts/databaseHelper.ts
+++ b/software/backend/scripts/databaseHelper.ts
@@ -88,6 +88,8 @@ export async function prepopulateDatabase() {
         {
           location["cityId"] = cityDataset.id
           location["urlName"] = location.name.replaceAll(" ", "-").toLowerCase()
+          location["imageIndoor"] = "http://localhost:3000/static/" + location["imageIndoor"]
+          location["imageOutdoor"] = "http://localhost:3000/static/" + location["imageOutdoor"]
 
           await Location.create(location)
             .then(async locationDataset => {
@@ -193,14 +195,14 @@ export async function prepopulateDatabase() {
           })
         }
 
-         for (let payment of account.payments) {
-          await Payment.create({
-            accountId: dataset.dataValues.id,
-            bankName: payment.bankName,
-            iban: payment.iban
-          })
-        }
-      })
+        for (let payment of account.payments) {
+        await Payment.create({
+          accountId: dataset.dataValues.id,
+          bankName: payment.bankName,
+          iban: payment.iban
+        })
+      }
+    })
   }
 
 
@@ -208,6 +210,10 @@ export async function prepopulateDatabase() {
   ////////// Band and Concert Tables //////////
 
   for(let band of bandsConcerts.bands) {
+    band.imageMembers = "http://localhost:3000/static/" + band.imageMembers
+    band.images = band.images.map(image => "http://localhost:3000/static/" + image)
+    band.logo = "http://localhost:3000/static/" + band.logo
+
     // Create a band dataset
     await Band.create(band)
       .then(async dataset => {
@@ -245,6 +251,8 @@ export async function prepopulateDatabase() {
         }
 
         for (let member of band.members) {
+          member.image = "http://localhost:3000/static/" + member.image
+
           await Member.create({
             name: member.name,
             image: member.image,
diff --git a/software/src/components/basics/cardViewTopImage.vue b/software/src/components/basics/cardViewTopImage.vue
index e8dfbe1..cdb535e 100644
--- a/software/src/components/basics/cardViewTopImage.vue
+++ b/software/src/components/basics/cardViewTopImage.vue
@@ -29,7 +29,7 @@ defineProps({
       height="150"
     >
       <v-img
-        :src="'http://localhost:3000/static/' + image"
+        :src="image"
         aspect-ratio="1"
         max-height="200"
         cover
diff --git a/software/src/components/pageParts/bandListItem.vue b/software/src/components/pageParts/bandListItem.vue
index 829bd98..32a62f8 100644
--- a/software/src/components/pageParts/bandListItem.vue
+++ b/software/src/components/pageParts/bandListItem.vue
@@ -34,7 +34,7 @@ defineProps({
   <card-view-horizontal
     v-if="!loading"
     :title="band.name"
-    :image="'http://localhost:3000/static/' + band.logo"
+    :image="band.logo"
     @click="router.push('/bands/details/' + band.name.replaceAll(' ', '-').toLowerCase())"
   >
     <template #content>
diff --git a/software/src/components/pageParts/heroImage.vue b/software/src/components/pageParts/heroImage.vue
index e642830..9fa9425 100644
--- a/software/src/components/pageParts/heroImage.vue
+++ b/software/src/components/pageParts/heroImage.vue
@@ -22,7 +22,7 @@ defineProps({
 
 <template>
   <v-img
-    :src="!loading ? 'http://localhost:3000/static/' + image : ''"
+    :src="!loading ? image : ''"
     height="600"
     gradient="to top, rgba(0, 0, 0, .9), rgba(255, 255, 255, 0.1)"
     cover
@@ -40,7 +40,7 @@ defineProps({
             <v-card>
               <v-img
                 v-if="logo"
-                :src="'http://localhost:3000/static/' + logo"
+                :src="logo"
                 width="200"
                 aspect-ratio="1"
                 cover
diff --git a/software/src/components/pageParts/ticketListItem.vue b/software/src/components/pageParts/ticketListItem.vue
index a004ee8..e82d827 100644
--- a/software/src/components/pageParts/ticketListItem.vue
+++ b/software/src/components/pageParts/ticketListItem.vue
@@ -41,7 +41,7 @@ defineProps({
 
 <template>
   <card-with-left-image
-    :image="'http://localhost:3000/static/' + image"
+    :image="image"
     :link="false"
     color-header="primary"
     :title="band.name + ' - ' + concert.name"
diff --git a/software/src/data/api/genreApi.ts b/software/src/data/api/genreApi.ts
index 395a7ae..067277f 100644
--- a/software/src/data/api/genreApi.ts
+++ b/software/src/data/api/genreApi.ts
@@ -1,7 +1,22 @@
 import axios from "axios"
+import { GenreModel } from "../models/acts/genreModel"
 
 let BASE_URL = "http://localhost:3000/genres"
 
 export async function fetchAllGenres() {
   return await axios.get(BASE_URL)
+}
+
+export async function postGenre(genre: GenreModel) {
+  return await axios.post(BASE_URL, genre)
+}
+
+export async function patchGenre(genre: GenreModel) {
+  return await axios.patch(BASE_URL, genre)
+}
+
+export async function deleteGenre(genre: GenreModel) {
+  return await axios.delete(BASE_URL, {
+    data: genre
+  })
 }
\ No newline at end of file
diff --git a/software/src/data/enums/bannerStateEnum.ts b/software/src/data/enums/bannerStateEnum.ts
index 45de686..03e7308 100644
--- a/software/src/data/enums/bannerStateEnum.ts
+++ b/software/src/data/enums/bannerStateEnum.ts
@@ -84,5 +84,15 @@ export enum BannerStateEnum {
 
   BANDDELETESUCCESSFUL,
 
-  BANDDELETEERROR
+  BANDDELETEERROR,
+
+  ////////// API Endpoint /genres //////////
+
+  GENRESAVEDSUCCESSFUL,
+
+  GENRESAVEDERROR,
+  
+  GENREDELETESUCCESSFUL,
+
+  GENREDELETEERROR
 }
\ No newline at end of file
diff --git a/software/src/data/models/acts/genreModel.ts b/software/src/data/models/acts/genreModel.ts
index 329776d..5423155 100644
--- a/software/src/data/models/acts/genreModel.ts
+++ b/software/src/data/models/acts/genreModel.ts
@@ -1,4 +1,4 @@
 export class GenreModel {
-  id: number = -1
+  id: number
   name: string = ""
 }
\ No newline at end of file
diff --git a/software/src/pages/admin/bandsAdminPage/bandEditDialog.vue b/software/src/pages/admin/bandsAdminPage/bandEditDialog.vue
index 8d8acd9..91feffc 100644
--- a/software/src/pages/admin/bandsAdminPage/bandEditDialog.vue
+++ b/software/src/pages/admin/bandsAdminPage/bandEditDialog.vue
@@ -74,6 +74,21 @@ function itemProps(item: GenreModel) {
           />
         </v-col>
       </v-row>
+
+      <v-row>
+        <v-col>
+          <v-img
+          :src="bandStore.band.logo"
+        />
+        </v-col>
+        <v-col>
+          <v-img
+            max-width="300"
+            :src="bandStore.band.imageMembers"
+            placeholder=""
+          />
+        </v-col>
+      </v-row>
     </v-container>
     
     <template #actions>
diff --git a/software/src/pages/admin/genresAdminPage/genreEditDialog.vue b/software/src/pages/admin/genresAdminPage/genreEditDialog.vue
index 7df2c62..79c1e2b 100644
--- a/software/src/pages/admin/genresAdminPage/genreEditDialog.vue
+++ b/software/src/pages/admin/genresAdminPage/genreEditDialog.vue
@@ -11,6 +11,7 @@ const genreStore = useGenreStore()
     v-model="genreStore.showEditDialog"
     :title="$t('band.editGenre')"
     icon="mdi-pencil"
+    max-width="500"
   >
     <v-container>
       <v-row>
diff --git a/software/src/pages/admin/genresAdminPage/index.vue b/software/src/pages/admin/genresAdminPage/index.vue
index 47c060d..d31d668 100644
--- a/software/src/pages/admin/genresAdminPage/index.vue
+++ b/software/src/pages/admin/genresAdminPage/index.vue
@@ -24,6 +24,7 @@ genreStore.getGenres()
       :loading="genreStore.fetchInProgress"
       :items="genreStore.genres"
       :headers="headers"
+      :items-per-page="100"
     >
       <template #item.bands="{ item }">
         <v-chip v-for="band of item.bands" class="mx-1">
diff --git a/software/src/pages/bands/bandDetailPage/gallerySection.vue b/software/src/pages/bands/bandDetailPage/gallerySection.vue
index d02d71f..4be6d69 100644
--- a/software/src/pages/bands/bandDetailPage/gallerySection.vue
+++ b/software/src/pages/bands/bandDetailPage/gallerySection.vue
@@ -44,7 +44,7 @@ defineProps({
 
           <v-carousel-item
             v-for="image in band.images"
-            :src="'http://localhost:3000/static/' + image" 
+            :src="image" 
             cover
           />
         </v-carousel>
diff --git a/software/src/pages/bands/bandDetailPage/index.vue b/software/src/pages/bands/bandDetailPage/index.vue
index d8b89fd..0e6be04 100644
--- a/software/src/pages/bands/bandDetailPage/index.vue
+++ b/software/src/pages/bands/bandDetailPage/index.vue
@@ -22,7 +22,6 @@ watch(() => router.currentRoute.value.params.name, () => {
 </script>
 
 <template>
-  {{ router.currentRoute.value.params.name }}
   <hero-image
     :image="bandStore.band.imageMembers"
     :logo="bandStore.band.logo"
diff --git a/software/src/pages/homePage/bandsSection.vue b/software/src/pages/homePage/bandsSection.vue
index ccfe42b..28a3f5c 100644
--- a/software/src/pages/homePage/bandsSection.vue
+++ b/software/src/pages/homePage/bandsSection.vue
@@ -29,7 +29,7 @@ bandStore.getBands()
         >
           <v-img
             class="d-flex align-center text-center"
-            :src="'http://localhost:3000/static/' + band.imageMembers"
+            :src="band.imageMembers"
             height="250px"
             width="350"
             cover
diff --git a/software/src/pages/homePage/upcomingConcertsSection.vue b/software/src/pages/homePage/upcomingConcertsSection.vue
index 15f8da2..ab6f19a 100644
--- a/software/src/pages/homePage/upcomingConcertsSection.vue
+++ b/software/src/pages/homePage/upcomingConcertsSection.vue
@@ -4,6 +4,7 @@ import { useRouter } from 'vue-router';
 import cardViewTopImage from '@/components/basics/cardViewTopImage.vue';
 import outlinedButton from '@/components/basics/outlinedButton.vue';
 import sectionDivider from '@/components/basics/sectionDivider.vue';
+import moment from 'moment';
 
 const concertStore = useConcertStore()
 const router = useRouter()
@@ -29,6 +30,7 @@ const router = useRouter()
         @click="router.push('/bands/details/' + concert.band.name.replaceAll(' ', '-').toLowerCase())"
         :loading="concertStore.fetchInProgress"
       >
+        {{ moment(concert.date).format("DD.MM.YYYY") }},
         {{ $t("misc.from") }} {{ (concert.price).toPrecision(4) }} €
       </card-view-top-image>
     </v-col>
diff --git a/software/src/stores/genre.store.ts b/software/src/stores/genre.store.ts
index 5874cd3..0faf0ed 100644
--- a/software/src/stores/genre.store.ts
+++ b/software/src/stores/genre.store.ts
@@ -1,7 +1,9 @@
-import { fetchAllGenres } from "@/data/api/genreApi";
+import { deleteGenre, fetchAllGenres, patchGenre, postGenre } from "@/data/api/genreApi";
 import { GenreApiModel } from "@/data/models/acts/genreApiModel";
 import { defineStore } from "pinia";
 import { ref } from "vue";
+import { useFeedbackStore } from "./feedback.store";
+import { BannerStateEnum } from "@/data/enums/bannerStateEnum";
 
 export const useGenreStore = defineStore("genreStore", {
   state: () => ({
@@ -14,11 +16,17 @@ export const useGenreStore = defineStore("genreStore", {
     /** Genres to filter bands for */
     filteredGenres: ref<Array<GenreApiModel>>([]),
 
+    /** Show or hide edit dialog for Genre object */
     showEditDialog: ref(false),
+
+    /** Request to server sent, waiting for data response */
     fetchInProgress: ref(false)
   }),
 
   actions: {
+    /**
+     * Get all genres from the database
+     */
     getGenres() {
       this.fetchInProgress = true
 
@@ -37,17 +45,68 @@ export const useGenreStore = defineStore("genreStore", {
       this.showEditDialog = true
     },
 
+    /**
+     * Edit a Genre object, move parameter to this.genre, opens dialog
+     * 
+     * @param genre Selected Genre object
+     */
     editGenre(genre: GenreApiModel) {
       this.genre = genre
       this.showEditDialog = true
     },
 
+    /**
+     * Save edited genre to the backend server
+     */
     saveGenre() {
-      // todo
+      const feedbackStore = useFeedbackStore()
+      this.fetchInProgress = true
+
+      if (this.genre.id == undefined) {
+        // Creating new Genre
+        postGenre(this.genre)
+          .then(response => {
+            if (response.status == 200) {
+              feedbackStore.changeBanner(BannerStateEnum.GENRESAVEDSUCCESSFUL)
+              this.getGenres()
+              this.showEditDialog = false
+            } else {
+              feedbackStore.changeBanner(BannerStateEnum.GENRESAVEDERROR)
+            }
+          })
+      } else {
+        // Update existing Genre
+        patchGenre(this.genre)
+          .then(response => {
+            if (response.status == 200) {
+              feedbackStore.changeBanner(BannerStateEnum.GENRESAVEDSUCCESSFUL)
+              this.getGenres()
+              this.showEditDialog = false
+            } else {
+              feedbackStore.changeBanner(BannerStateEnum.GENRESAVEDERROR)
+            }
+          })
+      }
     },
 
+    /**
+     * Delete a Genre object
+     * 
+     * @param genre Genre to delete
+     */
     deleteGenre(genre: GenreApiModel) {
-      // todo
+      const feedbackStore = useFeedbackStore()
+      this.fetchInProgress = true
+
+      deleteGenre(genre)
+        .then(response => {
+          if (response.status == 200) {
+            feedbackStore.changeBanner(BannerStateEnum.GENREDELETESUCCESSFUL)
+            this.getGenres()
+          } else {
+            feedbackStore.changeBanner(BannerStateEnum.GENREDELETEERROR)
+          }
+        })
     }
   }
 })
\ No newline at end of file