Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
max-parallel: 1
matrix:
# Angular 22 requires Node ^22.22.3 || ^24.15.0 || >=26.0.0
node-version: [22.22.3, 24.15.0]
node-version: [22.22.3, 24.18.0, 26.5.0]

services:
mongodb:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
*.env
.DS_Store
2 changes: 1 addition & 1 deletion client/src/app/add-employee/add-employee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { Router } from '@angular/router';
import { EmployeeForm } from '../employee-form/employee-form';
import { Employee } from '../employee';
import { EmployeeService } from '../employee.service';
import { EmployeeService } from '../employee';
import { MatCardModule } from '@angular/material/card';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/api-config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { isPlatformBrowser } from '@angular/common';
import { resolveApiBaseUrl } from './api-url';

@Service()
export class ApiConfigService {
export class ApiConfig {
private readonly platformId = inject(PLATFORM_ID);

// In the browser, derive the API URL from the current location so it works
Expand Down
6 changes: 2 additions & 4 deletions client/src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ import { provideRouter, withComponentInputBinding } from '@angular/router';

import { routes } from './app.routes';
import { provideClientHydration, withNoIncrementalHydration } from '@angular/platform-browser';
import { provideHttpClient, withFetch } from '@angular/common/http';
import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
import { provideHttpClient } from '@angular/common/http';

export const appConfig: ApplicationConfig = {
providers: [
provideBrowserGlobalErrorListeners(),
provideZonelessChangeDetection(),
provideRouter(routes, withComponentInputBinding()),
provideClientHydration(withNoIncrementalHydration()),
provideHttpClient(withFetch()),
provideAnimationsAsync(),
provideHttpClient(),
]
};
3 changes: 1 addition & 2 deletions client/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { catchError, of } from 'rxjs';
import { EmployeesList } from './employees-list/employees-list';
import { AddEmployee } from './add-employee/add-employee';
import { EditEmployee } from './edit-employee/edit-employee';
import { Employee } from './employee';
import { EmployeeService } from './employee.service';
import { Employee, EmployeeService } from './employee';

const employeeResolver: ResolveFn<Employee | RedirectCommand> = (route) => {
const router = inject(Router);
Expand Down
13 changes: 6 additions & 7 deletions client/src/app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ import { RouterOutlet } from '@angular/router';
import { MatToolbarModule } from '@angular/material/toolbar';

@Component({
selector: 'app-root',
selector: 'app-root',
imports: [RouterOutlet, MatToolbarModule],
styles: [
`
styles: [
`
main {
display: flex;
justify-content: center;
padding: 2rem 4rem;
}
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
],
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
<mat-toolbar>
<span>Employees Management System</span>
</mat-toolbar>
Expand All @@ -25,5 +25,4 @@ import { MatToolbarModule } from '@angular/material/toolbar';
`
})
export class App {
title = 'client';
}
2 changes: 1 addition & 1 deletion client/src/app/edit-employee/edit-employee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, input, inject } from '@angular/core
import { EmployeeForm } from '../employee-form/employee-form';
import { Router } from '@angular/router';
import { Employee } from '../employee';
import { EmployeeService } from '../employee.service';
import { EmployeeService } from '../employee';
import { MatCardModule } from '@angular/material/card';

@Component({
Expand Down
30 changes: 0 additions & 30 deletions client/src/app/employee.service.ts

This file was deleted.

30 changes: 30 additions & 0 deletions client/src/app/employee.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
import { Service, inject } from '@angular/core';
import { HttpClient, httpResource } from '@angular/common/http';
import { ApiConfig } from './api-config.service';

export interface Employee {
name: string;
position: string;
level: 'junior' | 'mid' | 'senior';
_id?: string;
}

@Service()
export class EmployeeService {
private readonly httpClient = inject(HttpClient);
private readonly url = inject(ApiConfig).baseUrl;

readonly employeesResource = httpResource<Employee[]>(() => `${this.url}/employees`, {
defaultValue: [],
});

getEmployee(id: string) {
return this.httpClient.get<Employee>(`${this.url}/employees/${id}`);
}

createEmployee(employee: Employee) {
return this.httpClient.post(`${this.url}/employees`, employee, { responseType: 'text' });
}

updateEmployee(id: string, employee: Employee) {
return this.httpClient.put(`${this.url}/employees/${id}`, employee, { responseType: 'text' });
}

deleteEmployee(id: string) {
return this.httpClient.delete(`${this.url}/employees/${id}`, { responseType: 'text' });
}
}
2 changes: 1 addition & 1 deletion client/src/app/employees-list/employees-list.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ChangeDetectionStrategy, computed, inject } from '@angular/core';
import { EmployeeService } from '../employee.service';
import { EmployeeService } from '../employee';
import { RouterModule } from '@angular/router';
import { MatTableModule } from '@angular/material/table';
import { MatButtonModule } from '@angular/material/button';
Expand Down
Loading
Loading