Changelog

CHANGELOG.md

@@ -1,30 +1,3 @@
-# v.0.3.0 (Release Candidate 1)
-## 🚀 Features
-- Swagger Documentation
-
-## 🐛 Bugfixes
-- Bugfix on search page for Band datasets
-
-# v.0.2.0 (Beta)
-## 🚀 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 (Alpha)
 ## 🚀 Features
 - Frontend

README.md

@@ -1,116 +1,30 @@
-<p align="center">
-  <img src="misc/images/logo.png" width="300" />
-</p>
+# HackMyCart
 
-<h1 align="center">EventMaster</h1>
-<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)
+The most hackable Web Shop!
 
 ## 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
-2. Open the root folder with VS Code (recommended)
-3. Open the bash inside VS Code and install all necessary packages:
+# If outdated version:
+sudo npm install -g n
+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

@@ -60,46 +60,39 @@
       "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": "todo",
       "exercises": [
-        {
-          "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": "todo"
-        },
         {
           "nameDe": "Alle Accounts ausspähen",
           "nameEn": "Get all accounts",
-          "exerciseNr": 2,
-          "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.",
+          "exerciseNr": 1,
+          "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": "Execute an SQL-Injection on the Search page to get all datasets from >>Accounts<< table."
         },
         {
           "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": "Execute an SQL-Injection on the Search page to get all datasets from >>AccountRoles<< table."
         },
         {
           "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": "Change the privileges of your 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": "todo"
         },
         {
           "nameDe": "Bewertungen löschen",
           "nameEn": "Delete ratings",
-          "exerciseNr": 6,
-          "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.",
+          "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 Tabelle >>Ratings<< alle Einträge mit der Bedingung >>rating = 5<< entfernt. Führe die Injection über die globale Suche aus.",
           "descriptionEn": "todo"
         }
       ]
