From 099b834118ac9bd5ed7c857fef0af8d63d80818a Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Thu, 1 Apr 2021 14:35:43 +0200 Subject: [PATCH] fix: broken link in mobile menu and admin panel --- src/app/admin/components/panel/panel.component.html | 2 +- src/app/admin/components/panel/panel.component.ts | 3 +++ src/app/header/header.component.html | 2 +- src/environments/environment.prod.ts | 3 ++- src/environments/environment.ts | 4 +--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/admin/components/panel/panel.component.html b/src/app/admin/components/panel/panel.component.html index 783642e99..252986fc6 100644 --- a/src/app/admin/components/panel/panel.component.html +++ b/src/app/admin/components/panel/panel.component.html @@ -3,7 +3,7 @@ <div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center center"> <button (click)="changeActiveFeature(features.pendingStructures)">Gestion structure</button> <button (click)="changeActiveFeature(features.deleteUsers)">Suppression d'utilisateurs</button> - <button routerLink="/blog/ghost/">Ghost</button> + <a target="_blank" class="custom-link" rel="noopener noreferrer" [href]="ghostLink">Ghost</a> </div> <div *ngIf="selectedFeature === features.deleteUsers"> <app-admin-delete-user></app-admin-delete-user> diff --git a/src/app/admin/components/panel/panel.component.ts b/src/app/admin/components/panel/panel.component.ts index c938918a3..15052b621 100644 --- a/src/app/admin/components/panel/panel.component.ts +++ b/src/app/admin/components/panel/panel.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { environment } from '../../../../environments/environment'; import { AdminPannelEnum } from '../../../shared/enum/adminPanel.enum'; @Component({ @@ -7,12 +8,14 @@ import { AdminPannelEnum } from '../../../shared/enum/adminPanel.enum'; }) export class PanelComponent implements OnInit { public features = AdminPannelEnum; + public ghostLink = environment.ghostAdmin; public selectedFeature; constructor() {} ngOnInit(): void { this.selectedFeature = this.features.pendingStructures; + console.log(this.ghostLink); } public changeActiveFeature(newFeature: AdminPannelEnum) { diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 3f402c5cb..d85570098 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -29,7 +29,7 @@ </div> <div fxLayout="column" class="right-header" fxLayoutAlign="none baseline" fxLayoutGap="5vw"> <a routerLink="/news" [routerLinkActive]="'active'" (click)="closeMenu()" i18n>Actualités</a> - <a routerLink="/home" [routerLinkActive]="'active'" (click)="closeMenu()" i18n>Cartographie de acteurs</a> + <a routerLink="/acteurs" [routerLinkActive]="'active'" (click)="closeMenu()" i18n>Cartographie de acteurs</a> <a routerLink="/about" [routerLinkActive]="'active'" i18n>Qui sommes-nous ?</a> <a *ngIf="isAdmin" routerLink="/admin" [routerLinkActive]="'active'" (click)="closeMenu()">Administration</a> </div> diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073bc..4e7f509af 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,4 @@ export const environment = { - production: true + production: true, + ghostAdmin: 'https://resin.grandlyon.com/blog/ghost', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 9ad8ed69b..c424d806c 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,9 +4,7 @@ export const environment = { production: false, - registrationForm: 'https://services.formulaireextranet.grandlyon.com/saisie-fiche-structure', - addressApi: 'https://passerelle.formulaireextranet.grandlyon.com/base-adresse/base-adresse-nationale/streets', - geojsonApi: 'https://download.data.grandlyon.com/geocoding/photon/api', + ghostAdmin: 'https://resin-dev.grandlyon.com/blog/ghost', VERSION: require('../../package.json').version, }; -- GitLab