Skip to content

🎨 DSFR - Admin & Mon DomiFa - Branche principale ⭐ #3855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+1,944 −2,311
Open

🎨 DSFR - Admin & Mon DomiFa - Branche principale ⭐ #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4142c0b
feat(mon-domifa): init dsfr
pYassine Aug 13, 2025
f615fcb
fix(yarn): fix yarn.lock
pYassine Aug 18, 2025
2edaf42
feat(admin-usagers): add skip links to admin and usagers (#3920)
hbalty Sep 23, 2025
199eb95
Feat dsfr pages statiques mon domifa - admin (#3910)
hbalty Sep 23, 2025
20356c3
🎨 Feat dsfr footer admin usagers (#3863)
hbalty Sep 23, 2025
c6cd651
fix(portails-admins): quick fix lien nos partenaire
hbalty Sep 23, 2025
0aa3986
feat(usagers): integration header mon domifa (#3923)
hbalty Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .talismanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ fileignoreconfig:
checksum: e6d4d9afca6797fbf98f12db96ad37a21d61289539827390ba5b4aefeb92a6b2
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
- filename: packages/portail-admins/src/app/modules/general/components/static-pages/politique/politique.component.ts
checksum: d1cc83582130541b0aff2b8b3984e907b889c057b21f8f251c9b55583e864703
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.html
checksum: c569c439ae74865248ff9a0840b658903e31f2b64af367760de27155957c6ea9
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.ts
checksum: dfdbbe1892cf17b22d28f529914eb5df3a07063d5e3071e59c36c907020260d3
- filename: yarn.lock
checksum: 075be99c7d081e6dc58ad5b0a0382963b392355221e5f8cf7f18bdcab8dae794
threshold: medium
Expand Down
12 changes: 6 additions & 6 deletions packages/portail-admins/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"assets": ["src/assets"],
"styles": [
"src/styles.scss",
"src/assets/css/bootstrap-custom.css",
"./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.main.min.css",
"./node_modules/@gouvfr/dsfr/dist/utility/utility.main.min.css",
"src/assets/css/bootstrap-custom.scss",
"src/assets/css/forms.scss",
"src/assets/css/fonts.css",
"src/assets/css/main.scss",
"src/assets/css/print.css",
"src/assets/css/icons.css"
"src/assets/css/fonts.scss",
"src/assets/css/print.css"
],
"scripts": [],
"scripts": ["./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.module.js"],
"aot": false,
"vendorChunk": true,
"extractLicenses": false,
Expand Down
3 changes: 3 additions & 0 deletions packages/portail-admins/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ module.exports = {
"^assets/(.*)$": "<rootDir>/src/assets/$1",
"^environments/(.*)$": "<rootDir>/src/environments/$1",
},
transformIgnorePatterns: [
"node_modules/(?!.*\\.mjs$|uuid|@edugouvfr/ngx-dsfr)",
],
};
3 changes: 2 additions & 1 deletion packages/portail-admins/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"@angular/platform-browser-dynamic": "^18.2.13",
"@angular/router": "^18.2.13",
"@domifa/common": "workspace:^",
"@edugouvfr/ngx-dsfr": "^1.14.3",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
Expand Down Expand Up @@ -89,4 +90,4 @@
"prettier --ignore-unknown -w"
]
}
}
}
255 changes: 39 additions & 216 deletions packages/portail-admins/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,8 @@
<app-custom-toastr></app-custom-toastr>
<nav id="skip-links" role="navigation" aria-label="Accès rapide">
<ul>
<li>
<a
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
[routerLink]="currentUrl"
fragment="navigation"
>Aller à la navigation</a
>
</li>
<li>
<a
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
[routerLink]="currentUrl"
fragment="page"
>Aller au contenu</a
>
</li>
<li *ngIf="currentUrl === '/manage'">
<a
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
[routerLink]="currentUrl"
fragment="search-bar"
>Aller à la recherche</a
>
</li>
<li>
<a
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
[routerLink]="currentUrl"
fragment="footer"
>Aller au pied de page</a
>
</li>
</ul>
</nav>