@@ -115,14 +108,14 @@
           "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": "Take an URL of the shop and extend it with JavaScript code so that a 'Hello World' message appears whent the link is opened"
         },
         {
           "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": "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/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,133 +12,61 @@ import { encryptString } from "../scripts/encryptScripts";
 
 export const account = Router()
 
-/**
- * @swagger
- * /accounts/login:
- *   get:
- *     summary: Start login process
- *     tags: [Account]
- *     parameters:
- *        - in: query
- *          name: username
- *          schema:
- *            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("/", (req: Request, res: Response) => {
+  Account.findAll({
+    include: [ AccountRole ]
+  })
+    .then(accounts => {
+      res.status(200).json(accounts)
+    })
+})
+
+// Login user
 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(
-        "SELECT * FROM Accounts " +
-        "WHERE (username='" + req.query.username + 
-        "' AND password='" + encryptedPassword + "')"
-      )
+  // Using raw SQL code for SQL injections!
+  const [results, metadata] = 
+    await sequelize.query(
+      "SELECT * FROM Accounts " +
+      "WHERE (username='" + req.query.username + 
+      "' AND password='" + encryptedPassword + "')"
+    )
 
-    if (results.length != 0) {
-      // Creating session token
-      const token = jwt.sign({ userId: results[0]["id"] }, 'sjcucjdkdf')
+  if (results.length != 0) {
+    // Creating session token
+    const token = jwt.sign({ userId: results[0]["id"] }, 'sjcucjdkdf')
 
-      // Status: 200 OK
-      res.status(200).json({
-        success: true,
-        token: token
-      })
-    } else {
-      // Status: 401 Unauthorized
-      res.status(401).send()
-    }
-  } catch (e) {
-    res.status(500).send()
+    // Status: 200 OK
+    res.status(200).json({
+      success: true,
+      token: token
+    })
+  } else {
+    // Status: 401 Unauthorized
+    res.status(401).json({
+      code: 401, 
+      message: "Unauthorized"
+    })
   }
 })
 
 
-/**
- * @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 ],
-    attributes: {
-      exclude: [ "accountRoleId" ]
-    }
+    include: [ Address, AccountRole, Payment ]
   })
     .then(account => {
       res.status(200).json(account)
     })
-    .catch(error => {
-      res.status(500).send()
-    })
 })
 
 
-/**
- * @swagger
- * /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) => {
+// Creating a new user
+account.post("/", 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) => {
     })
 })
 
-
-
-/**
- * @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.patch("/", 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) {
-        payment["accountId"] = req.body.id
+        if (payment.id == undefined) {
+          payment["accountId"] = req.body.id
 
-        await Payment.create(payment)
+          await Payment.create(payment)
+        } else {
+          await Payment.update(payment,
+            {
+              where: { id: payment.id }
+            }
+          )
+        }
       }
 
       for (let address of req.body.addresses) {
-        address["accountId"] = req.body.id
+        if (address.id == undefined) {
+          address["accountId"] = req.body.id
 
-        await Address.create(address)
+          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) => {
   })
 })
 
-
-/**
- * @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.delete("/:id", (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
- * /api:
- *   get:
- *     summary: Status check endpoint
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Server is up and running
+ * Status check endpoint
  */
 api.get("/", (req: Request, res: Response, next: NextFunction) => {
   res.status(200).send()
 })
 
 /**
- * @swagger
- * /api/resetdatabase:
- *   get:
- *     summary: Reset the database to factory state
- *     description: Doesn't effect ExerciseTable and ExerciseGroupTable
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Reset successful
+ * Reset the whole database to factory state
+ * Doesn't effect ExerciseTable and ExerciseGroupTable
  */
 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
- * /api/resetExerciseProgress:
- *   get:
- *     summary: Reset exercises to factory state
- *     description: Reset ExerciseTable and ExerciseGroupTable to factory state
- *     tags: [Api]
- *     responses:
- *       200:
- *         description: Reset successful
+ * Reset ExerciseTable and ExerciseGroupTable to factory state
  */
 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
- * /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
+ * Get all bands
  */
 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,
-      Rating
+      Concert
     ]
   })
     .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 {
-      const [results, metadata] =
-        await sequelize.query(prompts[prompts.length - 2])
-        res.status(200).json(results)
-    } catch (e) {
-      res.status(400).send()
-    }
+    console.log(prompts[prompts.length - 2])
+    const [results, metadata] =
+      await sequelize.query(prompts[prompts.length - 2])
+
+    res.status(200).json(results)
   } 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,68 +11,18 @@ import { Op } from "sequelize";
 
 export const concert = Router()
 
