replace images/splashscreens

dysTOS · Nov 11, 2023 · a7db21a · a7db21a
1 parent 86db0f2
commit a7db21a
Show file tree

Hide file tree

Showing 106 changed files with 801 additions and 803 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/angular.json b/angular.json
@@ -124,8 +124,8 @@
                                     "glob": "*.ico"
                                 },
                                 {
-                                    "input": "src/configurations/gmr/assets",
-                                    "output": "assets/",
+                                    "input": "src/configurations/gmr/assets/images",
+                                    "output": "assets/images",
                                     "glob": "*.*"
                                 }
                             ]

diff --git a/src/app/app.topbar.component.ts b/src/app/app.topbar.component.ts
@@ -9,7 +9,7 @@ import { environment } from "src/environments/environment";
         <div class="topbar clearfix">
             <div class="logo">
                 <a routerLink="/">
-                    <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+                    <img src="assets/images/app_logo.png" />
                 </a>
             </div>
 

diff --git a/src/app/pages/app.accessdenied.component.html b/src/app/pages/app.accessdenied.component.html
@@ -9,7 +9,7 @@
         <div class="exception-content">
             <h3>Zugriff verweigert!</h3>
             <p>Du hast keine Berechtigung.</p>
-            <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+            <img src="assets\images\app_logo.png" />
         </div>
     </div>
 </div>
diff --git a/src/app/pages/app.error.component.html b/src/app/pages/app.error.component.html
@@ -9,7 +9,7 @@
         <div class="exception-content">
             <h3>Fehler</h3>
             <p>Bitte versuche es später erneut!</p>
-            <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+            <img src="assets\images\app_logo.png" />
         </div>
     </div>
 </div>
diff --git a/src/app/pages/app.notfound.component.html b/src/app/pages/app.notfound.component.html
@@ -9,7 +9,7 @@
         <div class="exception-content">
             <h3>Seite nicht gefunden</h3>
             <p></p>
-            <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+            <img src="assets\images\app_logo.png" />
         </div>
     </div>
 </div>
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
@@ -2,10 +2,13 @@
 <div class="login-body">
     <div class="login-panel p-fluid">
         <div class="grid grid-nogutter">
-            <div class="col-12 login-header" style="margin-top: -5em">
+            <div class="col-12 login-header">
                 <h1>LOGIN</h1>
-                <h2>Willkommen bei der mkjAPP!</h2>
-                <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+                <h2>
+                    Wenn du das erste Mal hier bist, drücke unten auf
+                    "Registrierung".
+                </h2>
+                <img src="assets\images\app_logo.png" />
             </div>
             <div class="col-12 pb-0 pt-0">
                 <span class="p-float-label">

diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { environment } from "src/environments/environment";
 import { AuthStateService } from "src/app/services/authentication/auth-state.service";
-import { AuthAPIService } from "src/app/services/authentication/auth-api.service";
+import { AuthAPIService } from "src/app/services/api/auth-api.service";
 import { TokenService } from "src/app/services/authentication/token.service";
 import { UserService } from "src/app/services/authentication/user.service";
 import { InfoService } from "src/app/services/info.service";