<dsfr-skiplinks [links]="skipLinks"></dsfr-skiplinks>
<header id="page-header" role="banner">
<nav
class="navbar bg-white"
class="navbar bg-white shadow-sm p-3 mb-5 rounded"
role="navigation"
aria-label="Navigation principale"
style="position: sticky; top: 0; z-index: 1000"
Expand Down Expand Up @@ -112,180 +72,43 @@
</div>
</nav>
</header>

<main role="main" id="page">
<app-custom-toastr></app-custom-toastr>
<router-outlet></router-outlet>
</main>
<footer id="footer" role="contentinfo" class="d-print-none">
<div class="bg-light py-3 border-bottom-dark">
<div class="container my-2 py-3">
<div class="row">
<div class="col my-2">
<p class="fw-bold">Cadre juridique</p>
<ul>
<li>
<a href="https://domifa.fabrique.social.gouv.fr/accessibilite"
>Accessibilité: partiellement conforme
</a>
</li>

<li>
<a
ariaCurrentWhenActive="page"
routerLink="/mentions-legales"
routerLinkActive="router-link-active"
>Mentions légales</a
>
</li>
<li>
<a
routerLink="/cgu"
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
>CGU</a
>
</li>
<li>
<a
routerLink="/confidentialite"
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
>Politique de confidentialité</a
>
</li>
<li>
<a
routerLink="/plan-site"
ariaCurrentWhenActive="page"
routerLinkActive="router-link-active"
>Plan du site</a
>
</li>
</ul>
</div>

<div class="col-12 col-md-4 my-2">
<p class="fw-bold">Nos partenaires</p>
<ul>
<li *ngFor="let link of partnerLinks">
<a [href]="link.path" target="_blank" rel="noopener noreferrer">
{{ link.label }}
<fa-icon
class="ms-2"
[icon]="['fas', 'arrow-up-right-from-square']"
aria-hidden="true"
></fa-icon>
</a>
</li>
</ul>
</div>
</div>
<div class="container my-2 py-3">
<div class="row align-items-center">
<div class="col-12 col-md-4">
<a
id="logo-footer"
href="https://solidarites.gouv.fr/"
target="_blank"
rel="noopener noreferrer"
title="Ministère du Travail, de la Santé, des Solidarités et des familles"
>
<img
rel="noopener noreferrer"
src="/assets/images/logo-ministere.jpg"
alt="Ministère du Travail, de la Santé, des Solidarités et des familles"
/>
</a>
</div>
<div class="col-12 col-md-8">
<ul
data-component-id="footer"
class="content-list"
id="menu-footer-external"
>
<li class="content-item">
<a
href="https://www.info.gouv.fr/"
target="_blank"
class="content-link"
rel="noopener external"
title="info.gouv.fr - nouvelle fenêtre"
>info.gouv.fr
<fa-icon
aria-hidden="true"
[icon]="['fas', 'external-link-alt']"
></fa-icon>
</a>
</li>
<li class="content-item">
<a
href="https://www.service-public.fr/"
target="_blank"
class="content-link"
rel="noopener external"
title="service-public.fr - nouvelle fenêtre"
>service-public.fr
<fa-icon
aria-hidden="true"
[icon]="['fas', 'external-link-alt']"
></fa-icon
></a>
</li>
<li class="content-item">
<a
href="https://www.legifrance.gouv.fr/"
target="_blank"
class="content-link"
rel="noopener external"
title="legifrance.gouv.fr - nouvelle fenêtre"
>legifrance.gouv.fr
<fa-icon
aria-hidden="true"
[icon]="['fas', 'external-link-alt']"
></fa-icon
></a>
</li>
<li class="content-item">
<a
href="https://www.data.gouv.fr/fr/"
target="_blank"
class="content-link"
rel="noopener external"
title="data.gouv.fr - nouvelle fenêtre"
>data.gouv.fr
<fa-icon
aria-hidden="true"
[icon]="['fas', 'external-link-alt']"
></fa-icon
></a>
</li>
</ul>
</div>
</div>
</div>
<div class="bg-light border-top-dark">
<div class="container my-2 py-4">
<p>
DomiFa est une solution gratuite et complète de gestion des
domiciliations pour les structures domiciliataires (centres d'Action
Sociale, communes, organismes agréés).
</p>

