Delete qualifications/employees wip

2025-01-15 10:38:35 +01:00
57 changed files with 4205 additions and 2948 deletions
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@ -1,71 +0,0 @@
-name: Playwright Tests
-
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    services:
-      postgres-employee:
-        image: postgres:13.3
-        env:
-          POSTGRES_DB: employee_db
-          POSTGRES_USER: employee
-          POSTGRES_PASSWORD: secret
-
-      employee:
-        image: berndheidemann/employee-management-service:1.1.3
-        # image: berndheidemann/employee-management-service_without_keycloak:1.1
-        env:
-          spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db
-          spring.datasource.username: employee
-          spring.datasource.password: secret
-
-
-    steps:
-      # Checkout the repository
-      - uses: actions/checkout@v4
-
-      # Set up Node.js
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      # Install project dependencies
-      - name: Install dependencies
-        run: npm ci
-
-      # Build the Angular project
-      - name: Build Angular Project
-        run: |
-          npm install -g @angular/cli
-          ng build --configuration=pipeline
-
-      # Start Angular development server
-      - name: Start Angular Development Server in Background
-        run: ng serve --configuration=pipeline > angular.log 2>&1 &
-        env:
-          PORT: 4200 # Ensure the server runs on a predictable port
-
-      # Install Playwright and dependencies
-      - name: Install Playwright Browsers
-        run: npx playwright install --with-deps
-
-      # Run Playwright tests
-      - name: Run Playwright Tests
-        run: npx playwright test
-        env:
-          CI: true # Ensures Playwright runs in CI mode
-
-      # Upload Playwright report
-      - uses: actions/upload-artifact@v3
-        if: ${{ !cancelled() }}
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30
--- a/.gitignore
+++ b/.gitignore
@ -40,8 +40,3 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
-node_modules/
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
--- a/angular.json
+++ b/angular.json
@ -52,14 +52,6 @@
              "optimization": false,
              "extractLicenses": false,
              "sourceMap": true
-            },
-            "pipeline": {
-              "fileReplacements": [
-                {
-                  "replace": "src/app/environments/environment.ts",
-                  "with": "src/app/environments/environment.ci.ts"
-                }
-              ]
            }
          },
          "defaultConfiguration": "production"
@ -72,9 +64,6 @@
            },
            "development": {
              "buildTarget": "employeeService:build:development"
-            },
-            "pipeline": {
-              "buildTarget": "employeeService:build:pipeline"
            }
          },
          "defaultConfiguration": "development"
@ -104,8 +93,5 @@
        }
      }
    }
-  },
-  "cli": {
-    "analytics": false
  }
 }
--- a/compose.yml
+++ b/compose.yml
@ -6,10 +6,14 @@ services:
  postgres-employee:
    container_name: postgres_employee
    image: postgres:13.3
+    volumes:
+      - employee_postgres_data:/var/lib/postgresql/data
    environment:
      POSTGRES_DB: employee_db
      POSTGRES_USER: employee
      POSTGRES_PASSWORD: secret
+    ports:
+      - "5432:5432"

  employee:
    container_name: employee
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -28,9 +28,7 @@
    "@angular-devkit/build-angular": "^18.2.0",
    "@angular/cli": "^18.2.0",
    "@angular/compiler-cli": "^18.2.0",
-    "@playwright/test": "^1.49.1",
    "@types/jasmine": "~5.1.0",
-    "@types/node": "^22.10.7",
    "jasmine-core": "~5.2.0",
    "karma": "~6.4.0",
    "karma-chrome-launcher": "~3.2.0",
--- a/playwright.config.ts
+++ b/playwright.config.ts
@ -1,69 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// import path from 'path';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './tests',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 8 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://127.0.0.1:3000',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://127.0.0.1:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -1,10 +1,25 @@
 import {Component} from '@angular/core';
 import {RouterOutlet} from '@angular/router';
+import {LoginViewComponent} from "./components/login-view/login-view.component";
+import {
+  MitarbeiterverwaltungViewComponent
+} from "./components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component";
+
+import {NavigationBarComponent} from './components/navigation-bar/navigation-bar.component';
+import {EmployeeDetailComponent} from './components/employee-detail/employee-detail.component';
+import {
+  MitarbeiterBearbeitenViewComponent
+} from "./components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component";
+import {
+  QualifikatonBearbeitenViewComponent
+} from "./components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component";
+import {QualifikatonDetailComponent} from "./components/qualifikaton-detail/qualifikaton-detail.component";
+

@Component({
  selector: 'app-root',
  standalone: true,
-  imports: [RouterOutlet],
+  imports: [RouterOutlet, NavigationBarComponent, EmployeeDetailComponent, LoginViewComponent, MitarbeiterverwaltungViewComponent, MitarbeiterBearbeitenViewComponent, QualifikatonBearbeitenViewComponent, QualifikatonDetailComponent],
  templateUrl: './app.component.html',
  styleUrl: './app.component.css'
 })
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@ -3,11 +3,8 @@ 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 { MitarbeiterBearbeitenViewComponent } from "./components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component";
+import { KeycloakAuthGuard } from "keycloak-angular";
 import { AuthGuard } from "./service/auth.service";
