diff --git a/.vscode/settings.json b/.vscode/settings.json index 62ee709648a27306893cf6ff2dd148abd72f7adf..5fabf2de4fdfae26c01d6614547253a46fec68f6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,6 +36,7 @@ ], "cSpell.language": "fr,en", "cSpell.words": [ + "accessibilite", "Annuary", "carto", "categorie", diff --git a/src/app/page/enum/page.enum.ts b/src/app/page/enum/page.enum.ts deleted file mode 100644 index 3f1bd8e7d1420cf015aad0b573e546b4de64be41..0000000000000000000000000000000000000000 --- a/src/app/page/enum/page.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum PageEnum { - quiSommesNous = 'qui-sommes-nous', - accessibilite = 'accessibilite', -} diff --git a/src/app/page/page.component.html b/src/app/page/page.component.html index 3809b5440934dd64e6f973f7d54403ad69e3dd91..7cd7d3d83a452c4e03ee145f40fd9a925c92bc7a 100644 --- a/src/app/page/page.component.html +++ b/src/app/page/page.component.html @@ -1,17 +1,13 @@ -<div fxLayout="column" class="content-container full-screen"> +<div class="content-container full-screen"> <div class="section-container"> - <div *ngIf="page" class="postContainer" fxLayout="column" fxLayoutGap="16px"> + <div *ngIf="page" class="postContainer pageContainer"> <div class="gh-canvas"> - <div fxLayout="column" fxLayoutAlign="center none"> - <div fxLayout="row" class="title">{{ page.title }}</div> - </div> - <div *ngIf="page.feature_image" fxLayout="row" class="article-image"> - <img class="image" alt="image about the news" [src]="page.feature_image" /> - </div> + <h1 class="title">{{ page.title }}</h1> + <div class="description"> <div [innerHtml]="page.safeHtml"></div> </div> - <p *ngIf="version" class="version" fxLayoutAlign="center center">Version : {{ version }}</p> + <p *ngIf="version" class="version">Version : {{ version }}</p> </div> </div> </div> diff --git a/src/app/page/page.component.scss b/src/app/page/page.component.scss index d11eb24f6abf06828a5d5b0de4d58023d705f246..0128833bdf999853bf58052971fa66de9d6193eb 100644 --- a/src/app/page/page.component.scss +++ b/src/app/page/page.component.scss @@ -2,10 +2,16 @@ @import 'color'; @import 'ghost'; +.pageContainer { + max-width: 720px; + margin: auto; +} + .version { padding-top: 80px; font-size: $font-size-xxsmall; color: $grey-3; + text-align: center; } .articleContainer { diff --git a/src/app/page/page.component.ts b/src/app/page/page.component.ts index 9f5a82a091a6d0d1989e48c504da86573a0304ce..a804752487d05bb3c315589b5f497c0e19c23ea9 100644 --- a/src/app/page/page.component.ts +++ b/src/app/page/page.component.ts @@ -2,10 +2,14 @@ import { Component, ElementRef, OnInit, Renderer2, ViewEncapsulation } from '@an import { DomSanitizer, Meta } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import packageJson from '../../../package.json'; -import { PageEnum } from './enum/page.enum'; import { Page } from './models/page.model'; import { PageService } from './services/page.service'; +enum PageEnum { + quiSommesNous = 'qui-sommes-nous', + accessibilite = 'accessibilite', +} + @Component({ selector: 'app-page', templateUrl: './page.component.html', diff --git a/src/app/page/services/page.service.ts b/src/app/page/services/page.service.ts index cbb68924a66d7dc107bb76477f9cd4ff5169de51..aef530cef6b1d7bb85a9f2fa22a914ccb2e557b8 100644 --- a/src/app/page/services/page.service.ts +++ b/src/app/page/services/page.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; -import { map, catchError } from 'rxjs/operators'; +import { catchError, map } from 'rxjs/operators'; import { Page } from '../models/page.model'; @Injectable({ @@ -17,7 +17,7 @@ export class PageService { public getPage(slugPage: string): Observable<Page> { return this.http.get<Page>(`${this.baseUrl}` + slugPage).pipe( - map((item: Page) => { + map((item) => { return new Page(item); }), catchError(() => {