Skip to content

Commit e229e56

Browse files
pYassinehbalty
authored andcommitted
feat(mon-domifa): init dsfr
1 parent 7229910 commit e229e56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+791
-861
lines changed

.talismanrc

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,27 @@
11
fileignoreconfig:
2-
- filename: .anonymizer/yarn.lock
3-
checksum: adf574ab2b9fc5e21891b802504438b9f7738c8854047dbc7ca628cd3994ef5f
4-
- filename: .kontinuous/env/dev/templates/backend.sealed-secret.yaml
5-
checksum: eb02b7f4930980a6ad41118a3cae40e682d3322d1a3eba9b19b17da72e321136
6-
- filename: .kontinuous/env/preprod/templates/backend.sealed-secret.yaml
7-
checksum: 08602bd330f851a3a7a62707623f154cf4e33d43c96087b85531fee32dad342e
8-
- filename: _docs/dev/0.run-local-env.md
9-
checksum: 855b6f29ace746c86597d36382dbe7e40f771137734e3bf5eb53c948d6592a74
10-
- filename: _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
11-
checksum: f106304727d41ce64bb581f8772896ed8664df3a5e41489587be64afab48f453
12-
- filename: _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
13-
checksum: 4d2f01ba7fbd8c1109994a0831576e6341dc7e925fb75b9f447e2b3e1c9ef1c6
14-
- filename: packages/backend/package.json
15-
checksum: 2f5813dbc35cdc3659516beabf9f93e2978eb62d1b5403cfbb2907f22bb25355
16-
- filename: packages/backend/src/_migrations/1757532174131-auto-migration.ts
17-
checksum: 22a788509a5f08a8dbccbab49ed7b835df73ab56444b5c2a0e327fe51de2f748
18-
- filename: packages/backend/src/_migrations/_init-db/domifa_test_schema.sql
19-
checksum: 8b421c413bab4f2419972dec548a5399879f497a8c75c9b240bbf8c123cfab06
20-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.spec.ts
21-
checksum: 8f66091255109d0da277819584c6c69d4a7f720256842851a49b0dda16af6651
22-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts
23-
checksum: a0fbc6fca054f17c58d411b55a45acfa2351309a270968298aafcede7b7ae31f
24-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/services/structuresSearchStringFilter.service.ts
25-
checksum: fe3243c2d2adc23ed62431597b6ae7b3cb61fb25d876f1ada2de5387f0872b0b
26-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.spec.ts
27-
checksum: d202296bc7f349c0dc6bf140be961d8c321f57d9188325a07c49a6ca10c55b3b
28-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.ts
29-
checksum: e6d4d9afca6797fbf98f12db96ad37a21d61289539827390ba5b4aefeb92a6b2
30-
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
31-
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
32-
- filename: yarn.lock
33-
checksum: 075be99c7d081e6dc58ad5b0a0382963b392355221e5f8cf7f18bdcab8dae794
2+
- filename: .anonymizer/yarn.lock
3+
checksum: adf574ab2b9fc5e21891b802504438b9f7738c8854047dbc7ca628cd3994ef5f
4+
- filename: _docs/dev/0.run-local-env.md
5+
checksum: 855b6f29ace746c86597d36382dbe7e40f771137734e3bf5eb53c948d6592a74
6+
- filename: _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
7+
checksum: 6786973ce45c4e9f98501703bb28b21f487818ddbffcd30b35cb0499a659c9ef
8+
- filename: _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
9+
checksum: c68a6bc52521795e41b2d5ecddb9fb907ada5fce5bb1fef7fef4709fac8e0677
10+
- filename: packages/backend/package.json
11+
checksum: 2f5813dbc35cdc3659516beabf9f93e2978eb62d1b5403cfbb2907f22bb25355
12+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.spec.ts
13+
checksum: 8f66091255109d0da277819584c6c69d4a7f720256842851a49b0dda16af6651
14+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts
15+
checksum: a0fbc6fca054f17c58d411b55a45acfa2351309a270968298aafcede7b7ae31f
16+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/services/structuresSearchStringFilter.service.ts
17+
checksum: fe3243c2d2adc23ed62431597b6ae7b3cb61fb25d876f1ada2de5387f0872b0b
18+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.spec.ts
19+
checksum: d202296bc7f349c0dc6bf140be961d8c321f57d9188325a07c49a6ca10c55b3b
20+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.ts
21+
checksum: e6d4d9afca6797fbf98f12db96ad37a21d61289539827390ba5b4aefeb92a6b2
22+
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
23+
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
24+
- filename: yarn.lock
25+
checksum: 29561ce656a5b6dd4e1df7ecad5a09fc809fd3ffd12aff68f908a8c41a695a6f
3426
threshold: medium
3527
version: "1.0"

