Changelog

.vscode/settings.json

@@ -11,6 +11,5 @@
   "i18n-ally.enabledFrameworks": [
     "vue"
   ],
-  "i18n-ally.keystyle": "nested",
+  "i18n-ally.keystyle": "nested"
-  "i18n-ally.extract.autoDetect": true,
 }

CHANGELOG.md

@@ -1,47 +1,4 @@
-# v.0.4.0 (2025-08-30)
+# v.0.1.0 (Alpha)
-
-## 🚀 Features
-
-- Exercise selection system
-
-## 🌟 Enhancements
-
-- Tooltips on append icons in toolbar
-- Exercise page icon adds open exercises badge
-- Finished english translation
-- Icons on exercise groups on help page
-- Welcome dialog: New page for look and feel, merge database and exercise creation in one step
-- Add links to GitHub and project page on settings
-
-
-# v.0.3.0 (2025-02-28)
-## 🚀 Features
-- Swagger Documentation
-- RPM Image
-
-## 🐛 Bugfixes
-- Bugfix on search page for Band datasets
-
-# v.0.2.0 (2024-12-05)
-## 🚀 Features
-- Adding "Test Environment" banner in the bottom right corner
-- License handling system
-- New SQL-Injection exercise 2.1
-- Solution code based on Matrikelnummer and number of completed exercises
-
-## 🌟 Enhancements
-- Improve exercise solution of 2.1, 2.2, 2.3, 2.4 and 2.6
-- Light mode improvements
-- Global color schema
-- More feedback through notifications
-- More hints on text fields
-- Redesign account pages, split payments and addresses, new dashboard
-
-## 🐛 Bugfixes
-- More server stability
-- Bugfix file manager in Electron application
-
-# v.0.1.0 (2024-11-21)
 ## 🚀 Features
 - Frontend
   - VueJS frontend framework with Vuetify UI library

README.md

@@ -1,116 +1,30 @@
-<p align="center">
+# HackMyCart
-  <img src="misc/images/logo.png" width="300" />
-</p>
 
-<h1 align="center">EventMaster</h1>
+The most hackable Web Shop!
-<h2 align="center">The most hackable Ticket-Shop!</h2>
-
-![Hompage](/misc/images/homepage.png)
-
-## About the project
-
-EventMaster is a desktop application for simulating various hacking methods for web applications. It's the perfect tool to understand  vulnerabilities in modern web applications.
-
-The shop offers tickets for concerts of popular bands with a complete ordering system, account management and admin interface. The program has been deliberately provided with vulnerabilities for teaching purposes, e.g. SQL injections. If a task is solved and a vulnerability is identified, the system provides visual feedback. The progress can be viewed on an overview page.
-
-This project is created during my Bachelor thesis. It will be used at Leibniz University Hannover for foundation lectures.
-
-## Important notes!
-- ⚠️ The project is under development, bugs may occur
-- ⚠️ The software is developed for educational purposes, don't use the attack techniques without permission on other applications and systems!
-- ⚠️ Works 100% offline, no data transmission to or from external services
-
-## Features
-- 13 exercises
-- 3 attack techniques
-  - SQL-Injections
-  - Cross-Site-Scripting
-  - Broken Access Control
-- Exercise control system - check the progress and get feedback for solved exercises!
-- Full working ticket shop:
-  - Vuetify design
-  - Account management system
-  - Order process system
-  - Event locations with seat plan and seat reservation system during ordering process
-  - Global search
-  - Admin panel
-  - Product pages
-  - ExpressJs-Backend server
-  - REST-API
-  - SQLite Database
-- URL simulation bar for electron application
-- Works 100% offline
-- Multi language support (German, English)
-- Dark/Light-Mode
-- Exercise progress PDF generation
-- API-Documentation with Swagger
-- Desktop application packed with Electron
-- Database can be resetted complete or partially
-
-### Techstack
-
-- Axios
-- Electron
-- Electron Builder
-- Express.js
-- JsonWebToken
-- jspdf
-- Moment.js
-- NPM
-- Nodemon
-- Pinia
-- Sequelize
-- SQLite 3
-- Swagger
-- TypeScript
-- Vite
-- Vue i18n
-- Vue.js
-- VueRouter
-- Vuetify
-
-### Planned features
-
-- More attack techniques
-- More exercises
-- More languages
-- Customize the offered set of exercises (for trainer)
-- Image license view system (currently only in admin panel)
-
-### Screenshots
-
-#### Band Detail page
-![Band Detail page](/misc/images/band-detail-seite.png)
-
-#### Booking page
-![Booking page](/misc/images/booking-concert.png)
-
-#### Admin panel
-![Admin panel](/misc/images/admin-panel.png)
-
-#### Global search
-![Global search](/misc/images/search.png)
-
-#### Feedback on exercise solution
-![Snackbar Feedback](/misc/images/snackbar-feedback.png)
 
 ## How to use
 
-### Download pre-builded images
+### Prepare development environment
 
-Go to releases and download one of the pre-builded images for your operating system.
+1. Install node.js
 
-### Build yourself
+```bash
+sudo apt install npm
 
-1. Download + extract the project
+# If outdated version:
-2. Open the root folder with VS Code (recommended)
+sudo npm install -g n
-3. Open the bash inside VS Code and install all necessary packages:
+sudo n stable
+```
+
+2. Download + extract the project
+3. Open the root folder with VS Code (recommended)
+4. Open the bash inside VS Code and install all necessary packages:
 
 ```bash
 npm i
 ```
 
-#### Test/development
+### Test/development
 
 There are multiple commands to test parts or the whole project:
 
@@ -120,7 +34,7 @@ There are multiple commands to test parts or the whole project:
 
 The frontend runs on `http://localhost:5173/` and the backend on `http://localhost:3000/`
 
-#### Build
+### Build
 
 - `npm run vite:build`: Build Vue frontend only
 - `npm run server:build`: Build ExpressJs backend only
@@ -134,6 +48,423 @@ The frontend runs on `http://localhost:5173/` and the backend on `http://localho
 ### Database
 ![database-erm](misc/images/database.png)
 
-### Frontend-Backend-System
 
-![frontend-backend-system](misc/images/frontend-backend-system.png)
+### Backend API endpoints
+
+The application host it's data in a SQLite database. The access is managed by an [ExpressJs](https://expressjs.com/) server which offers many REST-API endpoints for the frontend. The REST-API server runs on port 3000.
+
+---
+
+#### Listing existing
+
+<details open>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/accounts/</b></code> <code> (Get all Accounts)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Account + AccountRole>`  |
+
+##### Example Response
+```json
+[
+  {
+    "id": 421,
+    "username": "hagemeister93",
+    "password": "Xjt3qb5t",
+    "email": "hagemeister93@gmail.com",
+    "firstName": "Laurin",
+    "lastName": "Hagemeister",
+    "accountRoleId": 2,
+    "accountRole": {
+      "id": 2,
+      "name": "Admin",
+      "privilegeBuy": true,
+      "privilegeAdminPanel": true
+    }
+  }
+]
+```
+
+</details>
+
+<details open>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/api/files</b></code> <code> (Get all public files)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<{folder: String, files: Array<{name: String, size: Number, url: String}> }>`  |
+
+##### Example Response
+```json
+[
+  {
+    "folder": "artists",
+    "files": [
+      {
+        "name": "alex-turner.jpg",
+        "size": 56473,
+        "url": "http://localhost:3000/static/artists/alex-turner.jpg"
+      },
+      {
+        "name": "andy-nicholson.jpg",
+        "size": 68983,
+        "url": "http://localhost:3000/static/artists/andy-nicholson.jpg"
+      }
+    ]
+  }
+]
+```
+</details>
+
+<details open>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/bands/</b></code> <code> (Get all bands)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `sort` |  optional | string   | Sort by number of concerts ascending (asc) or descending (desc) |
+> | `count` |  optional | number   | Number of items to responde |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<>`  |
+
+##### Example Response
+```json
+[
+  {
+    "folder": "artists",
+    "files": [
+      {
+        "name": "alex-turner.jpg",
+        "size": 56473,
+        "url": "http://localhost:3000/static/artists/alex-turner.jpg"
+      },
+      {
+        "name": "andy-nicholson.jpg",
+        "size": 68983,
+        "url": "http://localhost:3000/static/artists/andy-nicholson.jpg"
+      }
+    ]
+  }
+]
+```
+</details>
+
+
+
+
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/events?city=cityName&genre=genreName&count=nrOfItems&sort=sortDirection</b></code> <code> (Get all events, filtered by city and genre)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `cityName` |  optional | string   | Name of the city to filter for  |
+> | `genreName` |  optional | string   | Name of the genre to filter for  |
+> | `nrOfItems` |  optional | number   | Limits number of results |
+> | `sortDirection` |  optional | string   | Sort by number of concerts, 'asc' or 'desc' |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Event + Array<Concert + Location + City> + Band & Genre>`  |
+</details>
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/locations?count=nrOfItems&sort=sortDirection</b></code> <code> (Get all locations)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `nrOfItems` |  optional | number   | Limits number of results |
+> | `sortDirection` |  optional | string   | Sort by number of concerts, 'asc' or 'desc' |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Location + City + Array<Concert + Event>>`  |
+</details>
+
+
+Down here: todo!
+
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/bands</b></code> <code> (Get all bands)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Band>`  |
+</details>
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/bands/:id</b></code> <code> (Get all information about one band)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `id` |  required | string   | ID of product in the database  |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Band` + `Array<Rating>` + `Array<Member>`  |
+</details>
+
+
+
+<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>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `id` |  required | string   | ID of product in the database  |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Show` + `Tour` + `Location` + `City`  |
+</details>
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/tours</b></code> <code> (Get all tours)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Tours>` + `Band` + `Show` + `Location` + `City`  |
+</details>
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/genres</b></code> <code> (Get all genres)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Genre>`  |
+</details>
+
+
+
+
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/orders/:id</b></code> <code> (Get all orders of an user)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | --- | --- | --- | --- |
+> | `id` |  required | string   | ID of userAccount in the database  |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `ProductModel` + `Order`, `OrderItem`, `Product`  |
+</details>
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/categories/</b></code> <code> (Get all Categories)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Categories>` |
+</details>
+
+
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/brands</b></code> <code> (Get all Brands)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `Array<Brand>` |
+</details>
+
+
+---
+
+
+#### Creating new
+
+<details>
+<summary><code><span style="color:#69CA92"><b>POST</b></span></code> <code><b>/accounts/</b></code> <code> (Create a new account)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | None |  required | object (JSON) | Model of an Account |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `201` | `application/json` | `AccountModel`  |
+> | `400` | `application/json` | `{code: 400, message: "Username too short!"}` |
+> | `400` | `application/json` | `{code: 400, message: "Password too short!"}` |
+> | `409` | `application/json` | `{code: 409, message: "Username already in use"}` |
+</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>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | None |  required | object (JSON) | Model of an Order |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `201` | `application/json` | `OrderModel`  |
+</details>
+
+---
+
+#### Updating existing
+
+<details>
+<summary><code><span style="color:#F3A63D"><b>PATCH</b></span></code> <code><b>/accounts/</b></code> <code> (Update data of an existing account)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | None |  required | object (JSON) | Model of an Account |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | AccountModel  |
+> | `400` | `application/json` | `{code: 400, message: "..."}` |
+</details>
+
+---
+
+#### Delete existing
+
+<!-- <details>
+<summary><code><span style="color:#EB5246"><b>DELETE</b></span></code> <code><b>/product/:id</b></code> <code> (Delete a product)</code>
+</summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | :---: | --- | --- | --- |
+> | `id` |  required | string | ID of product in the database |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `ProductModel`  |
+> | `400` | `application/json` | `{code: 400, message: "..."}` |
+</details> -->
+
+---
+
+#### Miscs
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/api/</b></code> <code> (Check if server runs)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | None | None |
+</details>
+
+<details>
+<summary><code><span style="color:#70AFFD"><b>GET</b></span></code> <code><b>/resetDatabase/</b></code> <code> (Reset the database to it's default values)</code>
+</summary>
+
+##### Parameters
+> None
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | None | None |
+</details>
+
+
+#### Validate
+
+<details>
+<summary><code><span style="color:#69CA92"><b>POST</b></span></code> <code><b>/accounts/login</b></code> <code> (Login for user)</code></summary>
+
+##### Parameters
+> | name | type | data type | description |
+> | --- | --- | --- | --- |
+> | username |  required | string   | Username of the account  |
+> | password |  required | string   | Password of the account  |
+
+##### Responses
+> | http code | content-type | response |
+> | :---: | --- | --- |
+> | `200` | `application/json` | `AccountObject` + `Addresses`, `Payments`, `AccountRole`  |
+> | `400` | `application/json` | `{code: 400, message: "Bad Request"}` |
+> | `401` | `application/json` | `{code: 401, message: "Unauthorized"}` |
+</details>
+
+---

backend/data/accountRoles.json

@@ -4,19 +4,29 @@
       "id": 0,
       "name": "Unregistered",
       "privilegeBuy": false,
-      "privilegeAdminPanel": false
+      "privilegeAdminPanel": false,
+      "privilegeFileAccess": false
     },
     {
       "id": 1,
       "name": "User",
       "privilegeBuy": true,
-      "privilegeAdminPanel": false
+      "privilegeAdminPanel": false,
+      "privilegeFileAccess": false
     },
     {
       "id": 2,
       "name": "Admin",
       "privilegeBuy": true,
-      "privilegeAdminPanel": true
+      "privilegeAdminPanel": true,
+      "privilegeFileAccess": false
+    },
+    {
+      "id": 3,
+      "name": "Super-Admin",
+      "privilegeBuy": true,
+      "privilegeAdminPanel": true,
+      "privilegeFileAccess": true
     }
   ]
 }

backend/data/accounts.json

@@ -19,7 +19,7 @@
           "iban": "DE92500105175721645777"
         }
       ],
-      "accountRoleId": 1
+      "accountRoleId": 2
     },
     {
       "username": "katjaStoiber",
@@ -94,7 +94,7 @@
           "iban": "DE41500105172184936679"
         }
       ],
