From 5d0e2bba7423ebbd2d4c25081c6e3c36d075d896 Mon Sep 17 00:00:00 2001 From: mehdiboudjoudi Date: Wed, 8 Jan 2025 09:52:58 +0100 Subject: [PATCH 1/2] UI: Qualifikation Bearbeiten View --- .../qualifikaton-bearbeiten-view.component.css | 5 +++-- .../qualifikaton-bearbeiten-view.component.html | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css index 2873251..886cc52 100644 --- a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css +++ b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css @@ -70,7 +70,7 @@ input[type="text"] { } .add-employee-button { - background-color: #007bff; + background-color: #06a63b; color: #fff; padding: 10px 15px; border: none; @@ -96,7 +96,8 @@ input[type="text"] { padding: 5px 8px; border: none; cursor: pointer; - margin-left: 10px; + margin-left: 4px; + margin-right: 4px; border-radius: 3px; } diff --git a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html index cabdd8c..2370e98 100644 --- a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html +++ b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html @@ -11,16 +11,22 @@
- +
From ff92bf23c025ac1b2fa64986376890ecc9da1111 Mon Sep 17 00:00:00 2001 From: Jan Klattenhoff Date: Wed, 8 Jan 2025 10:19:43 +0100 Subject: [PATCH 2/2] Update the login view --- src/app/app.routes.ts | 18 ++++++++--------- .../login-view/login-view.component.html | 13 +++--------- .../login-view/login-view.component.ts | 20 ++++++++++++++----- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 7f0657d..d0683e9 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,10 +1,10 @@ -import { Routes } from '@angular/router'; -import { LoginViewComponent } from './components/login-view/login-view.component'; -import { MitarbeiterverwaltungViewComponent } from './components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component'; -import { EmployeeDetailComponent } from './components/employee-detail/employee-detail.component'; -import { QualifikatonBearbeitenViewComponent } from './components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component'; -import { KeycloakAuthGuard } from 'keycloak-angular'; -import { AuthGuard } from './service/auth.service'; +import { Routes } from "@angular/router"; +import { LoginViewComponent } from "./components/login-view/login-view.component"; +import { MitarbeiterverwaltungViewComponent } from "./components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component"; +import { EmployeeDetailComponent } from "./components/employee-detail/employee-detail.component"; +import { QualifikatonBearbeitenViewComponent } from "./components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component"; +import { KeycloakAuthGuard } from "keycloak-angular"; +import { AuthGuard } from "./service/auth.service"; export const routes: Routes = [ { @@ -26,6 +26,6 @@ export const routes: Routes = [ }, { path: "**", - redirectTo: '', - } + redirectTo: "", + }, ]; diff --git a/src/app/components/login-view/login-view.component.html b/src/app/components/login-view/login-view.component.html index d73e36d..c1234f8 100644 --- a/src/app/components/login-view/login-view.component.html +++ b/src/app/components/login-view/login-view.component.html @@ -1,15 +1,8 @@ - -
+

Hi-Tec GmbH

- Logout Icon + Logout Icon
- -
- - -

- - +
diff --git a/src/app/components/login-view/login-view.component.ts b/src/app/components/login-view/login-view.component.ts index 9e9655e..c15e6cf 100644 --- a/src/app/components/login-view/login-view.component.ts +++ b/src/app/components/login-view/login-view.component.ts @@ -1,12 +1,22 @@ -import { Component } from '@angular/core'; -import { KeycloakService } from 'keycloak-angular'; +import { Component } from "@angular/core"; +import { Router } from "@angular/router"; +import { KeycloakService } from "keycloak-angular"; @Component({ - selector: 'app-login-view', + selector: "app-login-view", standalone: true, imports: [], - templateUrl: './login-view.component.html', - styleUrl: './login-view.component.css' + templateUrl: "./login-view.component.html", + styleUrl: "./login-view.component.css", }) export class LoginViewComponent { + constructor( + private keyCloak: KeycloakService, + private router: Router, + ) {} + + login(): void { + this.keyCloak.login(); + this.router.navigate(["/mitarbeiter"]); + } }