packages/portail-admins/angular.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
"assets": ["src/assets"],
2323
"styles": [
2424
"src/styles.scss",
25-
"src/assets/css/bootstrap-custom.css",
25+
"./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.main.min.css",
26+
"./node_modules/@gouvfr/dsfr/dist/utility/utility.main.min.css",
27+
"src/assets/css/bootstrap-custom.scss",
2628
"src/assets/css/forms.scss",
27-
"src/assets/css/fonts.css",
29+
"src/assets/css/fonts.scss",
2830
"src/assets/css/main.scss",
29-
"src/assets/css/print.css",
30-
"src/assets/css/icons.css"
31+
"src/assets/css/print.css"
3132
],
32-
"scripts": [],
33+
"scripts": ["./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.module.js"],
3334
"aot": false,
3435
"vendorChunk": true,
3536
"extractLicenses": false,

packages/portail-admins/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"@angular/platform-browser-dynamic": "^18.2.13",
2929
"@angular/router": "^18.2.13",
3030
"@domifa/common": "workspace:^",
31+
"@edugouvfr/ngx-dsfr": "^1.14.3",
3132
"@fortawesome/angular-fontawesome": "0.15.0",
3233
"@fortawesome/fontawesome-svg-core": "^6.7.2",
3334
"@fortawesome/free-regular-svg-icons": "^6.7.2",

packages/portail-admins/src/app/app.component.html

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
</div>
113113
</nav>
114114
</header>
115+
115116
<main role="main" id="page">
116117
<router-outlet></router-outlet>
117118
</main>
@@ -169,11 +170,6 @@
169170
<li *ngFor="let link of partnerLinks">
170171
<a [href]="link.path" target="_blank" rel="noopener noreferrer">
171172
{{ link.label }}
172-
<fa-icon
173-
class="ms-2"
174-
[icon]="['fas', 'arrow-up-right-from-square']"
175-
aria-hidden="true"
176-
></fa-icon>
177173
</a>
178174
</li>
179175
</ul>
@@ -210,10 +206,6 @@
210206
rel="noopener external"
211207
title="info.gouv.fr - nouvelle fenêtre"
212208
>info.gouv.fr
213-
<fa-icon
214-
aria-hidden="true"
215-
[icon]="['fas', 'external-link-alt']"
216-
></fa-icon>
217209
</a>
218210
</li>
219211
<li class="content-item">
@@ -224,11 +216,7 @@
224216
rel="noopener external"
225217
title="service-public.fr - nouvelle fenêtre"
226218
>service-public.fr
227-
<fa-icon
228-
aria-hidden="true"
229-
[icon]="['fas', 'external-link-alt']"
230-
></fa-icon
231-
></a>
219+
</a>
232220
</li>
233221
<li class="content-item">
234222
<a
@@ -238,11 +226,7 @@
238226
rel="noopener external"
239227
title="legifrance.gouv.fr - nouvelle fenêtre"
240228
>legifrance.gouv.fr
241-
<fa-icon
242-
aria-hidden="true"
243-
[icon]="['fas', 'external-link-alt']"
244-
></fa-icon
245-
></a>
229+
</a>
246230
</li>
247231
<li class="content-item">
248232
<a
@@ -252,11 +236,7 @@
252236
rel="noopener external"
253237
title="data.gouv.fr - nouvelle fenêtre"
254238
>data.gouv.fr
255-
<fa-icon
256-
aria-hidden="true"
257-
[icon]="['fas', 'external-link-alt']"
258-
></fa-icon
259-
></a>
239+
</a>
260240
</li>
261241
</ul>
262242
</div>
@@ -277,12 +257,7 @@
277257
target="_blank"
278258
rel="noopener noreferrer"
279259
>licence etalab-2.0
280-
<fa-icon
281-
class="ms-2"
282-
[icon]="['fas', 'up-right-from-square']"
283-
aria-hidden="true"
284-
></fa-icon
285-
></a>
260+
</a>
286261
</p>
287262
</div>
288263
</div>

packages/portail-admins/src/app/modules/shared/components/custom-toastr/custom-toastr.component.css

Lines changed: 0 additions & 174 deletions
This file was deleted.
Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
<ng-container *ngIf="toast">
2-
<div
3-
@fadeInOut
4-
*ngIf="toast.display"
5-
id="toast-container"
6-
[attr.role]="toast.class === 'success' ? 'status' : 'alert'"
7-
aria-live="polite"
8-
aria-atomic="true"
9-
class="toast-top-left toast-container"
10-
[attr.aria-label]="toast.message"
11-
>
12-
<div [class]="'ngx-toastr toast-' + toast.class">
13-
<div class="row d-flex align-items-center">
14-
<div class="col-2">
15-
<fa-icon size="2x" [icon]="['fas', icon]" aria-hidden="true">
16-
</fa-icon>
17-
</div>
18-
<div class="col-10">
19-
<div class="toast-message">
20-
{{ toast.message }}
21-
</div>
22-
</div>
23-
</div>
24-
</div>
2+
<div id="toast-container">
3+
<dsfr-alert
4+
*ngIf="toast.display"
5+
[headingLevel]="undefined"
6+
[message]="toast.message"
7+
[severity]="toast.class === 'success' ? 'success' : 'error'"
8+
[ariaRoleValue]="'alert'"
9+
[hasAriaRole]="false"
10+
[closeable]="false"
11+
@fadeInOut
12+
></dsfr-alert>
2513
</div>
2614
</ng-container>

0 commit comments

Comments
 (0)