Merge branch 'paul' into Romain

src/app/app-routing.module.ts

@@ -11,6 +11,7 @@ import { SignupComponent } from './pages/signup/signup.component';
 import { AdminPageComponent } from './pages/admin-page/admin-page.component';
 import { AuthGuard } from './services/auth.guard';
 import { PageAccountComponent } from './pages/page-account/page-account.component';
+import { PageDeniedComponent } from './pages/page-denied/page-denied.component';
 
 const routes: Routes = [
     { path: '', redirectTo: 'home', pathMatch: 'full' },
@@ -23,6 +24,7 @@ const routes: Routes = [
     { path: 'Deconnexion', redirectTo: 'home'},
     {path: 'restaurants', canActivate: [AuthGuard], /*data : {ROLE : "ROLE_ADMIN"},*/ component: RestoPageComponent},
     {path: 'page-not-found',component: PageNotFoundComponent},
+    {path: 'page-denied',component: PageDeniedComponent},
     {path: 'admin',canActivate: [AuthGuard],data : {ROLE : "ROLE_ADMIN"}, component: AdminPageComponent},
     {path: '**', redirectTo: 'page-not-found' }
 ];

src/app/app.module.ts

@@ -26,7 +26,7 @@ import { AuthInterceptor } from './services/auth.interceptor';
 import { FavorisUserComponent } from './pages/favoris-user/favoris-user.component';
 import { SignupComponent } from './pages/signup/signup.component';
 import { PageAccountComponent } from './pages/page-account/page-account.component';
-import { PageAccesDeniedComponent } from './pages/page-acces-denied/page-acces-denied.component';
+import { PageDeniedComponent } from './pages/page-denied/page-denied.component';
 
 @NgModule({
   declarations: [
@@ -52,7 +52,7 @@ import { PageAccesDeniedComponent } from './pages/page-acces-denied/page-acces-d
     FavorisUserComponent,
     SignupComponent,
     PageAccountComponent,
-    PageAccesDeniedComponent
+    PageDeniedComponent
   ],
   imports: [
     BrowserModule,

src/app/pages/page-denied/page-denied.component.html

@@ -0,0 +1 @@
+<p>page-denied works!</p>

src/app/pages/page-denied/page-denied.component.spec.ts

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

src/app/pages/page-denied/page-denied.component.ts

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

src/app/pages/page-not-found/page-not-found.component.html

@@ -1 +1,5 @@
-<p>page-not-found works!</p>
+<main class="content">
+    <!-- <h2>Sorry...Page not found</h2> -->
+    <img class="fond" src="assets/fond404.jpeg">
+
+</main>

src/app/pages/page-not-found/page-not-found.component.scss

@@ -0,0 +1,11 @@
+.content{
+    width: 100%;
+    height: auto;
+    display: flex;
+    justify-content: center;
+}
+.fond{
+    width: 100%;
+    margin-top: 7vh;
+    
+}

src/app/pages/page-not-found/page-not-found.component.ts

@@ -7,7 +7,9 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PageNotFoundComponent implements OnInit {
 
-  constructor() { }
+  constructor() { 
+
+  }
 
   ngOnInit(): void {
   }

src/app/services/auth.guard.ts

@@ -43,7 +43,7 @@ export class AuthGuard implements CanActivate {
           }
 
           if(route.data['ROLE'] && route.data['ROLE'] != localStorage.getItem('ROLE')){
-              this.router.navigate(['page-not-found']);
+              this.router.navigate(['page-denied']);
             return false;
           }
         }

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiUrl: "http://localhost:8080",
+  apiUrl: "http://localhost:8081",
   tokenKey: "TOKEN-SIMPLEAT"
 };