diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 800a0f2a03f3a532b884daf458d11668ce68b85c..9fa58a5c3c45a5c9bd694a65fb90f975d68baab6 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,22 +1,18 @@ import { CommonModule } from "@angular/common"; import { HttpClientModule } from "@angular/common/http"; import { NgModule } from "@angular/core"; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { BrowserModule } from "@angular/platform-browser"; +import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AppRoutingModule } from "./modules/app-routing.module"; +import { AppMaterialModule } from "./modules/material.module"; +import { AppComponent } from "./pages/app/app.component"; +import { CreateReservationComponent } from "./pages/create-reservation/create-reservation.component"; +import { MembresComponent } from "./pages/membres/membres.component"; import { CommunicationService } from "./services/communication.service"; -import { AppMaterialModule } from './modules/material.module'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CreateReservationComponent } from './pages/create-reservation/create-reservation.component'; -import { AppComponent } from "./pages/app/app.component"; -import { TestComponent } from './pages/test/test.component'; @NgModule({ - declarations: [ - AppComponent, - CreateReservationComponent, - TestComponent - ], + declarations: [AppComponent, CreateReservationComponent, MembresComponent], imports: [ CommonModule, BrowserModule, @@ -25,10 +21,10 @@ import { TestComponent } from './pages/test/test.component'; AppRoutingModule, BrowserAnimationsModule, ReactiveFormsModule, - AppMaterialModule + AppMaterialModule, ], providers: [CommunicationService], entryComponents: [], bootstrap: [AppComponent], }) -export class AppModule { } +export class AppModule {} diff --git a/client/src/app/modules/app-routing.module.ts b/client/src/app/modules/app-routing.module.ts index 7d26f539fa9d68bfbd9a8736685ee38cc03a9ee4..d7e823e21d367f47b69e64fd1d2f14576a66f19d 100644 --- a/client/src/app/modules/app-routing.module.ts +++ b/client/src/app/modules/app-routing.module.ts @@ -3,12 +3,12 @@ import { RouterModule, Routes } from "@angular/router"; import { AppComponent } from "@app/pages/app/app.component"; import { CreateReservationComponent } from "@app/pages/create-reservation/create-reservation.component"; -import { TestComponent } from "@app/pages/test/test.component"; +import { MembresComponent } from "@app/pages/membres/membres.component"; const routes: Routes = [ { path: "app", component: AppComponent }, { path: "create-reservation", component: CreateReservationComponent }, - { path: "test", component: TestComponent }, + { path: "membre", component: MembresComponent }, ]; @NgModule({ diff --git a/client/src/app/pages/app/app.component.html b/client/src/app/pages/app/app.component.html index 8d870d5a3999394b4b712a1daa23576adbd9d315..cfabd28bd4a0230581def3c73180d4c7dc33a77f 100644 --- a/client/src/app/pages/app/app.component.html +++ b/client/src/app/pages/app/app.component.html @@ -22,4 +22,4 @@ </div> <router-outlet></router-outlet> </div> -</div> +</div> \ No newline at end of file diff --git a/client/src/app/pages/app/app.component.ts b/client/src/app/pages/app/app.component.ts index d93249396fae06b9376abbb9e90c10471addf6c7..55c0965a3c210e4b2f21030f42883b518d0b7756 100644 --- a/client/src/app/pages/app/app.component.ts +++ b/client/src/app/pages/app/app.component.ts @@ -8,18 +8,18 @@ import { Router } from "@angular/router"; styleUrls: ["./app.component.css"], }) export class AppComponent implements OnInit { - public route!: string; + public route!: string; - public constructor(location: Location, router: Router) { - router.events.subscribe((_val: any) => { - if (location.path() !== "") { - this.route = location.path(); - } else { - this.route = ""; - } - }); - } + public constructor(location: Location, router: Router) { + router.events.subscribe((_val: any) => { + if (location.path() !== "") { + this.route = location.path(); + } else { + this.route = ""; + } + }); + } - public readonly title: string = "INF3710 TP4"; - public ngOnInit(): void { } + public readonly title: string = "INF3710 TP4"; + public ngOnInit(): void {} } diff --git a/client/src/app/pages/test/test.component.css b/client/src/app/pages/membres/membres.component.css similarity index 100% rename from client/src/app/pages/test/test.component.css rename to client/src/app/pages/membres/membres.component.css diff --git a/client/src/app/pages/membres/membres.component.html b/client/src/app/pages/membres/membres.component.html new file mode 100644 index 0000000000000000000000000000000000000000..c3fb524a72b46be945fbc59ad52e2fcb3242640f --- /dev/null +++ b/client/src/app/pages/membres/membres.component.html @@ -0,0 +1 @@ +<p>membres works!</p> diff --git a/client/src/app/pages/test/test.component.spec.ts b/client/src/app/pages/membres/membres.component.spec.ts similarity index 54% rename from client/src/app/pages/test/test.component.spec.ts rename to client/src/app/pages/membres/membres.component.spec.ts index f55af9dbb1e575770234ac996cccf9970b95b744..99400beddec2a4c25753320cc1060a38f95ffbd4 100644 --- a/client/src/app/pages/test/test.component.spec.ts +++ b/client/src/app/pages/membres/membres.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TestComponent } from './test.component'; +import { MembresComponent } from './membres.component'; -describe('TestComponent', () => { - let component: TestComponent; - let fixture: ComponentFixture<TestComponent>; +describe('MembresComponent', () => { + let component: MembresComponent; + let fixture: ComponentFixture<MembresComponent>; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ TestComponent ] + declarations: [ MembresComponent ] }) .compileComponents(); - fixture = TestBed.createComponent(TestComponent); + fixture = TestBed.createComponent(MembresComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/client/src/app/pages/test/test.component.ts b/client/src/app/pages/membres/membres.component.ts similarity index 63% rename from client/src/app/pages/test/test.component.ts rename to client/src/app/pages/membres/membres.component.ts index 3f5e2365ad87d7026007f9794fa730077dddfb6b..1ebaed62f3f6b692999fac40dca52d89d9919d74 100644 --- a/client/src/app/pages/test/test.component.ts +++ b/client/src/app/pages/membres/membres.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { CommunicationService } from "@app/services/communication.service"; @Component({ - selector: "app-test", - templateUrl: "./test.component.html", - styleUrls: ["./test.component.css"], + selector: "app-membres", + templateUrl: "./membres.component.html", + styleUrls: ["./membres.component.css"], }) -export class TestComponent { +export class MembresComponent { constructor(private communicationService: CommunicationService) { console.log(this.communicationService); } diff --git a/client/src/app/pages/test/test.component.html b/client/src/app/pages/test/test.component.html deleted file mode 100644 index 941f267e61055d578e4779f4a84dc6b7f7c1117a..0000000000000000000000000000000000000000 --- a/client/src/app/pages/test/test.component.html +++ /dev/null @@ -1 +0,0 @@ -<p>test works!</p> diff --git a/common/interfaces/vehicule.ts b/common/interfaces/vehicule.ts index fb4e3f47ff63476c01da41c6bf59f975cbb8ebc2..79851a62eb74ed5ed0bb7341efdff2322f183b33 100644 --- a/common/interfaces/vehicule.ts +++ b/common/interfaces/vehicule.ts @@ -1,4 +1,4 @@ -import { TypeVehicule } from "../enum/type-vehicule.enum"; +import { TypeVehicule } from "@common/enum/type-vehicule.enum"; import { Emplacement } from "./emplacement"; export interface Vehicule { diff --git a/server/src/services/reservation.service.ts b/server/src/services/reservation.service.ts index e2213a6958138816a520d17ee3ad7f0077dc6441..028e6a95cba87047eba45b5b26f30872fc230e2b 100644 --- a/server/src/services/reservation.service.ts +++ b/server/src/services/reservation.service.ts @@ -1,5 +1,5 @@ -import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { TypeVehicule } from '@common/enum/type-vehicule.enum'; +import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { Conducteur } from 'model/conducteur.entity'; import { Emplacement } from 'model/emplacement.entity'; import { Membre } from 'model/membre.entity'; diff --git a/server/src/services/vehicle.service.ts b/server/src/services/vehicle.service.ts index 7d65ebe248605ba8ea2e20df6a7d4b76d50b01c5..993b53317cc1a53f99fb373bda1e134dacda5951 100644 --- a/server/src/services/vehicle.service.ts +++ b/server/src/services/vehicle.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@nestjs/common'; import { TypeVehicule } from '@common/enum/type-vehicule.enum'; +import { Injectable } from '@nestjs/common'; import { Emplacement } from 'model/emplacement.entity'; import { Vehicule, VehiculeHybride } from 'model/vehicule.entity'; import { VehiculeRow } from 'rows/vehicule.row';