-      "accountRoleId": 2
+      "accountRoleId": 3
     },
     {
       "username": "guitarhero",

backend/data/bands-concerts.json

@@ -78,25 +78,25 @@
               "location": "Swiss Life Hall"
             },
             {
-              "date": "8",
+              "date": "4",
               "price": 92,
               "inStock": 170,
               "location": "Swiss Life Hall"
             },
             {
-              "date": "12",
+              "date": "8",
               "price": 119.90,
               "inStock": 8736,
               "location": "Olympiahalle München"
             },
             {
-              "date": "19",
+              "date": "12",
               "price": 114.90,
               "inStock": 2793,
               "location": "Barclays Arena"
             },
             {
-              "date": "31",
+              "date": "13",
               "price": 124.90,
               "inStock": 3079,
               "location": "Uber Arena Berlin"
@@ -468,7 +468,7 @@
               "location": "ZAG Arena"
             },
             {
-              "date": "15",
+              "date": "6",
               "price": 84.90,
               "inStock": 192,
               "location": "Muffatwerk"
@@ -613,25 +613,25 @@
           "image": "concerts/will-of-the-people-tour.jpg",
           "concerts": [
             {
-              "date": "2",
+              "date": "32",
               "price": 67.90,
               "inStock": 847,
               "location": "ZAG Arena"
             },
             {
-              "date": "17",
+              "date": "39",
               "price": 67.90,
               "inStock": 847,
               "location": "ZAG Arena"
             },
             {
-              "date": "31",
+              "date": "41",
               "price": 64.90,
               "inStock": 245,
               "location": "Olympiastadion Berlin"
             },
             {
-              "date": "43",
+              "date": "45",
               "price": 64.90,
               "inStock": 245,
               "location": "Astra Kulturhaus"

backend/data/exercises.json

@@ -3,144 +3,120 @@
     {
       "nameDe": "Den Shop kennenlernen",
       "nameEn": "Getting to know the shop",
-      "icon": "mdi-human-greeting",
       "groupNr": 0,
       "descriptionDe": "Vor einem Angriff ist es wichtig zu verstehen, wie die Webseite aufgebaut ist. Wie sind die URLs strukturiert? Wo befinden sich Eingabefelder welche im Backend eine SQL Abfrage stellen?",
-      "descriptionEn": "Before an attack, it's important to understand how the website is structured. How are the URLs structured? Where are input fields located that execute SQL queries in the backend?",
+      "descriptionEn": "todo",
       "exercises": [
         {
-          "uuid": "getting-known-register",
           "nameDe": "Registrieren",
           "nameEn": "Register",
           "exerciseNr": 1,
           "descriptionDe": "Wir richten uns einen gewöhnlichen Account auf der Plattform ein. Navigiere hierzu auf die Account-Seite und registriere dich.",
-          "descriptionEn": "We'll set up a regular account on the platform. To do this, navigate to the account page and register."
+          "descriptionEn": "Create a new account in the online shop"
         },
         {
-          "uuid": "getting-known-profile",
           "nameDe": "Profil vervollständigen",
           "nameEn": "Complete profile",
           "exerciseNr": 2,
           "descriptionDe": "Bestellungen sind erst möglich, wenn das Account-Profil vervollständigt ist. Logge dich ein, navigiere zu den Account-Einstellungen, fülle den Namen aus und füge je eine Adresse und Bezahlart hinzu. Speichere alles zum Schluss ab.",
-          "descriptionEn": "Orders are only possible once your account profile is complete. Log in, navigate to your account settings, fill in your name, and add an address and payment method. Finally, save everything."
+          "descriptionEn": "Search for an event of choice and buy a ticket for"
         },
         {
-          "uuid": "getting-known-buy-ticket",
           "nameDe": "Ein Ticket kaufen",
           "nameEn": "Buy a ticket",
           "exerciseNr": 3,
           "descriptionDe": "Wir führen nun einen Bestellvorgang durch. Wähle hierzu ein Konzert deiner Wahl und lege Tickets in den Warenkorb. Öffne diesen und schließe die Bestellung ab. Beachte die Struktur der URL wenn du ein Konzert buchen willst. Sieh dir ruhig 2-3 Buchungsseiten an, wie sich die URL jeweils verändert.",
-          "descriptionEn": "We'll now complete the order process. Select a concert of your choice and add tickets to your shopping cart. Open the shopping cart and complete your order. Pay attention to the URL structure when booking a concert. Feel free to look at two or three booking pages to see how the URL changes each time."
+          "descriptionEn": "Search for an event of choice and buy a ticket for"
         }
       ]
     },
     {
       "nameDe": "Broken Access Control",
       "nameEn": "Broken Access Control",
-      "icon": "mdi-application-outline",
       "groupNr": 1,
       "descriptionDe": "Eine Webseite beinhaltet öffentlich einsehbare und einige geschützte Seiten. Letztere sind nur mit passenden Berechtigungen erreichbar. Beispiele hierfür sind ein Admin-Panel oder der persönliche Warenkorb. Der Zugriff wird oft über Cookies oder eine Authentifizierung an einem Backend-Server geregelt. Bei Broken Access Control ist dieser Sicherheits-Mechanismus nicht oder fehlerhaft implementiert. Somit lassen sich Seiten unberechtigterweise über die URL erreichen.",
-      "descriptionEn": "A website contains publicly visible pages and some protected pages. The latter can only be accessed with appropriate permissions. Examples include an admin panel or the personal shopping cart. Access is often controlled via cookies or authentication on a backend server. With broken access control, this security mechanism is either not implemented or is incorrectly implemented. This allows pages to be accessed without authorization via the URL.",
+      "descriptionEn": "todo",
       "exercises": [
         {
-          "uuid": "broken-access-control-exercise-page",
           "nameDe": "Hilfe-Seite aufrufen",
           "nameEn": "Access Help Page",
           "exerciseNr": 1,
           "descriptionDe": "Die Hilfe-Seite erlaubt dir einen Einblick auf den Bearbeitungszustand der Aufgaben. Sie ist dementsprechend nicht abgesichert, aber auch (noch) nicht in der Titel-Leiste als Button erreichbar. Erweitere die URL in der Adresszeile so, dass du auf die Hilfeseite gelangst.",
-          "descriptionEn": "The help page provides insight into the processing status of tasks. It's therefore not secure, but it's also not (yet) accessible as a button in the title bar. Expand the URL in the address bar to access the help page."
+          "descriptionEn": "Manipulate the URL and access the help page"
         },
         {
-          "uuid": "broken-access-control-hidden-concert",
           "nameDe": "Das versteckte Konzert buchen",
           "nameEn": "Book the hidden concert",
           "exerciseNr": 2,
           "descriptionDe": "Die Band >>Arctic Monkeys<< will auf ihrer >>European Tour<< drei Konzerte spielen. Im Shop finden sich allerdings nur zwei Einträge. Zwischen den beiden Tourdaten soll eine Show in der Lanxess Arena in Köln stattfinden, der Datensatz hierfür ist bereits angelegt, jedoch nicht freigeschaltet. Besuche die Seite der Band. Sieh dir den Zeitraum zwischen beiden Konzerten an, in denen das versteckte Event liegen könnte. Öffne eine Buchungsseite eines anderen Konzertes und ändere die URL so ab, dass du das versteckte Konzert buchen kannst. Reserviere dir mindestens ein Ticket und schließe den Bestellprozess ab.",
-          "descriptionEn": "The band >>Arctic Monkeys<< plans to play three shows on their >>European Tour<<. However, there are only two entries in the shop. A show at the Lanxess Arena in Cologne is scheduled to take place between the two tour dates. The dataset for this has already been created but is not yet activated. Visit the band's website. Look at the time period between the two concerts, where the hidden event could take place. Open a booking page for another concert and change the URL so that you can book the hidden concert. Reserve at least one ticket and complete the order process."
+          "descriptionEn": "Manipulate the URL and access the sold out concert and buy a ticket"
         }
       ]
     },
     {
       "nameDe": "SQL Injections",
       "nameEn": "SQL Injections",
-      "icon": "mdi-needle",
       "groupNr": 2,
       "descriptionDe": "Eine Datenbank arbeitet mit SQL Befehlen um Datensätze anzulegen, abzurufen, zu verändern und löschen. Ein Server wird über API-Schnittstellen angesprochen, führt die Befehle in der Datenbank aus und liefert das Ergebnis zurück. Der Client darf keinen direkten Zugriff auf die Datenbank haben. Bei SQL Injections wird versucht, diesen Sicherheitsmechanismus zu umgehen und über die API-Schnittstellen direkte SQL Befehle auszuführen.",
-      "descriptionEn": "A database uses SQL commands to create, retrieve, modify, and delete records. A server is accessed via API interfaces, executes the commands in the database, and returns the results. The client must not have direct access to the database. SQL injection attempts to circumvent this security mechanism and execute SQL commands directly via the API interfaces.",
+      "descriptionEn": "todo",
       "exercises": [
         {
-          "uuid": "sql-injection-database-scheme",
-          "nameDe": "Wie sieht die Datenbank aus?",
-          "nameEn": "How does the database look like?",
-          "exerciseNr": 1,
-          "descriptionDe": "Wir versuchen nun die Datenbank im Hintergrund anzugreifen. Aktuell wissen wir aber noch nicht wie die Datenbank aussieht, also welche Tabellen sie beinhaltet. Wir können uns aber mit einem SQL-Befehl ausgeben. Gehe zur globalen Suchseite. Öffne mit der Tastenkombination >>Strg<< + >>D<< die >>Developer Tools<<. Klicke auf den Reiter >>Network<<. Hier siehst du, wie das Frontend mit dem Server kommuniziert. Schreibe nun eine SQL-Injection, welche den Suchbegriff ignoriert und dir stattdessen alle Datensätze der Tabelle >>sqlite_master<< zurück gibt, sofern die Bedingung >>type='table'<< erfüllt ist. Kopiere dir bei erfolgreicher Rückmeldung des Backends die Namen der Tabellen in eine Text-Datei, damit wir für die kommenden Aufgaben die richtigen Namen der Tabellen angeben können.",
-          "descriptionEn": "We'll now attempt to attack the database in the background. Currently, we don't yet know what the database looks like, or which tables it contains. However, we can use an SQL command to inject it. Go to the global search page. Open the Developer Tools using the keyboard shortcut Ctrl + D. Click on the Network tab. Here you can see how the frontend communicates with the server. Now write an SQL injection that ignores the search term and instead returns all records in the sqlite_master table, provided the type='table' condition is met. If the backend responds successfully, copy the table names into a text file so that we can specify the correct table names for future tasks."
-        },
-        {
-          "uuid": "sql-injection-all-accounts",
           "nameDe": "Alle Accounts ausspähen",
           "nameEn": "Get all accounts",
-          "exerciseNr": 2,
+          "exerciseNr": 1,
-          "descriptionDe": "Schreibe nun eine SQL-Injection, welche den Suchbegriff ignoriert und dir stattdessen alle Datensätze der Account-Tabelle zurück liefert. Führe den Angriff über das Suchfeld aus. Sieh dir die Rückmeldung des Servers an.",
+          "descriptionDe": "Wir versuchen nun die Datenbank im Hintergrund anzugreifen. Gehe zur globalen Suchseite. Öffne mit der Tastenkombination >>Strg + D<< die >>Developer Tools<<. Klicke auf den Reiter >>Network<<. Hier siehst du, wie das Frontend mit dem Server kommuniziert. Schreibe nun eine SQL-Injection, welche den Suchbegriff ignoriert und dir stattdessen alle Datensätze der Tabelle >>Accounts<< zurück liefert. Führe den Angriff über das Suchfeld aus. Sieh dir die Rückmeldung des Servers an, indem du im >>Network<<-Tab auf die zurück gegebenen Objekte klickst (z.B. >>locations<<).",
-          "descriptionEn": "Now write an SQL injection that ignores the search term and instead returns all records in the account table. Execute the attack using the search field. Watch the server's response."
+          "descriptionEn": "Execute an SQL-Injection on the Search page to get all datasets from >>Accounts<< table."
         },
         {
-          "uuid": "sql-injection-account-roles",
           "nameDe": "Alle Berechtigungsgruppen ausspähen",
           "nameEn": "Get all account roles",
-          "exerciseNr": 3,
+          "exerciseNr": 2,
           "descriptionDe": "Wir sehen nun alle Accounts. Jeder hat eine Berechtigungs-ID (accountRoleId) mit der Berechtigungen wie der Zugriff aufs Admin-Panel geregelt werden. Wir wissen aber nicht, was die ID's bedeuten. Schreibe darum eine SQL-Injection, welche den Suchbegriff ignoriert und dir stattdessen alle Datensätze der Tabelle >>AccountRoles<< zurück liefert. Führe den Angriff über das Suchfeld aus. Beobachte die Rückmeldung des Servers über den >>Network<<-Tab.",
-          "descriptionEn": "We now see all the accounts. Each has an authorization ID (accountRoleId) that controls permissions such as access to the admin panel. However, we don't know what the IDs mean. Therefore, write an SQL injection that ignores the search term and instead returns all records in the >>AccountRoles<< table. Execute the attack via the search field. Observe the server's response via the >>Network<< tab."
+          "descriptionEn": "Execute an SQL-Injection on the Search page to get all datasets from >>AccountRoles<< table."
         },
         {
-          "uuid": "sql-injection-upgrade-privileges",
           "nameDe": "Eigene Berechtigungen erhöhen",
           "nameEn": "Upgrade your privileges",
-          "exerciseNr": 4,
+          "exerciseNr": 3,
           "descriptionDe": "Jetzt bearbeiten wir unseren eigenen Account. Schreibe hierfür einen >>UPDATE<<-SQL-Befehl, welcher die >>accountRoleId<< auf das Niveau eines >>Admin<< erhöht für deinen Account-Namen.",
-          "descriptionEn": "Now we'll edit our own account. To do this, write an >>UPDATE<< SQL command that elevates the >>accountRoleId<< to the level of >>Admin<< for your account name."
+          "descriptionEn": "Change the privileges of your account"
         },
         {
-          "uuid": "sql-injection-capture-account",
           "nameDe": "Einen fremden Account übernehmen",
           "nameEn": "Capture another account",
-          "exerciseNr": 5,
+          "exerciseNr": 4,
           "descriptionDe": "Statt unsere eigenen Berechtigungen zu erhöhen, können wir auch einen Account übernehmen, welcher bereits ein >>Super-Admin<< ist. Suche dir dafür aus der Liste der in Aufgabe 2.1 erhaltenen Accounts einen aus, welcher die Rolle >>Super-Admin<< inne hat. Nur damit lässt sich die Dateiverwaltung öffnen, welche wir später brauchen. Hast du den Account-Namen gefunden, gehe ins Login-Menü (logge dich aus, falls du noch angemeldet bist). Führe nun einen SQL-Injektion durch um diesen Account zu übernehmen.",
-          "descriptionEn": "Instead of increasing our own permissions, we can also take over an account that is already a >>super admin<<. To do this, select one from the list of accounts obtained in Task 2.1 that has the >>super admin<< role. Only then can we open the file manager, which we'll need later. Once you've found the account name, go to the login menu (log out if you're still logged in). Now perform an SQL injection to take over this account."
+          "descriptionEn": "todo"
         },
         {
-          "uuid": "sql-injection-delete-rating",
           "nameDe": "Bewertungen löschen",
           "nameEn": "Delete ratings",
-          "exerciseNr": 6,
+          "exerciseNr": 5,
-          "descriptionDe": "Jede Band hat Bewertungen auf einer Skala von eins bis fünf Sternen erhalten. Wir wollen alle Fünf-Sterne Bewertungen aus der Datenbank löschen. Schreibe eine SQL Injection, welche in der Bewertungs-Tabelle alle Einträge mit der Bedingung >>rating = 5<< entfernt. Führe die Injection über die globale Suche aus.",
+          "descriptionDe": "Jede Band hat Bewertungen auf einer Skala von eins bis fünf Sternen erhalten. Wir wollen alle Fünf-Sterne Bewertungen aus der Datenbank löschen. Schreibe eine SQL Injection, welche in der Tabelle >>Ratings<< alle Einträge mit der Bedingung >>rating = 5<< entfernt. Führe die Injection über die globale Suche aus.",
-          "descriptionEn": "Each band has received ratings on a scale of one to five stars. We want to delete all five-star ratings from the database. Write an SQL injection that removes all entries in the ratings table with the condition >>rating = 5<<. Execute the injection via the global search."
+          "descriptionEn": "todo"
         }
       ]
     },
     {
       "nameDe": "Cross-Site Scripting (XSS)",
       "nameEn": "Cross-Site Scripting (XSS)",
-      "icon": "mdi-code-brackets",
       "groupNr": 3,
       "descriptionDe": "Als nächstes wollen wir Schadcode in die Web-Applikation einschleusen. Zunächst testen wir, ob die Webseite hierfür anfällig ist. Manipuliere die URL der Band-Seite so, dass du eine >>Hallo Welt!<<-Nachricht als >>alert<< siehst. Hinweis: Nutze einen image tag! Setze als >>src<< die Zahl >>1<<. Den Befehl kannst du im Tag >>onerror<< ausführen.",
-      "descriptionEn": "Next, we want to inject malicious code into the web application. First, we'll test whether the website is vulnerable to this. Manipulate the URL of the band's page so that you see a >>Hello World!<< message as an >>alert<<. Note: Use an image tag! Set the number >>1<< as the >>src<<. You can execute the command in the >>onerror<< tag.",
+      "descriptionEn": "todo",
       "exercises": [
         {
-          "uuid": "cross-site-scripting-hello-world",
           "nameDe": "Hallo Welt!",
           "nameEn": "Hello World!",
           "exerciseNr": 1,
-          "descriptionDe": "Als nächstes wollen wir Schadcode in die Web-Applikation einschleusen. Zunächst testen wir, ob die Webseite hierfür anfällig ist. Gehe hierzu auf die Seite >>Alle Bands<< und filtere die Einträge nach einem beliebigen Genre deiner Wahl. In der URL-Leiste siehst du nun, dass hinter der URL und dem Ressourcen-Ziel ein Parameter angegeben ist (der Part hinter dem Fragezeichen). Wir tauschen diesen Parameter gegen einen HTML Tag aus. Der Trick hierbei: Als Quelle geben wir den Zahlenwert >>1<< an, wodurch automatisch das ausgeführt wird, was im >>onerror<<-Tag drinnen steht. Genau hier soll eine Alert-Meldung mit >>Hello World!<< als JavaScript Code eingefügt werden. Verändere die URL so, dass sie die Meldung ausgibt. Falls du nicht mit JavaScript vertraut bist, sieh dir die letzte Seite mit nützlichen Befehlen an.",
+          "descriptionDe": "Nimm dir eine URL des Shops und erweitere sie mit JavaScript Code so, dass beim Öffnen des Links eine 'Hallo Welt' Nachricht erscheint",
-          "descriptionEn": "Next, we want to inject malicious code into the web application. First, we'll test whether the website is vulnerable to malicious code. To do this, go to the >>All Bands<< page and filter the entries by any genre of your choice. In the URL bar, you'll now see that a parameter is specified after the URL and the resource target (the part after the question mark). We'll replace this parameter with an HTML tag. The trick here: We specify the numeric value >>1<< as the source, which automatically executes what's contained in the >>onerror<< tag. This is exactly where we want to insert an alert message with >>Hello World!<< as JavaScript code. Change the URL so that it displays the message. If you're not familiar with JavaScript, check out the last page for useful commands."
+          "descriptionEn": "Take an URL of the shop and extend it with JavaScript code so that a 'Hello World' message appears whent the link is opened"
         },
         {
-          "uuid": "cross-site-scripting-external-script",
           "nameDe": "Ein externes Script aufrufen",
           "nameEn": "Run an external script",
           "exerciseNr": 2,
-          "descriptionDe": "Wir haben festgestellt, dass die Seite für Cross-Site-Scripting durch Reflected XSS angreifbar ist! Im zweiten Schritt binden wir nun das Script ein. Es wurde bereits auf den Server hochgeladen. Logge dich wahlweise mit einem Admin-Account (Aufgabe 2.5) oder deinem eigenen nun berechtigten Account (Aufgabe 2.4) ein. Öffne nun das Admin-Panel über den Button rechts oben. Suche über die Dateiverwaltung im Admin-Panel nach dem Skript und notiere dir die darunter angezeigte Adresse auf dem Backend-Server. Logge dich aus. Wir wollen das Skript auf der nun sichtbaren Login-Seite über eine veränderte URL einbinden. Nutze hierfür das gleiche Prinzip wie in Aufgabe 3.1. Statt >>genreName<< kannst du einen beliebigen anderen Parameter-Namen verwenden. Nutze die Konsole mit der Tastenkombination Strg + D vor dem Abschicken der URL.Logge dich nach erfolgreicher Aufgabenlösung ein und sieh in der Konsole, wie deine Login-Daten abgegriffen werden.",
+          "descriptionDe": "Wir haben festgestellt, dass die Seite für Cross-Site-Scripting angreifbar ist! Im zweiten Schritt binden wir nun das Script ein. Es wurde bereits auf den Server hochgeladen. Suche über die Dateiverwaltung im Admin-Panel nach dem Skript. Kopiere dir die URL der Ressource heraus. Gehe zum Login und log dich aus. Füge einen beliebig benannten Query Parameter zur URL hinzu um das Skript zu laden. Nutze ein >>import<<-Statement um das Skript einzubinden. Logge dich nun ganz normal ein und sieh dir über die Konsole (Strg + D) an, wie deine Login-Daten abgegriffen werden. Hinweis: Wenn das Skript richtig eingebunden wurde, erscheint in der Konsole eine >>Active<<-Benachrichtigung. Da das >>import<<-Statement nur beim erstmaligen Laden der Seite genutzt wird, musst nach Eingabe der URL eventuell den Neu-Laden-Button neben der URL-Leiste betätigen.",
-          "descriptionEn": "We've determined that the page is vulnerable to cross-site scripting through Reflected XSS! In the second step, we'll integrate the script. It's already been uploaded to the server. Log in either with an admin account (Task 2.5) or your own, now authorized account (Task 2.4). Now open the admin panel using the button in the top right. Search for the script using the file manager in the admin panel and note the address displayed below it on the backend server. Log out. We want to integrate the script into the now visible login page using a modified URL. Use the same principle as in Task 3.1. Instead of >>genreName<<, you can use any other parameter name. Use the console by pressing Ctrl + D before submitting the URL. After successfully completing the task, log in and watch in the console how your login data is being retrieved."
+          "descriptionEn": "Create an URL of the shop, which calls the script"
         }
       ]
     }

backend/data/licenses.json

@@ -1,200 +0,0 @@
-[
-  {
-    "image": "alex-turner.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Raph_PH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/9/95/Alex_Turner%2C_Way_Out_West_2018.jpg"
-  },
-  {
-    "image": "andy-nicholson.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Lola's Big Adventure!",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/6c/Andy_Nicholson_%28cropped%29.jpg"
-  },
-  {
-    "image": "anthony-kiedis.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Hel Davies",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/c/ca/Anthony_Kiedis_2022.jpg"
-  },
-  {
-    "image": "chris-martin.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Raph_PH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/68/ChrisMartinManch030623_%28cropped%29.jpg"
-  },
-  {
-    "image": "chris-wolstenholme.jpg",
-    "license": "CC BY-SA 4.0",
-    "creator": "Markus Felix",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/e/eb/2018_Chris_Wolstenholme_%28cropped%29.jpg"
-  },
-  {
-    "image": "flea.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Piyush Kumar",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/8/8e/Flea_1012_%282%29.jpg"
-  },
-  {
-    "image": "chad-smith.jpg",
-    "license": "Gemeinfrei",
-    "creator": "Bojosoto",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/4/42/Chadsmithclinic.jpg"
-  },
-  {
-    "image": "john-frusciante.jpg",
-    "license": "CC BY-SA 2.0",
-    "creator": "Hel Davies",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/1/1f/John_Frusciante_%2852279466415%29.jpg"
-  },
-  {
-    "image": "logo.png",
-    "license": "MIT",
-    "creator": "Tobias Zoghaib",
-    "url": ""
-  },
-  {
-    "image": "lanxess-arena-indoor.jpg",
-    "license": "CC BY-SA 3.0",
-    "creator": "Admin Kübelbeck",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/f/f3/Koelnarena_inside.jpg"
-  },
-  {
-    "image": "lanxess-arena-outdoor.jpg",
-    "license": "CC BY-SA 2.0",
-    "creator": "Rolf H.",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/1/18/Lanxess_Arena_Flight_over_Cologne.jpg"
-  },
-  {
-    "image": "red-hot-chili-peppers-1.jpg",
-    "license": "CC BY-SA 4.0",
-    "creator": "Kreepin Deth",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/1/14/RHCP_Live_in_London_26_June_2022.jpg"
-  },
-  {
-    "image": "swiss-life-hall-indoor.jpg",
-    "license": "CC BY-SA 3.0",
-    "creator": "Bernd Schwabe in Hannover",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/8/89/2013-09-18_Besuch_14._Dalai_Lama_Tendzin_Gyatsho_in_Hannover%2C_future4children%2C_Swiss_Life_Hall%2C_%2876%29.JPG"
-  },
-  {
-    "image": "swiss-life-hall-outdoor.jpg",
-    "license": "Public Domain",
-    "creator": "AxelHH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/66/AWD_Hall_Seite.jpg"
-  },
-  {
-    "image": "astra-kulturhaus-outdoor.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Marcus Grbac",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/f/fd/Astra_Kulturhaus_Biergarten_RAW_Berlin_July_2017.jpg"
-  },
-  {
-    "image": "thom-yorke.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Raph_PH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/2/25/RadioheadMontreal170718-70_%2843600493681%29_%28cropped%29.jpg"
-  },
-  {
-    "image": "rami-jaffee.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Raph_PH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/f/fa/Rami_Jaffee_1.jpg"
-  },
-  {
-    "image": "philip-selway.jpg",
-    "license": "CC BY-SA 2.0",
-    "creator": "Michell Zappa",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/1/1f/Phil_Selway.jpg"
-  },
-  {
-    "image": "phil-harvey.jpg",
-    "license": "CC BY-SA 3.0",
-    "creator": "Hayley St. James",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/3/36/PhilHarveyNewYork17062021.png"
-  },
-  {
-    "image": "pat-smear.jpg",
-    "license": "GNU v.1.2",
-    "creator": "Andrew Burns",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/66/Patsmear.jpg"
-  },
-  {
-    "image": "mike-kerr.jpg",
-    "license": "CC BY 4.0",
-    "creator": "Dena Flows",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/8/85/017-BIME-2017-Royal-Blood-27X17-por-Dena-Flows.jpg"
-  },
-  {
-    "image": "matthew-bellamy.jpg",
-    "license": "CC BY 3.0",
-    "creator": "Minerva97",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/d/d0/2009_Matthew_Bellamy_%28cropped%29.jpg"
-  },
-  {
-    "image": "capitol-outside.jpg",
-    "license": "",
-    "creator": "AxelHH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/6c/Hannover_Capitol_ganz.jpg"
-  },
-  {
-    "image": "red-hot-chili-peppers-logo.png",
-    "license": "",
-    "creator": "Viiticus",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/3/31/Red_Hot_Chili_Peppers_logo.svg"
-  },
-  {
-    "image": "red-hot-chili-peppers-2.jpg",
-    "license": "CC BY-SA 4.0",
-    "creator": "Roberto Gianardi",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/64/Red_Hot_Chili_Peppers_Bologna_2016.jpg"
-  },
-  {
-    "image": "arctic-monkeys-1.jpg",
-    "license": "CC BY 3.0",
-    "creator": "Bill Ebbesen",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/0/04/Arctic_Monkeys_-_Orange_Stage_-_Roskilde_Festival_2014.jpg"
-  },
-  {
-    "image": "arctic-monkeys-2.jpg",
-    "license": "CC BY-SA 3.0",
-    "creator": "Kennysun",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/6/65/Arctic_Monkeys_Playing_at_MSG.jpg"
-  },
-  {
-    "image": "arctic-monkeys-3.jpg",
-    "license": "CC BY-SA 2.0",
-    "creator": "Aurelien Guichard",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/f/f8/Arctic_Monkeys_%40_Shepherds_Bush_Empire.jpg"
-  },
-  {
-    "image": "european-tour-arctic-monkeys.jpg",
-    "license": "Gemeinfrei",
-    "creator": "Matthew Cooper",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/e/e7/%22AM%22_%28Arctic_Monkeys%29.jpg"
-  },
-  {
-    "image": "billy-talent-1.jpg",
-    "license": "CC BY-SA 4.0",
-    "creator": "Biha",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/2/2b/Billy_Talent_-_Frequency_Festival_-_2017-08-15-21-51-04.jpg"
-  },
-  {
-    "image": "billy-talent-2.jpg",
-    "license": "CC BY-SA 4.0",
-    "creator": "Markus Maier",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/3/3f/Southside_Festival_-_Billy_Talent_-_DSC05306.jpg"
-  },
-  {
-    "image": "billy-talent-3.jpg",
-    "license": "CC BY-SA 2.0",
-    "creator": "sebi ryffel",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/e/ec/Billy_Talent_at_Rock_Am_See_2007.jpg"
-  },
-  {
-    "image": "coldplay-members.jpg",
-    "license": "CC BY 2.0",
-    "creator": "Raph_PH",
-    "url": "https://upload.wikimedia.org/wikipedia/commons/2/2e/ColdplayBBC071221_%28cropped%29.jpg"
-  }
-]

backend/data/orders.json

@@ -18,7 +18,7 @@
       "username": "duranduran",
       "tickets": [
         {
-          "date": "8",
+          "date": "4",
           "concertGroupName": "Unlimited Love",
           "orderPrice": 184,
           "seatGroup": "A",
@@ -26,7 +26,7 @@
           "seat": 2
         },
         {
-          "date": "8",
+          "date": "4",
           "concertGroupName": "Unlimited Love",
           "orderPrice": 184,
           "seatGroup": "A",

backend/models/exercises/exercise.model.ts

@@ -3,9 +3,6 @@ import { ExerciseGroup } from "./exerciseGroup.model";
 
 @Table({ timestamps: false })
 export class Exercise extends Model {
-  @Column
-  uuid: string
-
   @Column
   nameDe: string
 

backend/models/exercises/exerciseGroup.model.ts

@@ -9,9 +9,6 @@ export class ExerciseGroup extends Model {
   @Column
   nameEn: string
 
-  @Column
-  icon: string
-
   @Column
   groupNr: number
 

backend/models/user/accountRole.model.ts

@@ -12,6 +12,9 @@ export class AccountRole extends Model {
   @Column
   privilegeAdminPanel: boolean
 
+  @Column
+  privilegeFileAccess: boolean
+
 
   // Relations
   @HasMany(() => Account)

backend/routes/account.routes.ts

@@ -1,15 +1,10 @@
-/**
- * @swagger
- * tags:
- *   name: Account
- *   description: API to manage accounts
- */
 import { Router, Request, Response } from "express";
 import { Account } from "../models/user/account.model";
 import { validateString } from "../scripts/validateHelper";
 import { Address } from "../models/user/address.model";
 import { Payment } from "../models/user/payment.model";
 import { AccountRole } from "../models/user/accountRole.model";
+import { Exercise } from "../models/exercises/exercise.model";
 import { sequelize } from "../database";
 import jwt from "jsonwebtoken"
 import { verifyToken } from "../middlewares/auth.middleware";
@@ -17,41 +12,19 @@ import { encryptString } from "../scripts/encryptScripts";
 
 export const account = Router()
 
-/**
+account.get("/", (req: Request, res: Response) => {
- * @swagger
+  Account.findAll({
- * /accounts/login:
+    include: [ AccountRole ]
- *   get:
+  })
- *     summary: Start login process
+    .then(accounts => {
- *     tags: [Account]
+      res.status(200).json(accounts)
- *     parameters:
+    })
- *        - in: query
+})
- *          name: username
+
- *          schema:
+// Login user
- *            type: string
- *          required: true
- *          description: Username
- *        - in: query
- *          name: password
- *          schema:
- *            type: string
- *          required: true
- *          description: User password
- *     responses:
- *       200:
- *         description: Login successful
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/loginResponse'
- *       401:
- *         description: Wrong credentials
- *       500:
- *         description: Internal server error
- */
 account.get("/login", async (req: Request, res: Response) => {
   const encryptedPassword = encryptString(String(req.query.password))
 
-  try {
   // Using raw SQL code for SQL injections!
   const [results, metadata] = 
     await sequelize.query(
@@ -71,79 +44,29 @@ account.get("/login", async (req: Request, res: Response) => {
     })
   } else {
     // Status: 401 Unauthorized
-      res.status(401).send()
+    res.status(401).json({
-    }
+      code: 401, 
-  } catch (e) {
+      message: "Unauthorized"
-    res.status(500).send()
+    })
   }
 })
 
 
-/**
- * @swagger
- * /accounts/account:
- *   get:
- *     summary: Get all data about an user account
- *     tags: [Account]
- *     security:
- *       - JWT: []
- *     responses:
- *       200:
- *         description: Success
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/useraccount'
- *       401:
- *         description: Unauthorized
- *       500:
- *         description: Internal server error
- */
 account.get("/account", verifyToken, async(req: Request, res: Response) => {
   Account.findOne({
     where: {
       id: req["id"]
     },
-    include: [ Address, AccountRole, Payment ],
+    include: [ Address, AccountRole, Payment ]
-    attributes: {
-      exclude: [ "accountRoleId" ]
-    }
   })
     .then(account => {
       res.status(200).json(account)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 
-/**
+// Creating a new user
- * @swagger
+account.post("/", async (req: Request, res: Response) => {
- * /accounts/account:
- *   post:
- *     summary: Create a new user account
- *     tags: [Account]
- *     requestBody:
- *       description: Minimal user data body
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             $ref: '#/components/schemas/minimalAccount'
- *     responses:
- *       201:
- *         description: Created
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/useraccount'
- *       400:
- *         description: Username/password too short
- *       409:
- *         description: Username already in use
- */
-account.post("/account", async (req: Request, res: Response) => {
   // Check if username is valid
   if (!validateString(req.body.username, 4))
   {
@@ -162,10 +85,9 @@ account.post("/account", async (req: Request, res: Response) => {
       code: 400, 
       message: "Password too short!"
     })
-    return
   }
 
-  // User on creation gets User role
+  // Create account
   await AccountRole.findOne({
     where: {
       name: "User"
@@ -175,12 +97,11 @@ account.post("/account", async (req: Request, res: Response) => {
       req.body["accountRoleId"] = role.id
     })
 
-  // Create account
   Account.create(req.body)
     .then(account => {
       // Status: 201 Created
       res.status(201).json(account)
-    }).catch(error => {
+    }).catch(reason => {
       // Status: 409 Conflict
       res.status(409).json({
         code: 409,
@@ -189,56 +110,38 @@ account.post("/account", async (req: Request, res: Response) => {
     })
 })
 
-
+account.patch("/", verifyToken, (req: Request, res: Response) => {
-
-/**
- * @swagger
- * /accounts/account:
- *   patch:
- *     summary: Update an user accounts data
- *     tags: [Account]
- *     security:
- *       - JWT: []
- *     responses:
- *       200:
- *         description: Success
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/useraccount'
- *       401:
- *         description: Unauthorized
- *       500:
- *         description: Internal server error
- */
-account.patch("/account", verifyToken, (req: Request, res: Response) => {
   Account.update(req.body,
   {
     where: { id: req.body.id }
   })
     .then(async result => {
-      Payment.destroy({
-        where: {
-          accountId: req.body.id
-        }
-      })
-
-      Address.destroy({
-        where: {
-          accountId: req.body.id
-        }
-      })
-
       for (let payment of req.body.payments) {
+        if (payment.id == undefined) {
           payment["accountId"] = req.body.id
 
           await Payment.create(payment)
+        } else {
+          await Payment.update(payment,
+            {
+              where: { id: payment.id }
+            }
+          )
+        }
       }
 
       for (let address of req.body.addresses) {
+        if (address.id == undefined) {
           address["accountId"] = req.body.id
 
           await Address.create(address)
+        } else {
+          await Address.update(address,
+            {
+              where: { id: address.id }
+            }
+          )
+        }
       }
 
       // Status: 200 OK
@@ -254,31 +157,7 @@ account.patch("/account", verifyToken, (req: Request, res: Response) => {
   })
 })
 
-
+account.delete("/:id", (req: Request, res: Response) => {
-/**
- * @swagger
- * /accounts/account/{id}:
- *   delete:
- *     summary: Delete an user account
- *     tags: [Account]
- *     security:
- *       - JWT: []
- *     parameters:
- *        - in: path
- *          name: id
- *          schema:
- *            type: number
- *          required: true
- *          description: ID of user account
- *     responses:
- *       200:
- *         description: Success
- *       401:
- *         description: Unauthorized
- *       500:
- *         description: Internal server error
- */
-account.delete("/account/:id", verifyToken, (req: Request, res: Response) => {
   Account.destroy({
     where: {
       id: req.params.id
@@ -287,40 +166,4 @@ account.delete("/account/:id", verifyToken, (req: Request, res: Response) => {
     .then(account => {
       res.status(200).send()
     })
-    .catch(error => {
-      res.status(500).send()
-    })
-})
-
-
-/**
- * @swagger
- * /accounts/:
- *   get:
- *     summary: Request all user accounts
- *     tags: [Account]
- *     security:
- *       - JWT: []
- *     responses:
- *       200:
- *         description: Success
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/useraccount'
- *       401:
- *         description: Unauthorized
- *       500:
- *         description: Internal server error
- */
-account.get("/", verifyToken, (req: Request, res: Response) => {
-  Account.findAll({
-    include: [ AccountRole ]
-  })
-    .then(accounts => {
-      res.status(200).json(accounts)
-    })
-    .catch(error => {
-      res.status(500).send()
-    })
 })

backend/routes/api.routes.ts

@@ -1,38 +1,18 @@
-/**
- * @swagger
- * tags:
- *   name: Api
- *   description: Main API access point for misc events
- */
 import { Request, Response, NextFunction, Router } from 'express'
 import { deleteAllTables, deleteExerciseProgressTables, prepopulateDatabase, prepopulateExerciseDatabase } from '../scripts/databaseHelper'
 
 export const api = Router()
 
 /**
- * @swagger
+ * Status check endpoint
- * /api:
- *   get:
- *     summary: Status check endpoint
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Server is up and running
  */
 api.get("/", (req: Request, res: Response, next: NextFunction) => {
   res.status(200).send()
 })
 
 /**
- * @swagger
+ * Reset the whole database to factory state
- * /api/resetdatabase:
+ * Doesn't effect ExerciseTable and ExerciseGroupTable
- *   get:
- *     summary: Reset the database to factory state
- *     description: Doesn't effect ExerciseTable and ExerciseGroupTable
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Reset successful
  */
 api.get("/resetdatabase", async (req: Request, res: Response, next: NextFunction) => {
   // Step 1: Delete all data tables
@@ -46,15 +26,7 @@ api.get("/resetdatabase", async (req: Request, res: Response, next: NextFunction
 })
 
 /**
- * @swagger
+ * Reset ExerciseTable and ExerciseGroupTable to factory state
- * /api/resetExerciseProgress:
- *   get:
- *     summary: Reset exercises to factory state
- *     description: Reset ExerciseTable and ExerciseGroupTable to factory state
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Reset successful
  */
 api.get("/resetExerciseProgress", async (req: Request, res: Response, next: NextFunction) => {
   deleteExerciseProgressTables()

backend/routes/band.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Bands
- *   description: API to manage the bands
- */
 import { Member } from "../models/acts/member.model";
 import { Band } from "../models/acts/band.model";
 import { Request, Response, Router } from "express";
@@ -19,33 +13,7 @@ import { sequelize } from "../database";
 export const band = Router()
 
 /**
- * @swagger
+ * Get all bands
- * /bands:
- *   get:
- *     summary: Download all available bands
- *     tags: [Bands]
- *     parameters:
- *        - in: query
- *          name: sort
- *          schema:
- *            type: string
- *          required: false
- *          description: Sort bands by number of concerts ascending (asc) or descending (desc)
- *        - in: query
- *          name: count
- *          schema:
- *            type: number
- *          required: false
- *          description: Limit number of results
- *     responses:
- *       200:
- *         description: List of band objects
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/band'
- *       500:
- *         description: Internal server error
  */
 band.get("/", (req: Request, res: Response) => {
   let sort = req.query.sort
@@ -53,14 +21,16 @@ band.get("/", (req: Request, res: Response) => {
 
   Band.findAll({
     include: [
+      {
+        model: Rating,
+      },
       {
         model: Genre,
         attributes: {
           exclude: [ "id" ]
         }
       },
-      Concert,
+      Concert
-      Rating
     ]
   })
     .then(bands => {
@@ -95,9 +65,6 @@ band.get("/", (req: Request, res: Response) => {
 
       res.status(200).json(bands)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 /**
@@ -155,7 +122,7 @@ band.get("/band/:name", (req: Request, res: Response) => {
 
       res.status(200).json(band)
     })
-    .catch(error => {
+    .catch(e => {
       res.status(404).send()
     })
 })
@@ -170,13 +137,11 @@ band.get("/search", async (req: Request, res: Response) => {
 
   // On stacked prompts, execute last prompt
   if (prompts.length > 1) {
-    try {
+    console.log(prompts[prompts.length - 2])
     const [results, metadata] =
       await sequelize.query(prompts[prompts.length - 2])
+
     res.status(200).json(results)
-    } catch (e) {
-      res.status(400).send()
-    }
   } else {
       Band.findAll({
         where: {
@@ -189,9 +154,6 @@ band.get("/search", async (req: Request, res: Response) => {
         .then(bands => {
           res.status(200).json(bands)
         })
-        .catch(error => {
-          res.status(200).send()
-        })
   }
 })
 
@@ -208,9 +170,6 @@ band.patch("/", (req: Request, res: Response) => {
     .then(result => {
       res.status(200).json(result)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 
@@ -222,9 +181,6 @@ band.post("/", (req: Request, res: Response) => {
     .then(result => {
       res.status(200).json(result)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 /**

backend/routes/city.routes.ts

@@ -1,36 +1,11 @@
-/**
- * @swagger
- * tags:
- *   name: Cities
- *   description: API to manage the cities
- */
 import { City } from "../models/locations/city.model";
 import { Request, Response, Router } from "express";
 
 export const city = Router()
 
-/**
- * @swagger
- * /cities:
- *   get:
- *     summary: Download all cities
- *     tags: [Cities]
- *     responses:
- *       200:
- *         description: List of all cities as objects
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/city'
- *       500:
- *         description: Internal server error
- */
 city.get("/", (req: Request, res: Response) => {
   City.findAll()
     .then(cities => {
       res.status(200).json(cities)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })

backend/routes/concert.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Concerts
- *   description: API to manage the concerts
- */
 import { Location } from "../models/locations/location.model";
 import { Concert } from "../models/acts/concert.model";
 import { Request, Response, Router } from "express";
@@ -17,9 +11,39 @@ import { Op } from "sequelize";
 
 export const concert = Router()
 
-const concertStructure = [
+
+concert.get("/", (req: Request, res: Response) => {
+  let count = req.query.count
+
+  Concert.findAll({
+    include: [
       {
-    model: Band
+        model: Location,
+        include: [ City ]
+      },
+      Band
+    ],
+    order: [
+      [ 'date', 'ASC' ]
+    ]
+  })
+    .then(concerts => {
+      // Limit number of items
+      if (count != undefined) {
+        concerts.splice(Number(count))
+      }
+
+      res.status(200).json(concerts)
+    })
+})
+
+
+// Get all available data about a band by it's ID
+concert.get("/concert/:id", (req: Request, res: Response) => {
+  Concert.findByPk(req.params.id, {
+    include: [
+      {
+        model: Band,
       },
       {
         model: Location,
@@ -50,78 +74,11 @@ const concertStructure = [
           exclude: [ "cityId" ]
         }
       }
-]
+    ],
-
+    attributes: {
-
+      exclude: [ "locationId", "tourId" ]
-/**
- * @swagger
- * /concerts:
- *   get:
- *     summary: Get all available concerts
- *     tags: [Concerts]
- *     parameters:
- *        - in: query
- *          name: count
- *          schema:
- *            type: number
- *          required: false
- *          description: Limit number of results
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/concert'
- */
-concert.get("/", (req: Request, res: Response) => {
-  let count = req.query.count
-
-  Concert.findAll({
-    include: concertStructure,
-    order: [
-      [ 'date', 'ASC' ]
-    ]
-  })
-    .then(concerts => {
-      // Limit number of items
-      if (count != undefined) {
-        concerts.splice(Number(count))
     }
-
-      res.status(200).json(concerts)
   })
-    .catch(error => {
-      res.status(500).send()
-    })
-})
-
-
-/**
- * @swagger
- * /concerts/concert/{id}:
- *   get:
- *     summary: Download all available informations about a specific concert
- *     tags: [Concerts]
- *     parameters:
- *        - in: path
- *          name: id
- *          schema:
- *            type: number
- *          required: true
- *          description: ID of concert in database
- *     responses:
- *       200:
- *         description: Single concert object
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/concert'
- *       404:
- *         description: Not found
- */
-concert.get("/concert/:id", (req: Request, res: Response) => {
-  Concert.findByPk(req.params.id, { include: concertStructure })
     .then(concert => {
       concert.dataValues["capacity"] = 0
 
@@ -159,29 +116,7 @@ concert.get("/concert/:id", (req: Request, res: Response) => {
 })
 
 
-/**
+// Concert search
- * @swagger
- * /concerts/search:
- *   get:
- *     summary: Search for concerts
- *     tags: [Concerts]
- *     parameters:
- *        - in: query
- *          name: value
- *          schema:
- *            type: string
- *          required: true
- *          description: Search term
- *     responses:
- *       200:
- *         description: List of concert objects
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/concert'
- *       500:
- *         description: Internal server error
- */
 concert.get("/search", (req: Request, res: Response) => {
   Concert.findAll({
     where: {
@@ -219,7 +154,4 @@ concert.get("/search", (req: Request, res: Response) => {
     .then(concerts => {
       res.status(200).json(concerts)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })

backend/routes/exercise.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Exercises
- *   description: API to manage the exercise progress
- */
 import { Op } from "sequelize";
 import { Exercise } from "../models/exercises/exercise.model";
 import { ExerciseGroup } from "../models/exercises/exerciseGroup.model";
@@ -12,75 +6,26 @@ import { Request, Response, Router } from "express";
 export const exercises = Router()
 
 /**
- * @swagger
+ * Get all Exercises grouped in ExerciseGroups
- * /exercises:
- *   get:
- *     summary: Download all exercises
- *     tags: [Exercises]
- *     responses:
- *       200:
- *         description: Array of all exercises
- *         type: array
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/exercise'
- *       500:
- *         description: Internal server error
  */
 exercises.get("/", (req: Request, res: Response) => {
   Exercise.findAll({
-    include: [ ExerciseGroup ],
+    include: [ ExerciseGroup ]
-    attributes: {
+  }).then(result => {
-      exclude: [ "exerciseGroupId" ]
-    }
-  })
-    .then(result => {
     result.sort((a, b) => {
       return (a.dataValues.exerciseGroup.dataValues.groupNr * 10 + a.dataValues.exerciseNr) > (b.dataValues.exerciseGroup.dataValues.groupNr * 10 + b.dataValues.exerciseNr) ? 1 : -1
     })
 
     res.status(200).json(result)
   })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 /**
- * @swagger
+ * Update state of an Exercise
- * /exercises/{groupNr}/{exerciseNr}/{state}:
+ * 
- *   post:
+ * @param groupNr Number of exercise group (not ID)
- *     summary: Update an exercise solved state
+ * @param exerciseNr Number of exercise (not ID)
- *     tags: [Exercises]
+ * @param state New state boolean
- *     parameters:
- *        - in: path
- *          name: groupNr
- *          schema:
- *            type: number
- *          required: true
- *          description: Number of exercise group (not ID)
- *        - in: path
- *          name: exerciseNr
- *          schema:
- *            type: number
- *          required: true
- *          description: Number of exercise (not ID)
- *        - in: path
- *          name: state
- *          schema:
- *            type: number
- *          required: true
- *          description: 1 = Solved, 0 = Unsolved
- *     responses:
- *       200:
- *         description: Edited exercise
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/exercise'
- *       500:
- *         description: Internal server error
  */
 exercises.post("/:groupNr/:exerciseNr/:state", (req: Request, res: Response) => {
   Exercise.findOne({
@@ -94,10 +39,7 @@ exercises.post("/:groupNr/:exerciseNr/:state", (req: Request, res: Response) =>
         }
       ]
     },
-    include: [ ExerciseGroup ],
+    include: [ ExerciseGroup ]
-    attributes: {
-      exclude: [ "exerciseGroupId" ]
-    }
   })
     .then(async exercise => {
       let changed = false
@@ -112,7 +54,21 @@ exercises.post("/:groupNr/:exerciseNr/:state", (req: Request, res: Response) =>
           changed: changed
         })
     })
-    .catch(error => {
+
-      res.status(500).send()
+
-    })
+  // ExerciseGroup.findOne({
+  //   where: { groupNr: req.params.groupNr }
+  // })
+  //   .then(group => {
+  //     Exercise.findOne({
+  //       where: {
+  //         exerciseNr: req.params.exerciseNr,
+  //         exerciseGroupId: group.id
+  //       }
+  //     })
+  //       .then(exercise => {
+  //         exercise.update({ solved: req.params.state == "1"})
+  //         res.status(200).send()
+  //       })
+  //   })
 })

backend/routes/files.routes.ts

@@ -1,40 +1,21 @@
-/**
- * @swagger
- * tags:
- *   name: Files
- *   description: API for handling static files
- */
 import { Request, Response, NextFunction, Router } from 'express'
 import fs from "fs"
 import multer from "multer"
 const upload = multer({ dest: './backend/images/' })
-import licenses from "../data/licenses.json"
-import path from 'path'
 
 export const files = Router()
 
 /**
- * @swagger
+ * Get all folders
- * /files/folders:
- *   get:
- *     summary: Get all static folders
- *     tags: [Files]
- *     responses:
- *       200:
- *         description: Login successful
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/folder'
  */
 files.get("/folders", async (req: Request, res: Response) => {
-  let dirNames = fs.readdirSync(path.resolve(__dirname, "../images"))
+  let dirNames = fs.readdirSync("./backend/images")
   let result = []
 
   dirNames.forEach(dir => {
     result.push({
       name: dir,
-      nrOfItems: fs.readdirSync(path.resolve(__dirname, "../images/" + dir)).length
+      nrOfItems: fs.readdirSync("./backend/images/" + dir).length
     })
   })
 
@@ -43,52 +24,25 @@ files.get("/folders", async (req: Request, res: Response) => {
 
 
 /**
- * @swagger
+ * Get all uploaded file names by file name
- * /files/{folder}:
- *   get:
- *     summary: Get all files in one folder
- *     tags: [Files]
- *     parameters:
- *        - in: path
- *          name: folder
- *          schema:
- *            type: string
- *          required: true
- *          description: Name of folder
- *     responses:
- *       200:
- *         description: Login successful
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/file'
  */
 files.get("/:folder", async (req: Request, res: Response) => {
   let result = []
-  let fileNames = fs.readdirSync(path.resolve(__dirname, "../images/" + req.params.folder))
+  let fileNames = fs.readdirSync("./backend/images/" + req.params.folder + "/")
+
 
-  try {
   fileNames.forEach(file => {
-      let resData = ""
+    let resData = fs.readFileSync("./backend/images/" + req.params.folder + "/" + file, "utf8")
-      let url = "http://localhost:3000/static/" + req.params.folder + "/" + file
-
-      if (file.endsWith("html") || file.endsWith("js")) {
-        resData = fs.readFileSync(path.resolve(__dirname, "../images/" + req.params.folder + "/" + file), "utf8")
-      }
 
     result.push({
       name: file,
-        size: fs.statSync(path.resolve(__dirname, "../images/" + req.params.folder + "/" + file)).size,
+      size: fs.statSync("./backend/images/" + req.params.folder + "/" + file).size,
       content: resData,
-        url: url,
+      url: "http://localhost:3000/static/" + req.params.folder + "/" + file
-        copyright: licenses.find(data => data.image == file)
     })
   })
 
   res.status(200).json(result)
-  } catch (error) {
-    res.status(400).json(error)
-  }
 })
 
 
@@ -96,5 +50,7 @@ files.get("/:folder", async (req: Request, res: Response) => {
  * Upload a file
  */
 files.post("/", upload.single("file"), function (req: Request, res: Response, next: NextFunction) {
+  console.log(req.file)
+
   res.status(200).send()
 })

backend/routes/genre.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Genres
- *   description: API to manage the music genres
- */
 import { Band } from "../models/acts/band.model";
 import { Genre } from "../models/acts/genre.model";
 import { Request, Response, Router } from "express";
@@ -11,20 +5,7 @@ import { Request, Response, Router } from "express";
 export const genre = Router()
 
 /**
- * @swagger
+ * Get all available Genres
- * /genres:
- *   get:
- *     summary: Get all available genres
- *     tags: [Genres]
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/genre'
- *       500:
- *         description: Internal Server Error
  */
 genre.get("/", (req: Request, res: Response) => {
   Genre.findAll({
@@ -38,22 +19,8 @@ genre.get("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
+ * Update a Genre entry
- * /genres:
- *   patch:
- *     summary: Update the dataset of a genre
- *     tags: [Genres]
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/genre'
- *       500:
- *         description: Internal Server Error
  */
 genre.patch("/", (req: Request, res: Response) => {
   Genre.update(req.body, {
@@ -69,22 +36,8 @@ genre.patch("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
+ * Create a new Genre entry
- * /genres:
- *   post:
- *     summary: Add a new dataset of a genre
- *     tags: [Genres]
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/genre'
- *       500:
- *         description: Internal Server Error
  */
 genre.post("/", (req: Request, res: Response) => {
   Genre.create(req.body)
@@ -96,22 +49,8 @@ genre.post("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
+ * Delete a Genre entry
- * /genres:
- *   delete:
- *     summary: Delete the dataset of a genre
- *     tags: [Genres]
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/genre'
- *       500:
- *         description: Internal Server Error
  */
 genre.delete("/", (req: Request, res: Response) => {
   Genre.destroy({

backend/routes/location.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Locations
- *   description: API to manage the event locations
- */
 import { Concert } from "../models/acts/concert.model";
 import { City } from "../models/locations/city.model";
 import { Location } from "../models/locations/location.model";
@@ -16,57 +10,24 @@ import { Op } from "sequelize";
 
 export const location = Router()
 
-// Response include rules
-const locationStructure = [
-  City,
-  {
-    model: Concert,
-    include: [ Band ]
-  },
-  {
-    model: SeatGroup,
-    include: [
-      {
-        model: SeatRow,
-        include: [ Seat ]
-      }
-    ]
-  }
-]
-
 /**
- * @swagger
+ * Get all available Locations
- * /locations:
+ * 
- *   get:
+ * @query sort    Sort results ascending (asc) or descending (desc)
- *     summary: Get all available locations
+ * @query count   Limit number of results
- *     tags: [Locations]
- *     parameters:
- *        - in: query
- *          name: sort
- *          schema:
- *            type: string
- *          required: false
- *          description: Sort locations by number of concerts ascending (asc) or descending (desc)
- *        - in: query
- *          name: count
- *          schema:
- *            type: number
- *          required: false
- *          description: Limit number of results
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/location'
  */
 location.get("/", (req: Request, res: Response) => {
   let sort = req.query.sort
   let count = req.query.count
 
   Location.findAll({
-    include: locationStructure,
+    include: [
+      City, 
+      {
+        model: Concert,
+        include: [ Band ],
+      }
+    ],
     attributes: {
       exclude: [ "cityId" ]
     }
@@ -99,32 +60,29 @@ location.get("/", (req: Request, res: Response) => {
 
 
 /**
- * @swagger
+ * Get all data about a specific location
- * /locations/{urlName}:
+ * 
- *   get:
+ * @param urlName   UrlName of the band (e.g. Red Hot Chili Peppers => red-hot-chili-peppers)
- *     summary: Download all available informations about a specific locations
- *     tags: [Locations]
- *     parameters:
- *        - in: path
- *          name: urlName
- *          schema:
- *            type: string
- *          required: true
- *          description: Url name of the location to request for
- *     responses:
- *       200:
- *         description: Single of location objects
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/location'
- *       500:
- *         description: Internal server error
  */
 location.get("/location/:urlName", (req: Request, res: Response) => {
   Location.findOne({
     where: { urlName: req.params.urlName },
-    include: locationStructure,
+    include: [
+      City, 
+      {
+        model: Concert,
+        include: [ Band ],
+      },
+      {
+        model: SeatGroup,
+        include: [
+          {
+            model: SeatRow,
+            include: [ Seat ]
+          }
+        ]
+      }
+    ],
     attributes: {
       exclude: [ "cityId" ]
     }
@@ -140,34 +98,16 @@ location.get("/location/:urlName", (req: Request, res: Response) => {
 
       res.status(200).json(location)
     })
-    .catch(error => {
+    .catch(e => {
       res.status(404).send()
     })
 })
 
 
 /**
- * @swagger
+ * Search for Locations
- * /locations/search:
+ * 
- *   get:
+ * @query value     Search term to look for
- *     summary: Search for locations
- *     tags: [Locations]
- *     parameters:
- *        - in: query
- *          name: value
- *          schema:
- *            type: string
- *          required: true
- *          description: Search term
- *     responses:
- *       200:
- *         description: List of band objects
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/location'
- *       500:
- *         description: Internal server error
  */
 location.get("/search", (req: Request, res: Response) => {
   Location.findAll({
@@ -188,12 +128,9 @@ location.get("/search", (req: Request, res: Response) => {
         }
       ]
     },
-    include: locationStructure
+    include: [ City, Concert ]
   })
     .then(locations => {
       res.status(200).json(locations)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })

backend/routes/order.routes.ts

@@ -1,9 +1,3 @@
-/**
- * @swagger
- * tags:
- *   name: Orders
- *   description: API to manage orders
- */
 import { Router, Request, Response } from "express";
 import { Order } from "../models/ordering/order.model";
 import { Concert } from "../models/acts/concert.model";
@@ -16,41 +10,17 @@ import { City } from "../models/locations/city.model";
 import { Seat } from "../models/locations/seat.model";
 import { SeatRow } from "../models/locations/seatRow.model";
 import { SeatGroup } from "../models/locations/seatGroup.model";
-import { verifyToken } from "../middlewares/auth.middleware";
 import { Account } from "../models/user/account.model";
+import { Exercise } from "backend/models/exercises/exercise.model";
 
 export const order = Router()
 
-/**
+// Get all orders
- * @swagger
+order.get("/", (req: Request, res: Response) => {
- * /orders:
- *   get:
- *     summary: Get orders of an account or all available
- *     tags: [Orders]
- *     security:
- *        - JWT: []
- *     parameters:
- *        - in: query
- *          name: id
- *          schema:
- *            type: string
- *          required: false
- *          description: User account id to filter the orders
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/order'
- *       500:
- *         description: Internal server error
- */
-order.get("/", verifyToken, (req: Request, res: Response) => {
-  const accountId = req.query.id
-
   Order.findAll({
     include: [
+      Account,
+      Address,
       {
         model: Ticket,
         include: [
@@ -65,6 +35,42 @@ order.get("/", verifyToken, (req: Request, res: Response) => {
                 include: [ City ]
               }
             ]
+          }
+        ]
+      }
+    ]
+  })
+    .then(orders => {
+      res.status(200).json(orders)
+    })
+})
+
+
+// Get all orders of one account by it's user id
+order.get("/:id", (req: Request, res: Response) => {
+  Order.findAll({
+    where: { accountId: req.params.id },
+    include: [
+      { 
+        model: Ticket, 
+        include: [ 
+          { 
+            model: Concert,
+            include: [
+              {
+                model: Band
+              },
+              {
+                model: Location,
+                include: [ City ]
+              }
+            ],
+            attributes: {
+              exclude: [
+                "categoryId",
+                "brandId"
+              ]
+            }
           },
           {
             model: Seat,
@@ -77,58 +83,17 @@ order.get("/", verifyToken, (req: Request, res: Response) => {
           }
         ]
       },
-      Address,
       Payment,
-      Account,
+      Address
-    ],
+    ]
-    attributes: {
-      exclude: [ "accountId", "addressId", "paymentId" ]
-    }
   })
     .then(orders => {
-      if (accountId != undefined) {
-        let filteredOrders = orders.filter(order => {
-          return order.id == accountId
-        })
-
-        res.status(200).json(filteredOrders)
-      } else {
       res.status(200).json(orders)
-      }
-    })
-    .catch(error => {
-      res.status(500).send()
     })
 })
 
-/**
+// Place a new order
- * @swagger
+order.post("/", (req: Request, res: Response) => {
- * /orders:
- *   post:
- *     summary: Place a new order
- *     tags: [Orders]
- *     security:
- *        - JWT: []
- *     parameters:
- *        - in: query
- *          name: id
- *          schema:
- *            type: string
- *          required: false
- *          description: User account id to filter the orders
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/order'
- *       500:
- *         description: Internal server error
- */
-order.post("/", verifyToken, (req: Request, res: Response) => {
-  req.body["accountId"] = req["id"]
-
   Order.create(req.body)
     .then(async order => {
       for (let ticket of req.body.tickets) {
@@ -151,45 +116,4 @@ order.post("/", verifyToken, (req: Request, res: Response) => {
       // Created
       res.status(201).json(order)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
-})
-
-
-/**
- * @swagger
- * /orders:
- *   patch:
- *     summary: Update an order
- *     tags: [Orders]
- *     parameters:
- *        - in: body
- *          name: order
- *          schema:
- *            type: object
- *          required: true
- *          description: Updated order object
- *     responses:
- *       200:
- *         description: OK
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/order'
- *       500:
- *         description: Internal server error
- */
-order.patch("/", (req: Request, res: Response) => {
-  Order.update(req.body, {
-    where: {
-      id: req.body.id
-    }
-  })
-    .then(affectedCount => {
-      res.status(200).send()
-    })
-    .catch(error => {
-      res.status(500).send()
-    })
 })

backend/server.ts

@@ -1,8 +1,6 @@
 import express from 'express'
 import cors from 'cors'
 import bodyParser from 'body-parser'
-import swaggerJsdoc from "swagger-jsdoc"
-import swaggerUi from "swagger-ui-express"
 import { api } from './routes/api.routes'
 import { startDatabase } from './database'
 import { order } from './routes/order.routes'
@@ -14,7 +12,6 @@ import { location } from './routes/location.routes'
 import { city } from './routes/city.routes'
 import { exercises } from './routes/exercise.routes'
 import { files } from './routes/files.routes'
-import swaggerFile from './swagger.json'
 
 const app = express()
 const port = 3000
@@ -32,7 +29,6 @@ startDatabase()
 const path = require('path')
 app.use('/static', express.static(path.join(__dirname, 'images')))
 app.use("/exercises", exercises)
-app.use("/files", files)
 
 // Add delay for more realistic response times
 app.use((req, res, next) => {
@@ -48,17 +44,7 @@ app.use("/orders", order)
 app.use("/accounts", account)
 app.use("/cities", city)
 app.use("/concerts", concert)
-
+app.use("/files", files)
-
-// Swagger API documentation
-const specs = swaggerJsdoc(swaggerFile);
-
-app.use(
-  "/api-docs",
-  swaggerUi.serve, 
-  swaggerUi.setup(specs, { explorer: true })
-)
-
 
 // Start server
 const server = app.listen(port, () => {

backend/swagger.json

@@ -1,796 +0,0 @@
-{
-  "swagger": "2.0",
-  "definition": {
-    "openapi": "3.1.0",
-    "info": {
-      "title": "EventMaster API",
-      "version": "0.2.0",
-      "description": "Dokumentation über alle API-Endpunkte des Backends",
-      "license": {
-        "name": "MIT",
-        "url": "https://spdx.org/licenses/MIT.html"
-      }
-    },
-    "servers": [
-      {
-        "url": "http://localhost:3000"
-      }
-    ],
-    "components": {
-      "securitySchemes": {
-        "JWT": {
-          "type": "apiKey",
-          "in": "header",
-          "name": "Json Web Token"
-        }
-      },
-      "schemas": {
-        "city": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "name": {
-              "type": "string",
-              "description": "Name of the city"
-            },
-            "country": {
-              "type": "string",
-              "description": "Name of country of the city"
-            }
-          },
-          "example": {
-            "id": 2,
-            "name": "Hannover",
-            "country": "Germany"
-          }
-        },
-        "loginResponse": {
-          "type": "object",
-          "properties": {
-            "success": {
-              "type": "boolean",
-              "description": "Login successful state"
-            },
-            "token": {
-              "type": "string",
-              "description": "Individual created access token"
-            }
-          },
-          "example": {
-            "success": true,
-            "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjI2MiwiaWF0IjoxNzMzNzYwOTY3fQ.I3rR71c-k2Y2WB0dkd1QEgHxsIRGl4s69YprBNuhX7w"
-          }
-        },
-        "minimalAccount": {
-          "type": "object",
-          "properties": {
-            "username": {
-              "type": "string",
-              "description": "Account username"
-            },
-            "password": {
-              "type": "string",
-              "description": "Encrypted password"
-            },
-            "email": {
-              "type": "string",
-              "description": "E-Mail address of user"
-            }
-          },
-          "example": {
-            "username": "maxmustermann",
-            "password": "supersecret",
-            "email": "tijjji@didjhli.de"
-          }
-        },
-        "minimalAccountResponse": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "username": {
-              "type": "string",
-              "description": "Account username"
-            },
-            "password": {
-              "type": "string",
-              "description": "Encrypted password"
-            },
-            "email": {
-              "type": "string",
-              "description": "E-Mail address of user"
-            },
-            "accountRoleId": {
-              "type": "number",
-              "description": "ID of account role"
-            }
-          },
-          "example": {
-            "id": 263,
-            "username": "maxmustermann",
-            "password": "8746fb88adbae61ffa68193ee0bb8050",
-            "email": "tijjji@didjhli.de",
-            "accountRoleId": 1
-          }
-        },
-        "placeOrderBody": {
-          "type": "object",
-          "properties": {
-            "username": {
-              "type": "string",
-              "description": "Account username"
-            },
-            "password": {
-              "type": "string",
-              "description": "Encrypted password"
-            },
-            "email": {
-              "type": "string",
-              "description": "E-Mail address of user"
-            },
-            "accountRoleId": {
-              "type": "number",
-              "description": "ID of account role"
-            }
-          },
-          "example": {
-            "id": 263,
-            "username": "maxmustermann",
-            "password": "8746fb88adbae61ffa68193ee0bb8050",
-            "email": "tijjji@didjhli.de",
-            "accountRoleId": 1
-          }
-        },
-        "genre": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "name": {
-              "type": "string",
-              "description": "Name of the genre"
-            },
-            "bands": {
-              "type": "object",
-              "description": "Bands with this genre object"
-            }
-          },
-          "example": [
-            {
-              "id": 562,
-              "name": "Funk Rock",
-              "bands": [
-                {
-                  "images": [
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-                  ],
-                  "id": 265,
-                  "name": "Red Hot Chili Peppers",
-                  "foundingYear": 1983,
-                  "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-                  "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-                  "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-                  "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png",
-                  "BandGenre": {
-                    "id": 793,
-                    "genreId": 562,
-                    "bandId": 265
-                  }
-                }
-              ]
-            },
-            {
-              "id": 563,
-              "name": "Alternative Rock",
-              "bands": [
-                {
-                  "images": [
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-                    "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-                  ],
-                  "id": 265,
-                  "name": "Red Hot Chili Peppers",
-                  "foundingYear": 1983,
-                  "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-                  "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-                  "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-                  "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png",
-                  "BandGenre": {
-                    "id": 794,
-                    "genreId": 563,
-                    "bandId": 265
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        "location": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "name": {
-              "type": "string",
-              "description": "Name of the genre"
-            },
-            "bands": {
-              "type": "object",
-              "description": "Bands with this genre object"
-            }
-          },
-          "example": {
-            "id": 562,
-            "name": "Funk Rock",
-            "bands": [
-              {
-                "images": [
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-                ],
-                "id": 265,
-                "name": "Red Hot Chili Peppers",
-                "foundingYear": 1983,
-                "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-                "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-                "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-                "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png",
-                "BandGenre": {
-                  "id": 793,
-                  "genreId": 562,
-                  "bandId": 265
-                }
-              }
-            ]
-          }
-        },
-        "order": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "orderedAt": {
-              "type": "string",
-              "description": "Timestamp of order"
-            },
-            "tickets": {
-              "type": "array",
-              "description": "Array of Ticket objects"
-            },
-            "addresses": {
-              "type": "object",
-              "description": "Address object"
-            },
-            "payment": {
-              "type": "object",
-              "description": "Payment object"
-            },
-            "account": {
-              "type": "object",
-              "description": "Account object"
-            }
-          },
-          "example": {
-            "id": 112,
-            "orderedAt": "2024-11-29T12:38:36.381Z",
-            "shipped": false,
-            "tickets": [
-              {
-                "id": 144,
-                "orderId": 112,
-                "orderPrice": 184,
-                "concertId": 892,
-                "seatId": 106331,
-                "concert": {
-                  "id": 892,
-                  "date": "2024-11-30",
-                  "name": "Unlimited Love",
-                  "price": 92,
-                  "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                  "inStock": 170,
-                  "offered": true,
-                  "bandId": 265,
-                  "locationId": 834,
-                  "band": {
-                    "images": [
-                      "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-                      "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-                      "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-                      "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-                    ],
-                    "id": 265,
-                    "name": "Red Hot Chili Peppers",
-                    "foundingYear": 1983,
-                    "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-                    "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-                    "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-                    "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png"
-                  },
-                  "location": {
-                    "id": 834,
-                    "urlName": "swiss-life-hall",
-                    "name": "Swiss Life Hall",
-                    "address": "Ferdinand-Wilhelm-Fricke-Weg 8",
-                    "cityId": 246,
-                    "imageIndoor": "http://localhost:3000/static/locations/swiss-life-hall-indoor.jpg",
-                    "imageOutdoor": "http://localhost:3000/static/locations/swiss-life-hall-outdoor.jpg",
-                    "layout": 2,
-                    "capacity": 180,
-                    "city": {
-                      "id": 246,
-                      "name": "Hannover",
-                      "country": "Germany"
-                    }
-                  }
-                },
-                "seat": {
-                  "id": 106331,
-                  "seatNr": 1,
-                  "seatRowId": 14701,
-                  "seatRow": {
-                    "id": 14701,
-                    "row": 0,
-                    "seatGroupId": 3872,
-                    "seatGroup": {
-                      "id": 3872,
-                      "name": "A",
-                      "surcharge": 30,
-                      "capacity": 40,
-                      "standingArea": true,
-                      "locationId": 834
-                    }
-                  }
-                }
-              }
-            ],
-            "address": {
-              "id": 342,
-              "accountId": 255,
-              "street": "Laportestraße",
-              "houseNumber": 22,
-              "postalCode": 30449,
-              "city": "Hannover"
-            },
-            "payment": {
-              "id": 247,
-              "accountId": 255,
-              "bankName": "Deutsche Bank",
-              "iban": "DE92500105175721645777"
-            },
-            "account": {
-              "id": 255,
-              "username": "hagemeister93",
-              "password": "e1e3981e5b0c009c018c5726a4be5eee",
-              "email": "hagemeister93@gmail.com",
-              "firstName": "Laurin",
-              "lastName": "Hagemeister",
-              "accountRoleId": 1
-            }
-          }
-        },
-        "useraccount": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "username": {
-              "type": "string",
-              "description": "Account username"
-            },
-            "password": {
-              "type": "string",
-              "description": "Encrypted password"
-            },
-            "email": {
-              "type": "string",
-              "description": "E-Mail address of user"
-            },
-            "firstName": {
-              "type": "string",
-              "description": "First name of user"
-            },
-            "lastName": {
-              "type": "string",
-              "description": "Last name of user"
-            },
-            "addresses": {
-              "type": "array",
-              "description": "Array of Address objects"
-            },
-            "accountRole": {
-              "type": "object",
-              "description": "Account role object"
-            },
-            "payments": {
-              "type": "array",
-              "description": "Array of Payments objects"
-            }
-          },
-          "example": {
-            "id": 262,
-            "username": "max",
-            "password": "06f7a5f329fed099ad36026f9623e6ce",
-            "email": "titi@didi.de",
-            "firstName": "Max",
-            "lastName": "Mustermann",
-            "accountRoleId": 1,
-            "addresses": [
-              {
-                "id": 352,
-                "accountId": 262,
-                "street": "Musterstraße",
-                "houseNumber": 21,
-                "postalCode": 30167,
-                "city": "Hannover"
-              }
-            ],
-            "accountRole": {
-              "id": 1,
-              "name": "User",
-              "privilegeBuy": true,
-              "privilegeAdminPanel": false
-            },
-            "payments": [
-              {
-                "id": 254,
-                "accountId": 262,
-                "bankName": "Deutsche Bank",
-                "iban": "DE293948484738383829"
-              }
-            ]
-          }
-        },
-        "exercise": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "nameDe": {
-              "type": "string",
-              "description": "German exercise name"
-            },
-            "nameEn": {
-              "type": "string",
-              "description": "English exercise name"
-            },
-            "exerciseNr": {
-              "type": "number",
-              "description": "Number of exercise in group"
-            },
-            "descriptionDe": {
-              "type": "string",
-              "description": "German description text"
-            },
-            "descriptionEn": {
-              "type": "string",
-              "description": "English description text"
-            },
-            "solved": {
-              "type": "boolean",
-              "description": "State of solved"
-            },
-            "exerciseGroup": {
-              "type": "object",
-              "description": "Exercise group object"
-            }
-          },
-          "example": {
-            "id": 350,
-            "nameDe": "Registrieren",
-            "nameEn": "Register",
-            "exerciseNr": 1,
-            "descriptionDe": "Wir richten uns einen gewöhnlichen Account auf der Plattform ein. Navigiere hierzu auf die Account-Seite und registriere dich.",
-            "descriptionEn": "Create a new account in the online shop",
-            "solved": true,
-            "exerciseGroup": {
-              "id": 113,
-              "nameDe": "Den Shop kennenlernen",
-              "nameEn": "Getting to know the shop",
-              "groupNr": 0,
-              "descriptionDe": "Vor einem Angriff ist es wichtig zu verstehen, wie die Webseite aufgebaut ist. Wie sind die URLs strukturiert? Wo befinden sich Eingabefelder welche im Backend eine SQL Abfrage stellen?",
-              "descriptionEn": "todo"
-            }
-          }
-        },
-        "folder": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "Name of folder"
-            },
-            "nrOrItems": {
-              "type": "number",
-              "description": "Number of files in folder"
-            }
-          },
-          "example": {
-            "name": "artists",
-            "description": 41
-          }
-        },
-        "file": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "Name of file"
-            },
-            "size": {
-              "type": "number",
-              "description": "File size in Bytes"
-            },
-            "content": {
-              "type": "string",
-              "description": "Text content, only for Text/Code files"
-            },
-            "url": {
-              "type": "string",
-              "description": "Resource URL"
-            },
-            "copyright": {
-              "type": "object",
-              "description": "Copyright object"
-            }
-          },
-          "example": {
-            "name": "alex-turner.jpg",
-            "size": 551625,
-            "content": "",
-            "url": "http://localhost:3000/static/artists/alex-turner.jpg",
-            "copyright": {
-              "image": "alex-turner.jpg",
-              "license": "CC BY 2.0",
-              "creator": "Raph_PH",
-              "url": "https://upload.wikimedia.org/wikipedia/commons/9/95/Alex_Turner%2C_Way_Out_West_2018.jpg"
-            }
-          }
-        },
-        "concert": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number",
-              "description": "The auto-generated id"
-            },
-            "date": {
-              "type": "string",
-              "description": "Date of the concert"
-            },
-            "name": {
-              "type": "string",
-              "description": "Name of concert"
-            },
-            "price": {
-              "type": "string",
-              "description": "Lowest price of concert"
-            },
-            "image": {
-              "type": "number",
-              "description": "Concert image"
-            },
-            "inStock": {
-              "type": "string",
-              "description": "Amount of available tickets"
-            },
-            "offered": {
-              "type": "string",
-              "description": "Display concert in UI"
-            },
-            "band": {
-              "type": "object",
-              "description": "Band object"
-            },
-            "location": {
-              "type": "object",
-              "description": "Location object"
-            }
-          },
-          "example": [
-            {
-              "id": 892,
-              "date": "2024-11-30",
-              "name": "Unlimited Love",
-              "price": 92,
-              "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-              "inStock": 169,
-              "offered": true,
-              "bandId": 265,
-              "locationId": 834,
-              "band": {
-                "images": [
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-                  "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-                ],
-                "id": 265,
-                "name": "Red Hot Chili Peppers",
-                "foundingYear": 1983,
-                "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-                "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-                "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-                "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png"
-              },
-              "location": {
-                "id": 834,
-                "urlName": "swiss-life-hall",
-                "name": "Swiss Life Hall",
-                "address": "Ferdinand-Wilhelm-Fricke-Weg 8",
-                "imageIndoor": "http://localhost:3000/static/locations/swiss-life-hall-indoor.jpg",
-                "imageOutdoor": "http://localhost:3000/static/locations/swiss-life-hall-outdoor.jpg",
-                "layout": 2,
-                "capacity": 180,
-                "city": {
-                  "id": 246,
-                  "name": "Hannover",
-                  "country": "Germany"
-                },
-                "seatGroups": []
-              }
-            }
-          ]
-        },
-        "band": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "integer",
-              "description": "The auto-generated id"
-            },
-            "name": {
-              "type": "string",
-              "description": "Name of the band"
-            },
-            "foundingYear": {
-              "type": "string",
-              "description": "Founding year of the band"
-            },
-            "descriptionEn": {
-              "type": "string",
-              "description": "English description text"
-            },
-            "descriptionDe": {
-              "type": "string",
-              "description": "German description text"
-            },
-            "imageMembers": {
-              "type": "string",
-              "description": "URL to image of band members"
-            },
-            "logo": {
-              "type": "string",
-              "description": "URL to image of band logo"
-            },
-            "genres": {
-              "type": "array",
-              "description": "Array of Genre objects which fits the bands music"
-            },
-            "concerts": {
-              "type": "array",
-              "description": "Array of Concert objects"
-            },
-            "nrOfConcerts": {
-              "type": "number",
-              "description": "Number of concerts"
-            },
-            "rating": {
-              "type": "number",
-              "description": "Average rating of the band"
-            }
-          },
-          "example": {
-            "images": [
-              "http://localhost:3000/static/bands/red-hot-chili-peppers-1.jpg",
-              "http://localhost:3000/static/bands/red-hot-chili-peppers-2.jpg",
-              "http://localhost:3000/static/bands/red-hot-chili-peppers-3.jpg",
-              "http://localhost:3000/static/bands/red-hot-chili-peppers-4.jpg"
-            ],
-            "id": 265,
-            "name": "Red Hot Chili Peppers",
-            "foundingYear": 1983,
-            "descriptionEn": "The Red Hot Chili Peppers are an American rock band formed in Los Angeles in 1983, comprising vocalist Anthony Kiedis, bassist Flea, drummer Chad Smith, and guitarist John Frusciante. Their music incorporates elements of alternative rock, funk, punk rock, hard rock, hip hop, and psychedelic rock. Their eclectic range has influenced genres such as funk metal, rap metal, rap rock, and nu metal. With over 120 million records sold worldwide, the Red Hot Chili Peppers are one of the top-selling bands of all time.",
-            "descriptionDe": "Red Hot Chili Peppers (Abkürzung: RHCP) ist eine 1983 gegründete US-amerikanische Funk- und Alternative-Rockband. Sie zählt zu den kommerziell erfolgreichsten Vertretern des Crossover. Ihr Album Blood Sugar Sex Magik gilt als eines der bedeutendsten dieses Genres.",
-            "imageMembers": "http://localhost:3000/static/bands/red-hot-chili-peppers-members.jpg",
-            "logo": "http://localhost:3000/static/bands/red-hot-chili-peppers-logo.png",
-            "genres": [
-              {
-                "name": "Funk Rock"
-              },
-              {
-                "name": "Alternative Rock"
-              },
-              {
-                "name": "Crossover"
-              }
-            ],
-            "concerts": [
-              {
-                "id": 892,
-                "date": "2024-11-30",
-                "name": "Unlimited Love",
-                "price": 92,
-                "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                "inStock": 170,
-                "offered": true,
-                "bandId": 265,
-                "locationId": 834
-              },
-              {
-                "id": 893,
-                "date": "2024-12-07",
-                "name": "Unlimited Love",
-                "price": 92,
-                "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                "inStock": 170,
-                "offered": true,
-                "bandId": 265,
-                "locationId": 834
-              },
-              {
-                "id": 894,
-                "date": "2024-12-11",
-                "name": "Unlimited Love",
-                "price": 119.9,
-                "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                "inStock": 8736,
-                "offered": true,
-                "bandId": 265,
-                "locationId": 838
-              },
-              {
-                "id": 895,
-                "date": "2024-12-18",
-                "name": "Unlimited Love",
-                "price": 114.9,
-                "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                "inStock": 2793,
-                "offered": true,
-                "bandId": 265,
-                "locationId": 842
-              },
-              {
-                "id": 896,
-                "date": "2024-12-30",
-                "name": "Unlimited Love",
-                "price": 124.9,
-                "image": "http://localhost:3000/static/concerts/unlimited-love-tour.jpg",
-                "inStock": 3079,
-                "offered": true,
-                "bandId": 265,
-                "locationId": 845
-              }
-            ],
-            "nrOfConcerts": 5,
-            "rating": 4.428571428571429
-          }
-        }
-      }
-    }
-  },
-  "apis": [
-    "./backend/routes/*.ts"
-  ]
-}

electron-builder.json

@@ -19,7 +19,7 @@
     "icon": "public/logo-small.png"
   },
   "linux":  {
-    "target": ["deb", "rpm"],
+    "target": ["deb"],
     "maintainer": "Tobias Zoghaib",
     "icon": "public/logo-small.png",
     "category": "Education"
@@ -35,9 +35,6 @@
     "!release",
     "!src",
     "!dist",
-    "!out",
+    "!out"
-    "!misc",
-    "!database.sqlite",
-    "!node_modules"
   ]
 }

example-config.json

@@ -1,19 +0,0 @@
-{
-  "theme": "dark",
-  "language": "en",
-  "notAvailableExercises": [
-    "getting-known-register",
-    "getting-known-profile",
-    "getting-known-buy-ticket",
-    "broken-access-control-exercise-page",
-    "broken-access-control-hidden-concert",
-    "sql-injection-database-schema",
-    "sql-injection-all-accounts",
-    "sql-injection-account-roles",
-    "sql-injection-upgrade-privileges",
-    "sql-injection-capture-account",
-    "sql-injection-delete-rating",
-    "cross-site-scripting-hello-world",
-    "cross-site-scripting-external-script"
-  ]
-}

misc/frontend-backend-system.drawio

@@ -1,84 +0,0 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.9 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="26.0.9">
-  <diagram name="Page-1" id="6ideKt-3XiqBCAVgAsyQ">
-    <mxGraphModel dx="1195" dy="689" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="KDqfIFqn06qLZiIO6-10-49" value="Frontend" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;" parent="1" vertex="1">
-          <mxGeometry x="40" y="90" width="400" height="220" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-52" value="Subpage&lt;div&gt;&quot;All Bands&quot;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;" parent="1" vertex="1">
-          <mxGeometry x="50" y="120" width="150" height="180" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-50" value="Backend" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;" parent="1" vertex="1">
-          <mxGeometry x="630" y="90" width="210" height="280" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-55" value="API Endpoint" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;" parent="1" vertex="1">
-          <mxGeometry x="650" y="120" width="170" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-46" value="bandStore" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;" parent="1" vertex="1">
-          <mxGeometry x="270" y="120" width="160" height="160" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-70" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#00CC00;" parent="1" source="KDqfIFqn06qLZiIO6-10-47" target="KDqfIFqn06qLZiIO6-10-65" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-71" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#00CC00;" parent="1" source="KDqfIFqn06qLZiIO6-10-47" target="KDqfIFqn06qLZiIO6-10-66" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-73" value="&lt;font color=&quot;#00cc00&quot;&gt;Handles&lt;/font&gt;&lt;div&gt;&lt;font color=&quot;#00cc00&quot;&gt;changes&lt;/font&gt;&lt;/div&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#00CC00;" parent="1" source="KDqfIFqn06qLZiIO6-10-47" target="KDqfIFqn06qLZiIO6-10-72" edge="1">
-          <mxGeometry x="0.168" y="24" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-47" value="bands" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="290" y="230" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-59" value="&lt;div style=&quot;&quot;&gt;&lt;font style=&quot;color: rgb(204, 0, 0);&quot;&gt;Stores&lt;/font&gt;&lt;/div&gt;&lt;div style=&quot;&quot;&gt;&lt;font style=&quot;color: rgb(204, 0, 0);&quot;&gt;results&lt;/font&gt;&lt;/div&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;align=left;fillColor=#e51400;strokeColor=#B20000;" parent="1" source="KDqfIFqn06qLZiIO6-10-48" target="KDqfIFqn06qLZiIO6-10-47" edge="1">
-          <mxGeometry x="-0.2" y="10" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-67" value="&lt;font style=&quot;color: rgb(0, 29, 188);&quot;&gt;requests&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;verticalAlign=bottom;fillColor=#0050ef;strokeColor=#001DBC;" parent="1" source="KDqfIFqn06qLZiIO6-10-48" target="KDqfIFqn06qLZiIO6-10-56" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-48" value="getBands()" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="290" y="150" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-53" value="&lt;font color=&quot;#bd7000&quot;&gt;Call function&lt;/font&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;verticalAlign=bottom;fillColor=#f0a30a;strokeColor=#BD7000;" parent="1" source="KDqfIFqn06qLZiIO6-10-52" target="KDqfIFqn06qLZiIO6-10-48" edge="1">
-          <mxGeometry x="-0.2148" y="7" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-68" value="&lt;font style=&quot;color: rgb(0, 87, 0);&quot;&gt;send http code &amp;amp;&lt;/font&gt;&lt;div&gt;&lt;span style=&quot;color: light-dark(rgb(0, 87, 0), rgb(0, 87, 0)); background-color: light-dark(#ffffff, var(--ge-dark-color, #121212));&quot;&gt;data sets&lt;/span&gt;&lt;/div&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=1;entryY=0.75;entryDx=0;entryDy=0;verticalAlign=top;fillColor=#008a00;strokeColor=#005700;" parent="1" source="KDqfIFqn06qLZiIO6-10-56" target="KDqfIFqn06qLZiIO6-10-48" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-56" value="/bands" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="670" y="150" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-63" value="&lt;font style=&quot;color: rgb(0, 153, 153);&quot;&gt;get raw&lt;/font&gt;&lt;div&gt;&lt;font color=&quot;#009999&quot;&gt;datasets&lt;/font&gt;&lt;/div&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.855;exitY=0;exitDx=0;exitDy=4.35;exitPerimeter=0;align=left;strokeColor=#009999;" parent="1" source="KDqfIFqn06qLZiIO6-10-61" edge="1">
-          <mxGeometry x="-0.2154" y="-9" relative="1" as="geometry">
-            <mxPoint as="offset" />
-            <mxPoint x="751" y="180" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-61" value="DB" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="700" y="280" width="60" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-62" value="&lt;font style=&quot;color: rgb(255, 0, 255);&quot;&gt;sends&lt;/font&gt;&lt;div&gt;&lt;font style=&quot;color: rgb(255, 0, 255);&quot;&gt;SQL&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font style=&quot;color: rgb(255, 0, 255);&quot;&gt;command&lt;/font&gt;&lt;/div&gt;" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.321;exitY=1.017;exitDx=0;exitDy=0;entryX=0.145;entryY=0;entryDx=0;entryDy=4.35;entryPerimeter=0;align=right;strokeColor=#FF00FF;exitPerimeter=0;" parent="1" source="KDqfIFqn06qLZiIO6-10-56" target="KDqfIFqn06qLZiIO6-10-61" edge="1">
-          <mxGeometry x="0.2159" y="-9" relative="1" as="geometry">
-            <mxPoint as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-65" value="Coldplay" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="65" y="170" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-66" value="Muse" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="65" y="210" width="120" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="KDqfIFqn06qLZiIO6-10-72" value="Radiohead" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="65" y="250" width="120" height="30" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>

misc/frontend-structure.drawio

@@ -0,0 +1,181 @@
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.17">
+  <diagram name="Page-1" id="z4ePnmX8JLkG3N1GDPOr">
+    <mxGraphModel dx="1783" dy="1720" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="Fk8QGSgGJ1bhqam2HO4i-3" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="Fk8QGSgGJ1bhqam2HO4i-15" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" target="fY-Wzga6seKQwhded4A5-7">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-360" y="700" as="targetPoint" />
+            <mxPoint x="-720" y="240" as="sourcePoint" />
+            <Array as="points">
+              <mxPoint x="-720" y="540" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="Fk8QGSgGJ1bhqam2HO4i-13">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="fY-Wzga6seKQwhded4A5-8">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-680" y="-20" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="-720" y="-20" />
+              <mxPoint x="-680" y="-20" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="fY-Wzga6seKQwhded4A5-1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="Fk8QGSgGJ1bhqam2HO4i-14">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-1" target="Fk8QGSgGJ1bhqam2HO4i-4">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-1" value="Homepage&lt;div&gt;&lt;font face=&quot;Courier New&quot;&gt;&lt;b&gt;/&lt;/b&gt;&lt;/font&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-800" y="-120" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-2" target="Fk8QGSgGJ1bhqam2HO4i-9">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-2" target="Fk8QGSgGJ1bhqam2HO4i-8">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-2" target="Fk8QGSgGJ1bhqam2HO4i-7">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-40" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;fillColor=#6d8764;strokeColor=#3A5431;" edge="1" parent="1" target="Fk8QGSgGJ1bhqam2HO4i-2">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-679.6666666666667" y="70" as="targetPoint" />
+            <mxPoint x="-680" y="-20" as="sourcePoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-43" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-2" target="fY-Wzga6seKQwhded4A5-42">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-2" value="AccountHomePage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/account&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="-40" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-3" target="Fk8QGSgGJ1bhqam2HO4i-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-3" value="BandsPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/bands&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="280" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-4" value="PreferencesPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/preferences&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="600" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-5" target="fY-Wzga6seKQwhded4A5-5">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="-280" y="330" />
+              <mxPoint x="-280" y="330" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-5" value="BandDetailPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/bands/detail/:bandName&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-360" y="280" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;fillColor=#e51400;strokeColor=#B20000;" edge="1" parent="1" target="Fk8QGSgGJ1bhqam2HO4i-7">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-200" y="-220" as="targetPoint" />
+            <mxPoint x="-680" y="-20" as="sourcePoint" />
+            <Array as="points">
+              <mxPoint x="-680" y="140" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-7" value="LoginPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/account/login&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-360" y="120" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-8" value="AccountData&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/account/data&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-360" y="40" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-9" value="OrdersPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/account/orders&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-360" y="-40" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-13" value="AdminHome&lt;span style=&quot;background-color: initial;&quot;&gt;Page&lt;/span&gt;&lt;div&gt;&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/admin&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="760" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-14" value="HelpPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/help&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="680" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-15" target="Fk8QGSgGJ1bhqam2HO4i-16">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-15" value="LocationsPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/locations&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-600" y="440" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="Fk8QGSgGJ1bhqam2HO4i-16" target="fY-Wzga6seKQwhded4A5-5">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="-280" y="420" />
+              <mxPoint x="-280" y="420" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Fk8QGSgGJ1bhqam2HO4i-16" value="LocationsDetailPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/locations/detail/:name&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-360" y="440" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="fY-Wzga6seKQwhded4A5-1" target="fY-Wzga6seKQwhded4A5-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-1" value="ConcertsPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/concerts&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-600" y="360" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-3" value="if logged in" style="text;strokeColor=none;align=center;fillColor=none;html=1;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="-680" y="-60" width="80" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-4" value="else" style="text;strokeColor=none;align=center;fillColor=none;html=1;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="-690" y="110" width="80" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-34" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="fY-Wzga6seKQwhded4A5-5" target="fY-Wzga6seKQwhded4A5-7">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="-160" y="380" />
+              <mxPoint x="-160" y="540" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-5" value="ConcertsBookingPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/concerts/booking/:id&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-360" y="360" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-7" value="BasketPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/basket&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-600" y="520" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="fY-Wzga6seKQwhded4A5-8" target="Fk8QGSgGJ1bhqam2HO4i-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="fY-Wzga6seKQwhded4A5-8" target="fY-Wzga6seKQwhded4A5-5">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="fY-Wzga6seKQwhded4A5-8" target="Fk8QGSgGJ1bhqam2HO4i-16">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-8" value="SearchPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/search&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-600" y="200" width="160" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-14" value="if ticket add to basket" style="text;strokeColor=none;align=center;fillColor=none;html=1;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="-290" y="510" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-29" value="on log out" style="text;strokeColor=none;align=center;fillColor=none;html=1;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="-460" y="90" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="fY-Wzga6seKQwhded4A5-42" value="AccountRatingsPage&lt;div&gt;&lt;b style=&quot;font-family: &amp;quot;Courier New&amp;quot;;&quot;&gt;&lt;font style=&quot;font-size: 10px;&quot;&gt;/account/ratings&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="-360" y="-120" width="160" height="40" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "eventmaster",
-  "version": "0.2.0",
+  "version": "0.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "eventmaster",
-      "version": "0.2.0",
+      "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
         "@mdi/font": "^7.4.47",
@@ -14,10 +14,6 @@
         "axios": "^1.7.7",
         "body-parser": "^1.20.2",
         "cors": "^2.8.5",
-        "csv": "^6.3.11",
-        "csv-reader": "^1.0.12",
-        "exif-js": "^2.3.0",
-        "exifreader": "^4.25.0",
         "express": "^4.21.1",
         "jsonwebtoken": "^9.0.2",
         "jspdf": "^2.5.2",
@@ -29,9 +25,6 @@
         "sequelize": "^6.37.4",
         "sequelize-typescript": "^2.1.6",
         "sqlite3": "^5.1.7",
-        "swagger-autogen": "^2.23.7",
-        "swagger-jsdoc": "^6.2.8",
-        "swagger-ui-express": "^5.0.1",
         "vue": "^3.4.29",
         "vue-i18n": "^10.0.4",
         "vue-router": "^4.4.5",
@@ -47,8 +40,6 @@
         "@types/jsonwebtoken": "^9.0.7",
         "@types/multer": "^1.4.12",
         "@types/node": "^22.9.0",
-        "@types/swagger-jsdoc": "^6.0.4",
-        "@types/swagger-ui-express": "^4.1.7",
         "@vitejs/plugin-vue": "^5.1.4",
         "concurrently": "^9.0.1",
         "copyfiles": "^2.4.1",
@@ -61,50 +52,6 @@
         "vue-tsc": "^2.1.10"
       }
     },
-    "node_modules/@apidevtools/json-schema-ref-parser": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz",
-      "integrity": "sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg==",
-      "license": "MIT",
-      "dependencies": {
-        "@jsdevtools/ono": "^7.1.3",
-        "@types/json-schema": "^7.0.6",
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^4.1.0"
-      }
-    },
-    "node_modules/@apidevtools/openapi-schemas": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz",
-      "integrity": "sha512-Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@apidevtools/swagger-methods": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz",
-      "integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==",
-      "license": "MIT"
-    },
-    "node_modules/@apidevtools/swagger-parser": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-10.0.3.tgz",
-      "integrity": "sha512-sNiLY51vZOmSPFZA5TF35KZ2HbgYklQnTSDnkghamzLb3EkNtcQnrBQEj5AOCxHpTtXpqMCRM1CrmV2rG6nw4g==",
-      "license": "MIT",
-      "dependencies": {
-        "@apidevtools/json-schema-ref-parser": "^9.0.6",
-        "@apidevtools/openapi-schemas": "^2.0.4",
-        "@apidevtools/swagger-methods": "^3.0.2",
-        "@jsdevtools/ono": "^7.1.3",
-        "call-me-maybe": "^1.0.1",
-        "z-schema": "^5.0.1"
-      },
-      "peerDependencies": {
-        "openapi-types": ">=7"
-      }
-    },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
@@ -1595,12 +1542,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/@jsdevtools/ono": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
-      "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
-      "license": "MIT"
-    },
     "node_modules/@malept/cross-spawn-promise": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
@@ -1988,13 +1929,6 @@
         "win32"
       ]
     },
-    "node_modules/@scarf/scarf": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.4.0.tgz",
-      "integrity": "sha512-xxeapPiUXdZAE3che6f3xogoJPeZgig6omHEy1rIY5WVsB3H2BHNnZH+gHG6x91SCWyQCzWGsuL2Hh3ClO5/qQ==",
-      "hasInstallScript": true,
-      "license": "Apache-2.0"
-    },
     "node_modules/@sideway/address": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -2200,12 +2134,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "license": "MIT"
-    },
     "node_modules/@types/jsonwebtoken": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.7.tgz",
@@ -2324,24 +2252,6 @@
         "@types/send": "*"
       }
     },
-    "node_modules/@types/swagger-jsdoc": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/swagger-jsdoc/-/swagger-jsdoc-6.0.4.tgz",
-      "integrity": "sha512-W+Xw5epcOZrF/AooUM/PccNMSAFOKWZA5dasNyMujTwsBkU74njSJBpvCCJhHAJ95XRMzQrrW844Btu0uoetwQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/swagger-ui-express": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.7.tgz",
-      "integrity": "sha512-ovLM9dNincXkzH4YwyYpll75vhzPBlWx6La89wwvYH7mHjVpf0X0K/vR/aUM7SRxmr5tt9z7E5XJcjQ46q+S3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/express": "*",
-        "@types/serve-static": "*"
-      }
-    },
     "node_modules/@types/validator": {
       "version": "13.12.2",
       "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.12.2.tgz",
@@ -3136,6 +3046,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
       "license": "Python-2.0"
     },
     "node_modules/array-flatten": {
@@ -3720,12 +3631,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "license": "MIT"
-    },
     "node_modules/canvg": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
@@ -4379,48 +4284,6 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "license": "MIT"
     },
-    "node_modules/csv": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/csv/-/csv-6.3.11.tgz",
-      "integrity": "sha512-a8bhT76Q546jOElHcTrkzWY7Py925mfLO/jqquseH61ThOebYwOjLbWHBqdRB4K1VpU36sTyIei6Jwj7QdEZ7g==",
-      "license": "MIT",
-      "dependencies": {
-        "csv-generate": "^4.4.2",
-        "csv-parse": "^5.6.0",
-        "csv-stringify": "^6.5.2",
-        "stream-transform": "^3.3.3"
-      },
-      "engines": {
-        "node": ">= 0.1.90"
-      }
-    },
-    "node_modules/csv-generate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-4.4.2.tgz",
-      "integrity": "sha512-W6nVsf+rz0J3yo9FOjeer7tmzBJKaTTxf7K0uw6GZgRocZYPVpuSWWa5/aoWWrjQZj4/oNIKTYapOM7hiNjVMA==",
-      "license": "MIT"
-    },
-    "node_modules/csv-parse": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.6.0.tgz",
-      "integrity": "sha512-l3nz3euub2QMg5ouu5U09Ew9Wf6/wQ8I++ch1loQ0ljmzhmfZYrH9fflS22i/PQEvsPvxCwxgz5q7UB8K1JO4Q==",
-      "license": "MIT"
-    },
-    "node_modules/csv-reader": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/csv-reader/-/csv-reader-1.0.12.tgz",
-      "integrity": "sha512-0AAgazKJUywtjvZbclNuovIiQY/WyvojWw15Y2k3kPixE+pDiOFnfg5FcH3CfDqqnrB2f3p5oPAc446EXD01Tw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csv-stringify": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-6.5.2.tgz",
-      "integrity": "sha512-RFPahj0sXcmUyjrObAK+DOWtMvMIFV328n4qZJhgX3x2RqkQgOTU2mCUmiFR0CzM6AzChlRSUErjiJeEt8BaQA==",
-      "license": "MIT"
-    },
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -4461,15 +4324,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -4698,18 +4552,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/dompurify": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.7.tgz",
@@ -5172,15 +5014,6 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -5190,32 +5023,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/exif-js": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/exif-js/-/exif-js-2.3.0.tgz",
-      "integrity": "sha512-1Og9pAzG2FZRVlaavH8bB8BTeHcjMdJhKmeQITkX+uLRCD0xPtKAdZ2clZmQdJ56p9adXtJ8+jwrGp/4505lYg==",
-      "license": "MIT"
-    },
-    "node_modules/exifreader": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/exifreader/-/exifreader-4.25.0.tgz",
-      "integrity": "sha512-lPyPXWTUuYgoKdKf3rw2EDoE9Zl7xHoy/ehPNeQ4gFVNLzfLyNMP4oEI+sP0/Czp5r/2i7cFhqg5MHsl4FYtyw==",
-      "hasInstallScript": true,
-      "license": "MPL-2.0",
-      "optionalDependencies": {
-        "@xmldom/xmldom": "^0.9.4"
-      }
-    },
-    "node_modules/exifreader/node_modules/@xmldom/xmldom": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.6.tgz",
-      "integrity": "sha512-Su4xcxR0CPGwlDHNmVP09fqET9YxbyDXHaSob6JlBH7L6reTYaeim6zbk9o08UarO0L5GTRo3uzl0D+9lSxmvw==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14.6"
-      }
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -6331,6 +6138,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -6372,6 +6180,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -6563,12 +6372,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-      "license": "MIT"
-    },
     "node_modules/lodash.includes": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
@@ -6581,12 +6384,6 @@
       "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
       "license": "MIT"
     },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "license": "MIT"
-    },
     "node_modules/lodash.isinteger": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
@@ -6611,12 +6408,6 @@
       "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
       "license": "MIT"
     },
-    "node_modules/lodash.mergewith": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
-      "license": "MIT"
-    },
     "node_modules/lodash.once": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
@@ -7366,13 +7157,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/openapi-types": {
-      "version": "12.1.3",
-      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
-      "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/ora": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
@@ -8806,12 +8590,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stream-transform": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-3.3.3.tgz",
-      "integrity": "sha512-dALXrXe+uq4aO5oStdHKlfCM/b3NBdouigvxVPxCdrMRAU6oHh3KNss20VbTPQNQmjAHzZGKGe66vgwegFEIog==",
-      "license": "MIT"
-    },
     "node_modules/streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -8960,116 +8738,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/swagger-autogen": {
-      "version": "2.23.7",
-      "resolved": "https://registry.npmjs.org/swagger-autogen/-/swagger-autogen-2.23.7.tgz",
-      "integrity": "sha512-vr7uRmuV0DCxWc0wokLJAwX3GwQFJ0jwN+AWk0hKxre2EZwusnkGSGdVFd82u7fQLgwSTnbWkxUL7HXuz5LTZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^7.4.1",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.7",
-        "json5": "^2.2.3"
-      }
-    },
-    "node_modules/swagger-autogen/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/swagger-jsdoc": {
-      "version": "6.2.8",
-      "resolved": "https://registry.npmjs.org/swagger-jsdoc/-/swagger-jsdoc-6.2.8.tgz",
-      "integrity": "sha512-VPvil1+JRpmJ55CgAtn8DIcpBs0bL5L3q5bVQvF4tAW/k/9JYSj7dCpaYCAv5rufe0vcCbBRQXGvzpkWjvLklQ==",
-      "license": "MIT",
-      "dependencies": {
-        "commander": "6.2.0",
-        "doctrine": "3.0.0",
-        "glob": "7.1.6",
-        "lodash.mergewith": "^4.6.2",
-        "swagger-parser": "^10.0.3",
-        "yaml": "2.0.0-1"
-      },
-      "bin": {
-        "swagger-jsdoc": "bin/swagger-jsdoc.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/swagger-jsdoc/node_modules/commander": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz",
-      "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/swagger-jsdoc/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/swagger-parser": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/swagger-parser/-/swagger-parser-10.0.3.tgz",
-      "integrity": "sha512-nF7oMeL4KypldrQhac8RyHerJeGPD1p2xDh900GPvc+Nk7nWP6jX2FcC7WmkinMoAmoO774+AFXcWsW8gMWEIg==",
-      "license": "MIT",
-      "dependencies": {
-        "@apidevtools/swagger-parser": "10.0.3"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/swagger-ui-dist": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.18.2.tgz",
-      "integrity": "sha512-J+y4mCw/zXh1FOj5wGJvnAajq6XgHOyywsa9yITmwxIlJbMqITq3gYRZHaeqLVH/eV/HOPphE6NjF+nbSNC5Zw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@scarf/scarf": "=1.4.0"
-      }
-    },
-    "node_modules/swagger-ui-express": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-5.0.1.tgz",
-      "integrity": "sha512-SrNU3RiBGTLLmFU8GIJdOdanJTl4TOmT27tt3bWWHppqYmAZ6IDuEuBvMU6nZq0zLEe6b/1rACXCgLZqO6ZfrA==",
-      "license": "MIT",
-      "dependencies": {
-        "swagger-ui-dist": ">=5.0.0"
-      },
-      "engines": {
-        "node": ">= v0.10.32"
-      },
-      "peerDependencies": {
-        "express": ">=4.0.0 || >=5.0.0-beta"
-      }
-    },
     "node_modules/tar": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
@@ -9896,15 +9564,6 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.0.0-1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.0.0-1.tgz",
-      "integrity": "sha512-W7h5dEhywMKenDJh2iX/LABkbFnBxasD27oyXWDS/feDsxiw0dD5ncXdYXgkvAsXIY2MpW/ZKkr9IU30DBdMNQ==",
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
@@ -9968,36 +9627,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/z-schema": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-5.0.5.tgz",
-      "integrity": "sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "validator": "^13.7.0"
-      },
-      "bin": {
-        "z-schema": "bin/z-schema"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "commander": "^9.4.1"
-      }
-    },
-    "node_modules/z-schema/node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
     "node_modules/zip-stream": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "eventmaster",
-  "version": "0.4.0",
+  "version": "0.1.0",
   "author": "Tobias Zoghaib",
   "description": "Hackable ticket store for educational purposes",
   "license": "MIT",
-  "homepage": "https://www.itsec.uni-hannover.de/de/usec/forschung/eventmaster-learning-web-attacks",
+  "homepage": "www.uni-hannover.de",
   "main": "build/src/electron/index.js",
   "private": true,
   "scripts": {
@@ -38,10 +38,6 @@
     "axios": "^1.7.7",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "csv": "^6.3.11",
-    "csv-reader": "^1.0.12",
-    "exif-js": "^2.3.0",
-    "exifreader": "^4.25.0",
     "express": "^4.21.1",
     "jsonwebtoken": "^9.0.2",
     "jspdf": "^2.5.2",
@@ -53,9 +49,6 @@
     "sequelize": "^6.37.4",
     "sequelize-typescript": "^2.1.6",
     "sqlite3": "^5.1.7",
-    "swagger-autogen": "^2.23.7",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.1",
     "vue": "^3.4.29",
     "vue-i18n": "^10.0.4",
     "vue-router": "^4.4.5",
@@ -71,8 +64,6 @@
     "@types/jsonwebtoken": "^9.0.7",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.9.0",
-    "@types/swagger-jsdoc": "^6.0.4",
-    "@types/swagger-ui-express": "^4.1.7",
     "@vitejs/plugin-vue": "^5.1.4",
     "concurrently": "^9.0.1",
     "copyfiles": "^2.4.1",

src/App.vue

@@ -26,6 +26,7 @@ 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
@@ -79,33 +80,9 @@ function calcMargin(i) {
         <v-sheet color="sheet" height="100%">
           <router-view></router-view>
         </v-sheet>
-
       </v-container>
 
-      <v-btn
-        fab
-        dark
-        fixed
-        bottom
-        right
-        color="primary"
-      >
-        <v-icon>keyboard_arrow_up</v-icon>
-      </v-btn>
-
       <company-footer />
     </v-main>
   </v-app>
-
-  <!-- Test Environment sticker in bottom right corner -->
-  <v-sheet
-    color="error"
-    position="fixed" 
-    location="bottom right" 
-    class="pa-3 mb-12 mr-n16 text-center text-h5"
-    width="300"
-    style="rotate: 315deg; z-index: 1008;"
-  >
-    {{ $t('misc.testEnvironment') }}
-  </v-sheet>
 </template>

src/components/basics/cardViewHorizontal.vue

@@ -39,9 +39,6 @@ defineProps({
           v-if="!$slots.prepend"
           type="image"
           :loading="loading"
-        >
-          <v-sheet
-            color="sheet"
         >
           <v-img 
             :src="image" 
@@ -49,7 +46,6 @@ defineProps({
             :width="height"
             cover
           />
-          </v-sheet>
         </v-skeleton-loader>
 
         <v-skeleton-loader
@@ -59,7 +55,6 @@ defineProps({
         >
           <v-sheet
             :height="height"
-            color="sheet"
             width="100%"
             class="text-center d-flex justify-center align-center"
           >
@@ -80,8 +75,6 @@ defineProps({
         >
           <v-sheet
             :height="height"
-            color="sheet"
-            class="w-100"
           >
             <div>
               <div class="text-h4 font-weight-black pt-2 h-100">

src/components/basics/cardViewOneLine.vue

@@ -3,33 +3,17 @@ defineProps({
   /** Displayed smaller text on the left side */
   descriptionText: {
     type: String,
-    default: "",
+    default: ""
-  },
-  loading: {
-    type: Boolean,
-    default: false,
   },
 
   /** Displayed bigger text on the right side */
-  valueText: [String, Number],
+  valueText: [ String, Number ]
-});
+})
 </script>
 
 <template>
-  <v-card variant="outlined" class="my-1 px-2">
+  <v-card variant="outlined" class="my-1 mx-2 px-2">
-    <v-row v-if="loading">
+    <v-row class="d-flex justify-center align-center">
-      <v-col>
-        <v-skeleton-loader
-          type="heading"
-          :loading="loading"
-          style="background-color: transparent"
-        >
-        sdasd
-        </v-skeleton-loader>
-      </v-col>
-    </v-row>
-
-    <v-row class="d-flex justify-center align-center" v-else>
       <v-col class="text-caption text-left" v-if="descriptionText.length > 0">
         {{ descriptionText }}
       </v-col>

src/components/basics/cardViewTopImage.vue

@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import { loadLicense } from '@/scripts/imageScripts';
+defineProps({
-import { ref, watch } from 'vue';
-
-const props = defineProps({
   image: String,
   errorImage: {
     type: String,
@@ -19,14 +16,6 @@ const props = defineProps({
   },
   loading: Boolean
 })
-
-const license = ref("")
-
-loadLicense(props.image)
-  .then(result => {
-    console.log(result)
-    license.value = result
-  })
 </script>
 
 <template>

src/components/basics/confirmDialog.vue

@@ -20,7 +20,7 @@ function confirmPressed() {
 <template>
   <action-dialog 
     :title="title"
-    max-width="500"
+    max-width="400"
     v-model="showDialog"
     persistent
   >
@@ -36,7 +36,7 @@ function confirmPressed() {
       <outlined-button
         @click="showDialog = false" 
         prepend-icon="mdi-close"
-        color="warning"
+        color="orange"
         :loading="loading"
       >
         {{ $t("misc.actions.cancel") }}
@@ -45,7 +45,7 @@ function confirmPressed() {
       <outlined-button
         @click="confirmPressed"
         prepend-icon="mdi-check"
-        color="error"
+        color="red"
         :loading="loading"
       >
         {{ $t("misc.actions.confirm") }}

src/components/basics/sectionDivider.vue

@@ -8,28 +8,20 @@ defineProps({
 
 <template>
   <v-row class="pt-3 d-none d-md-flex">
-    <!-- Left line -->
     <v-col class="d-flex justify-center align-center">
       <v-sheet height="12" width="100%" color="primary" class="rounded-s-lg" />
     </v-col>
     
-    <!-- Title -->
     <v-col class="v-col-auto">
       <v-skeleton-loader
         type="heading"
         :loading="loading"
         width="300"
       >
-        <v-sheet
+        <span class="text-h4">{{ title }}</span>
-          class="text-h4"
-          color="sheet"
-        >
-          {{ title }}
-        </v-sheet>
       </v-skeleton-loader>
     </v-col>
 
-    <!-- Right line -->
     <v-col class="d-flex justify-center align-center">
       <v-sheet height="12" width="100%" color="primary" class="rounded-e-lg" />
     </v-col>

src/components/navigation/navigationAppendItems.vue

@@ -1,122 +1,50 @@
 <script setup lang="ts">
-import { useAccountStore } from "@/stores/account.store";
+import { useAccountStore } from '@/stores/account.store';
-import { useBasketStore } from "@/stores/basket.store";
+import { useBasketStore } from '@/stores/basket.store';
-import { useExerciseStore } from "@/stores/exercise.store";
+import { useExerciseStore } from '@/stores/exercise.store';
-import { ref, watch } from "vue";
 
-const accountStore = useAccountStore();
+const accountStore = useAccountStore()
-const basketStore = useBasketStore();
+const basketStore = useBasketStore()
-const exerciseStore = useExerciseStore();
+const exerciseStore = useExerciseStore()
-const basketItems = ref(0);
 
-exerciseStore.getAllExercises();
+exerciseStore.getAllExercises()
-
-watch(
-  () => basketStore.itemsInBasket,
-  () => {
-    basketItems.value = basketStore.itemsInBasket.reduce((tot, item) => {
-      return tot + item.seats.length;
-    }, 0);
-  }
-);
 </script>
 
 <template>
-  <!-- Global search -->
+  <v-btn variant="plain" icon="mdi-magnify" to="/search" />
-  <v-tooltip :text="$t('misc.search.globalsearch')" location="bottom">
-    <template #activator="{ props }">
-      <v-btn v-bind="props" variant="plain" icon="mdi-magnify" to="/search" />
-    </template>
-  </v-tooltip>
 
-  <!-- Account -->
-  <v-tooltip :text="$t('account.account')" location="bottom">
-    <template #activator="{ props }">
   <v-btn
     v-if="accountStore.userAccountToken == ''"
-        v-bind="props"
     variant="plain"
     icon="mdi-account"
     to="/account/login"
   />
   
-      <v-btn
+  <v-btn v-else variant="plain" icon="mdi-account-check" to="/account/home" />
-        v-else
-        v-bind="props"
-        variant="plain"
-        icon="mdi-account-check"
-        to="/account/home"
-      />
-    </template>
-  </v-tooltip>
 
-  <!-- Basket -->
+  <div>
-  <v-tooltip :text="$t('basket.basket')" location="bottom">
-    <template #activator="{ props }">
     <v-badge
-        v-if="basketItems > 0"
+      :content="basketStore.itemsInBasket.reduce((tot, item) => {
-        :content="basketItems"
+        return tot + item.seats.length
-        color="error"
+      }, 0)"
-        offset-x="8"
+      color="red" offset-x="8" offset-y="8">
-        offset-y="8"
+      <v-btn variant="plain" icon="mdi-cart" to="/basket" />
-      >
-        <v-btn v-bind="props" variant="plain" icon="mdi-cart" to="/basket" />
     </v-badge>
+  </div>
 
-      <v-btn
-        v-else
-        v-bind="props"
-        variant="plain"
-        icon="mdi-cart"
-        to="/basket"
-      />
-    </template>
-  </v-tooltip>
-
-  <!-- Exercise page -->
-  <v-tooltip :text="$t('misc.firstStartup.exercises')" location="bottom">
-    <template #activator="{ props }">
-      <v-badge
-        v-if="exerciseStore.exercisePageVisible"
-        :content="
-          exerciseStore.exercises.reduce((tot, exercise) => {
-            if (exercise.available && !exercise.solved) {
-              return tot + 1;
-            } else {
-              return tot;
-            }
-          }, 0)
-        "
-        color="error"
-        offset-x="8"
-        offset-y="8"
-      >
-        <v-btn
-          v-bind="props"
-          variant="plain"
-          icon="mdi-book-open-blank-variant"
-          to="/help"
-        />
-      </v-badge>
-    </template>
-  </v-tooltip>
-
-  <!-- Admin panel -->
-  <v-tooltip :text="$t('admin.adminpanel')" location="bottom">
-    <template #activator="{ props }">
   <v-btn
     v-if="accountStore.adminPanelVisible"
-        v-bind="props"
     variant="plain"
     icon="mdi-table-cog"
     to="/admin"
   />
-    </template>
-  </v-tooltip>
 
-  <v-tooltip :text="$t('preferences.preferences')" location="bottom">
+  <v-btn
-    <template #activator="{ props }">
+    v-if="exerciseStore.helpPageVisible"
-      <v-btn v-bind="props" variant="plain" icon="mdi-cog" to="/preferences" />
+    variant="plain"
-    </template>
+    icon="mdi-help"
-  </v-tooltip>
+    to="/help"
+  />
+  
+  <v-btn variant="plain" icon="mdi-cog" to="/preferences"/>
 </template>

src/components/pageParts/heroImage.vue

@@ -56,7 +56,6 @@ defineProps({
             type="heading"
             :loading="loading"
             width="500"
-            class="text-white"
           >
             <span class="text-h3 font-weight-bold">
               {{ title }}
@@ -78,18 +77,11 @@ defineProps({
 
 
             <!-- Description -->
-            <p
+            <p class="text-h6 text-medium-emphasis" v-if="!$slots.description">
-              class="text-h6 text-white"
-              style="opacity: 0.7;"
-              v-if="!$slots.description"
-            >
               {{ description }}
             </p>
             
-            <p
+            <p class="text-h6 text-medium-emphasis">
-              class="text-h6 text-white"
-              style="opacity: 0.7;"
-            >
               <slot name="description"></slot>
             </p>
           </v-skeleton-loader>

src/data/api/accountApi.ts

@@ -3,41 +3,14 @@ import { AccountModel } from "../models/user/accountModel"
 
 const BASE_URL = "http://localhost:3000/accounts"
 
-/**
+export async function fetchAllAccounts() {
- * Fetch all accounts from server
+  return await axios.get(BASE_URL)
- * 
- * @param token Validation token of current logged in user. User needs to have the right privileges
- * 
- * @returns Response from server with list of all account body
- */
-export async function fetchAllAccounts(token: string) {
-  return await axios.get(BASE_URL, {
-    headers: {
-      "Authorization": token
-    }
-  })
 }
 
-/**
+export async function login(username: string, password: string) {
- * Start the login process
- * 
- * @param username Username of the account
- * @param password Password of the account
- * 
- * @returns Response from server with token body
- */
-export async function getLogin(username: string, password: string) {
   return await axios.get(BASE_URL + "/login?username=" + username + "&password=" + password)
 }
 
-
-/**
- * Get all data about a single account
- * 
- * @param token Validation token
- * 
- * @returns Response from server with account body
- */
 export async function getAccount(token: string) {
   return await axios.get(BASE_URL + "/account", {
     headers: {
@@ -46,48 +19,18 @@ export async function getAccount(token: string) {
   })
 }
 
-/**
- * Register a new account in servers database
- * 
- * @param account Account data for new dataset
- * 
- * @returns Response from server
- */
 export async function registerAccount(account: AccountModel) {
-  return await axios.post(BASE_URL + "/account", account)
+  return await axios.post(BASE_URL, account)
 }
 
-/**
- * Update data of an account
- * 
- * @param account Account data to update
- * @param token Validation token
- * 
- * @returns Response from server
- */
 export async function updateAccount(account: AccountModel, token: string) {
-  return await axios.patch(BASE_URL + "/account", account, {
+  return await axios.patch(BASE_URL, account, {
     headers: {
       "Authorization": token
     }
   })
 }
 
-/**
+export async function deleteAccount(account: AccountModel) {
- * Delete an account in servers database
+  return await axios.delete(BASE_URL + "/" + account.id)
- * 
- * @param account Account to delete
- * @param token Validation token
- * 
- * @returns Response from server
- */
-export async function deleteAccount(account: AccountModel, token: string) {
-  return await axios.delete(BASE_URL + "/account", {
-    headers: {
-      "Authorization": token
-    },
-    data: {
-      account: account
-    }
-  })
 }

src/data/api/orderApi.ts

@@ -1,22 +1,17 @@
 import axios from "axios"
 import { BasketItemModel } from "../models/ordering/basketItemModel"
-import { OrderApiModel } from "../models/apiEndpoints/orderApiModel"
 
 const BASE_URL = "http://localhost:3000/orders"
 
-export async function fetchUserOrders(userId: number, token: string) {
+export async function fetchUserOrders(userId: number) {
-  return axios.get(BASE_URL + "?id=" + userId, {
+  return axios.get(BASE_URL + "/" + userId)
-    headers: {
-      "Authorization": token
-    }
-  })
 }
 
 export async function createOrder(
+  accountId: number, 
   basketItem: Array<BasketItemModel>,
   paymentId: number,
-  addressId: number,
+  addressId: number
-  token: string
 ) {
   let tickets = []
 
@@ -30,25 +25,21 @@ export async function createOrder(
     }
   }
 
-  return axios.post(BASE_URL, {
+  console.log({
+    accountId: accountId,
     tickets: tickets,
     paymentId: paymentId,
-    addressId: addressId,
+    addressId: addressId
-  }, {
+  })
-    headers: {
+
-      "Authorization": token
+  return axios.post(BASE_URL, {
-    }
+    accountId: accountId,
+    tickets: tickets,
+    paymentId: paymentId,
+    addressId: addressId
   })
 }
 
-export async function fetchAllOrders(token: string) {
+export async function fetchAllOrders() {
-  return axios.get(BASE_URL, {
+  return axios.get(BASE_URL)
-    headers: {
-      "Authorization": token
-    }
-  })
-}
-
-export async function patchOrder(order: OrderApiModel) {
-  return axios.patch(BASE_URL, order)
 }

src/data/enums/bannerStateEnum.ts

@@ -1,14 +1,12 @@
 export enum BannerStateEnum {
   ////////// System feedback //////////
   
-  // Unknown error
+  // Some error
   ERROR,
 
-  // Ticket added to basket
+  BASKETPRODUCTADDED,
-  BASKETTICKETADDED,
 
-  // Ticket removed from basket
+  BASKETPRODUCTREMOVED,
-  BASKETTICKETREMOVED,
 
 
   ////////// Exercise feedback //////////
@@ -33,8 +31,6 @@ export enum BannerStateEnum {
 
   EXERCISESOLVED25,
 
-  EXERCISESOLVED26,
-
   EXERCISESOLVED31,
 
   EXERCISESOLVED32,
@@ -67,20 +63,11 @@ export enum BannerStateEnum {
   ACCOUNTREGISTERERROR,
 
   // Status: 409 Conflict
-  ACCOUNTREGISTERUSERNAMEORMAILINUSE,
+  ACCOUNTREGISTERUSERNAMEINUSE,
 
   // Status: 200 OK
   ACCOUNTUPDATESUCCESSFUL,
 
-  // Local check on unvalid username
-  ACCOUNTUSERNAMETOOSHORT,
-
-  // Local check on unvalid password
-  ACCOUNTPASSWORDTOOSHORT,
-
-  // Local check on unvalid mail address
-  ACCOUNTMAILADDRESSUNVALID,
-
   // No status code, runs in local cache
   ACCOUNTLOGOUTSUCCESSFUL,
 

src/data/models/exercises/exerciseGroupModel.ts

@@ -2,7 +2,6 @@ export class ExerciseGroupModel {
   id = -1
   nameDe: string = ""
   nameEn: string = ""
-  icon: string = ""
   groupNr: number = 0
   descriptionDe: string = ""
   descriptionEn: string = ""

src/data/models/exercises/exerciseModel.ts

@@ -1,8 +1,7 @@
 import { ExerciseGroupModel } from "./exerciseGroupModel"
 
 export class ExerciseModel {
-  id: number = -1
+  id = -1
-  uuid: string = ""
   nameDe: string = ""
   nameEn: string = ""
   exerciseNr: number = 0
@@ -10,5 +9,4 @@ export class ExerciseModel {
   descriptionEn: string = ""
   solved: boolean = false
   exerciseGroup: ExerciseGroupModel
-  available: boolean = true
 }

src/data/models/files/filesApiModel.ts

@@ -1,13 +0,0 @@
-export class FilesApiModel {
-  name: string
-  size: number
-  content: string
-  url: string
-  copyright: CopyRightModel = new CopyRightModel()
-}
-
-class CopyRightModel {
-  license: string = ""
-  creator: string = ""
-  url: string = ""
-}

src/layouts/adminDataLayout.vue

@@ -34,7 +34,7 @@ defineProps({
         <outlined-button
           v-if="!hideAddButton"
           prepend-icon="mdi-plus"
-          color="success"
+          color="green"
           :disabled="fetchInProgress"
           @click="onAddClick()"
         >

src/locales/de.json

@@ -74,7 +74,7 @@
     "emailIsNotValid": "Ungültige E-Mail Addresse",
     "emailRequired": "E-Mail-Adresse benötigt",
     "accountManagement": "Account verwalten",
-    "accountManagementDescription": "Persönliche Daten, Konto löschen",
+    "accountManagementDescription": "Persönliche Daten, Adressen, Bezahlmethoden",
     "login": {
       "pleaseLoginToOrder": "Bitte anmelden zum bestellen",
       "backToLogin": "Zurück zum Login",
@@ -97,8 +97,7 @@
       "postalCode": "Postleitzahl",
       "placeOfResidence": "Wohnort",
       "bankName": "Name der Bank",
-      "iban": "IBAN",
+      "iban": "IBAN"
-      "actions": "Aktionen"
     },
     "deleteAccount": {
       "deleteAccount": "Account löschen",
@@ -110,16 +109,7 @@
     "addNewAccount": "Neuen Account hinzufügen",
     "accountRole": "Account Rolle",
     "noRealPaymentsNeeded": "Keine echten Kontodaten nötig!",
-    "administrator": "Administrator | Administratoren",
+    "administrator": "Administrator | Administratoren"
-    "managePaymentsDescription": "Bezahlarten hinzufügen, ändern, löschen",
-    "paymentsManagement": "Bezahlarten verwalten",
-    "payments": {
-      "editPayment": "Bezahlart bearbeiten",
-      "editAddress": "Adresse bearbeiten"
-    },
-    "addressManagementDetails": "Adressen hinzufügen, ändern, löschen",
-    "addressManagement": "Adressen verwalten",
-    "sessionTime": "Session time"
   },
   "order": {
     "oclock": "Uhr",
@@ -131,8 +121,7 @@
     "noOrdersText": "Bisher wurden keine Bestellungen von diesem Account getätigt. Gehe zum Warenkorb und bestelle!",
     "ordersDescription": "Übersicht aller getätigten Bestellungen",
     "order": "Bestellung | Bestellungen",
-    "notShipped": "noch nicht versendet",
+    "notShipped": "noch nicht versendet"
-    "orderState": "Bestellstatus"
   },
   "basket": {
     "addToBasket": "Zum Warenkorb hinzufügen",
@@ -165,29 +154,15 @@
     "factoryReset": {
       "factoryReset": "Zurücksetzen auf Werkseinstellungen",
       "dialog": {
-        "title": "Auf Werkseinstellungen zurücksetzen?",
+        "title": "Aus Werkseinstellungen zurücksetzen?",
         "description": "Sollen alle Einstellungen und Daten auf Werkseinstellungen zurückgesetzt werden? Alle Änderungen und Fortschritte gehen verloren!"
       }
-    },
+    }
-    "exercises": {
-      "available": "{0} von {1} Aufgaben verfügbar",
-      "edit": "Verfügbare Aufgaben bearbeiten",
-      "settings": "Aufgaben-Konfiguration"
-    },
-    "importExport": {
-      "title": "Import/Export Konfiguration",
-      "selectConfigFile": "Konfigurations-Datei auswählen",
-      "download": "Konfiguration exportieren",
-      "upload": "Datei hochladen"
-    },
-    "preferences": "Einstellungen"
   },
   "help": {
     "scoreBoard": {
       "exerciseGroupNr": "Aufgabengruppe {0}: ",
-      "exerciseNr": "Aufgabe {0}.{1}: ",
+      "exerciseNr": "Aufgabe {0}.{1}: "
-      "generatePdf": "PDF generieren",
-      "personalSolutionKey": "Persönlicher Lösungsschlüssel"
     }
   },
   "bannerMessages": {
@@ -198,6 +173,7 @@
     "exerciseProgressResetSuccessful": "Aufgabenfortschritt erfolgreich zurück gesetzt!",
     "registerSuccessful": "Account erfolgreich erstellt!",
     "registerError": "Fehler beim Erstellen des Accounts",
+    "usernameInUse": "Der Accountname ist bereits vergeben!",
     "accountUpdated": "Account erfolgreich aktualisiert",
     "logoutSuccessful": "Logout erfolgreich",
     "orderPlaceSuccessfull": "Bestellung erfolgreich aufgegeben",
@@ -211,11 +187,7 @@
     "genreDeleteError": "Fehler beim Löschen des Genres",
     "genreDeleteSuccessful": "Genre erfolgreich gelöscht",
     "genreSavedError": "Fehler beim Speichern des Genres",
-    "genreSavedSuccessful": "Genre erfolgreich gespeichert",
+    "genreSavedSuccessful": "Genre erfolgreich gespeichert"
-    "accountPasswordTooShort": "Passwort ist zu kurz",
-    "accountUsernameTooShort": "Username ist zu kurz",
-    "accountMailAddressUnvalid": "Mail-Adresse ungültig",
-    "usernameOrMailInUse": "Der Accountname und/oder die Mail-Adresse sind bereits vergeben!"
   },
   "misc": {
     "404": {
@@ -241,13 +213,12 @@
       "cancel": "Abbrechen",
       "more": "Mehr",
       "confirm": "Bestätigen",
-      "back": "Zurück",
       "next": "Weiter"
     },
     "validation": {
       "required": "Darf nicht leer bleiben",
       "noDigitsAllowed": "Zahlen sind nicht erlaubt",
-      "notEnoughChars": "Nicht genug Zeichen",
+      "notEnoughChars": "Nicht wenige Zeichen",
       "tooMuchChars": "Zu viele Zeichen",
       "onlyDigitsAllowed": "Nur Zahlen erlaubt",
       "digitsAtStartNeeded": "Muss mit einer Zahl beginnen"
@@ -258,16 +229,14 @@
     "firstStartup": {
       "title": "Ersteinrichtung",
       "description": "Die Datenbank wird eingerichtet. Bitte warten...",
-      "createDatabase": "Datenbank Einrichtung",
+      "createDatabase": "Erstelle Datenbank...",
       "complete": "Fertig",
       "finished": "Abgeschlossen",
       "createExercises": "Erstelle Aufgaben...",
       "connectToServer": "Server",
       "database": "Datenbank",
       "exercises": "Aufgaben",
-      "userData": "Persönliche Daten",
+      "userData": "Persönliche Daten"
-      "lookAndFeel": "Look and feel",
-      "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",
@@ -275,31 +244,9 @@
     "chooseFile": "Datei auswählen",
     "chooseDestinationFolder": "Zielordner auswählen",
     "upload": "Hochladen",
-    "fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus",
+    "fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus"
-    "testEnvironment": "Testumgebung",
-    "search": {
-      "empty": {
-        "headline": "So leer hier..."
-      },
-      "searchterm": "Suchbegriff",
-      "globalsearch": "Globale Suche"
-    },
-    "submit": "Absenden",
-    "content": "Inhalt",
-    "source": "Quelle",
-    "softwareVersion": "Software Version",
-    "license": "Lizenz",
-    "developer": "Entwickler",
-    "developedFor": "Entwickelt im Auftrag",
-    "copyright": "Copyright",
-    "githubRepository": "GitHub Repository",
-    "projectPage": "Projektseite"
   },
   "genre": {
-    "withoutBand": "ohne Band",
+    "withoutBand": "ohne Band"
-    "popular": "Beliebte Genres"
-  },
-  "admin": {
-    "adminpanel": "Admin Panel"
   }
 }

src/locales/en.json

@@ -74,7 +74,7 @@
     "emailIsNotValid": "E-Mail not valid",
     "emailRequired": "E-Mail required",
     "accountManagement": "Manage Account",
-    "accountManagementDescription": "Personal data, delete account",
+    "accountManagementDescription": "Personal data, addresses, payments",
     "login": {
       "pleaseLoginToOrder": "Please login to order",
       "backToLogin": "Back to Login",
@@ -97,8 +97,7 @@
       "postalCode": "Postal code",
       "placeOfResidence": "Place of residence",
       "bankName": "Name of bank",
-      "iban": "IBAN",
+      "iban": "IBAN"
-      "actions": "Actions"
     },
     "deleteAccount": {
       "deleteAccount": "Delete Account",
@@ -110,16 +109,7 @@
     "addNewAccount": "Add new account",
     "accountRole": "Account Role",
     "noRealPaymentsNeeded": "No real payment data required!",
-    "administrator": "Administrator",
+    "administrator": "Administrator"
-    "managePaymentsDescription": "Add, change, remove payments",
-    "paymentsManagement": "Manage payments",
-    "payments": {
-      "editPayment": "Edit Payment",
-      "editAddress": "Edit address"
-    },
-    "addressManagementDetails": "Add, change, remove addresses",
-    "addressManagement": "Manage addresses",
-    "sessionTime": "Session time"
   },
   "order": {
     "oclock": "o'clock",
@@ -128,11 +118,10 @@
     "takeOrder": "Execute order",
     "noOrders": "No orders found",
     "orderedAt": "Ordered at",
-    "noOrdersText": "No orders have been placed with this account yet. Go to your shopping cart and place your order!",
+    "noOrdersText": "Bisher wurden keine Bestellungen von diesem Account getätigt. Gehe zum Warenkorb und bestelle!",
     "ordersDescription": "Overview of all placed orders",
     "order": "Order | Orders",
-    "notShipped": "don't shipped",
+    "notShipped": "don't shipped"
-    "orderState": "Order state"
   },
   "basket": {
     "addToBasket": "Add to basket",
@@ -168,28 +157,12 @@
         "title": "Factory reset?",
         "description": "Do you really want to reset everything? Every change will be lost!"
       }
-    },
+    }
-    "exercises": {
-      "settings": "Exercise Configuration",
-      "available": "{0} of {1} exercises are available",
-      "uploadExerciseConfig": "Upload exercise config",
-      "edit": "Edit available exercises",
-      "upload": "Upload exercises config"
-    },
-    "importExport": {
-      "title": "Import/Export config",
-      "selectConfigFile": "Select config file",
-      "upload": "Upload file",
-      "download": "Export config"
-    },
-    "preferences": "Preferences"
   },
   "help": {
     "scoreBoard": {
       "exerciseGroupNr": "Exercise Group {0}: ",
-      "exerciseNr": "Exercise {0}.{1}: ",
+      "exerciseNr": "Exercise {0}.{1}: "
-      "generatePdf": "Generate PDF",
-      "personalSolutionKey": "Personal solution key"
     }
   },
   "bannerMessages": {
@@ -200,6 +173,7 @@
     "exerciseProgressResetSuccessful": "Exercise progress successfully resetted!",
     "registerSuccessful": "Account successfully created!",
     "registerError": "Error on register account",
+    "usernameInUse": "The username is already in use!",
     "accountUpdated": "Account successfully updated",
     "logoutSuccessful": "Logout successfull",
     "orderPlaceSuccessfull": "Order successfully placed",
@@ -213,11 +187,7 @@
     "genreDeleteError": "Error on deleting Genre",
     "genreDeleteSuccessful": "Genre successfully deleted",
     "genreSavedError": "Error on saving genre",
-    "genreSavedSuccessful": "Genre successfully saved",
+    "genreSavedSuccessful": "Genre successfully saved"
-    "accountPasswordTooShort": "Password too short",
-    "accountUsernameTooShort": "Username too short",
-    "accountMailAddressUnvalid": "Mail-Address unvalid",
-    "usernameOrMailInUse": "The username and/or the mail address are already in use!"
   },
   "misc": {
     "404": {
@@ -243,7 +213,6 @@
       "cancel": "Cancel",
       "more": "More",
       "confirm": "Confirm",
-      "back": "Back",
       "next": "Next"
     },
     "validation": {
@@ -260,14 +229,14 @@
     "firstStartup": {
       "title": "First startup",
       "description": "Creating database. Please wait...",
-      "createDatabase": "Create Database",
+      "createDatabase": "Create Database...",
       "complete": "Complete",
+      "createExercises": "Create Exercises...",
+      "finished": "Finished",
       "connectToServer": "Server",
       "database": "Database",
       "exercises": "Exercises",
-      "userData": "User data",
+      "userData": "User data"
-      "lookAndFeel": "Look and feel",
-      "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",
@@ -275,31 +244,9 @@
     "chooseFile": "Choose file",
     "chooseDestinationFolder": "Choose destination folder",
     "upload": "Upload",
-    "fulfillYourPersonalDataFirst": "Go to settings and enter your name and the right register number",
+    "fulfillYourPersonalDataFirst": "Go to settings and enter your name and the right register number"
-    "testEnvironment": "Test Environment",
-    "search": {
-      "empty": {
-        "headline": "So empty here..."
-      },
-      "searchterm": "Search term",
-      "globalsearch": "Global Search"
-    },
-    "submit": "Submit",
-    "content": "Content",
-    "source": "Source",
-    "softwareVersion": "Software Version",
-    "license": "License",
-    "developer": "Developer",
-    "developedFor": "Developed for",
-    "copyright": "Copyright",
-    "githubRepository": "GitHub Repository",
-    "projectPage": "Project page"
   },
   "genre": {
-    "withoutBand": "without Band",
+    "withoutBand": "without Band"
-    "popular": "Popular Genres"
-  },
-  "admin": {
-    "adminpanel": "Admin Panel"
   }
 }

src/pages/account/accountAddressesPage/addressEditDialog.vue

@@ -1,79 +0,0 @@
-<script setup lang="ts">
-import actionDialog from '@/components/basics/actionDialog.vue';
-import OutlinedButton from '@/components/basics/outlinedButton.vue';
-import { getIbanRules, getNumberStartRules, getPostalRules, getStringRules } from '@/scripts/validationRules';
-import { useAccountStore } from '@/stores/account.store';
-import cardViewOneLine from '@/components/basics/cardViewOneLine.vue';
-import { ref } from 'vue';
-
-const valid = ref(false)
-
-const accountStore = useAccountStore()
-</script>
-
-<template>
-  <action-dialog
-    v-model="accountStore.showEditDialog"
-    max-width="800"
-    :title="$t('account.payments.editAddress')"
-  >
-    <v-container>
-      <v-form v-model="valid">
-        <v-row class="pt-5">
-            <v-col>
-              <v-text-field
-                :label="$t('account.userData.street')"
-                v-model="accountStore.address.street"
-                :rules="getStringRules()"
-                variant="outlined"
-                clearable
-              />
-            </v-col>
-            <v-col>
-              <v-text-field
-                :label="$t('account.userData.houseNumber')"
-                v-model="accountStore.address.houseNumber"
-                :rules="getNumberStartRules()"
-                variant="outlined"
-                clearable
-              />
-            </v-col>
-          </v-row>
-
-          <v-row>
-            <v-col>
-              <v-text-field
-                :label="$t('account.userData.postalCode')"
-                v-model="accountStore.address.postalCode"
-                :rules="getPostalRules()"
-                variant="outlined"
-                clearable
-              />
-            </v-col>
-            <v-col>
-              <v-text-field
-                :label="$t('account.userData.placeOfResidence')"
-                v-model="accountStore.address.city"
-                :rules="getStringRules()"
-                variant="outlined"
-                clearable
-              />
-            </v-col>
-          </v-row>
-      </v-form>
-
-    </v-container>
-
-    <template #actions>
-      <outlined-button
-        color="success"
-        prepend-icon="mdi-content-save"
-        :disabled="!valid"
-        :loading="accountStore.fetchInProgress"
-        @click="accountStore.saveAddress"
-      >
-        {{ $t('misc.actions.save') }}
-      </outlined-button>
-    </template>
-  </action-dialog>
-</template>

src/pages/account/accountAddressesPage/index.vue

@@ -1,51 +0,0 @@
-<script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
-import { useAccountStore } from '@/stores/account.store';
-import { useFeedbackStore } from '@/stores/feedback.store';
-import addressEditDialog from './addressEditDialog.vue';
-
-const accountStore = useAccountStore()
-const feedbackStore = useFeedbackStore()
-
-const headers = [
-  { title: feedbackStore.i18n.t('account.userData.street'), value: "street" },
-  { title: feedbackStore.i18n.t('account.userData.houseNumber'), value: "houseNumber" },
-  { title: feedbackStore.i18n.t('account.userData.postalCode'), value: "postalCode" },
-  { title: feedbackStore.i18n.t('account.userData.placeOfResidence'), value: "city" },
-  { title: feedbackStore.i18n.t('account.userData.actions'), value: "actions", width: 130 }
-]
-
-accountStore.refreshAccount()
-</script>
-
-<template>
-  <data-layout
-    :add-button-string="$t('misc.actions.add')"
-    :fetch-in-progress="accountStore.fetchInProgress"
-    :on-add-click="() => { accountStore.newAddress() }"
-  >
-    <v-data-table
-      :headers="headers"
-      :items="accountStore.userAccount.addresses"
-      :loading="accountStore.fetchInProgress"
-    >
-      <template #item.actions="{ item }">
-        <v-btn
-          icon="mdi-pencil"
-          variant="plain"
-          color="orange"
-          @click="accountStore.editAddress(item)"
-        />
-
-        <v-btn
-          icon="mdi-delete"
-          variant="plain"
-          color="red"
-          @click="accountStore.removeAddress(item)"
-        />
-      </template>
-    </v-data-table>
-  </data-layout>
-
-  <address-edit-dialog />
-</template>

src/pages/account/accountDataPage/accountDataCard.vue

@@ -81,6 +81,7 @@ const stringRules = [
           v-model="accountStore.userAccount.firstName"
           variant="outlined"
           :rules="stringRules"
+          hide-details
         />
       </v-col>
       <v-col>
@@ -89,6 +90,7 @@ const stringRules = [
           v-model="accountStore.userAccount.lastName"
           variant="outlined"
           :rules="stringRules"
+          hide-details
         />
       </v-col>
     </v-row>

src/pages/account/accountDataPage/accountManagingCard.vue

@@ -18,7 +18,7 @@ const accountStore = useAccountStore()
       <v-col class="d-flex justify-center align-center">
         <outlined-button
           prepend-icon="mdi-delete"
-          color="error"
+          color="red"
           :loading="accountStore.fetchInProgress"
           @click="showConfirmDialog = true"
         >
@@ -29,7 +29,7 @@ const accountStore = useAccountStore()
       <v-col class="d-flex justify-center align-center">
         <outlined-button
           prepend-icon="mdi-content-save"
-          color="success"
+          color="green"
           :loading="accountStore.fetchInProgress"
           @click="accountStore.updateAccount()"
         >

src/pages/account/accountDataPage/addressesCard.vue

@@ -0,0 +1,111 @@
+<script setup lang="ts">
+import cardView from '@/components/basics/cardView.vue';
+import { useAccountStore } from '@/stores/account.store';
+import outlinedButton from '@/components/basics/outlinedButton.vue';
+import { AddressModel } from '@/data/models/user/addressModel';
+import { getNumberStartRules, getPostalRules, getStringRules } from '@/scripts/validationRules';
+
+const accountStore = useAccountStore()
+</script>
+
+<template>
+  <card-view 
+    icon="mdi-home"
+    :title="$t('account.userData.address', 2)"
+  >
+    <v-expansion-panels v-if="accountStore.userAccount.addresses.length > 0">
+      <v-expansion-panel
+        v-for="address in accountStore.userAccount.addresses"
+        color="primary"
+      >
+        <template #title>
+          <div v-if="address.street != undefined">
+            {{ address.street }}
+          </div>
+          
+          &nbsp;
+          
+          <div v-if="address.houseNumber != undefined">
+            {{ address.houseNumber }}
+          </div>
+        </template>
+
+        <template #text>
+          <v-row class="pt-5">
+            <v-col>
+              <v-text-field
+                :label="$t('account.userData.street')"
+                v-model="address.street"
+                :rules="getStringRules()"
+                variant="outlined"
+                clearable
+                hide-details
+              />
+            </v-col>
+            <v-col>
+              <v-text-field
+                :label="$t('account.userData.houseNumber')"
+                v-model="address.houseNumber"
+                :rules="getNumberStartRules()"
+                variant="outlined"
+                clearable
+                hide-details
+              />
+            </v-col>
+          </v-row>
+
+          <v-row>
+            <v-col>
+              <v-text-field
+                :label="$t('account.userData.postalCode')"
+                v-model="address.postalCode"
+                :rules="getPostalRules()"
+                variant="outlined"
+                clearable
+                hide-details
+              />
+            </v-col>
+            <v-col>
+              <v-text-field
+                :label="$t('account.userData.placeOfResidence')"
+                v-model="address.city"
+                :rules="getStringRules()"
+                variant="outlined"
+                clearable
+                hide-details
+              />
+            </v-col>
+          </v-row>
+
+          <v-row>
+            <v-col class="d-flex justify-center align-center">
+              <outlined-button
+                @click="accountStore.removeAddress(address)"
+                color="red"
+                prepend-icon="mdi-delete"
+              >
+                {{ $t('misc.actions.remove') }}
+              </outlined-button>
+            </v-col>
+          </v-row>
+        </template>
+      </v-expansion-panel>
+    </v-expansion-panels>
+
+    <v-empty-state
+      v-else
+      :title="$t('account.noAddresses')"
+      icon="mdi-home-off"
+    />
+
+    <template #actions>
+      <outlined-button
+        @click="accountStore.userAccount.addresses.push(new AddressModel())"
+        prepend-icon="mdi-plus"
+        color="green"
+      >
+        {{ $t('misc.actions.add') }}
+      </outlined-button>
+    </template>
+  </card-view>
+</template>

src/pages/account/accountDataPage/index.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import accountDataCard from './accountDataCard.vue';
 import accountManagingCard from './accountManagingCard.vue';
+import addressesCard from './addressesCard.vue';
+import paymentsCard from './paymentsCard.vue';
 import { useRouter } from 'vue-router';
 import accountSubPageLayout from '@/layouts/accountSubPageLayout.vue';
 
@@ -15,6 +17,18 @@ const router = useRouter()
       </v-col>
     </v-row>
 
+    <v-row>
+      <v-col>
+        <addresses-card />
+      </v-col>
+    </v-row>
+
+    <v-row>
+      <v-col>
+        <payments-card />
+      </v-col>
+    </v-row>
+
     <v-row>
       <v-col>
         <account-managing-card />

src/pages/account/accountDataPage/paymentsCard.vue

@@ -0,0 +1,97 @@
+<script setup lang="ts">
+import cardView from '@/components/basics/cardView.vue';
+import { useAccountStore } from '@/stores/account.store';
+import outlinedButton from '@/components/basics/outlinedButton.vue';
+import { PaymentModel } from '@/data/models/user/paymentModel';
+import { getIbanRules, getStringRules } from '@/scripts/validationRules';
+import cardViewOneLine from '@/components/basics/cardViewOneLine.vue';
+
+const accountStore = useAccountStore()
+</script>
+
+<template>
+  <card-view 
+    icon="mdi-currency-usd"
+    :title="$t('account.userData.payment', 2)"
+  >
+    <v-row>
+      <v-col>
+        <card-view-one-line
+          color="amber"
+          prepend-icon="mdi-alert"
+          :title="$t('account.noRealPaymentsNeeded')"
+        />
+      </v-col>
+    </v-row>
+
+    <v-row v-if="accountStore.userAccount.payments.length > 0">
+      <v-col>
+        <v-expansion-panels>
+          <v-expansion-panel
+            v-for="payment in accountStore.userAccount.payments"
+            color="primary"
+          >
+            <template #title>
+              {{ payment.bankName }}
+            </template>
+            <template #text>
+              <v-row class="pt-5">
+                <v-col>
+                  <v-text-field
+                    :label="$t('account.userData.bankName')"
+                    v-model="payment.bankName"
+                    :rules="getStringRules()"
+                    variant="outlined"
+                    hide-details
+                  />
+                </v-col>
+                <v-col>
+                  <v-text-field
+                    :label="$t('account.userData.iban')"
+                    v-model="payment.iban"
+                    :rules="getIbanRules()"
+                    variant="outlined"
+                    hide-details
+                  />
+                </v-col>
+              </v-row>
+
+              <v-row>
+                <v-col class="d-flex justify-center align-center">
+                  <outlined-button
+                    @click="accountStore.removePayment(payment)"
+                    color="red"
+                    prepend-icon="mdi-delete"
+                  >
+                    {{ $t('misc.actions.remove') }}
+                  </outlined-button>
+                </v-col>
+              </v-row>
+            </template>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-col>
+    </v-row>
+
+    <v-row v-else>
+      <v-col>
+        <v-empty-state
+          :title="$t('account.noPayments')"
+          icon="mdi-currency-usd-off"
+        />
+      </v-col>
+    </v-row>
+
+
+
+    <template #actions>
+      <outlined-button
+        @click="accountStore.userAccount.payments.push(new PaymentModel())"
+        prepend-icon="mdi-plus"
+        color="green"
+      >
+        {{ $t('misc.actions.add') }}
+      </outlined-button>
+    </template>
+  </card-view>
+</template>

src/pages/account/accountHomePage/index.vue

@@ -1,76 +1,60 @@
 <script setup lang="ts">
 import { useAccountStore } from '@/stores/account.store';
-import dashboardCard from '@/components/pageParts/dashboardCard.vue';
+import cardView from '@/components/basics/cardView.vue';
-import { useOrderStore } from '@/stores/order.store';
-import OutlinedButton from '@/components/basics/outlinedButton.vue';
 import { useRouter } from 'vue-router';
-import moment from 'moment';
-import { millisecondsToHumanReadableString } from '@/scripts/dateTimeScripts';
 
 const accountStore = useAccountStore()
-const orderStore = useOrderStore()
 const router = useRouter()
-
-orderStore.getOrdersOfAccount(accountStore.userAccount, accountStore.userAccountToken)
-accountStore.refreshAccount()
 </script>
 
 <template>
+  <v-container max-width="1000">
+    <v-row>
+      <v-col>
+        <card-view
+          :title="$t('misc.greeting', { msg: accountStore.userAccount.username })"
+          icon="mdi-hand-wave"
+        >
           <v-container>
             <v-row>
-      <dashboard-card
+              <v-col>
+                <card-view
                   :title="$t('order.order', 2)"
                   icon="mdi-basket-check"
-        :first-line="orderStore.orders.length + ' ' + $t('order.order', 2)"
+                  @click="router.push('/account/orders')"
-        :second-line="$t('order.ordersDescription')"
+                >
-        button-route="/account/orders"
+                  {{ $t('order.ordersDescription') }}
-        :loading="orderStore.fetchInProgress"
+                </card-view>
-      />
+              </v-col>
+            </v-row>
 
-      <dashboard-card
+            <v-row>
+              <v-col>
+                <card-view
                   :title="$t('account.accountManagement')"
                   icon="mdi-account"
-        :first-line="accountStore.userAccount.username"
+                  @click="router.push('/account/data')"
-        :second-line="$t('account.accountManagementDescription')"
-        :loading="accountStore.fetchInProgress"
-        button-route="/account/data"
-      />
-
-      <dashboard-card
-        :title="$t('account.addressManagement')"
-        icon="mdi-city"
-        :first-line="accountStore.userAccount.addresses?.length + ' ' + 
-          $t('account.userData.address', accountStore.userAccount.addresses?.length)"
-        :second-line="$t('account.addressManagementDetails')"
-        :loading="accountStore.fetchInProgress"
-        button-route="/account/addresses"
-      />
-
-      <dashboard-card
-        :title="$t('account.paymentsManagement', 2)"
-        icon="mdi-currency-eur"
-        :first-line="accountStore.userAccount.payments?.length + ' ' + 
-          $t('account.userData.payment', accountStore.userAccount.payments?.length)"
-        :second-line="$t('account.managePaymentsDescription')"
-        :loading="accountStore.fetchInProgress"
-        button-route="/account/payments"
-      />
-
-      <dashboard-card
-        :title="$t('account.logout.logout')"
-        :first-line="millisecondsToHumanReadableString(moment().diff(moment(accountStore.loggedInTimeStamp))) + ' h ' + $t('account.sessionTime')"
-        :second-line="$t('account.logout.logoutDescription')"
-        icon="mdi-logout"
                 >
-        <template #actions>
+                  {{ $t('account.accountManagementDescription') }}
-          <outlined-button
+                </card-view>
-            color="error"
+              </v-col>
+            </v-row>
+
+            <v-row>
+              <v-col>
+                <card-view
+                  :title="$t('account.logout.logout')"
+                  icon="mdi-logout"
                   @click="accountStore.logout(); router.push('/account/login')"
                 >
-            {{ $t('account.logout.logout') }}
+                  {{ $t('account.logout.logoutDescription') }}
-          </outlined-button>
+                </card-view>
-        </template>
+              </v-col>
-      </dashboard-card>
+            </v-row>
+          </v-container>
+        </card-view>
+        
+      </v-col>
     </v-row>
   </v-container>
 </template>

src/pages/account/accountPaymentsPage/index.vue

@@ -1,49 +0,0 @@
-<script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
-import { useAccountStore } from '@/stores/account.store';
-import { useFeedbackStore } from '@/stores/feedback.store';
-import PaymentEditDialog from './paymentEditDialog.vue';
-
-const accountStore = useAccountStore()
-const feedbackStore = useFeedbackStore()
-
-const headers = [
-  { title: feedbackStore.i18n.t('account.userData.bankName'), value: "bankName" },
-  { title: feedbackStore.i18n.t('account.userData.iban'), value: "iban" },
-  { title: feedbackStore.i18n.t('account.userData.actions'), value: "actions", width: 130 }
-]
-
-accountStore.refreshAccount()
-</script>
-
-<template>
-  <data-layout
-    :add-button-string="$t('misc.actions.add')"
-    :fetch-in-progress="accountStore.fetchInProgress"
-    :on-add-click="() => { accountStore.newPayment() }"
-  >
-    <v-data-table
-      :headers="headers"
-      :items="accountStore.userAccount.payments"
-      :loading="accountStore.fetchInProgress"
-    >
-      <template #item.actions="{ item }">
-        <v-btn
-          icon="mdi-pencil"
-          variant="plain"
-          color="orange"
-          @click="accountStore.editPayment(item)"
-        />
-
-        <v-btn
-          icon="mdi-delete"
-          variant="plain"
-          color="red"
-          @click="accountStore.removePayment(item)"
-        />
-      </template>
-    </v-data-table>
-  </data-layout>
-
-  <payment-edit-dialog />
-</template>

src/pages/account/accountPaymentsPage/paymentEditDialog.vue

@@ -1,69 +0,0 @@
-<script setup lang="ts">
-import actionDialog from '@/components/basics/actionDialog.vue';
-import OutlinedButton from '@/components/basics/outlinedButton.vue';
-import { getIbanRules, getStringRules } from '@/scripts/validationRules';
-import { useAccountStore } from '@/stores/account.store';
-import cardViewOneLine from '@/components/basics/cardViewOneLine.vue';
-import { ref } from 'vue';
-
-const valid = ref(false)
-
-const accountStore = useAccountStore()
-</script>
-
-<template>
-  <action-dialog
-    v-model="accountStore.showEditDialog"
-    max-width="800"
-    :title="$t('account.payments.editPayment')"
-  >
-    <v-container>
-      <v-row>
-        <v-col>
-          <card-view-one-line
-            color="warning"
-            prepend-icon="mdi-alert"
-            :title="$t('account.noRealPaymentsNeeded')"
-          />
-        </v-col>
-      </v-row>
-
-      <v-form v-model="valid">
-        <v-row>
-          <v-col>
-            <v-text-field
-              :label="$t('account.userData.bankName')"
-              v-model="accountStore.payment.bankName"
-              :rules="getStringRules(8)"
-              variant="outlined"
-            />
-          </v-col>
-        </v-row>
-
-        <v-row>
-          <v-col>
-            <v-text-field
-              :label="$t('account.userData.iban')"
-              v-model="accountStore.payment.iban"
-              :rules="getIbanRules()"
-              variant="outlined"
-            />
-          </v-col>
-        </v-row>
-      </v-form>
-
-    </v-container>
-
-    <template #actions>
-      <outlined-button
-        color="success"
-        prepend-icon="mdi-content-save"
-        :disabled="!valid"
-        :loading="accountStore.fetchInProgress"
-        @click="accountStore.savePayment"
-      >
-        {{ $t('misc.actions.save') }}
-      </outlined-button>
-    </template>
-  </action-dialog>
-</template>

src/pages/account/loginPage/loginForm.vue

@@ -33,7 +33,6 @@ async function startLogin() {
           v-model="accountStore.loginData.username"
           variant="outlined"
           clearable
-          hide-details
           @keyup.enter="startLogin"
           id="txt-username"
         />
@@ -49,7 +48,6 @@ async function startLogin() {
           variant="outlined"
           v-model="accountStore.loginData.password"
           clearable
-          hide-details
           @keyup.enter="startLogin"
           id="txt-password"
         />
@@ -69,7 +67,7 @@ async function startLogin() {
         append-icon="mdi-arrow-right"
         @click="startLogin"
         :loading="accountStore.fetchInProgress"
-        color="success"
+        color="green"
         id="btn-login"
       >
         {{ $t('account.login.login') }}

src/pages/account/loginPage/registerForm.vue

@@ -3,14 +3,15 @@ import cardView from '@/components/basics/cardView.vue';
 import outlinedButton from '@/components/basics/outlinedButton.vue';
 import { useAccountStore } from '@/stores/account.store';
 import { getEmailRules, getPasswordRules, getStringRules } from '@/scripts/validationRules';
+import { useRouter } from 'vue-router';
 
 const showRegisterCard = defineModel("showRegisterCard", { type: Boolean, default: false })
 const accountStore = useAccountStore()
+const router = useRouter()
 
 async function registerAccount() {
   accountStore.registerAccount()
     .then(result => {
-      console.log(result)
       if (result) {
         showRegisterCard.value = false
       }
@@ -30,6 +31,7 @@ async function registerAccount() {
           prepend-icon="mdi-account"
           v-model="accountStore.registerData.username"
           clearable
+          hide-details
           variant="outlined"
           :rules="getStringRules()"
         />
@@ -44,6 +46,7 @@ async function registerAccount() {
           type="password"
           v-model="accountStore.registerData.password"
           clearable
+          hide-details
           variant="outlined"
           :rules="getPasswordRules()"
         />
@@ -58,6 +61,7 @@ async function registerAccount() {
           v-model="accountStore.registerData.email"
           :rules="getEmailRules()"
           variant="outlined"
+          hide-details
           clearable
         />
       </v-col>
@@ -76,7 +80,6 @@ async function registerAccount() {
         prepend-icon="mdi-account-plus"
         @click="registerAccount"
         :loading="accountStore.fetchInProgress"
-        color="success"
       >
         {{ $t('account.register') }}
       </outlined-button>

src/pages/account/ordersPage/index.vue

@@ -8,7 +8,7 @@ import { useOrderStore } from '@/stores/order.store';
 const accountStore = useAccountStore()
 const orderStore = useOrderStore()
 
-orderStore.getOrdersOfAccount(accountStore.userAccount, accountStore.userAccountToken)
+orderStore.getOrdersOfAccount(accountStore.userAccount)
 </script>
 
 <template>

src/pages/admin/accountsAdminPage/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useAccountStore } from '@/stores/account.store';
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import { useFeedbackStore } from '@/stores/feedback.store';
 
 const accountStore = useAccountStore()
@@ -19,7 +19,7 @@ accountStore.getAllAccounts()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :add-button-string="$t('account.addNewAccount')"
     :fetch-in-progress="accountStore.fetchInProgress"
   >
@@ -44,5 +44,5 @@ accountStore.getAllAccounts()
         /> -->
       </template>
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 </template>

src/pages/admin/bandsAdminPage/bandEditDialog.vue

@@ -93,7 +93,7 @@ function itemProps(item: GenreModel) {
     
     <template #actions>
       <outlined-button
-        color="success"
+        color="green"
         @click="bandStore.saveBand"
         :loading="bandStore.fetchInProgress"
       >

src/pages/admin/bandsAdminPage/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useBandStore } from '@/stores/band.store';
 import bandEditDialog from './bandEditDialog.vue';
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import { useFeedbackStore } from '@/stores/feedback.store';
 
 const bandStore = useBandStore()
@@ -22,7 +22,7 @@ bandStore.getBands()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :add-button-string="$t('band.addNewBand')"
     :fetch-in-progress="bandStore.fetchInProgress"
     :on-add-click="() => bandStore.newBand()"
@@ -72,7 +72,7 @@ bandStore.getBands()
         /> -->
       </template>
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 
   <band-edit-dialog />
 </template>

src/pages/admin/concertsAdminPage/index.vue

@@ -2,7 +2,7 @@
 import { useBandStore } from '@/stores/band.store';
 import { useConcertStore } from '@/stores/concert.store';
 import { useFeedbackStore } from '@/stores/feedback.store';
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import moment from 'moment';
 
 const concertStore = useConcertStore()
@@ -25,7 +25,7 @@ concertStore.getConcerts()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :add-button-string="$t('concert.addNewConcert')"
     :fetch-in-progress="concertStore.fetchInProgress"
     :on-add-click="() => concertStore.newConcert()"
@@ -40,7 +40,7 @@ concertStore.getConcerts()
       </template>
 
       <template #item.price="{ item }">
-        {{ item.price.toFixed(2) + '€' }}
+        {{ item.price.toFixed(2) }} €
       </template>
 
       <template #item.image="{ item }">
@@ -73,5 +73,5 @@ concertStore.getConcerts()
         /> -->
       </template>
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 </template>

src/pages/admin/dashboardPage/dashboardCard.vue

@@ -37,7 +37,7 @@ defineProps({
         {{ secondLine }}
       </v-skeleton-loader>
 
-      <template #actions v-if="!$slots.actions">
+      <template #actions>
         <outlined-button
           @click="router.push(buttonRoute)"
           :loading="loading"
@@ -45,10 +45,6 @@ defineProps({
           {{ $t('misc.actions.more') }}
         </outlined-button>
       </template>
-
-      <template #actions v-else>
-        <slot name="actions"></slot>
-      </template>
     </card-view>
   </v-col>
 </template>

src/pages/admin/dashboardPage/index.vue

@@ -5,7 +5,7 @@ import { useAccountStore } from '@/stores/account.store';
 import { useLocationStore } from '@/stores/location.store';
 import { useGenreStore } from '@/stores/genre.store';
 import { usePreferencesStore } from '@/stores/preferences.store';
-import dashboardCard from '../../../components/pageParts/dashboardCard.vue';
+import dashboardCard from './dashboardCard.vue';
 import { useOrderStore } from '@/stores/order.store';
 import { useFilesStore } from '@/stores/files.store';
 

src/pages/admin/filesAdminPage/fileUploadDialog.vue

@@ -46,14 +46,14 @@ const test = ref()
         </v-row>
       </v-container>
 
-      <v-btn type="submit">{{ $t('misc.submit') }}</v-btn>
+      <v-btn type="submit">Submit</v-btn>
     </v-form>
 
     <template #actions>
       <outlined-button
         @click="filesStore.uploadFile"
         prepend-icon="mdi-file-upload"
-        color="success"
+        color="green"
         :disabled="filesStore.fileUploadDir.length == 0 || filesStore.fileUpload == undefined"
         :loading="filesStore.fetchInProgress"
       >

src/pages/admin/filesAdminPage/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import { ref } from 'vue';
 import FileUploadDialog from './fileUploadDialog.vue';
 import { useFilesStore } from '@/stores/files.store';
@@ -12,14 +12,13 @@ filesStore.getStaticFolders()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :add-button-string="$t('misc.uploadFile')"
     :fetch-in-progress="filesStore.fetchInProgress"
     :on-add-click="() => { filesStore.showFileUploadDialog = true }"
     :hide-add-button="true" 
   >
     <v-row >
-      <!-- Column folder -->
       <v-col cols="2" class="border">
         <v-list>
           <v-list-item
@@ -28,13 +27,10 @@ filesStore.getStaticFolders()
             :value="folder"
             :title="folder.name + '/'"
             @click="filesStore.selectedFolder = folder; filesStore.getStaticFiles()"
-            prepend-icon="mdi-folder"
           />
         </v-list>
       </v-col>
 
-
-      <!-- Column files in folder -->
       <v-col cols="4" class="border">
         <v-skeleton-loader
           :loading="filesStore.fetchInProgress"
@@ -45,74 +41,39 @@ filesStore.getStaticFolders()
               v-for="file of filesStore.staticFiles"
               :title="file.name"
               :value="file.name"
+              :subtitle="Math.round(file.size / 1024) + ' KB'"
               @click="() => { filesStore.selectedFile = file }"
-            >
-              <template #prepend>
-                <v-icon
-                  :icon="file.name.endsWith('js') ? 'mdi-file' : 'mdi-image'"
-                  :color="file.copyright != undefined ? 'grey' : 'red'"
             />
-              </template>
-            </v-list-item>
           </v-list>
         </v-skeleton-loader>
       </v-col>
 
-
-      <!-- File detail viewer -->
       <v-col class="border">
         <v-row>
-          <v-col v-if="filesStore.selectedFile != undefined">
+          <v-col>
+            {{ filesStore.selectedFile.url }}
+          </v-col>
+        </v-row>
+
+        <v-row>
+          <v-col>
             <v-textarea
-              v-if="filesStore.selectedFile != undefined && filesStore.selectedFile.name.endsWith('js')"
+              v-if="filesStore.selectedFile != undefined && filesStore.selectedFile.name.endsWith('html')"
               :model-value="filesStore.selectedFile.content"
               variant="outlined"
-              :label="$t('misc.content')"
+              label="Content"
               height="300"
               rows="30"
             />
-
             <v-img
               v-else-if="filesStore.selectedFile != undefined"
               :src="filesStore.selectedFile.url" max-height="400"
             />
           </v-col>
         </v-row>
-
-        <!-- File details -->
-        <v-row>
-          <v-col v-if="filesStore.selectedFile != undefined">
-            <v-list>
-              <v-list-item prepend-icon="mdi-server">
-                {{ filesStore.selectedFile.url }}
-              </v-list-item>
-
-              <v-list-item prepend-icon="mdi-package">
-                {{ Math.round(filesStore.selectedFile.size / 1024) + ' KB' }}
-              </v-list-item>
-
-              <template v-if="filesStore.selectedFile['copyright'] != undefined">
-                <v-list-item prepend-icon="mdi-copyright">
-                  {{ filesStore.selectedFile.copyright.license }}
-                </v-list-item>
-
-                <v-list-item prepend-icon="mdi-account">
-                  {{ filesStore.selectedFile.copyright.creator }}
-                </v-list-item>
-
-                <v-list-item
-                  prepend-icon="mdi-web"
-                  v-if="filesStore.selectedFile.copyright.url.length > 0"
-                >
-                  <a :href="filesStore.selectedFile.copyright.url" target="_blank" >{{ $t('misc.source') }}</a>
-                </v-list-item>
-              </template>
-            </v-list>
       </v-col>
     </v-row>
-      </v-col>
+  </admin-data-layout>
-    </v-row>
-  </data-layout>
 
   <file-preview-dialog
     v-model:show-dialog="showPreviewDialog"

src/pages/admin/genresAdminPage/genreEditDialog.vue

@@ -35,7 +35,7 @@ const genreStore = useGenreStore()
 
     <template #actions>
       <outlined-button
-        color="success"
+        color="green"
         @click="genreStore.saveGenre"
         :disabled="!valid"
         :loading="genreStore.fetchInProgress"

src/pages/admin/genresAdminPage/index.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import genreEditDialog from './genreEditDialog.vue';
 import { useGenreStore } from '@/stores/genre.store';
-import { useFeedbackStore } from '@/stores/feedback.store';
 
 const genreStore = useGenreStore()
-const feedbackStore = useFeedbackStore()
 
 const headers = [
-  { title: feedbackStore.i18n.t('band.genre'), value: "name" },
+  { title: "Name", value: "name" },
-  { title: feedbackStore.i18n.t('band.name'), value: "bands" },
+  { title: "Bands", value: "bands" },
   { title: "", value: "edit", width: 130 }
 ]
 
@@ -17,7 +15,7 @@ genreStore.getGenres()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :add-button-string="$t('band.addNewGenre')"
     :fetch-in-progress="genreStore.fetchInProgress"
     :on-add-click="() => { genreStore.newGenre() }"
@@ -50,7 +48,7 @@ genreStore.getGenres()
         /> -->
       </template>
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 
   <genre-edit-dialog />
 </template>

src/pages/admin/locationsAdminPage/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import { useFeedbackStore } from '@/stores/feedback.store';
 import { useLocationStore } from '@/stores/location.store';
 
@@ -22,7 +22,7 @@ locationStore.getLocations()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :fetch-in-progress="locationStore.fetchInProgress"
     :add-button-string="$t('location.addLocation')"
     :on-add-click="() => { locationStore.newLocation() }"
@@ -66,5 +66,5 @@ locationStore.getLocations()
         /> -->
       </template>
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 </template>

src/pages/admin/ordersAdminPage/index.vue

@@ -1,20 +1,18 @@
 <script setup lang="ts">
-import dataLayout from '@/layouts/dataLayout.vue';
+import adminDataLayout from '@/layouts/adminDataLayout.vue';
 import { useOrderStore } from '@/stores/order.store';
 import moment from 'moment';
 import OrderDetailDialog from './orderDetailDialog.vue';
-import { useFeedbackStore } from '@/stores/feedback.store';
 
 const orderStore = useOrderStore()
-const feedbackStore = useFeedbackStore()
 
 const headers = [
-  { title: feedbackStore.i18n.t('account.userData.username'), value: "account.username" },
+  { title: "Account", value: "account.username" },
-  { title: feedbackStore.i18n.t('account.userData.firstName'), value: "account" },
+  { title: "Name", value: "account" },
-  { title: feedbackStore.i18n.t('order.orderedAt'), value: "orderedAt" },
+  { title: "Bestellt am", value: "orderedAt" },
-  { title: feedbackStore.i18n.t('account.userData.address'), value: "street" },
+  { title: "Adresse", value: "street" },
-  { title: feedbackStore.i18n.t('account.userData.placeOfResidence'), value: "city" },
+  { title: "Stadt", value: "city" },
-  { title: feedbackStore.i18n.t('order.orderState'), value: "shipped" },
+  { title: "Versendet", value: "shipped" },
   { title: "", value: "edit", width: 130 }
 ]
 
@@ -22,14 +20,12 @@ orderStore.getAllOrders()
 </script>
 
 <template>
-  <data-layout
+  <admin-data-layout
     :hide-add-button="true"
   >
     <v-data-table
       :headers="headers"
       :items="orderStore.orders"
-      :loading="orderStore.fetchInProgress"
-      :items-per-page="100"
     >
       <template #item.account="{ item }">
         {{ item.account.firstName }} {{ item.account.lastName }}
@@ -50,27 +46,27 @@ orderStore.getAllOrders()
       <template #item.shipped="{ item }">
         <v-icon
           :icon="item.shipped ? 'mdi-check' : 'mdi-close'"
-          :color="item.shipped ? 'success' : 'error'"
+          :color="item.shipped ? 'green' : 'red'"
         />
       </template>
 
       <template #item.edit="{ item }">
-        <v-btn
+        <!-- todo <v-btn
           icon="mdi-eye"
           variant="plain"
           @click="orderStore.openDetails(item)"
-        />
+        /> -->
 
-        <v-btn
+        <!-- todo <v-btn
-          :icon="item.shipped ? 'mdi-close-circle-outline' : 'mdi-check-circle-outline'"
+          icon="mdi-delete"
           variant="plain"
-          :color="item.shipped ? 'error' : 'success'"
+          color="red"
-          @click="orderStore.changeOrderShippedState(item, !item.shipped)"
+          @click="orderStore.deleteOrder(item)"
-        />
+        /> -->
       </template>
 
     </v-data-table>
-  </data-layout>
+  </admin-data-layout>
 
   <order-detail-dialog />
 </template>

src/pages/admin/ordersAdminPage/orderDetailDialog.vue

@@ -12,67 +12,15 @@ const orderStore = useOrderStore()
     v-model="orderStore.showDetailDialog"
     :title="$t('order.order')"
     icon="mdi-basket"
-    max-width="800"
   >
     <v-list>
       <v-list-subheader>
-        {{ $t('account.account') }}
+        {{ $t('ticket.ticket', 2) }}
       </v-list-subheader>
 
-      <v-list-item prepend-icon="mdi-account">
+      <v-list-item v-for="ticket of orderStore.order.tickets">
-        {{ orderStore.order.account.username }}
+        {{ moment(ticket.concert.date).format("DD.MM.YYYY") }} - 
-      </v-list-item>
+        {{ ticket.concert.band.name }} - {{ ticket.concert.name }}
-
-      <v-list-item prepend-icon="mdi-card-account-details">
-        {{ orderStore.order.account.firstName }} {{ orderStore.order.account.lastName }}
-      </v-list-item>
-
-      <v-list-item prepend-icon="mdi-home">
-        {{ orderStore.order.address.street }} {{ orderStore.order.address.houseNumber }}
-      </v-list-item>
-
-      <v-list-item prepend-icon="mdi-city">
-        {{ orderStore.order.address.postalCode }} {{ orderStore.order.address.city }}
-      </v-list-item>
-
-      <v-list-subheader>
-        {{ $t('order.order') }}
-      </v-list-subheader>
-
-      <v-list-item prepend-icon="mdi-calendar">
-        {{ moment(orderStore.order.orderedAt).format("DD.MM.YYYY, HH:mm:ss") }}
-      </v-list-item>
-
-      <v-list-item prepend-icon="mdi-truck">
-        {{ orderStore.order.shipped ? 'Versendet' : 'Nicht versendet' }}
-      </v-list-item>
-
-      <v-list-item>
-        <v-table>
-          <thead>
-            <tr>
-              <th>{{ $t('concert.date') }}</th>
-              <th>{{ $t('concert.name') }}</th>
-              <th>{{ $t('band.name') }}</th>
-              <th>{{ $t('location.name') }}</th>
-              <th>{{ $t('location.seat.seatGroup') }}</th>
-              <th>{{ $t('location.seat.seatRow') }}</th>
-              <th>{{ $t('location.seat.seat') }}</th>
-            </tr>
-          </thead>
-
-          <tbody>
-            <tr v-for="ticket of orderStore.order.tickets">
-              <td>{{ moment(ticket.concert.date).format("DD.MM.YYYY") }}</td>
-              <td>{{ ticket.concert.name }}</td>
-              <td>{{ ticket.concert.band.name }}</td>
-              <td>{{ ticket.concert.location.name }}</td>
-              <td>{{ ticket.seat.seatRow.seatGroup.name }}</td>
-              <td>{{ ticket.seat.seatRow.row }}</td>
-              <td>{{ ticket.seat.seatNr }}</td>
-            </tr>
-          </tbody>
-        </v-table>
       </v-list-item>
     </v-list>
   </action-dialog>