Skip to content

Commit

Permalink
feat(App): ajout de la notice d'information et suppresion acces login…
Browse files Browse the repository at this point in the history
… pour l'instant
  • Loading branch information
cboucheIGN committed Dec 18, 2024
1 parent d6021e8 commit eb55bf0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
{{ title }}
</p>

<header id="header-navigation" tabindex="-1">
<div id="header-navigation" tabindex="-1">
<app-header></app-header>
</header>
</div>

<main id="content" tabindex="-1">
<router-outlet></router-outlet>
</main>

<footer id="footer" tabindex="-1" class="fr-mt-16v">
<div id="footer" tabindex="-1" class="fr-mt-16v">
<app-footer></app-footer>
</footer>
</div>
7 changes: 6 additions & 1 deletion src/app/components/header/header.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<dsfr-header [beta]="true" [logoLink]="'/'" [logoTooltipMessage]="logoTooltipMessage" [serviceTitle]="serviceTitle"
[serviceTagline]="serviceTagline" [operatorImagePath]="operatorImagePath" [menu]="menuHeader"
[headerToolsLinks]="headerToolsLinks" [searchBar]="false"></dsfr-header>


<dsfr-notice [closable]="false">
Vous êtes sur l'application FOREG, sur une adresse certifié par l'IGN.
Ne communiquez pas ce lien temporaire.
Cette adresse n'a pas vocation à perdurer puisque le service sera déplacé vers beta.gouv.fr.
</dsfr-notice>
13 changes: 7 additions & 6 deletions src/app/components/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ export class HeaderComponent {
searchSelect(event: any) { }

ngOnInit() {
this.headerToolsLinks = [];
// TODO subscribe to change user event
this.headerToolsLinks = this.logoutHeadersToolsLinks();
if (this.tokenService.hasToken()) {
this.loginService.getUserInfo().subscribe((user: any) => {
this.headerToolsLinks = this.connectedHeadersToolsLinks(user);
});
}
// this.headerToolsLinks = this.logoutHeadersToolsLinks();
// if (this.tokenService.hasToken()) {
// this.loginService.getUserInfo().subscribe((user: any) => {
// this.headerToolsLinks = this.connectedHeadersToolsLinks(user);
// });
// }
}

private connectedHeadersToolsLinks(user: any) {
Expand Down
3 changes: 3 additions & 0 deletions src/app/shared-design-dsfr/shared-design-dsfr.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
DsfrHeaderModule,
DsfrHighlightModule,
DsfrLinkModule,
DsfrNoticeModule,
DsfrPaginationModule,
DsfrQuoteModule,
DsfrResponseModule,
Expand Down Expand Up @@ -70,6 +71,7 @@ import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.componen
DsfrSkiplinksModule,
DsfrStepperModule,
DsfrResponseModule,
DsfrNoticeModule
],
exports: [
DsfrTranscriptionComponent,
Expand Down Expand Up @@ -104,6 +106,7 @@ import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.componen
DsfrStepperModule,
DsfrResponseModule,
BreadcrumbComponent,
DsfrNoticeModule
]
})
export class SharedDesignDsfrModule { }

0 comments on commit eb55bf0

Please sign in to comment.