From e04ee4258f8972c2575da48751f072ab94283b49 Mon Sep 17 00:00:00 2001 From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com> Date: Fri, 8 Jan 2021 15:58:04 +0100 Subject: [PATCH] feat(admin) : fix access component --- src/app/admin/admin.module.ts | 9 +++------ src/app/admin/panel/panel.component.html | 5 ++++- src/app/admin/panel/panel.component.ts | 11 ++++------- .../validation-attachment.component.html | 2 +- .../validation-attachment.component.ts | 11 ++++------- src/app/profile/profile.component.html | 2 +- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts index f3daca131..c2de925f9 100644 --- a/src/app/admin/admin.module.ts +++ b/src/app/admin/admin.module.ts @@ -2,13 +2,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PanelComponent } from './panel/panel.component'; import { ValidationAttachmentComponent } from './validation-attachment/validation-attachment.component'; - - +import { SharedModule } from '../shared/shared.module'; @NgModule({ declarations: [PanelComponent, ValidationAttachmentComponent], - imports: [ - CommonModule - ] + imports: [CommonModule, SharedModule], }) -export class AdminModule { } +export class AdminModule {} diff --git a/src/app/admin/panel/panel.component.html b/src/app/admin/panel/panel.component.html index 4d957c876..34dc8aa94 100644 --- a/src/app/admin/panel/panel.component.html +++ b/src/app/admin/panel/panel.component.html @@ -1 +1,4 @@ -<p>panel works!</p> +<div fxLayout="column" class="content-container"> + <div fxLayout="row" fxLayoutAlign="center center"><h1>Panel d'administration</h1></div> + <app-admin-validation-attachment></app-admin-validation-attachment> +</div> diff --git a/src/app/admin/panel/panel.component.ts b/src/app/admin/panel/panel.component.ts index 67475f03d..c6d2adffa 100644 --- a/src/app/admin/panel/panel.component.ts +++ b/src/app/admin/panel/panel.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-panel', + selector: 'app-admin-panel', templateUrl: './panel.component.html', - styleUrls: ['./panel.component.scss'] + styleUrls: ['./panel.component.scss'], }) export class PanelComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit(): void { - } - + ngOnInit(): void {} } diff --git a/src/app/admin/validation-attachment/validation-attachment.component.html b/src/app/admin/validation-attachment/validation-attachment.component.html index 52703fd14..46ad93600 100644 --- a/src/app/admin/validation-attachment/validation-attachment.component.html +++ b/src/app/admin/validation-attachment/validation-attachment.component.html @@ -1 +1 @@ -<p>validation-attachment works!</p> +<div fxLayout="row" fxLayoutAlign="center center"><p>validation-attachment works!</p></div> diff --git a/src/app/admin/validation-attachment/validation-attachment.component.ts b/src/app/admin/validation-attachment/validation-attachment.component.ts index fe1cfe8f6..09d9095c6 100644 --- a/src/app/admin/validation-attachment/validation-attachment.component.ts +++ b/src/app/admin/validation-attachment/validation-attachment.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-validation-attachment', + selector: 'app-admin-validation-attachment', templateUrl: './validation-attachment.component.html', - styleUrls: ['./validation-attachment.component.scss'] + styleUrls: ['./validation-attachment.component.scss'], }) export class ValidationAttachmentComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit(): void { - } - + ngOnInit(): void {} } diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html index 37ec8af99..51293a253 100644 --- a/src/app/profile/profile.component.html +++ b/src/app/profile/profile.component.html @@ -10,7 +10,7 @@ <strong>{{ structureId }}</strong> </span> </p> - <button routerLink="/admin">Accèder au panel d'administration</button> + <button *ngIf="profileService.isAdmin()" routerLink="/admin">Accèder au panel d'administration</button> <button (click)="toogleAddStructure()">Ajouter une structure</button> <button (click)="toogleChangeEmail()">Changer d'email</button> <form -- GitLab