diff --git a/src/components/basics/cardViewTopImage.vue b/src/components/basics/cardViewTopImage.vue
index 9b67ce6..4c8c6be 100644
--- a/src/components/basics/cardViewTopImage.vue
+++ b/src/components/basics/cardViewTopImage.vue
@@ -30,67 +30,58 @@ loadLicense(props.image)
-
-
-
+
-
+
-
-
-
-
-
+ style="background-color: aliceblue;"
+ />
+
+
+
-
-
-
- {{ title }}
-
+
+
+
+ {{ title }}
+
-
- {{ title }}
-
-
-
+
+ {{ title }}
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/basics/confirmDialog.vue b/src/components/basics/confirmDialog.vue
index 02acd67..a0bb9e0 100644
--- a/src/components/basics/confirmDialog.vue
+++ b/src/components/basics/confirmDialog.vue
@@ -20,7 +20,7 @@ function confirmPressed() {
diff --git a/src/components/basics/sectionDivider.vue b/src/components/basics/sectionDivider.vue
index 9511928..d02c6b1 100644
--- a/src/components/basics/sectionDivider.vue
+++ b/src/components/basics/sectionDivider.vue
@@ -8,20 +8,28 @@ defineProps({
+
+
- {{ title }}
+
+ {{ title }}
+
+
diff --git a/src/components/pageParts/heroImage.vue b/src/components/pageParts/heroImage.vue
index ba5bc5a..3beed9f 100644
--- a/src/components/pageParts/heroImage.vue
+++ b/src/components/pageParts/heroImage.vue
@@ -56,6 +56,7 @@ defineProps({
type="heading"
:loading="loading"
width="500"
+ class="text-white"
>
{{ title }}
@@ -77,11 +78,18 @@ defineProps({
-
+
{{ description }}
-
+
diff --git a/src/locales/de.json b/src/locales/de.json
index 14e35c4..df7ef7c 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -249,7 +249,13 @@
"chooseDestinationFolder": "Zielordner auswählen",
"upload": "Hochladen",
"fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus",
- "testEnvironment": "Testumgebung"
+ "testEnvironment": "Testumgebung",
+ "search": {
+ "empty": {
+ "headline": "So leer hier..."
+ },
+ "searchterm": "Suchbegriff"
+ }
},
"genre": {
"withoutBand": "ohne Band"
diff --git a/src/locales/en.json b/src/locales/en.json
index 9a422e9..ce56001 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -249,7 +249,13 @@
"chooseDestinationFolder": "Choose destination folder",
"upload": "Upload",
"fulfillYourPersonalDataFirst": "Go to settings and enter your name and the right register number",
- "testEnvironment": "Test Environment"
+ "testEnvironment": "Test Environment",
+ "search": {
+ "empty": {
+ "headline": "So empty here..."
+ },
+ "searchterm": "Search term"
+ }
},
"genre": {
"withoutBand": "without Band"
diff --git a/src/pages/bands/bandDetailPage/ratingSection.vue b/src/pages/bands/bandDetailPage/ratingSection.vue
index e839d16..7dbfe5f 100644
--- a/src/pages/bands/bandDetailPage/ratingSection.vue
+++ b/src/pages/bands/bandDetailPage/ratingSection.vue
@@ -46,8 +46,10 @@ defineProps({
-
-
+
+
{{ ratingValue.value }}
diff --git a/src/pages/concerts/concertBookingPage/index.vue b/src/pages/concerts/concertBookingPage/index.vue
index 423f7a7..49b6f76 100644
--- a/src/pages/concerts/concertBookingPage/index.vue
+++ b/src/pages/concerts/concertBookingPage/index.vue
@@ -94,7 +94,7 @@ watch(() => router.currentRoute.value.params.date, () => {
-
+
{{ $t('account.login.pleaseLoginToOrder') }}
diff --git a/src/pages/misc/basketPage/ticketsTable.vue b/src/pages/misc/basketPage/ticketsTable.vue
index 3b9ccd6..e1e2e20 100644
--- a/src/pages/misc/basketPage/ticketsTable.vue
+++ b/src/pages/misc/basketPage/ticketsTable.vue
@@ -2,6 +2,7 @@
import { useBasketStore } from '@/stores/basket.store';
import { BasketItemModel } from '@/data/models/ordering/basketItemModel';
import { calcPrice } from '@/scripts/concertScripts';
+import moment from 'moment';
const basketStore = useBasketStore()
@@ -11,9 +12,10 @@ function removeFromBasket(basketItem: BasketItemModel) {
-
+
+ | {{ $t('concert.date') }} |
{{ $t('band.band') }} |
{{ $t('concert.concert') }} |
{{ $t('misc.quantity') }} |
@@ -25,6 +27,11 @@ function removeFromBasket(basketItem: BasketItemModel) {
+
+ |
+ {{ moment(basketItem.concert.date).format("DD.MM.YYYY") }}
+ |
+
{{ basketItem.band.name }}
@@ -43,7 +50,7 @@ function removeFromBasket(basketItem: BasketItemModel) {
|
- {{ basketItem.price }} €
+ {{ basketItem.price.toFixed(2) }} €
|
diff --git a/src/pages/misc/preferencesPage/systemSetupSection.vue b/src/pages/misc/preferencesPage/systemSetupSection.vue
index 0bc4471..f5c0edc 100644
--- a/src/pages/misc/preferencesPage/systemSetupSection.vue
+++ b/src/pages/misc/preferencesPage/systemSetupSection.vue
@@ -67,6 +67,7 @@ preferenceStore.getServerState()
v-model="preferenceStore.showDeleteDbDialog"
:onConfirm="preferenceStore.resetDb"
:loading="preferenceStore.fetchInProgress"
+ icon="mdi-database-refresh"
/>
@@ -76,12 +77,14 @@ preferenceStore.getServerState()
v-model="preferenceStore.showDeleteExerciseDialog"
:onConfirm="preferenceStore.resetExerciseProg"
:loading="preferenceStore.fetchInProgress"
+ icon="mdi-progress-close"
/>
+
+
+
+
+
+
+
@@ -41,7 +51,8 @@ const searchStore = useSearchStore()
+ v-for="band in searchStore.bands"
+ >
diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts
index 0996991..168ab2d 100644
--- a/src/plugins/vuetify.ts
+++ b/src/plugins/vuetify.ts
@@ -30,7 +30,7 @@ const vuetify = createVuetify({
colors: {
primary: colors.blue.darken4,
secondary: colors.yellow.darken3,
- sheet: colors.grey.lighten3,
+ sheet: colors.grey.lighten4,
warning: colors.amber.darken4,
success: colors.green.darken2,
error: colors.red.darken4,
diff --git a/src/stores/account.store.ts b/src/stores/account.store.ts
index 3761ff0..5434864 100644
--- a/src/stores/account.store.ts
+++ b/src/stores/account.store.ts
@@ -33,8 +33,10 @@ export const useAccountStore = defineStore("accountStore", {
/** Request to server sent, waiting for data response */
fetchInProgress: ref(false),
+ /** Flag to show or hide admin icon in navigation bar */
adminPanelVisible: ref(false),
+ /** Flag to activate buy option on basket page */
privilegeBuy: ref(false)
}),
diff --git a/src/stores/basket.store.ts b/src/stores/basket.store.ts
index 4163641..3395c0e 100644
--- a/src/stores/basket.store.ts
+++ b/src/stores/basket.store.ts
@@ -19,10 +19,10 @@ export const useBasketStore = defineStore('basketStore', {
itemsInBasket: useLocalStorage>("hackmycart/basketStore/itemsInBasket", []),
/** Address used in the order dialog */
- usedAddress: ref(new AddressModel()),
+ usedAddress: ref(null),
/** Payment method used in the order dialog */
- usedPayment: ref(new PaymentModel()),
+ usedPayment: ref(null),
/** Selected seats in the booking page */
selectedSeats: ref>([])
diff --git a/src/stores/search.store.ts b/src/stores/search.store.ts
index a7b9e6b..3911dbf 100644
--- a/src/stores/search.store.ts
+++ b/src/stores/search.store.ts
@@ -5,11 +5,10 @@ import { fetchLocationsBySearchTerm } from "../data/api/locationApi";
import { fetchConcertsBySearchTerm } from "../data/api/concertApi";
import { ConcertApiModel } from "@/data/models/acts/concertApiModel";
import { useExerciseStore } from "./exercise.store";
-import { AccountApiModel } from "@/data/models/user/accountApiModel";
-import { LocationApiModel } from "@/data/models/locations/locationApiModel";
import { BandApiModel } from "@/data/models/acts/bandApiModel";
import { useBandStore } from "./band.store";
import { useAccountStore } from "./account.store";
+import { LocationDetailsApiModel } from "@/data/models/locations/locationDetailsApiModel";
export const useSearchStore = defineStore("searchStore", {
state: () => ({
@@ -20,7 +19,7 @@ export const useSearchStore = defineStore("searchStore", {
bands: ref>([]),
/** Location results */
- locations: ref>([]),
+ locations: ref>([]),
/** Concert results */
concerts: ref>([]),