From c6c8cf0ae82d7c75427781dadd37538a270a7aa5 Mon Sep 17 00:00:00 2001
From: Tobias Zoghaib <tobias.zoghaib@stud.uni-hannover.de>
Date: Fri, 27 Sep 2024 13:08:43 +0200
Subject: [PATCH] Move Navigation from NavDrawer to AppBar, redesign page
 structure and routes

---
 README.md                                     | 62 ++-----------------
 software/src/App.vue                          | 29 +++++----
 .../navigation/navigationAppendItems.vue      | 29 +++++++++
 .../navigation/navigationPrependItems.vue     | 48 ++++++++++++++
 software/src/locales/de.json                  |  5 +-
 software/src/locales/en.json                  |  5 +-
 .../accountDataPage}/accountDataCard.vue      |  0
 .../accountDataPage}/accountManagingCard.vue  |  0
 .../accountDataPage}/addressesCard.vue        |  0
 .../accountDataPage}/index.vue                |  1 -
 .../accountDataPage}/paymentsCard.vue         |  0
 .../pages/account/accountHomePage/index.vue   | 10 +++
 .../pages/{ => account}/loginPage/index.vue   |  0
 .../{ => account}/loginPage/loginForm.vue     |  0
 .../{ => account}/loginPage/registerForm.vue  |  0
 .../pages/{ => account}/ordersPage/index.vue  |  0
 .../{ => account}/ordersPage/ordersCard.vue   |  0
 .../pages/{helpPage => homePage}/index.vue    |  2 +-
 software/src/pages/shows/eventsPage/index.vue |  6 ++
 software/src/pages/shows/genresPage/index.vue |  6 ++
 .../src/pages/shows/locationsPage/index.vue   |  6 ++
 software/src/pages/shows/searchPage/index.vue |  6 ++
 .../ticketsPage}/filterNavDrawer.vue          |  0
 .../ticketsPage}/index.vue                    |  0
 .../ticketsPage}/productDetailsDialog.vue     |  0
 .../ticketsPage}/tourCard.vue                 |  0
 .../{ => shows}/tourDetailPage/index.vue      |  0
 .../helpPage}/index.vue                       |  0
 .../helpPage}/scoreCard.vue                   |  0
 .../{ => system}/preferencesPage/index.vue    |  0
 .../preferencesPage/pageSetup.vue             |  0
 .../preferencesPage/systemSetup.vue           |  0
 software/src/plugins/vuetify.ts               |  4 +-
 software/src/router/account.routes.ts         | 11 ++++
 software/src/router/admin.routes.ts           |  2 +-
 software/src/router/routes.ts                 | 26 +++-----
 software/src/router/show.routes.ts            | 11 ++++
 software/src/router/system.routes.ts          |  7 +++
 38 files changed, 184 insertions(+), 92 deletions(-)
 create mode 100644 software/src/components/navigation/navigationAppendItems.vue
 create mode 100644 software/src/components/navigation/navigationPrependItems.vue
 rename software/src/pages/{accountPage => account/accountDataPage}/accountDataCard.vue (100%)
 rename software/src/pages/{accountPage => account/accountDataPage}/accountManagingCard.vue (100%)
 rename software/src/pages/{accountPage => account/accountDataPage}/addressesCard.vue (100%)
 rename software/src/pages/{accountPage => account/accountDataPage}/index.vue (95%)
 rename software/src/pages/{accountPage => account/accountDataPage}/paymentsCard.vue (100%)
 create mode 100644 software/src/pages/account/accountHomePage/index.vue
 rename software/src/pages/{ => account}/loginPage/index.vue (100%)
 rename software/src/pages/{ => account}/loginPage/loginForm.vue (100%)
 rename software/src/pages/{ => account}/loginPage/registerForm.vue (100%)
 rename software/src/pages/{ => account}/ordersPage/index.vue (100%)
 rename software/src/pages/{ => account}/ordersPage/ordersCard.vue (100%)
 rename software/src/pages/{helpPage => homePage}/index.vue (89%)
 create mode 100644 software/src/pages/shows/eventsPage/index.vue
 create mode 100644 software/src/pages/shows/genresPage/index.vue
 create mode 100644 software/src/pages/shows/locationsPage/index.vue
 create mode 100644 software/src/pages/shows/searchPage/index.vue
 rename software/src/pages/{toursPage => shows/ticketsPage}/filterNavDrawer.vue (100%)
 rename software/src/pages/{toursPage => shows/ticketsPage}/index.vue (100%)
 rename software/src/pages/{toursPage => shows/ticketsPage}/productDetailsDialog.vue (100%)
 rename software/src/pages/{toursPage => shows/ticketsPage}/tourCard.vue (100%)
 rename software/src/pages/{ => shows}/tourDetailPage/index.vue (100%)
 rename software/src/pages/{scoreBoardPage => system/helpPage}/index.vue (100%)
 rename software/src/pages/{scoreBoardPage => system/helpPage}/scoreCard.vue (100%)
 rename software/src/pages/{ => system}/preferencesPage/index.vue (100%)
 rename software/src/pages/{ => system}/preferencesPage/pageSetup.vue (100%)
 rename software/src/pages/{ => system}/preferencesPage/systemSetup.vue (100%)
 create mode 100644 software/src/router/account.routes.ts
 create mode 100644 software/src/router/show.routes.ts
 create mode 100644 software/src/router/system.routes.ts