@@ -46,7 +46,6 @@ export class LoginComponent implements OnInit {
             this.isChecking = true;
             this.authService.login(this.user).subscribe(
                 (result) => {
-                    console.log(result);
                     this.tokenService.saveToken(result.token);
                     this.authState.setAuthState(true);
                     this.userService.setCurrentUser(result.user);

diff --git a/src/app/pages/signup/signup.component.html b/src/app/pages/signup/signup.component.html
@@ -2,10 +2,13 @@
 <div class="login-body">
     <div class="login-panel p-fluid">
         <div class="grid grid-nogutter">
-            <div class="col-12 login-header" style="margin-top: -7em">
+            <div class="col-12 login-header">
                 <h1>Registrierung</h1>
-                <h2>Wilkommen bei der mkjAPP!</h2>
-                <img src="assets/mkjICONS/LOGO_APP_Favicon.png" />
+                <h2>
+                    Erste Registrierung - bitte beachte das deine Mail-Adresse
+                    dem Administrator schon bekannt sein muss.
+                </h2>
+                <img src="assets\images\app_logo.png" />
             </div>
             <div class="col-12 pb-0 pt-0">
                 <span class="p-float-label">

diff --git a/src/app/pages/signup/signup.component.ts b/src/app/pages/signup/signup.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { UserRegistrationInput } from "src/app/interfaces/api-middleware";
-import { AuthAPIService } from "src/app/services/authentication/auth-api.service";
+import { AuthAPIService } from "src/app/services/api/auth-api.service";
 import { InfoService } from "src/app/services/info.service";
 
 @Component({

diff --git a/...rvices/authentication/auth-api.service.ts → src/app/services/api/auth-api.service.ts b/...rvices/authentication/auth-api.service.ts → src/app/services/api/auth-api.service.ts
diff --git a/src/app/services/authentication/user.service.ts b/src/app/services/authentication/user.service.ts
@@ -4,7 +4,7 @@ import { BehaviorSubject } from "rxjs/internal/BehaviorSubject";
 import { Gruppe } from "src/app/models/Gruppe";
 import { Mitglied } from "../../models/Mitglied";
 import { Permission, Role, User } from "../../models/User";
-import { AuthAPIService } from "./auth-api.service";
+import { AuthAPIService } from "../api/auth-api.service";
 import { TokenService } from "./token.service";
 
 @Injectable({

diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
@@ -8,8 +8,8 @@ export class ThemeService {
     private themePrefix = environment.prefix;
 
     public darkMode: boolean = false;
-    public layoutMode: string = "static";
-    public inputStyle: string = "outlined";
+    public layoutMode: "static" | "overlay" = "static";
+    public inputStyle: "outlined" | "filled" = "outlined";
 
     constructor() {
         this.initLocalSettings();

diff --git a/src/assets/images/10.2__iPad_landscape.png b/src/assets/images/10.2__iPad_landscape.png
diff --git a/src/assets/images/10.2__iPad_portrait.png b/src/assets/images/10.2__iPad_portrait.png
diff --git a/src/assets/images/10.5__iPad_Air_landscape.png b/src/assets/images/10.5__iPad_Air_landscape.png
diff --git a/src/assets/images/10.5__iPad_Air_portrait.png b/src/assets/images/10.5__iPad_Air_portrait.png
diff --git a/src/assets/images/10.9__iPad_Air_landscape.png b/src/assets/images/10.9__iPad_Air_landscape.png
diff --git a/src/assets/images/10.9__iPad_Air_portrait.png b/src/assets/images/10.9__iPad_Air_portrait.png
diff --git a/src/assets/images/11__iPad_Pro__10.5__iPad_Pro_landscape.png b/src/assets/images/11__iPad_Pro__10.5__iPad_Pro_landscape.png
diff --git a/src/assets/images/11__iPad_Pro__10.5__iPad_Pro_portrait.png b/src/assets/images/11__iPad_Pro__10.5__iPad_Pro_portrait.png
diff --git a/src/assets/images/12.9__iPad_Pro_landscape.png b/src/assets/images/12.9__iPad_Pro_landscape.png
diff --git a/src/assets/images/12.9__iPad_Pro_portrait.png b/src/assets/images/12.9__iPad_Pro_portrait.png
diff --git a/src/assets/images/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png b/src/assets/images/4__iPhone_SE__iPod_touch_5th_generation_and_later_landscape.png
diff --git a/src/assets/images/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png b/src/assets/images/4__iPhone_SE__iPod_touch_5th_generation_and_later_portrait.png
diff --git a/src/assets/images/8.3__iPad_Mini_landscape.png b/src/assets/images/8.3__iPad_Mini_landscape.png
diff --git a/src/assets/images/8.3__iPad_Mini_portrait.png b/src/assets/images/8.3__iPad_Mini_portrait.png
diff --git a/...ts/images/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png b/...ts/images/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_landscape.png
diff --git a/...ets/images/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png b/...ets/images/9.7__iPad_Pro__7.9__iPad_mini__9.7__iPad_Air__9.7__iPad_portrait.png
diff --git a/src/assets/images/app_logo.png b/src/assets/images/app_logo.png
diff --git a/src/assets/images/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png b/src/assets/images/iPhone_11_Pro_Max__iPhone_XS_Max_landscape.png
diff --git a/src/assets/images/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png b/src/assets/images/iPhone_11_Pro_Max__iPhone_XS_Max_portrait.png
diff --git a/src/assets/images/iPhone_11__iPhone_XR_landscape.png b/src/assets/images/iPhone_11__iPhone_XR_landscape.png
diff --git a/src/assets/images/iPhone_11__iPhone_XR_portrait.png b/src/assets/images/iPhone_11__iPhone_XR_portrait.png
diff --git a/...Phone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png b/...Phone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_landscape.png
diff --git a/...iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png b/...iPhone_13_mini__iPhone_12_mini__iPhone_11_Pro__iPhone_XS__iPhone_X_portrait.png
diff --git a/...ssets/images/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png b/...ssets/images/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_landscape.png
diff --git a/...assets/images/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png b/...assets/images/iPhone_14_Plus__iPhone_13_Pro_Max__iPhone_12_Pro_Max_portrait.png
diff --git a/...ges/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png b/...ges/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_landscape.png
diff --git a/...ages/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png b/...ages/iPhone_14__iPhone_13_Pro__iPhone_13__iPhone_12_Pro__iPhone_12_portrait.png
diff --git a/...ssets/images/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png b/...ssets/images/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_landscape.png
diff --git a/...assets/images/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png b/...assets/images/iPhone_15_Pro_Max__iPhone_15_Plus__iPhone_14_Pro_Max_portrait.png
diff --git a/src/assets/images/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png b/src/assets/images/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_landscape.png
diff --git a/src/assets/images/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png b/src/assets/images/iPhone_15_Pro__iPhone_15__iPhone_14_Pro_portrait.png
diff --git a/...mages/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png b/...mages/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_landscape.png
diff --git a/...images/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png b/...images/iPhone_8_Plus__iPhone_7_Plus__iPhone_6s_Plus__iPhone_6_Plus_portrait.png
diff --git a/...ts/images/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png b/...ts/images/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_landscape.png
diff --git a/...ets/images/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png b/...ets/images/iPhone_8__iPhone_7__iPhone_6s__iPhone_6__4.7__iPhone_SE_portrait.png
diff --git a/src/assets/images/icon.png b/src/assets/images/icon.png
diff --git a/src/assets/images/icon_192x192.png b/src/assets/images/icon_192x192.png
diff --git a/src/assets/mkjICONS/LOGO_APP_Favicon.png b/src/assets/mkjICONS/LOGO_APP_Favicon.png
diff --git a/src/assets/sass/layout/_login.scss b/src/assets/sass/layout/_login.scss
@@ -1,12 +1,11 @@
 .login-body {
-    background-color: var(--surface-200);
+    background-color: var(--surface-0);
     padding-top: 200px;
     height: auto;
-    background: url("../layout/images/login/login-image.png") no-repeat;
     background-position: 0 -100px;
 
     .login-panel {
-        background-color: var(--surface-200);
+        background-color: var(--surface-100);
         width: 400px;
         margin: 0 auto;
         padding-bottom: 20px;
@@ -32,6 +31,7 @@
                 font-size: 14px;
                 font-weight: normal;
                 margin-top: 0;
+                padding-right: 5rem;
             }
 
             img {

diff --git a/src/assets/sass/layout/_splash.scss b/src/assets/sass/layout/_splash.scss
@@ -1,5 +1,5 @@
 .splash-screen {
-    background: $primaryColor;
+    background: $topBarColor;
     width: 100%;
     height: 100%;
     position: fixed;
@@ -12,8 +12,6 @@
         width: 100px;
         height: 100px;
         border-radius: 100%;
-        background-color: #0a423b;
-        border: 10px solid #0a423b;
 
         img {
             width: 100px;

diff --git a/src/assets/theme/base/gmr/theme-gmr-dark.scss b/src/assets/theme/base/gmr/theme-gmr-dark.scss
@@ -1,12 +1,12 @@
-$primaryColor: #b00000;
-$primaryLightColor: #b00000;
+$primaryColor: #bf0000;
+$primaryLightColor: #bf0000;
 $primaryTextColor: #e8f5e9;
 $primaryTextHoverColor: #ffffff;
-$topBarColor: #b00000;
+$topBarColor: #bf0000;
 $accentColor: #fbc02d;
 $accentLightColor: #fff9c4;
 $accentTextColor: #000000;
-$activeMenuItemTextColor: #b00000;
+$activeMenuItemTextColor: #bf0000;
 $darkActiveMenuItemTextColor: #bb0101;
 $darkMenuItemTextColor: #dee0e3;
 $darkMenuItemInactiveTextColor: #757575;

diff --git a/src/assets/theme/base/gmr/theme-gmr-light.scss b/src/assets/theme/base/gmr/theme-gmr-light.scss
@@ -1,12 +1,12 @@
-$primaryColor: #b00000;
-$primaryLightColor: #b00000;
+$primaryColor: #bf0000;
+$primaryLightColor: #bf0000;
 $primaryTextColor: #e8f5e9;
 $primaryTextHoverColor: #ffffff;
-$topBarColor: #b00000;
+$topBarColor: #bf0000;
 $accentColor: #fbc02d;
 $accentLightColor: #fff9c4;
 $accentTextColor: #000000;
-$activeMenuItemTextColor: #b00000;
+$activeMenuItemTextColor: #bf0000;
 $darkActiveMenuItemTextColor: #bb0101;
 $darkMenuItemTextColor: #dee0e3;
 $darkMenuItemInactiveTextColor: #757575;