diff --git a/software/src/App.vue b/software/src/App.vue
index 81f06bc..81b575b 100644
--- a/software/src/App.vue
+++ b/software/src/App.vue
@@ -29,7 +29,7 @@ i18n.global.locale = userStore.language
{{ $t('menu.shopping') }}
-
+
diff --git a/software/src/components/actionDialog.vue b/software/src/components/actionDialog.vue
new file mode 100644
index 0000000..08c8ec4
--- /dev/null
+++ b/software/src/components/actionDialog.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/software/src/locales/english.json b/software/src/locales/english.json
index 6957d01..443360c 100644
--- a/software/src/locales/english.json
+++ b/software/src/locales/english.json
@@ -36,5 +36,14 @@
"username": "Username",
"password": "Password",
"login": "Login",
- "noAccountRegister": "No Account? Register now!"
+ "noAccountRegister": "No Account? Register now!",
+ "register": "Create Account",
+ "userInfo": {
+ "firstName": "First Name",
+ "lastName": "Family Name",
+ "street": "Street",
+ "houseNumber": "House Number",
+ "postalCode": "Postal Code",
+ "city": "City"
+ }
}
\ No newline at end of file
diff --git a/software/src/locales/german.json b/software/src/locales/german.json
index bb5176c..237d1e4 100644
--- a/software/src/locales/german.json
+++ b/software/src/locales/german.json
@@ -36,5 +36,14 @@
"username": "Username",
"password": "Passwort",
"login": "Login",
- "noAccountRegister": "Noch keinen Account? Jetzt anmelden!"
+ "noAccountRegister": "Noch keinen Account? Jetzt anmelden!",
+ "register": "Account erstellen",
+ "userInfo": {
+ "firstName": "Vorname",
+ "lastName": "Nachname",
+ "street": "Straße",
+ "houseNumber": "Hausnummer",
+ "postalCode": "Postleitzahl",
+ "city": "Stadt"
+ }
}
\ No newline at end of file
diff --git a/software/src/pages/helpPage/index.vue b/software/src/pages/helpPage/index.vue
new file mode 100644
index 0000000..d1f6730
--- /dev/null
+++ b/software/src/pages/helpPage/index.vue
@@ -0,0 +1,6 @@
+
+
+
+ Help
+
\ No newline at end of file
diff --git a/software/src/pages/loginPage/index.vue b/software/src/pages/loginPage/index.vue
index a1e8862..6de2249 100644
--- a/software/src/pages/loginPage/index.vue
+++ b/software/src/pages/loginPage/index.vue
@@ -1,14 +1,19 @@
-
+
+
+
\ No newline at end of file
diff --git a/software/src/pages/loginPage/loginForm.vue b/software/src/pages/loginPage/loginForm.vue
index dfcedf8..e01348c 100644
--- a/software/src/pages/loginPage/loginForm.vue
+++ b/software/src/pages/loginPage/loginForm.vue
@@ -1,4 +1,5 @@
@@ -25,14 +26,9 @@
-
- {{ $t('noAccountRegister') }}
-
+
+ {{ $t('noAccountRegister') }}
+
\ No newline at end of file
diff --git a/software/src/pages/loginPage/registerForm.vue b/software/src/pages/loginPage/registerForm.vue
new file mode 100644
index 0000000..281728b
--- /dev/null
+++ b/software/src/pages/loginPage/registerForm.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('register') }}
+
+
+
\ No newline at end of file
diff --git a/software/src/pages/productsPage/productDetails.vue b/software/src/pages/productsPage/productDetails.vue
index ec5d316..0fb28ed 100644
--- a/software/src/pages/productsPage/productDetails.vue
+++ b/software/src/pages/productsPage/productDetails.vue
@@ -5,6 +5,7 @@ import { CategoryModel } from '@/data/models/categoryModel';
import { ModelRef, ref } from 'vue';
import { useBasketStore } from '@/data/stores/basketStore';
import { calcProductPrice, productToBasketItem } from '@/scripts/productScripts';
+import ActionDialog from '@/components/actionDialog.vue'
const showDialog: ModelRef = defineModel()
const nrOfArticles = ref(1)
@@ -23,54 +24,51 @@ function addProductToBasket() {
-
-
-
+
+
+
+
+
+ {{ productCategory.name }}
+
+
+
+
+ {{ product.description }}
+
+
+
+
+
+
-
-
-
-
- {{ productCategory.name }}
-
-
-
-
- {{ product.description }}
-
-
-
-
-
-
+
-
+
+ {{ calcProductPrice(product, nrOfArticles) }} €
+
+
+
-
- {{ calcProductPrice(product, nrOfArticles) }} €
-
-
-
-
-
-
- {{ $t('addToBasket') }}
-
-
-
-
-
+
+
+ {{ $t('addToBasket') }}
+
+
+
\ No newline at end of file
diff --git a/software/src/router/routes.ts b/software/src/router/routes.ts
index aac969b..7674891 100644
--- a/software/src/router/routes.ts
+++ b/software/src/router/routes.ts
@@ -4,14 +4,16 @@ import PreferencesPage from "@/pages/preferencesPage/index.vue";
import ProductsPage from "@/pages/productsPage/index.vue";
import LoginPage from "@/pages/loginPage/index.vue"
import BasketPage from "@/pages/basketPage/index.vue"
+import HelpPage from "@/pages/helpPage/index.vue"
const routes = [
- { path: '/products', component: ProductsPage },
+ { path: '/', component: ProductsPage },
{ path: '/account', component: AccountPage },
{ path: '/orders', component: OrdersPage },
{ path: '/preferences', component: PreferencesPage },
{ path: '/login', component: LoginPage },
- { path: '/basket', component: BasketPage }
+ { path: '/basket', component: BasketPage },
+ { path: '/help', component: HelpPage }
]
export default routes
\ No newline at end of file