diff --git a/README.md b/README.md
index b1cb944..2d15b24 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ The application host it's data in a SQLite database. The access is managed by an
 
 
 
-<details open>
+<details>
 <summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/shows/:id</b></code> <code> (Get all information about one show)</code>
 </summary>
 
@@ -122,7 +122,7 @@ The application host it's data in a SQLite database. The access is managed by an
 
 
 
-<details open>
+<details>
 <summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/tours</b></code> <code> (Get all tours)</code>
 </summary>
 
@@ -136,7 +136,7 @@ The application host it's data in a SQLite database. The access is managed by an
 </details>
 
 
-<details open>
+<details>
 <summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/genres</b></code> <code> (Get all genres)</code>
 </summary>
 
@@ -151,7 +151,7 @@ The application host it's data in a SQLite database. The access is managed by an
 
 
 
-<details open>
+<details>
 <summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/locations</b></code> <code> (Get all locations)</code>
 </summary>
 
@@ -236,23 +236,6 @@ The application host it's data in a SQLite database. The access is managed by an
 </details>
 
 
-<details>
-<summary><code><span style="color:#69CA92"><b>POST</b></span></code> <code><b>/products/</b></code> <code> (Create a new product)</code>
-</summary>
-
-##### Parameters
-> | name | type | data type | description |
-> | :---: | --- | --- | --- |
-> | None |  required | object (JSON) | Model of a Product |
-
-##### Responses
-> | http code | content-type | response |
-> | :---: | --- | --- |
-> | `201` | `application/json` | `ProductModel`  |
-> | `400` | `application/json` | `{code: 400, message: "..."}` |
-</details>
-
-
 <details>
 <summary><code><span style="color:#69CA92"><b>POST</b></span></code> <code><b>/orders/</b></code> <code> (Create a new order)</code>
 </summary>
@@ -268,23 +251,6 @@ The application host it's data in a SQLite database. The access is managed by an
 > | `201` | `application/json` | `OrderModel`  |
 </details>
 
-
-<details>
-<summary><code><span style="color:#69CA92"><b>POST</b></span></code> <code><b>/categories/</b></code> <code> (Create a new category)</code>
-</summary>
-
-##### Parameters
-> | name | type | data type | description |
-> | :---: | --- | --- | --- |
-> | None |  required | object (JSON) | Model of a Category |
-
-##### Responses
-> | http code | content-type | response |
-> | :---: | --- | --- |
-> | `201` | `application/json` | `OrderModel`  |
-> | `400` | `application/json` | `{code: 400, message: "..."}` |
-</details>
-
 ---
 
 #### Updating existing
@@ -309,7 +275,7 @@ The application host it's data in a SQLite database. The access is managed by an
 
 #### Delete existing
 
