From 31fab3bd0d434ea518219e19978b7701ec0fc969 Mon Sep 17 00:00:00 2001
From: Fanevarak <rakotoarivonyfaneva@gmail.com>
Date: Wed, 19 Apr 2023 15:54:32 -0400
Subject: [PATCH] Created members component
---
client/src/app/app.module.ts | 22 +++++++----------
client/src/app/modules/app-routing.module.ts | 4 ++--
client/src/app/pages/app/app.component.html | 2 +-
client/src/app/pages/app/app.component.ts | 24 +++++++++----------
.../membres.component.css} | 0
.../app/pages/membres/membres.component.html | 1 +
.../membres.component.spec.ts} | 12 +++++-----
.../membres.component.ts} | 8 +++----
client/src/app/pages/test/test.component.html | 1 -
common/interfaces/vehicule.ts | 2 +-
server/src/services/reservation.service.ts | 2 +-
server/src/services/vehicle.service.ts | 2 +-
12 files changed, 38 insertions(+), 42 deletions(-)
rename client/src/app/pages/{test/test.component.css => membres/membres.component.css} (100%)
create mode 100644 client/src/app/pages/membres/membres.component.html
rename client/src/app/pages/{test/test.component.spec.ts => membres/membres.component.spec.ts} (54%)
rename client/src/app/pages/{test/test.component.ts => membres/membres.component.ts} (63%)
delete mode 100644 client/src/app/pages/test/test.component.html
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 800a0f2..9fa58a5 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 7d26f53..d7e823e 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 8d870d5..cfabd28 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 d932493..55c0965 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 0000000..c3fb524
--- /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 f55af9d..99400be 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 3f5e236..1ebaed6 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 941f267..0000000
--- 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 fb4e3f4..79851a6 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 e2213a6..028e6a9 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 7d65ebe..993b533 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';
--
GitLab