From 839f9f77526d843953cae220f024afe15da247d2 Mon Sep 17 00:00:00 2001 From: Constantin Simonis Date: Thu, 9 Jan 2025 09:13:06 +0000 Subject: [PATCH] change file structure Reviewed-on: https://git.simonis.lol/angular/ems-frontend/pulls/21 Reviewed-by: Get in my car i have candy --- src/app/{ => employee}/Employee.ts | 0 .../delete/delete.component.css} | 0 .../delete/delete.component.html} | 0 .../delete/delete.component.ts} | 8 ++++---- .../table/table.component.css} | 0 .../table/table.component.html} | 0 .../table/table.component.ts} | 14 +++++++------- src/app/home/home.component.ts | 6 +++--- src/app/{ => qualification}/Qualification.ts | 0 .../create/create.component.css} | 0 .../create/create.component.html} | 0 .../create/create.component.ts} | 10 +++++----- .../edit/edit.component.css} | 0 .../edit/edit.component.html} | 0 .../edit/edit.component.ts} | 10 +++++----- .../table/table.component.css} | 0 .../table/table.component.html} | 0 .../table/table.component.ts} | 14 +++++++------- src/app/services/employee-api.service.ts | 2 +- src/app/services/qualification.service.ts | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) rename src/app/{ => employee}/Employee.ts (100%) rename src/app/{create-qualification/create-qualification.component.css => employee/delete/delete.component.css} (100%) rename src/app/{delete-employee/delete-employee.component.html => employee/delete/delete.component.html} (100%) rename src/app/{delete-employee/delete-employee.component.ts => employee/delete/delete.component.ts} (77%) rename src/app/{employee-list/employee-list.component.css => employee/table/table.component.css} (100%) rename src/app/{employee-list/employee-list.component.html => employee/table/table.component.html} (100%) rename src/app/{employee-list/employee-list.component.ts => employee/table/table.component.ts} (85%) rename src/app/{ => qualification}/Qualification.ts (100%) rename src/app/{delete-employee/delete-employee.component.css => qualification/create/create.component.css} (100%) rename src/app/{create-qualification/create-qualification.component.html => qualification/create/create.component.html} (100%) rename src/app/{create-qualification/create-qualification.component.ts => qualification/create/create.component.ts} (87%) rename src/app/{edit-qualification/edit-qualification.component.css => qualification/edit/edit.component.css} (100%) rename src/app/{edit-qualification/edit-qualification.component.html => qualification/edit/edit.component.html} (100%) rename src/app/{edit-qualification/edit-qualification.component.ts => qualification/edit/edit.component.ts} (87%) rename src/app/{qualifications/qualifications.component.css => qualification/table/table.component.css} (100%) rename src/app/{qualifications/qualifications.component.html => qualification/table/table.component.html} (100%) rename src/app/{qualifications/qualifications.component.ts => qualification/table/table.component.ts} (77%) diff --git a/src/app/Employee.ts b/src/app/employee/Employee.ts similarity index 100% rename from src/app/Employee.ts rename to src/app/employee/Employee.ts diff --git a/src/app/create-qualification/create-qualification.component.css b/src/app/employee/delete/delete.component.css similarity index 100% rename from src/app/create-qualification/create-qualification.component.css rename to src/app/employee/delete/delete.component.css diff --git a/src/app/delete-employee/delete-employee.component.html b/src/app/employee/delete/delete.component.html similarity index 100% rename from src/app/delete-employee/delete-employee.component.html rename to src/app/employee/delete/delete.component.html diff --git a/src/app/delete-employee/delete-employee.component.ts b/src/app/employee/delete/delete.component.ts similarity index 77% rename from src/app/delete-employee/delete-employee.component.ts rename to src/app/employee/delete/delete.component.ts index 992bfff..a1f5dab 100644 --- a/src/app/delete-employee/delete-employee.component.ts +++ b/src/app/employee/delete/delete.component.ts @@ -8,7 +8,7 @@ import { MatDialogTitle } from "@angular/material/dialog"; import {MatButton} from "@angular/material/button"; -import EmployeeApiService from "../services/employee-api.service"; +import EmployeeApiService from "../../services/employee-api.service"; @Component({ selector: 'app-delete-employee', @@ -19,11 +19,11 @@ import EmployeeApiService from "../services/employee-api.service"; MatButton, MatDialogClose ], - templateUrl: './delete-employee.component.html', + templateUrl: './delete.component.html', standalone: true, - styleUrl: './delete-employee.component.css' + styleUrl: './delete.component.css' }) -export class DeleteEmployeeComponent { +export class DeleteComponent { private apiService: EmployeeApiService = inject(EmployeeApiService); protected employee: Employee = inject(MAT_DIALOG_DATA); diff --git a/src/app/employee-list/employee-list.component.css b/src/app/employee/table/table.component.css similarity index 100% rename from src/app/employee-list/employee-list.component.css rename to src/app/employee/table/table.component.css diff --git a/src/app/employee-list/employee-list.component.html b/src/app/employee/table/table.component.html similarity index 100% rename from src/app/employee-list/employee-list.component.html rename to src/app/employee/table/table.component.html diff --git a/src/app/employee-list/employee-list.component.ts b/src/app/employee/table/table.component.ts similarity index 85% rename from src/app/employee-list/employee-list.component.ts rename to src/app/employee/table/table.component.ts index c2b5d4d..019b783 100644 --- a/src/app/employee-list/employee-list.component.ts +++ b/src/app/employee/table/table.component.ts @@ -15,8 +15,8 @@ import {MatMenuModule} from '@angular/material/menu'; import {MatTableModule} from '@angular/material/table'; import {MatSortModule} from '@angular/material/sort'; import {MatDialog} from "@angular/material/dialog"; -import {DeleteEmployeeComponent} from "../delete-employee/delete-employee.component"; -import EmployeeApiService from "../services/employee-api.service"; +import {DeleteComponent} from "../delete/delete.component"; +import EmployeeApiService from "../../services/employee-api.service"; @Component({ selector: 'app-employee-list', @@ -34,13 +34,13 @@ import EmployeeApiService from "../services/employee-api.service"; MatTableModule, MatSortModule ], - templateUrl: './employee-list.component.html', + templateUrl: './table.component.html', host: { class: 'block w-full p-6' }, - styleUrl: './employee-list.component.css' + styleUrl: './table.component.css' }) -export class EmployeeListComponent implements OnInit{ +export class TableComponent implements OnInit{ private readonly apiService: EmployeeApiService = inject(EmployeeApiService); private readonly snackBar: MatSnackBar = inject(MatSnackBar); private readonly deleteDialogue: MatDialog = inject(MatDialog); @@ -55,7 +55,7 @@ export class EmployeeListComponent implements OnInit{ private fetchEmployees(): Observable { return this.apiService.getAll().pipe( - retry(EmployeeListComponent.MAX_RETRIES), + retry(TableComponent.MAX_RETRIES), catchError((error: HttpErrorResponse) => { console.error('Error fetching employees:', error); this.showErrorMessage('Failed to load employees. Please try again.'); @@ -74,6 +74,6 @@ export class EmployeeListComponent implements OnInit{ } protected openDeleteDialogue(employee: Employee): void { - this.deleteDialogue.open(DeleteEmployeeComponent, {data: employee}); + this.deleteDialogue.open(DeleteComponent, {data: employee}); } } diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index d811f13..8c5b336 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; -import {EmployeeListComponent} from "../employee-list/employee-list.component"; -import {QualificationsComponent} from "../qualifications/qualifications.component"; +import {TableComponent} from "../employee/table/table.component"; +import {QualificationsComponent} from "../qualification/table/table.component"; @Component({ selector: 'app-home', imports: [ - EmployeeListComponent, + TableComponent, QualificationsComponent ], templateUrl: './home.component.html', diff --git a/src/app/Qualification.ts b/src/app/qualification/Qualification.ts similarity index 100% rename from src/app/Qualification.ts rename to src/app/qualification/Qualification.ts diff --git a/src/app/delete-employee/delete-employee.component.css b/src/app/qualification/create/create.component.css similarity index 100% rename from src/app/delete-employee/delete-employee.component.css rename to src/app/qualification/create/create.component.css diff --git a/src/app/create-qualification/create-qualification.component.html b/src/app/qualification/create/create.component.html similarity index 100% rename from src/app/create-qualification/create-qualification.component.html rename to src/app/qualification/create/create.component.html diff --git a/src/app/create-qualification/create-qualification.component.ts b/src/app/qualification/create/create.component.ts similarity index 87% rename from src/app/create-qualification/create-qualification.component.ts rename to src/app/qualification/create/create.component.ts index bb32de0..2f9b001 100644 --- a/src/app/create-qualification/create-qualification.component.ts +++ b/src/app/qualification/create/create.component.ts @@ -1,6 +1,6 @@ import {Component, inject} from '@angular/core'; import {FormBuilder, ReactiveFormsModule, Validators} from "@angular/forms"; -import QualificationService from "../services/qualification.service"; +import QualificationService from "../../services/qualification.service"; import {MatDialogActions, MatDialogContent, MatDialogRef, MatDialogTitle} from "@angular/material/dialog"; import {NgIf} from "@angular/common"; import {MatError, MatFormField, MatLabel} from "@angular/material/form-field"; @@ -22,13 +22,13 @@ import {filter} from "rxjs"; MatButton, MatInput ], - templateUrl: './create-qualification.component.html', - styleUrl: './create-qualification.component.css' + templateUrl: './create.component.html', + styleUrl: './create.component.css' }) -export class CreateQualificationComponent { +export class CreateComponent { private formBuilder: FormBuilder = inject(FormBuilder); private qualificationService: QualificationService = inject(QualificationService); - private dialogRef: MatDialogRef = inject(MatDialogRef); + private dialogRef: MatDialogRef = inject(MatDialogRef); public apiErrorMessage: string = ''; diff --git a/src/app/edit-qualification/edit-qualification.component.css b/src/app/qualification/edit/edit.component.css similarity index 100% rename from src/app/edit-qualification/edit-qualification.component.css rename to src/app/qualification/edit/edit.component.css diff --git a/src/app/edit-qualification/edit-qualification.component.html b/src/app/qualification/edit/edit.component.html similarity index 100% rename from src/app/edit-qualification/edit-qualification.component.html rename to src/app/qualification/edit/edit.component.html diff --git a/src/app/edit-qualification/edit-qualification.component.ts b/src/app/qualification/edit/edit.component.ts similarity index 87% rename from src/app/edit-qualification/edit-qualification.component.ts rename to src/app/qualification/edit/edit.component.ts index 71d7380..20954c9 100644 --- a/src/app/edit-qualification/edit-qualification.component.ts +++ b/src/app/qualification/edit/edit.component.ts @@ -1,6 +1,6 @@ import {Component, inject} from '@angular/core'; import {FormBuilder, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; -import QualificationService from "../services/qualification.service"; +import QualificationService from "../../services/qualification.service"; import { MAT_DIALOG_DATA, MatDialogActions, @@ -29,16 +29,16 @@ import {Qualification} from "../Qualification"; NgIf, ReactiveFormsModule ], - templateUrl: './edit-qualification.component.html', - styleUrl: './edit-qualification.component.css' + templateUrl: './edit.component.html', + styleUrl: './edit.component.css' }) -export class EditQualificationComponent { +export class EditComponent { public apiErrorMessage: string = ''; public qualification: Qualification = inject(MAT_DIALOG_DATA); private formBuilder: FormBuilder = inject(FormBuilder); private qualificationService: QualificationService = inject(QualificationService); - private dialogRef: MatDialogRef = inject(MatDialogRef); + private dialogRef: MatDialogRef = inject(MatDialogRef); qualificationForm = this.formBuilder.group({ 'skill': [this.qualification.skill, Validators.required], diff --git a/src/app/qualifications/qualifications.component.css b/src/app/qualification/table/table.component.css similarity index 100% rename from src/app/qualifications/qualifications.component.css rename to src/app/qualification/table/table.component.css diff --git a/src/app/qualifications/qualifications.component.html b/src/app/qualification/table/table.component.html similarity index 100% rename from src/app/qualifications/qualifications.component.html rename to src/app/qualification/table/table.component.html diff --git a/src/app/qualifications/qualifications.component.ts b/src/app/qualification/table/table.component.ts similarity index 77% rename from src/app/qualifications/qualifications.component.ts rename to src/app/qualification/table/table.component.ts index c075121..f188b85 100644 --- a/src/app/qualifications/qualifications.component.ts +++ b/src/app/qualification/table/table.component.ts @@ -11,12 +11,12 @@ import { MatRow, MatRowDef, MatTable } from "@angular/material/table"; -import QualificationService from "../services/qualification.service"; +import QualificationService from "../../services/qualification.service"; import {MatDialog} from "@angular/material/dialog"; -import {CreateQualificationComponent} from "../create-qualification/create-qualification.component"; +import {CreateComponent} from "../create/create.component"; import {MatIcon} from "@angular/material/icon"; import {MatButton, MatIconButton} from "@angular/material/button"; -import {EditQualificationComponent} from "../edit-qualification/edit-qualification.component"; +import {EditComponent} from "../edit/edit.component"; @Component({ selector: 'app-qualifications', @@ -36,8 +36,8 @@ import {EditQualificationComponent} from "../edit-qualification/edit-qualificati MatIconButton, MatButton ], - templateUrl: './qualifications.component.html', - styleUrl: './qualifications.component.css' + templateUrl: './table.component.html', + styleUrl: './table.component.css' }) export class QualificationsComponent implements OnInit{ public qualifications$!: Observable; @@ -55,7 +55,7 @@ export class QualificationsComponent implements OnInit{ } openCreateModal() { - const dialogRef = this.dialog.open(CreateQualificationComponent); + const dialogRef = this.dialog.open(CreateComponent); dialogRef.afterClosed().subscribe(result => { if (result) { @@ -65,7 +65,7 @@ export class QualificationsComponent implements OnInit{ } openEditModal(qualification: Qualification) { - const dialogRef = this.dialog.open(EditQualificationComponent, { + const dialogRef = this.dialog.open(EditComponent, { data: qualification }); diff --git a/src/app/services/employee-api.service.ts b/src/app/services/employee-api.service.ts index c742de7..d9ecf2d 100644 --- a/src/app/services/employee-api.service.ts +++ b/src/app/services/employee-api.service.ts @@ -1,7 +1,7 @@ import {inject, Injectable} from "@angular/core"; import {HttpClient} from "@angular/common/http"; import {Observable} from "rxjs"; -import {Employee} from "../Employee"; +import {Employee} from "../employee/Employee"; @Injectable({ diff --git a/src/app/services/qualification.service.ts b/src/app/services/qualification.service.ts index 50f947b..274f3a8 100644 --- a/src/app/services/qualification.service.ts +++ b/src/app/services/qualification.service.ts @@ -1,7 +1,7 @@ import {inject, Injectable} from "@angular/core"; import {HttpClient} from "@angular/common/http"; import {map, Observable} from "rxjs"; -import {Qualification} from "../Qualification"; +import {Qualification} from "../qualification/Qualification"; @Injectable({