<p>
Sauf mention contraire, tous les textes de ce site sont sous
<a
href="https://github.com/etalab/licence-ouverte/blob/master/LO.md"
target="_blank"
rel="noopener noreferrer"
>licence etalab-2.0
<fa-icon
class="ms-2"
[icon]="['fas', 'up-right-from-square']"
aria-hidden="true"
></fa-icon
></a>
</p>
</div>
</div>
</div>
</div>
</footer>
<dsfr-footer
[logo]="{
label: 'République<br>Française',
imageAlt: 'République française logo',
tooltipMessage: '',
navigation: { routerLink: '/' }
}"
[mandatoryLinks]="[
{
label: 'Accessibilité : partiellement conforme',
link: 'https://domifa.fabrique.social.gouv.fr/accessibilite',
},
{
label: 'Mentions légales',
link: '/mentions-legales',
},
{
label: 'Conditions générales d’utilisation',
link: '/cgu',
},
{
label: 'Polotiques de confidentialité',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hbalty typo

link: '/confidentialite',
},
{
label: 'Plan du site',
link: '/plan-site',
},
{
label: 'Nos partenaires',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hbalty a retirer

link: '#',
}
]"
license="Sauf mention explicite de propriété intellectuelle détenue par des tiers, les contenus de ce site sont proposés sous <a href='https://github.com/etalab/licence-ouverte/blob/master/LO.md' _target='_blank'>licence etalab-2.0</a>"
></dsfr-footer>
23 changes: 21 additions & 2 deletions packages/portail-admins/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { LIENS_PARTENAIRES } from "./modules/general/components/static-pages/pla
import { PortailAdminUser } from "@domifa/common";
import { faChartBar } from "@fortawesome/free-regular-svg-icons";
import { faList, faUsers } from "@fortawesome/free-solid-svg-icons";
import { DsfrLink } from "@edugouvfr/ngx-dsfr";

@Component({
selector: "app-root",
Expand All @@ -21,7 +22,7 @@ export class AppComponent implements OnInit {
public faUsers = faUsers;
public faList = faList;
public currentUrl = "";

public skipLinks: DsfrLink[] = [];
constructor(
private readonly router: Router,
private readonly titleService: Title,
Expand All @@ -32,7 +33,6 @@ export class AppComponent implements OnInit {

public ngOnInit(): void {
this.currentUrl = this.router.url;

this.titleService.setTitle("Bienvenue sur le portail admin de DomiFa");

this.adminAuthService.currentAdminSubject.subscribe(
Expand All @@ -47,6 +47,25 @@ export class AppComponent implements OnInit {
const event = ev as unknown as NavigationEnd;
const splitUrl = event?.url.split("#");
this.currentUrl = splitUrl[0];
this.skipLinks = [
{
label: "Aller à la navigation",
link: `${this.currentUrl}#navigation`,
},
{ label: "Aller au contenu", link: `${this.currentUrl}#page` },
...(this.currentUrl === "/structures" // pour avoir le bon ordre des liens
? [
{
label: "Aller à la recherche",
link: `${this.currentUrl}#search-bar`,
},
]
: []),
{
label: "Aller au pied de page",
link: `${this.currentUrl}#footer`,
},
];

if (typeof splitUrl[1] !== "undefined") {
const fragment = splitUrl[1];
Expand Down
Loading
Loading