diff --git a/software/backend/routes/concert.routes.ts b/software/backend/routes/concert.routes.ts index 91bac10..f7c02da 100644 --- a/software/backend/routes/concert.routes.ts +++ b/software/backend/routes/concert.routes.ts @@ -102,9 +102,18 @@ concert.get("/concert/:id", (req: Request, res: Response) => { concert.get("/search", (req: Request, res: Response) => { Concert.findAll({ where: { - name: { - [Op.substring]: req.query.value - } + [Op.or]: [ + { + name: { + [Op.substring]: req.query.value + } + }, + { + "$band.name$": { + [Op.substring]: req.query.value + } + } + ] }, include: [ Band, Location ] }) diff --git a/software/src/components/basics/cardView.vue b/software/src/components/basics/cardView.vue index 9d8a209..3e17994 100644 --- a/software/src/components/basics/cardView.vue +++ b/software/src/components/basics/cardView.vue @@ -40,6 +40,8 @@ defineProps({ + + diff --git a/software/src/locales/de.json b/software/src/locales/de.json index 98e7086..f7755bf 100644 --- a/software/src/locales/de.json +++ b/software/src/locales/de.json @@ -129,7 +129,7 @@ }, "location": "Veranstaltungsort | Veranstaltungsorte", "band": "Band | Bands", - "noEventsFound": "Keine Events gefunden", + "noConcertsFound": "Keine Konzerte gefunden", "from": "ab", "soldOut": "Ausverkauft", "city": "Stadt", diff --git a/software/src/locales/en.json b/software/src/locales/en.json index 837ef48..6196fbc 100644 --- a/software/src/locales/en.json +++ b/software/src/locales/en.json @@ -129,7 +129,7 @@ }, "location": "Location | Locations", "band": "Band | Bands", - "noEventsFound": "No Events found", + "noConcertsFound": "No Concerts found", "from": "from", "soldOut": "Sold Out", "city": "City", diff --git a/software/src/pages/misc/basketPage/index.vue b/software/src/pages/misc/basketPage/index.vue index 5aeeb04..f417eff 100644 --- a/software/src/pages/misc/basketPage/index.vue +++ b/software/src/pages/misc/basketPage/index.vue @@ -18,20 +18,20 @@ const showOrderingDialog = ref() - - + {{ $t('totalPrice') }}: {{ (basketStore.getTotalPrice).toFixed(2) }} € diff --git a/software/src/pages/misc/searchPage/index.vue b/software/src/pages/misc/searchPage/index.vue index becdc28..9ebf6b8 100644 --- a/software/src/pages/misc/searchPage/index.vue +++ b/software/src/pages/misc/searchPage/index.vue @@ -66,7 +66,7 @@ const searchStore = useSearchStore() - + @@ -95,7 +95,7 @@ const searchStore = useSearchStore()