Skip to content

Commit 96805e6

Browse files
hbaltyrevu-bot
hbalty
and
revu-bot
authored
Feat integrating static pages - frontend (#3909)
* feat(frontend): integrating static pages * feat(frotend): integrating dsfr static pages * Update packages/frontend/src/app/modules/general/components/faq/faq.component.ts Co-authored-by: Revu <dnum.fabrique@sg.social.gouv.fr> --------- Co-authored-by: Revu <dnum.fabrique@sg.social.gouv.fr>
1 parent 2e88e01 commit 96805e6

File tree

16 files changed

+1068
-1104
lines changed

16 files changed

+1068
-1104
lines changed

‎.talismanrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ fileignoreconfig:
1717
checksum: e2d06e63d58935b349f2591b0a3c407c254be26c4e833456829e7c605fc7411b
1818
- filename: packages/backend/src/_migrations/_init-db/domifa_test_schema.sql
1919
checksum: 8b421c413bab4f2419972dec548a5399879f497a8c75c9b240bbf8c123cfab06
20+
- filename: packages/frontend/src/app/modules/general/components/static-pages/politique/politique.component.html
21+
checksum: b4b98ac83a35a960edeb96d560203a9afbcc2d68d01c6289c2b316c36e5cdc80
22+
- filename: packages/frontend/src/app/modules/general/components/static-pages/politique/politique.component.ts
23+
checksum: 94dd1d6db6c4ed1876bca5b077543693ee240e221ba32fab45885ed5b91e9f70
2024
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.spec.ts
2125
checksum: 8f66091255109d0da277819584c6c69d4a7f720256842851a49b0dda16af6651
2226
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts

‎packages/frontend/src/app/modules/general/components/contact-support/contact-support.component.html‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
<div class="head-page py-4">
2-
<div class="container">
3-
<h1 class="title">Formulaire de contact</h1>
4-
</div>
5-
</div>
6-
71
<div class="step-form my-5" *ngIf="success">
82
<div class="text-center">
93
<fa-icon
@@ -18,19 +12,27 @@ <h2 class="text-success">
1812
</div>
1913
</div>
2014

21-
<div class="content py-3" *ngIf="contactForm && !success">
15+
<div class="py-3" *ngIf="contactForm && !success">
2216
<div class="container py-3">
2317
<div class="page-content p-3">
24-
<p>
25-
Un problème ? Une suggestion ? Avez-vous consulté
26-
<a [routerLink]="['/faq']" ariaCurrentWhenActive="page">notre FAQ</a>
27-
?
28-
<br />
29-
Si la réponse ne s'y trouve pas, merci de remplir les champs ci-dessous
30-
en nous donnant un maximum d'informations, ce qui nous permettra de vous
31-
répondre plus rapidement.
32-
</p>
33-
18+
<div class="row justify-content-center">
19+
<div class="col-md-8 col-lg-8 col-sm-12">
20+
<h1>Formulaire de contact</h1>
21+
</div>
22+
<div class="col-md-8 col-lg-8 col-sm-12">
23+
<p>
24+
Un problème ? Une suggestion ? Avez-vous consulté
25+
<a [routerLink]="['/faq']" ariaCurrentWhenActive="page"
26+
>notre FAQ</a
27+
>
28+
?
29+
<br />
30+
Si la réponse ne s'y trouve pas, merci de remplir les champs
31+
ci-dessous en nous donnant un maximum d'informations, ce qui nous
32+
permettra de vous répondre plus rapidement.
33+
</p>
34+
</div>
35+
</div>
3436
<div class="row justify-content-center">
3537
<div class="col-md-8 col-lg-8 col-sm-12">
3638
<form [formGroup]="contactForm" (ngSubmit)="sendContactMessage()">

‎packages/frontend/src/app/modules/general/components/faq/faq.component.html‎

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
1-
<div class="head-page py-4">
2-
<div class="container">
3-
<div class="row">
4-
<div class="col-md-7 col-12">
5-
<h1 class="title">Questions / Réponses sur DomiFa</h1>
6-
</div>
7-
<div class="text-start text-md-end col-12 col-md-5">
8-
<a
9-
href="/assets/files/guide_utilisateur_domifa.pdf"
10-
target="_blank"
11-
class="btn btn-white-primary"
12-
rel="noopener noreferrer"
13-
download
14-
>
15-
<fa-icon [icon]="['fas', 'download']" aria-hidden="true"></fa-icon>
16-
Télécharger le guide utilisateur
17-
</a>
18-
</div>
1+
<div class="container py-4">
2+
<div class="row">
3+
<div class="col-md-7 col-12">
4+
<h1>Questions / Réponses sur DomiFa</h1>
5+
</div>
6+
<div class="text-start text-md-end col-12 col-md-5">
7+
<a
8+
href="/assets/files/guide_utilisateur_domifa.pdf"
9+
target="_blank"
10+
class="btn btn-primary"
11+
rel="noopener noreferrer"
12+
download
13+
>
14+
<fa-icon [icon]="['fas', 'download']" aria-hidden="true"></fa-icon>
15+
Télécharger le guide utilisateur
16+
</a>
1917
</div>
2018
</div>
21-
</div>
22-
23-
<div class="content py-4">
24-
<div class="container py-4">
25-
<div class="page-content p-3">
19+
<div class="py-4">
20+
<div class="p-3">
2621
<p>
2722
Si vos questions concernent les sections ci-dessous, merci de vous
2823
référer à notre guide utilisateurr, qui se compose des parties suivantes
@@ -331,34 +326,11 @@ <h3>
331326

332327
Ces équipes soit joignables 5 jours sur 7, de 9h à 18h.
333328
</p>
334-
<div class="table-responsive">
335-
<table class="table">
336-
<caption class="visually-hidden">
337-
En cas d’incident majeur sur la plateforme, quel est le dispositif
338-
mis en place ?
339-
</caption>
340-
<thead>
341-
<tr>
342-
<th scope="row">Action</th>
343-
<th scope="row">Indisponibilité maximum</th>
344-
</tr>
345-
</thead>
346-
<tbody>
347-
<tr>
348-
<td>Mise à jour</td>
349-
<td>30 minutes</td>
350-
</tr>
351-
<tr>
352-
<td>Maintenance trimestrielle</td>
353-
<td>1 heure</td>
354-
</tr>
355-
<tr>
356-
<td>Désastre majeur</td>
357-
<td>48 heures</td>
358-
</tr>
359-
</tbody>
360-
</table>
361-
</div>
329+
<dsfr-datatable
330+
[columns]="shutdownDelaiColumn"
331+
[data]="shutdownDelaidata"
332+
>
333+
</dsfr-datatable>
362334
<p>
363335
Nous garantissons un taux de disponibilité des applications de 95%.
364336
<br />

‎packages/frontend/src/app/modules/general/components/faq/faq.component.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ video {
88
max-width: 98%;
99
}
1010

11-
h2 {
12-
font-size: 1.6rem;
13-
}
14-
1511
ol {
1612
list-style-type: non;
1713

‎packages/frontend/src/app/modules/general/components/faq/faq.component.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,42 @@ import { Meta, Title } from "@angular/platform-browser";
33
import { MatomoTracker } from "ngx-matomo-client";
44
import { GeneralService } from "../../services/general.service";
55
import { ImportDocumentType } from "@domifa/common";
6+
import { DsfrColumn } from "@edugouvfr/ngx-dsfr";
67

78
@Component({
89
selector: "app-faq",
910
styleUrls: ["./faq.component.scss"],
1011
templateUrl: "./faq.component.html",
1112
})
1213
export class FaqComponent implements OnInit {
14+
public shutdownDelaiColumn: DsfrColumn[] = [
15+
{
16+
label: "Action",
17+
field: "action",
18+
},
19+
{
20+
label: "Indisponibilité maximum",
21+
field: "maxShutdownTime",
22+
},
23+
];
24+
25+
public shutdownDelaidata: {
26+
action: string;
27+
maxShutdownTime: string;
28+
}[] = [
29+
{
30+
action: "Mise à jour",
31+
maxShutdownTime: "30 minutes",
32+
},
33+
{
34+
action: "Maintenance trimestrielle",
35+
maxShutdownTime: "1 heure",
36+
},
37+
{
38+
action: "Désastre majeur",
39+
maxShutdownTime: "48 heures",
40+
},
41+
];
1342
constructor(
1443
private readonly titleService: Title,
1544
private readonly meta: Meta,
@@ -19,7 +48,6 @@ export class FaqComponent implements OnInit {
1948

2049
public ngOnInit(): void {
2150
this.titleService.setTitle("Foire aux question de DomiFa");
22-
2351
this.meta.updateTag({
2452
name: "description",
2553
content:

‎packages/frontend/src/app/modules/general/components/news/news.component.html‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
<div class="head-page py-4">
2-
<div class="container">
3-
<h1 class="title">Les dernières nouveautés de DomiFa</h1>
4-
</div>
5-
</div>
6-
7-
<div class="content py-3" *ngIf="DOMIFA_NEWS">
1+
<div class="py-3" *ngIf="DOMIFA_NEWS">
82
<div class="container py-3">
3+
<h1 class="title">Les dernières nouveautés de DomiFa</h1>
94
<div class="card my-3 text-start" *ngFor="let news of DOMIFA_NEWS">
105
<h2 class="my-2">
116
Nouveautés du {{ news.date | date : "d MMMM y"

‎packages/frontend/src/app/modules/general/components/news/news.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export class NewsComponent implements OnInit {
1313
public readonly DOMIFA_NEWS: any = DOMIFA_NEWS;
1414

1515
public constructor(private readonly seoService: SeoService) {}
16-
1716
public ngOnInit(): void {
1817
this.seoService.updateTitleAndTags(
1918
"Les dernières nouveautés de DomiFa",

‎packages/frontend/src/app/modules/general/components/plan-site/plan-site.component.html‎

Lines changed: 50 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,60 @@
1-
<div class="head-page py-4">
2-
<div class="container">
3-
<h1 class="title">Plan du site de DomiFa</h1>
4-
</div>
5-
</div>
6-
<div class="content py-3">
7-
<div class="container">
8-
<div class="page-content p-3">
9-
<div class="row" *ngIf="authService.currentUserValue">
10-
<ng-container *ngFor="let linkSection of siteMapLinksLogged">
11-
<div class="col-md-4 col-12 my-3">
12-
<h2 class="my-3">
13-
{{ linkSection.section }}
14-
</h2>
15-
<ul>
16-
<li *ngFor="let link of linkSection.links">
17-
<a routerLink="{{ link.path }}">{{ link.label }}</a>
18-
</li>
19-
</ul>
20-
</div>
21-
</ng-container>
22-
</div>
23-
<div class="row">
24-
<ng-container *ngFor="let linkSection of sitemapLinks">
25-
<div class="col-md-4 col-12 my-3">
26-
<h2 class="my-3">
27-
{{ linkSection.section }}
28-
</h2>
29-
<ul>
30-
<li *ngFor="let link of linkSection.links">
31-
<a routerLink="{{ link.path }}">{{ link.label }}</a>
32-
</li>
33-
</ul>
34-
</div>
35-
</ng-container>
36-
1+
<div class="container">
2+
<h1 class="title">Plan du site de DomiFa</h1>
3+
<div class="page-content p-3">
4+
<div class="row" *ngIf="authService.currentUserValue">
5+
<ng-container *ngFor="let linkSection of siteMapLinksLogged">
376
<div class="col-md-4 col-12 my-3">
38-
<h2 class="my-3">Nos partenaires</h2>
7+
<h2 class="my-3">
8+
{{ linkSection.section }}
9+
</h2>
3910
<ul>
40-
<li *ngFor="let link of partnerLinks">
41-
<a [href]="link.path" target="_blank">{{ link.label }} </a>
11+
<li *ngFor="let link of linkSection.links">
12+
<a routerLink="{{ link.path }}">{{ link.label }}</a>
4213
</li>
4314
</ul>
4415
</div>
16+
</ng-container>
17+
</div>
18+
<div class="row">
19+
<ng-container *ngFor="let linkSection of sitemapLinks">
4520
<div class="col-md-4 col-12 my-3">
46-
<h2 class="my-3">Pages de statistiques</h2>
47-
<section>
48-
<h3 class="fw-bold text-primary">Régions françaises</h3>
49-
<div class="region-list">
50-
<ul>
51-
<li *ngFor="let region of REGIONS_LISTE | keyvalue">
52-
<a
53-
[routerLink]="[
54-
'/stats/region/' + REGIONS_ID_SEO[region.key]
55-
]"
56-
class="region-name"
57-
ariaCurrentWhenActive="page"
58-
>
59-
{{ region.value }}
60-
</a>
61-
</li>
62-
</ul>
63-
</div>
64-
</section>
21+
<h2 class="my-3">
22+
{{ linkSection.section }}
23+
</h2>
24+
<ul>
25+
<li *ngFor="let link of linkSection.links">
26+
<a routerLink="{{ link.path }}">{{ link.label }}</a>
27+
</li>
28+
</ul>
6529
</div>
30+
</ng-container>
31+
32+
<div class="col-md-4 col-12 my-3">
33+
<h2 class="my-3">Nos partenaires</h2>
34+
<ul>
35+
<li *ngFor="let link of partnerLinks">
36+
<a [href]="link.path" target="_blank">{{ link.label }} </a>
37+
</li>
38+
</ul>
39+
</div>
40+
<div class="col-md-4 col-12 my-3">
41+
<h2 class="my-3">Pages de statistiques</h2>
42+
<section>
43+
<h3 class="fw-bold text-primary">Régions françaises</h3>
44+
<div class="region-list">
45+
<ul>
46+
<li *ngFor="let region of REGIONS_LISTE | keyvalue">
47+
<a
48+
[routerLink]="['/stats/region/' + REGIONS_ID_SEO[region.key]]"
49+
class="region-name"
50+
ariaCurrentWhenActive="page"
51+
>
52+
{{ region.value }}
53+
</a>
54+
</li>
55+
</ul>
56+
</div>
57+
</section>
6658
</div>
6759
</div>
6860
</div>

0 commit comments

Comments
 (0)