diff --git a/software/src/data/models/acts/concertDetailsApiModel.ts b/software/src/data/models/acts/concertDetailsApiModel.ts
index 5216d24..de408eb 100644
--- a/software/src/data/models/acts/concertDetailsApiModel.ts
+++ b/software/src/data/models/acts/concertDetailsApiModel.ts
@@ -5,5 +5,4 @@ import { ConcertModel } from "./concertModel";
export class ConcertDetailsApiModel extends ConcertModel {
location: LocationDetailsApiModel = new LocationDetailsApiModel()
band: BandModel = new BandModel()
-
}
\ No newline at end of file
diff --git a/software/src/data/models/locations/locationModel.ts b/software/src/data/models/locations/locationModel.ts
index 7d8c43f..9e5a360 100644
--- a/software/src/data/models/locations/locationModel.ts
+++ b/software/src/data/models/locations/locationModel.ts
@@ -6,4 +6,5 @@ export class LocationModel {
imageOutdoor: string = ""
capacity: number = 0
layout: number = 1
+ urlName: string = ""
}
\ No newline at end of file
diff --git a/software/src/pages/account/loginPage/loginForm.vue b/software/src/pages/account/loginPage/loginForm.vue
index 5f97507..9a97af7 100644
--- a/software/src/pages/account/loginPage/loginForm.vue
+++ b/software/src/pages/account/loginPage/loginForm.vue
@@ -32,6 +32,7 @@ async function startLogin() {
v-model="accountStore.loginData.username"
variant="outlined"
clearable
+ @keyup.enter="startLogin"
/>
@@ -45,6 +46,7 @@ async function startLogin() {
variant="outlined"
v-model="accountStore.loginData.password"
clearable
+ @keyup.enter="startLogin"
/>
diff --git a/software/src/pages/admin/dashboardPage/index.vue b/software/src/pages/admin/dashboardPage/index.vue
index e847052..f5b29c8 100644
--- a/software/src/pages/admin/dashboardPage/index.vue
+++ b/software/src/pages/admin/dashboardPage/index.vue
@@ -3,7 +3,6 @@ import { useConcertStore } from '@/stores/concert.store';
import { useBandStore } from '@/stores/band.store';
import { useAccountStore } from '@/stores/account.store';
import { useLocationStore } from '@/stores/location.store';
-import { useExerciseStore } from '@/stores/exercise.store';
import { useGenreStore } from '@/stores/genre.store';
import { usePreferencesStore } from '@/stores/preferences.store';
import dashboardCard from './dashboardCard.vue';
@@ -15,13 +14,10 @@ const bandStore = useBandStore()
const accountStore = useAccountStore()
const genreStore = useGenreStore()
const locationStore = useLocationStore()
-const exerciseStore = useExerciseStore()
const preferencesStore = usePreferencesStore()
const orderStore = useOrderStore()
const filesStore = useFilesStore()
-exerciseStore.solveExercise(2, 1)
-
filesStore.getStaticFolders()
bandStore.getBands()
locationStore.getLocations()
diff --git a/software/src/pages/bands/bandDetailPage/concertSection.vue b/software/src/pages/bands/bandDetailPage/concertSection.vue
index 98d5c3f..0e281b2 100644
--- a/software/src/pages/bands/bandDetailPage/concertSection.vue
+++ b/software/src/pages/bands/bandDetailPage/concertSection.vue
@@ -20,15 +20,17 @@ const bandStore = useBandStore()
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/software/src/pages/concerts/concertBookingPage/index.vue b/software/src/pages/concerts/concertBookingPage/index.vue
index 8433c4c..ed84dcb 100644
--- a/software/src/pages/concerts/concertBookingPage/index.vue
+++ b/software/src/pages/concerts/concertBookingPage/index.vue
@@ -15,11 +15,17 @@ const basketStore = useBasketStore()
const concertStore = useConcertStore()
onMounted(async () => {
- concertStore.getConcert(Number(router.currentRoute.value.params.id))
+ concertStore.getConcert(
+ String(router.currentRoute.value.params.locationUrl),
+ String(router.currentRoute.value.params.date)
+ )
})
watch(() => router.currentRoute.value.params.id, () => {
- concertStore.getConcert(Number(router.currentRoute.value.params.id))
+ concertStore.getConcert(
+ String(router.currentRoute.value.params.locationUrl),
+ String(router.currentRoute.value.params.date)
+ )
})
diff --git a/software/src/pages/concerts/concertsPage/concertsListSection.vue b/software/src/pages/concerts/concertsPage/concertsListSection.vue
index 1958a5d..7862f82 100644
--- a/software/src/pages/concerts/concertsPage/concertsListSection.vue
+++ b/software/src/pages/concerts/concertsPage/concertsListSection.vue
@@ -24,26 +24,28 @@ const concertStore = useConcertStore()
v-else-if="concertStore.concerts.length > 0"
v-for="(concert, index) of concertStore.concerts"
>
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+