-const concertStructure = [
-  {
-    model: Band
-  },
-  {
-    model: Location,
-    include: [
-      {
-        model: City
-      },
-      {
-        model: SeatGroup,
-        include: [
-          {
-            model: SeatRow,
-            include: [
-              {
-                model: Seat,
-                include: [
-                  {
-                    model: Ticket
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    attributes: {
-      exclude: [ "cityId" ]
-    }
-  }
-]
 
-
-/**
- * @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,
+    include: [
+      {
+        model: Location,
+        include: [ City ]
+      },
+      Band
+    ],
     order: [
       [ 'date', 'ASC' ]
     ]
@@ -91,37 +35,50 @@ concert.get("/", (req: Request, res: Response) => {
 
       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
- */
+// 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: concertStructure })
+  Concert.findByPk(req.params.id, {
+    include: [
+      {
+        model: Band,
+      },
+      {
+        model: Location,
+        include: [
+          {
+            model: City
+          },
+          {
+            model: SeatGroup,
+            include: [
+              {
+                model: SeatRow,
+                include: [
+                  {
+                    model: Seat,
+                    include: [
+                      {
+                        model: Ticket
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ],
+        attributes: {
+          exclude: [ "cityId" ]
+        }
+      }
+    ],
+    attributes: {
+      exclude: [ "locationId", "tourId" ]
+    }
+  })
     .then(concert => {
       concert.dataValues["capacity"] = 0
 
@@ -159,29 +116,7 @@ concert.get("/concert/:id", (req: Request, res: Response) => {
 })
 
 
-/**
- * @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 search
 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
- * /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
+ * Get all Exercises grouped in ExerciseGroups
  */
 exercises.get("/", (req: Request, res: Response) => {
   Exercise.findAll({
-    include: [ ExerciseGroup ],
-    attributes: {
-      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
-      })
+    include: [ ExerciseGroup ]
+  }).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()
-    })
+    res.status(200).json(result)
+  })
 })
 
 /**
- * @swagger
- * /exercises/{groupNr}/{exerciseNr}/{state}:
- *   post:
- *     summary: Update an exercise solved state
- *     tags: [Exercises]
- *     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
+ * Update state of an Exercise
+ * 
+ * @param groupNr Number of exercise group (not ID)
+ * @param exerciseNr Number of exercise (not ID)
+ * @param state New state boolean
  */
 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 ],
-    attributes: {
-      exclude: [ "exerciseGroupId" ]
-    }
+    include: [ ExerciseGroup ]
   })
     .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
- * /files/folders:
- *   get:
- *     summary: Get all static folders
- *     tags: [Files]
- *     responses:
- *       200:
- *         description: Login successful
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/folder'
+ * Get all folders
  */
 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
- * /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'
+ * Get all uploaded file names by file name
  */
 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 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")
-      }
+  fileNames.forEach(file => {
+    let resData = fs.readFileSync("./backend/images/" + req.params.folder + "/" + file, "utf8")
 
-      result.push({
-        name: file,
-        size: fs.statSync(path.resolve(__dirname, "../images/" + req.params.folder + "/" + file)).size,
-        content: resData,
-        url: url,
-        copyright: licenses.find(data => data.image == file)
-      })
+    result.push({
+      name: file,
+      size: fs.statSync("./backend/images/" + req.params.folder + "/" + file).size,
+      content: resData,
+      url: "http://localhost:3000/static/" + req.params.folder + "/" + file
     })
+  })
 
-    res.status(200).json(result)
-  } catch (error) {
-    res.status(400).json(error)
-  }
+  res.status(200).json(result)
 })
 
 
@@ -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
- * /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
+ * Get all available Genres
  */
 genre.get("/", (req: Request, res: Response) => {
   Genre.findAll({
@@ -38,22 +19,8 @@ genre.get("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
- * /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
+ * Update a Genre entry
  */
 genre.patch("/", (req: Request, res: Response) => {
   Genre.update(req.body, {
@@ -69,22 +36,8 @@ genre.patch("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
- * /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
+ * Create a new Genre entry
  */
 genre.post("/", (req: Request, res: Response) => {
   Genre.create(req.body)
@@ -96,22 +49,8 @@ genre.post("/", (req: Request, res: Response) => {
     })
 })
 
-
 /**
- * @swagger
- * /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
+ * Delete a Genre entry
  */
 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
- * /locations:
- *   get:
- *     summary: Get all available locations
- *     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'
+ * Get all available Locations
+ * 
+ * @query sort    Sort results ascending (asc) or descending (desc)
+ * @query count   Limit number of results
  */
 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
- * /locations/{urlName}:
- *   get:
- *     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
+ * Get all data about a specific location
+ * 
+ * @param urlName   UrlName of the band (e.g. Red Hot Chili Peppers => red-hot-chili-peppers)
  */
 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
- * /locations/search:
- *   get:
- *     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
+ * Search for Locations
+ * 
+ * @query value     Search term to look for
  */
 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()
 
-/**
- * @swagger
- * /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
-
+// Get all orders
+order.get("/", (req: Request, res: Response) => {
   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,
-    ],
-    attributes: {
-      exclude: [ "accountId", "addressId", "paymentId" ]
-    }
+      Address
+    ]
   })
     .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()
+      res.status(200).json(orders)
     })
 })
 
-/**
- * @swagger
- * /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"]
-
+// Place a new order
+order.post("/", (req: Request, res: Response) => {
   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)
-
-
-// Swagger API documentation
-const specs = swaggerJsdoc(swaggerFile);
-
-app.use(
-  "/api-docs",
-  swaggerUi.serve, 
-  swaggerUi.setup(specs, { explorer: true })
-)
-
+app.use("/files", files)
 
 // 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"
-  ]
-}

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,6 +1,6 @@
 {
   "name": "eventmaster",
-  "version": "0.3.0",
+  "version": "0.1.0",
   "author": "Tobias Zoghaib",
   "description": "Hackable ticket store for educational purposes",
   "license": "MIT",
@@ -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

@@ -40,16 +40,12 @@ defineProps({
           type="image"
           :loading="loading"
         >
-          <v-sheet
-            color="sheet"
-          >
-            <v-img 
-              :src="image" 
-              :height="height"
-              :width="height"
-              cover
-            />
-          </v-sheet>
+          <v-img 
+            :src="image" 
+            :height="height"
+            :width="height"
+            cover
+          />
         </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

@@ -12,7 +12,7 @@ defineProps({
 </script>
 
 <template>
-  <v-card variant="outlined" class="my-1 px-2">
+  <v-card variant="outlined" class="my-1 mx-2 px-2">
     <v-row class="d-flex justify-center align-center">
       <v-col class="text-caption text-left" v-if="descriptionText.length > 0">
         {{ descriptionText }}

src/components/basics/cardViewTopImage.vue

@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import { loadLicense } from '@/scripts/imageScripts';
-import { ref, watch } from 'vue';
-
-const props = defineProps({
+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
-          class="text-h4"
-          color="sheet"
-        >
-          {{ title }}
-        </v-sheet>
+        <span class="text-h4">{{ title }}</span>
       </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

@@ -27,7 +27,7 @@ exerciseStore.getAllExercises()
       :content="basketStore.itemsInBasket.reduce((tot, item) => {
         return tot + item.seats.length
       }, 0)"
-      color="error" offset-x="8" offset-y="8">
+      color="red" offset-x="8" offset-y="8">
       <v-btn variant="plain" icon="mdi-cart" to="/basket" />
     </v-badge>
   </div>

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
-              class="text-h6 text-white"
-              style="opacity: 0.7;"
-              v-if="!$slots.description"
-            >
+            <p class="text-h6 text-medium-emphasis" v-if="!$slots.description">
               {{ description }}
             </p>
             
-            <p
-              class="text-h6 text-white"
-              style="opacity: 0.7;"
-            >
+            <p class="text-h6 text-medium-emphasis">
               <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"
 
-/**
- * Fetch all accounts from server
- * 
- * @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 fetchAllAccounts() {
+  return await axios.get(BASE_URL)
 }
 
-/**
- * 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) {
+export async function login(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
     }
   })
 }
 
-/**
- * Delete an account in servers database
- * 
- * @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
-    }
-  })
+export async function deleteAccount(account: AccountModel) {
+  return await axios.delete(BASE_URL + "/" + account.id)
 }

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) {
-  return axios.get(BASE_URL + "?id=" + userId, {
-    headers: {
-      "Authorization": token
-    }
-  })
+export async function fetchUserOrders(userId: number) {
+  return axios.get(BASE_URL + "/" + userId)
 }
 
 export async function createOrder(
+  accountId: number, 
   basketItem: Array<BasketItemModel>,
   paymentId: number,
-  addressId: number,
-  token: string
+  addressId: number
 ) {
   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,
-  }, {
-    headers: {
-      "Authorization": token
-    }
+    addressId: addressId
+  })
+
+  return axios.post(BASE_URL, {
+    accountId: accountId,
+    tickets: tickets,
+    paymentId: paymentId,
+    addressId: addressId
   })
 }
 
-export async function fetchAllOrders(token: string) {
-  return axios.get(BASE_URL, {
-    headers: {
-      "Authorization": token
-    }
-  })
-}
-
-export async function patchOrder(order: OrderApiModel) {
-  return axios.patch(BASE_URL, order)
+export async function fetchAllOrders() {
+  return axios.get(BASE_URL)
 }

src/data/enums/bannerStateEnum.ts

@@ -1,14 +1,12 @@
 export enum BannerStateEnum {
   ////////// System feedback //////////
   
-  // Unknown error
+  // Some error
   ERROR,
 
-  // Ticket added to basket
-  BASKETTICKETADDED,
+  BASKETPRODUCTADDED,
 
-  // Ticket removed from basket
-  BASKETTICKETREMOVED,
+  BASKETPRODUCTREMOVED,
 
 
   ////////// Exercise feedback //////////
@@ -32,8 +30,6 @@ export enum BannerStateEnum {
   EXERCISESOLVED24,
 
   EXERCISESOLVED25,
-  
-  EXERCISESOLVED26,
 
   EXERCISESOLVED31,
 
@@ -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/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",
@@ -109,16 +109,7 @@
     "addNewAccount": "Neuen Account hinzufügen",
     "accountRole": "Account Rolle",
     "noRealPaymentsNeeded": "Keine echten Kontodaten nötig!",
-    "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"
+    "administrator": "Administrator | Administratoren"
   },
   "order": {
     "oclock": "Uhr",
@@ -163,7 +154,7 @@
     "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!"
       }
     }
@@ -182,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",
@@ -195,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",
-    "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!"
+    "genreSavedSuccessful": "Genre erfolgreich gespeichert"
   },
   "misc": {
     "404": {
@@ -230,7 +218,7 @@
     "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"
@@ -248,8 +236,7 @@
       "connectToServer": "Server",
       "database": "Datenbank",
       "exercises": "Aufgaben",
-      "userData": "Persönliche Daten",
-      "enterYourPersonalData": "Bitte gebe nun deinen Namen und deine Matrikelnummer von der Universität ein. Überprüfe die Angaben vor dem Absenden genau! Die Angaben können später nicht ohne Verlust des Bearbeitungsfortschrittes geändert werden!"
+      "userData": "Persönliche Daten"
     },
     "user": "Angaben zur Person",
     "registrationNumber": "Matrikelnummer",
@@ -257,14 +244,7 @@
     "chooseFile": "Datei auswählen",
     "chooseDestinationFolder": "Zielordner auswählen",
     "upload": "Hochladen",
-    "fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus",
-    "testEnvironment": "Testumgebung",
-    "search": {
-      "empty": {
-        "headline": "So leer hier..."
-      },
-      "searchterm": "Suchbegriff"
-    }
+    "fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus"
   },
   "genre": {
     "withoutBand": "ohne Band"

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",
@@ -109,16 +109,7 @@
     "addNewAccount": "Add new account",
     "accountRole": "Account Role",
     "noRealPaymentsNeeded": "No real payment data required!",
-    "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"
+    "administrator": "Administrator"
   },
   "order": {
     "oclock": "o'clock",
@@ -182,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",
@@ -195,11 +187,7 @@
     "genreDeleteError": "Error on deleting Genre",
     "genreDeleteSuccessful": "Genre successfully deleted",
     "genreSavedError": "Error on saving genre",
-    "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!"
+    "genreSavedSuccessful": "Genre successfully saved"
   },
   "misc": {
     "404": {
@@ -248,8 +236,7 @@
       "connectToServer": "Server",
       "database": "Database",
       "exercises": "Exercises",
-      "userData": "User data",
-      "enterYourPersonalData": "Please enter your name and your Matrikel number from your university. Check it twice! You can't change it later without loosing your exercise progress!"
+      "userData": "User data"
     },
     "user": "About person",
     "registrationNumber": "Matrikel number",
@@ -257,14 +244,7 @@
     "chooseFile": "Choose file",
     "chooseDestinationFolder": "Choose destination folder",
     "upload": "Upload",
-    "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"
-    }
+    "fulfillYourPersonalDataFirst": "Go to settings and enter your name and the right register number"
   },
   "genre": {
     "withoutBand": "without Band"

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: "Aktionen", 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 { useOrderStore } from '@/stores/order.store';
-import OutlinedButton from '@/components/basics/outlinedButton.vue';
+import cardView from '@/components/basics/cardView.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>
+  <v-container max-width="1000">
     <v-row>
-      <dashboard-card
-        :title="$t('order.order', 2)"
-        icon="mdi-basket-check"
-        :first-line="orderStore.orders.length + ' ' + $t('order.order', 2)"
-        :second-line="$t('order.ordersDescription')"
-        button-route="/account/orders"
-        :loading="orderStore.fetchInProgress"
-      />
+      <v-col>
+        <card-view
+          :title="$t('misc.greeting', { msg: accountStore.userAccount.username })"
+          icon="mdi-hand-wave"
+        >
+          <v-container>
+            <v-row>
+              <v-col>
+                <card-view
+                  :title="$t('order.order', 2)"
+                  icon="mdi-basket-check"
+                  @click="router.push('/account/orders')"
+                >
+                  {{ $t('order.ordersDescription') }}
+                </card-view>
+              </v-col>
+            </v-row>
 
-      <dashboard-card
-        :title="$t('account.accountManagement')"
-        icon="mdi-account"
-        :first-line="accountStore.userAccount.username"
-        :second-line="$t('account.accountManagementDescription')"
-        :loading="accountStore.fetchInProgress"
-        button-route="/account/data"
-      />
+            <v-row>
+              <v-col>
+                <card-view
+                  :title="$t('account.accountManagement')"
+                  icon="mdi-account"
+                  @click="router.push('/account/data')"
+                >
+                  {{ $t('account.accountManagementDescription') }}
+                </card-view>
+              </v-col>
+            </v-row>
 
-      <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>
-          <outlined-button
-            color="error"
-            @click="accountStore.logout(); router.push('/account/login')"
-          >
-            {{ $t('account.logout.logout') }}
-          </outlined-button>
-        </template>
-      </dashboard-card>
+            <v-row>
+              <v-col>
+                <card-view
+                  :title="$t('account.logout.logout')"
+                  icon="mdi-logout"
+                  @click="accountStore.logout(); router.push('/account/login')"
+                >
+                  {{ $t('account.logout.logoutDescription') }}
+                </card-view>
+              </v-col>
+            </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: "Aktionen", 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()"
@@ -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

@@ -53,7 +53,7 @@ const test = ref()
       <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="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" >Quelle</a>
-                </v-list-item>
-              </template>
-            </v-list>
-          </v-col>
-        </v-row>
       </v-col>
     </v-row>
-  </data-layout>
+  </admin-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,5 +1,5 @@
 <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';
 
@@ -15,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() }"
@@ -48,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,5 +1,5 @@
 <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';
@@ -13,21 +13,19 @@ const headers = [
   { title: "Adresse", value: "street" },
   { title: "Stadt", value: "city" },
   { title: "Versendet", value: "shipped" },
-  { title: "Aktionen", value: "edit", width: 130 }
+  { title: "", value: "edit", width: 130 }
 ]
 
 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 }}
@@ -48,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
-          :icon="item.shipped ? 'mdi-close-circle-outline' : 'mdi-check-circle-outline'"
+        <!-- todo <v-btn
+          icon="mdi-delete"
           variant="plain"
-          :color="item.shipped ? 'error' : 'success'"
-          @click="orderStore.changeOrderShippedState(item, !item.shipped)"
-        />
+          color="red"
+          @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">
-        {{ orderStore.order.account.username }}
-      </v-list-item>
-
-      <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-for="ticket of orderStore.order.tickets">
+        {{ moment(ticket.concert.date).format("DD.MM.YYYY") }} - 
+        {{ ticket.concert.band.name }} - {{ ticket.concert.name }}
       </v-list-item>
     </v-list>
   </action-dialog>

src/pages/bands/bandDetailPage/ratingSection.vue

@@ -46,10 +46,8 @@ defineProps({
     </v-col>
 
     <v-col>
-      <v-list style="background-color: transparent;">
-        <v-list-item
-          v-for="ratingValue in ratings"
-        >
+      <v-list>
+        <v-list-item v-for="ratingValue in ratings">
           <template v-slot:prepend>
             <span>{{ ratingValue.value }}</span>
             <v-icon class="ml-3 mr-n3" icon="mdi-star" />

src/pages/concerts/concertBookingPage/index.vue

@@ -94,7 +94,7 @@ watch(() => router.currentRoute.value.params.date, () => {
 
         <v-row>
           <v-col>
-            <v-list style="background-color: transparent;">
+            <v-list >
               <v-list-item v-for="seat in basketStore.selectedSeats" >
                 <ticket-list-item
                   :concert="concertStore.concert"

src/pages/misc/basketPage/index.vue

@@ -18,6 +18,7 @@ const showOrderingDialog = ref()
       <v-col>
         <v-alert
           color="info"
+          closable
         >
           {{ $t('account.login.pleaseLoginToOrder') }}
         </v-alert>
@@ -52,7 +53,7 @@ const showOrderingDialog = ref()
               prepend-icon="mdi-basket-check"
               :disabled="basketStore.itemsInBasket.length == 0 || accountStore.userAccount.id == null"
               variant="outlined"
-              color="success"
+              color="green"
               @click="showOrderingDialog = true"
             >
               {{ $t('order.takeOrder') }}

src/pages/misc/basketPage/orderingDialog.vue

@@ -100,7 +100,7 @@ function paymentItemProps(item: PaymentModel) {
         @click="doOrder"
         :loading="orderingInProgress"
         prepend-icon="mdi-send"
-        color="success"
+        color="green"
       >
         {{ $t('order.takeOrder') }}
       </outlined-button>

src/pages/misc/basketPage/ticketsTable.vue

@@ -2,7 +2,6 @@
 import { useBasketStore } from '@/stores/basket.store';
 import { BasketItemModel } from '@/data/models/ordering/basketItemModel';
 import { calcPrice } from '@/scripts/concertScripts';
-import moment from 'moment';
 
 const basketStore = useBasketStore()
 
@@ -12,10 +11,9 @@ function removeFromBasket(basketItem: BasketItemModel) {
 </script>
 
 <template>
-  <v-table style="background-color: transparent;">
+  <v-table>
     <thead>
       <tr>
-        <th>{{ $t('concert.date') }}</th>
         <th>{{ $t('band.band') }}</th>
         <th>{{ $t('concert.concert') }}</th>
         <th class="text-center">{{ $t('misc.quantity') }}</th>
@@ -27,11 +25,6 @@ function removeFromBasket(basketItem: BasketItemModel) {
 
     <tbody>
       <tr v-for="basketItem in basketStore.itemsInBasket">
-        <!-- Concert date -->
-        <td>
-          {{ moment(basketItem.concert.date).format("DD.MM.YYYY") }}
-        </td>
-
         <!-- Band name -->
         <td>
           {{ basketItem.band.name }}
@@ -50,7 +43,7 @@ function removeFromBasket(basketItem: BasketItemModel) {
         <!-- Price per event -->
         <td class="text-right">
           <div v-if="basketItem.seats">
-            {{ basketItem.price.toFixed(2) }} €
+            {{ basketItem.price }} €
           </div>
         </td>
 
@@ -63,7 +56,7 @@ function removeFromBasket(basketItem: BasketItemModel) {
           <v-btn
             icon="mdi-delete"
             @click="removeFromBasket(basketItem)"
-            color="error"
+            color="red"
             variant="text"
             flat
           />

src/pages/misc/helpPage/index.vue

@@ -19,22 +19,6 @@ function getDotColor(exerciseGroupNr: number) {
     case 3: return "pink"
   }
 }
-
-function generateExerciseKey() {
-  try {
-    let code = ""
-
-    for (let i = 0; i < 13; i++) {
-      if (exerciseStore.exercises[i].solved) {
-        code += "3"
-      } else {
-        code += "0"
-      }
-    }
-
-    return (Number(code) + Number(preferencesStore.registrationNumber)) * 237
-  } catch(e) {}
-}
 </script>
 
 <template>
@@ -42,7 +26,20 @@ function generateExerciseKey() {
     <v-row>
       <v-spacer />
 
+      <v-col
+        v-if="preferencesStore.studentName.length < 3 || preferencesStore.registrationNumber.length < 7"
+        cols="auto"
+      >
+        <card-view variant="outlined" >
+          {{ $t('misc.fulfillYourPersonalDataFirst') }}
+        </card-view>
+      </v-col>
+
       <v-col cols="auto">
+        <v-tooltip :text="$t('misc.fulfillYourPersonalDataFirst')">
+          <template #activator="{ props }"></template>
+
+        </v-tooltip>
         <outlined-button
           prepend-icon="mdi-file-pdf-box"
           @click="generateResultsPdf()"
@@ -53,17 +50,6 @@ function generateExerciseKey() {
       </v-col>
     </v-row>
 
-    <v-row>
-      <v-col class="text-h5 text-center">
-        <div>
-          Persönlicher Lösungsschlüssel:
-        </div>
-        <div>
-          {{ generateExerciseKey() }}
-        </div>
-      </v-col>
-    </v-row>
-
     <v-row>
       <v-col>
         <card-view

src/pages/misc/homePage/welcomeDialog.vue

@@ -2,7 +2,6 @@
 import actionDialog from '@/components/basics/actionDialog.vue';
 import outlinedButton from '@/components/basics/outlinedButton.vue';
 import ServerStateText from '@/components/pageParts/serverStateText.vue';
-import { getRegisterNumberRules, getStringRules } from '@/scripts/validationRules';
 import { useFeedbackStore } from '@/stores/feedback.store';
 import { usePreferencesStore } from '@/stores/preferences.store';
 import { ref, watch } from 'vue';
@@ -64,7 +63,7 @@ watch(() => currentStep.value, () => {
               :title="step"
               :value="n + 1"
               complete-icon="mdi-check"
-              color="success"
+              color="green"
             />
 
             <v-divider v-if="n < steps.length - 1" />
@@ -74,7 +73,6 @@ watch(() => currentStep.value, () => {
 
         <!-- Content -->
         <v-stepper-window>
-          <!-- Step 1: Check connection to backend server -->
           <v-stepper-window-item
             :value="1"
             class="text-h4 text-center"
@@ -86,7 +84,6 @@ watch(() => currentStep.value, () => {
             <server-state-text />
           </v-stepper-window-item>
 
-          <!-- Step 2: Reset the database -->
           <v-stepper-window-item
             :value="2"
           >
@@ -103,7 +100,7 @@ watch(() => currentStep.value, () => {
             </div>
           </v-stepper-window-item>
 
-          <!-- Step 3: Create exercises -->
+
           <v-stepper-window-item
             :value="3"
           >
@@ -120,25 +117,18 @@ watch(() => currentStep.value, () => {
             </div>
           </v-stepper-window-item>
 
-          <!-- Step 4: Personal data -->
+
           <v-stepper-window-item
             :value="4"
           >
             <v-container class="px-0 py-2">
-              <v-row>
-                <v-col>
-                  <v-alert color="warning" icon="mdi-alert">
-                    {{ $t('misc.firstStartup.enterYourPersonalData') }}
-                  </v-alert>
-                </v-col>
-              </v-row>
               <v-row>
                 <v-col>
                   <v-text-field
                     variant="outlined"
+                    hide-details
                     :label="$t('misc.yourFullName')"
                     v-model="preferencesStore.studentName"
-                    :rules="getStringRules(4)"
                   />
                 </v-col>
               </v-row>
@@ -147,9 +137,9 @@ watch(() => currentStep.value, () => {
                 <v-col>
                   <v-text-field
                     variant="outlined"
+                    hide-details
                     :label="$t('misc.registrationNumber')"
                     v-model="preferencesStore.registrationNumber"
-                    :rules="getRegisterNumberRules()"
                   />
                 </v-col>
               </v-row>
@@ -178,10 +168,10 @@ watch(() => currentStep.value, () => {
             <outlined-button
               v-else
               @click="showDialog = false; preferencesStore.firstStartup = false"
-              :disabled="preferencesStore.studentName.length < 5 || 
-                preferencesStore.registrationNumber.length < 8"
+              :disabled="preferencesStore.studentName.length == 0 || 
+                preferencesStore.registrationNumber.length == 0"
               prepend-icon="mdi-check"
-              color="success"
+              color="green"
             >
               {{ $t('misc.firstStartup.complete') }}
             </outlined-button>