-<details>
+<!-- <details>
 <summary><code><span style="color:#EB5246"><b>DELETE</b></span></code> <code><b>/product/:id</b></code> <code> (Delete a product)</code>
 </summary>
 
@@ -323,23 +289,7 @@ The application host it's data in a SQLite database. The access is managed by an
 > | :---: | --- | --- |
 > | `200` | `application/json` | `ProductModel`  |
 > | `400` | `application/json` | `{code: 400, message: "..."}` |
-</details>
-
-<details>
-<summary><code><span style="color:#EB5246"><b>DELETE</b></span></code> <code><b>/categories/:id</b></code> <code> (Delete a category)</code>
-</summary>
-
-##### Parameters
-> | name | type | data type | description |
-> | :---: | --- | --- | --- |
-> | `id` |  required | string | ID of category in the database |
-
-##### Responses
-> | http code | content-type | response |
-> | :---: | --- | --- |
-> | `200` | `application/json` | `CategoryModel`  |
-> | `400` | `application/json` | `{code: 400, message: "..."}` |
-</details>
+</details> -->
 
 ---
 
diff --git a/software/src/App.vue b/software/src/App.vue
index e762ded..8128d9b 100644
--- a/software/src/App.vue
+++ b/software/src/App.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { useTheme } from 'vuetify/lib/framework.mjs';
 import { i18n } from './plugins/i18n';
-import { ref, watch } from 'vue';
-import vuetify from './plugins/vuetify';
-import navigationItems from './components/navigationItems.vue';
+import { watch } from 'vue';
+import navigationAppendItems from './components/navigation/navigationAppendItems.vue';
+import navigationPrependItems from './components/navigation/navigationPrependItems.vue';
 import { usePreferencesStore } from './data/stores/preferencesStore';
 import { useFeedbackStore } from './data/stores/feedbackStore';
 import { useTourStore } from './data/stores/tourStore';
@@ -11,8 +11,8 @@ import { useTourStore } from './data/stores/tourStore';
 const preferencesStore = usePreferencesStore()
 const tourStore = useTourStore()
 const feedbackStore = useFeedbackStore()
+
 const theme = useTheme()
-const navRail = ref(vuetify.display.mobile)
 
 theme.global.name.value = preferencesStore.theme
 