-import { MitarbeiterErstellenComponent } from "./components/mitarbeiter-erstellen/mitarbeiter-erstellen.component";
-import { QualifikationsverwaltungComponent } from "./components/qualifikationsverwaltung/qualifikationsverwaltung.component";
-import { QulifikationErstellenComponent } from "./components/qualifikation-erstellen/qualifikation-erstellen.component";

 export const routes: Routes = [
  {
@ -20,34 +17,12 @@ export const routes: Routes = [
    canActivate: [AuthGuard],
  },
  {
-    path: "qualifikationerstellen",
-    component: QulifikationErstellenComponent,
-    canActivate: [AuthGuard],
-  },
-  {
-    path: "mitarbeitererstellen",
-    component: MitarbeiterErstellenComponent,
-    canActivate: [AuthGuard],
-  },
-  {
-    path: "mitarbeiterbearbeiten/:id",
-    component: MitarbeiterBearbeitenViewComponent,
-    canActivate: [AuthGuard],
-  },
-  {
-    path: "qualifikationsverwaltung",
-    component: QualifikationsverwaltungComponent,
-    canActivate: [AuthGuard],
-  },
-  {
-    path: "mitarbeiterdetails/:id",
+    path: "mitarbeiterdetails",
    component: EmployeeDetailComponent,
-    canActivate: [AuthGuard],
  },
  {
-    path: "qualifikationbearbeiten/:id",
+    path: "qualifikationbearbeiten",
    component: QualifikatonBearbeitenViewComponent,
-    canActivate: [AuthGuard],
  },
  {
    path: "**",
--- a/src/app/components/employee-detail/employee-detail.component.html
+++ b/src/app/components/employee-detail/employee-detail.component.html
@ -1,29 +1,28 @@
-<div class="container">
 <div class="d-flex flex-col" style="height: 100%;">
+  <app-navigation-bar></app-navigation-bar>
  <div class="p-3" style="width: 100%;">
-      <button class="btn btn-primary" (click)="goToEmployeePage()">Back</button>
+    <a href="" class="btn btn-primary">Zurück</a>
    <div class="row align-items-start pt-3">
      <div class="col">
-          <h1>{{ employee.firstName }} {{ employee.lastName }} </h1>
-          <p><strong>Street: </strong>{{ employee.street }}</p>
-          <p><strong>Postal Code: </strong>{{ employee.postcode }}</p>
-          <p><strong>City: </strong>{{ employee.city }}</p>
-          <p><strong>Phone number: </strong>{{ employee.phone }}s</p>
-          <button class="btn btn-danger" (click)="deleteEmployee(currentId)">Delete</button>
-          <button class="ms-3 btn btn-primary" (click)="editEmployee(currentId)">Edit</button>
-
+        <h1>Name des Mitarbeiters</h1>
+        <p><strong>Straße: </strong>Straße des Benutzers</p>
+        <p><strong>Postleitzahl: </strong>Postleitzahl des Benutzers</p>
+        <p><strong>Stadt: </strong>Stadt des Benutzers</p>
+        <p><strong>Telefonnummer: </strong>Telefonnummer des Benutzers</p>
+        <button class="btn btn-danger">Löschen</button>
+        <button class="ms-3 btn btn-primary">Bearbeiten</button>
      </div>
      <div class="col">
        <h2>Qualifikationen</h2>
        <ul class="list-group" style="width: fit-content;">
-            @for(skill of skillSet; track skill) {
-            <li class="list-group-item">{{ skill }}</li>
-            }
-
+          <li class="list-group-item">Qualifikation 1</li>
+          <li class="list-group-item">Qualifikation 2</li>
+          <li class="list-group-item">Qualifikation 3</li>
+          <li class="list-group-item">Qualifikation 4</li>
+          <li class="list-group-item">Qualifikation 5</li>
        </ul>
      </div>
    </div>

  </div>
 </div>
-</div>
--- a/src/app/components/employee-detail/employee-detail.component.ts
+++ b/src/app/components/employee-detail/employee-detail.component.ts
@ -1,11 +1,5 @@
 import { Component } from '@angular/core';
 import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
-import {EmployeeNameAndSkillDataDTO, EmployeeResponseDTO} from "../../models/mitarbeiter";
-import {EmployeeService} from "../../service/employee.service";
-import {ActivatedRoute, Router} from "@angular/router";
-import {Observable} from "rxjs";
-import {QualificationGetDTO} from "../../models/skill";
-import {SkillService} from "../../service/skill.service";

@Component({
  selector: 'app-employee-detail',
@ -15,31 +9,5 @@ import {SkillService} from "../../service/skill.service";
  styleUrl: './employee-detail.component.css'
 })
 export class EmployeeDetailComponent {
-  employee!: EmployeeResponseDTO;
-  skillSet: string[] = [];
-  currentId: number = 0;

-  constructor(private employeeService: EmployeeService, private router: Router, private route: ActivatedRoute, private skillService: SkillService) {
-    this.currentId = this.route.snapshot.params['id'];
-    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
-      this.employee = employee;
-      this.skillSet = this.employee.skillSet?.map(skill => skill.skill) || [];
-    });
-  }
-
-  editEmployee(id: number) {
-    this.router.navigate([`/mitarbeiterbearbeiten/${id}`]);
-  }
-
-  goToEmployeePage(){
-    this.router.navigate(['mitarbeiter']);
-  }
-
-  deleteEmployee(id: number) {
-    this.employeeService.deleteEmployee(id);
-    this.router.navigate([`mitarbeiter`]);
-  }
-
-
-  protected readonly EmployeeService = EmployeeService;
 }
--- a/src/app/components/login-view/login-view.component.html
+++ b/src/app/components/login-view/login-view.component.html
@ -3,6 +3,6 @@
  <img src="img.png" alt="Logout Icon" class="logo-image" />

  <form>
-    <button (click)="login()" type="submit">Login with Keycloak</button>
+    <button (click)="login()" type="submit">Mit KeyCLoak anmelden</button>
  </form>
 </div>
--- a/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.css
+++ b/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.css
@ -0,0 +1,120 @@
+body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 20px;
+  background-color: #f0f0f0;
+}
+
+.container {
+  width: 100%;
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 20px;
+  background-color: #fff;
+}
+
+h1, h2 {
+  font-size: 2rem;
+  margin-bottom: 20px;
+}
+
+.back-button {
+  background-color: #ccc;
+  color: #333;
+  border: none;
+  padding: 8px 12px;
+  border-radius: 3px;
+  margin-bottom: 15px;
+}
+
+.user-info {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: 20px;
+  margin-bottom: 20px;
+}
+
+.form-group {
+  display: flex;
+  flex-direction: column;
+}
+
+label {
+  margin-bottom: 5px;
+}
+
+input[type="text"] {
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+
+input[type="text"]::placeholder {
+  color: #999;
+}
+
+.save-button {
+  background-color: #007bff;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 10px;
+  width: 100%;
+}
+
+.skills-container {
+  border: 1px solid #ccc;
+  padding: 20px;
+  border-radius: 3px;
+}
+
+.skill-controls select {
+  padding: 10px 10px;
+  border: none;
+  border-radius: 3px;
+  background-color: #007bff;
+  color: #fff;
+  cursor: pointer;
+}
+
+.skill-list {
+  list-style: none;
+  padding: 0;
+}
+
+.skill-list li {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
+}
+
+.skill-icon {
+  margin-right: 5px;
+}
+
+.delete-skill-button {
+  color: #fff;
+  padding: 5px 8px;
+  border: none;
+  cursor: pointer;
+  margin-left: 10px;
+  border-radius: 3px;
+}
+
+.delete-skill-button img {
+  width: 15px;
+  height: 15px;
+}
+
+.add-skill-button{
+  background-color: #06a63b;
+  color: #fff;
+  padding: 8px 10px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-left: 10px;
+}
+
--- a/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.html
+++ b/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.html
@ -1 +1,49 @@
-<app-mitarbeiter-form [(mitarbeiter)]="mitarbeiter" (mitarbeiterChange)="submitted($event)"></app-mitarbeiter-form>
+<div class="container">
+  <button class="back-button">Back</button>
+  <div class="user-info">
+    <div class="form-group">
+      <label for="firstName">First Name</label>
+      <input type="text" id="firstName" placeholder="First Name">
+    </div>
+    <div class="form-group">
+      <label for="lastName">Last Name</label>
+      <input type="text" id="lastName" placeholder="Last Name">
+    </div>
+    <div class="form-group">
+      <label for="street">Street</label>
+      <input type="text" id="street" placeholder="Street">
+    </div>
+    <div class="form-group">
+      <label for="postcode">Postcode</label>
+      <input type="text" id="postcode" placeholder="Postcode">
+    </div>
+    <div class="form-group">
+      <label for="city">City</label>
+      <input type="text" id="city" placeholder="City">
+    </div>
+    <div class="form-group">
+      <label for="phone">Phone Number</label>
+      <input type="text" id="phone" placeholder="Phone Number">
+    </div>
+  </div>
+
+  <div class="skills-container">
+    <h2>Skills</h2>
+    <ul class="skill-list">
+      <li>
+        <span class="skill-name">Skill 1</span>
+          <button class="delete-skill-button" (click)="deleteEmployee(employees.id)">>
+            <img src="Delete-button.svg" alt="Delete">
+          </button>
+      </li>
+    </ul>
+    <div class="skill-controls">
+      <select>
+        <option value="">Option 1</option>
+        <option value="">Option 2</option>
+      </select>
+      <button class="add-skill-button">Add qualification</button>
+    </div>
+  </div>
+  <button class="save-button">Save</button>
+</div>
--- a/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.ts
+++ b/src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.ts
@ -1,43 +1,32 @@
 import { Component } from '@angular/core';
-import { MitarbeiterFormComponent } from '../mitarbeiter-form/mitarbeiter-form.component';
-import { EmployeeResponseDTO } from '../../models/mitarbeiter';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EmployeeService } from '../../service/employee.service';
+import {EmployeeService} from "../../service/employee.service";

