diff --git a/backend/data/bands-concerts.json b/backend/data/bands-concerts.json index 99f010d..83ed795 100644 --- a/backend/data/bands-concerts.json +++ b/backend/data/bands-concerts.json @@ -78,25 +78,25 @@ "location": "Swiss Life Hall" }, { - "date": "4", + "date": "8", "price": 92, "inStock": 170, "location": "Swiss Life Hall" }, { - "date": "8", + "date": "12", "price": 119.90, "inStock": 8736, "location": "Olympiahalle München" }, { - "date": "12", + "date": "19", "price": 114.90, "inStock": 2793, "location": "Barclays Arena" }, { - "date": "13", + "date": "31", "price": 124.90, "inStock": 3079, "location": "Uber Arena Berlin" @@ -468,7 +468,7 @@ "location": "ZAG Arena" }, { - "date": "6", + "date": "15", "price": 84.90, "inStock": 192, "location": "Muffatwerk" diff --git a/backend/data/orders.json b/backend/data/orders.json index df1ed50..d3d9e69 100644 --- a/backend/data/orders.json +++ b/backend/data/orders.json @@ -18,7 +18,7 @@ "username": "duranduran", "tickets": [ { - "date": "4", + "date": "8", "concertGroupName": "Unlimited Love", "orderPrice": 184, "seatGroup": "A", @@ -26,7 +26,7 @@ "seat": 2 }, { - "date": "4", + "date": "8", "concertGroupName": "Unlimited Love", "orderPrice": 184, "seatGroup": "A", diff --git a/src/App.vue b/src/App.vue index 2b56a2d..3e0d720 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,6 @@ watch(() => preferencesStore.language, () => { // Watch for theme change watch(() => preferencesStore.theme, () => { theme.global.name.value = preferencesStore.theme - feedbackStore.addSnackbar(BannerStateEnum.ERROR) }) // Watch for 404 page directions @@ -98,8 +97,9 @@ function calcMargin(i) { + {{ $t("misc.actions.cancel") }} @@ -45,7 +45,7 @@ function confirmPressed() { {{ $t("misc.actions.confirm") }} diff --git a/src/components/navigation/navigationAppendItems.vue b/src/components/navigation/navigationAppendItems.vue index ad0171a..98e98e3 100644 --- a/src/components/navigation/navigationAppendItems.vue +++ b/src/components/navigation/navigationAppendItems.vue @@ -27,7 +27,7 @@ exerciseStore.getAllExercises() :content="basketStore.itemsInBasket.reduce((tot, item) => { return tot + item.seats.length }, 0)" - color="red" offset-x="8" offset-y="8"> + color="error" offset-x="8" offset-y="8"> diff --git a/src/layouts/adminDataLayout.vue b/src/layouts/adminDataLayout.vue index 6709cc5..98bc9c9 100644 --- a/src/layouts/adminDataLayout.vue +++ b/src/layouts/adminDataLayout.vue @@ -34,7 +34,7 @@ defineProps({ diff --git a/src/locales/de.json b/src/locales/de.json index f6da564..14e35c4 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -154,7 +154,7 @@ "factoryReset": { "factoryReset": "Zurücksetzen auf Werkseinstellungen", "dialog": { - "title": "Aus Werkseinstellungen zurücksetzen?", + "title": "Auf Werkseinstellungen zurücksetzen?", "description": "Sollen alle Einstellungen und Daten auf Werkseinstellungen zurückgesetzt werden? Alle Änderungen und Fortschritte gehen verloren!" } } @@ -239,7 +239,8 @@ "connectToServer": "Server", "database": "Datenbank", "exercises": "Aufgaben", - "userData": "Persönliche Daten" + "userData": "Persönliche Daten", + "enterYourPersonalData": "Bitte gebe nun deinen Namen und deine Matrikelnummer von der Universität ein. Überprüfe die Angaben vor dem Absenden genau! Die Angaben können später nicht ohne Verlust des Bearbeitungsfortschrittes geändert werden!" }, "user": "Angaben zur Person", "registrationNumber": "Matrikelnummer", diff --git a/src/locales/en.json b/src/locales/en.json index 0a999c6..9a422e9 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -239,7 +239,8 @@ "connectToServer": "Server", "database": "Database", "exercises": "Exercises", - "userData": "User data" + "userData": "User data", + "enterYourPersonalData": "Please enter your name and your Matrikel number from your university. Check it twice! You can't change it later without loosing your exercise progress!" }, "user": "About person", "registrationNumber": "Matrikel number", diff --git a/src/pages/account/accountDataPage/accountManagingCard.vue b/src/pages/account/accountDataPage/accountManagingCard.vue index b48b997..294db9f 100644 --- a/src/pages/account/accountDataPage/accountManagingCard.vue +++ b/src/pages/account/accountDataPage/accountManagingCard.vue @@ -18,7 +18,7 @@ const accountStore = useAccountStore() @@ -29,7 +29,7 @@ const accountStore = useAccountStore() diff --git a/src/pages/account/accountDataPage/addressesCard.vue b/src/pages/account/accountDataPage/addressesCard.vue index 580ccbd..50c5042 100644 --- a/src/pages/account/accountDataPage/addressesCard.vue +++ b/src/pages/account/accountDataPage/addressesCard.vue @@ -81,7 +81,7 @@ const accountStore = useAccountStore() {{ $t('misc.actions.remove') }} @@ -102,7 +102,7 @@ const accountStore = useAccountStore() {{ $t('misc.actions.add') }} diff --git a/src/pages/account/accountDataPage/paymentsCard.vue b/src/pages/account/accountDataPage/paymentsCard.vue index 9f71a82..6b5a09d 100644 --- a/src/pages/account/accountDataPage/paymentsCard.vue +++ b/src/pages/account/accountDataPage/paymentsCard.vue @@ -17,7 +17,7 @@ const accountStore = useAccountStore() @@ -60,7 +60,7 @@ const accountStore = useAccountStore() {{ $t('misc.actions.remove') }} @@ -88,7 +88,7 @@ const accountStore = useAccountStore() {{ $t('misc.actions.add') }} diff --git a/src/pages/account/loginPage/loginForm.vue b/src/pages/account/loginPage/loginForm.vue index 0690c71..cb8e0a9 100644 --- a/src/pages/account/loginPage/loginForm.vue +++ b/src/pages/account/loginPage/loginForm.vue @@ -69,7 +69,7 @@ async function startLogin() { append-icon="mdi-arrow-right" @click="startLogin" :loading="accountStore.fetchInProgress" - color="green" + color="success" id="btn-login" > {{ $t('account.login.login') }} diff --git a/src/pages/account/loginPage/registerForm.vue b/src/pages/account/loginPage/registerForm.vue index d4783ae..bf422f0 100644 --- a/src/pages/account/loginPage/registerForm.vue +++ b/src/pages/account/loginPage/registerForm.vue @@ -75,6 +75,7 @@ async function registerAccount() { prepend-icon="mdi-account-plus" @click="registerAccount" :loading="accountStore.fetchInProgress" + color="success" > {{ $t('account.register') }} diff --git a/src/pages/admin/bandsAdminPage/bandEditDialog.vue b/src/pages/admin/bandsAdminPage/bandEditDialog.vue index 91feffc..fa06a9b 100644 --- a/src/pages/admin/bandsAdminPage/bandEditDialog.vue +++ b/src/pages/admin/bandsAdminPage/bandEditDialog.vue @@ -93,7 +93,7 @@ function itemProps(item: GenreModel) {