conflict app.module fix

src/app/app.module.ts

@@ -33,8 +33,10 @@ import { NavParrainComponent } from './components/navigationBar/nav-parrain/nav-
 
 import { AuthGuard } from './core/auth.guard';
 import { AuthService } from './services/auth/auth.service';
-import { AdminComponent } from './components/admin/admin.component';
 import { NavAdminComponent } from './components/navigationBar/nav-admin/nav-admin.component';
+import { ListeOpCommercialComponent } from './components/admin/liste-op-commercial/liste-op-commercial.component';
+import { DemandeOpCommercialComponent } from './components/admin/demande-op-commercial/demande-op-commercial.component';
+
 
 
 @NgModule({
@@ -55,8 +57,9 @@ import { NavAdminComponent } from './components/navigationBar/nav-admin/nav-admi
     CarteEnvoyerComponent,
     NavCommercantComponent,
     NavParrainComponent,
-    AdminComponent,
-    NavAdminComponent
+    NavAdminComponent,
+    ListeOpCommercialComponent,
+    DemandeOpCommercialComponent
   ],
   imports: [
     BrowserModule,

src/app/app.routes.ts

@@ -13,7 +13,8 @@ import { CarteEnvoyerComponent } from './components/carteParrainage/carte-envoye
 
 import {AuthGuard} from './core/auth.guard';
 
-
+import { ListeOpCommercialComponent } from './components/admin/liste-op-commercial/liste-op-commercial.component';
+import { DemandeOpCommercialComponent } from './components/admin/demande-op-commercial/demande-op-commercial.component';
 
 export const AppRoutes = [
   {path: '', component: HomeComponent},
@@ -27,5 +28,7 @@ export const AppRoutes = [
   {path: 'scannerCarte/:idOp', component: ScannerCarteComponent, canActivate: [AuthGuard]},
   {path: 'debiterCarte/:idOp', component: DebiterCarteComponent, canActivate: [AuthGuard]},
   {path: 'editProfil', component: EditProfilComponent, canActivate: [AuthGuard]},
-  {path: 'historiqueCarte', component: CarteEnvoyerComponent, canActivate: [AuthGuard]}
+  {path: 'historiqueCarte', component: CarteEnvoyerComponent, canActivate: [AuthGuard]},
+  {path: 'listOpCommercialAdmin', component: ListeOpCommercialComponent, canActivate: [AuthGuard]},
+  {path: 'demandeOpCommercialAdmin', component: DemandeOpCommercialComponent, canActivate: [AuthGuard]}
 ];

src/app/components/admin/admin.component.html

@@ -1,3 +0,0 @@
-<p>
-  admin works!
-</p>

src/app/components/admin/admin.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-admin',
-  templateUrl: './admin.component.html',
-  styleUrls: ['./admin.component.scss']
-})
-export class AdminComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

src/app/components/admin/demande-op-commercial/demande-op-commercial.component.html

@@ -0,0 +1,3 @@
+<p>
+  demande-op-commercial works!
+</p>

src/app/components/admin/demande-op-commercial/demande-op-commercial.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DemandeOpCommercialComponent } from './demande-op-commercial.component';
+
+describe('DemandeOpCommercialComponent', () => {
+  let component: DemandeOpCommercialComponent;
+  let fixture: ComponentFixture<DemandeOpCommercialComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DemandeOpCommercialComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DemandeOpCommercialComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/admin/demande-op-commercial/demande-op-commercial.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-demande-op-commercial',
+  templateUrl: './demande-op-commercial.component.html',
+  styleUrls: ['./demande-op-commercial.component.scss']
+})
+export class DemandeOpCommercialComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/components/admin/liste-op-commercial/liste-op-commercial.component.html

@@ -0,0 +1,3 @@
+<p>
+  liste-op-commercial works!
+</p>

src/app/components/admin/liste-op-commercial/liste-op-commercial.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AdminComponent } from './admin.component';
+import { ListeOpCommercialComponent } from './liste-op-commercial.component';
 
-describe('AdminComponent', () => {
-  let component: AdminComponent;
-  let fixture: ComponentFixture<AdminComponent>;
+describe('ListeOpCommercialComponent', () => {
+  let component: ListeOpCommercialComponent;
+  let fixture: ComponentFixture<ListeOpCommercialComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AdminComponent ]
+      declarations: [ ListeOpCommercialComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AdminComponent);
+    fixture = TestBed.createComponent(ListeOpCommercialComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/admin/liste-op-commercial/liste-op-commercial.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-liste-op-commercial',
+  templateUrl: './liste-op-commercial.component.html',
+  styleUrls: ['./liste-op-commercial.component.scss']
+})
+export class ListeOpCommercialComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}