@Component({
  selector: 'app-mitarbeiter-bearbeiten-view',
  standalone: true,
-  imports: [MitarbeiterFormComponent],
+  imports: [],
  templateUrl: './mitarbeiter-bearbeiten-view.component.html',
  styleUrl: './mitarbeiter-bearbeiten-view.component.css'
 })
 export class MitarbeiterBearbeitenViewComponent {
-  public mitarbeiter!: EmployeeResponseDTO;

-  constructor(private employeeService: EmployeeService, private route: ActivatedRoute, private router: Router) { }
+  employees: any[] = [];

-  submitted(mitarbeiter: EmployeeResponseDTO) {
-    this.employeeService.updateEmployee(mitarbeiter);
-    this.returnToEmployeeOverview();
-  }
+  constructor(private employeeService: EmployeeService) {}

-  returnToEmployeeOverview() {
-    this.router.navigate(["mitarbeiter"]);
-  }
-
-  ngOnInit(): void {
-    this.mitarbeiter = {
-      id: 0,
-      firstName: '',
-      lastName: '',
-      street: '',
-      phone: '',
-      skillSet: [],
-      postcode: '',
-      city: '',
-    }
-    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
-      this.mitarbeiter = employee;
+  deleteEmployee(id: number): void {
+    if (confirm('Are you sure you want to delete this employee?')) {
+      this.employeeService.deleteEmployee(id).subscribe({
+        next: () => {
+          alert('Employee deleted successfully!');
+          // Optionally, reload or refresh the employee list here
+        },
+        error: (err) => {
+          console.error('Error deleting employee:', err);
+          alert('An error occurred while deleting the employee.');
+        },
      });
    }
  }
+
+}
--- a/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.css
+++ b/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.css
--- a/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.html
+++ b/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.html
@ -1 +0,0 @@
-<app-mitarbeiter-form [(mitarbeiter)]="mitarbeiter" (mitarbeiterChange)="submitted($event)"></app-mitarbeiter-form>
--- a/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.spec.ts
+++ b/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MitarbeiterErstellenComponent } from './mitarbeiter-erstellen.component';
-
-describe('MitarbeiterErstellenComponent', () => {
-  let component: MitarbeiterErstellenComponent;
-  let fixture: ComponentFixture<MitarbeiterErstellenComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MitarbeiterErstellenComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(MitarbeiterErstellenComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.ts
+++ b/src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.ts
@ -1,44 +0,0 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EmployeeResponseDTO } from '../../models/mitarbeiter';
-import { EmployeeService } from '../../service/employee.service';
-import { MitarbeiterFormComponent } from '../mitarbeiter-form/mitarbeiter-form.component';
-
-@Component({
-  selector: 'app-mitarbeiter-erstellen',
-  standalone: true,
-  imports: [MitarbeiterFormComponent],
-  templateUrl: './mitarbeiter-erstellen.component.html',
-  styleUrl: './mitarbeiter-erstellen.component.css'
-})
-export class MitarbeiterErstellenComponent {
-  public mitarbeiter!: EmployeeResponseDTO;
-
-  constructor(private employeeService: EmployeeService, private route: ActivatedRoute, private router: Router) { }
-
-  submitted(mitarbeiter: EmployeeResponseDTO) {
-    console.log(mitarbeiter)
-    this.employeeService.createEmployee(mitarbeiter);
-    this.returnToEmployeeOverview();
-  }
-
-  returnToEmployeeOverview() {
-    this.router.navigate(["mitarbeiter"]);
-  }
-
-  ngOnInit(): void {
-    this.mitarbeiter = {
-      id: 0,
-      firstName: '',
-      lastName: '',
-      street: '',
-      phone: '',
-      skillSet: [],
-      postcode: '',
-      city: '',
-    }
-    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
-      this.mitarbeiter = employee;
-    });
-  }
-}
--- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.css
+++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.css
@ -1,120 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 20px;
-  background-color: #f0f0f0;
-}
-
-.container {
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-  background-color: #fff;
-}
-
-h1, h2 {
-  font-size: 2rem;
-  margin-bottom: 20px;
-}
-
-.back-button {
-  background-color: #ccc;
-  color: #333;
-  border: none;
-  padding: 8px 12px;
-  border-radius: 3px;
-  margin-bottom: 15px;
-}
-
-.user-info {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  grid-gap: 20px;
-  margin-bottom: 20px;
-}
-
-.form-group {
-  display: flex;
-  flex-direction: column;
-}
-
-label {
-  margin-bottom: 5px;
-}
-
-input[type="text"] {
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-}
-
-input[type="text"]::placeholder {
-  color: #999;
-}
-
-.save-button {
-  background-color: #007bff;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 10px;
-  width: 100%;
-}
-
-.skills-container {
-  border: 1px solid #ccc;
-  padding: 20px;
-  border-radius: 3px;
-}
-
-.skill-controls select {
-  padding: 10px 10px;
-  border: none;
-  border-radius: 3px;
-  background-color: #007bff;
-  color: #fff;
-  cursor: pointer;
-}
-
-.skill-list {
-  list-style: none;
-  padding: 0;
-}
-
-.skill-list li {
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
-
-.skill-icon {
-  margin-right: 5px;
-}
-
-.delete-skill-button {
-  color: #fff;
-  padding: 5px 8px;
-  border: none;
-  cursor: pointer;
-  margin-left: 10px;
-  border-radius: 3px;
-}
-
-.delete-skill-button img {
-  width: 15px;
-  height: 15px;
-}
-
-.add-skill-button{
-  background-color: #06a63b;
-  color: #fff;
-  padding: 8px 10px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-left: 10px;
-}
-
--- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.html
+++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.html
@ -1,78 +0,0 @@
-<form [formGroup]="mitarbeiterForm">
-
-  <div class="container">
-    <button (click)="returnToEmployeeOverview()" class="back-button">Back</button>
-    <div class="user-info">
-      <div class="form-group">
-        @if (errorMessages['firstName']) {
-        <div class="alert alert-danger">{{errorMessages['firstName']}}</div>
-        }
-        <label for="firstName">First Name</label>
-        <input type="text" id="firstName" placeholder="First Name" formControlName="firstName">
-      </div>
-      <div class="form-group">
-        @if (errorMessages['lastName']) {
-        <div class="alert alert-danger">{{errorMessages['lastName']}}</div>
-        }
-        <label for="lastName">Last Name</label>
-        <input type="text" id="lastName" placeholder="Last Name" formControlName="lastName">
-      </div>
-      <div class="form-group">
-        @if (errorMessages['street']) {
-        <div class="alert alert-danger">{{errorMessages['street']}}</div>
-        }
-        <label for="street">Street</label>
-        <input type="text" id="street" placeholder="Street" formControlName="street">
-      </div>
-      <div class="form-group">
-        @if (errorMessages['postcode']) {
-        <div class="alert alert-danger">{{errorMessages['postcode']}}</div>
-        }
-        <label for="postcode">Postcode</label>
-        <input type="text" id="postcode" placeholder="Postcode" formControlName="postcode">
-      </div>
-      <div class="form-group">
-        @if (errorMessages['city']) {
-        <div class="alert alert-danger">{{errorMessages['city']}}</div>
-        }
-        <label for="city">City</label>
-        <input type="text" id="city" placeholder="City" formControlName="city">
-      </div>
-      <div class="form-group">
-        @if (errorMessages['phone']) {
-        <div class="alert alert-danger">{{errorMessages['phone']}}</div>
-        }
-        <label for="phone">Phone Number</label>
-        <input type="text" id="phone" placeholder="Phone Number" formControlName="phone">
-      </div>
-    </div>
-
-    <div class="skills-container">
-      <h2>Skills</h2>
-      <ul class="skill-list">
-        @for (skill of mitarbeiter.skillSet; track skill) {
-        <li>
-          <span class="skill-name">{{skill.skill}}</span>
-          <button (click)="removeSkill(skill.id)" class="delete-skill-button">
-            <img src="Delete-button.svg" alt="Delete">
-          </button>
-        </li>
-        }
-      </ul>
-      @if (!hasAllSkills) {
-      <div class="skill-controls">
-        <select formControlName="newSkill">
-          @for (skill of allSkills | async; track skill) {
-          @if (!hasSkill(skill.id)) {
-          <option value="{{skill.id}}">{{skill.skill}}</option>
-          }
-          }
-        </select>
-        <button (click)="addSkill()" class="add-skill-button">Add qualification</button>
-      </div>
-      }
-    </div>
-    <button (click)="submit()" class="save-button">Save</button>
-  </div>
-
-</form>
--- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.spec.ts
+++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MitarbeiterFormComponent } from './mitarbeiter-form.component';
-
-describe('MitarbeiterFormComponent', () => {
-  let component: MitarbeiterFormComponent;
-  let fixture: ComponentFixture<MitarbeiterFormComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MitarbeiterFormComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(MitarbeiterFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts
+++ b/src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts
@ -1,133 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { EmployeeNameAndSkillDataDTO, EmployeeRequestPutDTO, EmployeeResponseDTO } from '../../models/mitarbeiter';
-import { AbstractControl, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { HttpClient } from '@angular/common/http';
-import { Router } from '@angular/router';
-import { AsyncPipe, NgFor, Location } from '@angular/common';
-import { SkillService } from '../../service/skill.service';
-import { QualificationGetDTO } from '../../models/skill';
-import { Observable, of } from 'rxjs';
-
-@Component({
-  selector: 'app-mitarbeiter-form',
-  standalone: true,
-  imports: [ReactiveFormsModule, NgFor, AsyncPipe],
-  templateUrl: './mitarbeiter-form.component.html',
-  styleUrl: './mitarbeiter-form.component.css'
-})
-export class MitarbeiterFormComponent {
-  @Input() mitarbeiter!: EmployeeResponseDTO;
-  @Output() mitarbeiterChange = new EventEmitter<EmployeeResponseDTO>();
-
-  public mitarbeiterForm!: FormGroup;
-  public allSkills: Observable<Array<QualificationGetDTO>> = of([]);
-  public hasAllSkills: boolean = false;
-  errorMessages: Record<string, string> = {};
-
-  constructor(public http: HttpClient, public router: Router, private skillService: SkillService, private location: Location) {}
-
-  returnToEmployeeOverview() {
-    this.location.back();
-  }
-
-  private setupForm() {
-    this.mitarbeiterForm = new FormGroup({
-      lastName: new FormControl(this.mitarbeiter.lastName, Validators.required),
-      firstName: new FormControl(this.mitarbeiter.firstName, Validators.required),
-      street: new FormControl(this.mitarbeiter.street, Validators.required),
-      postcode: new FormControl(this.mitarbeiter.postcode, [Validators.required, Validators.minLength(5), Validators.maxLength(5)]),
-      city: new FormControl(this.mitarbeiter.city, Validators.required),
-      phone: new FormControl(this.mitarbeiter.phone, [Validators.required, Validators.pattern('^[- +()0-9]+$')]),
-      newSkill: new FormControl(null)
-    });
-  }
-
-  ngOnChanges(): void {
-    this.setupForm();
-  }
-
-  skillsChanged() {
-    this.allSkills.subscribe(skills => {
-      this.hasAllSkills = this.checkAllSkills(skills);
-    });
-  }
-
-  ngOnInit(): void {
-    this.allSkills = this.skillService.getAllSkills();
-    this.skillsChanged();
-    this.setupForm();
-  }
-
-  removeSkill(id?: number) {
-    this.mitarbeiter.skillSet = this.mitarbeiter.skillSet?.filter(skill => skill.id !== id);
-    this.skillsChanged();
-  }
-
-  checkAllSkills(skills: Array<QualificationGetDTO>): boolean {
-    const skillSet = this.mitarbeiter.skillSet || [];
-
-    return skills.every(skill =>
-      skillSet.some(givenSkill => skill.id === givenSkill.id)
-    );
-  }
-
-  hasSkill(id: number): boolean {
-    for (const skill of this.mitarbeiter.skillSet || []) {
-      if (skill.id == id) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  addSkill() {
-    const id = Number(this.mitarbeiterForm.get("newSkill")?.value);
-    if (!id) {
-      return;
-    }
-    this.allSkills.subscribe(skills => {
-      const newSkill = skills.filter(skill => skill.id == id)[0];
-      this.mitarbeiter.skillSet?.push(newSkill);
-      this.skillsChanged();
-      this.mitarbeiterForm.get("newSkill")?.reset(null); // Added
-    });
-  }
-
-  private validationErrorMessages: Record<string, string> = {
-    required: "This field is required",
-    minlength: "The value is too short",
-    maxlength: "The value is too long",
-    pattern: "This field must be a valid phone number",
-  };
-
-  updateErrorMessages(): void {
-    this.errorMessages = {};
-
-    Object.keys(this.mitarbeiterForm.controls).forEach(field => {
-      const control = this.mitarbeiterForm.get(field);
-
-      if (control && control.errors) {
-        this.errorMessages[field] = Object.keys(control.errors)
-          .map(errorKey => this.validationErrorMessages[errorKey] || `Unknown error: ${errorKey}`)
-          .join(' ');
-      }
-    });
-  }
-
-
-  submit() {
-    this.updateErrorMessages();
-    if (!this.mitarbeiterForm.valid) {
-      return;
-    }
-
-    this.mitarbeiter.firstName = this.mitarbeiterForm.get("firstName")?.value;
-    this.mitarbeiter.lastName = this.mitarbeiterForm.get("lastName")?.value;
-    this.mitarbeiter.street = this.mitarbeiterForm.get("street")?.value;
-    this.mitarbeiter.postcode = this.mitarbeiterForm.get("postcode")?.value;
-    this.mitarbeiter.city = this.mitarbeiterForm.get("city")?.value;
-    this.mitarbeiter.phone = this.mitarbeiterForm.get("phone")?.value;
-
-    this.mitarbeiterChange.emit(this.mitarbeiter);
-  }
-}
--- a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.css
+++ b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.css
@ -19,7 +19,7 @@ h1 {

 .search-bar {
  display: flex;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
  align-items: center;
 }

--- a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html
+++ b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html
@ -1,28 +1,34 @@
-<div class="d-flex flex-row">
-  <app-navigation-bar [route]="'employee'" class="row" style="height: 100vh;"></app-navigation-bar>
 <div class="container">
  <div class="header">
    <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
+        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>
+        <li>
+          <a class="dropdown-item" href="/logout">Log out</a>
+        </li>
      </ul>
    </div>
    <h1>Employees</h1>
  </div>
-
  <div class="header-actions">
-      <form [formGroup]="searchForm">
    <div class="search-bar">
-          <input type="text" placeholder="Search employee" formControlName="search">
-          <button (click)="submit()">Search</button>
+      <input type="text" placeholder="Search employee">
+      <button>Search</button>
    </div>
-        <p class="text-body-tertiary">Search for a propertiy of an Employee. eg. First Name</p>
-      </form>
-      <button (click)="createEmployee()" class="add-button">Add employee</button>
+    <button class="add-button">Add employee</button>
  </div>

  <table class="employee-table">
@ -30,23 +36,14 @@
    <tr>
      <th><span class="sortable">First Name</span></th>
      <th><span class="sortable">Last Name</span></th>
+      <th>Street</th>
+      <th>Postcode</th>
+      <th>City</th>
+      <th>Phone</th>
      <th>Actions</th>
    </tr>
    </thead>
    <tbody>
-        @if (employees) {
-        @for (employee of employees; track employee) {
-        <tr>
-          <td>{{ employee.firstName }}</td>
-          <td>{{ employee.lastName }}</td>
-          <td>
-          <button class="btn btn-primary me-2" (click)="goToEmployeeDetailPage(employee.id)">Details</button>
-            <button class="btn btn-danger" (click)="deleteEmployee(employee.id)">Delete</button>
-          </td>
-        </tr>
-        }
-        }
    </tbody>
  </table>
 </div>
-</div>
--- a/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts
+++ b/src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts
@ -1,75 +1,13 @@
-import { Component, OnInit } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { Observable, of } from 'rxjs';
-import { EmployeeResponseDTO } from '../../models/mitarbeiter';
-import { EmployeeService } from '../../service/employee.service';
-import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
-import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
+import { Component } from '@angular/core';
+import {EmployeeService} from "../../service/employee.service";

@Component({
  selector: 'app-mitarbeiterverwaltung-view',
-  templateUrl: './mitarbeiterverwaltung-view.component.html',
-  styleUrls: ['./mitarbeiterverwaltung-view.component.css'],
  standalone: true,
-  imports: [CommonModule, ReactiveFormsModule, NavigationBarComponent]
+  imports: [],
+  templateUrl: './mitarbeiterverwaltung-view.component.html',
+  styleUrl: './mitarbeiterverwaltung-view.component.css'
 })
-export class MitarbeiterverwaltungViewComponent implements OnInit {
-  employees: Array<EmployeeResponseDTO> = [];
-  searchForm!: FormGroup;
+export class MitarbeiterverwaltungViewComponent {

-  constructor(private employeeService: EmployeeService, private router: Router) {
-    this.updateEmployees();
-  }
-
-  submit() {
-    const searchTerm = this.searchForm.get("search")?.value || '';
-
-    this.employeeService.getAllEmployees().subscribe(employees => {
-      let foundEmployees: Array<EmployeeResponseDTO> = [];
-      for (const employee of employees) {
-        if (
-          employee.firstName.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          employee.lastName.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          employee.street.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          employee.postcode.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          employee.city.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          employee.phone.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          searchTerm == ''
-        ) {
-          foundEmployees.push(employee);
-        }
-      }
-
-      this.employees = foundEmployees;
-    });
-  }
-
-  editEmployee(id: number) {
-    this.router.navigate([`/mitarbeiterbearbeiten/${id}`]);
-  }
-
-  createEmployee() {
-    this.router.navigate(['/mitarbeitererstellen']);
-  }
-
-  deleteEmployee(id: number) {
-    this.employeeService.deleteEmployee(id);
-    this.employees = this.employees.filter(employee => employee.id != id);
-  }
-
-  goToEmployeeDetailPage(id: number){
-    this.router.navigate([`/mitarbeiterdetails/${id}`]);
-  }
-
-  updateEmployees() {
-    this.employeeService.getAllEmployees().subscribe(employees => this.employees = employees);
-  }
-
-  ngOnInit(): void {
-    this.searchForm = new FormGroup({
-      search: new FormControl(''),
-    });
-    this.updateEmployees();
-  }
 }
--- a/src/app/components/navigation-bar/navigation-bar.component.html
+++ b/src/app/components/navigation-bar/navigation-bar.component.html
@ -5,13 +5,18 @@
    </a>
    <hr>
    <ul class="nav nav-pills flex-column mb-auto">
+      <li class="nav-item">
+        <a href="#" class="nav-link active text-black" aria-current="page">
+          Dashboard
+        </a>
+      </li>
      <li>
-        <a [routerLink]="['/mitarbeiter']" (click)="employees()" [class.active]="route == 'employee'" class="nav-link text-black" aria-current="page">
+        <a href="#" class="nav-link text-black">
          Mitarbeiterverwaltung
        </a>
      </li>
      <li>
-        <a [routerLink]="['/qualifikationsverwaltung']" [class.active]="route == 'skill'" class="nav-link text-black">
+        <a href="#" class="nav-link text-black">
          Qualifikationsverwaltung
        </a>
      </li>
--- a/src/app/components/navigation-bar/navigation-bar.component.ts
+++ b/src/app/components/navigation-bar/navigation-bar.component.ts
@ -1,18 +1,12 @@
-import { Component, Input } from '@angular/core';
-import { ActivatedRoute, Router, RouterLink } from '@angular/router';
+import { Component } from '@angular/core';

@Component({
  selector: 'app-navigation-bar',
  standalone: true,
-  imports: [RouterLink],
+  imports: [],
  templateUrl: './navigation-bar.component.html',
  styleUrl: './navigation-bar.component.css'
 })
 export class NavigationBarComponent {
-  constructor(private router: Router) { }
-  @Input() route: string = "";

-  employees() {
-    this.router.navigate(['mitarbeiter']);
-  }
 }
--- a/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.css
+++ b/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.css
--- a/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.html
+++ b/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.html
@ -1 +0,0 @@
-<app-qualifikation-form [(skill)]="skill" (skillChange)="submitted($event)"></app-qualifikation-form>
--- a/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.spec.ts
+++ b/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QulifikationErstellenComponent } from './qulifikation-erstellen.component';
-
-describe('QulifikationErstellenComponent', () => {
-  let component: QulifikationErstellenComponent;
-  let fixture: ComponentFixture<QulifikationErstellenComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [QulifikationErstellenComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(QulifikationErstellenComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.ts
+++ b/src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.ts
@ -1,29 +0,0 @@
-import { Component } from '@angular/core';
-import { QualifikationFormComponent } from '../qualifikation-form/qualifikation-form.component';
-import { QualificationGetDTO } from '../../models/skill';
-import { SkillService } from '../../service/skill.service';
-
-@Component({
-  selector: 'app-qulifikation-erstellen',
-  standalone: true,
-  imports: [QualifikationFormComponent],
-  templateUrl: './qualifikation-erstellen.component.html',
-  styleUrl: './qualifikation-erstellen.component.css'
-})
-export class QulifikationErstellenComponent {
-  public skill!: QualificationGetDTO;
-
-  constructor(private skillService: SkillService) { }
-
-  submitted(skill: QualificationGetDTO) {
-    console.log(skill);
-    this.skillService.createSkill(skill);
-  }
-
-  ngOnInit(): void {
-    this.skill = {
-      id: 0,
-      skill: '',
-    };
-  }
-}
--- a/src/app/components/qualifikation-form/qualifikation-form.component.css
+++ b/src/app/components/qualifikation-form/qualifikation-form.component.css
@ -1,131 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 20px;
-  background-color: #f0f0f0;
-}
-
-.container {
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-  background-color: #fff;
-}
-
-h1, h2 {
-  font-size: 1.8rem;
-  margin-bottom: 15px;
-}
-
-.back-button {
-  background-color: #ccc;
-  color: #333;
-  border: none;
-  padding: 8px 12px;
-  border-radius: 3px;
-  margin-bottom: 15px;
-}
-
-.form-group {
-  margin-bottom: 15px;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-input[type="text"] {
-  width: 100%;
-  padding: 10px;
-  border: 1px solid #ccc;
-  border-radius: 1px;
-}
-
-.employee-list {
-  list-style: none;
-  padding: 0;
-}
-
-.employee-list li {
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
-
-.employee-icon {
-  margin-right: 5px;
-}
-
-.add-employee-section {
-  margin-top: 15px;
-}
-
-.add-employee-section select {
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  margin-right: 10px;
-}
-
-.add-employee-button {
-  background-color: #06a63b;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 10px;
-}
-
-.save-button {
-  background-color: #007bff;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 20px;
-  display: block;
-  width: 100%;
-}
-
-.delete-skill-button {
-  color: #fff;
-  padding: 5px 8px;
-  border: none;
-  cursor: pointer;
-  margin-left: 4px;
-  margin-right: 4px;
-  border-radius: 3px;
-}
-
-.delete-skill-button img {
-  width: 15px;
-  height: 15px;
-}
-
-.add-employee-section {
-  margin-top: 15px;
-}
-
-.add-employee-section label {
-  display: block;
-  margin-bottom: 5px;
-  font-weight: bold;
-}
-
-.add-employee-section input[type="text"] {
-  width: 100%;
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-}
-
-.employee-container {
-  border: 1px solid #ccc;
-  padding: 20px;
-  border-radius: 1px;
-  margin-bottom: 20px;
-}
--- a/src/app/components/qualifikation-form/qualifikation-form.component.html
+++ b/src/app/components/qualifikation-form/qualifikation-form.component.html
@ -1,41 +0,0 @@
-<div class="container">
-  <form [formGroup]="skillForm">
-    <button (click)="returnToSkillList()" class="back-button">Back</button>
-
-    <div class="form-group">
-      @if (errorMessages['name']) {
-      <div class="alert alert-danger">{{errorMessages['name']}}</div>
-      }
-      <label for="name">Name</label>
-      <input type="text" id="name" formControlName="name">
-    </div>
-
-    <div class="employee-container">
-      <h2>Employees possessing the qualification</h2>
-
-      <ul class="employee-list">
-        @for (employee of addedEmployees; track employee) {
-        <li>
-          <button (click)="removeEmployee(employee.id)" class="delete-skill-button">
-            <img src="Delete-button.svg" alt="Delete">
-          </button>
-          <span class="employee-name">{{employee.firstName}} {{employee.lastName}}</span>
-        </li>
-        }
-      </ul>
-
-      @if (addableEmployees.length > 0) {
-      <div class="add-employee-section">
-        <select formControlName="newEmployee">
-          @for (employee of addableEmployees; track employee) {
-          <option value="{{employee.id}}">{{employee.firstName}} {{employee.lastName}}</option>
-          }
-        </select>
-
-        <button (click)="addEmployee()" class="add-employee-button">Add employee</button>
-      </div>
-      }
-    </div>
-    <button (click)="submit()" class="save-button">Save</button>
-  </form>
-</div>
--- a/src/app/components/qualifikation-form/qualifikation-form.component.spec.ts
+++ b/src/app/components/qualifikation-form/qualifikation-form.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QualifikationFormComponent } from './qualifikation-form.component';
-
-describe('QualifikationFormComponent', () => {
-  let component: QualifikationFormComponent;
-  let fixture: ComponentFixture<QualifikationFormComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [QualifikationFormComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(QualifikationFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/components/qualifikation-form/qualifikation-form.component.ts
+++ b/src/app/components/qualifikation-form/qualifikation-form.component.ts
@ -1,133 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { EmployeesForAQualificationDTO, QualificationGetDTO } from '../../models/skill';
-import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
-import { SkillService } from '../../service/skill.service';
-import { EmployeeService } from '../../service/employee.service';
-import { concatMap, every, from, lastValueFrom, Observable, of, switchMap, take, tap } from 'rxjs';
-import { EmployeeNameDataDTO, EmployeeResponseDTO } from '../../models/mitarbeiter';
-import { AsyncPipe } from '@angular/common';
-import { Router } from '@angular/router';
-
-@Component({
-  selector: 'app-qualifikation-form',
-  standalone: true,
-  imports: [ReactiveFormsModule, AsyncPipe],
-  templateUrl: './qualifikation-form.component.html',
-  styleUrl: './qualifikation-form.component.css'
-})
-export class QualifikationFormComponent {
-  @Input() skill!: QualificationGetDTO;
-  @Output() skillChange = new EventEmitter<QualificationGetDTO>();
-
-  public skillForm!: FormGroup;
-  public addableEmployees: Array<EmployeeResponseDTO> = [];
-  public addedEmployees: Array<EmployeeNameDataDTO> = [];
-  errorMessages: Record<string, string> = {};
-
-
-  constructor(private skillService: SkillService, private employeeService: EmployeeService, private router: Router) { }
-
-  private validationErrorMessages: Record<string, string> = {
-    required: "This field is required",
-  };
-
-  updateErrorMessages(): void {
-    this.errorMessages = {};
-
-    Object.keys(this.skillForm.controls).forEach(field => {
-      const control = this.skillForm.get(field);
-
-      if (control && control.errors) {
-        this.errorMessages[field] = Object.keys(control.errors)
-          .map(errorKey => this.validationErrorMessages[errorKey] || `Unknown error: ${errorKey}`)
-          .join(' ');
-      }
-    });
-  }
-
-  setUpForm() {
-    this.skillForm = new FormGroup({
-      name: new FormControl(this.skill.skill, Validators.required),
-      newEmployee: new FormControl(),
-    });
-  }
-
-
-  addEmployee() {
-    const employeeId = Number(this.skillForm.get("newEmployee")?.value);
-    if (!employeeId) {
-      return;
-    }
-    const employee = this.addableEmployees.find(emp => emp.id === employeeId);
-
-    if (employee) {
-      this.addableEmployees = this.addableEmployees.filter(emp => emp.id !== employeeId);
-
-      this.addedEmployees.push(employee);
-    }
-  }
-
-  removeEmployee(employeeId: number) {
-    const employee = this.addedEmployees.find(emp => emp.id === employeeId);
-
-    if (employee) {
-      this.addedEmployees = this.addedEmployees.filter(emp => emp.id !== employeeId);
-
-      this.employeeService.getEmployeeById(employee.id).subscribe(employeeDto => {
-        this.addableEmployees.push(employeeDto);
-      });
-    }
-  }
-
-  returnToSkillList() {
-    this.router.navigate(["qualifikationsverwaltung"]);
-  }
-
-  updateEmployeeLists() {
-    if (this.skill.id != -1) {
-      this.employeeService.getAllEmployees().subscribe(employees => {
-        this.addableEmployees = employees;
-
-        this.skillService.getEmployeesBySkill(this.skill.id).subscribe(addedEmployeesResponse => {
-          this.addedEmployees = addedEmployeesResponse.employees;
-
-          this.addableEmployees = this.addableEmployees.filter(employee => {
-            return !this.addedEmployees.some(added => added.id === employee.id);
-          });
-        });
-      });
-    }
-  }
-
-  submit() {
-    this.updateErrorMessages();
-    if (!this.skillForm.valid) {
-      return;
-    }
-
-    for (const employee of this.addedEmployees) {
-      this.employeeService.getEmployeeById(employee.id).subscribe(employeeResponse => {
-        this.employeeService.addSkillToEmployee(this.skill.id, employeeResponse);
-      });
-    }
-
-    for (const employee of this.addableEmployees) {
-      this.employeeService.removeSkillFromEmployee(this.skill.id, employee.id);
-    }
-
-    this.skill.skill = this.skillForm.get("name")?.value;
-    this.skillChange.emit(this.skill);
-
-    this.router.navigate(["/qualifikationsverwaltung"]);
-  }
-
-  ngOnChanges(): void {
-    this.setUpForm();
-    this.updateEmployeeLists();
-  }
-
-  ngOnInit() {
-    this.setUpForm();
-    this.updateEmployeeLists();
-  }
-}
--- a/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.css
+++ b/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.css
@ -1,90 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 20px;
-  background-color: #f0f0f0;
-}
-
-.container {
-  width: 100%;
-  margin: 0 auto;
-  background-color: #fff;
-  padding: 20px;
-}
-
-h1 {
-  font-size: 2rem;
-  margin-bottom: 20px;
-}
-
-.search-bar {
-  display: flex;
-  margin-bottom: 10px;
-  align-items: center;
-}
-
-.search-bar input[type="text"] {
-  padding: 8px;
-  border: 1px solid #ccc;
-  border-radius: 3px;
-  flex-grow: 1;
-  margin-right: 10px;
-}
-
-.search-bar button {
-  padding: 10px 15px;
-  background-color: #007bff;
-  color: #fff;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-}
-
-.add-button {
-  background-color: #07af16;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  float: left;
-  margin-bottom: 10px;
-}
-
-.employee-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-top: 20px;
-}
-
-.employee-table th,
-.employee-table td {
-  padding: 12px 15px;
-  border: 1px solid #ddd;
-  text-align: left;
-}
-
-.employee-table th {
-  background-color: #f0f0f0;
-  font-weight: bold;
-}
-
-.sortable {
-  cursor: pointer;
-}
-
-.logout-button {
-  background-color: transparent;
-  border: none;
-  cursor: pointer;
-  border-radius: 50%;
-  width: 30px;
-  height: 30px;
-  display: flex;
-  float: right;
-}
-
-.logout-button img {
-  width: 20px;
-  height: 20px;
-}
--- a/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.html
+++ b/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.html
@ -1,60 +0,0 @@
-<div class="d-flex flex-row">
-  <app-navigation-bar [route]="'skill'" class="row" style="height: 100vh;"></app-navigation-bar>
-  <div class="container">
-    <div class="header">
-      <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>Qualifications</h1>
-    </div>
-
-    <div class="d-flex flex-column">
-      <div class="row header-actions">
-        <form [formGroup]="searchForm">
-          <div class="search-bar">
-            <input type="text" placeholder="Search employee" formControlName="search">
-            <button (click)="submit()">Search</button>
-          </div>
-          <p class="text-body-tertiary">Search for a propertiy of a Qualification. eg. Name</p>
-        </form>
-        <div class="d-flex">
-          <button (click)="createSkill()" class="add-button me-auto">Add qualification</button>
-        </div>
-      </div>
-
-      @if (errorDeletingSkill) {
-      <div class="row">
-        <p class="alert alert-danger">This Qualification can not be deleted because it still has employees.</p>
-      </div>
-      }
-    </div>
-
-    <table class="employee-table">
-      <thead>
-        <tr>
-          <th><span class="sortable">Name</span></th>
-          <th>Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        @if (skills) {
-        @for (skill of skills; track skill) {
-        <tr>
-          <td>{{ skill.skill }}</td>
-          <td>
-            <button class="btn btn-primary me-2" (click)="editSkill(skill.id)">Edit</button>
-            <button class="btn btn-danger" (click)="deleteSkill(skill.id)">Delete</button>
-          </td>
-        </tr>
-        }
-        }
-      </tbody>
-    </table>
-  </div>
-</div>
--- a/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.spec.ts
+++ b/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QualifikationsverwaltungComponent } from './qualifikationsverwaltung.component';
-
-describe('QualifikationsverwaltungComponent', () => {
-  let component: QualifikationsverwaltungComponent;
-  let fixture: ComponentFixture<QualifikationsverwaltungComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [QualifikationsverwaltungComponent]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(QualifikationsverwaltungComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.ts
+++ b/src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.ts
@ -1,66 +0,0 @@
-import { Component } from '@angular/core';
-import { QualificationGetDTO } from '../../models/skill';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { SkillService } from '../../service/skill.service';
-import { Router } from '@angular/router';
-import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
-
-@Component({
-  selector: 'app-qualifikationsverwaltung',
-  standalone: true,
-  imports: [ReactiveFormsModule, NavigationBarComponent],
-  templateUrl: './qualifikationsverwaltung.component.html',
-  styleUrl: './qualifikationsverwaltung.component.css'
-})
-export class QualifikationsverwaltungComponent {
-  skills: Array<QualificationGetDTO> = [];
-  public searchForm!: FormGroup;
-  public errorDeletingSkill = false;
-
-  constructor(private skillService: SkillService, private router: Router) { }
-
-  submit() {
-    const searchTerm = this.searchForm.get("search")?.value || '';
-
-    this.skillService.getAllSkills().subscribe(skills => {
-      let foundSkills: Array<QualificationGetDTO> = [];
-      for (const skill of skills) {
-        if (
-          skill.skill.toLowerCase().includes(searchTerm.toLowerCase()) ||
-          searchTerm == ''
-        ) {
-          foundSkills.push(skill);
-        }
-      }
-
-      this.skills = foundSkills;
-    });
-  }
-
-  editSkill(id: number) {
-    this.router.navigate([`/qualifikationbearbeiten/${id}`]);
-  }
-
-  createSkill() {
-    this.router.navigate(['/qualifikationerstellen']);
-  }
-
-  deleteSkill(id: number) {
-    this.skillService.getEmployeesBySkill(id).subscribe(employees => {
-      this.errorDeletingSkill = false;
-      if (employees.employees.length == 0) {
-        this.skillService.deleteSkill(id);
-        this.skills = this.skills.filter(skill => skill.id != id);
-      } else {
-        this.errorDeletingSkill = true;
-      }
-    });
-  }
-
-  ngOnInit(): void {
-    this.searchForm = new FormGroup({
-      search: new FormControl(''),
-    });
-    this.skillService.getAllSkills().subscribe(skills => this.skills = skills);
-  }
-}
--- a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css
+++ b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css
@ -0,0 +1,131 @@
+body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 20px;
+  background-color: #f0f0f0;
+}
+
+.container {
+  width: 100%;
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 20px;
+  background-color: #fff;
+}
+
+h1, h2 {
+  font-size: 1.8rem;
+  margin-bottom: 15px;
+}
+
+.back-button {
+  background-color: #ccc;
+  color: #333;
+  border: none;
+  padding: 8px 12px;
+  border-radius: 3px;
+  margin-bottom: 15px;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+input[type="text"] {
+  width: 100%;
+  padding: 10px;
+  border: 1px solid #ccc;
+  border-radius: 1px;
+}
+
+.employee-list {
+  list-style: none;
+  padding: 0;
+}
+
+.employee-list li {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
+}
+
+.employee-icon {
+  margin-right: 5px;
+}
+
+.add-employee-section {
+  margin-top: 15px;
+}
+
+.add-employee-section select {
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  margin-right: 10px;
+}
+
+.add-employee-button {
+  background-color: #06a63b;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 10px;
+}
+
+.save-button {
+  background-color: #007bff;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 20px;
+  display: block;
+  width: 100%;
+}
+
+.delete-skill-button {
+  color: #fff;
+  padding: 5px 8px;
+  border: none;
+  cursor: pointer;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 3px;
+}
+
+.delete-skill-button img {
+  width: 15px;
+  height: 15px;
+}
+
+.add-employee-section {
+  margin-top: 15px;
+}
+
+.add-employee-section label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+
+.add-employee-section input[type="text"] {
+  width: 100%;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+
+.employee-container {
+  border: 1px solid #ccc;
+  padding: 20px;
+  border-radius: 1px;
+  margin-bottom: 20px;
+}
--- a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html
+++ b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html
@ -1 +1,36 @@
-<app-qualifikation-form [(skill)]="skill" (skillChange)="submitted($event)"></app-qualifikation-form>
+<div class="container">
+  <button class="back-button">Back</button>
+
+  <div class="form-group">
+    <label for="name">Name</label>
+    <input type="text" id="name" value="(Hier kommt name der gewählten qualification hin)">
+  </div>
+
+  <div class="employee-container">
+    <h2>Employees possessing the qualification</h2>
+
+    <ul class="employee-list">
+      <li>
+        <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>
+
+    <div class="add-employee-section">
+      <label for="employeeSearch">Search for employee</label>
+      <input type="text" id="employeeSearch" placeholder="Last name of employee">
+      <button class="add-employee-button">Add employee</button>
+    </div>
+  </div>
+
+  <button class="save-button">Save</button>
+</div>
+
--- a/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.ts
+++ b/src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.ts
@ -1,38 +1,12 @@
 import { Component } from '@angular/core';
-import { QualifikationFormComponent } from '../qualifikation-form/qualifikation-form.component';
-import { SkillService } from '../../service/skill.service';
-import { FormGroup } from '@angular/forms';
-import { QualificationGetDTO } from '../../models/skill';
-import { ActivatedRoute } from '@angular/router';

@Component({
  selector: 'app-qualifikaton-bearbeiten-view',
  standalone: true,
-  imports: [QualifikationFormComponent],
+  imports: [],
  templateUrl: './qualifikaton-bearbeiten-view.component.html',
  styleUrl: './qualifikaton-bearbeiten-view.component.css'
 })
 export class QualifikatonBearbeitenViewComponent {
-  public skill!: QualificationGetDTO;

-  constructor(private skillService: SkillService, private route: ActivatedRoute) { }
-
-  submitted(skill: QualificationGetDTO) {
-    this.skillService.updateSkill(skill);
-  }
-
-  ngOnInit(): void {
-    this.skill = {
-      id: -1,
-      skill: '',
-    };
-
-    this.skillService.getAllSkills().subscribe(skills => {
-      for (const skill of skills) {
-        if (skill.id == Number(this.route.snapshot.params['id'])) {
-          this.skill = skill;
-        }
-      }
-    });
-  }
 }
--- a/src/app/environments/environment.ci.ts
+++ b/src/app/environments/environment.ci.ts
@ -1,4 +0,0 @@
-
-export class Environment {
-  public static readonly BASE_URL = "http://employee:8089";
-}
--- a/src/app/environments/environment.ts
+++ b/src/app/environments/environment.ts
@ -1,4 +0,0 @@
-
-export class Environment {
-  public static readonly BASE_URL = "http://127.0.0.1:8089";
-}
--- a/src/app/models/mitarbeiter.ts
+++ b/src/app/models/mitarbeiter.ts
@ -1,47 +0,0 @@
-import { QualificationGetDTO, QualificationPostDTO } from "./skill";
-
-export interface EmployeeRequestPutDTO {
-  lastName: string,
-  firstName: string,
-  street: string,
-  postcode: string,
-  city: string,
-  phone: string,
-  skillSet: Array<number>,
-}
-
-export interface EmployeeResponseDTO {
-  id: number,
-  lastName: string,
-  firstName: string,
-  street: string,
-  postcode: string,
-  city: string,
-  phone: string,
-  skillSet?: Array<QualificationGetDTO>,
-}
-
-export interface EmployeeRequestDTO {
-  lastName: string,
-  firstName: string,
-  street: string,
-  postcode: string,
-  city: string,
-  phone: string,
-  skillSet?: Array<number>,
-}
-
-export interface EmployeeNameAndSkillDataDTO {
-  id: number,
-  lastName: string,
-  firstName: string,
-  skillSet: Array<QualificationPostDTO>,
-}
-
-export interface EmployeeNameDataDTO {
-  id: number,
-  lastName: string,
-  firstName: string,
-}
-
-
--- a/src/app/models/skill.ts
+++ b/src/app/models/skill.ts
@ -1,15 +0,0 @@
-import { EmployeeNameDataDTO } from "./mitarbeiter";
-
-export interface QualificationGetDTO {
-  id: number,
-  skill: string,
-}
-
-export interface QualificationPostDTO {
-  skill: string,
-}
-
-export interface EmployeesForAQualificationDTO {
-  qualification: QualificationGetDTO,
-  employees: Array<EmployeeNameDataDTO>,
-}
--- a/src/app/service/employee.service.ts
+++ b/src/app/service/employee.service.ts
@ -1,76 +1,22 @@
-import { Injectable } from "@angular/core";
-import { EmployeeRequestDTO, EmployeeRequestPutDTO, EmployeeResponseDTO } from "../models/mitarbeiter";
-import { HttpClient } from "@angular/common/http";
-import { Observable } from "rxjs";
-import { SkillService } from "./skill.service";
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';

@Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class EmployeeService {
+  private baseUrl = 'http://examplewebsite.com'; // Replace with your actual API base URL
+
  constructor(private http: HttpClient) {}

-  responseToRequestDto(employee: EmployeeResponseDTO): EmployeeRequestDTO {
-    return {
-      firstName: employee.firstName,
-      lastName: employee.lastName,
-      street: employee.street,
-      postcode: employee.postcode,
-      city: employee.city,
-      phone: employee.phone,
-      skillSet: employee.skillSet?.map(skill => skill.id) || [],
-    }
-  }
-
-  responseDtoToPutDto(employee: EmployeeResponseDTO): EmployeeRequestPutDTO {
-    return {
-      firstName: employee.firstName,
-      lastName: employee.lastName,
-      street: employee.street,
-      postcode: employee.postcode,
-      city: employee.city,
-      phone: employee.phone,
-      skillSet: employee.skillSet?.map(skill => skill.id) || [],
-    }
-  }
-
-  createEmployee(employee: EmployeeResponseDTO) {
-    this.http.post(`${SkillService.BASE_URL}/employees`, this.responseToRequestDto(employee)).subscribe();
-  }
-
-  updateEmployee(employee: EmployeeResponseDTO) {
-    this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, this.responseDtoToPutDto(employee)).subscribe();
-  }
-
-  getAllEmployees(): Observable<Array<EmployeeResponseDTO>> {
-    return this.http.get<Array<EmployeeResponseDTO>>(`${SkillService.BASE_URL}/employees`);
-  }
-
-  deleteEmployee(id: number) {
-    this.http.delete(`${SkillService.BASE_URL}/employees/${id}`).subscribe();
-  }
-
-  getEmployeeById(id: number): Observable<EmployeeResponseDTO> {
-    return this.http.get<EmployeeResponseDTO>(`${SkillService.BASE_URL}/employees/${id}`);
-  }
-
-  removeSkillFromEmployee(skillId: number, employeeId: number) {
-    this.getEmployeeById(employeeId).subscribe(employee => {
-      let employeePut = this.responseDtoToPutDto(employee);
-      if (employeePut.skillSet.indexOf(skillId) != 1) {
-        employeePut.skillSet = employeePut.skillSet.filter(skill => skill != skillId);
-      }
-
-      this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, employeePut).subscribe();
-    });
-  }
-
-  addSkillToEmployee(skillId: number, employee: EmployeeResponseDTO) {
-    let employeePut = this.responseDtoToPutDto(employee);
-    if (employeePut.skillSet.indexOf(skillId) == -1) {
-      employeePut.skillSet.push(skillId);
-    }
-
-    this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, employeePut).subscribe();
+  /**
+   * Deletes an employee by ID.
+   * @param id - The ID of the employee to delete.
+   * @returns An Observable for the delete operation.
+   */
+  deleteEmployee(id: number): Observable<void> {
+    const url = `${this.baseUrl}/employees/${id}`;
+    return this.http.delete<void>(url);
  }
 }
--- a/src/app/service/skill.service.ts
+++ b/src/app/service/skill.service.ts
@ -1,55 +0,0 @@
-import {HttpClient} from "@angular/common/http";
-import {Injectable} from "@angular/core";
-import {EmployeesForAQualificationDTO, QualificationGetDTO, QualificationPostDTO} from "../models/skill";
-import {Observable} from "rxjs";
-import {EmployeeNameAndSkillDataDTO, EmployeeNameDataDTO} from "../models/mitarbeiter";
-import {EmployeeService} from "./employee.service";
-import {Environment} from "../environments/environment";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class SkillService {
-  deleteSkill(id: number) {
-    this.getEmployeesBySkill(id).subscribe(employees => {
-      for (let employee of employees.employees) {
-        this.employeeService.removeSkillFromEmployee(id, employee.id);
-      }
-    });
-
-    this.http.delete(`${SkillService.BASE_URL}/qualifications/${id}`).subscribe();
-  }
-
-  public static readonly BASE_URL = Environment.BASE_URL;
-
-  getToPutDto(skill: QualificationGetDTO): QualificationPostDTO {
-    return {
-      skill: skill.skill,
-    }
-  }
-
-  createSkill(skill: QualificationGetDTO) {
-    this.http.post(`${SkillService.BASE_URL}/qualifications`, this.getToPutDto(skill)).subscribe();
-  }
-
-  constructor(private http: HttpClient, private employeeService: EmployeeService) {
-
-  }
-
-  updateSkill(skill: QualificationGetDTO) {
-    this.http.put(`${SkillService.BASE_URL}/qualifications/${skill.id}`, this.getToPutDto(skill)).subscribe();
-  }
-
-  getAllSkills(): Observable<Array<QualificationGetDTO>> {
-    return this.http.get<Array<QualificationGetDTO>>(`${SkillService.BASE_URL}/qualifications`);
-  }
-
-  getEmployeesBySkill(id: number): Observable<EmployeesForAQualificationDTO> {
-    return this.http.get<EmployeesForAQualificationDTO>(`${SkillService.BASE_URL}/qualifications/${id}/employees`);
-  }
-
-  getSkillsOfEmployee(id: number): Observable<EmployeeNameAndSkillDataDTO> {
-    return this.http.get<EmployeeNameAndSkillDataDTO>(`${SkillService.BASE_URL}/employees/${id}/qualifications`);
-  }
-
-}
--- a/src/main.ts
+++ b/src/main.ts
@ -1,7 +1,6 @@
-import { HttpClientModule } from '@angular/common/http';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';

-bootstrapApplication(AppComponent , appConfig,)
+bootstrapApplication(AppComponent, appConfig)
  .catch((err) => console.error(err));
--- a/tests/login.spec.ts
+++ b/tests/login.spec.ts
@ -1,46 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { async } from 'rxjs';
-
-test('LoginPageShouldRender', async ({ page }) => {
-  await page.goto('http://localhost:4200');
-
-  // Expect a title "to contain" a substring.
-  await expect(page).toHaveTitle(/EmployeeService/);
-});
-
-test('LoginPageShouldHaveCorrectHeading', async ({ page }) => {
-  await page.goto('http://localhost:4200');
-
-  const heading = page.getByRole('heading');
-  await expect(heading).toHaveText('Hi-Tec GmbH');
-});
-
-test('LoginPageShouldHaveLoginButton', async ({ page }) => {
-  await page.goto('http://localhost:4200');
-
-  const button = page.getByRole('button');
-  await expect(button).toHaveText('Login with Keycloak');
-});
-
-test('LoginPageButtonShouldRedirectToKeycloak', async ({ page }) => {
-  await page.goto('http://localhost:4200');
-
-  const button = page.getByText("Login with Keycloak");
-  await button.click();
-  await page.waitForFunction(() => window.location.href.includes('keycloak'));
-  expect(page.url()).toContain("keycloak.szut.dev");
-});
-
-test('AfterLoginUserShouldBeRedirectedToEmployees', async ({ page }) => {
-  await page.goto('http://localhost:4200');
-
-  await page.getByRole('button').click();
-  await page.waitForFunction(() => window.location.href.includes('keycloak'));
-  await page.getByLabel('Username or email').fill('user');
-  await page.getByLabel('Password').fill('test');
-  await page.click('#kc-login');
-
-  expect(page.url()).toContain('localhost');
-  expect(page.url()).toContain('mitarbeiter');
-});
-
--- a/tests/mitarbeiter.spec.ts
+++ b/tests/mitarbeiter.spec.ts
@ -1,50 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe('mitarbeiter', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('http://localhost:4200');
-
-    await page.getByRole('button').click();
-    await page.waitForFunction(() => window.location.href.includes('keycloak'));
-    await page.getByLabel('Username or email').fill('user');
-    await page.getByLabel('Password').fill('test');
-    await page.click('#kc-login');
-
-    await page.goto('http://localhost:4200/mitarbeiter');
-  });
-
-  test('ShouldLoad', async ({ page }) => {
-    await expect(page.getByRole('heading')).toHaveText("Employees");
-  });
-
-  test('ShouldLoadEmployees', async ({ page }) => {
-    expect(page.getByText('Max')).toBeTruthy();
-  });
-
-  test('AddEmployeeShouldRedirect', async ({ page }) => {
-    await page.getByText('Add employee').click();
-
-    expect(page.url()).toContain('mitarbeitererstellen');
-  });
-
-  test('DeleteShouldBeThere', async ({ page }) => {
-    const button = page.getByText('Delete').first();
-
-    const users = page.getByText('Delete');
-    await users.first().waitFor({ state: "visible" });
-    expect(await users.count()).toBeGreaterThan(1);
-    expect(button).toBeTruthy();
-  });
-
-  test('SearchShouldWork', async ({ page }) => {
-    const searchField = page.getByRole('textbox');
-    const searchButton = page.getByText('Search').first();
-
-    await searchField.fill('Max');
-    await searchButton.click();
-
-    const hiddenItem = page.getByText('MusterFrau');
-    await expect(hiddenItem).toHaveCount(0);
-  });
-});
-
--- a/tests/mitarbeiterErstellen.spec.ts
+++ b/tests/mitarbeiterErstellen.spec.ts
@ -1,61 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe('mitarbeiter', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('http://localhost:4200');
-
-    await page.getByRole('button').click();
-    await page.waitForFunction(() => window.location.href.includes('keycloak'));
-    await page.getByLabel('Username or email').fill('user');
-    await page.getByLabel('Password').fill('test');
-    await page.click('#kc-login');
-
-    await page.goto('http://localhost:4200/mitarbeitererstellen');
-  });
-
-  test('pageShouldLoad', async ({ page }) => {
-    await expect(page.getByText('Save')).toHaveCount(1);
-  });
-
-  test('backButtonShouldGoBack', async ({ page }) => {
-    await page.getByText('Back').click();
-
-    expect(page.url().includes('erstellen')).toBeFalsy();
-  });
-
-  test('EveryFieldShouldValidateEmptiness', async ({ page }) => {
-    await page.getByText('Save').click();
-
-    const errors = page.getByText('This field is required');
-
-    await expect(errors).toHaveCount(6);
-  });
-
-  test('PhoneNumberShouldBeValidated', async ({ page }) => {
-    await page.getByLabel('Phone').fill("asd");
-    await page.getByText('Save').click();
-
-    const error = page.getByText('This field must be a valid phone number');
-
-    await expect(error).toHaveCount(1);
-  });
-
-  test('PostCodeShouldValidateTooShort', async ({ page }) => {
-    await page.getByLabel('Postcode').fill("1");
-    await page.getByText('Save').click();
-
-    const error = page.getByText('The value is too short');
-
-    await expect(error).toHaveCount(1);
-  });
-
-  test('PostCodeShouldValidateTooLong', async ({ page }) => {
-    await page.getByLabel('Postcode').fill("123456");
-    await page.getByText('Save').click();
-
-    const error = page.getByText('The value is too long');
-
-    await expect(error).toHaveCount(1);
-  });
-});
-
--- a/tests/mitarbeiterbearbeiten.spec.ts
+++ b/tests/mitarbeiterbearbeiten.spec.ts
@ -1,24 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe('mitarbeiterbearbeiten', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('http://localhost:4200');
-
-    await page.getByRole('button').click();
-    await page.waitForFunction(() => window.location.href.includes('keycloak'));
-    await page.getByLabel('Username or email').fill('user');
-    await page.getByLabel('Password').fill('test');
-    await page.click('#kc-login');
-
-    await page.goto('http://localhost:4200/mitarbeiterbearbeiten/1');
-  });
-
-  test('ShouldLoad', async ({ page }) => {
-    expect(page.getByText("Save")).toBeTruthy();
-  });
-
-  test('FieldsShouldHaveValues', async ({page}) => {
-    await expect(page.getByLabel('First Name')).toHaveValue('Max');
-  });
-});
-
--- a/tests/qualifikationbearbeiten.spec.ts
+++ b/tests/qualifikationbearbeiten.spec.ts
@ -1,23 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe('qualifikationbearbeiten', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('http://localhost:4200');
-
-    await page.getByRole('button').click();
-    await page.waitForFunction(() => window.location.href.includes('keycloak'));
-    await page.getByLabel('Username or email').fill('user');
-    await page.getByLabel('Password').fill('test');
-    await page.click('#kc-login');
-
-    await page.goto('http://localhost:4200/qualifikationbearbeiten/1');
-  });
-
-  test('ShouldLoad', async ({ page }) => {
-    expect(page.getByText("Save")).toBeTruthy();
-  });
-
-  test('FieldsShouldHaveValues', async ({page}) => {
-    await expect(page.getByLabel('Name')).toHaveValue('Java');
-  });
-});
--- a/tests/qualifikationsverwaltung.spec.ts
+++ b/tests/qualifikationsverwaltung.spec.ts
@ -1,58 +0,0 @@
-import { test, expect } from "@playwright/test";
-
-test.describe('qualifikationen', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('http://localhost:4200');
-
-    await page.getByRole('button').click();
-    await page.waitForFunction(() => window.location.href.includes('keycloak'));
-    await page.getByLabel('Username or email').fill('user');
-    await page.getByLabel('Password').fill('test');
-    await page.click('#kc-login');
-
-    await page.goto('http://localhost:4200/qualifikationsverwaltung');
-  });
-
-  test('ShouldLoad', async ({ page }) => {
-    await expect(page.getByRole('heading')).toHaveText("Qualifications");
-  });
-
-  test('ShouldLoadQualifications', async ({ page }) => {
-    expect(page.getByText('Java')).toBeTruthy();
-  });
-
-  // TODO
-  // test('AddQualificationShouldRedirect', async ({ page }) => {
-  //   await page.getByText('Add qualification').click();
-
-  //   expect(page.url()).toContain('mitarbeitererstellen');
-  // });
-
-  test('EditShouldRedirectToCorrespondingPage', async ({ page }) => {
-    const button = page.getByText('Edit').first();
-    await button.click();
-
-    expect(page.url()).toContain('qualifikationbearbeiten');
-    expect(page.url()).toContain('1');
-  });
-
-  test('DeleteShouldBeThere', async ({ page }) => {
-    const button = page.getByText('Delete').first();
-
-    const users = page.getByText('Delete');
-    await users.first().waitFor({ state: "visible" });
-    expect(await users.count()).toBe(2);
-    expect(button).toBeTruthy();
-  });
-
-  test('SearchShouldWork', async ({ page }) => {
-    const searchField = page.getByRole('textbox');
-    const searchButton = page.getByText('Search').first();
-
-    await searchField.fill('Java');
-    await searchButton.click();
-
-    const hiddenItem = page.getByText('Angular');
-    await expect(hiddenItem).toHaveCount(0);
-  });
-});
				`@ -1 +0,0 @@`
				`<app-mitarbeiter-form [(mitarbeiter)]="mitarbeiter" (mitarbeiterChange)="submitted($event)"></app-mitarbeiter-form>`
				`@ -1 +0,0 @@`
				`<app-qualifikation-form [(skill)]="skill" (skillChange)="submitted($event)"></app-qualifikation-form>`