@@ -26,15 +26,20 @@ watch(() => preferencesStore.language, () => {
 
 <template>
   <v-app>
-    <v-app-bar>
-      <v-app-bar-nav-icon @click="navRail = !navRail" />
+    <v-app-bar
+      height="80"
+      color="primary" 
+      class="px-5"
+    >
+      <template #prepend>
+        <navigation-prepend-items />
+      </template>
 
-      <v-app-bar-title>HackMyCart</v-app-bar-title>
+      <template #append>
+        <navigation-append-items />
+      </template>
     </v-app-bar>
 
-    <v-navigation-drawer :rail="navRail" permanent>
-      <navigation-items v-model:nav-rail="navRail" />
-    </v-navigation-drawer>
 
     <v-main>
       <!-- Snackbar in the top right corner for user feedback -->
@@ -58,7 +63,9 @@ watch(() => preferencesStore.language, () => {
       </v-snackbar>
 
       <!-- Here changes the router the content -->
-      <router-view></router-view>
+      <v-container max-width="1200">
+        <router-view></router-view>
+      </v-container>
     </v-main>
   </v-app>
 </template>
diff --git a/software/src/components/navigation/navigationAppendItems.vue b/software/src/components/navigation/navigationAppendItems.vue
new file mode 100644
index 0000000..3c40c80
--- /dev/null
+++ b/software/src/components/navigation/navigationAppendItems.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { useAccountStore } from '@/data/stores/accountStore';
+import router from '@/plugins/router';
+
+const accountStore = useAccountStore()
+
+function startSearch() {
+  // todo
+  router.push("/shows/search")
+}
+</script>
+
+<template>
+  <v-text-field
+    variant="outlined"
+    append-inner-icon="mdi-magnify"
+    density="compact"
+    class="mt-5 mr-5"
+    @click:append-inner="startSearch"
+    width="400"
+  />
+
+  <v-btn v-if="accountStore.userAccount.id == 0" variant="plain" icon="mdi-account" to="/account/login" />
+  <v-btn v-else variant="plain" icon="mdi-account" to="/account/home" />
+
+  <v-btn variant="plain" icon="mdi-cart" to="/basket" />
+  <v-btn variant="plain" icon="mdi-help" to="/system/help" />
+  <v-btn variant="plain" icon="mdi-cog" to="/system/preferences"/>
+</template>
\ No newline at end of file
diff --git a/software/src/components/navigation/navigationPrependItems.vue b/software/src/components/navigation/navigationPrependItems.vue
new file mode 100644
index 0000000..e34855e
--- /dev/null
+++ b/software/src/components/navigation/navigationPrependItems.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  <v-app-bar-title class="pr-5">
+    <!-- todo: Brand logo -->
+    <v-btn variant="plain" to="/" flat>HackMyCart</v-btn>
+  </v-app-bar-title>
+
+  <v-divider vertical />
+
+  <v-btn
+    to="/shows/events"
+    prepend-icon="mdi-ticket"
+    height="100%"
+    :rounded="false"
+  >
+    {{ $t('menu.shopping.allEvents', 2) }}
+  </v-btn>
+
+  <v-divider vertical />
+
+
+  <v-btn
+    variant="text"
+    to="/shows/locations"
+    prepend-icon="mdi-city"
+    height="100%"
+    :rounded="false"
+  >
+    {{ $t('menu.shopping.allLocations', 2) }}
+  </v-btn>
+
+  <v-divider vertical />
+
+
+  <v-btn
+    variant="text"
+    to="/shows/genres"
+    prepend-icon="mdi-music-clef-treble"
+    height="100%"
+    :rounded="false"
+  >
+    {{ $t('menu.shopping.allGenres', 2) }}
+  </v-btn>
+
+  <v-divider vertical />
+</template>
\ No newline at end of file
diff --git a/software/src/locales/de.json b/software/src/locales/de.json
index e94501a..4aaec23 100644
--- a/software/src/locales/de.json
+++ b/software/src/locales/de.json
@@ -1,8 +1,9 @@
 {
   "menu": {
     "shopping": {
-      "shopping": "Einkaufen",
-      "ticket": "Ticket | Tickets",
+      "allEvents": "Alle Events",
+      "allLocations": "Alle Orte",
+      "allGenres": "Alle Genres",
       "basket": "Warenkorb"
     },
     "account": {
diff --git a/software/src/locales/en.json b/software/src/locales/en.json
index 0fc724e..86c61d6 100644
--- a/software/src/locales/en.json
+++ b/software/src/locales/en.json
@@ -1,8 +1,9 @@
 {
   "menu": {
     "shopping": {
-      "shopping": "Shopping",
-      "ticket": "Ticket | Tickets",
+      "allEvents": "All Events",
+      "allLocations": "All Locations",
+      "allGenres": "All Genres",
       "basket": "Basket"
     },
     "account": {
diff --git a/software/src/pages/accountPage/accountDataCard.vue b/software/src/pages/account/accountDataPage/accountDataCard.vue
similarity index 100%
rename from software/src/pages/accountPage/accountDataCard.vue
rename to software/src/pages/account/accountDataPage/accountDataCard.vue
diff --git a/software/src/pages/accountPage/accountManagingCard.vue b/software/src/pages/account/accountDataPage/accountManagingCard.vue
similarity index 100%
rename from software/src/pages/accountPage/accountManagingCard.vue
rename to software/src/pages/account/accountDataPage/accountManagingCard.vue
diff --git a/software/src/pages/accountPage/addressesCard.vue b/software/src/pages/account/accountDataPage/addressesCard.vue
similarity index 100%
rename from software/src/pages/accountPage/addressesCard.vue
rename to software/src/pages/account/accountDataPage/addressesCard.vue
diff --git a/software/src/pages/accountPage/index.vue b/software/src/pages/account/accountDataPage/index.vue
similarity index 95%
rename from software/src/pages/accountPage/index.vue
rename to software/src/pages/account/accountDataPage/index.vue
index 7d87a0d..72f57ce 100644
--- a/software/src/pages/accountPage/index.vue
+++ b/software/src/pages/account/accountDataPage/index.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import alertBanner from '@/components/alertBanner.vue';
 import accountDataCard from './accountDataCard.vue';
 import accountManagingCard from './accountManagingCard.vue';
 import addressesCard from './addressesCard.vue';
diff --git a/software/src/pages/accountPage/paymentsCard.vue b/software/src/pages/account/accountDataPage/paymentsCard.vue
similarity index 100%
rename from software/src/pages/accountPage/paymentsCard.vue
rename to software/src/pages/account/accountDataPage/paymentsCard.vue
diff --git a/software/src/pages/account/accountHomePage/index.vue b/software/src/pages/account/accountHomePage/index.vue
new file mode 100644
index 0000000..06d3674
--- /dev/null
+++ b/software/src/pages/account/accountHomePage/index.vue
@@ -0,0 +1,10 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  Account Home
+
+  <v-btn to="/account/edit" >Account Data</v-btn>
+
+  <v-btn to="/account/orders" >Orders</v-btn>
+</template>
\ No newline at end of file
diff --git a/software/src/pages/loginPage/index.vue b/software/src/pages/account/loginPage/index.vue
similarity index 100%
rename from software/src/pages/loginPage/index.vue
rename to software/src/pages/account/loginPage/index.vue
diff --git a/software/src/pages/loginPage/loginForm.vue b/software/src/pages/account/loginPage/loginForm.vue
similarity index 100%
rename from software/src/pages/loginPage/loginForm.vue
rename to software/src/pages/account/loginPage/loginForm.vue
diff --git a/software/src/pages/loginPage/registerForm.vue b/software/src/pages/account/loginPage/registerForm.vue
similarity index 100%
rename from software/src/pages/loginPage/registerForm.vue
rename to software/src/pages/account/loginPage/registerForm.vue
diff --git a/software/src/pages/ordersPage/index.vue b/software/src/pages/account/ordersPage/index.vue
similarity index 100%
rename from software/src/pages/ordersPage/index.vue
rename to software/src/pages/account/ordersPage/index.vue
diff --git a/software/src/pages/ordersPage/ordersCard.vue b/software/src/pages/account/ordersPage/ordersCard.vue
similarity index 100%
rename from software/src/pages/ordersPage/ordersCard.vue
rename to software/src/pages/account/ordersPage/ordersCard.vue
diff --git a/software/src/pages/helpPage/index.vue b/software/src/pages/homePage/index.vue
similarity index 89%
rename from software/src/pages/helpPage/index.vue
rename to software/src/pages/homePage/index.vue
index d1f6730..67b94f6 100644
--- a/software/src/pages/helpPage/index.vue
+++ b/software/src/pages/homePage/index.vue
@@ -2,5 +2,5 @@
 </script>
 
 <template>
-  Help
+  Home
 </template>
\ No newline at end of file
diff --git a/software/src/pages/shows/eventsPage/index.vue b/software/src/pages/shows/eventsPage/index.vue
new file mode 100644
index 0000000..c12ab13
--- /dev/null
+++ b/software/src/pages/shows/eventsPage/index.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  Events
+</template>
\ No newline at end of file
diff --git a/software/src/pages/shows/genresPage/index.vue b/software/src/pages/shows/genresPage/index.vue
new file mode 100644
index 0000000..db9cc6f
--- /dev/null
+++ b/software/src/pages/shows/genresPage/index.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  Genres
+</template>
\ No newline at end of file
diff --git a/software/src/pages/shows/locationsPage/index.vue b/software/src/pages/shows/locationsPage/index.vue
new file mode 100644
index 0000000..0e82771
--- /dev/null
+++ b/software/src/pages/shows/locationsPage/index.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  Locations
+</template>
\ No newline at end of file
diff --git a/software/src/pages/shows/searchPage/index.vue b/software/src/pages/shows/searchPage/index.vue
new file mode 100644
index 0000000..6404e3e
--- /dev/null
+++ b/software/src/pages/shows/searchPage/index.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  Search
+</template>
\ No newline at end of file
diff --git a/software/src/pages/toursPage/filterNavDrawer.vue b/software/src/pages/shows/ticketsPage/filterNavDrawer.vue
similarity index 100%
rename from software/src/pages/toursPage/filterNavDrawer.vue
rename to software/src/pages/shows/ticketsPage/filterNavDrawer.vue
diff --git a/software/src/pages/toursPage/index.vue b/software/src/pages/shows/ticketsPage/index.vue
similarity index 100%
rename from software/src/pages/toursPage/index.vue
rename to software/src/pages/shows/ticketsPage/index.vue
diff --git a/software/src/pages/toursPage/productDetailsDialog.vue b/software/src/pages/shows/ticketsPage/productDetailsDialog.vue
similarity index 100%
rename from software/src/pages/toursPage/productDetailsDialog.vue
rename to software/src/pages/shows/ticketsPage/productDetailsDialog.vue
diff --git a/software/src/pages/toursPage/tourCard.vue b/software/src/pages/shows/ticketsPage/tourCard.vue
similarity index 100%
rename from software/src/pages/toursPage/tourCard.vue
rename to software/src/pages/shows/ticketsPage/tourCard.vue
diff --git a/software/src/pages/tourDetailPage/index.vue b/software/src/pages/shows/tourDetailPage/index.vue
similarity index 100%
rename from software/src/pages/tourDetailPage/index.vue
rename to software/src/pages/shows/tourDetailPage/index.vue
diff --git a/software/src/pages/scoreBoardPage/index.vue b/software/src/pages/system/helpPage/index.vue
similarity index 100%
rename from software/src/pages/scoreBoardPage/index.vue
rename to software/src/pages/system/helpPage/index.vue
diff --git a/software/src/pages/scoreBoardPage/scoreCard.vue b/software/src/pages/system/helpPage/scoreCard.vue
similarity index 100%
rename from software/src/pages/scoreBoardPage/scoreCard.vue
rename to software/src/pages/system/helpPage/scoreCard.vue
diff --git a/software/src/pages/preferencesPage/index.vue b/software/src/pages/system/preferencesPage/index.vue
similarity index 100%
rename from software/src/pages/preferencesPage/index.vue
rename to software/src/pages/system/preferencesPage/index.vue
diff --git a/software/src/pages/preferencesPage/pageSetup.vue b/software/src/pages/system/preferencesPage/pageSetup.vue
similarity index 100%
rename from software/src/pages/preferencesPage/pageSetup.vue
rename to software/src/pages/system/preferencesPage/pageSetup.vue
diff --git a/software/src/pages/preferencesPage/systemSetup.vue b/software/src/pages/system/preferencesPage/systemSetup.vue
similarity index 100%
rename from software/src/pages/preferencesPage/systemSetup.vue
rename to software/src/pages/system/preferencesPage/systemSetup.vue
diff --git a/software/src/plugins/vuetify.ts b/software/src/plugins/vuetify.ts
index 79a50ad..6917739 100644
--- a/software/src/plugins/vuetify.ts
+++ b/software/src/plugins/vuetify.ts
@@ -20,7 +20,7 @@ const vuetify = createVuetify({
           secondary: colors.red.lighten2
         }
       },
-            lightRed: {
+      lightRed: {
         dark: false,
         colors: {
           primary: colors.red.darken1,
@@ -30,7 +30,7 @@ const vuetify = createVuetify({
       darkBlue: {
         dark: true,
         colors: {
-          primary: colors.blue.darken1,
+          primary: colors.blue.darken4,
           secondary: colors.blue.lighten2
         }
       },
diff --git a/software/src/router/account.routes.ts b/software/src/router/account.routes.ts
new file mode 100644
index 0000000..82b9e37
--- /dev/null
+++ b/software/src/router/account.routes.ts
@@ -0,0 +1,11 @@
+import AccountHomePage from "@/pages/account/accountHomePage/index.vue";
+import AccountDataPage from "@/pages/account/accountDataPage/index.vue";
+import OrdersPage from "@/pages/account/ordersPage/index.vue";
+import LoginPage from "@/pages/account/loginPage/index.vue"
+
+export const accountRoutes = [
+  { path: '/account/home', component: AccountHomePage },
+  { path: '/account/login', component: LoginPage },
+  { path: '/account/edit', component: AccountDataPage },
+  { path: '/account/orders', component: OrdersPage },
+]
\ No newline at end of file
diff --git a/software/src/router/admin.routes.ts b/software/src/router/admin.routes.ts
index 44ff2ce..642ce19 100644
--- a/software/src/router/admin.routes.ts
+++ b/software/src/router/admin.routes.ts
@@ -4,7 +4,7 @@ import AccountsPage from "@/pages/admin/accountsPage/index.vue"
 import ProductsPage from "@/pages/admin/productsPage/index.vue"
 import BrandsPage from "@/pages/admin/brandsPage/index.vue"
 
-export default [
+export const adminRoutes = [
   {
     path: '/admin/dashboard',
     component: DashboardPage
diff --git a/software/src/router/routes.ts b/software/src/router/routes.ts
index 3c807bf..4ce752e 100644
--- a/software/src/router/routes.ts
+++ b/software/src/router/routes.ts
@@ -1,23 +1,17 @@
-import AccountPage from "@/pages/accountPage/index.vue";
-import OrdersPage from "@/pages/ordersPage/index.vue";
-import PreferencesPage from "@/pages/preferencesPage/index.vue";
-import TourPage from "@/pages/toursPage/index.vue";
-import LoginPage from "@/pages/loginPage/index.vue"
 import BasketPage from "@/pages/basketPage/index.vue"
-import HelpPage from "@/pages/helpPage/index.vue"
-import ScoreBoardPage from "@/pages/scoreBoardPage/index.vue"
-import adminRoutes from "./admin.routes";
+import HomePage from "@/pages/homePage/index.vue"
+import { adminRoutes } from "./admin.routes";
+import { accountRoutes } from "./account.routes";
+import { showRoutes } from "./show.routes";
+import { systemRoutes } from "./system.routes";
 
 const routes = [
-  { path: '/', component: TourPage },
-  { path: '/account', component: AccountPage },
-  { path: '/orders', component: OrdersPage },
-  { path: '/preferences', component: PreferencesPage },
-  { path: '/login', component: LoginPage },
+  { path: "/", component: HomePage },
   { path: '/basket', component: BasketPage },
-  { path: '/scoreboard', component: ScoreBoardPage },
-  { path: '/help', component: HelpPage },
-  ...adminRoutes
+  ...showRoutes,
+  ...accountRoutes,
+  ...adminRoutes,
+  ...systemRoutes
 ]
 
 export default routes
\ No newline at end of file
diff --git a/software/src/router/show.routes.ts b/software/src/router/show.routes.ts
new file mode 100644
index 0000000..711fd32
--- /dev/null
+++ b/software/src/router/show.routes.ts
@@ -0,0 +1,11 @@
+import EventsPage from "@/pages/shows/eventsPage/index.vue";
+import GenresPage from "@/pages/shows/genresPage/index.vue";
+import LocationsPage from "@/pages/shows/locationsPage/index.vue"
+import SearchPage from "@/pages/shows/searchPage/index.vue"
+
+export const showRoutes = [
+  { path: '/shows/events', component: EventsPage },
+  { path: '/shows/genres', component: GenresPage },
+  { path: '/shows/locations', component: LocationsPage },
+  { path: '/shows/search', component: SearchPage },
+]
\ No newline at end of file
diff --git a/software/src/router/system.routes.ts b/software/src/router/system.routes.ts
new file mode 100644
index 0000000..2a05819
--- /dev/null
+++ b/software/src/router/system.routes.ts
@@ -0,0 +1,7 @@
+import PreferencesPage from "@/pages/system/preferencesPage/index.vue";
+import HelpPage from "@/pages/system/helpPage/index.vue"
+
+export const systemRoutes = [
+  { path: '/system/preferences', component: PreferencesPage },
+  { path: '/system/help', component: HelpPage }
+]
\ No newline at end of file