diff --git a/.vs/JudoWeb/v17/DocumentLayout.backup.json b/.vs/JudoWeb/v17/DocumentLayout.backup.json index a97d429..923ca22 100644 --- a/.vs/JudoWeb/v17/DocumentLayout.backup.json +++ b/.vs/JudoWeb/v17/DocumentLayout.backup.json @@ -24,18 +24,22 @@ "RelativeDocumentMoniker": "API\\Program.cs", "ToolTip": "D:\\Programmieren\\CSharp\\JudoWeb\\API\\Program.cs", "RelativeToolTip": "API\\Program.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-05T16:26:39.39Z", "EditorCaption": "" }, { "$type": "Bookmark", - "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" + "Name": "ST:0:0:{0174dea2-fdbe-4ef1-8f99-c0beae78880f}" }, { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" } ] } diff --git a/.vs/JudoWeb/v17/DocumentLayout.json b/.vs/JudoWeb/v17/DocumentLayout.json index a97d429..923ca22 100644 --- a/.vs/JudoWeb/v17/DocumentLayout.json +++ b/.vs/JudoWeb/v17/DocumentLayout.json @@ -24,18 +24,22 @@ "RelativeDocumentMoniker": "API\\Program.cs", "ToolTip": "D:\\Programmieren\\CSharp\\JudoWeb\\API\\Program.cs", "RelativeToolTip": "API\\Program.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABUAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-10-05T16:26:39.39Z", "EditorCaption": "" }, { "$type": "Bookmark", - "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" + "Name": "ST:0:0:{0174dea2-fdbe-4ef1-8f99-c0beae78880f}" }, { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" } ] } diff --git a/GUI/.prettierrc.json b/GUI/.prettierrc.json index 29a2402..334a585 100644 --- a/GUI/.prettierrc.json +++ b/GUI/.prettierrc.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/prettierrc", - "semi": false, + "semi": true, "singleQuote": true, "printWidth": 100 } diff --git a/GUI/public/Logo.png b/GUI/public/static/images/Logo.png similarity index 100% rename from GUI/public/Logo.png rename to GUI/public/static/images/Logo.png diff --git a/GUI/public/appBarIcon.png b/GUI/public/static/images/appBarIcon.png similarity index 100% rename from GUI/public/appBarIcon.png rename to GUI/public/static/images/appBarIcon.png diff --git a/GUI/public/static/images/house/entrance.jpg b/GUI/public/static/images/house/entrance.jpg new file mode 100644 index 0000000..c1db95d Binary files /dev/null and b/GUI/public/static/images/house/entrance.jpg differ diff --git a/GUI/public/static/images/house/front.jpg b/GUI/public/static/images/house/front.jpg new file mode 100644 index 0000000..9c54ecd Binary files /dev/null and b/GUI/public/static/images/house/front.jpg differ diff --git a/GUI/public/static/images/house/frontSide.jpg b/GUI/public/static/images/house/frontSide.jpg new file mode 100644 index 0000000..526ad8e Binary files /dev/null and b/GUI/public/static/images/house/frontSide.jpg differ diff --git a/GUI/src/Layout.vue b/GUI/src/Layout.vue index 5642d7f..5c3c245 100644 --- a/GUI/src/Layout.vue +++ b/GUI/src/Layout.vue @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/GUI/src/css/global.css b/GUI/src/css/global.css index 3afca1b..d116244 100644 --- a/GUI/src/css/global.css +++ b/GUI/src/css/global.css @@ -1,3 +1,11 @@ -.title{ - font-weight: 600; -} \ No newline at end of file +.title { + font-weight: 600; +} + +.whiteTransp { + background-color: rgba(255, 255, 255, 0.5); +} + +.blackTransp { + background-color: rgb(0, 0, 0, 0.5); +} diff --git a/GUI/src/plugins/routesLayout.ts b/GUI/src/plugins/routesLayout.ts index 3c4ebaa..66c1483 100644 --- a/GUI/src/plugins/routesLayout.ts +++ b/GUI/src/plugins/routesLayout.ts @@ -1,8 +1,42 @@ -export default [ +import Home from '@/routes/Home.vue' +import NotFound from '@/routes/404NotFound.vue' +import type { RouteRecordRaw } from 'vue-router' + +export enum Visibility { + Hidden, + Authorized, + Public +} + + +export interface LayoutRoute { + path: string, + name: string, + description: string, + icon: string, + visible: Visibility, + meta: RouteRecordRaw +} + +export const routes: LayoutRoute[] = [ { path: "/", name: "Startseite", description: "Übersicht der Anwendung", icon: "mdi-home", + visible: Visibility.Public, + meta: { + name: 'Home', + path: '/', + component: Home + } + }, + { + path: "/notFound", + name: "Nicht Verfügbar", + description: "Diese Seite wurde nicht gefunden", + icon: "mdi-information-outline", + visible: Visibility.Hidden, + meta: { path: '/:pathMatch(.*)*', name: 'NotFound', component: NotFound }, } -] \ No newline at end of file +] \ No newline at end of file diff --git a/GUI/src/router/index.ts b/GUI/src/router/index.ts index 07d76ff..a561eb8 100644 --- a/GUI/src/router/index.ts +++ b/GUI/src/router/index.ts @@ -1,17 +1,9 @@ -import Home from '@/routes/Home.vue' -import NotFound from '@/routes/404NotFound.vue' import { createRouter, createWebHistory } from 'vue-router' +import { routes } from '@/plugins/routesLayout' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), - routes: [ - { - name: 'Home', - path: '/', - component: Home, - }, - { path: '/:pathMatch(.*)*', name: 'NotFound', component: NotFound }, - ], + routes: routes.map(x => x.meta) }) export default router diff --git a/GUI/src/routes/Home.vue b/GUI/src/routes/Home.vue index b9d8080..5009e68 100644 --- a/GUI/src/routes/Home.vue +++ b/GUI/src/routes/Home.vue @@ -1,10 +1,23 @@ - \ No newline at end of file +