Compare commits

...

15 commits

Author SHA1 Message Date
3139802ebf chore(deps): update devdependencies (non-major)
Some checks failed
renovate/artifacts Artifact file update failure
2025-01-08 10:02:26 +00:00
0bfa9b45c2 Merge pull request 'Benutzer-Ausloggen-Menu' (#56) from Benutzer-Ausloggen-Menu into main
Reviewed-on: #56
Reviewed-by: Jan Gleytenhoover <jan@kjan.email>
2025-01-08 09:52:41 +00:00
a0306fb548 Merge branch 'main' into Benutzer-Ausloggen-Menu 2025-01-08 09:52:23 +00:00
838deca050 src/app/app.component.html aktualisiert 2025-01-08 09:37:42 +00:00
0a13de7541 Ausloggen Menu UI 2025-01-08 10:36:48 +01:00
c23555b2cb Ausloggen Menu UI 2025-01-08 10:35:18 +01:00
b7d613f5d5 Merge pull request 'Update the login view' (#55) from fix/update-login-screen into main
Reviewed-on: #55
2025-01-08 09:22:58 +00:00
7d01118114 Merge branch 'main' into fix/update-login-screen 2025-01-08 09:22:34 +00:00
ff92bf23c0
Update the login view 2025-01-08 10:19:43 +01:00
cc9364f905 Merge pull request 'UI: Qualifikation Bearbeiten View' (#54) from Qualiofikation-Bearbeiten-UI into main
Reviewed-on: #54
2025-01-08 09:07:03 +00:00
4b0ab2f3b9 Merge branch 'main' into Qualiofikation-Bearbeiten-UI 2025-01-08 09:06:28 +00:00
mehdiboudjoudi
5d0e2bba74 UI: Qualifikation Bearbeiten View 2025-01-08 09:52:58 +01:00
544960e4af Merge remote-tracking branch 'origin/main' 2025-01-08 09:42:10 +01:00
74834a99d5 k 2025-01-08 08:58:43 +01:00
b9d6bf0b67 k 2025-01-08 08:58:32 +01:00
9 changed files with 3761 additions and 1140 deletions

BIN
bun.lockb

Binary file not shown.

4805
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -29,12 +29,12 @@
"@angular/cli": "^18.2.0",
"@angular/compiler-cli": "^18.2.0",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.2.0",
"jasmine-core": "~5.5.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.5.2"
"typescript": "~5.7.0"
}
}

View file

@ -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: "",
},
];

View file

@ -1,15 +1,8 @@
<div class="container" style="width: 100%;">
<div class="container" style="width: 100%">
<h1>Hi-Tec GmbH</h1>
<img src="img.png" alt="Logout Icon" class="logo-image">
<img src="img.png" alt="Logout Icon" class="logo-image" />
<form>
<label for="username">Username</label>
<input type="text" id="username" name="username"><br>
<label for="password">Password</label>
<input type="password" id="password" name="password"><br><br>
<button type="submit">Anmelden</button>
<button (click)="login()" type="submit">Mit KeyCLoak anmelden</button>
</form>
</div>

View file

@ -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"]);
}
}

View file

@ -1,8 +1,26 @@
<div class="container">
<div class="header">
<button class="logout-button">
<img src="user.svg" alt="User Icon">
<div class="dropdown position-absolute top-0 end-0 m-3">
<button
class="btn align-items-center d-flex"
type="button"
id="userDropdown"
data-bs-toggle="dropdown"
aria-expanded="false"
>
<img
src="user.svg"
alt="User Icon"
class="rounded-circle"
style="width: 30px; height: 30px;"
>
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
<li>
<a class="dropdown-item" href="/logout">Log out</a>
</li>
</ul>
</div>
<h1>Employees</h1>
</div>
<div class="header-actions">

View file

@ -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;
}

View file

@ -11,10 +11,16 @@
<ul class="employee-list">
<li>
<span class="employee-name">Employee 1</span>
<button class="delete-skill-button">
<img src="Delete-button.svg" alt="Delete">
</button>
<span class="employee-name">Max Mustermann</span>
</li>
<li>
<button class="delete-skill-button">
<img src="Delete-button.svg" alt="Delete">
</button>
<span class="employee-name">Mehdi Boudjoudi</span>
</li>
</ul>