diff --git a/.gitignore b/.gitignore
index 0c2496404a3ef178e3491369592461e2770953ce..ad8ee656e658e16e3c3964f6e12afdc0a0a96dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,7 @@ CHANGELOG.md
# Storybook
/storybook-static
-documentation.json
\ No newline at end of file
+documentation.json
+
+# .nx
+/.nx
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c0691ad76d3a84ec9f8e15a3e8f7ca2e639bd492..62ee709648a27306893cf6ff2dd148abd72f7adf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -59,6 +59,7 @@
"personaloffer",
"Rés'in",
"saturday",
+ "sizename",
"smedium",
"sunday",
"thursday",
diff --git a/src/app/admin/components/manage-employers/manage-employers.component.html b/src/app/admin/components/manage-employers/manage-employers.component.html
index c39a858e24db3ae6d269ac58da9017e821a5f36f..31d21f4aba9faf35b550c988232000de52dcfda4 100644
--- a/src/app/admin/components/manage-employers/manage-employers.component.html
+++ b/src/app/admin/components/manage-employers/manage-employers.component.html
@@ -44,16 +44,16 @@
</form>
</div>
-<app-v3-modal
+<app-modal
*ngIf="employerToDelete"
[title]="'ATTENTION'"
[opened]="deleteModalOpened"
(closed)="deleteEmployer(employerToDelete, $event)"
>
Voulez-vous vraiment supprimer l'employeur <b>{{ employerToDelete.name }}</b> ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="mergeOpe.newEmployer"
[opened]="mergeEmployerModalOpened"
[title]="'ATTENTION'"
@@ -61,4 +61,4 @@
>
Voulez-vous vraiment fusionner cet employeur avec <b>{{ mergeOpe.newEmployer.name }}</b
> ?
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/admin/components/manage-jobs/manage-jobs.component.html b/src/app/admin/components/manage-jobs/manage-jobs.component.html
index edd4f9fc41e07dace632dee0806c5c24e406b1fb..a155df8b6d2496c4e1109454282f0a5686d8b0ba 100644
--- a/src/app/admin/components/manage-jobs/manage-jobs.component.html
+++ b/src/app/admin/components/manage-jobs/manage-jobs.component.html
@@ -68,29 +68,29 @@
</form>
</div>
-<app-v3-modal
+<app-modal
*ngIf="jobToDelete"
[title]="'ATTENTION'"
[opened]="deleteModalOpened"
(closed)="deleteJob(jobToDelete, $event)"
>
Voulez-vous vraiment supprimer la fonction {{ jobToDelete.name }} ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="mergeOpe.newJob"
[title]="'ATTENTION'"
[opened]="mergeJobModalOpened"
(closed)="mergeJob(mergeOpe.newJob._id, mergeOpe.formerId, $event, contextRow)"
>
Voulez-vous vraiment fusionner cette fonction avec {{ mergeOpe.newJob.name }} ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="jobsGroupToDelete"
[title]="'ATTENTION'"
[opened]="deleteJobsGroupModalOpened"
(closed)="deleteJobsGroup(jobsGroupToDelete, $event)"
>
Voulez-vous vraiment supprimer le groupe de fonctions {{ jobsGroupToDelete.name }} ?
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/admin/components/manage-users/manage-users.component.html b/src/app/admin/components/manage-users/manage-users.component.html
index 11b7be9f0d4b9b5b73c139097ff1ccc3e126076b..4549c91f7be2d097398a88cf44b24f88e768bf6d 100644
--- a/src/app/admin/components/manage-users/manage-users.component.html
+++ b/src/app/admin/components/manage-users/manage-users.component.html
@@ -25,7 +25,7 @@
<h3 *ngIf="unAttachedUsers" class="title inline">
Utilisateurs non rattachés ({{ unAttachedUsers.length }})
- <app-v3-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('unattached')" />
+ <app-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('unattached')" />
</h3>
<ag-grid-angular
@@ -44,7 +44,7 @@
<h3 *ngIf="attachedUsers" class="title inline">
Utilisateurs rattachés ({{ attachedUsers.length }})
- <app-v3-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('attached')" />
+ <app-button [label]="'Exporter'" [variant]="'tertiary'" [size]="'small'" (click)="exportUsers('attached')" />
</h3>
<ag-grid-angular
*ngIf="validatedJobs && validatedEmployers"
@@ -75,16 +75,16 @@
/>
</div>
-<app-v3-modal
+<app-modal
*ngIf="userToDelete"
[title]="'ATTENTION'"
[opened]="deleteModalOpened"
(closed)="deleteUser(userToDelete, $event)"
>
Voulez-vous vraiment supprimer l'utilisateur <b>{{ userToDelete.email }}</b> ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="changingJobs && changingJobs[0] !== null"
[title]="'ATTENTION'"
[opened]="editJobModalOpened"
@@ -92,18 +92,18 @@
>
Voulez-vous vraiment changer la fonction de cet utilisateur ({{ changingJobs[1].name }}) par
{{ changingJobs[0].name }} ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="changingJobs && changingJobs[0] === null"
[title]="'ATTENTION'"
[opened]="editJobModalOpened"
(closed)="editJob(changingJobs[0], changingJobs[1], $event, contextRow)"
>
Voulez-vous vraiment supprimer la fonction de cet utilisateur ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="changingEmployers && changingEmployers[0] !== null"
[title]="'ATTENTION'"
[opened]="editEmployerModalOpened"
@@ -111,13 +111,13 @@
>
Voulez-vous vraiment changer l'employeur de cet utilisateur ({{ changingEmployers[1].name }}) par
{{ changingEmployers[0].name }} ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="changingEmployers && changingEmployers[0] === null"
[title]="'ATTENTION'"
[opened]="editEmployerModalOpened"
(closed)="editEmployer(changingEmployers[0], changingEmployers[1], $event, contextRow)"
>
Voulez-vous vraiment supprimer l'employeur de cet utilisateur ?
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/admin/components/nav-bar/nav-bar.component.html b/src/app/admin/components/nav-bar/nav-bar.component.html
index 682ffd516ae317912f69359287cfcec2762a552f..ab692b563cbe1d3c3bbf44b9d2bd07fdfc16da37 100644
--- a/src/app/admin/components/nav-bar/nav-bar.component.html
+++ b/src/app/admin/components/nav-bar/nav-bar.component.html
@@ -1,42 +1,42 @@
<header>
<h1>Administration</h1>
<nav>
- <app-v3-button
+ <app-button
[label]="'Revendication structure'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.pendingStructures.link)"
/>
- <app-v3-button
+ <app-button
[label]="'Liste structures'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.structuresList.link)"
/>
- <app-v3-button
+ <app-button
[label]="'Structures supprimées'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.deletedStructures.link)"
/>
- <app-v3-button
+ <app-button
[label]="'Gestion des utilisateurs'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.manageUsers.link)"
/>
- <app-v3-button [label]="'Fonctions'" [variant]="'secondary'" (click)="router.navigateByUrl(routes.jobsList.link)" />
- <app-v3-button
+ <app-button [label]="'Fonctions'" [variant]="'secondary'" (click)="router.navigateByUrl(routes.jobsList.link)" />
+ <app-button
[label]="'Employeurs'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.employersList.link)"
/>
- <app-v3-button
+ <app-button
[label]="'CNFS Espace Coop'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.espaceCoopCNFS.link)"
/>
- <app-v3-button
+ <app-button
[label]="'Infos covid'"
[variant]="'secondary'"
(click)="router.navigateByUrl(routes.lockdownInfo.link)"
/>
- <app-v3-button [variant]="'tertiary'" [label]="'Ghost'" (click)="openGhost()" />
+ <app-button [variant]="'tertiary'" [label]="'Ghost'" (click)="openGhost()" />
</nav>
</header>
diff --git a/src/app/annuaire/annuaire-header/annuaire-header.component.html b/src/app/annuaire/annuaire-header/annuaire-header.component.html
index f8c6fd8bfd6542ba9f587a39eab4abf3f75d1bb9..dd0aa9dfac71fd5253d6740beeea8038353b4fb2 100644
--- a/src/app/annuaire/annuaire-header/annuaire-header.component.html
+++ b/src/app/annuaire/annuaire-header/annuaire-header.component.html
@@ -1,6 +1,6 @@
<div class="searchContainer">
<div class="searchBarAndFilters">
- <app-v3-search-bar [(value)]="searchInput" (search)="applyFilter()" />
+ <app-search-bar [(value)]="searchInput" (search)="applyFilter()" />
<div class="filters isntPhoneContent" (appClickOutside)="closeModal()">
<app-collapsable-filter
[label]="'Fonction'"
@@ -27,17 +27,17 @@
</div>
<div *ngIf="searchService.checkedFilterList.length" class="filterTags isntPhoneContent">
<div class="title">Filtres :</div>
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let filter of searchService.checkedFilterList"
[label]="filter"
[size]="'small'"
- [color]="'black'"
+ [color]="'grey'"
[iconName]="'cross'"
[iconPosition]="'right'"
[clickable]="true"
(action)="removeFilter(filter)"
/>
- <app-v3-tag-item
+ <app-tag-item
[label]="'Réinitialiser les filtres'"
[size]="'small'"
[color]="'white'"
diff --git a/src/app/annuaire/annuaire-header/annuaire-header.component.scss b/src/app/annuaire/annuaire-header/annuaire-header.component.scss
index 0670a0ffa5d25776ec7bf1ae7b036eabf9086251..f12a2d2d56c724cb5df0dccfbb6a2d9d10edcd14 100644
--- a/src/app/annuaire/annuaire-header/annuaire-header.component.scss
+++ b/src/app/annuaire/annuaire-header/annuaire-header.component.scss
@@ -1,6 +1,12 @@
@import 'search';
+@import 'color';
.searchContainer {
+ max-width: 980px;
+ margin: auto;
padding-top: 24px;
padding-bottom: 16px;
+ background-color: $white;
+ position: sticky;
+ top: 0;
}
diff --git a/src/app/annuaire/annuaire-header/annuaire-header.component.ts b/src/app/annuaire/annuaire-header/annuaire-header.component.ts
index 201682041640eaa4a5a8f28342a3f3e65b0d0f40..f8178e77c34990b29db762356885a85a3e7d31b0 100644
--- a/src/app/annuaire/annuaire-header/annuaire-header.component.ts
+++ b/src/app/annuaire/annuaire-header/annuaire-header.component.ts
@@ -1,7 +1,6 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { forkJoin, lastValueFrom } from 'rxjs';
-import { ButtonType } from '../../shared/components/button/buttonType.enum';
import { SearchService } from '../../structure-list/services/search.service';
import { TypeModal } from '../enums/TypeModal.enum';
import { SearchQuery } from '../models/searchQuery.model';
@@ -18,7 +17,6 @@ export class AnnuaireHeaderComponent implements OnInit, OnChanges {
@Output() shouldLoad = new EventEmitter<boolean>();
public addStructureFormModal = false;
- public buttonTypeEnum = ButtonType;
public modalTypeOpened: TypeModal;
public employersFiltersActive = false;
public jobsFiltersActive = false;
diff --git a/src/app/annuaire/annuaire.component.scss b/src/app/annuaire/annuaire.component.scss
index 53633e31364bb8ddfbb6ce494117246f6a91f68e..a17cc1389ae34ce6524cf9a7d57be87071a05f01 100644
--- a/src/app/annuaire/annuaire.component.scss
+++ b/src/app/annuaire/annuaire.component.scss
@@ -2,9 +2,6 @@
@import 'breakpoint';
.annuaire-container {
- padding-inline: 6rem;
- margin: auto;
- max-width: $content-desktop-width;
@media #{$tablet} {
padding-inline: 0.5rem;
}
diff --git a/src/app/annuaire/filter-modal/filter-modal.component.html b/src/app/annuaire/filter-modal/filter-modal.component.html
index 788d795f64ffb0e3ef6de43f91e7a3cafa5bdad0..e25bf4cb1be1d60a38b5d0a2cc18058e9f108b65 100644
--- a/src/app/annuaire/filter-modal/filter-modal.component.html
+++ b/src/app/annuaire/filter-modal/filter-modal.component.html
@@ -1,7 +1,7 @@
<div *ngIf="modalType" [ngClass]="['filterModal', getModalType()]">
<div class="filterModalContainer">
<div class="modalContent">
- <app-v3-label-checkbox
+ <app-label-checkbox
*ngFor="let filter of filtersTypes"
[label]="filter"
[for]="filter"
@@ -12,8 +12,8 @@
</div>
<div class="modalFooter">
- <app-v3-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
- <app-v3-button [variant]="'primary'" [label]="'Appliquer'" (click)="onSubmitFilters()" />
+ <app-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
+ <app-button [variant]="'primary'" [label]="'Appliquer'" (click)="onSubmitFilters()" />
</div>
</div>
</div>
diff --git a/src/app/annuaire/result-list/result-list.component.html b/src/app/annuaire/result-list/result-list.component.html
index 9f5db7053a0cf9104863348ce7b8c28a2e883b97..9bb0da4397d357293219fbe8eabe083955300080 100644
--- a/src/app/annuaire/result-list/result-list.component.html
+++ b/src/app/annuaire/result-list/result-list.component.html
@@ -13,33 +13,16 @@
</div>
<div class="resultsInfo">
<div *ngIf="userList.length" class="users">
- <div
+ <app-member-card
*ngFor="let user of userList"
- class="singleUser"
- tabindex="0"
- role="link"
- (click)="goToUser(user._id)"
- (keyup.enter)="goToUser(user._id)"
- >
- <div class="left">
- <app-svg-icon [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-48'" />
- <div class="identity">
- <p class="name">{{ user.name | userName }} {{ user.surname | uppercase }}</p>
- <p *ngIf="user.job" class="job">{{ user.job.name }}</p>
- <div *ngIf="user.withAppointment" class="appointment">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'rdv'" />
- <span>Rendez-vous</span>
- </div>
- </div>
- </div>
- <div class="right">
- <div *ngIf="user.employer" class="employer">{{ user.employer.name }}</div>
- <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'chevronRight'" />
- </div>
- </div>
+ [member]="user"
+ [showAppointment]="true"
+ [showContactInfo]="false"
+ [showEmployer]="true"
+ />
<div *ngIf="showPagination" class="pagination">
<p>{{ userList.length }} membres affichés sur {{ totalUserResult }}</p>
- <app-v3-button
+ <app-button
[label]="'Voir plus'"
[variant]="'primaryBlack'"
[size]="'medium'"
@@ -51,7 +34,7 @@
<ng-container *ngIf="userList.length === 0">
<p class="noResult">Aucun résultat ne correspond à vos filtres</p>
<p class="filtersInfo">Merci de réinitialiser ou modifier les filtres afin d'élargir votre recherche</p>
- <app-v3-button
+ <app-button
tabindex="0"
[variant]="'primary'"
[wide]="true"
@@ -77,8 +60,8 @@
veuillez vous connecter ou vous créer un compte.
</div>
<div class="buttons">
- <app-v3-button [label]="'Créer un compte'" [variant]="'secondary'" (action)="goRegister()" />
- <app-v3-button [label]="'Se connecter'" [variant]="'primary'" (action)="goLogin()" />
+ <app-button [label]="'Créer un compte'" [variant]="'secondary'" (action)="goRegister()" />
+ <app-button [label]="'Se connecter'" [variant]="'primary'" (action)="goLogin()" />
</div>
</div>
</ng-container>
diff --git a/src/app/annuaire/result-list/result-list.component.scss b/src/app/annuaire/result-list/result-list.component.scss
index 565fd658bd5e96002efd5af0296f0acdd1abd9a1..f25302418ba1b820401c9fca875dcc1568024c25 100644
--- a/src/app/annuaire/result-list/result-list.component.scss
+++ b/src/app/annuaire/result-list/result-list.component.scss
@@ -4,10 +4,10 @@
@import 'typography';
.results {
- margin-top: 1rem;
- height: calc(100vh - $footer-height - $header-height - 7rem);
overflow-y: auto;
- overflow-anchor: none;
+ margin: 1rem auto auto auto;
+ max-width: 980px;
+ padding-bottom: 1rem;
@media #{$phone} {
height: unset;
@@ -45,58 +45,6 @@
flex-direction: column;
gap: 16px;
padding-right: 8px;
- .singleUser {
- display: flex;
- align-items: center;
- min-height: 100px;
- padding: 1rem;
- box-sizing: border-box;
- cursor: pointer;
- border-radius: 8px;
- border: 1px solid $grey-7;
- justify-content: space-between;
- gap: 1rem;
- transition: all 0.2s ease-in-out;
-
- &:hover {
- border-color: $grey-4;
- }
-
- .left {
- display: flex;
- align-items: center;
- gap: 1.5rem;
- .identity {
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- max-width: 330px;
- .name {
- font-weight: bold;
- }
- .job {
- color: $grey-3;
- }
- .appointment {
- display: flex;
- align-items: center;
- gap: 0.5rem;
- span {
- @include font-bold-14;
- }
- }
- }
- }
- .right {
- display: flex;
- align-items: center;
- gap: 1.5rem;
- color: $grey-4;
- .employer {
- color: $grey-3;
- }
- }
- }
}
.noResult {
@@ -129,7 +77,6 @@
}
.notConnected {
- height: auto;
text-align: center;
padding: 70px 40px;
@media #{$tablet} {
diff --git a/src/app/carto/carto.component.html b/src/app/carto/carto.component.html
index c626107507ccedf1a6a6651cae374809ba74ab66..929cb04096bff9ad9d6562dc42e38d8cba1af5ec 100644
--- a/src/app/carto/carto.component.html
+++ b/src/app/carto/carto.component.html
@@ -20,7 +20,7 @@
(structureRDVSelected)="selectStructureRDV($event)"
/>
<div class="btnSwitch">
- <app-v3-button
+ <app-button
[variant]="'primaryBlack'"
[label]="isMapPhone ? 'Liste' : 'Carte'"
[size]="'large'"
diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html
index 6d53f98096c4076f2538b5f5dcb2002cce3ff875..3f0f49a0d6b10ba0bb3bd0f6b54a6460c488b67e 100644
--- a/src/app/contact/contact.component.html
+++ b/src/app/contact/contact.component.html
@@ -1,123 +1,59 @@
-<div class="section-container">
- <form [formGroup]="contactForm" (ngSubmit)="onSubmit()">
- <div class="formFields">
- <h2>Nous contacter</h2>
- <div class="form-group">
- <label for="name">Prénom et Nom</label>
- <div fxLayout="row" fxLayoutGap="15px">
- <input type="text" autocomplete="on" formControlName="name" class="form-input" />
- <app-svg-icon
- *ngIf="contactForm.get('name').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="contactForm.get('name').value && !contactForm.get('name').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+<form class="contactForm" [formGroup]="contactForm" (ngSubmit)="onSubmit()">
+ <h2>Nous contacter</h2>
- <div class="form-group">
- <label for="email">Adresse mail</label>
- <div fxLayout="row" fxLayoutGap="15px">
- <input type="text" autocomplete="on" formControlName="email" class="form-input" />
- <app-svg-icon
- *ngIf="contactForm.get('email').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="contactForm.get('email').value && !contactForm.get('email').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+ <app-input
+ id="name"
+ label="Nom"
+ size="large"
+ [status]="contactForm.get('name').invalid ? null : 'success'"
+ [value]="contactForm.get('name').value"
+ (valueChange)="contactForm.get('name').setValue($event)"
+ />
- <div class="form-group">
- <label for="phone">N° de téléphone</label>
- <p class="notRequired">facultatif</p>
- <div fxLayout="row" fxLayoutGap="15px">
- <input
- type="text"
- autocomplete="on"
- formControlName="phone"
- class="form-input phone"
- (input)="utils.modifyPhoneInput(contactForm, 'phone', $event.target)"
- />
- <app-svg-icon
- *ngIf="contactForm.get('phone').value && contactForm.get('phone').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="contactForm.get('phone').value && !contactForm.get('phone').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+ <app-input
+ id="email"
+ label="Adresse mail"
+ autocomplete="on"
+ size="large"
+ [status]="contactForm.get('email').value ? (contactForm.get('email').invalid ? 'error' : 'success') : null"
+ [statusText]="contactForm.get('email').hasError('alreadyExist') ? 'Cet email est déjà utilisé' : null"
+ [value]="contactForm.get('email').value"
+ (valueChange)="contactForm.get('email').setValue($event)"
+ />
- <div class="form-group">
- <label for="subject">Objet du message</label>
- <div fxLayout="row" fxLayoutGap="15px">
- <input type="text" maxlength="100" formControlName="subject" class="form-input subject" />
- <app-svg-icon
- *ngIf="contactForm.get('subject').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="contactForm.get('subject').value && !contactForm.get('subject').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+ <app-input
+ id="phone"
+ label="Téléphone"
+ size="large"
+ [status]="contactForm.get('phone').value ? (contactForm.get('phone').invalid ? 'error' : 'success') : null"
+ [value]="contactForm.get('phone').value"
+ (valueChange)="contactForm.get('phone').setValue($event); utils.modifyPhoneInput(contactForm, 'phone', $event)"
+ />
- <div class="form-group">
- <label for="message">Message</label>
- <div class="textareaBlock" fxLayout="row" fxLayoutGap="15px">
- <textarea
- rows="8"
- placeholder="Exemple : J'aimerais avoir de l'aide sur Rés'in."
- maxlength="500"
- formControlName="message"
- ></textarea>
- <app-svg-icon
- *ngIf="contactForm.get('message').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="contactForm.get('message').value && !contactForm.get('message').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- <p>{{ contactForm.get('message').value ? contactForm.get('message').value.length : 0 }}/500</p>
- </div>
- </div>
- <div class="buttons">
- <app-v3-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
- <app-v3-button
- [type]="'submit'"
- [variant]="'primary'"
- [label]="'Envoyer'"
- [disabled]="!contactForm.valid || loading"
- />
- </div>
- </form>
-</div>
+ <app-input
+ id="subject"
+ label="Objet du message"
+ size="large"
+ [status]="contactForm.get('subject').invalid ? null : 'success'"
+ [value]="contactForm.get('subject').value"
+ (valueChange)="contactForm.get('subject').setValue($event)"
+ />
+
+ <app-textarea
+ id="message"
+ label="Message"
+ placeholder="Exemple : J'aimerais avoir de l'aide sur Rés'in."
+ [value]="contactForm.get('message').value"
+ (valueChange)="contactForm.get('message').setValue($event)"
+ />
+
+ <div class="buttons">
+ <app-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
+ <app-button
+ [type]="'submit'"
+ [variant]="'primary'"
+ [label]="'Envoyer'"
+ [disabled]="!contactForm.valid || loading"
+ />
+ </div>
+</form>
diff --git a/src/app/contact/contact.component.scss b/src/app/contact/contact.component.scss
index ad393715e8fb4363c6281d43983f44fe188d32c5..ebd60c1133466c28facc227a1cbd2bd4abb5f6a5 100644
--- a/src/app/contact/contact.component.scss
+++ b/src/app/contact/contact.component.scss
@@ -2,47 +2,21 @@
@import 'layout';
@import 'breakpoint';
@import 'typography';
-@import 'shapes';
@import 'z-index';
-.formFields {
- max-width: 960px;
- padding: 40px;
- background: $white;
- border-radius: 8px;
- border: 1px solid $grey-6;
-}
-.phone {
- width: 200px;
-}
-.subject {
- width: 600px;
-}
-.textareaBlock {
- flex-direction: column;
- box-sizing: border-box;
- display: flex;
- textarea {
- width: 94%;
- margin-top: 4px;
- &:focus {
- border: 1px solid $blue;
- outline: none !important;
- }
- }
-}
-.buttons {
+.contactForm {
+ max-width: 600px;
+ padding: 1rem 0;
+ margin: auto;
+
display: flex;
- justify-content: center;
- max-width: 960px;
- padding-top: 1rem;
+ flex-direction: column;
gap: 1rem;
-}
-p {
- text-align: right;
- width: 96%;
- &.notRequired {
- text-align: left;
- margin: 0;
+
+ .buttons {
+ display: flex;
+ justify-content: center;
+ max-width: 600px;
+ gap: 1rem;
}
}
diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts
index c631d5c9693bdb3e21434fa9404f7eb0d4136e1d..1e1231ad352dd4c841d7d160ed808c170660ed3d 100644
--- a/src/app/contact/contact.component.ts
+++ b/src/app/contact/contact.component.ts
@@ -58,9 +58,6 @@ export class ContactComponent implements OnInit {
}
public onSubmit(): void {
- if (!this.contactForm.valid) {
- return;
- }
this.loading = true;
const contactMessage: ContactMessage = this.contactForm.value;
diff --git a/src/app/form/footer-form/footer-form.component.html b/src/app/form/footer-form/footer-form.component.html
index 162289ed8985bf1b35183374a9f02ff8bb2e6ef0..1c4f56c76547c910baf3f5fc09e24f3e748a4f74 100644
--- a/src/app/form/footer-form/footer-form.component.html
+++ b/src/app/form/footer-form/footer-form.component.html
@@ -1,5 +1,5 @@
<div class="footerForm">
- <app-v3-button
+ <app-button
*ngIf="!isLastFormStep && !isNextFormTransition && !isStructureLastPage() && !isPersonalOfferFirstPage()"
[variant]="'secondary'"
[label]="!isEditMode ? 'Précédent' : 'Annuler'"
@@ -7,7 +7,7 @@
(action)="prevPage()"
/>
- <app-v3-button
+ <app-button
*ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode"
[variant]="'primary'"
[label]="'Suivant'"
@@ -18,7 +18,7 @@
(action)="nextPage()"
/>
- <app-v3-button
+ <app-button
*ngIf="isEditMode"
[variant]="'primary'"
[label]="'Valider'"
diff --git a/src/app/form/footer-form/footer-form.component.scss b/src/app/form/footer-form/footer-form.component.scss
index 63e1650f573450673ad62dd4d6e57c9784692b16..bdf40933a3a0dc43131e84a780467eee4fb9713f 100644
--- a/src/app/form/footer-form/footer-form.component.scss
+++ b/src/app/form/footer-form/footer-form.component.scss
@@ -7,7 +7,6 @@
justify-content: center;
gap: 1rem;
padding: 32px 0 40px 0;
- margin: 0 96px;
border-top: 1px solid $grey-7;
@media #{$tablet} {
margin: 0 2%;
diff --git a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
index 772ca38d143a19323d4b56786e2e5f914fbb9fe3..6c6ae7d94ec728adb3a7f7f1549f0eed3eeab8c8 100644
--- a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
+++ b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html
@@ -31,7 +31,7 @@
<li [ngClass]="accountForm.get('password').value.length >= 8 ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="accountForm.get('password').value.length >= 8 ? 'validate' : 'notValidate'"
/>
<p>8 caractères</p>
@@ -39,7 +39,7 @@
<li [ngClass]="checkIfPasswordHasSpecialChar(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasSpecialChar(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère spécial</p>
@@ -47,7 +47,7 @@
<li [ngClass]="checkIfPasswordHasLowerCase(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasLowerCase(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère en minuscule</p>
@@ -55,7 +55,7 @@
<li [ngClass]="checkIfPasswordHasUpperCase(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasUpperCase(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 caractère en majuscule</p>
@@ -63,7 +63,7 @@
<li [ngClass]="checkIfPasswordHasDigit(accountForm.get('password').value) ? 'valid' : 'invalid'">
<app-svg-icon
[iconClass]="'icon-16'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="checkIfPasswordHasDigit(accountForm.get('password').value) ? 'validate' : 'notValidate'"
/>
<p>1 chiffre</p>
diff --git a/src/app/form/form-view/form-view.component.html b/src/app/form/form-view/form-view.component.html
index 24b0e342e3f32a9d8443a0734fe97f1739fc4094..509253eb83a8fb72c6d616f4728ea5b7d19169a3 100644
--- a/src/app/form/form-view/form-view.component.html
+++ b/src/app/form/form-view/form-view.component.html
@@ -1,5 +1,5 @@
<div class="formView">
- <app-v3-modal
+ <app-modal
[title]="'Attention'"
[opened]="showConfirmationModal"
[validateLabel]="'Quitter'"
@@ -9,7 +9,7 @@
<div class="modalContent emphasized">
Si vous quittez le formulaire maintenant, toutes les informations saisies seront perdues
</div>
- </app-v3-modal>
+ </app-modal>
<app-progress-bar
*ngIf="!isEditMode"
[formType]="formType[routeParam]"
diff --git a/src/app/form/form-view/form-view.component.scss b/src/app/form/form-view/form-view.component.scss
index b7cd4cd4ef66311bd32c3b701269a307ee79411e..e4fcd10c091ac9edf18d64165a8ff8e1ade741ff 100644
--- a/src/app/form/form-view/form-view.component.scss
+++ b/src/app/form/form-view/form-view.component.scss
@@ -4,23 +4,25 @@
@import 'typography';
:host {
- height: 100%;
+ display: flex;
+ flex-direction: column;
+ flex: 1;
}
.formView {
- height: 100%;
display: flex;
flex-direction: column;
- background-color: $grey-10;
+ flex: 1;
}
::ng-deep.page {
display: flex;
place-content: center;
height: 100%;
- margin: 16px 96px;
- overflow-y: auto;
- scrollbar-gutter: stable;
+ margin: auto;
+ padding-block: 16px;
+ max-width: 980px;
+ width: 100%;
@media #{$tablet} {
margin: 0px 0.5rem;
width: auto;
@@ -47,6 +49,7 @@
display: flex;
flex-direction: column;
gap: 1rem;
+ width: 600px;
}
}
@@ -83,13 +86,15 @@
.info {
@include font-regular-14;
}
- // V3REMOVE
- .backArrow {
- cursor: pointer;
- }
}
:host ::ng-deep .form-details {
@include font-regular-18;
color: $grey-4-5-1;
}
+
+app-footer-form {
+ position: sticky;
+ bottom: 0;
+ background: $white;
+}
diff --git a/src/app/form/form-view/global-components/information-step/information-step.component.html b/src/app/form/form-view/global-components/information-step/information-step.component.html
index 7d593af00bd9b3d247f7f50d98e98bc477e20ac7..97b2f8232edf765ccc369e1a4905c6659113035b 100644
--- a/src/app/form/form-view/global-components/information-step/information-step.component.html
+++ b/src/app/form/form-view/global-components/information-step/information-step.component.html
@@ -5,7 +5,7 @@
<img src="../../assets/form/emailVerification.svg" alt="" />
<h3>Un email vous a été envoyé afin de finaliser votre inscription</h3>
<div class="btnContainer">
- <app-v3-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" />
+ <app-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" />
</div>
</div>
</ng-container>
@@ -13,12 +13,12 @@
<!-- Email just got confirmed, request some info about the user -->
<ng-container *ngIf="formType === formTypeEnum.profile && step === profileFormStepEnum.profileBeginningInfo">
<div class="information-step">
- <img src="../../assets/form/profileSkip.svg" alt="Image profil" />
+ <img src="../../assets/form/profileSkip.svg" alt="" />
<h3>Pour compléter votre profil, nous aimerions vous poser quelques questions</h3>
<div class="btnContainer">
<div class="btnGroup">
- <app-v3-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" />
- <app-v3-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" />
+ <app-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" />
+ <app-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" />
</div>
</div>
</div>
@@ -76,7 +76,7 @@
donner accès au numérique
</p>
<div class="btnContainer">
- <app-v3-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" />
+ <app-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" />
</div>
</div>
</ng-container>
@@ -98,7 +98,7 @@
<img src="../../assets/form/profileUpdated.svg" alt="" />
<h3>Merci, les informations de votre profil ont été mises à jour</h3>
<div class="btnContainer">
- <app-v3-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" />
+ <app-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" />
</div>
</div>
</ng-container>
diff --git a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.html b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.html
index e3557df5af8c7c5b205d2342ba549434230ffa09..150f1370898a393952194579058764966a669c5f 100644
--- a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.html
+++ b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.html
@@ -3,7 +3,7 @@
<p *ngIf="formType === formTypeEnum.profile">Création du profil</p>
<p *ngIf="formType === formTypeEnum.structure">Création de la structure</p>
<p *ngIf="formType === formTypeEnum.personaloffer">Création d'offre d’accompagnements</p>
- <div fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="20px">
+ <div class="container">
<label for="progressForm" [ngClass]="{ validate: currentPage === nbSteps }"
>{{ progressStatus > 100 ? 100 : (progressStatus | number: '1.0-0') }}%
</label>
diff --git a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.scss b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.scss
index 3d2c2b9dce371cd804ae08ced91ce1e8e4f6c771..72b5f2c747f83791268e0c4f9c54d249c4538cdb 100644
--- a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.scss
+++ b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.scss
@@ -4,7 +4,6 @@
@import 'breakpoint';
.progressBar {
- background-color: $grey-9;
padding: 1rem 6rem;
@media #{$tablet} {
@@ -19,6 +18,14 @@
@media print {
display: none;
}
+
+ .container {
+ display: flex;
+ flex-direction: row;
+ gap: 1.5rem;
+ align-items: center;
+ }
+
progress {
width: 100%;
height: 6px;
@@ -34,18 +41,18 @@
border-radius: 7px;
}
&::-webkit-progress-value {
- background-color: $primary-color;
+ background-color: $red;
border-radius: 12px;
transition: width 0.5s;
}
&::-moz-progress-bar {
- background-color: $primary-color;
+ background-color: $red;
border-radius: 12px;
}
}
label {
@include font-bold-14;
- color: $primary-color;
+ color: $red;
min-width: 26px;
}
}
diff --git a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts
index 7b2862691b2812a75c1e3e4f35670895bd9affc6..088e78892c779a9dcc762b03c2d6d44953741f63 100644
--- a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts
+++ b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts
@@ -10,13 +10,15 @@ import { structureFormStep } from '../../structure-form/structureFormStep.enum';
})
export class ProgressBarComponent implements OnChanges {
@Input() formType: formType;
- @Input() isEditMode: boolean;
- @Input() currentPage: number;
- @Input() nbSteps: number;
+ /** Number of current step */
+ @Input({ required: true }) currentPage: number;
+ /** Total number of steps */
+ @Input({ required: true }) nbSteps: number;
public progressStatus: number;
public formTypeEnum = formType;
- public profileFormSteps: number = Object.keys(profileFormStep).length / 2;
- public structureFormSteps: number = Object.keys(structureFormStep).length / 2;
+ // When working with numeric enums, divide the result by 2, because a reverse mapping is generated.
+ public profileFormSteps = Object.keys(profileFormStep).length / 2;
+ public structureFormSteps = Object.keys(structureFormStep).length / 2;
ngOnChanges(changes: SimpleChanges): void {
if (changes.currentPage) {
diff --git a/src/app/form/form-view/global-components/progress-bar/progress-bar.stories.ts b/src/app/form/form-view/global-components/progress-bar/progress-bar.stories.ts
new file mode 100644
index 0000000000000000000000000000000000000000..25d0b7786a5447784c8aca962427a063f047b645
--- /dev/null
+++ b/src/app/form/form-view/global-components/progress-bar/progress-bar.stories.ts
@@ -0,0 +1,41 @@
+import { CommonModule } from '@angular/common';
+import type { Meta, StoryObj } from '@storybook/angular';
+import { moduleMetadata } from '@storybook/angular';
+import { formType } from '../../formType.enum';
+import { ProgressBarComponent } from './progress-bar.component';
+
+// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
+const meta: Meta<ProgressBarComponent> = {
+ title: 'Form/Progress bar',
+ component: ProgressBarComponent,
+ tags: ['autodocs'],
+ decorators: [
+ moduleMetadata({
+ declarations: [],
+ imports: [CommonModule],
+ }),
+ ],
+ argTypes: {},
+};
+
+export default meta;
+type Story = StoryObj<ProgressBarComponent>;
+
+export const ProgressBar: Story = {
+ args: {
+ currentPage: 5,
+ formType: formType.account,
+ nbSteps: 15,
+ },
+ argTypes: {
+ currentPage: {
+ type: 'number',
+ description: 'Play with this value to see the animation of the progress',
+ control: {
+ type: 'range',
+ min: 0,
+ max: 15,
+ },
+ },
+ },
+};
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.scss b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.scss
deleted file mode 100644
index 46e81fc093176def48681a01e61f2bd8cd3435b4..0000000000000000000000000000000000000000
--- a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'buttons';
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts
index 9ee5fc01ea1334270d185dec0b2443157d7d08c5..d9d4b13619a9ff9874aec44be39a8a9009ba2a91 100644
--- a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts
+++ b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts
@@ -5,7 +5,6 @@ import { Category } from '../../../../structure-list/models/category.model';
@Component({
selector: 'app-personal-offer-accompaniment',
templateUrl: './personal-offer-accompaniment.component.html',
- styleUrls: ['./personal-offer-accompaniment.component.scss'],
})
export class PersonalOfferAccompanimentComponent implements OnInit {
@Input() structureName: string;
diff --git a/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html b/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html
index 423bc9fec420c5704540b1804f88eeb02b6d93fe..e749780fe81e2c5be0807a11bd5ee8669276fc73 100644
--- a/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html
+++ b/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html
@@ -4,8 +4,8 @@
<p>Cette information sera visible dans l’annuaire des acteurs, accessible uniquement en version connectée</p>
</div>
<div fxLayout="column" fxLayoutGap="32px">
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let job of jobs"
[iconFolder]="'ico'"
[iconName]="isSelectedJob(job) ? 'check' : null"
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
index e865c69c04ae3ea4906d9195af90320d8284cdba..708beea1acaa687ac6963c87734c81c063ae41ba 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
@@ -1,7 +1,7 @@
<form>
<h2 class="title">Dans quelle structure travaillez-vous ?</h2>
<div class="content">
- <app-v3-search-bar
+ <app-search-bar
placeholder="Rechercher une structure"
[(value)]="searchString"
(valueChange)="onSearchChange($event)"
@@ -43,7 +43,7 @@
*ngIf="isSelectedStructure(structure)"
class="form-icon"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<div *ngIf="structure.alreadySelected" class="sticker">Déjà<br />sélectionnée</div>
@@ -55,11 +55,11 @@
Cette structure n’existe pas encore sur Rés'in.<br />
<span class="question">Souhaitez-vous la référencer ?</span>
</div>
- <app-v3-button
+ <app-button
[label]="'Créer une structure'"
[variant]="'primaryBlack'"
[wide]="true"
- [iconName]="'add'"
+ [iconName]="'plus'"
(action)="addStructure()"
/>
</div>
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
index 3f30f02c459f318373a797efedc82ae7909f3663..fdf5dc0980c1e3e3d9f23402b5637c1cd0ebdc32 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
@@ -24,6 +24,10 @@
padding-right: 12px;
}
+.content {
+ width: 600px;
+}
+
.scroll {
box-sizing: border-box;
height: 50vh;
diff --git a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
index 83433bbf59718380445004330140858ef98cb85b..961a52f7ffe353defa66c077c72a46994e6aea6d 100644
--- a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
+++ b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html
@@ -5,7 +5,7 @@
<p>Plusieurs choix possibles</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('categories').get('accessModality').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner au moins un champ</span>
</p>
<div *ngIf="accessModality" class="modality">
diff --git a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
index afddcb27a16d193070736b0d800bde676e210748..c0d833c40db2a97bf5314736b5feffc4d86f3a63 100644
--- a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
+++ b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html
@@ -18,7 +18,7 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonFirstname').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
</div>
@@ -37,7 +37,7 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonLastname').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
</div>
@@ -56,13 +56,13 @@
<app-svg-icon
*ngIf="structureForm.get('contactPersonEmail').valid"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="structureForm.get('contactPersonEmail').invalid && structureForm.get('contactPersonEmail').value"
[iconClass]="'icon-26'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
diff --git a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
index 090c68394e8cde087ac1a615a2ff5fd8fb8f722b..94d9e035dec9202344cc9f414c7eb346f5bfcc7e 100644
--- a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
+++ b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
@@ -8,7 +8,7 @@
id="covid"
label=""
placeholder="Exemple : nous ne sommes joignables que par visio"
- [value]="getStructureControl('lockdownActivity').value || ''"
+ [value]="getStructureControl('lockdownActivity').value"
(valueChange)="getStructureControl('lockdownActivity').setValue($event)"
/>
</form>
diff --git a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
index ec2dfc72aa8154b6d1b903b5089be872540030f8..49f0669aaad46f7ebb4d10b64f321d3c26619d48 100644
--- a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
+++ b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
@@ -7,7 +7,7 @@
<app-textarea
id="description"
label="Description"
- [value]="getStructureControl('description').value || ''"
+ [value]="getStructureControl('description').value"
(valueChange)="getStructureControl('description').setValue($event)"
/>
</form>
diff --git a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html
index 589eb83ada0bbb1099a17d84c1b9e0138985a057..54e54a9e0008b284f64a447548baf9f0d1cc61a2 100644
--- a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html
+++ b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html
@@ -4,8 +4,8 @@
<h3>La structure propose-t-elle une aide gratuite<sup>*</sup> aux démarches en ligne ?</h3>
<p>Facultatif - Plusieurs choix possibles</p>
</div>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let accompaniment of onlineProcedures.modules"
[iconName]="isInArray(accompaniment.id) ? 'check' : null"
[label]="accompaniment.name"
diff --git a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts
index 8bc10c09440709b895f1490879567d3cb094c3a3..d04a20883ea738b0c743b9c1c82726d5ba3b7d59 100644
--- a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts
+++ b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
import { Category } from '../../../../structure-list/models/category.model';
@Component({
@@ -14,8 +13,6 @@ export class StructureDigitalHelpingAccompanimentComponent implements OnInit {
@Output() updateChoice = new EventEmitter<any>();
@Output() validateForm = new EventEmitter<any>();
- public buttonTypeEnum = ButtonType;
-
ngOnInit(): void {
this.validateForm.emit();
}
diff --git a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
index 1e2ceb645547d62941fcfbec77913db65718b864..309483ee92e590e2a448c10fc4c2f2eb42a21fd3 100644
--- a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
+++ b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
@@ -11,10 +11,9 @@
<div class="inputSection">
<ng-container *ngIf="equipment.module.id === 'computer'">
- <app-v3-icon-button
+ <app-icon-button
[variant]="'primaryBlack'"
- [iconFolder]="'form'"
- [iconName]="'hide'"
+ [iconName]="'minus'"
[iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbComputers === 0"
@@ -32,10 +31,9 @@
/>
</ng-container>
<ng-container *ngIf="equipment.module.id === 'printer'">
- <app-v3-icon-button
+ <app-icon-button
[variant]="'primaryBlack'"
- [iconFolder]="'form'"
- [iconName]="'hide'"
+ [iconName]="'minus'"
[iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbPrinters === 0"
@@ -53,10 +51,9 @@
/>
</ng-container>
<ng-container *ngIf="equipment.module.id === 'scanner'">
- <app-v3-icon-button
+ <app-icon-button
[variant]="'primaryBlack'"
- [iconFolder]="'form'"
- [iconName]="'hide'"
+ [iconName]="'minus'"
[iconColor]="'currentColor'"
[size]="'medium'"
[disabled]="structureForm.value.nbScanners === 0"
@@ -73,10 +70,9 @@
(input)="setValidationsForm()"
/>
</ng-container>
- <app-v3-icon-button
+ <app-icon-button
[variant]="'primaryBlack'"
- [iconFolder]="'form'"
- [iconName]="'show'"
+ [iconName]="'plus'"
[iconColor]="'currentColor'"
[size]="'medium'"
(click)="changeValueHandler(equipment.module.id, 1)"
diff --git a/src/app/form/form-view/structure-form/structure-form.component.ts b/src/app/form/form-view/structure-form/structure-form.component.ts
index 769824f364ebac0aa65daa18db9c501427148161..dc85a4ee18b823c2b406bfb7601e850e275e656b 100644
--- a/src/app/form/form-view/structure-form/structure-form.component.ts
+++ b/src/app/form/form-view/structure-form/structure-form.component.ts
@@ -180,7 +180,7 @@ export class StructureFormComponent implements OnChanges, OnInit {
valid: this.structureForm.get('freeWorkShop').valid,
};
this.pagesValidation[structureFormStep.structureWifi] = {
- valid: this.structureForm.get('categories').get('selfServiceMaterial').valid,
+ valid: this.structureForm.get('freeWifi').valid,
};
this.pagesValidation[structureFormStep.structureEquipments] = {
valid:
diff --git a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
index b4eeeebe4b73ba99bfc1a89113916f8df9c0eb40..2b896e8e7c13417e80c91a2b6817ee4f2587b920 100644
--- a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
+++ b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
@@ -18,7 +18,7 @@
<app-textarea
id="hoursDetails"
label="Informations supplémentaires"
- [value]="structureForm.get('exceptionalClosures').value || ''"
+ [value]="structureForm.get('exceptionalClosures').value"
(valueChange)="structureForm.get('exceptionalClosures').setValue($event)"
/>
</form>
diff --git a/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html b/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html
index 68c7f1185da50801886f2669af07daea2c3f503a..b54bc80a592a49db29fc006f9924fb2f706a587b 100644
--- a/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html
+++ b/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html
@@ -3,7 +3,7 @@
<div class="title">
<h3>Quels sont le nom et l'adresse de cette structure ?</h3>
</div>
- <div class="formGroup" style="max-width: 300px">
+ <div class="formGroup">
<app-input
id="name"
label="Nom"
@@ -12,13 +12,12 @@
[value]="structureForm.get('structureName').value"
(valueChange)="structureForm.get('structureName').setValue($event); setValidationsForm()"
/>
- <div class="addressRow">
- <app-address-autocomplete
- [form]="structureForm"
- [address]="structureForm.get('address').valid ? structureForm.get('address').value : null"
- (inputAddress)="setAddressStructure()"
- (selectedAddress)="setAddressStructure($event)"
- />
- </div>
+
+ <app-address-autocomplete
+ [form]="structureForm"
+ [address]="structureForm.get('address').valid ? structureForm.get('address').value : null"
+ (inputAddress)="setAddressStructure()"
+ (selectedAddress)="setAddressStructure($event)"
+ />
</div>
</form>
diff --git a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html
index a85a7354b8c798985861a65bcf9fe86ad519e951..301aebe636c73c1bdc1eb98f05533d609777a298 100644
--- a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html
+++ b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html
@@ -6,7 +6,7 @@
<app-textarea
id="otherTextarea"
label="Autres démarches"
- [value]="structureForm.get('otherDescription').value || ''"
+ [value]="structureForm.get('otherDescription').value"
(valueChange)="structureForm.get('otherDescription').setValue($event)"
/>
</form>
diff --git a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.ts b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.ts
index d5950865f0a2f1623d2929c7416e9565e3907845..4b162a4619b8c07c8017bf9e3da079ddc504cd33 100644
--- a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.ts
+++ b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { AbstractControl, UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
@Component({
selector: 'app-structure-public-target-other',
@@ -12,8 +11,6 @@ export class StructureDigitalHelpingAccompanimentOtherComponent implements OnIni
@Output() updateChoice = new EventEmitter<any>();
@Output() validateForm = new EventEmitter<any>();
- public buttonTypeEnum = ButtonType;
-
ngOnInit(): void {
this.validateForm.emit();
}
diff --git a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
index 5dc593c436fa2459c051bf1062f189e2efcdf747..1f7906c5dd85c94687e253c77a254d26013e8c79 100644
--- a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
+++ b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html
@@ -11,14 +11,14 @@
<p>{{ isMandatoryFields ? '' : 'Facultatif - ' }}Plusieurs choix possibles</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('categories').get('age').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner au moins un champ</span>
</p>
<ng-container *ngIf="!isMandatoryFields">
<div *ngIf="languageAndIlliteracy" class="title" style="gap: 12px">
<h4>Langue et illettrisme</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let choice of languageAndIlliteracy.modules"
[iconName]="isInArray(choice.id, 'languageAndIlliteracy') ? 'check' : null"
[label]="choice.name"
@@ -30,8 +30,8 @@
</div>
<div *ngIf="handicaps" class="title" style="gap: 12px">
<h4>Handicaps</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let choice of handicaps.modules"
[iconName]="isInArray(choice.id, 'handicaps') ? 'check' : null"
[label]="choice.name"
@@ -43,8 +43,8 @@
</div>
<div *ngIf="genre" class="title" style="gap: 12px">
<h4>Genre</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let choice of genre.modules"
[iconName]="isInArray(choice.id, 'genre') ? 'check' : null"
[label]="choice.name"
@@ -59,8 +59,8 @@
<ng-container *ngIf="isMandatoryFields">
<div *ngIf="age" class="title" style="gap: 12px">
<h4>Âge</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let choice of age.modules"
[iconName]="isInArray(choice.id, 'age') ? 'check' : null"
[label]="choice.name"
diff --git a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.ts b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.ts
index 79560c5ede1310eb2b4c2687e04d36041a77ba36..09d86a0c36bcd6c580cbd84111ed3dfdc3acb4f8 100644
--- a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.ts
+++ b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
import { Category } from '../../../../structure-list/models/category.model';
@Component({
@@ -18,8 +17,6 @@ export class StructurePublicTargetComponent implements OnInit, OnChanges {
@Output() updateChoice = new EventEmitter<any>();
@Output() validateForm = new EventEmitter<any>();
- public buttonTypeEnum = ButtonType;
-
ngOnInit(): void {
this.validateForm.emit();
}
diff --git a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html
index 2058d4253eb56cfd4c39fb027d6484aaa02e8eda..245ab00233d2aff54aeea024a44e9cb3ceb1ac74 100644
--- a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html
+++ b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html
@@ -5,8 +5,8 @@
<p>Facultatif - Plusieurs choix possibles</p>
</div>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let material of solidarityMaterial.modules"
[iconName]="isInArray(material.id) ? 'check' : null"
[label]="material.name"
diff --git a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.ts b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.ts
index 3a860cd0b42bfec7ef65402bcac5902f8a93442a..4fd5b441c1ab7193de9dcabda5957f8761250951 100644
--- a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.ts
+++ b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
import { Category } from '../../../../structure-list/models/category.model';
@Component({
@@ -14,8 +13,6 @@ export class StructureSolidarityMaterialComponent implements OnInit {
@Output() updateChoice = new EventEmitter<any>();
@Output() validateForm = new EventEmitter<any>();
- public buttonTypeEnum = ButtonType;
-
ngOnInit(): void {
this.validateForm.emit();
}
diff --git a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
index 28032a7974546cc161c677abbc2b3cf5cf08fa08..7384aac97ff539715ce3fa6bc0f02dccba39755e 100644
--- a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
+++ b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
@@ -10,7 +10,7 @@
<div class="inputSection">
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'website'"
[iconClass]="'icon-36'"
[ngClass]="{
@@ -38,7 +38,7 @@
<div class="inputSection">
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'x'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -61,7 +61,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'facebook'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -84,7 +84,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'linkedin'"
[iconClass]="'icon-36'"
[class.icon-centered]="
@@ -107,7 +107,7 @@
<div class="row">
<app-svg-icon
- [type]="'tags'"
+ [folder]="'tags'"
[icon]="'instagram'"
[iconClass]="'icon-36'"
[class.icon-centered]="
diff --git a/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.ts b/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.ts
index 818d0a8b842d47412b92e0bb27b1b41121c1db41..d09ef61d17ada8f91c9e1d3e28aacf495a8a020b 100644
--- a/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.ts
+++ b/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.ts
@@ -16,7 +16,6 @@ export class StructureWifiComponent implements OnInit {
public formUtils = new FormUtils();
ngOnInit(): void {
this.validateForm.emit();
- console.log('freewifi', this.structureForm.get('freeWifi').value);
}
public isInArray(formControlName: string, term: string): boolean {
return this.formUtils.isInCategoryArray(term, formControlName, this.structureForm);
diff --git a/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html b/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html
index a4a8701d01470f44716ff0d73201e450b432fd0c..e96a93e369826f08071569e58a569f86f308781f 100644
--- a/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html
+++ b/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html
@@ -1,8 +1,8 @@
<div class="orientationForm">
- <h2>Quel est le besoin numérique de la personne ?</h2>
+ <h2>Quel est le besoin numérique de la personne ?</h2>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let module of baseSkills"
[label]="module.name"
[disabled]="module.disabled"
diff --git a/src/app/form/orientation-form-view/enums/orientation.enums.ts b/src/app/form/orientation-form-view/enums/orientation.enums.ts
index 84c3b9ee735f96da242792bb6212e0e9006f6baf..ef4c4b7b12a03e695066d552ef8d7a3458379f31 100644
--- a/src/app/form/orientation-form-view/enums/orientation.enums.ts
+++ b/src/app/form/orientation-form-view/enums/orientation.enums.ts
@@ -1,12 +1,13 @@
export enum AppointmentSteps {
infoScreen,
- structureOrientator,
pmrAccess,
location,
carto,
makeAppointment,
mediationBeneficiaryInfo,
+ structureOrientator,
rdvEnd,
+ orientationRecap,
}
export enum FiltersSteps {
@@ -23,7 +24,11 @@ export enum HotlineMediationSteps {
mediationBeneficiaryInfo,
mediationHoursSelection,
mediationLanguageSelection,
+ comments,
+ structureOrientator,
orientationRecap,
+ rdvEnd,
+ orientationPrint,
}
export enum OnlineDemarche {
@@ -50,6 +55,7 @@ export enum PreferredLanguages {
arabic = 'Arabe',
}
export enum RecapsType {
+ appointment,
onlineMediation,
structure,
}
@@ -58,8 +64,8 @@ export enum StructuresListSteps {
pmrAccess,
address,
structureChoice,
- structureOrientator,
mediationBeneficiaryInfo,
comments,
+ structureOrientator,
orientationRecap,
}
diff --git a/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html b/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html
index af9b46e97722b52c7f59bf4e79b4a9c5277e5197..f759cf5670c6d884f3a4949d9eb49c2f2c6fbfbb 100644
--- a/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html
+++ b/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html
@@ -1,8 +1,8 @@
<div class="orientationForm">
- <h2>Quel matériel la personne a-t-elle besoin d'utiliser ?</h2>
+ <h2>Quel matériel la personne a-t-elle besoin d'utiliser ?</h2>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let module of equipmentType"
[label]="module.name"
[color]="isSelectedModule(module.id) ? 'black' : 'white'"
diff --git a/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html b/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html
index ee797a06f1decff72d96ed085a4a373365595faf..a4782040e02a14999b1f9782723e41aa538e4534 100644
--- a/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html
+++ b/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html
@@ -1,8 +1,8 @@
<div class="orientationForm">
- <h2>Quel matériel la personne souhaite-t-elle acheter à tarif solidaire ?</h2>
+ <h2>Quel matériel la personne souhaite-t-elle acheter à tarif solidaire ?</h2>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let module of equipmentType"
[label]="module.name"
[color]="isSelectedModule(module.id) ? 'black' : 'white'"
diff --git a/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.html b/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.html
index b6e6110eefaf983c0f2f712cce8f2cdbd5c52537..6d9cd7560388925507db04307b5eaef4dbc1ceae 100644
--- a/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.html
+++ b/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.html
@@ -1,18 +1,20 @@
-<div *ngIf="currentType === currentTypeEnum.appointment" class="container">
- <img src="../../../../../assets/img/rdvsBeginning.svg" alt="" />
- <h2>Vous vous apprêtez à demander un rendez-vous auprès d'un·e accompagnant·e numérique</h2>
- <p>
- Ces professionnel·les peuvent aider à la prise en main des services administratifs en ligne, mais ne sont pas
- expert·es de l’accès aux droits. Si la personne a besoin d’aide sur le fond d’une démarche administrative, merci de
- l’orienter vers un lieu du type “Maison France Service”.
- </p>
-</div>
-<div *ngIf="currentType === currentTypeEnum.onlineMediation" class="container">
- <img src="../../../../../assets/img/onlineMediationBeginning.svg" alt="" />
- <h2>Vous vous apprêtez à choisir un créneau de médiation numérique à distance</h2>
- <p>
- Ce service d’accompagnement permettra à la personne d'être assistée depuis son domicile dans ses usages numériques.
- <br />
- La personne sera recontactée par un médiateur ou une médiatrice sur le créneau choisi.
- </p>
+<div class="container">
+ <img src="../../../../../assets/img/orientationBeginning.svg" alt="" />
+ <ng-container *ngIf="currentType === currentTypeEnum.appointment">
+ <h2>Vous vous apprêtez à demander un rendez-vous auprès d'un·e accompagnant·e numérique</h2>
+ <p>
+ Ces professionnel·les peuvent aider à la prise en main des services administratifs en ligne, mais ne sont pas
+ expert·es de l’accès aux droits. Si la personne a besoin d’aide sur le fond d’une démarche administrative, merci
+ de l’orienter vers un lieu du type “Maison France Service”.
+ </p>
+ </ng-container>
+ <ng-container *ngIf="currentType === currentTypeEnum.onlineMediation">
+ <h2>Vous vous apprêtez à choisir un créneau de médiation numérique à distance</h2>
+ <p>
+ Ce service d’accompagnement permettra à la personne d'être assistée depuis son domicile dans ses usages
+ numériques.
+ <br />
+ La personne sera recontactée par un médiateur ou une médiatrice sur le créneau choisi.
+ </p>
+ </ng-container>
</div>
diff --git a/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.scss b/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.scss
index 00cf038cd14635c1e121bbc660a05ca1ea31694c..b84ac9292a0a4d19c0d4fc52285754d18f89f582 100644
--- a/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.scss
+++ b/src/app/form/orientation-form-view/global-components/information-screen/information-screen.component.scss
@@ -1,3 +1,5 @@
+@import 'typography';
+
.container {
display: flex;
flex-direction: column;
@@ -5,8 +7,12 @@
text-align: center;
justify-content: center;
height: 90%;
+ max-width: 600px;
h2 {
margin-top: 2rem;
margin-bottom: 0.5rem;
}
+ p {
+ @include font-regular-18;
+ }
}
diff --git a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html
index 6b81610cd156f6e13a5ab18174aea2fc53c1cb2e..6fba5574a5ab24e8370f46f073191e5120e15ff5 100644
--- a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html
+++ b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html
@@ -1,13 +1,13 @@
<div class="footerForm">
<ng-container *ngIf="!shouldResetOrientation">
- <app-v3-button
+ <app-button
*ngIf="currentStep !== null && !(isLastStep && needType === 'onlineDemarch')"
[variant]="'secondary'"
[label]="'Précédent'"
[iconName]="'arrowBack'"
(action)="prevPage()"
/>
- <app-v3-button
+ <app-button
*ngIf="!hideNavButtons"
[variant]="'primary'"
[label]="isLastStep ? 'Terminer' : 'Suivant'"
@@ -18,7 +18,7 @@
/>
</ng-container>
<ng-container *ngIf="shouldResetOrientation">
- <app-v3-button [variant]="'secondary'" [label]="'Cartographie'" (action)="goCarto()" />
- <app-v3-button [variant]="'primary'" [label]="'Recommencer'" (action)="resetOrientation()" />
+ <app-button [variant]="'secondary'" [label]="'Cartographie'" (action)="goCarto()" />
+ <app-button [variant]="'primary'" [label]="'Recommencer'" (action)="resetOrientation()" />
</ng-container>
</div>
diff --git a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss
index 507e8881755c04a69afb01cc69933f1e4828f0bf..6be85e259273c7e37c4fdaf7f05444d14bf904b9 100644
--- a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss
+++ b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss
@@ -1,9 +1,13 @@
+@import 'color';
+
.footerForm {
display: flex;
justify-content: center;
gap: 2rem;
padding-top: 2rem;
padding-bottom: 40px;
+ border-top: 1px solid $grey-7;
+ width: 100%;
@media print {
display: none !important;
}
diff --git a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html
index 9d7dd1fdde49b67ac3c27bccc89de9ce64999835..98778d9e3d2bcb19cb568afc472d420a384bde01 100644
--- a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html
+++ b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html
@@ -1,6 +1,6 @@
<div class="orientationForm">
<div class="title">
- <h2>Quels sont les besoins de la personne ?</h2>
+ <h2>Quels sont les besoins de la personne ?</h2>
<p>Un seul choix possible</p>
</div>
<div class="formGroup">
diff --git a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.ts b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.ts
index f69e882d5a2b9f0bb01c3f702cf691383d81d2d7..544db2f1b3950f12a9315640e2211a24476d4412 100644
--- a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.ts
+++ b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.ts
@@ -30,7 +30,7 @@ export class NeedsSelectionComponent implements OnInit {
},
{
title: 'Réaliser une démarche en ligne',
- hint: '(Démarche Caf, CPAM, Pôle emploi…)',
+ hint: '(Démarche Caf, CPAM, France Travail…)',
key: NeedsType.onlineDemarch,
icon: 'orientationIndex2',
},
diff --git a/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.ts b/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.ts
index d6f6f83d22a1b67ee84c2d81a488fd005d5a71e6..de9cc90c3c0324f10809ed95257c008db608ce3c 100644
--- a/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.ts
+++ b/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.ts
@@ -1,8 +1,10 @@
import { DatePipe } from '@angular/common';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
+import { Owner } from '../../../../models/owner.model';
import { Structure } from '../../../../models/structure.model';
import { Module } from '../../../../structure-list/models/module.model';
+import { Utils } from '../../../../utils/utils';
import { RecapsType } from '../../enums/orientation.enums';
@Component({
@@ -13,20 +15,29 @@ import { RecapsType } from '../../enums/orientation.enums';
export class OrientationRecapComponent implements OnInit {
@Input() form: UntypedFormGroup;
@Input() recapType: RecapsType;
+ @Input() socialWorker?: Owner;
+ @Input() structureRDV?: Structure;
@Output() checkValidation = new EventEmitter<any>();
+ public utils = new Utils();
public needs: Module[];
public structuresToPrint: Structure[];
public orientator: { structureName: string; structureMail: string; structurePhone: string };
public comment: string;
- public beneficiary: any;
+ public beneficiary: { name: string; surname: string };
public recap: { day: string; hours: string; month: string; language?: string };
constructor(private datePipe: DatePipe) {}
ngOnInit(): void {
this.checkValidation.emit();
- this.needs = this.form.get('filters').value;
+ // When requesting for an appointments, we save Filters within the form 'onlineDemarcheType',
+ // instead of Modules within the form 'filters'. This harmonizes it.
+ if (this.recapType === RecapsType.appointment) {
+ this.needs = this.utils.convertFiltersToModule(this.form.get('onlineDemarcheType').value);
+ } else {
+ this.needs = this.form.get('filters').value;
+ }
this.beneficiary = {
name: this.form.get('name').value,
surname: this.form.get('surname').value,
@@ -35,6 +46,9 @@ export class OrientationRecapComponent implements OnInit {
case RecapsType.onlineMediation:
this.handleOnlineOrientationRecap();
break;
+ case RecapsType.appointment:
+ this.handleAppointmentRecap();
+ break;
case RecapsType.structure:
this.handleStructureRecap();
break;
@@ -43,6 +57,15 @@ export class OrientationRecapComponent implements OnInit {
}
}
+ public shouldDisplayAppointmentRecap(): boolean {
+ return this.recapType === RecapsType.appointment;
+ }
+
+ public handleAppointmentRecap(): void {
+ this.comment = this.form.get('details').value;
+ this.orientator = this.form.get('structureOrientator').value;
+ }
+
public handleStructureRecap(): void {
this.comment = this.form.get('comments').value;
this.structuresToPrint = this.form.get('structureChoice').value;
@@ -50,10 +73,12 @@ export class OrientationRecapComponent implements OnInit {
}
public isOrientator(): boolean {
- return this.orientator?.structureName ? true : false;
+ return !!this.orientator?.structureName;
}
public handleOnlineOrientationRecap(): void {
+ this.comment = this.form.get('comments').value;
+ this.orientator = this.form.get('structureOrientator').value;
const monthNumber = parseInt(this.form.get('dateSlot').value.day.slice(-2));
const monthName = this.datePipe.transform(`2000-${monthNumber}-01`, 'MMMM', 'fr');
diff --git a/src/app/form/orientation-form-view/global-components/select/select.component.ts b/src/app/form/orientation-form-view/global-components/select/select.component.ts
index 77b5174178097bd4b18cad890e07ca9a9449346c..aa11c141e66df456f12ddc1c445d91936b29352d 100644
--- a/src/app/form/orientation-form-view/global-components/select/select.component.ts
+++ b/src/app/form/orientation-form-view/global-components/select/select.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
import { Module } from '../../../../structure-list/models/module.model';
@Component({ template: `` })
@@ -9,7 +8,6 @@ export class SelectComponent {
@Output() checkValidation = new EventEmitter<any>();
public equipmentType: Module[] = [];
public selectedModules: Module[] = [];
- public buttonTypeEnum = ButtonType;
public handleClick(module: Module): void {
if (this.isSelectedModule(module.id)) {
diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
index 41a5db1a2f0855e72ee0b77461bca624bdaf6a9b..8d4a13890441671f3dcc57e549ef224900d73ab5 100644
--- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
+++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html
@@ -1,105 +1,68 @@
<div class="orientationForm">
- <h2>Quelle structure oriente la personne ?</h2>
- <div *ngIf="hasStructures && structuresLinked.length >= 2" class="select-structure border">
- <div class="number">{{ structuresLinked.length }} structures sont associées à votre compte</div>
- <div
- *ngFor="let structure of structuresLinked"
- class="structure-item"
- tabindex="0"
- [ngClass]="{ 'item-selected': structure.structureName === selected?.structureName }"
- (click)="select(structure)"
- (keyup.enter)="select(structure)"
- >
- <div class="item-frame">
- <div class="name">{{ structure.structureName }}</div>
- <div class="commune">{{ structure.address.commune }}</div>
- </div>
- <app-svg-icon
- *ngIf="structure.structureName === selected?.structureName"
- class="form-icon"
- [iconClass]="'icon-26'"
- [type]="'form'"
- [icon]="'validate'"
- />
+ <div class="orientation-header">
+ <h2>Quelle structure oriente la personne ?</h2>
+ <div *ngIf="hasStructures && structuresLinked.length >= 2" class="number">
+ {{ structuresLinked.length }} structures sont associées à votre compte
</div>
</div>
- <div *ngIf="!hasStructures" class="select-structure">
+
+ <!-- User is connected and belong to several structures -->
+ <section *ngIf="hasStructures && structuresLinked.length >= 2">
+ <app-member-card [member]="profile" [showContactInfo]="false" [showEmployer]="false" [redirectToProfile]="false" />
+
+ <div class="structures-section">
+ <p>Sélectionnez la structure de votre choix</p>
+
+ <div class="list-structures">
+ <app-card
+ *ngFor="let structure of structuresLinked"
+ role="listitem"
+ [structure]="structure"
+ [redirectToStructure]="false"
+ [showRadioButton]="true"
+ [isChecked]="structure._id === selected?._id"
+ (selectedStructure)="select(structure)"
+ />
+ </div>
+ </div>
+ </section>
+
+ <!-- User is not connected-->
+ <div *ngIf="!hasStructures">
<form [formGroup]="form">
- <div>
- <div class="form-group" fxLayout="column">
- <label for="structureName">Nom de votre structure</label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="text"
- autocomplete="on"
- formControlName="structureName"
- class="form-input"
- (input)="updatedForm('structureName', $event.target)"
- />
- <app-svg-icon
- *ngIf="form.get('structureName').value && form.get('structureName').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="form.get('structureName').value && !form.get('structureName').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
- <div class="form-group" fxLayout="column">
- <label for="structureMail">Email de votre structure</label>
- <p class="notRequired">Facultatif</p>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="text"
- autocomplete="on"
- formControlName="structureMail"
- class="form-input"
- (input)="updatedForm('structureMail', $event.target)"
- />
- <app-svg-icon
- *ngIf="form.get('structureMail').value && form.get('structureMail').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="form.get('structureMail').value && !form.get('structureMail').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
- <div class="form-group" fxLayout="column">
- <label for="structurePhone">Téléphone de votre structure</label>
- <p class="notRequired">Facultatif</p>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="phone"
- autocomplete="on"
- formControlName="structurePhone"
- class="form-input"
- (input)="updatedForm('structurePhone', $event.target)"
- />
- <app-svg-icon
- *ngIf="form.get('structurePhone').value && form.get('structurePhone').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="form.get('structurePhone').value && !form.get('structurePhone').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+ <div class="formGroup">
+ <app-input
+ id="structureName"
+ label="Nom de votre structure"
+ size="large"
+ [status]="form.get('structureName').value ? (form.get('structureName').invalid ? 'error' : 'success') : null"
+ [value]="form.get('structureName').value"
+ (valueChange)="updatedForm('structureName', $event)"
+ />
+
+ <app-input
+ id="structureMail"
+ label="Email de votre structure"
+ description="Facultatif"
+ autocomplete="on"
+ size="large"
+ [status]="form.get('structureMail').value ? (form.get('structureMail').invalid ? 'error' : 'success') : null"
+ [value]="form.get('structureMail').value"
+ (valueChange)="updatedForm('structureMail', $event)"
+ />
+
+ <app-input
+ id="structurePhone"
+ label="Téléphone de votre structure"
+ description="Facultatif"
+ autocomplete="on"
+ size="large"
+ [status]="
+ form.get('structurePhone').value ? (form.get('structurePhone').invalid ? 'error' : 'success') : null
+ "
+ [value]="form.get('structurePhone').value"
+ (valueChange)="updatedForm('structurePhone', $event)"
+ />
</div>
</form>
</div>
diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
index 6bfd7b13eafef7e446cf6b03f515a3fdc6f8dd7e..93067451d1d441addc1c7dd8cd2c98bd2f879920 100644
--- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
+++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
@@ -3,55 +3,40 @@
@import 'inputs';
@import 'breakpoint';
-.select-structure {
- width: 380px;
+.orientation-header {
+ display: flex;
+ flex-direction: column;
+ gap: 16px;
.number {
- padding: 1rem;
color: $grey-3;
- @include font-regular-13;
- }
- &.border {
- border: solid 2px $grey-9;
- }
- .structure-item {
- cursor: pointer;
- padding-left: 1rem;
- height: 76px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border: solid 2px transparent;
- border-top-color: $grey-9;
-
- &:hover {
- .name {
- text-decoration: underline;
- }
- }
- &.item-selected {
- border: solid 2px $green-1;
- }
+ @include font-regular-18;
}
}
-.name {
- @include font-regular-16;
- font-weight: 600;
-}
+section {
+ border: 1px solid $grey-6;
+ border-radius: 8px;
-.commune {
- @include font-regular-13;
- font-style: italic;
- color: $grey-3;
- margin: 4px 0px 0px 0px;
+ ::ng-deep .structureMember {
+ border: 0px;
+ border-bottom: 1px solid $grey-6;
+ border-radius: 8px 8px 0px 0px;
+ }
}
-.form-icon {
- margin: 0px 24px;
+.structures-section {
display: flex;
- align-items: center;
-}
+ flex-direction: column;
+ gap: 16px;
+ padding: 16px;
+
+ p {
+ @include font-bold-16;
+ }
-.notRequired {
- margin-bottom: 0;
+ .list-structures {
+ display: flex;
+ flex-direction: column;
+ gap: 24px;
+ }
}
diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.ts b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.ts
index 56bc78f49134666bc5bc544df7d3bc0770307672..15b734f34375c64bc6ecefa5ccd86cdd530287ea 100644
--- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.ts
+++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.ts
@@ -49,10 +49,9 @@ export class StructureOrientatorComponent implements OnInit {
this.validatePage.emit(this.form.valid);
}
- public updatedForm(field: string, target: EventTarget): void {
- const value = (target as HTMLInputElement).value;
+ public updatedForm(field: string, value: string): void {
if (field === 'phone') {
- this.utils.modifyPhoneInput(this.form, 'phone', target);
+ this.utils.modifyPhoneInput(this.form, 'phone', value);
} else this.form.get(field).patchValue(value);
this.validatePage.emit(this.form.valid);
diff --git a/src/app/form/orientation-form-view/interfaces/onlineMediation.interface.ts b/src/app/form/orientation-form-view/interfaces/onlineMediation.interface.ts
index fd27e71f06510b951afa1a8b79951e701fe53541..0e761600309233bec1bab2410567ff8a69605820 100644
--- a/src/app/form/orientation-form-view/interfaces/onlineMediation.interface.ts
+++ b/src/app/form/orientation-form-view/interfaces/onlineMediation.interface.ts
@@ -5,4 +5,6 @@ export interface IOnlineMediation {
onlineDemarcheType: string[];
dateSlot: { day: string; hours: string };
preferredLanguage: string;
+ comment: string;
+ structureOrientator: { structureName: string; structureMail: string; structurePhone: string };
}
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.html b/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.html
index 8882e6fe1bdd0637d6f2cd50aac7f1649f331337..5f82bce506350dfffccb88bff2884a07e1beeeaf 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.html
@@ -1,6 +1,7 @@
-<div *ngIf="hasStructure" class="container">
+<!-- Appointment success -->
+<div *ngIf="!isOnlineMediation && hasStructure" class="container">
<img src="../../../../../../assets/form/structureCreated.svg" alt="rdv illustration" />
- <h2>Votre demande de rendez-vous a été transmise !</h2>
+ <h2>Votre demande de rendez-vous a été transmise !</h2>
<p>
La demande de <b>rendez-vous</b> a bien été transmise à
<b
@@ -11,8 +12,17 @@
<b>{{ structureRDV?.structureName || selectedStructureRDV?.structureName }}</b>
</p>
</div>
-<div *ngIf="!hasStructure" class="container">
- <img src="../../../../../../assets/img/joinRefused.svg" alt="rdv illustration" />
+
+<!-- Hotline appointment success -->
+<div *ngIf="isOnlineMediation" class="container">
+ <img src="../../../../../../assets/form/structureCreated.svg" alt="rdv illustration" />
+ <h2>Votre demande de médiation à distance a été transmise !</h2>
+ <p>La demande de <b>médiation à distance</b> a bien été transmise.</p>
+</div>
+
+<!-- No structure found -->
+<div *ngIf="!isOnlineMediation && !hasStructure" class="container">
+ <img src="../../../../../../assets/form/structureNegatif.svg" alt="rdv illustration" />
<h2>Aucune structure correspondant à votre recherche ne propose de rendez-vous</h2>
<p>Merci de renouveler votre recherche avec des critères différents ou accédez à la cartographie</p>
</div>
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.ts b/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.ts
index b259b9fc9389e98fb2926eb4dd16a1344eb39773..9688588a2ac43ea9bde9fa414ceb4da901ca240b 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.ts
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/appointment-end/appointment-end.component.ts
@@ -12,9 +12,10 @@ import { OrientationService } from '../../../../../services/orientation.service'
})
export class AppointmentEndComponent implements OnInit {
@Input() form: UntypedFormGroup;
- @Input() structureRDV: Structure;
- @Input() socialWorker: Owner;
- @Input() selectedStructureRDV: Structure;
+ @Input() structureRDV?: Structure;
+ @Input() socialWorker?: Owner;
+ @Input() selectedStructureRDV?: Structure;
+ @Input() isOnlineMediation = false;
@Output() setResetOrientation = new EventEmitter();
@Output() checkValidation = new EventEmitter<any>();
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
index 50c0e1c427156c38f2fc32dd9061ab6fdaf1d925..9a7899abfa90c7146270eb20ccb5d495005b68cf 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html
@@ -1,112 +1,68 @@
-<form *ngIf="owners?.length > 0 || (structures?.length > 0 && structuresListReady)" [formGroup]="form">
+<form
+ *ngIf="owners?.length > 0 || (structures?.length > 0 && structuresListReady)"
+ class="orientationForm"
+ [formGroup]="form"
+>
<div class="title">
- <h3>Vous allez demander un rendez-vous :</h3>
+ <h3>Vous allez demander un rendez-vous avec :</h3>
</div>
- <div *ngIf="owners?.length > 0">
- <div class="header" tabindex="0" fxLayout="column">
- <app-card
- class="structure-card"
- role="listitem"
- [noDetails]="true"
- [structure]="structureRDV"
- [isOrientation]="false"
- [isOrientationRdv]="false"
- [isInteractive]="false"
- />
+ <!-- If need to select a social worker -->
+ <section *ngIf="owners?.length > 0">
+ <div class="header-card">
+ <app-card [structure]="structureRDV" [redirectToStructure]="false" />
</div>
- <div class="selectList">
- <h4>Sélectionnez un·e accompagnant·e numérique</h4>
- <div
- *ngFor="let owner of owners"
- class="card-single selected"
- fxLayout="row"
- fxLayoutAlign="left center"
- fxLayoutGap="16px"
- [ngClass]="{ selected: this.form.get('socialWorkerId')?.value === owner._id }"
- >
- <input
- type="radio"
- formControlName="socialWorkerId"
- id="{{ owner._id }}"
- value="{{ owner._id }}"
- (change)="onSocialWorkerRadioChange(owner)"
+ <div class="picker-section">
+ <p>Sélectionnez un·e accompagnant·e numérique</p>
+ <div class="list-choices">
+ <app-member-card
+ *ngFor="let owner of owners"
+ role="listitem"
+ [member]="owner"
+ [showContactInfo]="false"
+ [showEmployer]="false"
+ [redirectToProfile]="false"
+ [showRadioButton]="true"
+ [isChecked]="this.form.get('socialWorkerId')?.value === owner._id"
+ (selectedCard)="onSocialWorkerRadioChange(owner)"
/>
- <label for="{{ owner._id }}">
- <app-svg-icon class="" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
- <div fxLayout="column" fxLayoutAlign="start">
- <div fxLayout="row" class="selectListNameContainer">
- <span class="selectListName">{{ owner.name | userName }} {{ owner.surname | uppercase }}</span>
- </div>
- <span class="selectListJob">{{ owner.job?.name }}</span>
- </div>
- </label>
</div>
</div>
- </div>
+ </section>
- <div *ngIf="structures?.length > 0">
- <div class="header" tabindex="0" fxLayout="column">
- <div fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
- <div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px">
- <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
- <div fxLayout="column" fxLayoutAlign="end">
- <div fxLayout="row" class="headerNameContainer">
- <span class="headerName"
- >{{ orientationService.rdvUser.name | userName }}
- {{ orientationService.rdvUser.surname | uppercase }}</span
- >
- </div>
- <span class="headerType">{{ orientationService.rdvUser.job.name }}</span>
- </div>
- </div>
- </div>
+ <!-- If need to select a structure -->
+ <section *ngIf="structures?.length > 0">
+ <div class="header-card">
+ <app-member-card
+ [member]="orientationService.rdvUser"
+ [showContactInfo]="false"
+ [showEmployer]="false"
+ [redirectToProfile]="false"
+ />
</div>
- <div class="selectList">
- <h4>Sélectionnez la structure de votre choix</h4>
- <div
- *ngFor="let structure of structures"
- class="card-single structure-single selected"
- fxLayout="row"
- fxLayoutAlign="left center"
- fxLayoutGap="16px"
- [ngClass]="{ selected: selectedOption === structure._id }"
- >
- <input
- type="radio"
- formControlName="structureRDV"
- id="{{ structure._id }}"
- value="{{ structure._id }}"
- (change)="onStructureRadioChange(structure)"
+ <div class="picker-section">
+ <p>Sélectionnez la structure de votre choix</p>
+
+ <div class="list-choices">
+ <app-card
+ *ngFor="let structure of structures"
+ role="listitem"
+ [structure]="structure"
+ [redirectToStructure]="false"
+ [showRadioButton]="true"
+ [isChecked]="selectedOption === structure._id"
+ (selectedStructure)="onStructureRadioChange(structure)"
/>
- <label class="listCards" for="{{ structure._id }}">
- <app-card
- class="structure-card"
- role="listitem"
- [noDetails]="true"
- [structure]="structure"
- [isOrientation]="false"
- [isOrientationRdv]="false"
- (change)="onStructureRadioChange(structure)"
- />
- </label>
</div>
</div>
- </div>
+ </section>
- <div class="details">
- <label for="details-field">Précisez les besoins de la personne (disponibilités...) :</label>
- <div fxLayout="row" fxLayoutAlign="left center" fxLayoutGap="16px">
- <textarea
- formControlName="details"
- id="details"
- name="details-field"
- rows="10"
- maxlength="1000"
- (change)="onDetailsChange()"
- ></textarea>
- </div>
- </div>
+ <app-textarea
+ id="details"
+ label="Précisez les besoins de la personne (disponibilités...) :"
+ [value]="this.form.get('details').value || ''"
+ (valueChange)="this.form.get('details').setValue($event)"
+ />
</form>
<div *ngIf="owners?.length === 0 || (structures?.length === 0 && structuresListReady)" class="noResult">
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
index 4fb165b179a696947ab3513925250342147d5aa4..0439f61de268ba4996309dd4240e883237688aa6 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss
@@ -1,103 +1,33 @@
@import 'color';
@import 'typography';
-.header {
- margin-top: 24px;
- padding: 0 48px;
- border: 2px solid $grey-6;
- border-radius: 8px 8px 0 0;
- min-height: 110px;
- display: flex;
- justify-content: center;
- ::ng-deep .avatar svg {
- top: -0.125em;
- }
- .headerType {
- color: $grey-3;
- @include font-regular-16;
- font-style: italic;
- }
- .headerNameContainer {
- align-items: center;
- }
- .headerName {
- @include font-bold-18;
- width: 100%;
- }
-}
-.selectList {
- padding: 0 32px 24px 48px;
- border: 2px solid $grey-6;
- border-top: none;
- min-height: 110px;
- display: flex;
- justify-content: center;
- flex-direction: column;
- .card-single {
- padding: 16px 8px;
- border: 1px solid transparent;
- &.selected {
- border-color: black;
- }
- &.structure-single {
- padding: 0 12px;
- }
- }
- .selectListJob {
- color: $grey-3;
- @include font-regular-16;
- font-style: italic;
- }
- .selectListNameContainer {
- align-items: center;
- }
- .selectListName {
- @include font-bold-18;
- width: 100%;
- }
- h4 {
- @include font-bold-18;
- }
- ::ng-deep svg {
- padding: 0 24px 0 8px;
- }
- label {
- display: flex;
- flex: 1;
- flex-direction: row;
- cursor: pointer;
- width: 100%;
- &.listCards {
- display: block;
+section {
+ border: 1px solid $grey-6;
+ border-radius: 8px;
+
+ .header-card {
+ ::ng-deep .structure,
+ ::ng-deep .structureMember {
+ border: 0px;
+ border-bottom: 1px solid $grey-6;
+ border-radius: 8px 8px 0px 0px;
}
}
}
-.details {
- margin-top: 40px;
- label {
- padding-bottom: 8px;
- }
- textarea {
- width: 100%;
- max-width: 600px;
- margin-top: 8px;
- }
-}
-.noResult,
-.noResult > span {
+
+.picker-section {
display: flex;
flex-direction: column;
- align-items: center;
- text-align: center;
- h2 {
- margin-top: 2rem;
- margin-bottom: 0.5rem;
- max-width: 600px;
- font-weight: 600px;
- }
+ gap: 16px;
+ padding: 16px;
+
p {
- text-align: center;
- max-width: 600px;
- margin: 2em 0 0 0;
+ @include font-bold-16;
+ }
+
+ .list-choices {
+ display: flex;
+ flex-direction: column;
+ gap: 24px;
}
}
diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts
index 03d65020a6c258d6482c21d9d9284f7b6f359310..31d331e56c95ea7761115dd13ce35120dfe05217 100644
--- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts
+++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AbstractControl, UntypedFormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
import { Observable, forkJoin } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import { Owner } from '../../../../../models/owner.model';
@@ -135,23 +135,19 @@ export class MakeAppointmentComponent implements OnInit {
return this.structureService.getStructureWithOwners(structureId).pipe(map((result) => result.owners));
}
- public getStructureControl(nameControl: string): AbstractControl {
- return this.form.get(nameControl);
- }
-
public onSocialWorkerRadioChange(socialWorker: Owner): void {
+ this.form.patchValue({
+ socialWorkerId: socialWorker._id,
+ });
this.socialWorker.emit(socialWorker);
this.checkValidation.emit();
}
public onStructureRadioChange(structure: Structure): void {
this.selectedOption = structure._id;
+ this.form.get('structureRDV').setValue(structure._id);
this.form.get('socialWorkerId').setValue(this.orientationService.rdvUser._id);
this.selectedStructureRDV.emit(structure);
this.checkValidation.emit(structure);
}
-
- public onDetailsChange(): void {
- this.checkValidation.emit();
- }
}
diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html
index d60a390697a47d9e936dee01305140e926d4fbb8..5c0440da5ba1698148f51df92d51783a629d1437 100644
--- a/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html
@@ -1,5 +1,5 @@
<div class="orientationForm">
- <h2>Dans quelle langue la personne souhaite-t-elle être rappelée ?</h2>
+ <h2>Dans quelle langue la personne souhaite-t-elle être rappelée ?</h2>
<div class="formGroup">
<app-radio-option
diff --git a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html
index 06b035d1018bfff96558702017fbf0bf24f62df3..5a6defbe09a8ae6f6e652b3dcdd6fb988908a1c3 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html
@@ -1,5 +1,5 @@
<div class="orientationForm">
- <h2>De quel accompagnement la personne a-t-elle besoin ?</h2>
+ <h2>De quel accompagnement la personne a-t-elle besoin ?</h2>
<div class="formGroup">
<app-radio-option
*ngFor="let option of accompanimentTypes"
diff --git a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html
index 17b6d2548e6a23054ca7db689aebb7ff4914a29f..0f8e52f9857b46707defe6a48f195b6a792fe5c7 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html
@@ -1,7 +1,7 @@
<div class="orientationForm">
- <h2>Quelle démarche en ligne la personne a-t-elle besoin de réaliser ?</h2>
- <div class="btn-grid">
- <app-v3-tag-item
+ <h2>Quelle démarche en ligne la personne a-t-elle besoin de réaliser ?</h2>
+ <div class="tagList">
+ <app-tag-item
*ngFor="let module of accompanimentType"
[label]="module.name"
[disabled]="module.disabled"
@@ -11,7 +11,7 @@
(action)="handleClick(module)"
/>
</div>
- <app-v3-modal
+ <app-modal
[opened]="showStrangersModal"
[validateLabel]="'J\'ai compris'"
[singleButton]="true"
@@ -22,5 +22,5 @@
Les premières demandes de titres de séjour doivent être redirigées vers les associations spécialisées sur les
droits des étrangers.
</div>
- </app-v3-modal>
+ </app-modal>
</div>
diff --git a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.ts b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.ts
index d7f6ce5708c01de7ecaaddf93204da5d0c6caa8c..3434236940aa5a085064fa13fa5f6413122ab248 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.ts
+++ b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.ts
@@ -4,7 +4,6 @@ import { CategoryEnum } from 'src/app/shared/enum/category.enum';
import { OrientationService } from '../../../../services/orientation.service';
import { PersonalOfferService } from '../../../../services/personal-offer.service';
import { StructureService } from '../../../../services/structure.service';
-import { ButtonType } from '../../../../shared/components/button/buttonType.enum';
import { Category } from '../../../../structure-list/models/category.model';
import { Module } from '../../../../structure-list/models/module.model';
import { SearchService } from '../../../../structure-list/services/search.service';
@@ -26,7 +25,6 @@ export class OnlineDemarchComponent implements OnInit {
) {}
public orientationUtils = new OrientationUtils();
public accompanimentType: Module[];
- public buttonTypeEnum = ButtonType;
public selectedModules: Module[] = [];
public showStrangersModal = false;
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
index f65c86877987f5df1beca98049a11a7781a168ad..4f13f13e140158e666132b08a3f3644ba26ff620 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.html
@@ -1,98 +1,64 @@
-<div class="orientationForm">
- <h2 *ngIf="currentType !== 'RDV Conseiller Numérique'">Quelles sont les informations de la personne ?</h2>
- <h2 *ngIf="currentType === 'RDV Conseiller Numérique'">Quelles sont les coordonnées de la personne ?</h2>
- <form [formGroup]="form">
- <div class="form-group" fxLayout="column">
- <label for="name">Prénom</label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="text"
- autocomplete="on"
- formControlName="name"
- class="form-input"
- (input)="updatedForm('name', $event.target)"
- />
- <app-svg-icon *ngIf="form.get('name').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" />
- <app-svg-icon
- *ngIf="form.get('name').value && !form.get('name').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
- <div class="form-group" fxLayout="column">
- <label for="surname">Nom</label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="text"
- autocomplete="on"
- formControlName="surname"
- class="form-input"
- (input)="updatedForm('surname', $event.target)"
- />
- <app-svg-icon
- *ngIf="form.get('surname').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="form.get('surname').value && !form.get('surname').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+<form class="orientationForm" [formGroup]="form">
+ <div *ngIf="isOrientationRdv" class="title">
+ <h2>Quelles sont les coordonnées de la personne que vous orientez ?</h2>
+ </div>
+ <div *ngIf="!isOrientationRdv" class="title">
+ <h2>Quel est le nom de la personne que vous orientez ?</h2>
+ <p>Ces informations apparaîtront sur une fiche d’orientation à imprimer et à transmettre à la personne</p>
+ </div>
- <div *ngIf="isEmail()" class="form-group" fxLayout="column">
- <label for="email">Email <sup *ngIf="isOrientationRdv" class="footnote-nb">1</sup></label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="text"
- autocomplete="on"
- formControlName="email"
- class="form-input"
- (input)="updatedForm('email', $event.target)"
- />
- <app-svg-icon
- *ngIf="form.get('email').value && form.get('email').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'validate'"
- />
- <app-svg-icon
- *ngIf="form.get('email').value && !form.get('email').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
+ <div class="formGroup">
+ <app-input
+ id="name"
+ label="Prénom"
+ autocomplete="on"
+ size="large"
+ [status]="form.get('name').value ? (form.get('name').invalid ? 'error' : 'success') : null"
+ [value]="form.get('name').value"
+ (valueChange)="updatedForm('name', $event)"
+ />
- <div *ngIf="isPhone()" class="form-group" fxLayout="column">
- <label for="phone">Téléphone<sup *ngIf="isOrientationRdv" class="footnote-nb">1</sup></label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="phone"
- autocomplete="on"
- formControlName="phone"
- class="form-input"
- (input)="updatedForm('phone', $event.target)"
- />
- <app-svg-icon *ngIf="form.get('phone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" />
- <app-svg-icon
- *ngIf="form.get('phone').value && !form.get('phone').valid"
- [iconClass]="'validation'"
- [type]="'form'"
- [icon]="'notValidate'"
- />
- </div>
- </div>
- <p *ngIf="isOrientationRdv && isPhone() && isEmail()" class="footnote">
- <sup class="footnote-nb">1</sup> Un moyen de communication (email et/ou téléphone) est obligatoire pour valider
- cette étape
- </p>
- </form>
-</div>
+ <app-input
+ id="surname"
+ label="Nom"
+ autocomplete="on"
+ size="large"
+ [status]="form.get('surname').value ? (form.get('surname').invalid ? 'error' : 'success') : null"
+ [value]="form.get('surname').value"
+ (valueChange)="updatedForm('surname', $event)"
+ />
+
+ <app-input
+ *ngIf="isEmail()"
+ id="email"
+ label="Email<sup class='sup-input'>1</sup>"
+ autocomplete="on"
+ size="large"
+ [status]="form.get('email').value ? (form.get('email').invalid ? 'error' : 'success') : null"
+ [statusText]="form.get('email').value ? (form.get('email').invalid ? 'Email invalide' : 'Email valide') : null"
+ [value]="form.get('email').value"
+ (valueChange)="updatedForm('email', $event)"
+ />
+
+ <app-input
+ *ngIf="isPhone()"
+ id="phone"
+ label="Téléphone<sup class='sup-input'>1</sup>"
+ autocomplete="on"
+ size="large"
+ [status]="form.get('phone').value ? (form.get('phone').invalid ? 'error' : 'success') : null"
+ [statusText]="
+ form.get('phone').value ? (form.get('phone').invalid ? 'Téléphone invalide' : 'Téléphone valide') : null
+ "
+ [value]="form.get('phone').value"
+ (valueChange)="updatedForm('phone', $event)"
+ />
+ </div>
+
+ <p *ngIf="isOrientationRdv && isPhone() && isEmail()">
+ <sup class="sup-input">1</sup
+ ><span class="footnote">
+ Un moyen de communication (email et/ou téléphone) est obligatoire pour valider cette étape</span
+ >
+ </p>
+</form>
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.scss b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.scss
index 9059e80a0a42626129551f52623fca0b9ea0b748..b378d0179f4514a496f9ccf6d402228f43711c59 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.scss
@@ -1,11 +1,5 @@
-@import 'color';
@import 'typography';
-sup {
- color: red;
- font-size: $font-size-xxsmall;
-}
.footnote {
- margin-top: 2em;
- font-size: $font-size-xmsmall;
+ font-size: $font-size-xxsmall;
}
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.ts b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.ts
index 9b8ac7ac62102b6a915f1ba1d7ed15bda3fe89c3..c69a97ceaa9cfd291928dfb1e2fed5770d4dfabe 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.ts
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneficiary-info/mediation-beneficiary-info.component.ts
@@ -1,7 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { UntypedFormGroup } from '@angular/forms';
import { Utils } from '../../../../../utils/utils';
-import { MediationType } from '../../../types/orientation.types';
@Component({
selector: 'app-mediation-beneficiary-info',
@@ -11,7 +10,6 @@ import { MediationType } from '../../../types/orientation.types';
export class MediationBeneficiaryInfoComponent implements OnInit {
@Input() form: UntypedFormGroup;
@Output() checkValidation = new EventEmitter<any>();
- @Input() currentType: MediationType;
@Input() public isOrientationRdv = false;
public utils = new Utils();
@@ -26,10 +24,9 @@ export class MediationBeneficiaryInfoComponent implements OnInit {
return Boolean(this.form.get('email'));
}
- public updatedForm(field: string, target: EventTarget): void {
- const value = (target as HTMLInputElement).value;
+ public updatedForm(field: string, value: string): void {
if (field === 'phone') {
- this.utils.modifyPhoneInput(this.form, 'phone', target);
+ this.utils.modifyPhoneInput(this.form, 'phone', value);
} else this.form.get(field).patchValue(value);
this.checkValidation.emit();
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.html b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.html
index 0886512f82062b9776455ec800ea9ed65c9ac303..bb8858c7122d47b84032d4514d7779d7ad40d9ee 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.html
@@ -1,6 +1,5 @@
<div class="orientationForm">
- <h2>Sur quel créneau horaire la personne souhaite-t-elle être rappelée ?</h2>
- <div class="subtitle">Horaires de la Hotline</div>
+ <h2>Sur quel créneau horaire la personne souhaite-t-elle être rappelée ?</h2>
<div class="container">
<div *ngFor="let slot of timeSlots" class="slot">
<div class="day">{{ slot.day }}</div>
diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
index c71cef871db7ac7ad5ed9689c46db164064e902e..9a3271b56b0a894d9e5a6c754bee732fb9565373 100644
--- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
+++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-hours-selection/mediation-hours-selection.component.scss
@@ -2,56 +2,37 @@
@import 'breakpoint';
@import 'typography';
-.subtitle {
- color: $grey-3;
- @include font-bold-14;
-}
.container {
display: flex;
- align-items: center;
- gap: 0.5rem;
- margin: 1.5rem 0;
- flex-wrap: wrap;
- max-width: 600px;
+ justify-content: space-between;
.slot {
- transition: all 300ms ease;
- padding-right: 0.5rem;
- height: 85px;
- &:last-child {
- border: none;
- }
- @media #{$phone} {
- &:nth-child(even) {
- border: none;
- }
- }
+ display: flex;
+ gap: 8px;
+ flex-direction: column;
+ width: 85px;
+
.day {
@include font-regular-13;
color: $grey-3;
text-align: center;
- margin-bottom: 0.5rem;
+ max-width: 50px;
+ margin: auto;
}
.time {
cursor: pointer;
- width: 73px;
- height: 71px;
text-align: center;
- border: 1px solid $grey-1;
- border-radius: 4px;
+ border: 1px solid $grey-4;
+ border-radius: 8px;
@include font-regular-14;
- margin: auto;
background: $white;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
+ padding: 16px;
span {
display: block;
+ @include font-bold-16;
}
&.selected {
- background: $green-1 !important;
- color: $white;
- border-color: $green-1;
+ border-color: $red;
+ box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
}
}
}
diff --git a/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html b/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html
index 551ec89f816c541e041141ff23a8a9cf4b09e5bb..de89d9d6af78055ea4b508b1a535c77cf61e79e0 100644
--- a/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html
+++ b/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html
@@ -25,12 +25,6 @@
[currentType]="currentType"
(checkValidation)="checkValidation()"
/>
- <app-structure-orientator
- *ngIf="currentStep === OnlineDemarchesAppointmentSteps.structureOrientator"
- [profile]="profile"
- [form]="form"
- (validatePage)="checkValidation()"
- />
<app-structure-pmr
*ngIf="currentStep === OnlineDemarchesAppointmentSteps.pmrAccess"
[structureForm]="form"
@@ -66,6 +60,12 @@
[isOrientationRdv]="true"
(checkValidation)="checkValidation()"
/>
+ <app-structure-orientator
+ *ngIf="currentStep === OnlineDemarchesAppointmentSteps.structureOrientator"
+ [profile]="profile"
+ [form]="form"
+ (validatePage)="checkValidation()"
+ />
<app-appointment-end
*ngIf="currentStep === OnlineDemarchesAppointmentSteps.rdvEnd"
[form]="form"
@@ -75,6 +75,14 @@
(checkValidation)="checkValidation()"
(setResetOrientation)="showResetOrientation()"
/>
+ <app-orientation-recap
+ *ngIf="currentStep === OnlineDemarchesAppointmentSteps.orientationRecap"
+ [form]="form"
+ [recapType]="RecapsType.appointment"
+ [socialWorker]="socialWorker"
+ [structureRDV]="structureRDV"
+ (checkValidation)="checkValidation()"
+ />
</ng-container>
<!-- ONLINE MEDIATION FORM -->
<ng-container *ngIf="currentType === OnlineDemarche.onlineMediation">
@@ -98,12 +106,36 @@
[form]="form"
(checkValidation)="checkValidation()"
/>
+ <app-orientation-comments
+ *ngIf="currentStep === HotlineMediationSteps.comments"
+ [form]="form"
+ (checkValidation)="checkValidation()"
+ />
+ <app-structure-orientator
+ *ngIf="currentStep === HotlineMediationSteps.structureOrientator"
+ [profile]="profile"
+ [form]="form"
+ (validatePage)="checkValidation()"
+ />
<app-orientation-recap
*ngIf="currentStep === HotlineMediationSteps.orientationRecap"
[form]="form"
[recapType]="RecapsType.onlineMediation"
(checkValidation)="checkValidation()"
/>
+ <app-appointment-end
+ *ngIf="currentStep === HotlineMediationSteps.rdvEnd"
+ [form]="form"
+ [isOnlineMediation]="true"
+ (checkValidation)="checkValidation()"
+ (setResetOrientation)="showResetOrientation()"
+ />
+ <app-orientation-recap
+ *ngIf="currentStep === HotlineMediationSteps.orientationPrint"
+ [form]="form"
+ [recapType]="RecapsType.onlineMediation"
+ (checkValidation)="checkValidation()"
+ />
</ng-container>
<!-- STRUCTURE LIST FORM -->
<app-orientation-structure-list
diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.html b/src/app/form/orientation-form-view/orientation-form-view.component.html
index 54e600aa11584bdce5b139ff703d83b0d836ae0a..b0cc37f06d2730682b29f13e489f2e2657ca1b63 100644
--- a/src/app/form/orientation-form-view/orientation-form-view.component.html
+++ b/src/app/form/orientation-form-view/orientation-form-view.component.html
@@ -58,7 +58,7 @@
(goPrev)="prevPage()"
(goReset)="reset()"
/>
- <app-v3-modal
+ <app-modal
[opened]="showConfirmationModal"
[title]="'Attention'"
[validateLabel]="'Quitter'"
@@ -68,9 +68,9 @@
<div class="modalContent emphasized">
Si vous quittez le formulaire maintenant, toutes les informations saisies seront perdues
</div>
- </app-v3-modal>
+ </app-modal>
- <app-v3-modal
+ <app-modal
[opened]="showLoginModal"
[title]="'Se connecter'"
[validateLabel]="'Se connecter'"
@@ -80,5 +80,5 @@
<img src="../../../../../assets/img/resin-login.svg" alt="resin-login-image" />
<h3>Pour pré-remplir ce formulaire, gagnez du temps en vous connectant !</h3>
</div>
- </app-v3-modal>
+ </app-modal>
</div>
diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.scss b/src/app/form/orientation-form-view/orientation-form-view.component.scss
index fe687ad53b9be575a5fb091d64feb0ed97182a15..d94a71fe783149f4152dcee871e4f3acbd7414f0 100644
--- a/src/app/form/orientation-form-view/orientation-form-view.component.scss
+++ b/src/app/form/orientation-form-view/orientation-form-view.component.scss
@@ -4,19 +4,19 @@
@import 'typography';
:host {
- height: 100%;
+ display: flex;
+ flex-direction: column;
+ flex: 1;
}
.orientation {
- height: 100%;
display: flex;
flex-direction: column;
+ flex: 1;
.container {
box-sizing: border-box;
-
height: 100%;
margin: auto;
- overflow-y: auto;
padding: 2rem 3rem;
@media #{$tablet} {
@@ -55,10 +55,6 @@
@include font-regular-18;
color: $grey-3;
}
- // V3REMOVE
- .backArrow {
- cursor: pointer;
- }
}
div.titleform {
@@ -69,9 +65,12 @@ div.titleform {
display: flex;
flex-direction: column;
gap: 40px;
+ width: 100%;
+ max-width: 600px;
+}
- width: 600px;
- @media #{$tablet} {
- width: auto;
- }
+app-navigation {
+ position: sticky;
+ bottom: 0;
+ background: $white;
}
diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.ts b/src/app/form/orientation-form-view/orientation-form-view.component.ts
index 1697d8c628d8de841a2e0bbbf53f0e7199be6bb8..05e2e1a6b856306b8ef1cf9f75757c752f2bba72 100644
--- a/src/app/form/orientation-form-view/orientation-form-view.component.ts
+++ b/src/app/form/orientation-form-view/orientation-form-view.component.ts
@@ -207,14 +207,15 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
const isOnlineMediationOrientationRecap =
isOnlineDemarcheOrLearnSkills &&
this.currentType === OnlineDemarche.onlineMediation &&
- this.currentStep === HotlineMediationSteps.orientationRecap;
+ this.currentStep === HotlineMediationSteps.orientationPrint;
const isStructureListOrientationRecap =
this.currentType === OnlineDemarche.structureList && this.currentStep === StructuresListSteps.orientationRecap;
- const isAppointmentRdvEnd =
+ const isAppointmentOrientationRecap =
isOnlineDemarcheOrLearnSkills &&
this.currentType === OnlineDemarche.appointment &&
- this.currentStep === AppointmentSteps.rdvEnd;
- this.isLastStep = isOnlineMediationOrientationRecap || isStructureListOrientationRecap || isAppointmentRdvEnd;
+ this.currentStep === AppointmentSteps.orientationRecap;
+ this.isLastStep =
+ isOnlineMediationOrientationRecap || isStructureListOrientationRecap || isAppointmentOrientationRecap;
}
/**
@@ -242,13 +243,11 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
};
await lastValueFrom(this.orientationService.createOnlineMediation(toCreate))
.then(() => {
- this.canDeactivate = true;
this.notificationService.showSuccess('Votre démarche en ligne a bien été enregistrée');
})
.catch(() => {
this.notificationService.showErrorPleaseRetry('Échec de la création de votre démarche en ligne');
- })
- .finally(() => this.printForm());
+ });
}
public printForm(): void {
@@ -300,6 +299,7 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
this.setStepNumber(Object.keys(HotlineMediationSteps).length);
this.onlineDemarcheForm = this.orientationUtils.createOnlineMediationForm(
this.utils.convertFiltersToModule(this.filters),
+ this.orientator,
);
break;
default:
@@ -415,12 +415,23 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
this.previousNeedType = this.needType;
return;
}
- // Handle last screen Online appointment and print
+ // If no multiple structures, skip orientator
+ if (
+ this.currentType === OnlineDemarche.onlineMediation &&
+ this.currentStep === HotlineMediationSteps.structureOrientator - 1
+ ) {
+ this.skipStructureOrientator(true);
+ }
+ // Handle Online appointment
if (
this.currentType === OnlineDemarche.onlineMediation &&
- this.currentStep === HotlineMediationSteps.orientationRecap
+ this.currentStep === HotlineMediationSteps.rdvEnd - 1
) {
await this.handleOnlineAppointment();
+ }
+ // Handle last screen Online appointment and print
+ if (this.currentStep === HotlineMediationSteps.orientationPrint) {
+ this.printForm();
return;
}
// Handle last screen appointment
@@ -438,6 +449,10 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
// Structure list handling
if (this.currentType === OnlineDemarche.structureList) {
+ // If no multiple structures, skip orientator
+ if (this.currentStep === StructuresListSteps.structureOrientator - 1) {
+ this.skipStructureOrientator(true);
+ }
// Print last screen
if (this.currentStep === StructuresListSteps.orientationRecap) {
this.printForm();
@@ -451,7 +466,6 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
// Unset fullscreen
if (this.currentStep === StructuresListSteps.structureChoice) {
this.fullScreen = false;
- this.skipStructureOrientator(true);
}
}
@@ -485,7 +499,7 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
}
// after last page, go to new orientation
- if (this.currentStep === AppointmentSteps.rdvEnd) {
+ if (this.currentStep === AppointmentSteps.orientationRecap) {
this.sendOrientationIndicator(this.structureOrientationForm ?? this.onlineDemarcheForm);
history.pushState({ rdvStructure: null, rdvUser: null }, '', '/orientation');
window.location.reload();
@@ -541,9 +555,6 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
) {
this.currentStep--;
}
- if (this.currentStep === AppointmentSteps.structureOrientator + 1) {
- this.skipStructureOrientator(false);
- }
if (this.indicatorNeedType === NeedsType.learnSkills && this.currentStep === AppointmentSteps.infoScreen + 1) {
this.currentStep--;
}
@@ -561,6 +572,9 @@ export class OrientationFormViewComponent implements OnInit, AfterContentChecked
this.currentStep -= 3;
this.skipStructureOrientator(false);
}
+ if (this.currentStep === AppointmentSteps.structureOrientator + 1) {
+ this.skipStructureOrientator(false);
+ }
}
// Default case for first form step. If there was a previous form (like filterForm) we go back to this form
diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.html b/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.html
index 885c7b3627f316b8f4521c4fb2e3ca0ea97dff7a..f301e77bd18563adf74d18891416b88bd658b5a3 100644
--- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.html
+++ b/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.html
@@ -3,17 +3,11 @@
<h3>Avez-vous des précisions à apporter ?</h3>
<p>Facultatif</p>
</div>
- <div>
- <p>Ces informations accompagneront la fiche d'orientation de la personne</p>
- <div class="textareaBlock" fxLayout="column">
- <textarea
- rows="8"
- placeholder=""
- maxlength="500"
- formControlName="comments"
- (input)="setComment($event.target)"
- ></textarea>
- <p class="count">{{ getStructureControl('comments').value?.length || 0 }} / 500</p>
- </div>
- </div>
+
+ <app-textarea
+ id="comments"
+ label="Ces informations accompagneront la fiche d'orientation de la personne"
+ [value]="this.form.get('comments').value || ''"
+ (valueChange)="this.form.get('comments').setValue($event)"
+ />
</form>
diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.scss b/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.scss
deleted file mode 100644
index 5b0572697991772a96319e6d62eccec2623981cd..0000000000000000000000000000000000000000
--- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@import 'color';
-@import 'typography';
-
-form {
- max-width: 600px;
-}
-p {
- margin: 0.25rem 0;
-}
-
-.count {
- text-align: right;
- color: $grey-3;
- @include font-regular-13;
- font-style: italic;
- margin-top: 0.5rem;
-}
diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.ts b/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.ts
index 3fbac07deaa8b87ed60931ecc998fe810ed8b95c..a022109706c7f60623b8c77d7b3ee3230e6f1e5c 100644
--- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.ts
+++ b/src/app/form/orientation-form-view/orientation-structure-list/orientation-comments/orientation-comments.component.ts
@@ -4,7 +4,6 @@ import { AbstractControl, UntypedFormGroup } from '@angular/forms';
@Component({
selector: 'app-orientation-comments',
templateUrl: './orientation-comments.component.html',
- styleUrls: ['./orientation-comments.component.scss'],
})
export class OrientationCommentsComponent implements OnInit {
@Input() form: UntypedFormGroup;
diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html
index 15d778e82bfcab89b78facc96d79c69acaf82e14..a77c625340b2b63d8c24053379fc794a19059cbc 100644
--- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html
+++ b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html
@@ -4,15 +4,13 @@
<p>Facultatif</p>
</div>
<div class="form-group">
- <div class="addressRow">
- <app-address-autocomplete
- [form]="form"
- [wide]="true"
- [required]="false"
- [address]="form.get('address').valid ? form.get('address').value : null"
- (inputAddress)="setAddressStructure()"
- (selectedAddress)="setAddressStructure($event)"
- />
- </div>
+ <app-address-autocomplete
+ [form]="form"
+ [wide]="true"
+ [required]="false"
+ [address]="form.get('address').valid ? form.get('address').value : null"
+ (inputAddress)="setAddressStructure()"
+ (selectedAddress)="setAddressStructure($event)"
+ />
</div>
</form>
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index bbfe129a092e8db18d570d72a4e627b31fed6446..5e42694748a2802d5ec5af9145308a6b2f466440 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -3,7 +3,7 @@
<app-svg-icon
class="clickable"
tabindex="0"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'menu'"
[iconClass]="'icon-32'"
(click)="openMenu()"
@@ -24,7 +24,7 @@
<app-svg-icon
class="clickable"
tabindex="0"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'profile'"
[iconClass]="'icon-32'"
(click)="isLoggedIn ? openProfileMenu() : goToLoginPage()"
@@ -43,7 +43,7 @@
Annuaire
</a>
<a *ngIf="isAdmin" routerLink="/admin" [routerLinkActive]="'active'">Administration</a>
- <app-v3-button
+ <app-button
*ngIf="isLoggedIn"
class="connected"
[variant]="'primary'"
@@ -51,7 +51,7 @@
[size]="'small'"
(action)="openProfileMenu()"
/>
- <app-v3-button
+ <app-button
*ngIf="!isLoggedIn"
[variant]="'primaryBlack'"
[label]="'Se connecter'"
@@ -94,7 +94,7 @@
<app-svg-icon
class="avatar"
tabindex="0"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
(click)="isLoggedIn ? openProfileMenu() : goToLoginPage()"
@@ -102,8 +102,8 @@
<span class="name">{{ displayFullName }}</span>
</div>
<div class="profileMenuButtons">
- <app-v3-button [variant]="'primaryBlack'" [label]="'Voir mon compte'" [size]="'small'" (click)="goToProfile()" />
- <app-v3-button [label]="'Se déconnecter'" [variant]="'secondary'" [size]="'small'" (action)="logout()" />
+ <app-button [variant]="'primaryBlack'" [label]="'Voir mon compte'" [size]="'small'" (click)="goToProfile()" />
+ <app-button [label]="'Se déconnecter'" [variant]="'secondary'" [size]="'small'" (action)="logout()" />
</div>
</div>
</div>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index de68e365d3281aee8609af37569d998b8e96687a..79cd170eb32120456dae5672029e2ae507150c49 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -2,8 +2,6 @@
@import 'layout';
@import 'color';
@import 'breakpoint';
-@import 'shapes';
-@import 'buttons';
@import 'z-index';
header {
@@ -52,22 +50,6 @@ header {
}
}
-button {
- @include btn-grey;
- &.red {
- @include btn-red;
- border: none;
- // user name ellipsis handling
- white-space: nowrap;
- width: 100px;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- &:focus-visible {
- outline: 1px solid $black;
- }
-}
-
a {
color: $grey-2;
height: 100%;
diff --git a/src/app/legal-notice/legal-notice.component.html b/src/app/legal-notice/legal-notice.component.html
index f6bb072d2844160539dbce2c01b6498c4f4f9c3b..22a9506df1a3391f75a6eabdf7194d4c05ff9604 100644
--- a/src/app/legal-notice/legal-notice.component.html
+++ b/src/app/legal-notice/legal-notice.component.html
@@ -1,5 +1,5 @@
-<div fxLayout="column" class="content-container">
- <h1 style="display: none">Mentions légales</h1>
+<div class="content-container">
+ <h1 class="visually-hidden">Mentions légales</h1>
<div class="section-container">
<h1>Mentions légales du réseau des acteurs de l'inclusion numérique sur le territoire de la métropole de Lyon</h1>
<p>
@@ -43,27 +43,21 @@
de rectification, d’effacement, d’opposition, de limitation du traitement et de révocation de votre consentement.
</p>
- <p>Afin d'exercer vos droits :</p>
- <ul>
- <li>
- Vous pouvez vous adresser par courrier postal à : Métropole de Lyon - Direction des Affaires Juridiques et de la
- Commande Publique - 20 rue du Lac - BP 33569 - 69505 Lyon Cedex.
- </li>
- <li>
- Ou remplir le formulaire dédié au sein du guichet numérique métropolitain TOODEGO :
- <a href="https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/"
- >demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a
- >
- </li>
- </ul>
- Afin d'exercer vos droits : <br />
- - Vous pouvez vous adresser par courrier postal à : <br />
- Métropole de Lyon - Direction des Affaires Juridiques et de la Commande Publique - 20 rue du Lac - BP 33569 - 69505
- Lyon Cedex. <br />- Ou remplir le formulaire dédié au sein du guichet numérique métropolitain TOODEGO :<a
- href="https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/"
- >https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a
- >
- <br />
+ <div>
+ <p>Afin d'exercer vos droits vous pouvez :</p>
+ <ul>
+ <li>
+ Vous adresser par courrier postal à : Métropole de Lyon - Direction des Affaires Juridiques et de la Commande
+ Publique - 20 rue du Lac - BP 33569 - 69505 Lyon Cedex.
+ </li>
+ <li>
+ Ou remplir le formulaire dédié au sein du guichet numérique métropolitain TOODEGO :
+ <a href="https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/"
+ >demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a
+ >
+ </li>
+ </ul>
+ </div>
<p>
Si vous estimez, après nous avoir contactés, que vos droits « Informatique et Libertés » ne sont pas respectés,
@@ -74,7 +68,8 @@
Nous vous informons que le secret des correspondances transmises sur le réseau internet n'est pas garanti.
Chaque utilisateur est, de ce fait, seul responsable du contenu de sa correspondance.
</p>
- <p><strong>Mesure d'audience Matomo</strong></p>
+
+ <h2>Mesure d'audience Matomo</h2>
<p>
Afin de vous fournir un meilleur service et d’améliorer votre expérience d'utilisateur sur notre site, nous
utilisons des solutions de mesure d’audience qui utilisent la technologie des « cookies », des fichiers texte qui
@@ -94,31 +89,35 @@
Vous avez cependant le droit de vous opposer à l’utilisation de ces cookies, et donc au traitement de vos données
personnelles de navigation, en utilisant un cookie « anti-cookie ».
</p>
- <p><strong>Pour désactiver les cookies de Matomo</strong></p>
+
+ <h2>Pour désactiver les cookies de Matomo</h2>
<p>À tout moment, vous pouvez régler vos préférences de cookies sur cette page.</p>
<p>
En cliquant sur "désactiver" vous êtes automatiquement désactivé et ne recevrez pas de cookies Matomo.
Merci de lire ce qui concerne le cookie "anti-cookie" pour comprendre comment Matomo est capable de se
souvenir de votre choix de désactivation.
</p>
- <p>
- Vous avez le droit de consulter, de rectifier et de supprimer les données personnelles que Matomo aurait pu
- collecter. Pour exercer ces droits, ou pour toute information concernant le traitement des données personnelles,
- nous vous invitons à contacter le Délégué à la Protection des Données de la Métropole de Lyon :
- </p>
- <ul>
- <li>
- par courrier : Métropole de Lyon – Délégué à la Protection des Données - Direction des Affaires Juridiques et de
- la Commande Publique - 20, rue du Lac - <strong>BP 33569</strong>
- </li>
- <li>
- par formulaire
- <a href="https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/"
- >demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a
- >
- </li>
- </ul>
- <p><strong>Dispositions légales</strong></p>
+ <div>
+ <p>
+ Vous avez le droit de consulter, de rectifier et de supprimer les données personnelles que Matomo aurait pu
+ collecter. Pour exercer ces droits, ou pour toute information concernant le traitement des données personnelles,
+ nous vous invitons à contacter le Délégué à la Protection des Données de la Métropole de Lyon :
+ </p>
+ <ul>
+ <li>
+ par courrier : Métropole de Lyon – Délégué à la Protection des Données - Direction des Affaires Juridiques et
+ de la Commande Publique - 20, rue du Lac - <strong>BP 33569</strong>
+ </li>
+ <li>
+ par formulaire
+ <a href="https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/"
+ >demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a
+ >
+ </li>
+ </ul>
+ </div>
+
+ <h2>Dispositions légales</h2>
<p>
Les divers éléments du site web (la forme, la mise en page, le fonds, la structure …) sont protégés par le droit
des dessins et modèles, le droit d’auteur, le droit des marques ainsi que le droit à l’image et ils ne peuvent
@@ -128,7 +127,8 @@
Toute personne ne respectant pas les dispositions légales applicables se rend coupable du délit de contrefaçon et
est passible des sanctions pénales prévues par la loi.
</p>
- <p><strong>Droits d'auteurs</strong></p>
+
+ <h2>Droits d'auteurs</h2>
<p>
Le présent site constitue une œuvre dont la "Métropole de Lyon" est l'auteur au sens des articles L.
111.1 et suivants du Code de la propriété intellectuelle. Les photographies, textes, logos, pictogrammes, ainsi
@@ -141,7 +141,8 @@
des tiers. Les reproductions, les transmissions, les modifications, les réutilisations à des fins publicitaires,
commerciales ou d'information, de tout ou partie du site, sont totalement interdites.
</p>
- <p><strong>Logo de la Métropole de Lyon</strong></p>
+
+ <h2>Logo de la Métropole de Lyon</h2>
<p>
Le logo de la Métropole de Lyon ne peut être modifié – proportions, couleurs, éléments, constituants – et ne peut
être sujet à aucune transformation, animation ou tout autre processus. Le logo de la Métropole de Lyon ne peut
@@ -154,11 +155,13 @@
le droit de modifier les conditions d'utilisation du logo de la Métropole de Lyon à tout moment et sans
préavis.
</p>
- <p><strong>Droit des bases de données</strong></p>
+
+ <h2>Droit des bases de données</h2>
<p>
Les bases de données sont protégées par la loi du 1er juillet 1998 et le régime français du droit d'auteur.
</p>
- <p><strong>Établissements de liens vers le site resin.grandlyon.com</strong></p>
+
+ <h2>Établissements de liens vers le site resin.grandlyon.com</h2>
<p>
La Métropole de Lyon autorise la mise en place d'un lien hypertexte vers son site resin.grandlyon.com pour
tous les sites Internet, à l'exclusion de ceux diffusant des informations à caractère polémique,
@@ -169,14 +172,16 @@
réserve le droit de demander la suppression d'un lien si elle estime que le site cible ne respecte pas les
règles ainsi définies.
</p>
- <p><strong>Liens vers des sites tiers depuis le site resin.grandlyon.com</strong></p>
+
+ <h2>Liens vers des sites tiers depuis le site resin.grandlyon.com</h2>
<p>
Les liens hypertextes mis en œuvre au sein du site en direction d'autres sites et/ou de pages personnelles et
d'une manière générale vers toutes ressources existantes sur internet ne sauraient engager la responsabilité
de la Métropole de Lyon quant aux liens qu'ils contiennent ou aux changements ou mises à jour qui leur sont
apportés.
</p>
- <p><strong>Mise en garde générale</strong></p>
+
+ <h2>Mise en garde générale</h2>
<p>
Nos services mettent tout en œuvre pour offrir aux visiteurs de ce site web des informations fiables et vérifiées.
Cependant, malgré tous les soins apportés, le site peut comporter des inexactitudes, des défauts de mise à jour ou
diff --git a/src/app/legal-notice/legal-notice.component.scss b/src/app/legal-notice/legal-notice.component.scss
index e077716b4eae2a1c6e04c6ade486ae11545c511d..4cb60187a4d0cf24fd61c5b5191596994f038035 100644
--- a/src/app/legal-notice/legal-notice.component.scss
+++ b/src/app/legal-notice/legal-notice.component.scss
@@ -1,3 +1,9 @@
.content-container {
- overflow: auto;
+ padding-bottom: 1rem;
+
+ .section-container {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+ }
}
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index c82e2790f5845b971975f06eea9325e0a5090e21..01e3984b600e1c19af3aeca4dbd0e1e72b3d98e6 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -18,7 +18,7 @@
[value]="f.email.value"
(valueChange)="onChange(); f.email.setValue($event)"
/>
- <app-v3-button
+ <app-button
*ngIf="isUnverifiedEmail"
label="Renvoyer le mail de confirmation"
size="small"
@@ -36,21 +36,21 @@
? 'Le mot de passe doit obligatoirement contenir : 8 caractères, une majuscule, une minuscule, un caractère spécial et un chiffre'
: ''
"
- [status]="f.password.value ? (f.password.invalid ? 'error' : 'success') : 'info'"
+ [status]="f.password.value ? (f.password.invalid || authFailed ? 'error' : 'success') : 'info'"
[value]="f.password.value"
(valueChange)="onChange(); f.password.setValue($event)"
/>
</div>
<div class="footer">
- <app-v3-button [variant]="'secondary'" [label]="'Mot de passe oublié'" (action)="switchToResetPassword()" />
- <app-v3-button
+ <app-button [variant]="'secondary'" [label]="'Mot de passe oublié'" (action)="switchToResetPassword()" />
+ <app-button
[variant]="'primary'"
[type]="'submit'"
[label]="'Se connecter'"
[disabled]="loginForm.invalid || loading"
/>
</div>
- <app-v3-button
+ <app-button
class="goSignup"
[variant]="'tertiary'"
[label]="'Je n’ai pas encore de compte'"
diff --git a/src/app/map/components/map.component.scss b/src/app/map/components/map.component.scss
index e26bad08b5569579902ef9547eee995f2aae65d3..9f1584742f7517e10e2c97285c7e98282db34b99 100644
--- a/src/app/map/components/map.component.scss
+++ b/src/app/map/components/map.component.scss
@@ -1,8 +1,6 @@
@import 'color';
@import 'layout';
@import 'typography';
-@import 'shapes';
-@import 'buttons';
@import 'breakpoint';
@import 'z-index';
@@ -57,7 +55,7 @@
fill: $gold;
}
&.france-service {
- fill: $primary-color;
+ fill: $red;
}
}
}
@@ -74,9 +72,16 @@
}
button {
- @include btn-search-filter;
- @include font-bold-14;
- font-size: 16px;
+ @include font-regular-16;
+ background: $red;
+ height: 36px;
+ color: $white;
+ padding: 4px 37px;
+ border-radius: 4px;
+ outline: none;
+ border: 1px solid transparent;
+ cursor: pointer;
+ line-break: 18px;
}
span {
diff --git a/src/app/models/orientation-filter.object.ts b/src/app/models/orientation-filter.object.ts
index 70b34795509efc5281782884a93bca7b538d4278..a6f44bad592a70af9b256e6d0e0e4b84dd19b7c7 100644
--- a/src/app/models/orientation-filter.object.ts
+++ b/src/app/models/orientation-filter.object.ts
@@ -4,7 +4,6 @@ import { Address } from './address.model';
export class OrientationFormFilters {
specificProfile: Category;
handicap: boolean;
- passNumeric: boolean;
structureAccompaniment: string;
contactAccompanimentPhone: string;
contactAccompanimentEmail: string;
diff --git a/src/app/models/personalOffer.model.ts b/src/app/models/personalOffer.model.ts
index 0cb13b9c93cb9a32ee2feb82fbc665122da11ab9..463fe0832b8f7e5fef7063e40fb59a4aa1f959d5 100644
--- a/src/app/models/personalOffer.model.ts
+++ b/src/app/models/personalOffer.model.ts
@@ -1,7 +1,9 @@
+import { Module } from '../structure-list/models/module.model';
+
export class PersonalOffer {
public _id: string = null;
public categories: Record<string, string[]>;
- public categoriesDisplay?: Record<string, string[]>;
+ public categoriesDisplay?: Record<string, Module[]>;
constructor(obj?: any) {
Object.assign(this, obj, {
diff --git a/src/app/models/structure.model.ts b/src/app/models/structure.model.ts
index 447db76745c3e6f1cc0eeb34ab4134d628c7f2fc..eb2d28e8ed0b7db1b720fbbfc45e12f76cfb7254 100644
--- a/src/app/models/structure.model.ts
+++ b/src/app/models/structure.model.ts
@@ -1,6 +1,8 @@
import { StructureCategoryEnum } from '../shared/enum/structureCategory.enum';
import { StructureCategoryIconEnum } from '../shared/enum/structureCategoryIcon.enum';
import { Weekday } from '../structure-list/enum/weekday.enum';
+import { Module } from '../structure-list/models/module.model';
+import { FreeWorkshop } from '../structure/enums/freeWorkshop.enum';
import { Address } from './address.model';
import { OpeningDay } from './openingDay.model';
import { PersonalOffer } from './personalOffer.model';
@@ -34,7 +36,7 @@ export class Structure {
public contactPersonLastName: string = null;
public contactPersonEmail: string = null;
public categories: Record<string, string[]>;
- public categoriesDisplay: Record<string, string[]>;
+ public categoriesDisplay: Record<string, Module[]>;
public remoteAccompaniment: boolean = null;
public nbComputers: number = null;
public nbPrinters: number = null;
@@ -119,13 +121,6 @@ export class Structure {
return false;
}
- /**
- * Check if a structure has pass Numeric label
- */
- public hasPassNumeric(): boolean {
- return this.categories.labelsQualifications.includes('passNumerique');
- }
-
/**
* Return a range, according to the distance, between [1,3] to get a distance reference.
* - [0,5km] => 1
@@ -177,4 +172,12 @@ export class Structure {
(this.twitter !== null && this.twitter !== '')
);
}
+
+ public getFreeWorkshopLabel(): string {
+ const isFree = this.freeWorkShop !== FreeWorkshop.no;
+ const isUnderCondition = this.freeWorkShop === FreeWorkshop.underCondition;
+ const accessStatus = isFree ? 'gratuits' : 'payants';
+ const conditionStatus = isUnderCondition ? ' sous conditions' : '';
+ return `Accompagnements ${accessStatus}${conditionStatus}`;
+ }
}
diff --git a/src/app/newsletter-subscription/newsletter-subscription.component.html b/src/app/newsletter-subscription/newsletter-subscription.component.html
index ed185b316c52fcf21421f31897dab19c34f33305..a2e7fec0766ab2206765054fb8db483dd4a31cce 100644
--- a/src/app/newsletter-subscription/newsletter-subscription.component.html
+++ b/src/app/newsletter-subscription/newsletter-subscription.component.html
@@ -1,41 +1,33 @@
-<div fxLayout="column" class="content-container full-screen">
- <div class="section-container" fxLayout="column" fxLayoutAlign="center center">
- <div class="subscriptionForm">
- <div *ngIf="subscriptionMod"><h1>Inscription à la newsletter</h1></div>
- <div *ngIf="!subscriptionMod"><h1>Désabonnement de la newsletter</h1></div>
- <form [formGroup]="subscriptionForm" (ngSubmit)="onSubmit()">
- <div class="form-group">
- <label for="email">Courriel personnel</label>
- <div fxLayout="row" fxLayoutGap="13px">
- <input
- type="email"
- autocomplete="on"
- formControlName="email"
- class="form-input"
- [ngClass]="{ 'is-invalid': submitted && f.email.errors }"
- />
- </div>
- <div *ngIf="submitted && f.email.errors" class="invalid-feedback">
- <div *ngIf="f.email.errors.required">L'adresse e-mail est requise</div>
- <div *ngIf="f.email.errors.pattern">L'adresse e-mail doit être valide</div>
- </div>
- </div>
- <div class="button" fxLayout="row" fxLayoutAlign="space-around center">
- <app-v3-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
- <app-v3-button
- [variant]="'primary'"
- [label]="subscriptionMod ? 'S\'inscrire' : 'Se désinscrire'"
- [type]="'submit'"
- [disabled]="loading"
- />
- </div>
- </form>
+<form class="newsletterForm" [formGroup]="subscriptionForm" (ngSubmit)="onSubmit()">
+ <h2 *ngIf="subscriptionMod">Inscription à la newsletter</h2>
+ <h2 *ngIf="!subscriptionMod">Désabonnement de la newsletter</h2>
+
+ <app-input
+ id="email"
+ label="Courriel personnel"
+ autocomplete="on"
+ size="large"
+ [status]="
+ subscriptionForm.get('email').value ? (subscriptionForm.get('email').invalid ? 'error' : 'success') : null
+ "
+ [value]="subscriptionForm.get('email').value"
+ (valueChange)="subscriptionForm.get('email').setValue($event)"
+ />
+
+ <div class="actions">
+ <div class="buttons">
+ <app-button [variant]="'secondary'" [label]="'Annuler'" [routerLink]="'/home'" />
+ <app-button
+ [variant]="'primary'"
+ [label]="subscriptionMod ? 'S\'inscrire' : 'Se désinscrire'"
+ [type]="'submit'"
+ [disabled]="loading"
+ />
</div>
- <div *ngIf="!subscriptionMod">
- <a class="btn-side" routerLink="/newsletter">Inscription</a>
- </div>
- <div *ngIf="subscriptionMod">
- <a class="btn-side" routerLink="/newsletter-unsubscribe"> Désabonnement </a>
+
+ <div class="link">
+ <a *ngIf="!subscriptionMod" routerLink="/newsletter">Inscription</a>
+ <a *ngIf="subscriptionMod" routerLink="/newsletter-unsubscribe">Désabonnement</a>
</div>
</div>
-</div>
+</form>
diff --git a/src/app/newsletter-subscription/newsletter-subscription.component.scss b/src/app/newsletter-subscription/newsletter-subscription.component.scss
index 475da47e9cf74d640fd0bd76c8db602b14ae415f..c42cc464efc0885355ff25fdb0f2cd043a0e3c19 100644
--- a/src/app/newsletter-subscription/newsletter-subscription.component.scss
+++ b/src/app/newsletter-subscription/newsletter-subscription.component.scss
@@ -1,20 +1,24 @@
-@import 'color';
+.newsletterForm {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+ width: fit-content;
+ padding: 1rem 0;
+ margin: auto;
-.subscriptionPasswordForm {
- max-width: 500px;
-}
-
-.button {
- margin-top: 20px;
- margin-bottom: 20px;
-}
+ .actions {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
-.form-input {
- background-color: $white;
- width: 100%;
-}
+ .buttons {
+ display: flex;
+ gap: 1rem;
+ }
-.btn-side {
- color: #4f4f4f;
- text-decoration: underline;
+ .link {
+ display: flex;
+ place-content: center;
+ }
+ }
}
diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html
index 99ed08f76357969b4b8687b65eb5c7cc12fc5235..cf99e8d2109a7902dd06e9a4975a46f9e5718174 100644
--- a/src/app/post/components/post-card/post-card.component.html
+++ b/src/app/post/components/post-card/post-card.component.html
@@ -15,12 +15,10 @@
/>
</div>
<div class="informations">
- <div class="inline">
- <app-v3-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" [size]="'small'" />
+ <div *ngIf="post.tags.length" class="inline">
+ <app-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" [size]="'small'" />
</div>
- <h2 fxLayout="row" class="title">
- {{ post.title }}
- </h2>
+ <h2 class="title">{{ post.title }}</h2>
<div class="details">
<div>Publié par : {{ post.author }}</div>
<div>
diff --git a/src/app/post/components/post-card/post-card.component.scss b/src/app/post/components/post-card/post-card.component.scss
index 058698b00fd639aebef60766af5f8287f5f922bd..5e1fcacf02e407e638ec0b7070057905dd16bf63 100644
--- a/src/app/post/components/post-card/post-card.component.scss
+++ b/src/app/post/components/post-card/post-card.component.scss
@@ -47,7 +47,7 @@
.details {
@include font-regular-14;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
}
}
diff --git a/src/app/post/components/post-details/post-details.component.html b/src/app/post/components/post-details/post-details.component.html
index b86bb600e7904abcc852c1e8afe1363efa9bb497..598bdf4e4d0f44375157993c2c12a4c57e94fb2a 100644
--- a/src/app/post/components/post-details/post-details.component.html
+++ b/src/app/post/components/post-details/post-details.component.html
@@ -1,5 +1,5 @@
<div *ngIf="post" class="postContainer">
- <app-v3-button
+ <app-button
[label]="'Retour'"
[variant]="'tertiary'"
[iconFolder]="'ico'"
@@ -9,7 +9,7 @@
<div class="gh-canvas">
<div class="inline">
- <app-v3-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" />
+ <app-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" />
</div>
<h1 class="title">{{ post.title }}</h1>
<div class="details">
diff --git a/src/app/post/components/post-details/post-details.component.scss b/src/app/post/components/post-details/post-details.component.scss
index 9fe01a944c5da69d2c2ccc151e68957a0c9c17fc..7a666d85c2ef16d29593df06e9ae3aa3f458108a 100644
--- a/src/app/post/components/post-details/post-details.component.scss
+++ b/src/app/post/components/post-details/post-details.component.scss
@@ -2,7 +2,6 @@
@import 'typography';
@import 'layout';
@import 'breakpoint';
-@import 'hyperlink';
@import 'ghost';
h1 {
@@ -38,7 +37,7 @@ h1 {
flex-direction: column;
gap: 4px;
@include font-regular-14;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
.informations {
diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html
index cd783f259da60fb81a9da44a476ac42afc876963..c5495657048aace912c5a1b8f32989d578d8f847 100644
--- a/src/app/post/components/post-header/post-header.component.html
+++ b/src/app/post/components/post-header/post-header.component.html
@@ -8,7 +8,7 @@
<nav>
<span
*ngFor="let tag of tags.others"
- class="btnTag"
+ class="tag"
tabindex="0"
role="listitem"
[ngClass]="{ active: tag.slug === mainActiveTag.slug || tag.name === mainActiveTag.slug }"
@@ -18,11 +18,11 @@
{{ tag.name }}
</span>
</nav>
- <app-v3-button
+ <app-button
class="publish-button hide-on-mobile"
[variant]="'primaryBlack'"
[label]="'Publier'"
- [iconName]="'add'"
+ [iconName]="'plus'"
(action)="togglePublishNews()"
/>
</div>
diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss
index 4def009a7624d9c252b7c3a093a8ec2f2c51cd93..486ea9c16fc75205f9fe29fd0972b441c0d6646a 100644
--- a/src/app/post/components/post-header/post-header.component.scss
+++ b/src/app/post/components/post-header/post-header.component.scss
@@ -1,5 +1,4 @@
@import 'color';
-@import 'buttons';
@import 'typography';
@import 'breakpoint';
@import 'layout';
@@ -25,15 +24,16 @@ header {
nav {
display: flex;
overflow-x: auto;
- .btnTag {
+ white-space: nowrap;
+ .tag {
+ cursor: pointer;
+ user-select: none;
+ @include font-regular-14;
+ box-sizing: border-box;
padding: 0 16px;
height: 60px;
- @include font-regular-14;
display: flex;
align-items: center;
- cursor: pointer;
- user-select: none;
- white-space: nowrap;
border-bottom: 3px solid transparent;
transition: all 0.3s ease-in-out;
&.active {
@@ -44,7 +44,7 @@ header {
border-color: $grey-4;
}
&:focus {
- outline-color: $primary-color;
+ outline-color: $red;
}
}
}
diff --git a/src/app/post/components/post-list/post-list.component.html b/src/app/post/components/post-list/post-list.component.html
index 5546494fb7f71cfcea43c3a25138bfbfdf41043e..18758c913f79a44b44f38bc49cbf424b3fc46a73 100644
--- a/src/app/post/components/post-list/post-list.component.html
+++ b/src/app/post/components/post-list/post-list.component.html
@@ -11,13 +11,13 @@
<div *ngIf="isLoading" class="loader" aria-busy="true">
<img class="loader-gif" src="/assets/gif/loader_circle.gif" alt />
</div>
- <div *ngIf="!isLastPage && !isLoading" class="loadMore">
- <app-v3-button
- class="loadMoreB"
- [variant]="'primaryBlack'"
- [label]="'Voir plus d\'actualités'"
- [wide]="true"
- (click)="loadMore()"
- />
- </div>
+
+ <app-button
+ *ngIf="!isLastPage && !isLoading"
+ class="loadMore"
+ [variant]="'primaryBlack'"
+ [label]="'Voir plus d\'actualités'"
+ [wide]="true"
+ (click)="loadMore()"
+ />
</div>
diff --git a/src/app/post/components/post-list/post-list.component.scss b/src/app/post/components/post-list/post-list.component.scss
index da0c186828b1c15788913386ffec6610d62fdc3a..b39ed183cff29d81281e136f951a7483544d3dd5 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -1,10 +1,9 @@
@import 'color';
@import 'typography';
-@import 'shapes';
@import 'breakpoint';
.news {
- padding-top: 2rem;
+ padding-block: 2rem;
}
@mixin big-container {
@@ -16,7 +15,7 @@
}
}
::ng-deep .post .imageContainer {
- .image {
+ img {
height: 40vw;
max-height: 320px;
@media #{$news-max} {
@@ -38,7 +37,7 @@
}
@media #{$news-max} {
- ::ng-deep .post .imageContainer .image {
+ ::ng-deep .post .imageContainer img {
height: unset;
max-height: 320px;
}
@@ -47,7 +46,7 @@
@mixin twin-container($start) {
grid-column: $start / span 6;
- ::ng-deep .post .imageContainer .image {
+ ::ng-deep .post .imageContainer img {
height: 40vw;
max-height: 250px;
}
@@ -58,7 +57,7 @@
@mixin triple-container-first {
grid-column: 1 / span 4;
- ::ng-deep .post .imageContainer .image {
+ ::ng-deep .post .imageContainer img {
height: 40vw;
max-height: 180px;
}
@@ -68,7 +67,7 @@
}
@mixin triple-container {
grid-column: span 4;
- ::ng-deep .post .imageContainer .image {
+ ::ng-deep .post .imageContainer img {
height: 40vw;
max-height: 180px;
}
@@ -134,7 +133,7 @@
}
.loadMore {
- margin: 16px auto 32px auto;
+ margin-top: 16px;
display: flex;
justify-content: center;
}
diff --git a/src/app/post/components/post-publish/post-publish.component.html b/src/app/post/components/post-publish/post-publish.component.html
index 7eba0c6e83f7b3dd9beae2d24a1bb8d80ab72695..d17fe0bd7c1f098d06b172eca74aae9c91e54d70 100644
--- a/src/app/post/components/post-publish/post-publish.component.html
+++ b/src/app/post/components/post-publish/post-publish.component.html
@@ -1,7 +1,7 @@
<div class="section-container no-padding news">
<div class="container">
<div class="goBack">
- <app-v3-button
+ <app-button
[label]="'Retour'"
[variant]="'tertiary'"
[iconFolder]="'ico'"
@@ -23,7 +23,7 @@
<p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL</p>
</div>
<div>
- <app-v3-button
+ <app-button
routerLink="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail"
[label]="'Envoyer votre actu par mail'"
[variant]="'primary'"
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index 7267da9225278fbd4529ce41b55d10ea18ec0aa0..48dcb3f8c92cf514839288ed3076a58290201706 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -6,7 +6,7 @@
<div class="title">
<h1>Modifier mon profil</h1>
</div>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondaryDelete'"
[label]="'Supprimer mon compte'"
@@ -15,7 +15,7 @@
[wide]="true"
(action)="showDeleteAccountModal()"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondaryDelete'"
[iconName]="'delete'"
@@ -94,16 +94,16 @@
<div *ngIf="currentTab === tabsEnum.credentials" class="credentialsTab">
<div class="credentials">
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
<span>{{ userProfile.email }}</span>
</div>
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'password'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'password'" [iconClass]="'icon-20'" />
<span>********</span>
</div>
</div>
<div class="buttons">
- <app-v3-button
+ <app-button
[variant]="'secondary'"
[label]="'Modifier mon email'"
[iconName]="'email'"
@@ -111,7 +111,7 @@
[wide]="true"
(action)="showEmailModal()"
/>
- <app-v3-button
+ <app-button
[variant]="'secondary'"
[label]="'Modifier mon mot de passe'"
[iconName]="'lock'"
@@ -151,8 +151,8 @@
</div>
<p class="subTitle">Fonction</p>
<div fxLayout="column" fxLayoutGap="32px">
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let job of jobs"
[iconName]="isSelectedJob(job) ? 'check' : null"
[label]="job.name"
@@ -180,7 +180,7 @@
/>
</div>
- <app-v3-modal
+ <app-modal
[title]="'ATTENTION'"
[opened]="showConfirmationModal"
[validateLabel]="'OK'"
@@ -188,7 +188,7 @@
>
Veuillez indiquer si vous souhaitez proposer la fonctionnalité 'être rappelé' dans l'onglet 'Employeur et
fonction'.
- </app-v3-modal>
+ </app-modal>
<div *ngIf="currentTab === tabsEnum.description" class="descriptionTab">
<app-textarea
@@ -202,13 +202,13 @@
<!-- Footer -->
<div *ngIf="currentTab !== tabsEnum.credentials" class="footer">
- <app-v3-button *ngIf="profileChanged()" [variant]="'secondary'" [label]="'Annuler'" (action)="cancel()" />
- <app-v3-button [variant]="'primary'" [label]="'Valider'" [disabled]="!isPageValid()" (action)="confirm()" />
+ <app-button *ngIf="profileChanged()" [variant]="'secondary'" [label]="'Annuler'" (action)="cancel()" />
+ <app-button [variant]="'primary'" [label]="'Valider'" [disabled]="!isPageValid()" (action)="confirm()" />
</div>
</div>
<!-- Modal: Email change -->
- <app-v3-modal
+ <app-modal
[title]="'Modifier mon email'"
[opened]="emailModal"
[validateLabel]="'Valider'"
@@ -225,10 +225,10 @@
[(value)]="newEmailConfirm"
/>
</div>
- </app-v3-modal>
+ </app-modal>
<!-- Modal: Password change -->
- <app-v3-modal
+ <app-modal
[title]="'Modifier mon mot de passe'"
[opened]="passwordModal"
[validateDisabled]="!isPageValid()"
@@ -268,10 +268,10 @@
/>
</div>
</div>
- </app-v3-modal>
+ </app-modal>
<!-- Modal: Delete account -->
- <app-v3-modal
+ <app-modal
[title]="'Supprimer mon compte'"
[opened]="deleteAccountModal"
[validateLabel]="'Valider'"
@@ -283,24 +283,14 @@
Cette action est définitive, veuillez entrer votre mot de passe afin de supprimer votre compte
</p>
- <div class="modal-form-group">
- <label for="oldPassword">Mot de passe</label>
- <div class="modal-form-item">
- <input
- id="oldPassword"
- class="form-input password"
- autocomplete="on"
- [type]="isShowPassword.oldPassword ? 'text' : 'password'"
- [(ngModel)]="oldPassword"
- />
- <app-svg-icon
- [iconClass]="'icon-32 grey hover'"
- [type]="'form'"
- [icon]="isShowPassword.oldPassword ? 'eyePasswordInvisible' : 'eyePasswordVisible'"
- (click)="showPassword(ShowPassword.oldPassword)"
- />
- </div>
- </div>
+ <app-input
+ autocomplete="on"
+ [id]="oldPassword"
+ [label]="'Mot de passe'"
+ [type]="'password'"
+ [size]="'large'"
+ [(value)]="oldPassword"
+ />
</div>
- </app-v3-modal>
+ </app-modal>
</div>
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 35af539ae5dcb8f70b5b4a9379c184c9902bf773..ef12dc1a71d6dc6c8fab6d2bead1db205969b95c 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -1,7 +1,5 @@
@import 'color';
@import 'typography';
-@import 'hyperlink';
-@import 'shapes';
@import 'breakpoint';
.content-container {
@@ -61,17 +59,24 @@
border-bottom: 1px solid $grey-5;
.tab {
- padding-bottom: 1rem;
- justify-content: center;
+ cursor: pointer;
+ user-select: none;
+ @include font-regular-14;
+ box-sizing: border-box;
+ padding: 0 16px;
+ height: 60px;
display: flex;
+ justify-content: center;
+ align-items: center;
flex: 1;
- user-select: none;
+ border-bottom: 3px solid transparent;
+ transition: all 0.3s ease-in-out;
&:hover {
- cursor: pointer;
+ border-color: $grey-4;
}
&.selected {
font-weight: bold;
- border-bottom: 2px solid $grey-1;
+ border-color: $grey-1;
}
}
}
@@ -112,7 +117,7 @@
@include font-bold-16;
}
}
- .btn-grid {
+ .tagList {
margin-bottom: 1em;
}
@@ -142,11 +147,6 @@
justify-content: center;
flex-wrap: wrap;
border-top: 1px solid $grey-5;
-
- // V3REMOVE
- ::ng-deep div svg {
- height: 22px;
- }
}
}
@@ -171,21 +171,3 @@ p {
width: 300px;
}
}
-
-.modal-form-group {
- display: flex;
- flex-direction: column;
- max-width: fit-content;
- padding: 8px 0;
-
- label {
- text-align: left;
- }
-
- .modal-form-item {
- display: flex;
- flex-direction: row;
- justify-content: center;
- gap: 16px;
- }
-}
diff --git a/src/app/profile/edit/edit.component.ts b/src/app/profile/edit/edit.component.ts
index f3fc46f43d381e91ad48aa17fe7bae1f118baccd..3f9c18914df37ffb33ed1687b12ccb3699d62311 100644
--- a/src/app/profile/edit/edit.component.ts
+++ b/src/app/profile/edit/edit.component.ts
@@ -8,7 +8,6 @@ import { Job } from '../../models/job.model';
import { User } from '../../models/user.model';
import { AuthService } from '../../services/auth.service';
import { NotificationService } from '../../services/notification.service';
-import { ButtonType } from '../../shared/components/button/buttonType.enum';
import { CustomRegExp } from '../../utils/CustomRegExp';
import { Utils } from '../../utils/utils';
import { ProfileService } from '../services/profile.service';
@@ -36,7 +35,6 @@ type passwordStatuses = 'error' | 'info' | 'success';
})
export class EditComponent implements OnInit {
public tabsEnum = tabsEnum;
- public buttonTypeEnum = ButtonType;
public currentTab: tabsEnum = tabsEnum.details;
@Input() userProfile: User;
diff --git a/src/app/profile/personal-offer-edition/personal-offer-edition.component.html b/src/app/profile/personal-offer-edition/personal-offer-edition.component.html
index d4a09f5091b6d4fcf1d9281d097ab52ed328f865..607c7bcf83e72105f901c5743d28ef4200a1f5be 100644
--- a/src/app/profile/personal-offer-edition/personal-offer-edition.component.html
+++ b/src/app/profile/personal-offer-edition/personal-offer-edition.component.html
@@ -8,7 +8,7 @@
<h2 *ngIf="structureName" class="overtitle">{{ structureName }}</h2>
</div>
</div>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondaryDelete'"
[label]="'Supprimer mon offre'"
@@ -17,7 +17,7 @@
[size]="'small'"
(action)="showDeleteOfferModal()"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondaryDelete'"
[iconName]="'delete'"
@@ -66,13 +66,13 @@
<!-- Footer -->
<div class="footer">
- <app-v3-button
+ <app-button
[variant]="'secondary'"
[label]="'Annuler'"
[disabled]="personalOfferForm?.pristine"
(action)="cancel()"
/>
- <app-v3-button
+ <app-button
[variant]="'primary'"
[label]="'Valider'"
[disabled]="personalOfferForm?.pristine"
@@ -82,7 +82,7 @@
</div>
<!-- Modal : Delete offer -->
- <app-v3-modal
+ <app-modal
[title]="'Supprimer mon offre'"
[opened]="deleteOfferModal"
[validateLabel]="'Supprimer'"
@@ -92,5 +92,5 @@
<p *ngIf="structureName" class="emphasized">{{ structureName }}</p>
<p>Vous êtes sur le point de supprimer votre offre d’accompagnements, veuillez confirmer pour poursuivre</p>
</div>
- </app-v3-modal>
+ </app-modal>
</div>
diff --git a/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss b/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
index 4af3aaa7f07c6785f8c1aac99014613f29405dc1..581ea7142e803d9d5e9e2abe620e48bc0a5f6a4f 100644
--- a/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
+++ b/src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
@@ -1,7 +1,5 @@
@import 'color';
@import 'typography';
-@import 'hyperlink';
-@import 'shapes';
@import 'breakpoint';
.content-container {
@@ -65,21 +63,27 @@
justify-content: flex-start;
overflow-x: auto;
white-space: nowrap;
-
border-bottom: 1px solid $grey-5;
.tab {
- padding-bottom: 1rem;
- justify-content: center;
+ cursor: pointer;
+ user-select: none;
+ @include font-regular-14;
+ box-sizing: border-box;
+ padding: 0 16px;
+ height: 60px;
display: flex;
+ justify-content: center;
+ align-items: center;
flex: 1;
- user-select: none;
+ border-bottom: 3px solid transparent;
+ transition: all 0.3s ease-in-out;
&:hover {
- cursor: pointer;
+ border-color: $grey-4;
}
&.selected {
font-weight: bold;
- border-bottom: 2px solid $grey-1;
+ border-color: $grey-1;
}
}
}
@@ -96,11 +100,6 @@
justify-content: center;
flex-wrap: wrap;
border-top: 1px solid $grey-5;
-
- // V3REMOVE
- ::ng-deep div svg {
- height: 22px;
- }
}
}
diff --git a/src/app/profile/profile-structure/personal-offer/personal-offer.component.html b/src/app/profile/profile-structure/personal-offer/personal-offer.component.html
index 4dc5c3b19722bd8f5cd06c74dd256bf6421f2cee..4bb0938ceee03218bb1980dfb8578039b36a9559 100644
--- a/src/app/profile/profile-structure/personal-offer/personal-offer.component.html
+++ b/src/app/profile/profile-structure/personal-offer/personal-offer.component.html
@@ -1,7 +1,7 @@
<div *ngIf="this.personalOffer.categoriesDisplay" class="container">
<div class="header">
<h2 class="uppercase">Mon offre d'accompagnements</h2>
- <app-v3-button
+ <app-button
*ngIf="!isPublic"
class="hide-on-mobile"
[state]="{ structureName: this.structureName }"
@@ -12,7 +12,7 @@
[size]="'small'"
[wide]="true"
/>
- <app-v3-icon-button
+ <app-icon-button
*ngIf="!isPublic"
class="hide-on-desktop"
routerLink="./edit-personal-offer/{{ this.personalOffer._id }}"
@@ -30,7 +30,7 @@
<app-collapse-content>
<ul>
<li *ngFor="let onlineProcedure of this.personalOffer.categoriesDisplay.onlineProcedures">
- {{ onlineProcedure }}
+ {{ onlineProcedure.name }}
</li>
</ul>
</app-collapse-content>
@@ -44,7 +44,7 @@
</app-collapse-header>
<app-collapse-content>
<ul>
- <li *ngFor="let baseSkill of this.personalOffer.categoriesDisplay.baseSkills">{{ baseSkill }}</li>
+ <li *ngFor="let baseSkill of this.personalOffer.categoriesDisplay.baseSkills">{{ baseSkill.name }}</li>
</ul>
</app-collapse-content>
</app-collapse>
@@ -58,7 +58,7 @@
<app-collapse-content>
<ul>
<li *ngFor="let advancedSkill of this.personalOffer.categoriesDisplay.advancedSkills">
- {{ advancedSkill }}
+ {{ advancedSkill.name }}
</li>
</ul>
</app-collapse-content>
diff --git a/src/app/profile/profile-structure/profile-structure.component.html b/src/app/profile/profile-structure/profile-structure.component.html
index 468809c32fa5c998d9fc1fd43847b71a6986cda4..42f65fba26911d5c0b94b6ceda930ecc77033919 100644
--- a/src/app/profile/profile-structure/profile-structure.component.html
+++ b/src/app/profile/profile-structure/profile-structure.component.html
@@ -12,9 +12,9 @@
<img alt="" height="80px" width="80px" [src]="'../../../../../assets/ico/' + getStructureTypeIcon() + '.svg'" />
<div class="structureInfos">
<p class="structureName">{{ structure.structureName }}</p>
- <app-v3-tag-item
- *ngIf="structure.structureType?.value"
- [label]="structure.structureType?.value"
+ <app-tag-item
+ *ngIf="structure.structureType?.name"
+ [label]="structure.structureType?.name"
[size]="'small'"
[color]="'red'"
/>
@@ -27,7 +27,7 @@
</div>
</div>
<div class="right">
- <app-v3-button
+ <app-button
*ngIf="isPending && !isPublic"
class="hide-on-mobile"
[variant]="'secondary'"
@@ -43,7 +43,7 @@
<div class="sectionHeader">
<p class="sectionTitle uppercase">informations</p>
<div class="sectionButtons">
- <app-v3-button
+ <app-button
class="hide-on-mobile"
routerLink="./"
tabindex="none"
@@ -51,21 +51,21 @@
[variant]="'secondary'"
[label]="'Voir la structure'"
[iconFolder]="'form'"
- [iconName]="'eye'"
+ [iconName]="'visibility'"
[size]="'small'"
[queryParams]="{ id: structure._id }"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
routerLink="./"
tabindex="none"
[routerLinkActive]="'active'"
[variant]="'secondary'"
[iconFolder]="'form'"
- [iconName]="'eye'"
+ [iconName]="'visibility'"
[queryParams]="{ id: structure._id }"
/>
- <app-v3-button
+ <app-button
*ngIf="!isPublic && !isPending"
class="hide-on-mobile"
tabindex="none"
@@ -75,7 +75,7 @@
[label]="'Modifier la structure'"
[size]="'small'"
/>
- <app-v3-icon-button
+ <app-icon-button
*ngIf="!isPublic && !isPending"
class="hide-on-desktop"
tabindex="none"
@@ -88,15 +88,15 @@
</div>
<div class="sectionContent infoSection">
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'address'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'address'" />
<p>{{ getAddress() }}</p>
</div>
<div *ngIf="structure.contactPhone" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'phone'" />
<p>{{ structure.contactPhone | phone }}</p>
</div>
<div *ngIf="structure.contactMail" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'ico'" [icon]="'mail'" />
<a class="email" href="mailto:{{ structure.contactMail }}">
{{ structure.contactMail }}
</a>
@@ -113,7 +113,7 @@
<div *ngIf="membersWithJobWithPO.length > 0" class="section">
<div class="sectionHeader">
<p class="sectionTitle uppercase">Accompagnant·es numériques</p>
- <app-v3-button
+ <app-button
*ngIf="!isPublic && !isPending"
class="hide-on-mobile"
routerLink="./structure-members-management/{{ structure._id }}"
@@ -124,7 +124,7 @@
[size]="'small'"
[wide]="true"
/>
- <app-v3-icon-button
+ <app-icon-button
*ngIf="!isPublic && !isPending"
class="hide-on-desktop"
routerLink="./structure-members-management/{{ structure._id }}"
@@ -135,18 +135,23 @@
/>
</div>
<div class="sectionContent members">
- <app-member-card *ngFor="let member of membersWithJobWithPO" [member]="member" />
+ <app-member-card
+ *ngFor="let member of membersWithJobWithPO"
+ [member]="member"
+ [redirectToProfile]="false"
+ [showEmployer]="false"
+ />
</div>
</div>
<div
*ngIf="!isPublic && !this.personalOffer && userProfile.job?.hasPersonalOffer && !isPending"
class="call-to-action"
>
- <app-v3-button
+ <app-button
[routerLinkActive]="'active'"
[variant]="'primaryBlack'"
[label]="'Ajouter une offre'"
- [iconName]="'add'"
+ [iconName]="'plus'"
[size]="'small'"
[wide]="true"
(click)="goToOffer()"
diff --git a/src/app/profile/profile-structure/profile-structure.component.scss b/src/app/profile/profile-structure/profile-structure.component.scss
index c04e7bc82bd4590abdbb1731d89b2ec1e37755a6..fddf6a306e4d20b0286127a683687679a185e55e 100644
--- a/src/app/profile/profile-structure/profile-structure.component.scss
+++ b/src/app/profile/profile-structure/profile-structure.component.scss
@@ -1,7 +1,6 @@
@import 'color';
@import 'typography';
@import 'breakpoint';
-@import 'shapes';
.collapseHeader {
width: 100%;
@@ -32,7 +31,7 @@
p {
margin: 0 !important;
&.structureName {
- @include font-bold-16;
+ @include font-bold-18;
}
&.structureType {
@include font-regular-14;
@@ -92,14 +91,6 @@
margin-bottom: 1rem;
}
-// V3REMOVE
-::ng-deep app-button.warning button {
- color: $orange-warning;
- .text {
- border: 1px solid $orange-warning !important;
- }
-}
-
.row {
display: flex;
gap: 8px;
diff --git a/src/app/profile/profile-structure/profile-structure.component.ts b/src/app/profile/profile-structure/profile-structure.component.ts
index 4243456cc6e83cacdfc6cba9ddca1234cd501abf..47d9a0a49f14673d8ffafc6dbf6524acd353893c 100644
--- a/src/app/profile/profile-structure/profile-structure.component.ts
+++ b/src/app/profile/profile-structure/profile-structure.component.ts
@@ -5,7 +5,7 @@ import { DateTime } from 'luxon';
import { structureFormStep } from '../../form/form-view/structure-form/structureFormStep.enum';
import { Structure } from '../../models/structure.model';
import { StructureWithOwners } from '../../models/structureWithOwners.model';
-import { CollapseType } from '../../shared/components/v3/collapse/collapse.type';
+import { CollapseType } from '../../shared/components/collapse/collapse.type';
import { SearchService } from '../../structure-list/services/search.service';
import { FormUtils } from '../../utils/formUtils';
import { Utils } from '../../utils/utils';
diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html
index 3d6c6cc12c3501cf3cb58c9eb35e2942c798b37a..86e1e80a1c647bd64a2b8c893cb55e72f913861d 100644
--- a/src/app/profile/profile.component.html
+++ b/src/app/profile/profile.component.html
@@ -6,7 +6,7 @@
<section>
<div class="header">
<h1 class="uppercase">Profil</h1>
- <app-v3-button
+ <app-button
*ngIf="isPublic && userProfile.withAppointment"
class="hide-on-mobile rdv"
tabindex="none"
@@ -19,7 +19,7 @@
[size]="'small'"
[wide]="true"
/>
- <app-v3-button
+ <app-button
*ngIf="!isPublic"
class="hide-on-mobile"
tabindex="none"
@@ -31,7 +31,7 @@
[size]="'small'"
[wide]="true"
/>
- <app-v3-icon-button
+ <app-icon-button
*ngIf="!isPublic"
class="hide-on-desktop"
tabindex="none"
@@ -42,7 +42,7 @@
/>
</div>
<div class="profile">
- <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-112'" />
+ <app-svg-icon class="avatar" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-112'" />
<div class="information">
<div class="block">
<div class="name">{{ userProfile.name | userName }} {{ userProfile.surname | uppercase }}</div>
@@ -50,15 +50,15 @@
</div>
<div class="block contact">
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'phone'" />
<div>{{ userProfile.phone | phone }}</div>
</div>
<div class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'mail'" />
<a href="mailto:{{ userProfile.email }}">{{ userProfile.email }}</a>
</div>
<div *ngIf="isPublic && userProfile.withAppointment" class="row">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'rdv'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'rdv'" />
<div>Rendez-vous</div>
</div>
</div>
@@ -66,7 +66,7 @@
<div *ngIf="userProfile.description" class="description">{{ userProfile.description }}</div>
</div>
</div>
- <app-v3-button
+ <app-button
*ngIf="!isPublic && !userProfile.description"
class="centerButton"
tabindex="none"
@@ -75,7 +75,7 @@
[state]="{ data: 'description' }"
[variant]="'secondary'"
[label]="'Ajouter une description'"
- [iconName]="'add'"
+ [iconName]="'plus'"
[size]="'small'"
[wide]="true"
/>
@@ -88,7 +88,8 @@
<ng-template ngPluralCase="1">Structure</ng-template>
<ng-template ngPluralCase="other">Structures</ng-template>
</h1>
- <app-v3-button
+ <!-- Do NOT pluralize this button, it's weird for the UX otherwise -->
+ <app-button
*ngIf="userProfile.structuresLink.length > 0"
class="hide-on-mobile"
routerLink="./structures-management"
@@ -96,11 +97,11 @@
[routerLinkActive]="'active'"
[iconName]="'edit'"
[variant]="'primaryBlack'"
- [label]="userProfile.structuresLink.length > 1 ? 'Gérer mes structures' : 'Gérer ma structure'"
+ [label]="'Gérer mes structures'"
[size]="'small'"
[wide]="true"
/>
- <app-v3-icon-button
+ <app-icon-button
*ngIf="userProfile.structuresLink.length > 0"
class="hide-on-desktop"
tabindex="none"
@@ -131,13 +132,13 @@
[isPublic]="this.isPublic"
/>
</div>
- <app-v3-button
+ <app-button
class="centerButton"
tabindex="none"
routerLink="/form/structure"
[variant]="'secondary'"
[label]="'Ajouter une structure'"
- [iconName]="'add'"
+ [iconName]="'plus'"
[size]="'small'"
[wide]="true"
/>
diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss
index c9c86211c8ca31140693050cbb5665013b9490e9..48ee89d930657b5bca52619142028a7364e2399f 100644
--- a/src/app/profile/profile.component.scss
+++ b/src/app/profile/profile.component.scss
@@ -1,7 +1,5 @@
@import 'color';
@import 'typography';
-@import 'hyperlink';
-@import 'shapes';
@import 'breakpoint';
@import 'layout';
@@ -23,18 +21,18 @@
}
section {
- width: $content-desktop-width;
+ width: 100%;
+ max-width: 980px;
display: flex;
gap: 2em;
flex-direction: column;
align-items: flex-start;
box-sizing: border-box;
- padding: 2rem;
background: $white;
border: 1px solid $grey-6;
border-radius: 8px;
+ padding: 2rem;
@media #{$tablet} {
- width: 100%;
padding: 1.5rem;
}
@@ -47,10 +45,6 @@ section {
h1 {
@include font-bold-18;
}
- // V3REMOVE
- .backArrow {
- cursor: pointer;
- }
}
.profile {
@@ -84,7 +78,7 @@ section {
}
.job {
@include font-regular-15;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
.contact {
diff --git a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
index 67387c0190302af168953897cf43da5225572fd7..9db4feffb9bb837c0bad8ef43805e9fed8816b3f 100644
--- a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
+++ b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html
@@ -1,4 +1,4 @@
-<app-v3-modal
+<app-modal
[title]="'Ajouter un membre'"
[opened]="opened"
[validateLabel]="'Ajouter'"
@@ -10,13 +10,13 @@
<label for="email">Email du membre à ajouter</label>
<div class="modalItem">
<input type="text" formControlName="email" class="form-input" autocomplete="on" />
- <app-svg-icon *ngIf="fAddAccount.email.valid" [type]="'form'" [icon]="'validate'" />
+ <app-svg-icon *ngIf="fAddAccount.email.valid" [folder]="'form'" [icon]="'validate'" />
<app-svg-icon
*ngIf="fAddAccount.email.invalid && fAddAccount.email.value"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
</div>
</form>
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
index 28731f72e59c9b3ff175b33240637520d2adbf5b..80e5d1db213468c3d41cbd17f2e66f2434ea2704 100644
--- a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
+++ b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
@Component({
selector: 'app-missing-information',
template: `<p class="warning">
- <app-svg-icon [type]="'tags'" [icon]="'warning'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'warning'" />
<span>{{ plural ? 'Informations manquantes' : 'Information manquante' }}</span>
</p>`,
styleUrls: ['./missing-information.component.scss'],
diff --git a/src/app/profile/structure-edition-summary/no-information/no-information.component.scss b/src/app/profile/structure-edition-summary/no-information/no-information.component.scss
index 02f9e779ce6d9c5a6d3c5403053c40850e7f3d47..442c7da16c03f4e14b7d3b3027f61624c2652cee 100644
--- a/src/app/profile/structure-edition-summary/no-information/no-information.component.scss
+++ b/src/app/profile/structure-edition-summary/no-information/no-information.component.scss
@@ -1,7 +1,7 @@
@import 'color';
.noInformation {
- color: $grey-4-text;
+ color: $grey-4-5-1;
font-weight: 400;
font-style: italic;
margin: 0;
diff --git a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
index 04d9a9a5f45e72d7790da9ac97a88830b75ca8ba..ae04a0fc7a6ed269f87f5e8d56e6cba12fa03185 100644
--- a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
+++ b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html
@@ -17,7 +17,7 @@
<section class="nameAndAddress">
<div class="sectionHeader">
<h3 class="uppercase">Nom et adresse</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -25,7 +25,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureNameAndAddress)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -34,13 +34,13 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'structureType'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'structureType'" />
<p>
{{ structure.structureName }}
</p>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'address'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'address'" />
<p>
{{ formatAddress() }}
</p>
@@ -54,7 +54,7 @@
<h3 class="uppercase">Type de structure</h3>
<app-missing-information *ngIf="!isFieldValid('structureType')" />
</div>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -62,7 +62,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureType)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -71,7 +71,7 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'structure'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'structure'" />
<app-no-information *ngIf="!isFieldValid('structureType')" />
<p *ngIf="isFieldValid('structureType')" class="inline">
{{ structure.structureType?.category }} - {{ structure.structureType?.name }}
@@ -83,7 +83,7 @@
<section class="description">
<div class="sectionHeader">
<h3 class="uppercase">Description</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -91,7 +91,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureDescription)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -110,7 +110,7 @@
<h3 class="uppercase">Téléphone et email</h3>
<app-missing-information *ngIf="requiredPhoneOrMailError()" />
</div>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -118,7 +118,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureContact)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -127,14 +127,14 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'phone'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'phone'" />
<app-no-information *ngIf="utils.isNullOrEmpty(structure.contactPhone)" />
<p *ngIf="!utils.isNullOrEmpty(structure.contactPhone)">
{{ structure.contactPhone }}
</p>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'mail'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'mail'" />
<app-no-information *ngIf="utils.isNullOrEmpty(structure.contactMail)" />
<a *ngIf="!utils.isNullOrEmpty(structure.contactMail)" [href]="mailHref">
{{ structure.contactMail }}
@@ -146,7 +146,7 @@
<section class="webAndSocialNetworks">
<div class="sectionHeader">
<h3 class="uppercase">Présence sur internet</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -154,7 +154,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureWebAndSocialNetwork)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -163,13 +163,13 @@
</div>
<div class="content">
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'website'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'website'" />
<app-no-information *ngIf="!structure.website" />
<a *ngIf="structure.website" href="{{ structure.website }}">{{ structure.website }}</a>
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'x'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'x'" />
<app-no-information *ngIf="!structure.twitter" />
<a
*ngIf="structure.twitter"
@@ -183,7 +183,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'facebook'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'facebook'" />
<app-no-information *ngIf="!structure.facebook" />
<a
*ngIf="structure.facebook"
@@ -197,7 +197,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'linkedin'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'linkedin'" />
<app-no-information *ngIf="!structure.linkedin" />
<a
*ngIf="structure.linkedin"
@@ -211,7 +211,7 @@
</div>
<div class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'instagram'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'instagram'" />
<app-no-information *ngIf="!structure.instagram" />
<a
*ngIf="structure.instagram"
@@ -229,7 +229,7 @@
<section class="hours">
<div class="sectionHeader">
<h3 class="uppercase">Horaires</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -237,7 +237,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureHours)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -262,7 +262,7 @@
<section class="proceduresAccompaniment">
<div class="sectionHeader">
<h3 class="uppercase">Aides aux démarches en ligne</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -270,19 +270,26 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureDigitalHelpingAccompaniment)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
(action)="goToEdit(structureFormStep.structureDigitalHelpingAccompaniment)"
/>
</div>
+ <app-tag-item
+ *ngIf="containsDigitalHelp()"
+ label="Accompagnements gratuits"
+ size="small"
+ color="red"
+ [clickable]="false"
+ />
<div class="content">
<app-no-information *ngIf="!containsDigitalHelp()" />
<div *ngIf="containsDigitalHelp()" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let digitalHelp of structure.categoriesDisplay.onlineProcedures"
- [label]="digitalHelp"
+ [label]="digitalHelp.name"
[color]="'red'"
[size]="'small'"
/>
@@ -293,7 +300,7 @@
<section class="proceduresAccompaniment">
<div class="sectionHeader">
<h3 class="uppercase">Autres démarches en ligne</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -301,13 +308,14 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureDigitalHelpingAccompanimentOther)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
(action)="goToEdit(structureFormStep.structureDigitalHelpingAccompanimentOther)"
/>
</div>
+
<div class="content">
<app-no-information *ngIf="!structure.otherDescription" />
<ng-container *ngIf="structure.otherDescription">
@@ -319,7 +327,7 @@
<section class="learning" id="learning">
<div class="sectionHeader">
<h3 class="uppercase">Accompagnements aux usages numériques</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -327,13 +335,22 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureTrainingType)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
(action)="goToEdit(structureFormStep.structureTrainingType)"
/>
</div>
+ <app-tag-item
+ *ngIf="containsDigitalLearning()"
+ wa
+ [label]="structure.getFreeWorkshopLabel()"
+ [size]="'small'"
+ [color]="'red'"
+ [clickable]="false"
+ />
+
<div class="content">
<app-no-information *ngIf="!containsDigitalLearning()" />
<div *ngIf="containsDigitalLearning()" class="formationDetails">
@@ -345,7 +362,7 @@
<hr />
<ul>
<li *ngFor="let skill of structure.categoriesDisplay.baseSkills">
- {{ skill }}
+ {{ skill.name }}
</li>
</ul>
</app-collapse-content>
@@ -361,7 +378,7 @@
<hr />
<ul>
<li *ngFor="let skill of structure.categoriesDisplay.advancedSkills">
- {{ skill }}
+ {{ skill.name }}
</li>
</ul>
</app-collapse-content>
@@ -377,7 +394,7 @@
>
<div class="sectionHeader">
<h3 class="uppercase">Gratuité des accompagnements aux usages numériques</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -385,7 +402,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureTrainingPrice)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -401,7 +418,7 @@
<section class="wifi">
<div class="sectionHeader">
<h3 class="uppercase">Wifi</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -409,7 +426,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureWifi)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -426,7 +443,7 @@
<section class="equipements">
<div class="sectionHeader">
<h3 class="uppercase">Matériel en accès libre</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -434,7 +451,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureEquipments)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -444,19 +461,19 @@
<div class="content">
<app-no-information *ngIf="!hasEquipments(structure)" />
<div *ngIf="!!filterOnlyEquipments(structure.categories.selfServiceMaterial)" class="list">
- <app-v3-tag-item
+ <app-tag-item
[label]="getEquipmentsLabelAndValue(equipmentEnum.computer, structure.nbComputers)"
[color]="'red'"
[size]="'small'"
/>
- <app-v3-tag-item
+ <app-tag-item
[label]="getEquipmentsLabelAndValue(equipmentEnum.printer, structure.nbPrinters)"
[color]="'red'"
[size]="'small'"
/>
- <app-v3-tag-item
+ <app-tag-item
[label]="getEquipmentsLabelAndValue(equipmentEnum.scanner, structure.nbScanners)"
[color]="'red'"
[size]="'small'"
@@ -468,7 +485,7 @@
<section class="solidarityMaterial">
<div class="sectionHeader">
<h3 class="uppercase">Achat de matériel à tarif solidaire</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -476,7 +493,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureSolidarityMaterial)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -486,9 +503,9 @@
<div class="content">
<app-no-information *ngIf="structure.categoriesDisplay.solidarityMaterial.length === 0" />
<div class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let material of structure.categoriesDisplay.solidarityMaterial"
- [label]="material"
+ [label]="material.name"
[color]="'red'"
[size]="'small'"
/>
@@ -499,7 +516,7 @@
<section class="accessModality" [ngClass]="{ warningBorder: !isFieldValid('accessModality', 'categories') }">
<div class="sectionHeader">
<h3 class="uppercase">Modalité d’accès</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -507,7 +524,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureAccessModality)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -517,9 +534,9 @@
<div class="content">
<app-missing-information *ngIf="!isFieldValid('accessModality', 'categories')" />
<div *ngIf="isFieldValid('accessModality', 'categories')" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let accessModality of structure.categoriesDisplay.accessModality"
- [label]="accessModality"
+ [label]="accessModality.name"
[color]="'red'"
[size]="'small'"
/>
@@ -533,7 +550,7 @@
>
<div class="sectionHeader">
<h3 class="uppercase">Publics accueillis</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -541,7 +558,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structurePublicTarget)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -550,9 +567,9 @@
</div>
<div class="content">
<div *ngIf="isFieldValid('age', 'categories') && structure.categoriesDisplay.age" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let public of structure.categoriesDisplay.age"
- [label]="public"
+ [label]="public.name"
[color]="'red'"
[size]="'small'"
/>
@@ -568,7 +585,7 @@
<section class="publics">
<div class="sectionHeader">
<h3 class="uppercase">Public spécifique admis</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -576,7 +593,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structurePublicTargetOptional)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -587,9 +604,9 @@
<h4>Langue et illettrisme</h4>
<app-no-information *ngIf="structure.categoriesDisplay.languageAndIlliteracy.length === 0" />
<div *ngIf="structure.categoriesDisplay.languageAndIlliteracy.length" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let public of structure.categoriesDisplay.languageAndIlliteracy"
- [label]="public"
+ [label]="public.name"
[color]="'red'"
[size]="'small'"
/>
@@ -599,9 +616,9 @@
<h4>Handicaps</h4>
<app-no-information *ngIf="structure.categoriesDisplay.handicaps.length === 0" />
<div *ngIf="structure.categoriesDisplay.handicaps.length" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let public of structure.categoriesDisplay.handicaps"
- [label]="public"
+ [label]="public.name"
[color]="'red'"
[size]="'small'"
/>
@@ -611,9 +628,9 @@
<h4>Genre</h4>
<app-no-information *ngIf="structure.categoriesDisplay.genre.length === 0" />
<div *ngIf="structure.categoriesDisplay.genre.length" class="list">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let public of structure.categoriesDisplay.genre"
- [label]="public"
+ [label]="public.name"
[color]="'red'"
[size]="'small'"
/>
@@ -638,7 +655,7 @@
<h3 class="uppercase">Accessibilité pour les personnes à mobilité réduite</h3>
<app-missing-information *ngIf="structure.pmrAccess === null" />
</div>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -646,7 +663,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structurePmr)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -664,7 +681,7 @@
<section class="members">
<div class="sectionHeader">
<h3 class="uppercase">Membres</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -672,7 +689,7 @@
[size]="'small'"
(action)="goToManageMembers()"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -689,7 +706,7 @@
<section class="labels">
<div class="sectionHeader">
<h3 class="uppercase">Labellisations</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -697,7 +714,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureLabels)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -705,9 +722,12 @@
/>
</div>
<div class="content">
- <app-no-information *ngIf="structure.categories.labelsQualifications.length === 0" />
+ <app-no-information *ngIf="structure.categoriesDisplay.labelsQualifications.length === 0" />
<div class="labelsContainer">
- <app-logo-card *ngFor="let label of structure.categories.labelsQualifications.sort()" [name]="label" />
+ <app-logo-card
+ *ngFor="let label of structure.categoriesDisplay.labelsQualifications.sort()"
+ [module]="label"
+ />
</div>
</div>
</section>
@@ -715,7 +735,7 @@
<section class="covid">
<div class="sectionHeader">
<h3 class="uppercase">Informations spécifiques à la période COVID</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -723,7 +743,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureCovidInfo)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -739,7 +759,7 @@
<section class="dataShare">
<div class="sectionHeader">
<h3 class="uppercase">Partage de données sur data.grandlyon.com</h3>
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'secondary'"
[label]="'Modifier'"
@@ -747,7 +767,7 @@
[size]="'small'"
(action)="goToEdit(structureFormStep.structureConsent)"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'secondary'"
[iconName]="'edit'"
@@ -759,26 +779,24 @@
</div>
</section>
</div>
-
<div class="footer">
<ng-container *ngIf="isUpdateStructure">
<p *ngIf="!isFormValid()" class="warning">
Vous pourrez valider après avoir renseigné l’intégralité des champs obligatoires.
</p>
<div class="buttons">
- <app-v3-button [variant]="'secondary'" [label]="'Retour'" [size]="'small'" (action)="goBack()" />
- <app-v3-button
+ <app-button [variant]="'secondary'" [label]="'Retour'" (action)="goBack()" />
+ <app-button
[variant]="'primary'"
[label]="'Valider'"
[disabled]="!isFormValid()"
- [size]="'small'"
(action)="updateStructureUpdateDate()"
/>
</div>
</ng-container>
<ng-container *ngIf="!isUpdateStructure">
<div class="buttons">
- <app-v3-button [variant]="'secondary'" [label]="'Retour'" [size]="'small'" (action)="goBack()" />
+ <app-button [variant]="'secondary'" [label]="'Retour'" (action)="goBack()" />
</div>
</ng-container>
</div>
diff --git a/src/app/profile/structure-edition-summary/structure-edition-summary.component.scss b/src/app/profile/structure-edition-summary/structure-edition-summary.component.scss
index 25887a73b10a62eab0342c9ad4933c4ceda6d194..546f351723a1aea505d063d74ff59a1b6c9fab92 100644
--- a/src/app/profile/structure-edition-summary/structure-edition-summary.component.scss
+++ b/src/app/profile/structure-edition-summary/structure-edition-summary.component.scss
@@ -6,20 +6,18 @@
.container {
margin: 2rem auto auto auto;
max-width: 980px;
- height: calc(100vh - $header-height - $footer-height - 2rem); //2rem are needed because of 1rem margin
+ // height: calc(100vh - $header-height - $footer-height - 2rem); //2rem are needed because of 1rem margin
display: flex;
flex-direction: column;
justify-content: space-between;
.scroll {
- height: 90%;
- overflow-y: scroll;
overflow-x: hidden;
position: sticky; // to properly display hours
- padding-right: 40px;
display: flex;
flex-direction: column;
gap: 2rem;
+ padding-bottom: 32px;
.header {
display: flex;
@@ -33,7 +31,7 @@
color: $red;
}
p {
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
}
@@ -103,7 +101,13 @@
}
}
.footer {
- border-top: 1px solid $grey-5;
+ border-top: 1px solid $grey-7;
+ position: sticky;
+ bottom: 0;
+ background: $white;
+ margin: auto;
+ max-width: 980px;
+ width: 100%;
p.warning {
color: $orange-warning;
margin: 1rem;
@@ -112,8 +116,8 @@
display: flex;
justify-content: center;
gap: 24px;
- padding-top: 1rem;
- padding-bottom: 8px;
+ padding-top: 2rem;
+ padding-bottom: 40px;
}
}
}
diff --git a/src/app/profile/structure-edition-summary/structure-edition-summary.component.ts b/src/app/profile/structure-edition-summary/structure-edition-summary.component.ts
index dcf3e589b9db689b70a0ea9a19c7c3b9eeec9b57..9a9b89aaf63d434934b95e209ea133a406250862 100644
--- a/src/app/profile/structure-edition-summary/structure-edition-summary.component.ts
+++ b/src/app/profile/structure-edition-summary/structure-edition-summary.component.ts
@@ -10,7 +10,6 @@ import { Structure } from '../../models/structure.model';
import { NotificationService } from '../../services/notification.service';
import { StructureService } from '../../services/structure.service';
import { CategoryEnum } from '../../shared/enum/category.enum';
-import { Demarches } from '../../shared/enum/demarches.enum';
import { AccessModality } from '../../structure-list/enum/access-modality.enum';
import { Equipment } from '../../structure-list/enum/equipment.enum';
import { Category } from '../../structure-list/models/category.model';
@@ -156,10 +155,6 @@ export class StructureEditionSummaryComponent implements OnInit {
return this.structure.categoriesDisplay.onlineProcedures?.length > 0;
}
- public getDigitalHelpLabel(digitalHelp: Demarches): string {
- return this.utils.getDigitalHelpLabel(digitalHelp);
- }
-
public isBaseSkills(): boolean {
return this.structure.categories.baseSkills?.length > 0;
}
diff --git a/src/app/profile/structure-members-management/structure-members-management.component.html b/src/app/profile/structure-members-management/structure-members-management.component.html
index 385384e7d40f8751a9f8d0bcbce19ba76dd216f9..3f87129455ba0d133dc337a98a1f0df1cd820985 100644
--- a/src/app/profile/structure-members-management/structure-members-management.component.html
+++ b/src/app/profile/structure-members-management/structure-members-management.component.html
@@ -5,11 +5,11 @@
<h1>Gérer les membres de</h1>
<h2>{{ structure.structureName }}</h2>
</div>
- <app-v3-button
+ <app-button
tabindex="0"
[variant]="'primaryBlack'"
[label]="'Ajouter un membre'"
- [iconName]="'add'"
+ [iconName]="'plus'"
[size]="'small'"
[wide]="true"
(click)="addMemberModalOpened = true"
@@ -24,7 +24,7 @@
<div class="user">
<app-svg-icon
class="avatar hide-on-mobile"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
/>
@@ -35,7 +35,7 @@
<p *ngIf="displayJobEmployer(member)" class="job">{{ displayJobEmployer(member) }}</p>
</div>
</div>
- <app-v3-button
+ <app-button
*ngIf="currentProfile._id !== member._id"
tabindex="0"
[variant]="'secondaryDelete'"
@@ -48,7 +48,7 @@
<div class="user">
<app-svg-icon
class="avatar hide-on-mobile"
- [type]="'avatar'"
+ [folder]="'avatar'"
[icon]="'defaultAvatar'"
[iconClass]="'icon-40'"
/>
@@ -58,7 +58,7 @@
</div>
<div class="pendingContainer">
<p class="text">Demande de rattachement envoyée le {{ member.updatedAt | date: 'dd/MM/YYYY' }}</p>
- <app-v3-button
+ <app-button
tabindex="0"
[variant]="'secondary'"
[label]="'Annuler la demande'"
@@ -76,7 +76,7 @@
(closed)="closeAddMemberModal($event)"
/>
-<app-v3-modal
+<app-modal
*ngIf="memberToExclude"
[opened]="excludeModalOpened"
[title]="'Exclure un membre'"
@@ -85,9 +85,9 @@
<div class="modalContent emphasized">
Souhaitez-vous exclure le membre {{ displayMemberName(memberToExclude) }} de la structure ?
</div>
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
*ngIf="tempUserToCancel"
[opened]="cancelAddTempUserModalOpened"
[title]="'Annuler la demande'"
@@ -97,4 +97,4 @@
Souhaitez-vous vraiment annuler la demande d’ajout à la structure de : <br />
{{ tempUserToCancel.email }} ?
</div>
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/profile/structures-management/structures-management.component.html b/src/app/profile/structures-management/structures-management.component.html
index 3bacd7e2b4e60f00f1ae5ed09efebd9943374d40..8b28347aa8220e4aa8f6c769b051e5a27d548aba 100644
--- a/src/app/profile/structures-management/structures-management.component.html
+++ b/src/app/profile/structures-management/structures-management.component.html
@@ -6,12 +6,12 @@
<ng-template ngPluralCase="1">Gestion des structures</ng-template>
<ng-template ngPluralCase="other">Gérer mes structures</ng-template>
</h1>
- <app-v3-button
+ <app-button
routerLink="/form/structure"
tabindex="0"
[variant]="'primaryBlack'"
[label]="'Ajouter une structure'"
- [iconName]="'add'"
+ [iconName]="'plus'"
[size]="'small'"
[wide]="true"
/>
@@ -25,14 +25,14 @@
<!-- TODO link to structure -->
<div class="structureDetails">
<h2 class="structureName">{{ elt.structure.structureName }}</h2>
- <app-v3-tag-item
+ <app-tag-item
*ngIf="elt.structure.structureType?.name"
[label]="elt.structure.structureType.name"
[size]="'small'"
[color]="'red'"
/>
<div *ngIf="isBeingDeleted(elt.structure)" class="deleteInProgress">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'warning'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'warning'" />
<span>
Suppression le {{ elt.structure.toBeDeletedAt | date: 'shortDate' }} (5 semaines depuis la demande de
suppression)
@@ -40,20 +40,20 @@
</div>
</div>
<div class="buttons">
- <app-v3-button
+ <app-button
[variant]="'secondary'"
[label]="'Quitter la structure'"
[size]="'small'"
(click)="selectedStructure = elt.structure; leaveModalOpened = true"
/>
- <app-v3-button
+ <app-button
*ngIf="!isBeingDeleted(elt.structure)"
[variant]="'secondaryDelete'"
[label]="'Supprimer la structure'"
[size]="'small'"
(click)="selectedStructure = elt.structure; deleteModalOpened = true"
/>
- <app-v3-button
+ <app-button
*ngIf="isBeingDeleted(elt.structure)"
[variant]="'primary'"
[label]="'Annuler suppression'"
@@ -66,7 +66,7 @@
</div>
</div>
-<app-v3-modal
+<app-modal
[opened]="leaveModalOpened"
[validateLabel]="'Oui'"
[cancelLabel]="'Non'"
@@ -74,7 +74,7 @@
(closed)="leaveStructure(selectedStructure, $event)"
/>
-<app-v3-modal
+<app-modal
[opened]="deleteModalOpened"
[title]="'Supprimer la structure'"
(closed)="deleteStructure(selectedStructure, $event)"
@@ -83,9 +83,9 @@
Si vous êtes le seul membre de cette structure, celle-ci est supprimée immédiatement. Si plusieurs membres sont
présents dans cette structure, ils seront avertis et auront jusqu'à 5 semaines pour s'opposer à la suppression.
</div>
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
[opened]="cancelDeleteModalOpened"
[validateLabel]="'Oui'"
[cancelLabel]="'Non'"
@@ -93,4 +93,4 @@
(closed)="cancelDelete(selectedStructure, $event)"
>
<div class="modalContent emphasized">Souhaitez-vous vraiment annuler la suppression de la structure ?</div>
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/profile/structures-management/structures-management.component.scss b/src/app/profile/structures-management/structures-management.component.scss
index 7e7730c263fab793fcab98f3a02c05289af1a2bd..44a007d48c3bcccc7963a0fdd8a361109dd82c27 100644
--- a/src/app/profile/structures-management/structures-management.component.scss
+++ b/src/app/profile/structures-management/structures-management.component.scss
@@ -10,6 +10,7 @@
width: 100%;
margin: 0 auto;
gap: 2rem;
+ padding-top: 16px;
.header {
display: flex;
diff --git a/src/app/reset-password/reset-password.component.html b/src/app/reset-password/reset-password.component.html
index 80afd89e52f096c09f9a326beb2cc1d2b76f605b..de0851ff66bf9ad21153442de2095ee31d55a6a0 100644
--- a/src/app/reset-password/reset-password.component.html
+++ b/src/app/reset-password/reset-password.component.html
@@ -22,8 +22,8 @@
</div>
</div>
<div class="footer" fxLayout="row" fxLayoutAlign="space-between center">
- <app-v3-button [variant]="'secondary'" [label]="'Annuler'" (action)="goLogin()" />
- <app-v3-button [variant]="'primary'" [label]="'Envoyer'" [type]="'submit'" [disabled]="loading" />
+ <app-button [variant]="'secondary'" [label]="'Annuler'" (action)="goLogin()" />
+ <app-button [variant]="'primary'" [label]="'Envoyer'" [type]="'submit'" [disabled]="loading" />
</div>
</form>
</div>
diff --git a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html
index 87d0ed662e39937e11252f59961d33c6c038e462..e38019e36dbb9966287301812d3d265d97db73c6 100644
--- a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html
+++ b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html
@@ -1,5 +1,5 @@
-<div *ngIf="onlineProcedures" class="btn-grid">
- <app-v3-tag-item
+<div *ngIf="onlineProcedures" class="tagList">
+ <app-tag-item
*ngFor="let module of onlineProcedures.modules"
[iconName]="isSelectedModule(module) ? 'check' : null"
[label]="module.name"
diff --git a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.scss b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.scss
deleted file mode 100644
index 46e81fc093176def48681a01e61f2bd8cd3435b4..0000000000000000000000000000000000000000
--- a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'buttons';
diff --git a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.ts b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.ts
index 90b0d7ad0ac94c3d844a0ea7373f4c52dcee4f7f..44a36ffbea88416c23c46c0ff3c84f04c8632b3f 100644
--- a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.ts
+++ b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.ts
@@ -2,19 +2,16 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angu
import { UntypedFormGroup } from '@angular/forms';
import { Category } from '../../../structure-list/models/category.model';
import { Module } from '../../../structure-list/models/module.model';
-import { ButtonType } from '../button/buttonType.enum';
@Component({
selector: 'app-accompaniment-picker',
templateUrl: './accompaniment-picker.component.html',
- styleUrls: ['./accompaniment-picker.component.scss'],
})
export class AccompanimentPickerComponent implements OnInit, OnChanges {
@Input() personalOfferForm: UntypedFormGroup;
@Input() onlineProcedures: Category;
@Output() validateForm = new EventEmitter<any>();
- public buttonTypeEnum = ButtonType;
public selectedModules: Module[] = [];
ngOnInit(): void {
diff --git a/src/app/shared/components/v3/button/Button.stories.ts b/src/app/shared/components/button/Button.stories.ts
similarity index 83%
rename from src/app/shared/components/v3/button/Button.stories.ts
rename to src/app/shared/components/button/Button.stories.ts
index a2f1a470dde08617eace6a20235c8cccae2c5a19..4c17d66463befb47e09ed6a3549374543f4ca6ab 100644
--- a/src/app/shared/components/v3/button/Button.stories.ts
+++ b/src/app/shared/components/button/Button.stories.ts
@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { ButtonV3Component } from './button.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { ButtonComponent } from './button.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<ButtonV3Component> = {
+const meta: Meta<ButtonComponent> = {
title: 'Components/Button',
- component: ButtonV3Component,
+ component: ButtonComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -19,7 +19,7 @@ const meta: Meta<ButtonV3Component> = {
};
export default meta;
-type Story = StoryObj<ButtonV3Component>;
+type Story = StoryObj<ButtonComponent>;
export const Primary: Story = {
args: {
@@ -89,6 +89,13 @@ export const Secondary: Story = {
},
};
+export const SecondarySuccess: Story = {
+ args: {
+ label: 'SecondarySuccess button',
+ variant: 'secondarySuccess',
+ },
+};
+
export const SecondaryDelete: Story = {
args: {
label: 'SecondaryDelete button',
diff --git a/src/app/shared/components/button/button.component.html b/src/app/shared/components/button/button.component.html
index 1e315a064a5c5d1b25db2aa3a99605fd084d5d4f..a73644d7c8d0883e7ffe06363b741cf6eaf6b848 100644
--- a/src/app/shared/components/button/button.component.html
+++ b/src/app/shared/components/button/button.component.html
@@ -1,306 +1,17 @@
-<ng-container *ngIf="style === buttonTypeEnum.Regular">
- <button class="btn-regular" type="{{ type }}" [disabled]="disabled" (click)="doAction()">
- <div *ngIf="!iconBtn" class="text">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- class="text withIcon left"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span>{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text withIcon right"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.searchIcon">
- <button class="searchIcon" aria-label="Rechercher" type="{{ type }}" (click)="doAction()">
- <div fxLayout="row center" class="searchIcon withIcon" fxLayoutAlign="space-between center">
- <app-svg-icon [type]="'ico'" [icon]="iconBtn" [iconColor]="'currentColor'" [iconClass]="'icon-30'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.Primary">
- <button
- class="btn-regular primary"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="extraClass"
- (click)="doAction()"
- >
- <div *ngIf="!iconBtn" class="text">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- class="text withIcon left"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span [ngClass]="extraClass">{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text withIcon right"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <span [ngClass]="extraClass">{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.modalPrimary">
- <button class="btn-regular modal-primary" type="{{ type }}" [disabled]="disabled" (click)="doAction()">
- <div *ngIf="!iconBtn" class="text" [ngClass]="variant">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- class="text"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span>{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.modalSecondary">
- <button
- class="btn-regular modal-secondary"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="{ disabled: disabled }"
- (click)="doAction()"
- >
- <div *ngIf="!iconBtn" class="text" [ngClass]="variant">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- class="text"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span>{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.Secondary || style === buttonTypeEnum.SecondaryWide">
- <button
- [ngClass]="{
- 'btn-regular secondary': true,
- wide: style === buttonTypeEnum.SecondaryWide
- }"
- type="{{ type }}"
- [disabled]="disabled"
- (click)="doAction()"
- >
- <div *ngIf="!iconBtn" class="text" [ngClass]="[variant, extraClass || '']">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- fxLayoutAlign="space-around center"
- class="text withIcon left"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span>{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text withIcon right"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.SecondaryUltraWide">
- <button class="btn-regular secondary ultrawide" type="{{ type }}" [disabled]="disabled" (click)="doAction()">
- <div *ngIf="!iconBtn" class="text" [ngClass]="[variant, extraClass || '']">{{ text }}</div>
- <div
- *ngIf="iconBtn && iconPos === 'left'"
- fxLayout="row center"
- class="text withIcon left"
- fxLayoutAlign="center center"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- <span>{{ text }}</span>
- </div>
- <div
- *ngIf="iconBtn && iconPos === 'right'"
- fxLayout="row center"
- class="text withIcon right"
- fxLayoutAlign="center center"
- [ngClass]="variant"
- >
- <span>{{ text }}</span>
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.SecondaryOnlyIcon">
- <button class="btn-regular secondary" type="{{ type }}" [disabled]="disabled" (click)="doAction()">
- <div
- *ngIf="iconBtn"
- fxLayout="row center"
- class="text withIcon center"
- fxLayoutAlign="space-around center"
- [ngClass]="variant"
- >
- <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" />
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.ButtonPhone">
- <button class="btn-switch-phone" [disabled]="disabled" type="{{ type }}" (click)="doAction()">
- <div *ngIf="!iconBtn" class="text" [ngClass]="variant">{{ text }}</div>
- <div
- *ngIf="iconBtn"
- fxLayout="center"
- class="text withIcon"
- fxLayoutAlign="space-around center"
- fxLayoutGap="13px"
- [ngClass]="variant"
- >
- <app-svg-icon
- class="iconBtn"
- [type]="'ico'"
- [iconClass]="'icon-32'"
- [icon]="iconBtn"
- [iconColor]="'currentColor'"
- />
- {{ text }}
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.Filter">
- <button
- class="btn-filter-phone"
- [disabled]="disabled"
- type="{{ type }}"
- [ngClass]="{ disabled: disabled }"
- (click)="doAction()"
- >
- <div *ngIf="!iconBtn" class="text" [ngClass]="variant">{{ text }}</div>
- <div
- *ngIf="iconBtn"
- fxLayout="row center"
- class="text withIcon"
- fxLayoutAlign="space-around center"
- fxLayoutGap="13px"
- >
- <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'" />
- {{ text }}
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.Tertiary">
- <button
- class="btn-regular tertiary"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="extraClass"
- (click)="doAction()"
- >
- <div>{{ text }}</div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.TertiaryRounded">
- <button
- class="btn-regular tertiary rounded"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="extraClass"
- (click)="doAction()"
- >
- <div>{{ text }}</div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.CheckButton">
- <button
- class="btn-regular tertiary rounded checkButton"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="extraClass"
- (click)="doAction()"
- >
- <div fxLayout="row center" fxLayoutAlign="space-around center" fxLayoutGap="13px">
- <app-svg-icon
- *ngIf="extraClass"
- [type]="'ico'"
- [icon]="'check'"
- [iconClass]="'icon-28'"
- [iconColor]="'currentColor'"
- />
- {{ text }}
- </div>
- </button>
-</ng-container>
-
-<ng-container *ngIf="style === buttonTypeEnum.IconOnly">
- <button
- class="btn-regular icon-only"
- type="{{ type }}"
- [disabled]="disabled"
- [ngClass]="{ active: active }"
- (click)="doAction()"
- >
- <div *ngIf="iconBtn" class="text withIcon" [ngClass]="variant">
- <app-svg-icon
- *ngIf="iconBtn"
- [type]="iconType"
- [icon]="iconBtn"
- [iconClass]="'icon-28'"
- [iconColor]="active ? 'green' : 'currentColor'"
- />
- </div>
- </button>
-</ng-container>
+<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
+ <app-svg-icon
+ *ngIf="iconName && iconPosition === 'left'"
+ [folder]="iconFolder"
+ [icon]="iconName"
+ [iconColor]="iconColor"
+ [iconClass]="'icon-20'"
+ />
+ {{ label }}
+ <app-svg-icon
+ *ngIf="iconName && iconPosition === 'right'"
+ [folder]="iconFolder"
+ [icon]="iconName"
+ [iconColor]="iconColor"
+ [iconClass]="'icon-20'"
+ />
+</button>
diff --git a/src/app/shared/components/button/button.component.scss b/src/app/shared/components/button/button.component.scss
index 929f321f87d51f25c3910f9610d6a876e77139c6..9d640518b8dfd82eaeb7f752ca9730d31e97bdc9 100644
--- a/src/app/shared/components/button/button.component.scss
+++ b/src/app/shared/components/button/button.component.scss
@@ -1,279 +1,180 @@
-@import 'typography';
@import 'color';
-@import 'breakpoint';
-@import 'shapes';
+@import 'typography';
-@mixin btn-bold {
- @include font-bold-13;
- line-height: 18px;
-}
-@mixin btn-bold-underline {
- @include btn-bold;
- text-decoration: underline;
-}
-@mixin btn-regular {
- @include font-regular-13;
- line-height: 19px;
-}
button {
- outline: none;
border-radius: 4px;
cursor: pointer;
- border: 1px solid;
- padding: 0;
-}
-.searchIcon {
- background: transparent;
- border: none;
- & > svg {
- width: 30px;
- height: 30px;
- }
-}
+ border: 1px solid transparent;
+ transition:
+ background-color 0.2s ease-in-out,
+ border 0.2s ease-out;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.5rem;
-.btn-regular {
- background: $grey-9;
- border-radius: 5px 5px 4px 5px;
- border: 0;
- transition: all 0.1s;
- div:first-child {
- width: 125px;
- }
- &:hover {
- box-shadow: -2px 2px;
- }
&:focus-visible {
- box-shadow: 0 0 0 5px $grey-5;
+ outline-offset: 2px;
+ outline: 2px solid $blue-focus;
}
- .searchButton {
- background: $grey-6;
+ // WIDTH
+ width: 150px;
+ &.wide {
+ width: 250px;
}
- &.primary {
- border: 0;
- @include btn-bold;
- .text {
- background: $primary-color;
- border: 1px solid $grey-1;
- line-height: 15px;
- color: $white;
- &.withIcon {
- color: $white;
- }
+ // SIZES
+ &.small {
+ height: 32px;
+ font-size: $font-size-xsmall;
+ padding-inline: 4px;
+ &.icon-only {
+ width: 32px;
}
}
- &.modal-primary {
- border: none;
- width: 100%;
- @include btn-bold;
- .text {
- display: flex;
- text-align: center;
- align-items: center;
- justify-content: center;
- background: $primary-color;
- margin: auto;
- color: $white;
- width: auto;
- line-height: 15px;
- &.withIcon {
- color: $white;
- }
+ &.medium {
+ height: 40px;
+ font-size: $font-size-small;
+ padding-inline: 4px;
+ &.icon-only {
+ width: 40px;
}
}
- &.modal-secondary {
- border: none;
- width: 100%;
- @include btn-regular;
- .text {
- display: flex;
- text-align: center;
- align-items: center;
- justify-content: center;
- margin: auto;
- color: $grey-1;
- width: auto;
- line-height: 15px;
- &.withIcon {
- color: $grey-1;
- }
- }
+ &.large {
+ height: 48px;
+ font-size: $font-size-smedium;
+ padding-inline: 4px;
}
- &.secondary {
- div:first-child {
- width: unset;
+
+ // VARIANT
+ &.primary {
+ background-color: $red;
+ color: $white;
+ &:hover {
+ background-color: $red-dark;
+ }
+ &:disabled {
+ background-color: $grey-8;
+ color: $grey-3;
}
- border: 0;
- background: $white;
- @include btn-regular;
- .text {
- background: $white;
- border: 1px solid $grey-1;
- color: $grey-1;
- font-size: 14px;
- line-height: 15px;
- &.withIcon {
- color: $grey-1;
- }
+ &:active {
+ background-color: $red-light;
}
- &.wide {
- div:first-child {
- min-width: 50px;
- width: 184px;
- }
+ }
+
+ &.primaryBlack {
+ background-color: $grey-1;
+ color: $white;
+ &:hover {
+ background-color: $grey-2;
}
- &.ultrawide {
- div:first-child {
- min-width: 50px;
- width: 400px;
- @media #{$tablet} {
- width: 200px;
- }
- span {
- padding-inline: 4px;
- }
- }
+ &:disabled {
+ background-color: $grey-8;
+ color: $grey-3;
}
- .small-text {
- height: 22px !important;
+ &:active {
+ background-color: $grey-3;
}
}
- &.tertiary {
- div:first-child {
- min-width: 50px;
- width: unset;
- }
+
+ &.primaryWarning {
+ background-color: $info-warning;
+ color: $white;
&:hover {
- border: 1px solid $grey-5;
- box-shadow: none;
+ background-color: $warning-hover;
}
- border: 1px solid transparent;
- background: $grey-8;
- height: 36px;
- color: $black;
- padding: 0px 16px;
- min-width: 50px;
-
- @include btn-regular;
- &.selected {
- background-color: $green-1 !important;
- color: white !important;
- &:hover {
- background-color: $green-1 !important;
- }
+ &:disabled {
+ background-color: $grey-8;
+ color: $grey-3;
}
- &.checkButton {
- padding: 0px 14px;
- font-weight: bold;
- div:first-child {
- padding: 0 14px;
- }
- &.selected {
- padding: unset;
- }
+ &:active {
+ background-color: $warning-pressed;
}
}
- &.icon-only {
- div:first-child {
- width: unset;
+ &.primarySuccess {
+ background-color: $info-success;
+ color: $white;
+ &:hover {
+ background-color: $success-hover;
}
- &.active {
- .text {
- border-color: $green-1;
- }
- &:hover {
- background: unset !important;
- }
+ &:disabled {
+ background-color: $grey-8;
+ color: $grey-3;
}
- &.center {
- padding-left: 6px !important;
- padding-right: 6px !important;
+ &:active {
+ background-color: $success-pressed;
}
}
- &.rounded {
- border-radius: 20px;
- transition: unset;
- }
- .text {
- // position: relative;
- // top: -1px;
- // right: -1px;
- border: 1px solid $grey-1;
- background: $white;
- height: 31px;
+ &.secondary {
+ background-color: $white;
color: $grey-1;
- padding: 3px 15px;
- display: table-cell;
- vertical-align: middle;
- border-radius: 4px;
- font-size: 14px;
- line-height: 15px;
- &.small {
- height: 26px;
+ border-color: $grey-1;
+ &:hover {
+ background-color: $grey-7;
}
- &.medium {
- height: 32px;
+ &:disabled {
+ background-color: $white;
+ color: $grey-4;
+ border-color: $grey-4;
}
- &.large {
- height: 37px;
+ &:active {
+ background-color: $grey-8;
}
+ }
- &.withIcon {
- color: $black;
- height: 36px;
- &.left {
- padding-left: 8px !important;
- }
- &.right {
- padding-right: 8px !important;
- }
- &.center {
- padding-left: 6px !important;
- padding-right: 6px !important;
- }
+ &.secondarySuccess {
+ background-color: $white;
+ color: $info-success;
+ border-color: $info-success;
+ &:hover {
+ background-color: rgba($info-success, 0.15);
+ color: $success-hover;
+ border-color: $success-hover;
+ }
+ &:disabled {
+ background-color: $white;
+ color: $grey-4;
+ border-color: $grey-4;
+ }
+ &:active {
+ background-color: rgba($success-pressed, 0.2);
+ color: $success-pressed;
+ border-color: $success-pressed;
}
}
-}
-.btn-switch-phone {
- background: $black;
- height: 40px;
- width: 124px;
- color: $white;
- padding: 0 28px;
- border-radius: 20px;
- .iconBtn {
- margin-right: 6px;
+ &.secondaryDelete {
+ background-color: $white;
+ color: $red;
+ border-color: $red;
+ &:hover {
+ background-color: $grey-3;
+ }
+ &:disabled {
+ background-color: $white;
+ color: $grey-5;
+ border-color: $grey-5;
+ }
+ &:active {
+ background-color: $grey-3;
+ }
}
-}
-.btn-filter-phone {
- background: $white;
- height: 40px;
- color: $grey-1;
- padding: 4px 37px 4px 37px;
- border-color: $grey-5;
- @include btn-normal;
- &.containCheckedFilters {
- border-color: $primary-color;
- }
-}
-.fullButton {
- width: 125px !important;
-}
-.fullWidth {
- width: 100% !important;
-}
-.bigButton {
- width: 280px !important;
- .text {
- width: inherit !important;
+ &.tertiary {
+ background-color: $white;
+ color: $grey-1;
+ &:hover {
+ border-color: $grey-3;
+ }
+ &:disabled {
+ color: $grey-3;
+ }
+ &:active {
+ background-color: $grey-8;
+ }
}
}
-button:disabled {
- opacity: 0.4;
- cursor: not-allowed;
-}
diff --git a/src/app/shared/components/button/button.component.ts b/src/app/shared/components/button/button.component.ts
index d23441d50b8c178b3dbed039413d4107d97ac356..7b2438ca3e21f3f90123b95cf4848a4cab682dba 100644
--- a/src/app/shared/components/button/button.component.ts
+++ b/src/app/shared/components/button/button.component.ts
@@ -1,5 +1,16 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ButtonType } from './buttonType.enum';
+import { SpriteFolderType } from '../svg-icon/SpriteFolder.type';
+
+/** values will be used for css selectors */
+export type ButtonType =
+ | 'primary'
+ | 'primaryBlack'
+ | 'primaryWarning'
+ | 'primarySuccess'
+ | 'secondary'
+ | 'secondarySuccess'
+ | 'secondaryDelete'
+ | 'tertiary';
@Component({
selector: 'app-button',
@@ -7,21 +18,40 @@ import { ButtonType } from './buttonType.enum';
styleUrls: ['./button.component.scss'],
})
export class ButtonComponent {
- @Input() public style: ButtonType = ButtonType.Regular;
- @Input() public text: string;
- @Input() public type = 'button';
- @Input() public variant: 'small' | 'medium' | 'large' = 'medium';
- @Input() public iconType = 'ico';
- @Input() public iconBtn: string;
- @Input() public iconPos = 'left';
- @Input() public extraClass: string;
- @Input() public disabled = false;
- @Input() public active = false;
- @Output() public action = new EventEmitter();
-
- public buttonTypeEnum = ButtonType;
-
- public doAction(): void {
- this.action.emit();
+ /** Button label */
+ @Input({ required: true }) label: string;
+
+ /** HTML type of the button */
+ @Input() type: 'submit' | 'button' | 'reset' = 'button';
+
+ /** What variant should be the button ? */
+ @Input({ required: true }) variant: ButtonType;
+
+ /** Affects the height of the button */
+ @Input() size?: 'small' | 'medium' | 'large' = 'medium';
+
+ /** Should the button be wide ? (250px) */
+ @Input() wide = false;
+
+ /** Should the button be disabled ? */
+ @Input() disabled = false;
+
+ /** Sets the position of the icon if one provided */
+ @Input() iconPosition: 'left' | 'right' = 'left';
+
+ /** Folder of the icon ex: assets/ico */
+ @Input() iconFolder: SpriteFolderType = 'ico';
+
+ /** Icon name */
+ @Input() iconName?: string;
+
+ /** Icon color, defaults to none as the svg-icon does */
+ @Input() iconColor = 'none';
+
+ /** Click handler */
+ @Output() action = new EventEmitter<Event>();
+
+ public get classes(): string[] {
+ return [this.variant, this.size, this.wide ? 'wide' : ''];
}
}
diff --git a/src/app/shared/components/button/buttonType.enum.ts b/src/app/shared/components/button/buttonType.enum.ts
deleted file mode 100644
index c2bbb517f93cd20f9725c66d112ae44ea9500cd9..0000000000000000000000000000000000000000
--- a/src/app/shared/components/button/buttonType.enum.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export enum ButtonType {
- Regular,
- Primary,
- Secondary,
- SecondaryWide,
- SecondaryUltraWide,
- SecondaryOnlyIcon,
- Tertiary,
- TertiaryRounded,
- ButtonPhone,
- Filter,
- IconOnly,
- CheckButton,
- searchIcon,
- modalPrimary,
- modalSecondary,
-}
diff --git a/src/app/shared/components/v3/button/icon-button/IconButton.stories.ts b/src/app/shared/components/button/icon-button/IconButton.stories.ts
similarity index 77%
rename from src/app/shared/components/v3/button/icon-button/IconButton.stories.ts
rename to src/app/shared/components/button/icon-button/IconButton.stories.ts
index 6119d7119f1e4df336eae7fafa7595aee4931491..18cff3dfbe28d4996a552caca2eb571261636484 100644
--- a/src/app/shared/components/v3/button/icon-button/IconButton.stories.ts
+++ b/src/app/shared/components/button/icon-button/IconButton.stories.ts
@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../../svg-icon/svg-icon.component';
-import { IconButtonV3Component } from './icon-button.component';
+import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
+import { IconButtonComponent } from './icon-button.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<IconButtonV3Component> = {
+const meta: Meta<IconButtonComponent> = {
title: 'Components/IconButton',
- component: IconButtonV3Component,
+ component: IconButtonComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -19,7 +19,7 @@ const meta: Meta<IconButtonV3Component> = {
};
export default meta;
-type Story = StoryObj<IconButtonV3Component>;
+type Story = StoryObj<IconButtonComponent>;
export const Primary: Story = {
args: {
diff --git a/src/app/shared/components/button/icon-button/icon-button.component.html b/src/app/shared/components/button/icon-button/icon-button.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..f87527ac5624a2bb565ee96f93eb5d6ce25b960c
--- /dev/null
+++ b/src/app/shared/components/button/icon-button/icon-button.component.html
@@ -0,0 +1,3 @@
+<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
+ <app-svg-icon [folder]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
+</button>
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts b/src/app/shared/components/button/icon-button/icon-button.component.ts
similarity index 70%
rename from src/app/shared/components/v3/button/icon-button/icon-button.component.ts
rename to src/app/shared/components/button/icon-button/icon-button.component.ts
index d0a22e751fb2c064ad7514c11e8c05fd560d0543..d66d2c79dfe9038feed50d96680b923f6e7a7805 100644
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.ts
+++ b/src/app/shared/components/button/icon-button/icon-button.component.ts
@@ -1,12 +1,13 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ButtonTypeV3 } from '../button.component';
+import { SpriteFolderType } from '../../svg-icon/SpriteFolder.type';
+import { ButtonType } from '../button.component';
@Component({
- selector: 'app-v3-icon-button',
+ selector: 'app-icon-button',
templateUrl: './icon-button.component.html',
styleUrls: ['../button.component.scss'],
})
-export class IconButtonV3Component {
+export class IconButtonComponent {
/** Icon name */
@Input({ required: true }) iconName: string;
@@ -14,7 +15,7 @@ export class IconButtonV3Component {
@Input() type: 'submit' | 'button' | 'reset' = 'button';
/** What variant should the button be ? */
- @Input({ required: true }) variant: ButtonTypeV3;
+ @Input({ required: true }) variant: ButtonType;
/** Affects the height of the button */
@Input() size?: 'small' | 'medium' = 'small';
@@ -22,8 +23,8 @@ export class IconButtonV3Component {
/** Should the button be disabled ? */
@Input() disabled = false;
- /** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
+ /** Folder of the sprite ex: assets/ico/sprite.svg */
+ @Input() iconFolder: SpriteFolderType = 'ico';
/** Icon color, defaults to none as the svg-icon does */
@Input() iconColor = 'none';
diff --git a/src/app/shared/components/checkbox-filter/checkbox-filter.component.html b/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
index 35538a1f79a938d100784897c62895f02b9e0252..ab8a474d8e5b30af55121b795c536648e242e7fe 100644
--- a/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
+++ b/src/app/shared/components/checkbox-filter/checkbox-filter.component.html
@@ -1,5 +1,5 @@
<button type="button" [ngClass]="{ checked: checked }" (click)="toggle.emit(module)">
- <app-svg-icon *ngIf="!checked" [iconClass]="'icon-20'" [type]="'form'" [icon]="'radio-unchecked'" />
- <app-svg-icon *ngIf="checked" [iconClass]="'icon-20'" [type]="'form'" [icon]="'radio-checked'" />
+ <app-svg-icon *ngIf="!checked" [iconClass]="'icon-20'" [folder]="'form'" [icon]="'radio-unchecked'" />
+ <app-svg-icon *ngIf="checked" [iconClass]="'icon-20'" [folder]="'form'" [icon]="'radio-checked'" />
<span>{{ module.displayText }}</span>
</button>
diff --git a/src/app/shared/components/checkbox-form/checkbox-form.component.html b/src/app/shared/components/checkbox-form/checkbox-form.component.html
index 5b91f12923b56c2d1042c726f1aa80f119c64d93..784e822f616468f01899def2081e9e01dcfc629d 100644
--- a/src/app/shared/components/checkbox-form/checkbox-form.component.html
+++ b/src/app/shared/components/checkbox-form/checkbox-form.component.html
@@ -1,5 +1,5 @@
<button type="button" tabindex="-1" [ngClass]="{ selected: isChecked }" (click)="clicked()">
- <app-v3-checkbox [checked]="isChecked" />
+ <app-checkbox [checked]="isChecked" />
<svg *ngIf="iconSvg" aria-hidden="true" class="icon" [ngClass]="iconType">
<use [attr.xlink:href]="'assets/form/sprite.svg#' + iconSvg" />
diff --git a/src/app/shared/components/checkbox-form/checkbox-form.stories.ts b/src/app/shared/components/checkbox-form/checkbox-form.stories.ts
index 360f6271aa30e82e9b24a7e9924d873c5d6b8ef1..60d9b97288bcf46049364eaf459a63b8db824118 100644
--- a/src/app/shared/components/checkbox-form/checkbox-form.stories.ts
+++ b/src/app/shared/components/checkbox-form/checkbox-form.stories.ts
@@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { componentWrapperDecorator, moduleMetadata } from '@storybook/angular';
-import { CheckboxV3Component } from '../v3/checkbox/checkbox.component';
+import { CheckboxComponent } from '../checkbox/checkbox.component';
import { CheckboxFormComponent } from './checkbox-form.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
@@ -11,7 +11,7 @@ const meta: Meta<CheckboxFormComponent> = {
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [CheckboxV3Component],
+ declarations: [CheckboxComponent],
imports: [CommonModule],
}),
],
diff --git a/src/app/shared/components/v3/checkbox/check-grey.svg b/src/app/shared/components/checkbox/check-grey.svg
similarity index 100%
rename from src/app/shared/components/v3/checkbox/check-grey.svg
rename to src/app/shared/components/checkbox/check-grey.svg
diff --git a/src/app/shared/components/v3/checkbox/check.svg b/src/app/shared/components/checkbox/check.svg
similarity index 100%
rename from src/app/shared/components/v3/checkbox/check.svg
rename to src/app/shared/components/checkbox/check.svg
diff --git a/src/app/shared/components/v3/checkbox/checkbox.component.html b/src/app/shared/components/checkbox/checkbox.component.html
similarity index 100%
rename from src/app/shared/components/v3/checkbox/checkbox.component.html
rename to src/app/shared/components/checkbox/checkbox.component.html
diff --git a/src/app/shared/components/v3/checkbox/checkbox.component.scss b/src/app/shared/components/checkbox/checkbox.component.scss
similarity index 100%
rename from src/app/shared/components/v3/checkbox/checkbox.component.scss
rename to src/app/shared/components/checkbox/checkbox.component.scss
diff --git a/src/app/shared/components/v3/checkbox/checkbox.component.ts b/src/app/shared/components/checkbox/checkbox.component.ts
similarity index 90%
rename from src/app/shared/components/v3/checkbox/checkbox.component.ts
rename to src/app/shared/components/checkbox/checkbox.component.ts
index 6328818c279f39aadd16ce14bb361c9ebc83bdf1..04cc9244c4f6dbc1fc0e081708629f001cb6e69d 100644
--- a/src/app/shared/components/v3/checkbox/checkbox.component.ts
+++ b/src/app/shared/components/checkbox/checkbox.component.ts
@@ -1,11 +1,11 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
- selector: 'app-v3-checkbox',
+ selector: 'app-checkbox',
templateUrl: './checkbox.component.html',
styleUrls: ['./checkbox.component.scss'],
})
-export class CheckboxV3Component {
+export class CheckboxComponent {
/** HTML id associated with for */
@Input() id: string;
diff --git a/src/app/shared/components/v3/checkbox/checkbox.stories.ts b/src/app/shared/components/checkbox/checkbox.stories.ts
similarity index 82%
rename from src/app/shared/components/v3/checkbox/checkbox.stories.ts
rename to src/app/shared/components/checkbox/checkbox.stories.ts
index fca45a411a8a3de4c7c051ed346446c8d2cdfc73..6816dd265dbf213b7376255b174a1dda07e70e11 100644
--- a/src/app/shared/components/v3/checkbox/checkbox.stories.ts
+++ b/src/app/shared/components/checkbox/checkbox.stories.ts
@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { CheckboxV3Component } from './checkbox.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { CheckboxComponent } from './checkbox.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<CheckboxV3Component> = {
+const meta: Meta<CheckboxComponent> = {
title: 'Components/Checkbox',
- component: CheckboxV3Component,
+ component: CheckboxComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -19,7 +19,7 @@ const meta: Meta<CheckboxV3Component> = {
};
export default meta;
-type Story = StoryObj<CheckboxV3Component>;
+type Story = StoryObj<CheckboxComponent>;
export const CheckBoxSmall: Story = {
args: {
diff --git a/src/app/shared/components/v3/checkbox/indeterminate-grey.svg b/src/app/shared/components/checkbox/indeterminate-grey.svg
similarity index 100%
rename from src/app/shared/components/v3/checkbox/indeterminate-grey.svg
rename to src/app/shared/components/checkbox/indeterminate-grey.svg
diff --git a/src/app/shared/components/v3/checkbox/indeterminate.svg b/src/app/shared/components/checkbox/indeterminate.svg
similarity index 100%
rename from src/app/shared/components/v3/checkbox/indeterminate.svg
rename to src/app/shared/components/checkbox/indeterminate.svg
diff --git a/src/app/shared/components/collapsable-filter/collapsable-filter.component.html b/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
index 03403632e815dcc26627c484969c755b3687c037..0c75310f9703c5aadbedc30e0976f07336188550 100644
--- a/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
+++ b/src/app/shared/components/collapsable-filter/collapsable-filter.component.html
@@ -7,5 +7,5 @@
(click)="handleToggle()"
>
<span>{{ label }}</span>
- <app-svg-icon [ngClass]="{ expanded: expanded }" [type]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-20'" />
+ <app-svg-icon [ngClass]="{ expanded: expanded }" [folder]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-20'" />
</button>
diff --git a/src/app/shared/components/v3/collapse/collapse-content/collapse-content.component.ts b/src/app/shared/components/collapse/collapse-content/collapse-content.component.ts
similarity index 100%
rename from src/app/shared/components/v3/collapse/collapse-content/collapse-content.component.ts
rename to src/app/shared/components/collapse/collapse-content/collapse-content.component.ts
diff --git a/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.scss b/src/app/shared/components/collapse/collapse-header/collapse-header.component.scss
similarity index 100%
rename from src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.scss
rename to src/app/shared/components/collapse/collapse-header/collapse-header.component.scss
diff --git a/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts b/src/app/shared/components/collapse/collapse-header/collapse-header.component.ts
similarity index 80%
rename from src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts
rename to src/app/shared/components/collapse/collapse-header/collapse-header.component.ts
index a0341f444693cc83cd2f20a02dfaa5f85fa516e2..ec62e8b0eca3ac44886547d2e53bba80fbbb25b5 100644
--- a/src/app/shared/components/v3/collapse/collapse-header/collapse-header.component.ts
+++ b/src/app/shared/components/collapse/collapse-header/collapse-header.component.ts
@@ -11,7 +11,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
(keyup.enter)="toggle.emit()"
>
<ng-content />
- <app-svg-icon [ngClass]="expanded && 'expanded'" [type]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-32'" />
+ <app-svg-icon [ngClass]="expanded && 'expanded'" [folder]="'ico'" [icon]="'chevronDown'" [iconClass]="'icon-32'" />
</div>`,
styleUrls: ['collapse-header.component.scss'],
})
diff --git a/src/app/shared/components/v3/collapse/collapse.component.scss b/src/app/shared/components/collapse/collapse.component.scss
similarity index 100%
rename from src/app/shared/components/v3/collapse/collapse.component.scss
rename to src/app/shared/components/collapse/collapse.component.scss
diff --git a/src/app/shared/components/v3/collapse/collapse.component.ts b/src/app/shared/components/collapse/collapse.component.ts
similarity index 100%
rename from src/app/shared/components/v3/collapse/collapse.component.ts
rename to src/app/shared/components/collapse/collapse.component.ts
diff --git a/src/app/shared/components/v3/collapse/collapse.stories.ts b/src/app/shared/components/collapse/collapse.stories.ts
similarity index 97%
rename from src/app/shared/components/v3/collapse/collapse.stories.ts
rename to src/app/shared/components/collapse/collapse.stories.ts
index 6e84843a3db56fd68ca6f5f76e5e7964af8944b0..b8c1e4b1bb0ca773ac0bb7546a6b4cd7121b5dc2 100644
--- a/src/app/shared/components/v3/collapse/collapse.stories.ts
+++ b/src/app/shared/components/collapse/collapse.stories.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
import { CollapseContentComponent } from './collapse-content/collapse-content.component';
import { CollapseHeaderComponent } from './collapse-header/collapse-header.component';
import { CollapseComponent } from './collapse.component';
diff --git a/src/app/shared/components/v3/collapse/collapse.type.ts b/src/app/shared/components/collapse/collapse.type.ts
similarity index 100%
rename from src/app/shared/components/v3/collapse/collapse.type.ts
rename to src/app/shared/components/collapse/collapse.type.ts
diff --git a/src/app/shared/components/data-share-consent/data-share-consent.component.html b/src/app/shared/components/data-share-consent/data-share-consent.component.html
index 5475a4c27ba2235a03b1b33312ef54979136e4b9..9a69793f911b86bba09f09ed7e72c3b0d75f9da9 100644
--- a/src/app/shared/components/data-share-consent/data-share-consent.component.html
+++ b/src/app/shared/components/data-share-consent/data-share-consent.component.html
@@ -1,4 +1,4 @@
-<app-v3-modal
+<app-modal
[opened]="opened"
[validateLabel]="'Valider'"
[singleButton]="true"
@@ -61,4 +61,4 @@
de vos interlocuteurs de la Métropole de Lyon.
</p>
</form>
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/shared/components/data-share-consent/data-share-consent.component.scss b/src/app/shared/components/data-share-consent/data-share-consent.component.scss
index f432f0f49c6b9ef4b71aad25dacc8ca4fa2f58bc..04a14f9bcad1ee0335768242d15d9da74ccf3b87 100644
--- a/src/app/shared/components/data-share-consent/data-share-consent.component.scss
+++ b/src/app/shared/components/data-share-consent/data-share-consent.component.scss
@@ -1,9 +1,7 @@
@import 'typography';
@import 'breakpoint';
@import 'color';
-@import 'buttons';
@import 'z-index';
-@import 'hyperlink';
h1 {
@include font-bold-26;
diff --git a/src/app/shared/components/go-back/go-back.component.ts b/src/app/shared/components/go-back/go-back.component.ts
index 772eba5a96b55e4fceadac30e7e9cb79db370fa1..f608c6a6c4495ac8e48afd3e1fea90cf51226543 100644
--- a/src/app/shared/components/go-back/go-back.component.ts
+++ b/src/app/shared/components/go-back/go-back.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
@Component({
selector: 'app-go-back',
- template: `<app-v3-button
+ template: `<app-button
[label]="'Retour'"
[variant]="'tertiary'"
[iconFolder]="'ico'"
diff --git a/src/app/shared/components/hour-picker/hour-picker.component.html b/src/app/shared/components/hour-picker/hour-picker.component.html
index 88c47c207e1c8491ececcd9eed1c5c0bb9ccbc17..6149db74b7431ec0f8bc7b67cac8fa746e5cc39c 100644
--- a/src/app/shared/components/hour-picker/hour-picker.component.html
+++ b/src/app/shared/components/hour-picker/hour-picker.component.html
@@ -36,7 +36,7 @@
(valueChange)="submitForm()"
/>
- <app-v3-button
+ <app-button
*ngIf="day.hours.length === 2 && index === 1"
[variant]="'secondary'"
[label]="'Supprimer'"
@@ -45,7 +45,7 @@
/>
</div>
- <app-v3-button
+ <app-button
*ngIf="day.hours.length === 1"
[variant]="'primaryBlack'"
[label]="'Ajouter un horaire'"
diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts
index 7b96c64b3d254d16f6c1d3433859330f7d67db3a..53992d236f133297128d9a2b2c49125b9f5b06fe 100644
--- a/src/app/shared/components/index.ts
+++ b/src/app/shared/components/index.ts
@@ -5,53 +5,51 @@ import { AccompanimentPickerComponent } from './accompaniment-picker/accompanime
import { AddressAutocompleteComponent } from './address-autocomplete/address-autocomplete.component';
import { AppointmentChoiceComponent } from './appointment-choice/appointment-choice.component';
import { ButtonComponent } from './button/button.component';
+import { IconButtonComponent } from './button/icon-button/icon-button.component';
import { CheckboxFilterComponent } from './checkbox-filter/checkbox-filter.component';
import { CheckboxFormComponent } from './checkbox-form/checkbox-form.component';
+import { CheckboxComponent } from './checkbox/checkbox.component';
import { CollapsableFilterComponent } from './collapsable-filter/collapsable-filter.component';
+import { CollapseContentComponent } from './collapse/collapse-content/collapse-content.component';
+import { CollapseHeaderComponent } from './collapse/collapse-header/collapse-header.component';
+import { CollapseComponent } from './collapse/collapse.component';
import { GoBackComponent } from './go-back/go-back.component';
import { HourPickerComponent } from './hour-picker/hour-picker.component';
+import { InputComponent } from './input/input.component';
+import { LabelCheckboxComponent } from './label-checkbox/label-checkbox.component';
import { LogoCardComponent } from './logo-card/logo-card.component';
import { MemberCardComponent } from './member-card/member-card.component';
+import { ModalComponent } from './modal/modal.component';
import { PasswordFormComponent } from './password-form/password-form.component';
import { RadioOptionComponent } from './radio-option/radio-option.component';
+import { RadioComponent } from './radio/radio.component';
+import { SearchBarComponent } from './search-bar/search-bar.component';
import { StructureDetailPrintComponent } from './structure-detail-print/structure-detail-print.component';
import { StructureHoursListComponent } from './structure-hours/structure-hours-list.component';
import { StructurePmrComponent } from './structure-pmr/structure-pmr.component';
import { StructureTypePickerComponent } from './structure-type-picker/structure-type-picker.component';
import { SvgIconComponent } from './svg-icon/svg-icon.component';
+import { SwitchComponent } from './switch/switch.component';
+import { TagItemComponent } from './tag-item/tag-item.component';
+import { TextareaComponent } from './textarea/textarea.component';
import { TrainingTypePickerComponent } from './training-type-picker/training-type-picker.component';
-import { ButtonV3Component } from './v3/button/button.component';
-import { IconButtonV3Component } from './v3/button/icon-button/icon-button.component';
-import { CheckboxV3Component } from './v3/checkbox/checkbox.component';
-import { CollapseContentComponent } from './v3/collapse/collapse-content/collapse-content.component';
-import { CollapseHeaderComponent } from './v3/collapse/collapse-header/collapse-header.component';
-import { CollapseComponent } from './v3/collapse/collapse.component';
-import { InputV3Component } from './v3/input/input.component';
-import { LabelCheckboxV3Component } from './v3/label-checkbox/label-checkbox.component';
-import { ModalV3Component } from './v3/modal/modal.component';
-import { RadioV3Component } from './v3/radio/radio.component';
-import { SearchBarV3Component } from './v3/search-bar/search-bar.component';
-import { SwitchComponent } from './v3/switch/switch.component';
-import { TagItemV3Component } from './v3/tag-item/tag-item.component';
-import { TextareaV3Component } from './v3/textarea/textarea.component';
export {
AccompanimentPickerComponent,
AddressAutocompleteComponent,
ButtonComponent,
- ButtonV3Component,
+ CheckboxComponent,
CheckboxFormComponent,
- CheckboxV3Component,
CollapseComponent,
CollapseContentComponent,
CollapseHeaderComponent,
GoBackComponent,
HourPickerComponent,
InformationStepComponent,
- LabelCheckboxV3Component,
+ LabelCheckboxComponent,
LogoCardComponent,
MemberCardComponent,
- ModalV3Component,
+ ModalComponent,
PasswordFormComponent,
ProgressBarComponent,
RadioOptionComponent,
@@ -62,7 +60,7 @@ export {
StructureTypePickerComponent,
SvgIconComponent,
SwitchComponent,
- TagItemV3Component,
+ TagItemComponent,
TrainingTypePickerComponent,
};
@@ -71,35 +69,35 @@ export const SharedComponents = [
AddressAutocompleteComponent,
AppointmentChoiceComponent,
ButtonComponent,
- ButtonV3Component,
+ ButtonComponent,
CheckboxFilterComponent,
CheckboxFormComponent,
- CheckboxV3Component,
+ CheckboxComponent,
CollapsableFilterComponent,
CollapseComponent,
CollapseContentComponent,
CollapseHeaderComponent,
HourPickerComponent,
- IconButtonV3Component,
+ IconButtonComponent,
InformationStepComponent,
- InputV3Component,
- LabelCheckboxV3Component,
+ InputComponent,
+ LabelCheckboxComponent,
MemberCardComponent,
LogoCardComponent,
- ModalV3Component,
+ ModalComponent,
PasswordFormComponent,
ProgressBarComponent,
RadioOptionComponent,
- RadioV3Component,
- SearchBarV3Component,
+ RadioComponent,
+ SearchBarComponent,
StructureDetailPrintComponent,
StructurePmrComponent,
StructurePublicTargetComponent,
StructureTypePickerComponent,
SvgIconComponent,
- TagItemV3Component,
+ TagItemComponent,
TrainingTypePickerComponent,
- TextareaV3Component,
+ TextareaComponent,
StructureHoursListComponent,
GoBackComponent,
SwitchComponent,
diff --git a/src/app/shared/components/v3/input/input.component.html b/src/app/shared/components/input/input.component.html
similarity index 95%
rename from src/app/shared/components/v3/input/input.component.html
rename to src/app/shared/components/input/input.component.html
index 9159e8e9ab7005393b3095752bc57af34f353542..fbc9390e36a146f2e95577fee9b5d3bbffb8db37 100644
--- a/src/app/shared/components/v3/input/input.component.html
+++ b/src/app/shared/components/input/input.component.html
@@ -1,6 +1,6 @@
<div class="container" [ngClass]="{ disabled: disabled, wide: wide }">
<div class="label">
- <label [ngClass]="status" [htmlFor]="id">{{ label }}</label>
+ <label [ngClass]="status" [htmlFor]="id" [innerHtml]="label"></label>
<span *ngIf="description" class="description" [ngClass]="{ disabled: disabled }">{{ description }}</span>
</div>
diff --git a/src/app/shared/components/v3/input/input.component.scss b/src/app/shared/components/input/input.component.scss
similarity index 100%
rename from src/app/shared/components/v3/input/input.component.scss
rename to src/app/shared/components/input/input.component.scss
diff --git a/src/app/shared/components/v3/input/input.component.ts b/src/app/shared/components/input/input.component.ts
similarity index 97%
rename from src/app/shared/components/v3/input/input.component.ts
rename to src/app/shared/components/input/input.component.ts
index 69c94e0da2c1c25aae60fbbfe1668f813245a4a1..8eb9ce8906ab76e2e0942191cc275c5723c34111 100644
--- a/src/app/shared/components/v3/input/input.component.ts
+++ b/src/app/shared/components/input/input.component.ts
@@ -5,7 +5,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
templateUrl: './input.component.html',
styleUrls: ['./input.component.scss'],
})
-export class InputV3Component implements OnInit {
+export class InputComponent implements OnInit {
/** HTML id associated with for */
@Input() id: string;
diff --git a/src/app/shared/components/v3/input/input.stories.ts b/src/app/shared/components/input/input.stories.ts
similarity index 90%
rename from src/app/shared/components/v3/input/input.stories.ts
rename to src/app/shared/components/input/input.stories.ts
index 47180bbae6bdd92cf5504837993ac8a761acaed1..1327c3e9eb7b86f76cb5c0bacee3022dd8f8794a 100644
--- a/src/app/shared/components/v3/input/input.stories.ts
+++ b/src/app/shared/components/input/input.stories.ts
@@ -1,12 +1,12 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { InputV3Component } from './input.component';
+import { InputComponent } from './input.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<InputV3Component> = {
+const meta: Meta<InputComponent> = {
title: 'Components/Input',
- component: InputV3Component,
+ component: InputComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -18,7 +18,7 @@ const meta: Meta<InputV3Component> = {
};
export default meta;
-type Story = StoryObj<InputV3Component>;
+type Story = StoryObj<InputComponent>;
export const Input: Story = {
args: {
diff --git a/src/app/shared/components/v3/label-checkbox/label-checkbox.component.html b/src/app/shared/components/label-checkbox/label-checkbox.component.html
similarity index 96%
rename from src/app/shared/components/v3/label-checkbox/label-checkbox.component.html
rename to src/app/shared/components/label-checkbox/label-checkbox.component.html
index 837b9044c6258f3c11157e92e38cf1464bd9b6dc..4befd4ab0b9d1e033c9ab83f12751ca0c93c6efa 100644
--- a/src/app/shared/components/v3/label-checkbox/label-checkbox.component.html
+++ b/src/app/shared/components/label-checkbox/label-checkbox.component.html
@@ -1,6 +1,6 @@
<div>
<div class="row">
- <app-v3-checkbox
+ <app-checkbox
[id]="for"
[size]="size"
[checked]="checked"
diff --git a/src/app/shared/components/v3/label-checkbox/label-checkbox.component.scss b/src/app/shared/components/label-checkbox/label-checkbox.component.scss
similarity index 100%
rename from src/app/shared/components/v3/label-checkbox/label-checkbox.component.scss
rename to src/app/shared/components/label-checkbox/label-checkbox.component.scss
diff --git a/src/app/shared/components/v3/label-checkbox/label-checkbox.component.ts b/src/app/shared/components/label-checkbox/label-checkbox.component.ts
similarity index 91%
rename from src/app/shared/components/v3/label-checkbox/label-checkbox.component.ts
rename to src/app/shared/components/label-checkbox/label-checkbox.component.ts
index 5e8b003d5cc45cbd926781ae2a9b4dbd36109f75..4e9189c5b3e31799b8744488a3a3ff86fb23de44 100644
--- a/src/app/shared/components/v3/label-checkbox/label-checkbox.component.ts
+++ b/src/app/shared/components/label-checkbox/label-checkbox.component.ts
@@ -1,11 +1,11 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
- selector: 'app-v3-label-checkbox',
+ selector: 'app-label-checkbox',
templateUrl: './label-checkbox.component.html',
styleUrls: ['./label-checkbox.component.scss'],
})
-export class LabelCheckboxV3Component {
+export class LabelCheckboxComponent {
/** Label text to display */
@Input({ required: true }) label: string;
diff --git a/src/app/shared/components/v3/label-checkbox/label-checkbox.stories.ts b/src/app/shared/components/label-checkbox/label-checkbox.stories.ts
similarity index 74%
rename from src/app/shared/components/v3/label-checkbox/label-checkbox.stories.ts
rename to src/app/shared/components/label-checkbox/label-checkbox.stories.ts
index 4d816b80c6ddbd1145fcc86844974f0ecce9d414..f8d6e896d980c337480e037b7eb6312d374d3621 100644
--- a/src/app/shared/components/v3/label-checkbox/label-checkbox.stories.ts
+++ b/src/app/shared/components/label-checkbox/label-checkbox.stories.ts
@@ -1,18 +1,18 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { CheckboxV3Component } from '../checkbox/checkbox.component';
-import { LabelCheckboxV3Component } from './label-checkbox.component';
+import { CheckboxComponent } from '../checkbox/checkbox.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { LabelCheckboxComponent } from './label-checkbox.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<LabelCheckboxV3Component> = {
+const meta: Meta<LabelCheckboxComponent> = {
title: 'Components/Label checkbox',
- component: LabelCheckboxV3Component,
+ component: LabelCheckboxComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [SvgIconComponent, CheckboxV3Component],
+ declarations: [SvgIconComponent, CheckboxComponent],
imports: [CommonModule],
}),
],
@@ -20,7 +20,7 @@ const meta: Meta<LabelCheckboxV3Component> = {
};
export default meta;
-type Story = StoryObj<LabelCheckboxV3Component>;
+type Story = StoryObj<LabelCheckboxComponent>;
export const Label: Story = {
args: {
diff --git a/src/app/shared/components/logo-card/logo-card.component.html b/src/app/shared/components/logo-card/logo-card.component.html
index a8b43209e76f0b647abaf1dd82b811698c508c3c..cf2170a0c50d5d42d49a6708bb7d3613e94496cf 100644
--- a/src/app/shared/components/logo-card/logo-card.component.html
+++ b/src/app/shared/components/logo-card/logo-card.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="name">
- <img class="icon-40" [src]="getPath(name)" [alt]="" />
- <p>{{ getName(name) }}</p>
+<div *ngIf="module">
+ <img class="icon-40" [src]="getPath()" [alt]="" />
+ <p>{{ module.name }}</p>
</div>
diff --git a/src/app/shared/components/logo-card/logo-card.component.ts b/src/app/shared/components/logo-card/logo-card.component.ts
index a9f4bd2c9fad0197d1baa5b505307e51ea702422..e51156c3f83a27ec3f1e7e9295f9d71a79b37607 100644
--- a/src/app/shared/components/logo-card/logo-card.component.ts
+++ b/src/app/shared/components/logo-card/logo-card.component.ts
@@ -1,6 +1,5 @@
import { Component, Input } from '@angular/core';
-import { Demarches } from '../../enum/demarches.enum';
-import { Labels } from '../../enum/labels.emum';
+import { Module } from '../../../structure-list/models/module.model';
@Component({
selector: 'app-logo-card',
@@ -8,18 +7,9 @@ import { Labels } from '../../enum/labels.emum';
styleUrls: ['./logo-card.component.scss'],
})
export class LogoCardComponent {
- @Input() public name: string;
+ @Input() public module: Module;
- public getName(key: string): string {
- if (Labels[key]) {
- return Labels[key];
- } else {
- return key;
- }
- }
-
- public getPath(value: string): string {
- const path = Object.entries(Demarches).find(([, val]) => val === value)?.[0];
- return `assets/logos/${path || this.name}.svg`;
+ public getPath(): string {
+ return `assets/logos/${this.module.id}.svg`;
}
}
diff --git a/src/app/shared/components/member-card/member-card.component.html b/src/app/shared/components/member-card/member-card.component.html
index efeb1c9360dacaaab85565c0343f54cc3451796a..c6c6661230fd266916b607e636eb4668017bc144 100644
--- a/src/app/shared/components/member-card/member-card.component.html
+++ b/src/app/shared/components/member-card/member-card.component.html
@@ -1,13 +1,24 @@
-<div class="structureMember">
- <app-svg-icon class="avatar hide-on-mobile" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" />
- <div class="infoDetails">
- <p class="name underline" tabindex="0" (click)="goToProfile()" (keyup.enter)="goToProfile()">
- {{ member.name | userName }} {{ member.surname | uppercase }}
- </p>
+<div
+ class="structureMember"
+ [ngClass]="{ clickable: isInteractive(), isChecked: isChecked }"
+ [tabindex]="isInteractive() ? '0' : '-1'"
+ (click)="cardClicked()"
+ (keyup.enter)="cardClicked()"
+>
+ <input *ngIf="showRadioButton" type="radio" tabindex="-1" id="{{ member._id }}" [checked]="isChecked" />
+ <app-svg-icon class="hide-on-mobile" [folder]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-48'" />
+ <div class="infoDetails" [ngClass]="{ largeCard: showAppointment }">
+ <p class="name">{{ member.name | userName }} {{ member.surname | uppercase }}</p>
<p>{{ getJob() }}</p>
+ <div *ngIf="showAppointment && member.withAppointment" class="appointment">
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'rdv'" />
+ <span>Rendez-vous</span>
+ </div>
</div>
- <div *ngIf="getPhone()" class="infoDetails">
- <p>{{ getPhone() }}</p>
- <p class="mail">{{ member.email }}</p>
+ <div *ngIf="showContactInfo" class="infoDetails">
+ <p *ngIf="getPhone()">{{ getPhone() }}</p>
+ <p *ngIf="getEmail()" class="mail">{{ getEmail() }}</p>
</div>
+ <div *ngIf="showEmployer && member.employer" class="right employer">{{ member.employer.name }}</div>
+ <app-svg-icon *ngIf="redirectToProfile" [iconClass]="'icon-32'" [folder]="'ico'" [icon]="'chevronRight'" />
</div>
diff --git a/src/app/shared/components/member-card/member-card.component.scss b/src/app/shared/components/member-card/member-card.component.scss
index 91979734f1f4b12fa2ff010f2d3a9100bf6e2c64..66a270be69038af1a7ef872a5df7c180bb340393 100644
--- a/src/app/shared/components/member-card/member-card.component.scss
+++ b/src/app/shared/components/member-card/member-card.component.scss
@@ -1,25 +1,38 @@
@import 'color';
@import 'typography';
@import 'breakpoint';
-@import 'shapes';
.structureMember {
@include font-regular-14;
display: flex;
+ flex-direction: row;
align-items: center;
gap: 24px;
-
padding: 1rem;
border: 1px solid $grey-7;
border-radius: 4px;
color: $grey-3;
transition: all 0.2s ease-in-out;
- .avatar {
- display: flex;
- align-items: center;
- background-color: $grey-9;
- border-radius: 4px;
+ &.clickable {
+ &:hover {
+ border-color: $grey-4;
+ }
+ }
+ &.isChecked {
+ box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.1);
+ border-color: $red;
+ &:hover {
+ border-color: $red;
+ }
+ }
+
+ input {
+ accent-color: $grey-1;
+ width: 18px;
+ height: 18px;
+ margin: 6px;
+ cursor: pointer;
}
p {
@@ -27,8 +40,6 @@
}
.name {
@include font-bold-16;
- text-decoration: underline;
- cursor: pointer;
color: $grey-1;
}
@@ -36,12 +47,41 @@
box-sizing: border-box;
display: flex;
flex-direction: column;
+ justify-content: center;
gap: 8px;
flex-grow: 1;
flex-basis: 0;
+
+ &.largeCard {
+ height: 71px;
+ }
+
+ .appointment {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ span {
+ @include font-bold-14;
+ }
+ }
}
.mail {
text-decoration: underline;
}
+
+ .right {
+ display: flex;
+ align-items: center;
+ gap: 1.5rem;
+ color: $grey-4;
+ .employer {
+ color: $grey-3;
+ }
+ }
+
+ ::ng-deep svg {
+ top: 0px;
+ position: unset;
+ }
}
diff --git a/src/app/shared/components/member-card/member-card.component.ts b/src/app/shared/components/member-card/member-card.component.ts
index a11dc0a9230c9d7556b9fc0f263a30215f8fb718..4e8926204d41360d41d5e19ba1c6c8df18959dc2 100644
--- a/src/app/shared/components/member-card/member-card.component.ts
+++ b/src/app/shared/components/member-card/member-card.component.ts
@@ -1,19 +1,51 @@
-import { Component, Input } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Router } from '@angular/router';
import { get } from 'lodash';
import { Owner } from '../../../models/owner.model';
-import { User } from '../../../models/user.model';
+import { User, UserAnnuary } from '../../../models/user.model';
@Component({
selector: 'app-member-card',
templateUrl: './member-card.component.html',
styleUrls: ['./member-card.component.scss'],
})
-export class MemberCardComponent {
- @Input() public member: User | Owner;
+export class MemberCardComponent implements OnInit {
+ /** The user info to display */
+ @Input({ required: true }) public member: User | Owner | UserAnnuary;
+
+ /** If true, shows the RDV icon if available */
+ @Input() public showAppointment = false;
+
+ /** If true, shows the contact info (phone + email), if provided */
+ @Input() public showContactInfo = true;
+
+ /** If true, shows the employer */
+ @Input() public showEmployer = true;
+
+ /** If true, click event redirects to profile */
+ @Input() public redirectToProfile = true;
+
+ /** If true, shows a radio button to select the card, disables the redirection to profile */
+ @Input() public showRadioButton = false;
+
+ /** If true, checks the radioButton */
+ @Input() public isChecked = false;
+
+ @Output() public selectedCard = new EventEmitter<string>();
constructor(private router: Router) {}
+ ngOnInit(): void {
+ if (this.showRadioButton && this.redirectToProfile) {
+ console.warn("Can't make a card redirect to a profile with a radio button.");
+ this.redirectToProfile = false;
+ }
+ }
+
+ isInteractive(): boolean {
+ return this.showRadioButton || this.redirectToProfile;
+ }
+
getJob(): string {
return this.member.job?.name ?? '';
}
@@ -23,7 +55,16 @@ export class MemberCardComponent {
return get(this.member, 'phone') ?? false;
}
- goToProfile(): void {
- this.router.navigateByUrl(`/profile/${this.member._id}`);
+ /** Depending on User or UserAnnuary return the email of false */
+ getEmail(): string | false {
+ return get(this.member, 'email') ?? false;
+ }
+
+ cardClicked(): void {
+ if (this.redirectToProfile) {
+ this.router.navigateByUrl(`/profile/${this.member._id}`);
+ } else if (this.showRadioButton) {
+ this.selectedCard.emit(this.member._id);
+ }
}
}
diff --git a/src/app/shared/components/v3/modal/modal.component.html b/src/app/shared/components/modal/modal.component.html
similarity index 92%
rename from src/app/shared/components/v3/modal/modal.component.html
rename to src/app/shared/components/modal/modal.component.html
index bb1f952cdfc5fc4a36f5fb5d70ebce05bfe793ac..eb393e445524c8f1253f20b7068063916a820046 100644
--- a/src/app/shared/components/v3/modal/modal.component.html
+++ b/src/app/shared/components/modal/modal.component.html
@@ -5,7 +5,7 @@
<app-svg-icon
tabindex="0"
alt="Fermer la fenêtre"
- [type]="'ico'"
+ [folder]="'ico'"
[icon]="'cross'"
[iconClass]="'icon-24 hover'"
(keyup.enter)="closeModal(false)"
@@ -14,14 +14,14 @@
</div>
<p><ng-content /></p>
<div class="footerModal">
- <app-v3-button
+ <app-button
*ngIf="!singleButton"
[label]="cancelLabel"
[variant]="'secondary'"
[size]="'medium'"
(action)="closeModal(false)"
/>
- <app-v3-button
+ <app-button
[label]="validateLabel"
[variant]="'primary'"
[wide]="singleButton"
diff --git a/src/app/shared/components/v3/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss
similarity index 96%
rename from src/app/shared/components/v3/modal/modal.component.scss
rename to src/app/shared/components/modal/modal.component.scss
index 033ccb4818cfa39b659f1f3fd71c5188f0f394be..4f00e6cdc1e9fdff9e0602f45d383cae5909ec04 100644
--- a/src/app/shared/components/v3/modal/modal.component.scss
+++ b/src/app/shared/components/modal/modal.component.scss
@@ -61,9 +61,6 @@
margin-top: 8px;
gap: 0.75rem;
justify-content: center;
- app-button {
- flex: 1;
- }
}
}
}
diff --git a/src/app/shared/components/v3/modal/modal.component.ts b/src/app/shared/components/modal/modal.component.ts
similarity index 94%
rename from src/app/shared/components/v3/modal/modal.component.ts
rename to src/app/shared/components/modal/modal.component.ts
index e046e7f1146bca8caab1dbd876609f4d22bd863b..55d0b799321c8d05394f288871c9f58c5891ba51 100644
--- a/src/app/shared/components/v3/modal/modal.component.ts
+++ b/src/app/shared/components/modal/modal.component.ts
@@ -1,11 +1,11 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
- selector: 'app-v3-modal',
+ selector: 'app-modal',
templateUrl: './modal.component.html',
styleUrls: ['./modal.component.scss'],
})
-export class ModalV3Component {
+export class ModalComponent {
/* Is modal opened ? */
@Input({ required: true }) public opened: boolean;
diff --git a/src/app/shared/components/v3/modal/modal.stories.ts b/src/app/shared/components/modal/modal.stories.ts
similarity index 76%
rename from src/app/shared/components/v3/modal/modal.stories.ts
rename to src/app/shared/components/modal/modal.stories.ts
index fcf67c8c40ef67746f1f7f83ab3431f7fbeeb410..56b393d3ded1c90bd0493f7d6e0bffbb0de1c938 100644
--- a/src/app/shared/components/v3/modal/modal.stories.ts
+++ b/src/app/shared/components/modal/modal.stories.ts
@@ -1,18 +1,18 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { ButtonV3Component } from '../button/button.component';
-import { ModalV3Component } from './modal.component';
+import { ButtonComponent } from '../button/button.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { ModalComponent } from './modal.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<ModalV3Component> = {
+const meta: Meta<ModalComponent> = {
title: 'Components/Modal',
- component: ModalV3Component,
+ component: ModalComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [SvgIconComponent, ButtonV3Component],
+ declarations: [SvgIconComponent, ButtonComponent],
imports: [CommonModule],
}),
],
@@ -20,7 +20,7 @@ const meta: Meta<ModalV3Component> = {
};
export default meta;
-type Story = StoryObj<ModalV3Component>;
+type Story = StoryObj<ModalComponent>;
export const SingleButton: Story = {
args: {
@@ -31,15 +31,15 @@ export const SingleButton: Story = {
cancelLabel: 'Annuler',
singleButton: true,
},
- render: (args: Partial<ModalV3Component>) => ({
- template: `<app-v3-modal [opened]="${args.opened}"
+ render: (args: Partial<ModalComponent>) => ({
+ template: `<app-modal [opened]="${args.opened}"
[validateLabel]="'${args.validateLabel}'"
[cancelLabel]="'${args.cancelLabel}'"
[title]="'${args.title}'"
[singleButton]="${args.singleButton}"
>
${args.content}
- </app-v3-modal>`,
+ </app-modal>`,
}),
};
diff --git a/src/app/shared/components/password-form/password-form.component.html b/src/app/shared/components/password-form/password-form.component.html
index d6cdc35fc8d883db5450b563fd0ab7c7512a9bfe..4e19f2a51456e5984cfa17eb063d5bed2f369eca 100644
--- a/src/app/shared/components/password-form/password-form.component.html
+++ b/src/app/shared/components/password-form/password-form.component.html
@@ -13,15 +13,15 @@
/>
<app-svg-icon
tabindex="0"
- [type]="'form'"
+ [folder]="'form'"
[iconClass]="'grey'"
- [icon]="'eyePassword'"
+ [icon]="'visibility'"
(click)="showOldPassword()"
(keyup.enter)="showOldPassword()"
/>
<app-svg-icon
*ngIf="!checkOldPassword(accountForm.value.oldPassword)"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -40,13 +40,13 @@
<app-svg-icon
*ngIf="accountForm.get('password').value.length >= 8"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('password').value.length < 8"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>8 caractères</p>
@@ -60,13 +60,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasSpecialChar(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasSpecialChar(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère spécial</p>
@@ -80,13 +80,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasLowerCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasLowerCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère en minuscule</p>
@@ -100,13 +100,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasUpperCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasUpperCase(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un caractère en majuscule</p>
@@ -120,13 +120,13 @@
<app-svg-icon
*ngIf="checkIfPasswordHasDigit(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="!checkIfPasswordHasDigit(accountForm.get('password').value)"
[iconClass]="'validation-small'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
<p>un chiffre</p>
@@ -142,8 +142,8 @@
<app-svg-icon
tabindex="0"
[iconClass]="'validation grey hover'"
- [type]="'form'"
- [icon]="'eyePassword'"
+ [folder]="'form'"
+ [icon]="'visibility'"
(click)="showPassword()"
(keyup.enter)="showPassword()"
/>
@@ -151,13 +151,13 @@
<app-svg-icon
*ngIf="accountForm.get('password').valid"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('password').invalid && accountForm.get('password').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
@@ -174,28 +174,28 @@
<app-svg-icon
tabindex="0"
[iconClass]="'validation grey hover'"
- [type]="'form'"
- [icon]="'eyePassword'"
+ [folder]="'form'"
+ [icon]="'visibility'"
(click)="showConfirmPassword()"
(keyup.enter)="showConfirmPassword()"
/>
<app-svg-icon
*ngIf="accountForm.get('confirmPassword').valid && accountForm.get('confirmPassword').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'validate'"
/>
<app-svg-icon
*ngIf="accountForm.get('confirmPassword').invalid && accountForm.get('confirmPassword').value"
[iconClass]="'validation'"
- [type]="'form'"
+ [folder]="'form'"
[icon]="'notValidate'"
/>
</div>
</div>
<div class="form-group" fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="20px">
- <app-v3-button [variant]="'secondary'" [label]="'Annuler'" (action)="goHome()" />
- <app-v3-button
+ <app-button [variant]="'secondary'" [label]="'Annuler'" (action)="goHome()" />
+ <app-button
[type]="'submit'"
[disabled]="
accountForm.get('confirmPassword').invalid ||
diff --git a/src/app/shared/components/radio-option/radio-option.stories.ts b/src/app/shared/components/radio-option/radio-option.stories.ts
index 9b0703e9d58325e7b84d1a9a9d718607e591d01e..c91b65fb8ce55670e92ab73d2df45d21b60e0474 100644
--- a/src/app/shared/components/radio-option/radio-option.stories.ts
+++ b/src/app/shared/components/radio-option/radio-option.stories.ts
@@ -1,8 +1,8 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { componentWrapperDecorator, moduleMetadata } from '@storybook/angular';
+import { RadioComponent } from '../radio/radio.component';
import { SvgIconComponent } from '../svg-icon/svg-icon.component';
-import { RadioV3Component } from '../v3/radio/radio.component';
import { RadioOptionComponent } from './radio-option.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
@@ -12,7 +12,7 @@ const meta: Meta<RadioOptionComponent> = {
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [SvgIconComponent, RadioV3Component],
+ declarations: [SvgIconComponent, RadioComponent],
imports: [CommonModule],
}),
],
diff --git a/src/app/shared/components/v3/radio/radio.component.html b/src/app/shared/components/radio/radio.component.html
similarity index 77%
rename from src/app/shared/components/v3/radio/radio.component.html
rename to src/app/shared/components/radio/radio.component.html
index d4210091016bacd2018f9631c6cb30475d41bd81..2d3f9e8977734f072773e8463c996985d5ea048e 100644
--- a/src/app/shared/components/v3/radio/radio.component.html
+++ b/src/app/shared/components/radio/radio.component.html
@@ -7,7 +7,7 @@
[ngClass]="classes"
(click)="action.emit($event)"
/>
- <app-svg-icon *ngIf="iconName" [iconClass]="'icon-40'" [type]="'form'" [icon]="iconName" />
+ <app-svg-icon *ngIf="iconName" [iconClass]="'icon-40'" [folder]="'form'" [icon]="iconName" />
<div class="details">
<label [for]="id">{{ label }}</label>
<p *ngIf="description" class="description">{{ description }}</p>
diff --git a/src/app/shared/components/v3/radio/radio.component.scss b/src/app/shared/components/radio/radio.component.scss
similarity index 100%
rename from src/app/shared/components/v3/radio/radio.component.scss
rename to src/app/shared/components/radio/radio.component.scss
diff --git a/src/app/shared/components/v3/radio/radio.component.ts b/src/app/shared/components/radio/radio.component.ts
similarity index 96%
rename from src/app/shared/components/v3/radio/radio.component.ts
rename to src/app/shared/components/radio/radio.component.ts
index 3ee99023f42d87906f1408ef20871c7eb38d5ade..ee4010b2d3e9ab7adb1062af520df2227d99c6dd 100644
--- a/src/app/shared/components/v3/radio/radio.component.ts
+++ b/src/app/shared/components/radio/radio.component.ts
@@ -5,7 +5,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
templateUrl: './radio.component.html',
styleUrls: ['./radio.component.scss'],
})
-export class RadioV3Component {
+export class RadioComponent {
/** HTML id associated with for */
@Input() id: string;
diff --git a/src/app/shared/components/v3/radio/radio.stories.ts b/src/app/shared/components/radio/radio.stories.ts
similarity index 85%
rename from src/app/shared/components/v3/radio/radio.stories.ts
rename to src/app/shared/components/radio/radio.stories.ts
index fed1d1a9728dde4dd718e0552fe2c95c1920c752..383d9e13cb3adb9237563b8b97cec44533fde7b8 100644
--- a/src/app/shared/components/v3/radio/radio.stories.ts
+++ b/src/app/shared/components/radio/radio.stories.ts
@@ -1,12 +1,12 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { RadioV3Component } from './radio.component';
+import { RadioComponent } from './radio.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<RadioV3Component> = {
+const meta: Meta<RadioComponent> = {
title: 'Components/Radio',
- component: RadioV3Component,
+ component: RadioComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -18,7 +18,7 @@ const meta: Meta<RadioV3Component> = {
};
export default meta;
-type Story = StoryObj<RadioV3Component>;
+type Story = StoryObj<RadioComponent>;
export const Radio: Story = {
args: {
diff --git a/src/app/shared/components/v3/scrollbar/scrollbar.stories.ts b/src/app/shared/components/scrollbar/scrollbar.stories.ts
similarity index 100%
rename from src/app/shared/components/v3/scrollbar/scrollbar.stories.ts
rename to src/app/shared/components/scrollbar/scrollbar.stories.ts
diff --git a/src/app/shared/components/v3/search-bar/search-bar.component.html b/src/app/shared/components/search-bar/search-bar.component.html
similarity index 94%
rename from src/app/shared/components/v3/search-bar/search-bar.component.html
rename to src/app/shared/components/search-bar/search-bar.component.html
index 682164dc7260e49a07ebd9374708f72ed000fa5d..32d7dcbac00dced9585e464a23edd9bf0b8c00fc 100644
--- a/src/app/shared/components/v3/search-bar/search-bar.component.html
+++ b/src/app/shared/components/search-bar/search-bar.component.html
@@ -7,7 +7,7 @@
(ngModelChange)="onChange()"
(keyup.enter)="handleSearch()"
/>
- <app-v3-icon-button
+ <app-icon-button
[iconFolder]="'ico'"
[iconName]="'search'"
[iconColor]="'currentColor'"
diff --git a/src/app/shared/components/v3/search-bar/search-bar.component.scss b/src/app/shared/components/search-bar/search-bar.component.scss
similarity index 94%
rename from src/app/shared/components/v3/search-bar/search-bar.component.scss
rename to src/app/shared/components/search-bar/search-bar.component.scss
index c871e6b767f2f9fc07c851c5cec929a0e6876f48..18bc89006f93b99a3ab4bca01c946361224bd201 100644
--- a/src/app/shared/components/v3/search-bar/search-bar.component.scss
+++ b/src/app/shared/components/search-bar/search-bar.component.scss
@@ -31,7 +31,7 @@
border: 1px solid $grey-1;
}
}
- ::ng-deep app-v3-icon-button button {
+ ::ng-deep app-icon-button button {
border-radius: 0 4px 4px 0;
}
}
diff --git a/src/app/shared/components/v3/search-bar/search-bar.component.ts b/src/app/shared/components/search-bar/search-bar.component.ts
similarity index 89%
rename from src/app/shared/components/v3/search-bar/search-bar.component.ts
rename to src/app/shared/components/search-bar/search-bar.component.ts
index f6f3c3dbea7dc08ee96a8657fd1adf21ecf6fba7..524248dcf0adb0a90118e10bd0d65ad4c4dfe4ee 100644
--- a/src/app/shared/components/v3/search-bar/search-bar.component.ts
+++ b/src/app/shared/components/search-bar/search-bar.component.ts
@@ -1,11 +1,11 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
- selector: 'app-v3-search-bar',
+ selector: 'app-search-bar',
templateUrl: './search-bar.component.html',
styleUrls: ['./search-bar.component.scss'],
})
-export class SearchBarV3Component {
+export class SearchBarComponent {
@Input() placeholder = 'Rechercher';
@Input({ required: true }) value = '';
diff --git a/src/app/shared/components/v3/search-bar/search-bar.stories.ts b/src/app/shared/components/search-bar/search-bar.stories.ts
similarity index 55%
rename from src/app/shared/components/v3/search-bar/search-bar.stories.ts
rename to src/app/shared/components/search-bar/search-bar.stories.ts
index 33043de812da9ed98ff9f332f4097b2fb369b63f..f6dc049d3d606ebbb9009d3bc115a77b1d0bafca 100644
--- a/src/app/shared/components/v3/search-bar/search-bar.stories.ts
+++ b/src/app/shared/components/search-bar/search-bar.stories.ts
@@ -1,19 +1,19 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { ButtonV3Component } from '../button/button.component';
-import { IconButtonV3Component } from '../button/icon-button/icon-button.component';
-import { SearchBarV3Component } from './search-bar.component';
+import { ButtonComponent } from '../button/button.component';
+import { IconButtonComponent } from '../button/icon-button/icon-button.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { SearchBarComponent } from './search-bar.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<SearchBarV3Component> = {
+const meta: Meta<SearchBarComponent> = {
title: 'Components/Search bar',
- component: SearchBarV3Component,
+ component: SearchBarComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [IconButtonV3Component, ButtonV3Component, SvgIconComponent],
+ declarations: [IconButtonComponent, ButtonComponent, SvgIconComponent],
imports: [CommonModule],
}),
],
@@ -21,7 +21,7 @@ const meta: Meta<SearchBarV3Component> = {
};
export default meta;
-type Story = StoryObj<SearchBarV3Component>;
+type Story = StoryObj<SearchBarComponent>;
export const Default: Story = {
args: {},
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html b/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
index fa5e23b868d4852d7ca22b402fcf270ff9e8e194..2cc2e743c8a3bd541d469859efd2ff68a463c3ad 100644
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
+++ b/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
@@ -13,15 +13,15 @@
<div class="mobile-column">
<div fxLayout="column" fxFlex="100%">
<div *ngIf="structure.address" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [icon]="'adress'" [iconClass]="'icon-22'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'address'" [iconClass]="'icon-22'" />
<p>{{ structure.address.numero }} {{ structure.address.street }}, {{ structure.address.commune }}</p>
</div>
<div *ngIf="structure.contactPhone" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [icon]="'tel'" [iconClass]="'icon-22'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'tel'" [iconClass]="'icon-22'" />
<p>{{ structure.contactPhone | phone }}</p>
</div>
<div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [type]="'ico'" [iconClass]="'grey-1 icon-22'" [icon]="'email'" />
+ <app-svg-icon [folder]="'ico'" [icon]="'email'" [iconClass]="'grey-1 icon-22'" />
<p>{{ structure.contactMail }}</p>
</div>
</div>
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss b/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss
index 47e930605d21073c113eed4e898c94c0cdcad1a0..19e1cde56e9355ab37c805702b9bae1ff6ae2b18 100644
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss
+++ b/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss
@@ -3,7 +3,6 @@
@import 'z-index';
@import 'layout';
@import 'breakpoint';
-@import 'buttons';
h2 {
margin-top: 0;
@@ -88,7 +87,7 @@ a {
}
.info {
- color: $primary-color;
+ color: $red;
}
.wrapper {
diff --git a/src/app/shared/components/structure-hours/structure-hours-list.component.scss b/src/app/shared/components/structure-hours/structure-hours-list.component.scss
index f3a0133bc2fb5367dcbff822cd7aec8bfd1743bb..0f5159d0f4e5030d6f5f3308b5894d9b192d96d5 100644
--- a/src/app/shared/components/structure-hours/structure-hours-list.component.scss
+++ b/src/app/shared/components/structure-hours/structure-hours-list.component.scss
@@ -48,7 +48,7 @@ ul.hoursContainer {
}
.openingTime {
@include font-regular-13;
- color: $grey-4-text;
+ color: $grey-4-5-1;
display: flex;
gap: 8px;
}
diff --git a/src/app/shared/components/structure-pmr/structure-pmr.component.html b/src/app/shared/components/structure-pmr/structure-pmr.component.html
index c7726274427f2c69dba93e7f7c33f44cee00c539..1af3acf298e0126a9989508f67f8a8feb9728590 100644
--- a/src/app/shared/components/structure-pmr/structure-pmr.component.html
+++ b/src/app/shared/components/structure-pmr/structure-pmr.component.html
@@ -5,7 +5,7 @@
<p>Un seul choix possible</p>
</div>
<p *ngIf="isEditMode && !structureForm.get('pmrAccess').valid" class="missing-information">
- <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" />
+ <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" />
<span>Il faut renseigner un champ</span>
</p>
<div class="formGroup">
diff --git a/src/app/shared/components/structure-type-picker/structure-type-picker.component.html b/src/app/shared/components/structure-type-picker/structure-type-picker.component.html
index 71bad38b6cc441fd7552ec7b5a9010ba929c74d2..5bf922a4fd477443fd50d05448f06a4b2aca3446 100644
--- a/src/app/shared/components/structure-type-picker/structure-type-picker.component.html
+++ b/src/app/shared/components/structure-type-picker/structure-type-picker.component.html
@@ -1,8 +1,8 @@
<form>
<div class="title" style="gap: 12px">
<h4>{{ structureTypeCategoryEnum.public }}</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let type of publicTypes"
[iconName]="type._id === pickedTypeId ? 'check' : null"
[label]="type.name"
@@ -15,8 +15,8 @@
<div class="title" style="gap: 12px">
<h4>{{ structureTypeCategoryEnum.private }}</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let type of privateTypes"
[iconName]="type._id === pickedTypeId ? 'check' : null"
[label]="type.name"
@@ -29,8 +29,8 @@
<div class="title" style="gap: 12px">
<h4>{{ structureTypeCategoryEnum.privateLucrative }}</h4>
- <div class="btn-grid">
- <app-v3-tag-item
+ <div class="tagList">
+ <app-tag-item
*ngFor="let type of privateLucrativeTypes"
[iconName]="type._id === pickedTypeId ? 'check' : null"
[label]="type.name"
diff --git a/src/app/shared/components/structure-type-picker/structure-type-picker.component.ts b/src/app/shared/components/structure-type-picker/structure-type-picker.component.ts
index e2991ec4e8cc34d47fa69d6e5fe53ea98d4608b2..95b8ae49bde9fdb93f3fba3885c256629024b539 100644
--- a/src/app/shared/components/structure-type-picker/structure-type-picker.component.ts
+++ b/src/app/shared/components/structure-type-picker/structure-type-picker.component.ts
@@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { StructureType } from '../../../models/structureType.model';
import { StructureTypeService } from '../../../services/structure-type.service';
import { StructureCategoryEnum } from '../../enum/structureCategory.enum';
-import { ButtonType } from '../button/buttonType.enum';
@Component({
selector: 'app-structure-type-picker',
@@ -15,7 +14,6 @@ export class StructureTypePickerComponent implements OnInit {
@Input() public pickedTypeId?: string;
@Output() selectedType: EventEmitter<string> = new EventEmitter<string>();
- public buttonTypeEnum = ButtonType;
public structureTypeCategoryEnum = StructureCategoryEnum;
constructor(private structureTypeService: StructureTypeService) {}
diff --git a/src/app/shared/components/svg-icon/SpriteFolder.type.ts b/src/app/shared/components/svg-icon/SpriteFolder.type.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f7e2066dd01130c875fb432cf61264cc515664b8
--- /dev/null
+++ b/src/app/shared/components/svg-icon/SpriteFolder.type.ts
@@ -0,0 +1 @@
+export type SpriteFolderType = 'avatar' | 'form' | 'ico' | 'tags' | 'tcl';
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.html b/src/app/shared/components/svg-icon/svg-icon.component.html
index a70245f6aff02d84c86f53cca6fecd36314f006e..72f8ed825f1bdd485bca014d8ea19ec6990abc5a 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.html
+++ b/src/app/shared/components/svg-icon/svg-icon.component.html
@@ -2,11 +2,11 @@
<svg
aria-hidden="true"
class="icon"
- role="img"
+ role="presentation"
[ngClass]="iconClass"
[attr.fill]="iconColor"
[attr.stroke]="iconColor"
>
- <use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon" />
+ <use [attr.xlink:href]="'assets/' + folder + '/sprite.svg#' + icon" />
</svg>
</div>
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.scss b/src/app/shared/components/svg-icon/svg-icon.component.scss
index 7f77f0f919e7ae54d9514bd608804033a664d334..12e3fb223d5a0237f68074b116f1eea4290d1a78 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -59,32 +59,6 @@ $sizes: (
opacity: 0.8;
}
}
- &.white {
- fill: $white;
- stroke: $white;
- path {
- stroke: $white;
- fill: $white;
- }
- }
- &.grey {
- fill: $grey-3;
- stroke: $grey-3;
- }
- &.grey-1 {
- fill: $grey-1;
- stroke: $grey-1;
- }
- &.green {
- fill: $green-1;
- stroke: $green-1;
- }
- // V3REMOVE
- &.backArrow {
- height: 40px;
- width: 40px;
- margin-right: 1rem;
- }
}
svg {
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.ts b/src/app/shared/components/svg-icon/svg-icon.component.ts
index 577f21bdac10ea9527d2397427da679c7a27195b..59bce347689128db6a2fcafa018ff36bffe43f19 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.ts
+++ b/src/app/shared/components/svg-icon/svg-icon.component.ts
@@ -1,4 +1,5 @@
import { Component, Input } from '@angular/core';
+import { SpriteFolderType } from './SpriteFolder.type';
@Component({
selector: 'app-svg-icon',
@@ -9,8 +10,8 @@ export class SvgIconComponent {
/** Id of svg to use */
@Input({ required: true }) icon: string;
- /** Folder of the sprite to use */
- @Input({ required: true }) type: string;
+ /** Folder of the sprite ex: assets/ico/sprite.svg */
+ @Input({ required: true }) folder: SpriteFolderType = 'ico';
@Input() iconClass: string;
@Input() iconColor = 'none';
diff --git a/src/app/shared/components/v3/switch/switch.component.html b/src/app/shared/components/switch/switch.component.html
similarity index 100%
rename from src/app/shared/components/v3/switch/switch.component.html
rename to src/app/shared/components/switch/switch.component.html
diff --git a/src/app/shared/components/v3/switch/switch.component.scss b/src/app/shared/components/switch/switch.component.scss
similarity index 100%
rename from src/app/shared/components/v3/switch/switch.component.scss
rename to src/app/shared/components/switch/switch.component.scss
diff --git a/src/app/shared/components/v3/switch/switch.component.ts b/src/app/shared/components/switch/switch.component.ts
similarity index 100%
rename from src/app/shared/components/v3/switch/switch.component.ts
rename to src/app/shared/components/switch/switch.component.ts
diff --git a/src/app/shared/components/v3/switch/switch.stories.ts b/src/app/shared/components/switch/switch.stories.ts
similarity index 86%
rename from src/app/shared/components/v3/switch/switch.stories.ts
rename to src/app/shared/components/switch/switch.stories.ts
index 147a35106fd4e1b8b4fdbad654e116c2fde30b86..2401ad57d562d36444b61305ae552563e668e238 100644
--- a/src/app/shared/components/v3/switch/switch.stories.ts
+++ b/src/app/shared/components/switch/switch.stories.ts
@@ -1,8 +1,8 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { CheckboxV3Component } from '../checkbox/checkbox.component';
+import { CheckboxComponent } from '../checkbox/checkbox.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
import { SwitchComponent } from './switch.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
@@ -12,7 +12,7 @@ const meta: Meta<SwitchComponent> = {
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [SvgIconComponent, SvgIconComponent, CheckboxV3Component],
+ declarations: [SvgIconComponent, SvgIconComponent, CheckboxComponent],
imports: [CommonModule],
}),
],
diff --git a/src/app/shared/components/v3/tag-item/tag-item.component.html b/src/app/shared/components/tag-item/tag-item.component.html
similarity index 89%
rename from src/app/shared/components/v3/tag-item/tag-item.component.html
rename to src/app/shared/components/tag-item/tag-item.component.html
index b73fd8e47fe1e7cc80f92667e7f321c487a79dfa..47765edc015c8a4f04445f196648a4921a57cc10 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.component.html
+++ b/src/app/shared/components/tag-item/tag-item.component.html
@@ -7,7 +7,7 @@
>
<app-svg-icon
*ngIf="iconName && iconPosition === 'left'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="'currentColor'"
[iconClass]="iconSize"
@@ -15,7 +15,7 @@
{{ label }}
<app-svg-icon
*ngIf="iconName && iconPosition === 'right'"
- [type]="iconFolder"
+ [folder]="iconFolder"
[icon]="iconName"
[iconColor]="'currentColor'"
[iconClass]="iconSize"
diff --git a/src/app/shared/components/v3/tag-item/tag-item.component.scss b/src/app/shared/components/tag-item/tag-item.component.scss
similarity index 63%
rename from src/app/shared/components/v3/tag-item/tag-item.component.scss
rename to src/app/shared/components/tag-item/tag-item.component.scss
index e3d85d8eedd67501deee142e6a55f5ead42a249b..374d6bda881197ee035c9fc2926f8e5669eeee07 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.component.scss
+++ b/src/app/shared/components/tag-item/tag-item.component.scss
@@ -27,14 +27,6 @@ button {
background-color: $white;
border-color: $grey-5;
color: $grey-1;
- &.selected {
- background-color: $grey-1;
- border-color: $grey-1;
- color: $white;
- &:active {
- background-color: $grey-2;
- }
- }
&:hover {
border-color: $grey-3;
}
@@ -52,9 +44,34 @@ button {
}
}
+ &.grey {
+ background-color: $grey-7;
+ border-color: $grey-7;
+ color: $grey-3;
+ &:hover {
+ background-color: $grey-5;
+ border-color: $grey-5;
+ color: $grey-1;
+ }
+ &:focus-visible {
+ outline-offset: 2px;
+ outline: 2px solid $blue-focus;
+ }
+ &:disabled {
+ background-color: $grey-9;
+ border-color: $grey-9;
+ color: $grey-5;
+ }
+ &:active {
+ background-color: $grey-7;
+ border-color: $grey-3;
+ color: $grey-3;
+ }
+ }
+
&.red {
- color: $red-darker;
- background-color: $red-light;
+ color: $red-dark;
+ background-color: $red-lighter;
}
&.black {
diff --git a/src/app/shared/components/v3/tag-item/tag-item.component.ts b/src/app/shared/components/tag-item/tag-item.component.ts
similarity index 81%
rename from src/app/shared/components/v3/tag-item/tag-item.component.ts
rename to src/app/shared/components/tag-item/tag-item.component.ts
index 71d3a74af64f701ccf2df36eac43e88aa86de827..244ad75ab99a5bf0ae5d256fd6bbf72d3462797b 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.component.ts
+++ b/src/app/shared/components/tag-item/tag-item.component.ts
@@ -1,11 +1,12 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { SpriteFolderType } from '../svg-icon/SpriteFolder.type';
@Component({
- selector: 'app-v3-tag-item',
+ selector: 'app-tag-item',
templateUrl: './tag-item.component.html',
styleUrls: ['./tag-item.component.scss'],
})
-export class TagItemV3Component {
+export class TagItemComponent {
/** Tag label */
@Input({ required: true }) label: string;
@@ -13,7 +14,7 @@ export class TagItemV3Component {
@Input() size?: 'small' | 'medium' = 'medium';
/** What color should the tag be ? */
- @Input() color?: 'white' | 'black' | 'red' = 'white';
+ @Input() color?: 'white' | 'black' | 'red' | 'grey' = 'white';
/** Should the button be clickable ? */
@Input() clickable = false;
@@ -25,7 +26,7 @@ export class TagItemV3Component {
@Input() iconPosition?: 'left' | 'right' = 'left';
/** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
+ @Input() iconFolder: SpriteFolderType = 'ico';
/** Icon name */
@Input() iconName?: string;
diff --git a/src/app/shared/components/v3/tag-item/tag-item.stories.ts b/src/app/shared/components/tag-item/tag-item.stories.ts
similarity index 74%
rename from src/app/shared/components/v3/tag-item/tag-item.stories.ts
rename to src/app/shared/components/tag-item/tag-item.stories.ts
index 00bc172cc8245ac2e30880741853dc30954e35b1..01a458e3fb4e2730817299f3fd190dcf2e2a7f76 100644
--- a/src/app/shared/components/v3/tag-item/tag-item.stories.ts
+++ b/src/app/shared/components/tag-item/tag-item.stories.ts
@@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common';
import { EventEmitter } from '@angular/core';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { SvgIconComponent } from '../../svg-icon/svg-icon.component';
-import { TagItemV3Component } from './tag-item.component';
+import { SvgIconComponent } from '../svg-icon/svg-icon.component';
+import { TagItemComponent } from './tag-item.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<TagItemV3Component> = {
+const meta: Meta<TagItemComponent> = {
title: 'Components/Tag item',
- component: TagItemV3Component,
+ component: TagItemComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -20,13 +20,13 @@ const meta: Meta<TagItemV3Component> = {
};
export default meta;
-type Story = StoryObj<TagItemV3Component>;
+type Story = StoryObj<TagItemComponent>;
export const Small: Story = {
args: {
label: 'Label tag',
size: 'small',
-
+ clickable: true,
action: new EventEmitter(),
},
};
@@ -44,6 +44,7 @@ export const Medium: Story = {
label: 'Medium tag',
color: 'white',
size: 'medium',
+ clickable: true,
},
};
@@ -71,6 +72,16 @@ export const MediumBlack: Story = {
label: 'Médiathèque/Bibliothèque',
color: 'black',
size: 'medium',
+ clickable: false,
+ },
+};
+
+export const MediumGrey: Story = {
+ args: {
+ label: 'Médiathèque/Bibliothèque',
+ color: 'grey',
+ size: 'medium',
+ clickable: true,
},
};
@@ -93,10 +104,10 @@ export const MultipleTags: Story = {
render: (args) => ({
props: args,
template: `
- <div class="btn-grid">
- <app-v3-tag-item label="test 1" />
- <app-v3-tag-item label="test 2" />
- <app-v3-tag-item label="test 3" />
+ <div class="tagList">
+ <app-tag-item label="test 1" />
+ <app-tag-item label="test 2" />
+ <app-tag-item label="test 3" />
</div>`,
}),
};
diff --git a/src/app/shared/components/v3/textarea/textarea.component.html b/src/app/shared/components/textarea/textarea.component.html
similarity index 87%
rename from src/app/shared/components/v3/textarea/textarea.component.html
rename to src/app/shared/components/textarea/textarea.component.html
index be76d2d7e1e1890579359e852230dfee42799db0..2c3494407593cfc59175555d1813c423579c4d60 100644
--- a/src/app/shared/components/v3/textarea/textarea.component.html
+++ b/src/app/shared/components/textarea/textarea.component.html
@@ -10,10 +10,11 @@
[disabled]="disabled"
[ngClass]="status"
[placeholder]="placeholder"
- (input)="onValueChange($event)"
+ [(ngModel)]="value"
+ (ngModelChange)="onValueChange()"
></textarea>
- <div class="count">{{ value?.length }} / {{ maxLength }}</div>
+ <div class="count">{{ value?.length ?? 0 }} / {{ maxLength }}</div>
<div *ngIf="status && statusText" class="status" [ngClass]="status">
<img *ngIf="status === 'error'" src="assets/ico/error-rounded.svg" alt="" />
<img *ngIf="status === 'success'" src="assets/ico/success-rounded.svg" alt="" />
diff --git a/src/app/shared/components/v3/textarea/textarea.component.scss b/src/app/shared/components/textarea/textarea.component.scss
similarity index 100%
rename from src/app/shared/components/v3/textarea/textarea.component.scss
rename to src/app/shared/components/textarea/textarea.component.scss
diff --git a/src/app/shared/components/v3/textarea/textarea.component.ts b/src/app/shared/components/textarea/textarea.component.ts
similarity index 86%
rename from src/app/shared/components/v3/textarea/textarea.component.ts
rename to src/app/shared/components/textarea/textarea.component.ts
index 28fe1f149032908a1ee3a89c7f5f10444c437798..ee6b4dc6f5e773e674543218826c8ae70511cb72 100644
--- a/src/app/shared/components/v3/textarea/textarea.component.ts
+++ b/src/app/shared/components/textarea/textarea.component.ts
@@ -5,7 +5,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
templateUrl: './textarea.component.html',
styleUrls: ['./textarea.component.scss'],
})
-export class TextareaV3Component {
+export class TextareaComponent {
/** HTML id associated with for */
@Input({ required: true }) id: string;
@@ -34,8 +34,7 @@ export class TextareaV3Component {
@Output() valueChange = new EventEmitter<string>();
- public onValueChange(event: Event): void {
- this.value = (event.target as HTMLTextAreaElement).value;
+ public onValueChange(): void {
this.valueChange.emit(this.value);
}
}
diff --git a/src/app/shared/components/v3/textarea/textarea.stories.ts b/src/app/shared/components/textarea/textarea.stories.ts
similarity index 82%
rename from src/app/shared/components/v3/textarea/textarea.stories.ts
rename to src/app/shared/components/textarea/textarea.stories.ts
index e60a1a3c47d1796198283452d5516d3b60158bb7..f4d4f03a7fc0f20f91ab791059791a62c8f29a77 100644
--- a/src/app/shared/components/v3/textarea/textarea.stories.ts
+++ b/src/app/shared/components/textarea/textarea.stories.ts
@@ -1,12 +1,12 @@
import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
-import { TextareaV3Component } from './textarea.component';
+import { TextareaComponent } from './textarea.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
-const meta: Meta<TextareaV3Component> = {
+const meta: Meta<TextareaComponent> = {
title: 'Components/Textarea',
- component: TextareaV3Component,
+ component: TextareaComponent,
tags: ['autodocs'],
decorators: [
moduleMetadata({
@@ -18,13 +18,12 @@ const meta: Meta<TextareaV3Component> = {
};
export default meta;
-type Story = StoryObj<TextareaV3Component>;
+type Story = StoryObj<TextareaComponent>;
export const Textarea: Story = {
args: {
id: 'input1',
label: 'Label',
- onValueChange: (event) => console.log((event.target as HTMLTextAreaElement).value),
},
};
diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.html b/src/app/shared/components/training-type-picker/training-type-picker.component.html
index 45b303d0af02a2105a2060459d3c69b4a76e8e36..b9b710433dd8c76e69a0da482fdf4166c5db101c 100644
--- a/src/app/shared/components/training-type-picker/training-type-picker.component.html
+++ b/src/app/shared/components/training-type-picker/training-type-picker.component.html
@@ -2,7 +2,7 @@
<app-collapse *ngFor="let category of categories" [expanded]="isCategorieExpanded(category.id)">
<app-collapse-header>
<div class="collapseHeader">
- <app-v3-checkbox
+ <app-checkbox
[checked]="getCategoryCheckboxStatus(category) === 'checked'"
[indeterminate]="getCategoryCheckboxStatus(category) === 'halfChecked'"
(action)="pickAllCategory(category); $event.stopPropagation()"
@@ -11,8 +11,8 @@
</div>
</app-collapse-header>
<app-collapse-content>
- <div class="inputSection btn-grid">
- <app-v3-tag-item
+ <div class="inputSection tagList">
+ <app-tag-item
*ngFor="let module of category.modules"
[iconName]="isModulePicked(category, module) ? 'check' : null"
[label]="module.name"
diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.scss b/src/app/shared/components/training-type-picker/training-type-picker.component.scss
index 0f0a584cdcdbb6397aab225c2aa6489dbc3c97aa..3427d224600b703128dc0d49adb37e6b875273fb 100644
--- a/src/app/shared/components/training-type-picker/training-type-picker.component.scss
+++ b/src/app/shared/components/training-type-picker/training-type-picker.component.scss
@@ -1,8 +1,6 @@
@import 'typography';
-@import 'shapes';
@import 'color';
@import 'breakpoint';
-@import 'buttons';
.trainingContainer {
display: flex;
@@ -15,10 +13,6 @@
padding: 8px 12px;
gap: 1.5rem;
- .checkbox {
- width: 2.25rem;
- margin-top: 0.2rem;
- }
.titleCollapse {
@include font-bold-16;
color: $grey-1;
diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.ts b/src/app/shared/components/training-type-picker/training-type-picker.component.ts
index 48e734fed8c30beb08cfad685a0711b08c1d8768..373ab003d2bcb994ea84063328f500049955bdde 100644
--- a/src/app/shared/components/training-type-picker/training-type-picker.component.ts
+++ b/src/app/shared/components/training-type-picker/training-type-picker.component.ts
@@ -4,7 +4,6 @@ import { CategoriesToggle } from 'src/app/models/categoriesToggle.model';
import { Category } from '../../../structure-list/models/category.model';
import { Module } from '../../../structure-list/models/module.model';
import { CategoryEnum } from '../../enum/category.enum';
-import { ButtonType } from '../button/buttonType.enum';
@Component({
selector: 'app-training-type-picker',
@@ -17,7 +16,6 @@ export class TrainingTypePickerComponent implements OnInit, OnChanges {
@Input() public trainingCategories: CategoriesToggle[];
@Output() selectedType: EventEmitter<Category[]> = new EventEmitter<Category[]>();
- public buttonTypeEnum = ButtonType;
public categories: Category[] = [];
public selectedChoices: Category[] = [];
diff --git a/src/app/shared/components/v3/button/button.component.html b/src/app/shared/components/v3/button/button.component.html
deleted file mode 100644
index 57b740107c858d064f5c5b6d0f7d762914620eeb..0000000000000000000000000000000000000000
--- a/src/app/shared/components/v3/button/button.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
- <app-svg-icon
- *ngIf="iconName && iconPosition === 'left'"
- [type]="iconFolder"
- [icon]="iconName"
- [iconColor]="iconColor"
- [iconClass]="'icon-20'"
- />
- {{ label }}
- <app-svg-icon
- *ngIf="iconName && iconPosition === 'right'"
- [type]="iconFolder"
- [icon]="iconName"
- [iconColor]="iconColor"
- [iconClass]="'icon-20'"
- />
-</button>
diff --git a/src/app/shared/components/v3/button/button.component.scss b/src/app/shared/components/v3/button/button.component.scss
deleted file mode 100644
index 916470e33ff32c972844ed78822139fe01ac319d..0000000000000000000000000000000000000000
--- a/src/app/shared/components/v3/button/button.component.scss
+++ /dev/null
@@ -1,157 +0,0 @@
-@import 'color';
-@import 'typography';
-
-button {
- border-radius: 4px;
- cursor: pointer;
- border: 1px solid transparent;
- transition: background-color 0.2s ease-in-out, border 0.2s ease-out;
-
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 0.5rem;
-
- &:focus-visible {
- outline-offset: 2px;
- outline: 2px solid $blue-focus;
- }
-
- // WIDTH
- width: 150px;
- &.wide {
- width: 250px;
- }
-
- // SIZES
- &.small {
- height: 32px;
- font-size: $font-size-xsmall;
- padding-inline: 4px;
- &.icon-only {
- width: 32px;
- }
- }
- &.medium {
- height: 40px;
- font-size: $font-size-small;
- padding-inline: 4px;
- &.icon-only {
- width: 40px;
- }
- }
- &.large {
- height: 48px;
- font-size: $font-size-smedium;
- padding-inline: 4px;
- }
-
- // VARIANT
- &.primary {
- background-color: $red;
- color: $white;
- &:hover {
- background-color: $red-dark;
- }
- &:disabled {
- background-color: $grey-8;
- color: $grey-3;
- }
- &:active {
- background-color: $red-pressed;
- }
- }
-
- &.primaryBlack {
- background-color: $grey-1;
- color: $white;
- &:hover {
- background-color: $grey-2;
- }
- &:disabled {
- background-color: $grey-8;
- color: $grey-3;
- }
- &:active {
- background-color: $grey-3;
- }
- }
-
- &.primaryWarning {
- background-color: $info-warning;
- color: $white;
- &:hover {
- background-color: $warning-hover;
- }
- &:disabled {
- background-color: $grey-8;
- color: $grey-3;
- }
- &:active {
- background-color: $warning-pressed;
- }
- }
-
- &.primarySuccess {
- background-color: $info-success;
- color: $white;
- &:hover {
- background-color: $success-hover;
- }
- &:disabled {
- background-color: $grey-8;
- color: $grey-3;
- }
- &:active {
- background-color: $success-pressed;
- }
- }
-
- &.secondary {
- background-color: $white;
- color: $grey-1;
- border-color: $grey-1;
- &:hover {
- background-color: $grey-3-15;
- }
- &:disabled {
- background-color: $white;
- color: $grey-5;
- border-color: $grey-5;
- }
- &:active {
- background-color: $grey-3-20;
- }
- }
-
- &.secondaryDelete {
- background-color: $white;
- color: $red;
- border-color: $red;
- &:hover {
- background-color: $grey-3-15;
- }
- &:disabled {
- background-color: $white;
- color: $grey-5;
- border-color: $grey-5;
- }
- &:active {
- background-color: $grey-3-20;
- }
- }
-
- &.tertiary {
- background-color: $white;
- color: $grey-1;
- &:hover {
- border-color: $grey-3;
- }
- &:disabled {
- color: $grey-3;
- }
- &:active {
- background-color: $grey-9;
- }
- }
-}
diff --git a/src/app/shared/components/v3/button/button.component.ts b/src/app/shared/components/v3/button/button.component.ts
deleted file mode 100644
index ecfb4a4e15f0fb5543b46447d7b07ca5b30ef79c..0000000000000000000000000000000000000000
--- a/src/app/shared/components/v3/button/button.component.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-/** values will be used for css selectors */
-export type ButtonTypeV3 =
- | 'primary'
- | 'primaryBlack'
- | 'primaryWarning'
- | 'primarySuccess'
- | 'secondary'
- | 'secondaryDelete'
- | 'tertiary';
-
-@Component({
- selector: 'app-v3-button',
- templateUrl: './button.component.html',
- styleUrls: ['./button.component.scss'],
-})
-export class ButtonV3Component {
- /** Button label */
- @Input({ required: true }) label: string;
-
- /** HTML type of the button */
- @Input() type: 'submit' | 'button' | 'reset' = 'button';
-
- /** What variant should be the button ? */
- @Input({ required: true }) variant: ButtonTypeV3;
-
- /** Affects the height of the button */
- @Input() size?: 'small' | 'medium' | 'large' = 'medium';
-
- /** Should the button be wide ? (250px) */
- @Input() wide = false;
-
- /** Should the button be disabled ? */
- @Input() disabled = false;
-
- /** Sets the position of the icon if one provided */
- @Input() iconPosition: 'left' | 'right' = 'left';
-
- /** Folder of the icon ex: assets/ico */
- @Input() iconFolder = 'ico';
-
- /** Icon name */
- @Input() iconName?: string;
-
- /** Icon color, defaults to none as the svg-icon does */
- @Input() iconColor = 'none';
-
- /** Click handler */
- @Output() action = new EventEmitter<Event>();
-
- public get classes(): string[] {
- return [this.variant, this.size, this.wide ? 'wide' : ''];
- }
-}
diff --git a/src/app/shared/components/v3/button/icon-button/icon-button.component.html b/src/app/shared/components/v3/button/icon-button/icon-button.component.html
deleted file mode 100644
index cb2f3f64e8234541679da7cc5ed27be9a1fb0bbe..0000000000000000000000000000000000000000
--- a/src/app/shared/components/v3/button/icon-button/icon-button.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button [type]="type" [ngClass]="classes" [disabled]="disabled" (click)="action.emit($event)">
- <app-svg-icon [type]="iconFolder" [icon]="iconName" [iconColor]="iconColor" [iconClass]="'icon-20'" />
-</button>
diff --git a/src/app/shared/components/yes-no/yes-no.component.html b/src/app/shared/components/yes-no/yes-no.component.html
index d077aed57ccec172c707892da6ad7a843cafb766..d5291e02fe7fa011c15961f546c32620be1549cd 100644
--- a/src/app/shared/components/yes-no/yes-no.component.html
+++ b/src/app/shared/components/yes-no/yes-no.component.html
@@ -1,12 +1,12 @@
<div class="content">
- <app-v3-tag-item
+ <app-tag-item
[iconName]="selected ? 'check' : null"
[label]="'Oui'"
[color]="selected ? 'black' : 'white'"
[clickable]="true"
(action)="selected = true; clicked()"
/>
- <app-v3-tag-item
+ <app-tag-item
[iconName]="selected !== null && !selected ? 'check' : null"
[label]="'Non'"
[color]="selected !== null && !selected ? 'black' : 'white'"
diff --git a/src/app/shared/components/yes-no/yes-no.stories.ts b/src/app/shared/components/yes-no/yes-no.stories.ts
index b943a2adef871a6bceec291ee13ff3b9a4563490..9248f5b9eb0e45b85f5589db5b741c0f7132eeb5 100644
--- a/src/app/shared/components/yes-no/yes-no.stories.ts
+++ b/src/app/shared/components/yes-no/yes-no.stories.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import type { Meta, StoryObj } from '@storybook/angular';
import { moduleMetadata } from '@storybook/angular';
import { SvgIconComponent } from '../svg-icon/svg-icon.component';
-import { TagItemV3Component } from '../v3/tag-item/tag-item.component';
+import { TagItemComponent } from '../tag-item/tag-item.component';
import { YesNoComponent } from './yes-no.component';
// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction
@@ -12,7 +12,7 @@ const meta: Meta<YesNoComponent> = {
tags: ['autodocs'],
decorators: [
moduleMetadata({
- declarations: [TagItemV3Component, SvgIconComponent],
+ declarations: [TagItemComponent, SvgIconComponent],
imports: [CommonModule],
}),
],
diff --git a/src/app/shared/enum/demarches.enum.ts b/src/app/shared/enum/demarches.enum.ts
deleted file mode 100644
index eea5e4880170dce74f3848a49e02d2e6ae289946..0000000000000000000000000000000000000000
--- a/src/app/shared/enum/demarches.enum.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export enum Demarches {
- caf = 'CAF',
- idDoc = 'Carte d’identité, passeport',
- needs = 'Énergie, téléphonie, internet',
- foreigners = 'Démarches liées aux étrangers',
- franceConnect = 'France Connect',
- training = 'Formation (CPF...)',
- taxes = 'Impôts',
- housing = 'Logement',
- retirement = 'Retraite',
- health = 'Santé (Ameli, CPAM...)',
- scolarity = 'Scolarité (CROUS…)',
- transport = 'Transports (carte grise, permis, TCL…)',
- work = 'Travail (Pôle emploi, CESU…)',
- autres = 'Autres',
-}
diff --git a/src/app/shared/enum/demarchesLogo.enum.ts b/src/app/shared/enum/demarchesLogo.enum.ts
deleted file mode 100644
index d9f55e20d0135a6853af54cca3678bf4f26b42e4..0000000000000000000000000000000000000000
--- a/src/app/shared/enum/demarchesLogo.enum.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export enum DemarchesLogo {
- caf = 'caf',
- idDoc = 'Carte d’identité, passeport',
- needs = 'Énergie, téléphonie, internet',
- foreigners = 'Démarches liées aux étrangers',
- franceConnect = 'France Connect',
- training = 'Formation (CPF...)',
- taxes = 'Impôts',
- housing = 'Logement',
- retirement = 'Retraite',
- health = 'Santé (Ameli...)',
- scolarity = 'Scolarité (CROUS…)',
- transport = 'Transports (carte grise, permis, TCL…)',
- work = 'Travail (Pôle emploi, CESU…)',
- autres = 'Autres',
-}
diff --git a/src/app/shared/enum/labels.emum.ts b/src/app/shared/enum/labels.emum.ts
deleted file mode 100644
index 8e4c20f9573d8edbf9045ea012ea5933337c212b..0000000000000000000000000000000000000000
--- a/src/app/shared/enum/labels.emum.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export enum Labels {
- passNumerique = 'Pass numérique',
- espacePublicNumeriqueepn = 'Espace public numérique',
- maisonFranceService = 'Maison france service',
- aidantsConnect = 'Aidants connect',
- fabriqueDeTerritoire = 'Fabrique de territoire',
- demarcheMetropolitaine = 'Démarches Métropolitaines',
- conseillerNumFranceServices = 'Conseiller numérique',
- monEspaceSante = 'Mon espace santé',
- numRelay = 'Les relais numériques',
- mesPapiers = 'Mes papiers',
-}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 81b2f0536221714716b6ff915e3eed78a391232d..21c196a474151af01ef88c24951cbe8b783f0044 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -7,10 +7,10 @@ import { SharedComponents } from './components';
import { AddressAutocompleteComponent } from './components/address-autocomplete/address-autocomplete.component';
import { AppointmentChoiceComponent } from './components/appointment-choice/appointment-choice.component';
import { HourPickerComponent } from './components/hour-picker/hour-picker.component';
+import { InputComponent } from './components/input/input.component';
import { RadioOptionComponent } from './components/radio-option/radio-option.component';
-import { InputV3Component } from './components/v3/input/input.component';
-import { RadioV3Component } from './components/v3/radio/radio.component';
-import { TextareaV3Component } from './components/v3/textarea/textarea.component';
+import { RadioComponent } from './components/radio/radio.component';
+import { TextareaComponent } from './components/textarea/textarea.component';
import { YesNoComponent } from './components/yes-no/yes-no.component';
import { SharedDirectives } from './directives';
import { SharedPipes } from './pipes';
@@ -22,10 +22,10 @@ import { SharedPipes } from './pipes';
...SharedDirectives,
AddressAutocompleteComponent,
HourPickerComponent,
- RadioV3Component,
+ RadioComponent,
AppointmentChoiceComponent,
- InputV3Component,
- TextareaV3Component,
+ InputComponent,
+ TextareaComponent,
RadioOptionComponent,
YesNoComponent,
],
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index fc6caaf081f1ba5af8d18cb18c2b1c4495eeaa91..c89b3761413dded99d89f86b9236222c7180f495 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -1,26 +1,28 @@
<div
class="structure"
- tabindex="0"
- [ngClass]="{ orientation: isOrientation, interactive: isInteractive }"
+ [tabindex]="isInteractive() ? '0' : '-1'"
+ [ngClass]="{ orientation: isOrientation, interactive: isInteractive(), isChecked: isChecked }"
(click)="cardClicked()"
(keyup.enter)="cardClicked()"
(mouseenter)="cardHover()"
>
<div class="left">
+ <input *ngIf="showRadioButton" type="radio" tabindex="-1" id="{{ structure._id }}" [checked]="isChecked" />
+
<img alt [src]="'../../../../assets/ico/' + structure?.getTypeStructureIcon() + '.svg'" />
<div class="structureDetails">
<span class="structureName" [ngClass]="{ notClaimed: structure.hasNoUserDN && profileService.isAdmin() }">
{{ structure.structureName }}
</span>
- <app-v3-tag-item
+ <app-tag-item
*ngIf="structure.structureType?.name"
[label]="structure.structureType.name"
[color]="'red'"
[size]="'small'"
/>
<div class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
<ng-container *ngIf="structure.distance">
<span class="distance"> {{ this.formatDistance() }} </span>
<span class="structureLocationDot">•</span>
@@ -31,54 +33,49 @@
</div>
<!-- rdv -->
<div *ngIf="structure.hasUserWithAppointmentDN && !isOrientation" class="rdv">
- <app-svg-icon [type]="'tags'" [icon]="'rdv'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'rdv'" [iconClass]="'icon-20'" />
<span>Rendez-vous</span>
</div>
</div>
</div>
<div class="right">
- <app-svg-icon *ngIf="!isOrientation" [type]="'ico'" [icon]="'chevronRight'" [iconClass]="'icon-24'" />
<div *ngIf="isOrientation && !isOrientationRdv">
- <div
+ <app-button
*ngIf="!isSelected"
- fxLayout="row"
- fxLayoutGap="6px"
- class="selection-button selected"
- tabindex="0"
- (click)="cardAddToList(); $event.stopPropagation()"
- (keyup.enter)="cardAddToList(); $event.stopPropagation()"
- >
- <app-svg-icon [type]="'ico'" [icon]="'add'" [iconColor]="'black'" />
- <span>Ajouter</span>
- </div>
- <div
+ [variant]="'secondary'"
+ [label]="'Ajouter'"
+ [iconName]="'plus'"
+ (action)="cardAddToList(); $event.stopPropagation()"
+ />
+ <app-button
*ngIf="isSelected"
- fxLayout="row"
- fxLayoutGap="6px"
- class="selection-button to-select"
- tabindex="0"
- (click)="cardAddToList(); $event.stopPropagation()"
- (keyup.enter)="cardAddToList(); $event.stopPropagation()"
- >
- <app-svg-icon [type]="'ico'" [icon]="'check'" [iconClass]="'icon-22'" [iconColor]="'white'" />
- <span>Ajouté</span>
- </div>
+ [variant]="'secondarySuccess'"
+ [label]="'Ajouté'"
+ [iconName]="'check'"
+ (action)="cardAddToList(); $event.stopPropagation()"
+ />
</div>
<ng-container *ngIf="isOrientation && isOrientationRdv">
- <app-v3-button
+ <app-button
class="hide-on-mobile"
[variant]="'primary'"
[label]="'Prendre RDV'"
[iconName]="'calendar'"
(click)="cardRDV(); $event.stopPropagation()"
/>
- <app-v3-icon-button
+ <app-icon-button
class="hide-on-desktop"
[variant]="'primary'"
[iconName]="'calendar'"
(click)="cardRDV(); $event.stopPropagation()"
/>
</ng-container>
+ <app-svg-icon
+ *ngIf="redirectToStructure && !isOrientation"
+ [folder]="'ico'"
+ [icon]="'chevronRight'"
+ [iconClass]="'icon-24'"
+ />
</div>
</div>
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index c7c6c5e5872e74e7282868fb9a136391949cfd2a..286a293e67ea6dee67949ed9ff5b2a4c6faf4ecc 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -11,21 +11,38 @@
justify-content: space-between;
align-items: center;
transition: all 0.2s ease-in-out;
- &:hover {
- box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
- border-color: $grey-1;
+
+ &.interactive {
+ cursor: pointer;
+ &:hover {
+ box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
+ border-color: $grey-1;
+ }
}
@media #{$large-phone} {
height: unset;
}
- &.interactive {
- cursor: pointer;
+ &.isChecked {
+ box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
+ border-color: $red;
+ &:hover {
+ border-color: $red;
+ }
}
.left {
display: flex;
+ align-items: center;
gap: 24px;
+ input {
+ accent-color: $grey-1;
+ width: 18px;
+ height: 18px;
+ margin: 6px;
+ cursor: pointer;
+ }
+
.structureDetails {
display: flex;
flex-direction: column;
@@ -34,7 +51,7 @@
.structureName {
@include font-bold-18;
&.notClaimed {
- color: $primary-color;
+ color: $red;
}
}
.inline {
@@ -43,12 +60,12 @@
}
.structureLocation {
@include font-regular-14;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
.structureLocationDot {
font-size: 0.3rem;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
}
@@ -62,43 +79,10 @@
}
}
-.selection-button {
- font-style: normal;
- font-weight: bold;
- justify-content: center;
- align-items: center;
- min-width: 120px;
- height: 40px;
- border-radius: 20px;
-}
-
-.selected {
- border: solid 1px $grey-5;
- background-color: $white;
- color: $grey-1;
-}
-.to-select {
- color: $white;
- border-style: none;
- background: #47c562;
-}
-
.add-icon {
color: $green-1;
}
.orientation {
- flex-direction: row !important;
- align-items: center;
-
- .left {
- display: flex;
- width: 70%;
- }
-
- .right {
- @media #{$large-phone} {
- margin-left: unset;
- }
- }
+ gap: 16px;
}
diff --git a/src/app/structure-list/components/card/card.component.ts b/src/app/structure-list/components/card/card.component.ts
index f6a1164105c243afbe6ce541aa0b3b31ad8216cd..c1571a72d4a03f4cc9e0e956b2f6c5c35378d485 100644
--- a/src/app/structure-list/components/card/card.component.ts
+++ b/src/app/structure-list/components/card/card.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Structure } from '../../../models/structure.model';
import { ProfileService } from '../../../profile/services/profile.service';
@@ -8,17 +8,31 @@ import { ProfileService } from '../../../profile/services/profile.service';
templateUrl: './card.component.html',
styleUrls: ['./card.component.scss'],
})
-export class CardComponent {
+export class CardComponent implements OnInit {
+ /** The structure element to display */
@Input() public structure: Structure;
- @Input() public isSelected: boolean;
+
+ /** If true, click event redirects to profile */
+ @Input() public redirectToStructure = true;
+
+ /** If true, shows a radio button to select the card, disables the redirection to structure */
+ @Input() public showRadioButton = false;
+
+ /** If true, checks the radioButton */
+ @Input() public isChecked = false;
+
+ /** If true, the form comes from the orientation */
@Input() public isOrientation = false;
+ /** If in orientation, when we add to list, the card becomes selected */
+ @Input() public isSelected = false;
+ /** If true, the form comes from the orientation and will propose to reserve an appointment */
@Input() public isOrientationRdv = false;
- @Input() public noDetails = false;
- @Input() public isInteractive = true;
- @Output() public showDetails: EventEmitter<Structure> = new EventEmitter<Structure>();
- @Output() public addToList: EventEmitter<Structure> = new EventEmitter<Structure>();
- @Output() public selectRDV: EventEmitter<Structure> = new EventEmitter<Structure>();
- @Output() public hover: EventEmitter<Structure> = new EventEmitter<Structure>();
+
+ @Output() public showDetails = new EventEmitter<Structure>();
+ @Output() public hover = new EventEmitter<Structure>();
+ @Output() public addToList = new EventEmitter<Structure>();
+ @Output() public selectRDV = new EventEmitter<Structure>();
+ @Output() public selectedStructure = new EventEmitter<Structure>();
constructor(
private route: ActivatedRoute,
@@ -26,6 +40,17 @@ export class CardComponent {
public profileService: ProfileService,
) {}
+ ngOnInit(): void {
+ if (this.showRadioButton && this.redirectToStructure) {
+ console.warn("Can't make a card redirect to a structure with a radio button.");
+ this.redirectToStructure = false;
+ }
+ }
+
+ isInteractive(): boolean {
+ return this.showRadioButton || this.redirectToStructure || this.isOrientation;
+ }
+
/**
* Display distance in m or km according to value
*/
@@ -38,20 +63,19 @@ export class CardComponent {
}
public cardClicked(): void {
- if (!this.noDetails) {
+ if (this.redirectToStructure) {
this.showDetails.emit(this.structure);
const queryString = this.route.snapshot.queryParamMap.get('search');
this.router.navigate([], {
relativeTo: this.route,
- queryParams: queryString
- ? {
- id: this.structure._id,
- search: queryString,
- }
- : {
- id: this.structure._id,
- },
+ queryParams: {
+ id: this.structure._id,
+ ...(queryString && { search: queryString }),
+ },
+ state: { isOrientation: this.isOrientation },
});
+ } else {
+ this.selectedStructure.emit(this.structure);
}
}
diff --git a/src/app/structure-list/components/more-filters/more-filters.component.html b/src/app/structure-list/components/more-filters/more-filters.component.html
index 4e76898ef72043530905296d38161fb4a902fda5..16adea4953bfbe386b66f0abbc1d72f12c385f99 100644
--- a/src/app/structure-list/components/more-filters/more-filters.component.html
+++ b/src/app/structure-list/components/more-filters/more-filters.component.html
@@ -4,12 +4,12 @@
<div *ngIf="getModalType() === 'moreFilters'" class="moreFiltersHeader">
<h3>Plus de filtres</h3>
<div class="closeIcon" tabindex="0" (click)="closeModal()" (keyup.enter)="closeModal()">
- <app-svg-icon [iconClass]="'icon-40'" [iconColor]="'grey-1'" [icon]="'cross'" [type]="'ico'" />
+ <app-svg-icon [iconClass]="'icon-40'" [iconColor]="'grey-1'" [icon]="'cross'" [folder]="'ico'" />
</div>
</div>
<!-- Filter with single category -->
<div *ngIf="categories.length === 1" class="modalContent">
- <app-v3-label-checkbox
+ <app-label-checkbox
*ngFor="let module of categories[0].modules"
[label]="module.name"
[for]="module.id"
@@ -23,7 +23,7 @@
<app-collapse *ngFor="let c of categories">
<app-collapse-header>
<div class="collapseHeader">
- <app-v3-checkbox
+ <app-checkbox
[size]="'medium'"
[checked]="getCategoryCheckboxStatus(c) === 'checked'"
[indeterminate]="getCategoryCheckboxStatus(c) === 'halfChecked'"
@@ -34,7 +34,7 @@
</app-collapse-header>
<app-collapse-content>
<div class="collapseContent">
- <app-v3-label-checkbox
+ <app-label-checkbox
*ngFor="let module of c.modules"
[label]="module.name"
[for]="c.id + '-' + module.id"
@@ -47,8 +47,8 @@
</app-collapse>
</div>
<div class="modalFooter">
- <app-v3-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
- <app-v3-button [variant]="'primary'" [label]="'Appliquer'" (click)="emitModules(checkedModules)" />
+ <app-button [variant]="'secondary'" [label]="'Effacer'" (click)="clearFilters()" />
+ <app-button [variant]="'primary'" [label]="'Appliquer'" (click)="emitModules(checkedModules)" />
</div>
</div>
</div>
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html
index 91d64640fa187bd582ebf051832ce6316e244d33..7f611ea8416ff4d2ce57fd660bc1fe2d525b43cc 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.html
+++ b/src/app/structure-list/components/structure-details/structure-details.component.html
@@ -13,7 +13,7 @@
<img alt [src]="'../../../../assets/ico/' + structure?.getTypeStructureIcon() + '.svg'" />
<div class="details">
<h1>{{ structure.structureName }}</h1>
- <app-v3-tag-item
+ <app-tag-item
*ngIf="structure.structureType?.name"
[label]="structure.structureType.name"
[color]="'red'"
@@ -21,10 +21,10 @@
[clickable]="false"
/>
</div>
- <app-svg-icon [type]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" />
+ <app-svg-icon [folder]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" />
</section>
- <section class="actions hide-on-print">
+ <section *ngIf="showButtons" class="actions hide-on-print">
<div
*ngIf="structure.hasUserWithAppointmentDN"
class="clickableDiv"
@@ -33,7 +33,7 @@
[routerLink]="['/orientation']"
[state]="{ rdvStructure: structure }"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'" />
<div class="iconTitle">Demander un RDV</div>
</div>
<!-- Voir le site -->
@@ -45,12 +45,12 @@
(click)="goToWebsite()"
(keyup.enter)="goToWebsite()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'web'" [iconClass]="'icon-32'" />
<div class="iconTitle">Site web</div>
</div>
<!-- Imprimer -->
<div role="button" class="printButton clickableDiv" tabindex="0" (click)="print()" (keyup.enter)="print()">
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'" />
<div class="iconTitle">Imprimer</div>
</div>
<!-- Signaler une erreur -->
@@ -61,7 +61,7 @@
(click)="displayModalError()"
(keyup.enter)="displayModalError()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'" />
<div class="iconTitle">Signaler une erreur</div>
</div>
<!-- Je travaille ici -->
@@ -73,7 +73,7 @@
(click)="handleJoin()"
(keyup.enter)="handleJoin()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'workHere'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'workHere'" [iconClass]="'icon-32'" />
<div class="iconTitle">Je travaille ici</div>
</div>
<!-- Modifier la structure -->
@@ -85,7 +85,7 @@
(click)="handleModify()"
(keyup.enter)="handleModify()"
>
- <app-svg-icon class="icon" [type]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'" />
+ <app-svg-icon class="icon" [folder]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'" />
<div class="iconTitle">Modifier la structure</div>
</div>
</section>
@@ -116,43 +116,43 @@
<section class="informations">
<h2>Informations</h2>
<div *ngIf="structure.address" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'address'" [iconClass]="'icon-20'" />
<span>{{ structure.address.numero }} {{ structure.address.street }}</span>
<span class="light">•</span>
<span class="light"> {{ structure.address.commune }} </span>
</div>
<div *ngIf="structure.contactPhone" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'phone'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'phone'" [iconClass]="'icon-20'" />
{{ structure.contactPhone | phone }}
</div>
<div *ngIf="structure.contactMail" class="inline">
- <app-svg-icon [type]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
+ <app-svg-icon [folder]="'tags'" [icon]="'mail'" [iconClass]="'icon-20'" />
<a href="mailto:{{ structure.contactMail }}">{{ structure.contactMail }}</a>
</div>
<div *ngIf="structure.twitter" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'x'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'x'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.twitter">
{{ structure.twitter }}
</a>
</div>
<div *ngIf="structure.facebook" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'facebook'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'facebook'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.facebook">
{{ structure.facebook }}
</a>
</div>
<div *ngIf="structure.linkedin" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'linkedin'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'linkedin'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.linkedin">
{{ structure.linkedin }}
</a>
</div>
<div *ngIf="structure.instagram" class="inline">
- <app-svg-icon [iconClass]="'icon-20'" [type]="'tags'" [icon]="'instagram'" />
+ <app-svg-icon [iconClass]="'icon-20'" [folder]="'tags'" [icon]="'instagram'" />
<a target="_blank" rel="noopener noreferrer" [href]="'http://' + structure.instagram">
{{ structure.instagram }}
</a>
@@ -183,9 +183,9 @@
>
<h2>Modalités d'accès</h2>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let access of structure.categoriesDisplay.accessModality"
- [label]="access"
+ [label]="access.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -202,9 +202,9 @@
<ng-container *ngIf="structure.categoriesDisplay.age && structure.categoriesDisplay.age.length">
<h4>Âge</h4>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let label of structure.categoriesDisplay.age.sort()"
- [label]="label"
+ [label]="label.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -219,9 +219,9 @@
>
<h4>Langue et illettrisme</h4>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let label of structure.categoriesDisplay.languageAndIlliteracy.sort()"
- [label]="label"
+ [label]="label.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -232,9 +232,9 @@
<ng-container *ngIf="structure.categoriesDisplay.handicaps && structure.categoriesDisplay.handicaps.length">
<h4>Handicaps</h4>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let label of structure.categoriesDisplay.handicaps.sort()"
- [label]="label"
+ [label]="label.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -245,9 +245,9 @@
<ng-container *ngIf="structure.categoriesDisplay.genre && structure.categoriesDisplay.genre.length">
<h4>Genre</h4>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let label of structure.categoriesDisplay.genre.sort()"
- [label]="label"
+ [label]="label.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -257,10 +257,10 @@
</section>
<!-- Labellisation -->
- <section *ngIf="structure.categories.labelsQualifications.length" class="labels">
+ <section *ngIf="structure.categoriesDisplay.labelsQualifications.length" class="labels">
<h2>Labellisations</h2>
<div class="wrapper">
- <app-logo-card *ngFor="let label of structure.categories.labelsQualifications.sort()" [name]="label" />
+ <app-logo-card *ngFor="let label of structure.categoriesDisplay.labelsQualifications.sort()" [module]="label" />
</div>
</section>
@@ -268,7 +268,12 @@
<section *ngIf="userIsLoggedIn() && membersWithJobWithPO.length" class="members">
<h2>Accompagnant·es numériques</h2>
<div class="members">
- <app-member-card *ngFor="let member of membersWithJobWithPO" [member]="member" />
+ <app-member-card
+ *ngFor="let member of membersWithJobWithPO"
+ [member]="member"
+ [showContactInfo]="false"
+ [showEmployer]="false"
+ />
</div>
</section>
@@ -281,10 +286,17 @@
class="onlineDemarch"
>
<h2>Aides aux démarches en ligne</h2>
+ <app-tag-item
+ *ngIf="structure.categoriesDisplay.onlineProcedures.length > 0"
+ label="Accompagnements gratuits"
+ size="small"
+ color="red"
+ [clickable]="false"
+ />
<div class="wrapper">
<app-logo-card
*ngFor="let accompagnement of structure.categoriesDisplay.onlineProcedures.sort()"
- [name]="accompagnement"
+ [module]="accompagnement"
/>
</div>
<div *ngIf="structure.otherDescription" class="otherDescription">
@@ -296,22 +308,22 @@
<!-- Compétences numériques -->
<section *ngIf="hasBaseSkills() || hasAdvancedSkills()" class="digitalSkills">
<h2>Compétences numériques</h2>
- <app-v3-tag-item [label]="getFreeWorkshopLabel()" [size]="'small'" [color]="'red'" [clickable]="false" />
+ <app-tag-item [label]="structure.getFreeWorkshopLabel()" [size]="'small'" [color]="'red'" [clickable]="false" />
<!-- BaseSkills-->
<div *ngIf="hasBaseSkills()" class="skillsContainer">
<h3 class="titleSkills">Compétences numériques de base</h3>
<ul>
- <li *ngFor="let skill of structure.categoriesDisplay.baseSkills" class="details">{{ skill }}</li>
+ <li *ngFor="let skill of structure.categoriesDisplay.baseSkills" class="details">{{ skill.name }}</li>
</ul>
</div>
<!-- advancedSkills-->
- <div *ngIf="hasBaseSkills()" class="skillsContainer">
+ <div *ngIf="hasAdvancedSkills()" class="skillsContainer">
<h3 class="titleSkills">Approfondir sa culture numérique</h3>
<ul>
<li *ngFor="let skill of structure.categoriesDisplay.advancedSkills" class="details">
- {{ skill }}
+ {{ skill.name }}
</li>
</ul>
</div>
@@ -320,7 +332,7 @@
<!-- Matériel et wifi -->
<section *ngIf="structure.hasEquipments()" class="equipments">
<h2>Matériel et wifi</h2>
- <app-v3-tag-item
+ <app-tag-item
*ngIf="structure.categories.selfServiceMaterial.includes('wifiEnAccesLibre')"
[label]="getEquipmentsLabel(Equipment.wifi)"
[color]="'red'"
@@ -355,9 +367,9 @@
>
<h2>Vente de matériel a prix solidaire</h2>
<div class="inline">
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let equipment of structure.categoriesDisplay.solidarityMaterial"
- [label]="equipment"
+ [label]="equipment.name"
[color]="'red'"
[size]="'small'"
[clickable]="false"
@@ -373,13 +385,13 @@
<span>{{ tclStop.name }}</span>
<div class="inline">
<p *ngFor="let sub of tclStop.subLines">
- <app-svg-icon [type]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'" />
</p>
<p *ngFor="let tram of tclStop.tramLines">
- <app-svg-icon [type]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'" />
</p>
<p *ngFor="let bus of tclStop.busLines">
- <app-svg-icon [type]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'" />
+ <app-svg-icon [folder]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'" />
</p>
</div>
</div>
@@ -392,25 +404,25 @@
</div>
</div>
-<app-v3-modal [title]="'ATTENTION'" [opened]="deleteModalOpened" (closed)="deleteStructure($event)">
+<app-modal [title]="'ATTENTION'" [opened]="deleteModalOpened" (closed)="deleteStructure($event)">
Voulez-vous vraiment supprimer cette structure ?
-</app-v3-modal>
+</app-modal>
-<app-v3-modal [title]="'Travaillez-vous ici ?'" [opened]="claimModalOpened" (closed)="claimStructure($event)">
+<app-modal [title]="'Travaillez-vous ici ?'" [opened]="claimModalOpened" (closed)="claimStructure($event)">
<div class="modalContent">
Un message sera envoyé aux administrateurs Rés'IN pour valider l'affectation de votre compte à la structure : <br />
<span class="emphasized">{{ structure?.structureName }}</span>
</div>
-</app-v3-modal>
+</app-modal>
-<app-v3-modal [title]="'Travaillez-vous ici ?'" [opened]="joinModalOpened" (closed)="joinStructure($event)">
+<app-modal [title]="'Travaillez-vous ici ?'" [opened]="joinModalOpened" (closed)="joinStructure($event)">
<div class="modalContent">
Un message sera envoyé aux membres de la structure : <br />
<span class="emphasized">{{ structure?.structureName }}</span>
</div>
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
[title]="'Travaillez-vous ici ?'"
[opened]="pendingModalOpened"
[validateLabel]="'OK'"
@@ -422,9 +434,9 @@
: <br />
<span class="emphasized">{{ structure?.structureName }}</span>
</div>
-</app-v3-modal>
+</app-modal>
-<app-v3-modal
+<app-modal
[title]="'Signaler une erreur'"
[opened]="structureErrorModalOpened"
[validateLabel]="'Confirmer'"
@@ -442,4 +454,4 @@
rows="6"
placeholder="Décrivez l'erreur ici. Ex: Horaires faux..."
></textarea>
-</app-v3-modal>
+</app-modal>
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index 90bb11fe8b5c975fd5f81208545a9b54ff64949e..b596c385664cbacef3fd36b23101c93280afb106 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -15,7 +15,6 @@
position: fixed;
z-index: $structure-details-z-index;
height: 100%;
- width: 100%;
h1 {
@include font-bold-24;
@@ -35,7 +34,7 @@
height: calc(100% - $header-height);
overflow-y: auto;
scrollbar-gutter: stable;
- max-width: 600px;
+ width: 600px;
box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
background-color: $white;
}
@@ -111,14 +110,14 @@ section.actions {
section.informations {
.light {
font-weight: 400;
- color: $grey-4-text;
+ color: $grey-4-5-1;
}
}
section.description {
.info {
@include font-bold-16;
- color: $red-1;
+ color: $red;
}
}
@@ -145,6 +144,12 @@ section.onlineDemarch {
grid-template-columns: 1fr;
}
}
+ .otherDescription {
+ margin-top: 12px;
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ }
}
section.labels {
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.ts b/src/app/structure-list/components/structure-details/structure-details.component.ts
index d9beac7ae4840cf94ef9440e511731de3e979d9f..e0bee71ffa474091e5c4f15a66e599a512b921e6 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.ts
+++ b/src/app/structure-list/components/structure-details/structure-details.component.ts
@@ -57,6 +57,7 @@ export class StructureDetailsComponent implements OnInit {
public structureAdmins: Owner[] = [];
public membersWithJobWithPO: Owner[] = [];
public fullScreen = false;
+ public showButtons = true;
public Equipment = Equipment;
public FreeWorkshop = FreeWorkshop;
@@ -96,6 +97,7 @@ export class StructureDetailsComponent implements OnInit {
} else if (!this.printMode) {
this.structure = null;
}
+ this.showButtons = !history.state.isOrientation;
});
this.route.data.subscribe((data) => {
if (data.fullScreen) {
@@ -287,16 +289,6 @@ export class StructureDetailsComponent implements OnInit {
}
}
- public multipleWorkshop(): boolean {
- if (
- this.structure.categoriesDisplay.baseSkills.length + this.structure.categoriesDisplay.advancedSkills.length >
- 1
- ) {
- return true;
- }
- return false;
- }
-
public goToWebsite(): void {
let url = this.structure.website;
if (!url.startsWith('http')) {
@@ -317,16 +309,6 @@ export class StructureDetailsComponent implements OnInit {
);
}
- public getFreeWorkshopLabel(): string {
- const isFree = this.structure.freeWorkShop !== FreeWorkshop.no;
- const isUnderCondition = this.structure.freeWorkShop === FreeWorkshop.underCondition;
- const workshopText = this.multipleWorkshop() ? 'ces formations' : 'cette formation';
- const accessStatus = isFree ? 'gratuit' : 'payant';
- const conditionStatus = isUnderCondition ? ' sous condition' : '';
-
- return `L'accès à ${workshopText} est ${accessStatus}${conditionStatus}`;
- }
-
public containsHours(): boolean {
for (const day in this.structure.hours) {
if (this.structure.hours[day].time.length) return true;
diff --git a/src/app/structure-list/components/structure-list-search/structure-list-search.component.html b/src/app/structure-list/components/structure-list-search/structure-list-search.component.html
index 9c65a4798e44abdb597808046cbe439b4521bb8f..3b7af57941cc259a5cf1f2f591468b59d45d3e06 100644
--- a/src/app/structure-list/components/structure-list-search/structure-list-search.component.html
+++ b/src/app/structure-list/components/structure-list-search/structure-list-search.component.html
@@ -1,6 +1,6 @@
<div class="searchContainer">
<div class="searchBarAndFilters">
- <app-v3-search-bar [(value)]="searchInput" (search)="applyFilter()" />
+ <app-search-bar [(value)]="searchInput" (search)="applyFilter()" />
<div class="filters isntPhoneContent" (appClickOutside)="closeModal()">
<app-collapsable-filter
[label]="'Démarches en ligne'"
@@ -26,11 +26,6 @@
[active]="numberEquipmentChecked > 0"
(toggle)="openModal(TypeModal.equipments)"
/>
- <app-checkbox-filter
- [module]="{ id: 'passNumerique', name: 'labelsQualifications', displayText: 'Pass numérique', disabled: false }"
- [checked]="searchService.getIndex(checkedModulesFilter, 'passNumerique', 'labelsQualifications') > -1"
- (toggle)="externalCheckboxCheck($event)"
- />
<app-checkbox-filter
[module]="{
id: 'conseillerNumFranceServices',
@@ -48,7 +43,7 @@
[checked]="searchService.getIndex(checkedModulesFilter, 'accesLibre', 'accessModality') > -1"
(toggle)="externalCheckboxCheck($event)"
/>
- <app-v3-button [variant]="'tertiary'" [label]="'Plus de filtres'" (action)="openModal(TypeModal.moreFilters)" />
+ <app-button [variant]="'tertiary'" [label]="'Plus de filtres'" (action)="openModal(TypeModal.moreFilters)" />
<div *ngIf="modalTypeOpened">
<app-more-filters
[modalType]="modalTypeOpened"
@@ -62,17 +57,17 @@
</div>
<div *ngIf="checkedModulesFilter.length" class="filterTags isntPhoneContent">
<div class="title">Filtres :</div>
- <app-v3-tag-item
+ <app-tag-item
*ngFor="let filter of checkedModulesFilter"
[label]="filter.displayText"
[size]="'small'"
- [color]="'black'"
+ [color]="'grey'"
[iconName]="'cross'"
[iconPosition]="'right'"
[clickable]="true"
(action)="removeFilter(filter)"
/>
- <app-v3-tag-item
+ <app-tag-item
[label]="'Réinitialiser les filtres'"
[size]="'small'"
[color]="'white'"
diff --git a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
index 1f8209f0e040ed7377332618c0945592e77052ce..9c0aeeabd55b009a5680abbd3af9f2ae6a5c6538 100644
--- a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
+++ b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
@@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
-import { ButtonType } from '../../../shared/components/button/buttonType.enum';
import { Utils } from '../../../utils/utils';
import { Theme } from '../../enum/themes.enum';
import { TypeModal } from '../../enum/typeModal.enum';
@@ -18,8 +17,6 @@ export class StructureListSearchComponent implements OnInit {
@Output() searchEvent = new EventEmitter();
@Input() filters: Filter[] = [];
public utils = new Utils();
- // Show/hide form createStructure
- public buttonTypeEnum = ButtonType;
public searchInput = '';
public modalTypeOpened: TypeModal;
diff --git a/src/app/structure-list/models/filter.model.ts b/src/app/structure-list/models/filter.model.ts
index 87f5b5ae4b7aac2f2c644b447b32a7891127ab3f..35bb660b7d2e0297201a42483505527da1590b25 100644
--- a/src/app/structure-list/models/filter.model.ts
+++ b/src/app/structure-list/models/filter.model.ts
@@ -5,7 +5,7 @@ export class Filter {
checked: boolean;
orOperator: boolean;
- constructor(name: string, value: any, text?: string, orOperator = false) {
+ constructor(name: string, value: string, text?: string, orOperator = false) {
this.name = name;
this.value = value.toString();
this.text = text;
diff --git a/src/app/structure-list/structure-list.component.html b/src/app/structure-list/structure-list.component.html
index 4b9a4229e4993c092bbcf9d19be5f9d0bd2ddd86..80162cd683d846c149bcba04ebad41c52807832d 100644
--- a/src/app/structure-list/structure-list.component.html
+++ b/src/app/structure-list/structure-list.component.html
@@ -6,13 +6,13 @@
<ng-template ngPluralCase="other">{{ structureList.length }} structures</ng-template>
</div>
<ng-container *ngIf="!isOrientation">
- <app-v3-button
+ <app-button
[variant]="'secondary'"
[label]="'Ajouter une structure'"
[size]="'small'"
(action)="addStructure()"
/>
- <app-v3-button [variant]="'secondary'" [label]="'Imprimer la liste'" [size]="'small'" (action)="print()" />
+ <app-button [variant]="'secondary'" [label]="'Imprimer la liste'" [size]="'small'" (action)="print()" />
</ng-container>
</div>
diff --git a/src/app/structure-list/structure-list.component.scss b/src/app/structure-list/structure-list.component.scss
index 977c32f2742427c19d3ee7e549a1556f01271b8d..20aeea09a408a02f6f281c6e4e5f3e6cfb55750f 100644
--- a/src/app/structure-list/structure-list.component.scss
+++ b/src/app/structure-list/structure-list.component.scss
@@ -1,6 +1,5 @@
@import 'color';
@import 'typography';
-@import 'buttons';
.structureList-container {
overflow-y: auto;
diff --git a/src/app/structure-list/structure-list.component.ts b/src/app/structure-list/structure-list.component.ts
index e5f4e065323aba9878ef71e1aef0199f846d05ab..50f12a4aaa3632f69fda7c8aed57eef93b36f7ad 100644
--- a/src/app/structure-list/structure-list.component.ts
+++ b/src/app/structure-list/structure-list.component.ts
@@ -86,7 +86,7 @@ export class StructureListComponent implements OnChanges, OnInit {
}
public isInPrintList(id: string): boolean {
- return this.selectedStructureList.findIndex((elem) => elem._id === id) > -1 ? true : false;
+ return this.selectedStructureList.findIndex((elem) => elem._id === id) > -1;
}
public addStructure(): void {
diff --git a/src/app/structure/structure-join/structure-join.component.html b/src/app/structure/structure-join/structure-join.component.html
index c29e9af64dd6460dbee9bea6b29ade476e8327cc..6d8399d0128f2bdf04fe212dc2ca95167a8a6003 100644
--- a/src/app/structure/structure-join/structure-join.component.html
+++ b/src/app/structure/structure-join/structure-join.component.html
@@ -10,7 +10,7 @@
/>
</div>
<div class="button">
- <app-v3-button [variant]="'primary'" [label]="'Ok'" [wide]="true" (action)="handleFinish()" />
+ <app-button [variant]="'primary'" [label]="'Ok'" [wide]="true" (action)="handleFinish()" />
</div>
</div>
</ng-container>
@@ -53,7 +53,7 @@
</div>
</div>
<div class="button">
- <app-v3-button [variant]="'primary'" [label]="'Ok'" [wide]="true" (action)="handleCallback()" />
+ <app-button [variant]="'primary'" [label]="'Ok'" [wide]="true" (action)="handleCallback()" />
</div>
</div>
</ng-container>
diff --git a/src/app/utils/orientationUtils.ts b/src/app/utils/orientationUtils.ts
index f46437089b8b3a330d1b63957d26e5d8b0cb15e1..5057e49c1a309e51a4bca82c01ca626b7e85082b 100644
--- a/src/app/utils/orientationUtils.ts
+++ b/src/app/utils/orientationUtils.ts
@@ -47,7 +47,10 @@ export class OrientationUtils {
});
}
- public createOnlineMediationForm(onlineDemarcheType: Module[]): UntypedFormGroup {
+ public createOnlineMediationForm(
+ onlineDemarcheType: Module[],
+ orientatorForm?: FormGroup<StructureOrientator>,
+ ): UntypedFormGroup {
return new UntypedFormGroup({
filters: new FormControl<Module[]>(onlineDemarcheType, Validators.required),
name: new UntypedFormControl('', [Validators.required, Validators.pattern(CustomRegExp.TEXT_WITHOUT_NUMBER)]),
@@ -55,6 +58,8 @@ export class OrientationUtils {
phone: new UntypedFormControl('', [Validators.required, Validators.pattern(CustomRegExp.PHONE)]),
dateSlot: new UntypedFormControl(null, Validators.required),
preferredLanguage: new UntypedFormControl(PreferredLanguages.french, Validators.required),
+ comments: new UntypedFormControl('', Validators.required),
+ structureOrientator: orientatorForm || this.createStructureOrientatorForm(),
});
}
@@ -152,9 +157,21 @@ export class OrientationUtils {
pagesValidation[HotlineMediationSteps.mediationLanguageSelection] = {
valid: true,
};
+ pagesValidation[HotlineMediationSteps.comments] = {
+ valid: true,
+ };
+ pagesValidation[HotlineMediationSteps.structureOrientator] = {
+ valid: form.get('structureOrientator').valid,
+ };
pagesValidation[HotlineMediationSteps.orientationRecap] = {
valid: true,
};
+ pagesValidation[HotlineMediationSteps.rdvEnd] = {
+ valid: true,
+ };
+ pagesValidation[HotlineMediationSteps.orientationPrint] = {
+ valid: true,
+ };
updatePageValid(pagesValidation[step].valid);
}
@@ -171,13 +188,13 @@ export class OrientationUtils {
pagesValidation[StructuresListSteps.structureChoice] = {
valid: form.get('structureChoice').valid,
};
- pagesValidation[StructuresListSteps.structureOrientator] = {
- valid: form.get('structureOrientator').valid,
- };
pagesValidation[StructuresListSteps.mediationBeneficiaryInfo] = {
valid: form.get('name').valid && form.get('surname').valid,
};
pagesValidation[StructuresListSteps.comments] = { valid: true };
+ pagesValidation[StructuresListSteps.structureOrientator] = {
+ valid: form.get('structureOrientator').valid,
+ };
pagesValidation[StructuresListSteps.orientationRecap] = { valid: true };
updatePageValid(pagesValidation[step].valid);
}
@@ -191,9 +208,6 @@ export class OrientationUtils {
pagesValidation[AppointmentSteps.infoScreen] = {
valid: true,
};
- pagesValidation[AppointmentSteps.structureOrientator] = {
- valid: form.get('structureOrientator').valid,
- };
pagesValidation[AppointmentSteps.pmrAccess] = {
valid: form.get('pmrAccess').valid,
};
@@ -208,11 +222,19 @@ export class OrientationUtils {
};
pagesValidation[AppointmentSteps.mediationBeneficiaryInfo] = {
valid:
- form.get('name').valid && form.get('surname').valid && (form.get('phone').valid || form.get('email').valid),
+ form.get('name').valid &&
+ form.get('surname').valid &&
+ (form.get('phone').valid || form.get('email').valid) &&
+ (!form.get('phone').value || form.get('phone').valid) &&
+ (!form.get('email').value || form.get('email').valid),
+ };
+ pagesValidation[AppointmentSteps.structureOrientator] = {
+ valid: form.get('structureOrientator').valid,
};
pagesValidation[AppointmentSteps.rdvEnd] = {
valid: true,
};
+ pagesValidation[AppointmentSteps.orientationRecap] = { valid: true };
updatePageValid(pagesValidation[step].valid);
}
diff --git a/src/app/utils/utils.ts b/src/app/utils/utils.ts
index 1ee5d70610b5946eb33317be2b60801721dd6635..f3f11fdf1c66d31806076963a59b989193ce5271 100644
--- a/src/app/utils/utils.ts
+++ b/src/app/utils/utils.ts
@@ -3,7 +3,6 @@ import { UntypedFormGroup } from '@angular/forms';
import { Owner } from '../models/owner.model';
import { Structure } from '../models/structure.model';
import { User } from '../models/user.model';
-import { Demarches } from '../shared/enum/demarches.enum';
import { OtherServices } from '../shared/enum/otherServices.enum';
import { AccessModality } from '../structure-list/enum/access-modality.enum';
import { Equipment } from '../structure-list/enum/equipment.enum';
@@ -16,12 +15,8 @@ import { PersonalOffer } from './../models/personalOffer.model';
providedIn: 'root',
})
export class Utils {
- // V3REMOVE : supprimer le cas EventTarget
- public modifyPhoneInput(form: UntypedFormGroup, controlName: string, target: EventTarget | string): void {
- if (target['value']) target = (target as HTMLInputElement).value;
- const phoneNumber = target as string;
+ public modifyPhoneInput(form: UntypedFormGroup, controlName: string, phoneNumber: string): void {
form.get(controlName).setValue(phoneNumber);
-
// Take length of phone number without spaces.
const phoneNoSpace = phoneNumber.replace(/\s/g, '');
// Check to refresh every 2 number.
@@ -79,10 +74,6 @@ export class Utils {
return structure.website !== null && structure.website !== '';
}
- public getDigitalHelpLabel(digitalHelp: Demarches): string {
- return Demarches[digitalHelp];
- }
-
public hasWifi(selfServiceMaterial: string[]): boolean {
return selfServiceMaterial.includes('wifiEnAccesLibre');
}
@@ -140,7 +131,7 @@ export class Utils {
const moduleNames = category.modules
.map((module) => {
if (structureModuleIds.includes(module.id)) {
- return module.name;
+ return module;
}
})
.filter((value) => value !== undefined);
diff --git a/src/assets/form/excludeMember.svg b/src/assets/form/excludeMember.svg
deleted file mode 100644
index 06a9bfe61c839c39a8182c5daee1c7d13119a1ac..0000000000000000000000000000000000000000
--- a/src/assets/form/excludeMember.svg
+++ /dev/null
@@ -1,166 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_6867_13593)">
-<path d="M29.3915 113.811C28.6927 113.477 27.4068 113.324 26.8901 114.04C26.4203 114.675 26.115 116.119 26.1914 116.877C26.2383 117.393 26.4497 117.951 26.7961 118.35C27.2659 118.896 27.5536 118.697 28.1643 118.879C28.7397 119.043 28.9981 119.607 29.5618 118.896C29.9082 118.456 29.7908 117.746 29.8671 117.211C29.9611 116.618 30.1078 113.676 29.092 113.735" fill="white"/>
-<path d="M29.3915 113.811C28.6927 113.477 27.4068 113.324 26.8901 114.04C26.4203 114.675 26.115 116.119 26.1914 116.877C26.2383 117.393 26.4497 117.951 26.7961 118.35C27.2659 118.896 27.5536 118.697 28.1643 118.879C28.7397 119.043 28.9981 119.607 29.5618 118.896C29.9082 118.456 29.7908 117.746 29.8671 117.211C29.9611 116.618 30.1078 113.676 29.092 113.735" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.3915 113.811C28.6927 113.477 27.4068 113.324 26.8901 114.04C26.4203 114.675 26.115 116.119 26.1914 116.877C26.2383 117.393 26.4497 117.951 26.7961 118.35C27.2659 118.896 27.5536 118.697 28.1643 118.879C28.7397 119.043 28.9981 119.607 29.5618 118.896C29.9082 118.456 29.7908 117.746 29.8671 117.211C29.9611 116.618 30.1078 113.676 29.092 113.735" fill="white"/>
-<path d="M29.3915 113.811C28.6927 113.477 27.4068 113.324 26.8901 114.04C26.4203 114.675 26.115 116.119 26.1914 116.877C26.2383 117.393 26.4497 117.951 26.7961 118.35C27.2659 118.896 27.5536 118.697 28.1643 118.879C28.7397 119.043 28.9981 119.607 29.5618 118.896C29.9082 118.456 29.7908 117.746 29.8671 117.211C29.9611 116.618 30.1078 113.676 29.092 113.735" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.6298 113.811C28.2346 113.535 29.6145 113.946 29.1624 114.886C28.9334 115.373 28.4813 115.326 28.311 115.89C28.264 116.054 28.2347 117.117 28.3873 117.182C28.8101 117.381 28.7338 116.225 28.9628 116.09C29.7496 115.573 29.4207 116.894 29.7378 117.088C30.5423 117.605 30.648 114.78 30.2839 114.269C29.8435 113.6 27.7355 112.843 27.1895 113.753C27.3539 113.8 27.6122 113.888 27.7825 113.905" fill="white"/>
-<path d="M27.6298 113.811C28.2346 113.535 29.6145 113.946 29.1624 114.886C28.9334 115.373 28.4813 115.326 28.311 115.89C28.264 116.054 28.2347 117.117 28.3873 117.182C28.8101 117.381 28.7338 116.225 28.9628 116.09C29.7496 115.573 29.4207 116.894 29.7378 117.088C30.5423 117.605 30.648 114.78 30.2839 114.269C29.8435 113.6 27.7355 112.843 27.1895 113.753C27.3539 113.8 27.6122 113.888 27.7825 113.905" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.6298 113.811C28.2346 113.535 29.6145 113.946 29.1624 114.886C28.9334 115.373 28.4813 115.326 28.311 115.89C28.264 116.054 28.2347 117.117 28.3873 117.182C28.8101 117.381 28.7338 116.225 28.9628 116.09C29.7496 115.573 29.4207 116.894 29.7378 117.088C30.5423 117.605 30.648 114.78 30.2839 114.269C29.8435 113.6 27.7355 112.843 27.1895 113.753C27.3539 113.8 27.6122 113.888 27.7825 113.905" fill="#DA3635"/>
-<path d="M27.6298 113.811C28.2346 113.535 29.6145 113.946 29.1624 114.886C28.9334 115.373 28.4813 115.326 28.311 115.89C28.264 116.054 28.2347 117.117 28.3873 117.182C28.8101 117.381 28.7338 116.225 28.9628 116.09C29.7496 115.573 29.4207 116.894 29.7378 117.088C30.5423 117.605 30.648 114.78 30.2839 114.269C29.8435 113.6 27.7355 112.843 27.1895 113.753C27.3539 113.8 27.6122 113.888 27.7825 113.905" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.2746 126.7C22.1513 127.046 22.2922 127.61 21.8929 127.915C21.8753 127.821 21.8166 127.686 21.8166 127.569C21.5876 127.933 21.3175 128.326 20.9065 128.479C20.6012 127.54 21.2412 126.735 21.9106 126.113C22.0456 126.248 22.2276 126.4 22.2922 126.553" fill="white"/>
-<path d="M22.2746 126.7C22.1513 127.046 22.2922 127.61 21.8929 127.915C21.8753 127.821 21.8166 127.686 21.8166 127.569C21.5876 127.933 21.3175 128.326 20.9065 128.479C20.6012 127.54 21.2412 126.735 21.9106 126.113C22.0456 126.248 22.2276 126.4 22.2922 126.553" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.2746 126.7C22.1513 127.046 22.2922 127.61 21.8929 127.915C21.8753 127.821 21.8166 127.686 21.8166 127.569C21.5876 127.933 21.3175 128.326 20.9065 128.479C20.6012 127.54 21.2412 126.735 21.9106 126.113C22.0456 126.248 22.2276 126.4 22.2922 126.553" fill="white"/>
-<path d="M22.2746 126.7C22.1513 127.046 22.2922 127.61 21.8929 127.915C21.8753 127.821 21.8166 127.686 21.8166 127.569C21.5876 127.933 21.3175 128.326 20.9065 128.479C20.6012 127.54 21.2412 126.735 21.9106 126.113C22.0456 126.248 22.2276 126.4 22.2922 126.553" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.2384 142.26C29.2208 142.489 29.4968 142.865 29.4498 143.018C29.3441 143.476 28.9214 143.476 28.5397 143.623C28.1463 143.758 27.9349 143.787 27.5356 144.016C27.3066 144.169 26.8369 144.762 26.5315 144.715C25.41 144.562 26.6255 143 27.0013 142.771C27.5004 142.454 28.7746 141.984 29.2033 142.484" fill="white"/>
-<path d="M29.2384 142.26C29.2208 142.489 29.4968 142.865 29.4498 143.018C29.3441 143.476 28.9214 143.476 28.5397 143.623C28.1463 143.758 27.9349 143.787 27.5356 144.016C27.3066 144.169 26.8369 144.762 26.5315 144.715C25.41 144.562 26.6255 143 27.0013 142.771C27.5004 142.454 28.7746 141.984 29.2033 142.484" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.2384 142.26C29.2208 142.489 29.4968 142.865 29.4498 143.018C29.3441 143.476 28.9214 143.476 28.5397 143.623C28.1463 143.758 27.9349 143.787 27.5356 144.016C27.3066 144.169 26.8369 144.762 26.5315 144.715C25.41 144.562 26.6255 143 27.0013 142.771C27.5004 142.454 28.7746 141.984 29.2033 142.484" fill="white"/>
-<path d="M29.2384 142.26C29.2208 142.489 29.4968 142.865 29.4498 143.018C29.3441 143.476 28.9214 143.476 28.5397 143.623C28.1463 143.758 27.9349 143.787 27.5356 144.016C27.3066 144.169 26.8369 144.762 26.5315 144.715C25.41 144.562 26.6255 143 27.0013 142.771C27.5004 142.454 28.7746 141.984 29.2033 142.484" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M35.9443 141.597C35.8679 142.343 36.5373 142.901 36.185 143.57C35.956 144.028 35.1986 145.12 34.5644 144.873C33.6073 144.509 34.4 143.523 34.6701 143.036C34.8697 142.689 34.9754 142.366 35.2749 142.125C35.4628 141.973 35.9913 141.579 35.9443 141.597Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.4827 127.628C27.2831 129.601 26.7076 131.632 26.2966 133.605C26.0382 134.821 26.4023 135.837 26.5256 137.017C26.6607 138.32 26.8133 139.595 26.9366 140.886C26.9953 141.521 26.8427 142.401 27.4064 142.66C27.9701 142.918 28.8332 142.419 29.3793 142.343C29.6377 140.54 29.1797 138.473 29.1797 136.624C29.1797 135.59 29.1504 134.88 29.6377 133.981C30.0311 133.253 30.4128 132.419 30.3952 131.568C30.8062 133.647 30.9119 135.725 31.7163 137.663C32.5031 139.618 33.6599 141.468 34.7638 143.2C36.3727 142.472 36.132 140.804 35.3275 139.606C34.5113 138.391 34.0827 137.117 33.9183 135.678C33.7656 134.281 33.7832 132.965 33.9359 131.568C34.0122 130.781 34.2706 129.853 34.1473 129.066C34.0122 128.186 33.5719 128.109 32.7205 127.851C32.0041 127.64 27.7587 126.941 27.5473 127.775" fill="white"/>
-<path d="M27.4827 127.628C27.2831 129.601 26.7076 131.632 26.2966 133.605C26.0382 134.821 26.4023 135.837 26.5256 137.017C26.6607 138.32 26.8133 139.595 26.9366 140.886C26.9953 141.521 26.8427 142.401 27.4064 142.66C27.9701 142.918 28.8332 142.419 29.3793 142.343C29.6377 140.54 29.1797 138.473 29.1797 136.624C29.1797 135.59 29.1504 134.88 29.6377 133.981C30.0311 133.253 30.4128 132.419 30.3952 131.568C30.8062 133.647 30.9119 135.725 31.7163 137.663C32.5031 139.618 33.6599 141.468 34.7638 143.2C36.3727 142.472 36.132 140.804 35.3275 139.606C34.5113 138.391 34.0827 137.117 33.9183 135.678C33.7656 134.281 33.7832 132.965 33.9359 131.568C34.0122 130.781 34.2706 129.853 34.1473 129.066C34.0122 128.186 33.5719 128.109 32.7205 127.851C32.0041 127.64 27.7587 126.941 27.5473 127.775" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.4827 127.628C27.2831 129.601 26.7076 131.632 26.2966 133.605C26.0382 134.821 26.4023 135.837 26.5256 137.017C26.6607 138.32 26.8133 139.595 26.9366 140.886C26.9953 141.521 26.8427 142.401 27.4064 142.66C27.9701 142.918 28.8332 142.419 29.3793 142.343C29.6377 140.54 29.1797 138.473 29.1797 136.624C29.1797 135.59 29.1504 134.88 29.6377 133.981C30.0311 133.253 30.4128 132.419 30.3952 131.568C30.8062 133.647 30.9119 135.725 31.7163 137.663C32.5031 139.618 33.6599 141.468 34.7638 143.2C36.3727 142.472 36.132 140.804 35.3275 139.606C34.5113 138.391 34.0827 137.117 33.9183 135.678C33.7656 134.281 33.7832 132.965 33.9359 131.568C34.0122 130.781 34.2706 129.853 34.1473 129.066C34.0122 128.186 33.5719 128.109 32.7205 127.851C32.0041 127.64 27.7587 126.941 27.5473 127.775" fill="white"/>
-<path d="M27.4827 127.628C27.2831 129.601 26.7076 131.632 26.2966 133.605C26.0382 134.821 26.4023 135.837 26.5256 137.017C26.6607 138.32 26.8133 139.595 26.9366 140.886C26.9953 141.521 26.8427 142.401 27.4064 142.66C27.9701 142.918 28.8332 142.419 29.3793 142.343C29.6377 140.54 29.1797 138.473 29.1797 136.624C29.1797 135.59 29.1504 134.88 29.6377 133.981C30.0311 133.253 30.4128 132.419 30.3952 131.568C30.8062 133.647 30.9119 135.725 31.7163 137.663C32.5031 139.618 33.6599 141.468 34.7638 143.2C36.3727 142.472 36.132 140.804 35.3275 139.606C34.5113 138.391 34.0827 137.117 33.9183 135.678C33.7656 134.281 33.7832 132.965 33.9359 131.568C34.0122 130.781 34.2706 129.853 34.1473 129.066C34.0122 128.186 33.5719 128.109 32.7205 127.851C32.0041 127.64 27.7587 126.941 27.5473 127.775" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.1011 118.573C25.3102 118.65 24.9344 122.731 23.8833 123.882C23.4606 124.351 23.0202 124.792 22.5035 125.173C21.975 125.567 21.3173 125.69 21.975 126.389C22.568 127.041 22.7794 126.589 23.3431 126.178C23.8128 125.831 24.3589 125.602 24.8933 125.326C26.3965 124.569 26.3026 123.852 26.5609 122.355C26.7253 123.054 26.9837 123.582 27.0306 124.31C27.0776 125.144 26.9543 125.995 27.0306 126.812C27.1833 128.679 28.9566 128.614 30.4892 128.755C31.276 128.814 32.0217 128.362 32.5678 128.421C32.8732 128.45 33.1608 128.832 33.5543 128.697C34.118 128.497 33.9947 128.045 34.1591 127.546C34.4762 126.618 35.3863 125.285 35.3099 124.299C35.2219 123.148 33.4427 121.809 32.8673 120.781C32.2918 119.765 31.6048 118.309 30.1838 118.444C29.6553 118.491 29.4557 118.932 28.9566 119.037C28.4575 119.143 27.8058 118.873 27.3654 118.656" fill="white"/>
-<path d="M27.1011 118.573C25.3102 118.65 24.9344 122.731 23.8833 123.882C23.4606 124.351 23.0202 124.792 22.5035 125.173C21.975 125.567 21.3173 125.69 21.975 126.389C22.568 127.041 22.7794 126.589 23.3431 126.178C23.8128 125.831 24.3589 125.602 24.8933 125.326C26.3965 124.569 26.3026 123.852 26.5609 122.355C26.7253 123.054 26.9837 123.582 27.0306 124.31C27.0776 125.144 26.9543 125.995 27.0306 126.812C27.1833 128.679 28.9566 128.614 30.4892 128.755C31.276 128.814 32.0217 128.362 32.5678 128.421C32.8732 128.45 33.1608 128.832 33.5543 128.697C34.118 128.497 33.9947 128.045 34.1591 127.546C34.4762 126.618 35.3863 125.285 35.3099 124.299C35.2219 123.148 33.4427 121.809 32.8673 120.781C32.2918 119.765 31.6048 118.309 30.1838 118.444C29.6553 118.491 29.4557 118.932 28.9566 119.037C28.4575 119.143 27.8058 118.873 27.3654 118.656" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.1011 118.573C25.3102 118.65 24.9344 122.731 23.8833 123.882C23.4606 124.351 23.0202 124.792 22.5035 125.173C21.975 125.567 21.3173 125.69 21.975 126.389C22.568 127.041 22.7794 126.589 23.3431 126.178C23.8128 125.831 24.3589 125.602 24.8933 125.326C26.3965 124.569 26.3026 123.852 26.5609 122.355C26.7253 123.054 26.9837 123.582 27.0306 124.31C27.0776 125.144 26.9543 125.995 27.0306 126.812C27.1833 128.679 28.9566 128.614 30.4892 128.755C31.276 128.814 32.0217 128.362 32.5678 128.421C32.8732 128.45 33.1608 128.832 33.5543 128.697C34.118 128.497 33.9947 128.045 34.1591 127.546C34.4762 126.618 35.3863 125.285 35.3099 124.299C35.2219 123.148 33.4427 121.809 32.8673 120.781C32.2918 119.765 31.6048 118.309 30.1838 118.444C29.6553 118.491 29.4557 118.932 28.9566 119.037C28.4575 119.143 27.8058 118.873 27.3654 118.656" fill="white"/>
-<path d="M27.1011 118.573C25.3102 118.65 24.9344 122.731 23.8833 123.882C23.4606 124.351 23.0202 124.792 22.5035 125.173C21.975 125.567 21.3173 125.69 21.975 126.389C22.568 127.041 22.7794 126.589 23.3431 126.178C23.8128 125.831 24.3589 125.602 24.8933 125.326C26.3965 124.569 26.3026 123.852 26.5609 122.355C26.7253 123.054 26.9837 123.582 27.0306 124.31C27.0776 125.144 26.9543 125.995 27.0306 126.812C27.1833 128.679 28.9566 128.614 30.4892 128.755C31.276 128.814 32.0217 128.362 32.5678 128.421C32.8732 128.45 33.1608 128.832 33.5543 128.697C34.118 128.497 33.9947 128.045 34.1591 127.546C34.4762 126.618 35.3863 125.285 35.3099 124.299C35.2219 123.148 33.4427 121.809 32.8673 120.781C32.2918 119.765 31.6048 118.309 30.1838 118.444C29.6553 118.491 29.4557 118.932 28.9566 119.037C28.4575 119.143 27.8058 118.873 27.3654 118.656" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M32.1394 129.172C31.5463 129.883 31.5169 130.64 31.4112 131.627C31.2879 132.701 31.0296 133.658 31.0179 134.768C31.0002 136.999 31.0179 139.195 31.0179 141.456C31.0179 142.184 30.6362 144.885 31.2292 145.279C31.652 144.14 31.3349 142.443 31.3937 141.215C31.47 139.636 31.3936 137.968 31.4993 136.406C31.6344 134.674 31.5933 132.871 31.9104 131.174C31.9985 130.705 32.2451 129.519 32.7618 129.337C33.4899 129.066 33.9127 130.411 34.0653 130.429C34.8111 130.534 34.0184 128.867 33.2139 128.773C32.4388 128.673 32.2275 128.961 32.1394 129.172Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M33.6071 128.767C33.6071 129.19 33.7421 129.812 33.2724 130.012C32.5912 130.288 32.603 129.495 32.603 129.043C32.4973 129.061 32.2859 128.984 32.1626 128.996C31.8749 127.98 34.0005 128.068 33.7539 129.072" fill="white"/>
-<path d="M33.6071 128.767C33.6071 129.19 33.7421 129.812 33.2724 130.012C32.5912 130.288 32.603 129.495 32.603 129.043C32.4973 129.061 32.2859 128.984 32.1626 128.996C31.8749 127.98 34.0005 128.068 33.7539 129.072" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M33.6071 128.767C33.6071 129.19 33.7421 129.812 33.2724 130.012C32.5912 130.288 32.603 129.495 32.603 129.043C32.4973 129.061 32.2859 128.984 32.1626 128.996C31.8749 127.98 34.0005 128.068 33.7539 129.072" fill="white"/>
-<path d="M33.6071 128.767C33.6071 129.19 33.7421 129.812 33.2724 130.012C32.5912 130.288 32.603 129.495 32.603 129.043C32.4973 129.061 32.2859 128.984 32.1626 128.996C31.8749 127.98 34.0005 128.068 33.7539 129.072" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M128.575 125.941L148.045 136.959C154.369 140.538 154.419 146.409 148.158 150.024L96.0668 180.098C89.849 183.688 79.768 183.688 73.5502 180.098L30.3016 155.129" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M42.6586 80.0252L33.4559 74.804C27.1452 71.2237 27.1009 65.3595 33.3571 61.7475L77.9341 36.0109C84.1519 32.4211 94.233 32.4211 100.451 36.0109L170.121 76.2353" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M47.7647 82.7691C47.4781 82.9335 47.1956 83.1064 46.9174 83.2834C37.9049 88.9869 37.9091 97.8477 46.9259 103.513C53.1436 107.425 62.0465 108.951 70.393 108.108C71.5902 107.986 72.4755 108.723 71.9064 109.343C62.0381 120.029 64.032 133.417 77.926 142.969C78.7185 143.513 80.1517 143.543 81.0243 143.037L151.7 102.232C152.572 101.726 152.53 100.895 151.594 100.436C135.15 92.3592 112.046 91.1578 93.5609 96.8402C92.4776 97.1732 91.2298 96.6421 91.4448 95.9423C92.8654 91.3011 90.5048 86.3565 84.3334 82.7691C74.267 76.9224 57.8943 76.9224 47.7647 82.7691Z" fill="#EDEDED"/>
-<path d="M42.5926 80.5227C42.268 80.7082 41.9476 80.9021 41.6357 81.1002C31.4513 87.5456 31.4555 97.5572 41.6441 103.965C48.6712 108.382 58.7334 110.111 68.1633 109.154C69.5122 109.015 70.5154 109.849 69.8705 110.549C58.7207 122.626 60.9718 137.755 76.6742 148.547C77.5678 149.162 79.1866 149.192 80.173 148.623L160.047 102.51C161.033 101.941 160.987 101.001 159.929 100.483C141.343 91.3521 115.233 89.9989 94.341 96.419C93.1185 96.7942 91.7063 96.1956 91.9508 95.4073C93.5569 90.1633 90.8886 84.5737 83.9163 80.5227C72.5431 73.9129 54.0416 73.9129 42.5926 80.5227Z" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M91.9258 77.8123L91.9764 94.9943C91.9764 94.9437 91.9848 94.8974 91.9974 94.8468C92.2503 94.0164 92.3768 93.1775 92.3768 92.3386L92.3262 75.1566C92.3304 75.9955 92.204 76.8343 91.9468 77.6648C91.9342 77.7153 91.9258 77.7659 91.9258 77.8123Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M43.5791 75.2958L43.6297 92.4778C43.6381 95.9007 45.7669 99.3194 50.0118 101.988C55.8755 105.676 64.2768 107.118 72.1469 106.321C73.0322 106.233 73.7404 106.642 73.7404 107.105L73.6898 89.9232C73.6898 89.4595 72.9816 89.0507 72.0964 89.1392C64.2262 89.9359 55.8291 88.4942 49.9612 84.8057C45.7163 82.1374 43.5875 78.7187 43.5791 75.2958Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M149.378 82.7697C149.378 83.0689 149.184 83.3683 148.787 83.5959L82.1206 122.087L82.1712 139.269L148.838 100.778C149.234 100.55 149.432 100.251 149.428 99.9517L149.378 82.7697Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M67.7168 103.8L67.7674 120.982C67.7842 127.47 71.6118 133.953 79.2502 139.201C79.9963 139.716 81.3495 139.741 82.1715 139.265L82.1209 122.083C81.2989 122.559 79.9457 122.534 79.1996 122.019C71.5612 116.771 67.7337 110.288 67.7168 103.8Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M50.7537 65.2421C50.4839 65.398 50.2141 65.5582 49.9527 65.7268C41.4502 71.1057 41.4587 79.4649 49.9612 84.81C55.8248 88.4985 64.2261 89.9402 72.0963 89.1434C73.2218 89.0296 74.0607 89.7209 73.5211 90.3069C64.2135 100.39 66.0935 113.015 79.1992 122.024C79.9454 122.538 81.2985 122.563 82.1206 122.087L148.787 83.596C149.609 83.1196 149.571 82.3356 148.69 81.9014C133.178 74.2799 111.388 73.1502 93.949 78.508C92.9288 78.8199 91.7485 78.3225 91.9509 77.6607C93.2914 73.2851 91.0615 68.6186 85.2442 65.2336C75.7511 59.7241 60.31 59.7241 50.7537 65.2421Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M129.093 121.462C131.133 122.639 131.146 124.548 129.118 125.724C127.09 126.9 123.794 126.9 121.754 125.724C119.714 124.548 119.705 122.639 121.733 121.462C123.76 120.286 127.053 120.286 129.093 121.462Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M125.417 56.6667V124" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<path d="M130.655 48.227L126.083 45.5704L134.228 50.2147L138.807 52.8713L130.655 48.227Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.273 24.8822L138.853 27.5454C138.223 27.1751 137.391 27.2921 136.56 27.7727L131.98 25.1096C132.812 24.6289 133.643 24.5185 134.273 24.8822Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.267 73.5663L107.687 70.9032C106.434 70.1757 106.518 67.6619 107.785 65.4794L112.364 68.1426C111.097 70.3251 111.006 72.8388 112.267 73.5663Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.357 68.1423L107.778 65.4792L115.871 51.4618L120.451 54.125L112.357 68.1423Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M126.076 44.3751L121.503 41.7184L129.707 27.5127L134.287 30.1694L126.076 44.3751Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.286 30.1696L129.707 27.5064C130.331 26.4216 131.156 25.5772 131.98 25.1031L136.56 27.7662C135.735 28.2469 134.91 29.0848 134.286 30.1696Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M120.451 54.1249L115.871 51.4617C116.17 50.9421 116.17 50.3835 115.865 50.2211L120.444 52.8842C120.749 53.0466 120.756 53.6052 120.451 54.1249Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M124.998 45.0053L120.418 42.3422C120.568 42.4266 120.769 42.4006 120.964 42.2837C121.159 42.1733 121.354 41.9719 121.503 41.7121L126.083 44.3753C125.933 44.6351 125.738 44.8299 125.543 44.9469C125.342 45.0573 125.147 45.0898 124.998 45.0053Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M116.852 40.3545L112.272 37.6978L120.418 42.3421L124.997 45.0053L116.852 40.3545Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M136.56 27.7661C137.411 27.2725 138.268 27.1685 138.905 27.5713C140.126 28.3442 140.002 30.793 138.755 32.9561L130.655 46.9799C130.356 47.493 130.356 48.0516 130.662 48.2205L138.807 52.8648C140.106 53.5988 140.184 56.0801 138.866 58.2821C138.249 59.3149 137.456 60.1073 136.657 60.5685C135.832 61.0427 135.001 61.1596 134.371 60.7958L126.115 56.0931C125.966 56.0086 125.771 56.0346 125.576 56.1451C125.381 56.2555 125.186 56.4568 125.037 56.7167L116.833 70.9224C116.203 72.0136 115.378 72.8515 114.553 73.3257C113.754 73.7869 112.962 73.9038 112.338 73.592C111.006 72.9165 111.071 70.3572 112.357 68.1293L120.451 54.112C120.75 53.5923 120.75 53.0337 120.444 52.8713L112.189 48.1686C110.909 47.4346 110.922 45.0247 112.234 42.8227C112.838 41.8094 113.611 41.0495 114.397 40.5948C115.28 40.0881 116.177 39.9712 116.839 40.348L124.985 44.9922C125.134 45.0767 125.335 45.0507 125.53 44.9338C125.725 44.8234 125.92 44.622 126.069 44.3622L134.273 30.1565C134.91 29.0847 135.735 28.2468 136.56 27.7661Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.195 48.1752L107.616 45.512C106.336 44.778 106.349 42.3682 107.661 40.1662C108.265 39.1529 109.038 38.3929 109.824 37.9382C110.708 37.4316 111.604 37.3147 112.267 37.6914L116.846 40.3546C116.177 39.9778 115.287 40.0883 114.404 40.6014C113.618 41.0561 112.845 41.8225 112.241 42.8294C110.929 45.0313 110.916 47.4412 112.195 48.1752Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M32.2121 144.724C37.7749 147.937 37.8109 153.146 32.2781 156.359C26.7512 159.572 17.7537 159.572 12.1909 156.359C6.6281 153.146 6.59814 147.937 12.131 144.724C17.6578 141.511 26.6494 141.511 32.2121 144.724Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<path d="M30.6175 145.521C35.2872 148.219 35.3171 152.589 30.6775 155.286C26.0378 157.984 18.485 157.984 13.8093 155.286C9.13372 152.589 9.11569 148.219 13.7553 145.521C18.395 142.824 25.9419 142.824 30.6175 145.521Z" fill="#EDEDED"/>
-<path d="M33.1714 145.252C33.1654 145.305 33.1654 145.359 33.1594 145.419C33.1534 145.467 33.1475 145.515 33.1415 145.563C33.1355 145.617 33.1235 145.671 33.1175 145.725C33.1115 145.773 33.0994 145.821 33.0875 145.869C33.0755 145.923 33.0635 145.977 33.0455 146.031C33.0335 146.079 33.0155 146.127 33.0035 146.175C32.9855 146.229 32.9676 146.283 32.9496 146.331C32.9316 146.378 32.9137 146.426 32.8957 146.474C32.8717 146.528 32.8477 146.582 32.8237 146.642C32.8058 146.69 32.7818 146.732 32.7578 146.78C32.7338 146.834 32.7038 146.888 32.6739 146.942C32.6499 146.984 32.6259 147.032 32.6019 147.074C32.566 147.14 32.524 147.206 32.482 147.266C32.458 147.308 32.4341 147.344 32.4041 147.386C32.3561 147.457 32.3022 147.529 32.2482 147.595C32.2243 147.625 32.2003 147.655 32.1763 147.691C32.0864 147.805 31.9905 147.913 31.8946 148.021C31.8706 148.051 31.8406 148.075 31.8167 148.105C31.7387 148.189 31.6549 148.273 31.5709 148.351C31.529 148.387 31.493 148.423 31.451 148.459C31.3971 148.506 31.3431 148.548 31.2891 148.596C31.2412 148.638 31.1932 148.68 31.1393 148.722C31.0853 148.77 31.0254 148.812 30.9655 148.86C30.9115 148.902 30.8576 148.944 30.8036 148.98C30.7437 149.022 30.6837 149.07 30.6178 149.112C30.5578 149.154 30.5039 149.19 30.444 149.232C30.378 149.274 30.3121 149.316 30.2461 149.358C30.1622 149.412 30.0783 149.46 29.9944 149.514C29.7546 149.651 29.5088 149.777 29.257 149.903C29.1911 149.933 29.1252 149.969 29.0532 149.999C28.8255 150.107 28.5917 150.203 28.3519 150.299C28.3219 150.311 28.292 150.323 28.256 150.335C27.9983 150.431 27.7345 150.521 27.4707 150.605C27.2849 150.664 27.0931 150.712 26.9073 150.766C26.7634 150.808 26.6196 150.844 26.4757 150.88C26.2779 150.928 26.0741 150.97 25.8703 151.012C25.7204 151.042 25.5765 151.078 25.4267 151.102C25.3667 151.114 25.3008 151.12 25.2408 151.132C24.9891 151.174 24.7373 151.21 24.4795 151.24C24.4076 151.246 24.3297 151.258 24.2577 151.264C24.1139 151.282 23.964 151.288 23.8142 151.3C23.5684 151.318 23.3226 151.336 23.0709 151.348C22.915 151.354 22.7531 151.36 22.5973 151.36C22.3995 151.366 22.1957 151.366 21.9978 151.36C21.83 151.36 21.6622 151.354 21.4943 151.348C21.3085 151.342 21.1227 151.33 20.9368 151.318C20.769 151.306 20.6012 151.294 20.4273 151.276C20.2415 151.258 20.0617 151.24 19.8819 151.216C19.72 151.198 19.5522 151.174 19.3903 151.144C19.1925 151.114 19.0007 151.078 18.8089 151.042C18.659 151.012 18.5031 150.982 18.3533 150.952C18.1255 150.904 17.8977 150.844 17.6699 150.784C17.5261 150.748 17.3762 150.712 17.2323 150.664C17.1544 150.64 17.0765 150.616 17.0046 150.593C16.7768 150.521 16.555 150.443 16.3392 150.365C16.2732 150.341 16.2133 150.317 16.1473 150.293C15.9495 150.215 15.7577 150.131 15.5659 150.047C15.47 150.005 15.3741 149.969 15.2842 149.921C15.0084 149.789 14.7387 149.651 14.4809 149.502C12.317 148.255 11.238 146.612 11.244 144.976L11.232 149.693C11.226 151.33 12.305 152.966 14.4689 154.219C14.7267 154.369 14.9964 154.507 15.2722 154.639C15.3621 154.681 15.464 154.723 15.5539 154.765C15.7157 154.837 15.8776 154.914 16.0455 154.98C16.0754 154.992 16.1054 155.004 16.1354 155.01C16.1953 155.034 16.2612 155.058 16.3272 155.082C16.543 155.16 16.7708 155.238 16.9926 155.31C17.0705 155.334 17.1484 155.358 17.2263 155.382C17.2803 155.4 17.3283 155.418 17.3822 155.43C17.4721 155.454 17.568 155.472 17.6639 155.496C17.8917 155.556 18.1135 155.61 18.3473 155.664C18.4072 155.676 18.4672 155.694 18.5271 155.706C18.6171 155.724 18.707 155.736 18.7969 155.754C18.9887 155.79 19.1865 155.826 19.3783 155.856C19.4562 155.868 19.5342 155.886 19.6121 155.898C19.696 155.91 19.786 155.916 19.8699 155.928C20.0497 155.952 20.2355 155.969 20.4213 155.987C20.5112 155.993 20.5952 156.011 20.6851 156.017C20.769 156.023 20.847 156.023 20.9309 156.029C21.1167 156.041 21.3025 156.053 21.4883 156.059C21.5842 156.065 21.6741 156.071 21.7701 156.071C21.842 156.071 21.9199 156.071 21.9918 156.071C22.1897 156.071 22.3935 156.071 22.5913 156.071C22.6932 156.071 22.7891 156.071 22.891 156.071C22.9509 156.071 23.0109 156.059 23.0649 156.059C23.3106 156.047 23.5624 156.029 23.8082 156.011C23.9101 156.005 24.006 155.999 24.1079 155.993C24.1558 155.987 24.2038 155.981 24.2517 155.975C24.3237 155.969 24.4016 155.957 24.4735 155.952C24.7313 155.922 24.9831 155.886 25.2348 155.844C25.2948 155.832 25.3607 155.826 25.4207 155.814C25.4507 155.808 25.4806 155.808 25.5105 155.802C25.6304 155.778 25.7444 155.748 25.8643 155.724C26.0681 155.682 26.2719 155.64 26.4697 155.592C26.6136 155.556 26.7574 155.514 26.9013 155.478C27.0931 155.424 27.2789 155.376 27.4647 155.316C27.5067 155.304 27.5487 155.292 27.5847 155.28C27.8124 155.208 28.0342 155.13 28.25 155.046C28.28 155.034 28.31 155.022 28.346 155.01C28.5857 154.914 28.8195 154.819 29.0472 154.711C29.1132 154.681 29.1851 154.651 29.251 154.615C29.5028 154.495 29.7546 154.363 29.9884 154.225C30.0364 154.201 30.0783 154.171 30.1203 154.147C30.1622 154.123 30.1982 154.099 30.2401 154.069C30.3061 154.027 30.372 153.985 30.438 153.943C30.4979 153.901 30.5578 153.865 30.6118 153.823C30.6717 153.782 30.7377 153.74 30.7976 153.692C30.8516 153.65 30.9055 153.608 30.9595 153.566C31.0194 153.524 31.0733 153.476 31.1333 153.434C31.1872 153.392 31.2352 153.35 31.2831 153.308C31.3371 153.26 31.391 153.218 31.439 153.17C31.463 153.152 31.481 153.134 31.5049 153.116C31.5229 153.098 31.5409 153.08 31.5589 153.062C31.6429 152.978 31.7267 152.9 31.8046 152.816C31.8286 152.786 31.8586 152.762 31.8826 152.733C31.9845 152.625 32.0805 152.511 32.1644 152.403C32.1704 152.397 32.1703 152.391 32.1763 152.391C32.1943 152.367 32.2123 152.337 32.2363 152.313C32.2903 152.241 32.3442 152.175 32.3922 152.103C32.4161 152.061 32.4461 152.025 32.4701 151.983C32.5121 151.917 32.554 151.851 32.5899 151.791C32.6019 151.773 32.614 151.755 32.6199 151.737C32.6379 151.713 32.6439 151.683 32.6619 151.66C32.6919 151.606 32.7218 151.552 32.7458 151.498C32.7698 151.45 32.7878 151.408 32.8117 151.36C32.8357 151.306 32.8597 151.252 32.8837 151.192C32.8957 151.168 32.9077 151.144 32.9137 151.12C32.9197 151.096 32.9256 151.072 32.9376 151.054C32.9556 151 32.9736 150.946 32.9916 150.898C33.0036 150.85 33.0215 150.802 33.0335 150.754C33.0455 150.7 33.0635 150.646 33.0755 150.593C33.0814 150.563 33.0935 150.533 33.0995 150.509C33.1055 150.491 33.1055 150.467 33.1115 150.449C33.1234 150.395 33.1295 150.341 33.1355 150.287C33.1415 150.239 33.1474 150.191 33.1534 150.143C33.1594 150.089 33.1594 150.035 33.1654 149.975C33.1654 149.945 33.1714 149.909 33.1714 149.879C33.1714 149.849 33.1714 149.813 33.1714 149.783L33.1834 145.066C33.1834 145.12 33.1774 145.186 33.1714 145.252Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M29.9404 140.528C34.2384 143.01 34.2624 147.032 29.9944 149.514C25.7264 151.995 18.7789 151.995 14.4809 149.514C10.1829 147.032 10.1649 143.01 14.4329 140.528C18.7009 138.046 25.6424 138.046 29.9404 140.528Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<line x1="22.2247" y1="141.707" x2="22.2247" y2="147.293" stroke="#DA3635" stroke-width="2" stroke-linecap="round"/>
-<line x1="25.7753" y1="144.707" x2="18.2247" y2="144.707" stroke="#DA3635" stroke-width="2" stroke-linecap="round"/>
-<path d="M180.108 74.1322C183.506 76.0827 183.52 79.2463 180.149 81.2038C176.779 83.1543 171.29 83.1543 167.892 81.2038C164.493 79.2532 164.48 76.0896 167.857 74.1322C171.235 72.1747 176.716 72.1816 180.108 74.1322Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M160.944 63.4988C160.96 63.7129 160.929 64.2023 160.878 64.396C160.649 64.396 160.618 64.2838 160.582 64.085C160.241 64.6101 159.767 65.9458 159.405 64.8191C159.191 64.1513 159.471 63.3 160.073 62.8921" fill="white"/>
-<path d="M160.944 63.4988C160.96 63.7129 160.929 64.2023 160.878 64.396C160.649 64.396 160.618 64.2838 160.582 64.085C160.241 64.6101 159.767 65.9458 159.405 64.8191C159.191 64.1513 159.471 63.3 160.073 62.8921" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.944 63.4988C160.96 63.7129 160.929 64.2023 160.878 64.396C160.649 64.396 160.618 64.2838 160.582 64.085C160.241 64.6101 159.767 65.9458 159.405 64.8191C159.191 64.1513 159.471 63.3 160.073 62.8921" fill="white"/>
-<path d="M160.944 63.4988C160.96 63.7129 160.929 64.2023 160.878 64.396C160.649 64.396 160.618 64.2838 160.582 64.085C160.241 64.6101 159.767 65.9458 159.405 64.8191C159.191 64.1513 159.471 63.3 160.073 62.8921" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.772 65.3951C171.935 65.8845 172.766 66.5218 172.068 66.8837C171.349 67.261 170.844 66.0833 170.763 65.4818" fill="white"/>
-<path d="M171.772 65.3951C171.935 65.8845 172.766 66.5218 172.068 66.8837C171.349 67.261 170.844 66.0833 170.763 65.4818" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.772 65.3951C171.935 65.8845 172.766 66.5218 172.068 66.8837C171.349 67.261 170.844 66.0833 170.763 65.4818" fill="white"/>
-<path d="M171.772 65.3951C171.935 65.8845 172.766 66.5218 172.068 66.8837C171.349 67.261 170.844 66.0833 170.763 65.4818" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.201 74.2299C171.171 74.5256 171.92 75.2444 172.053 75.6319C172.231 76.1723 172.038 76.6107 171.757 77.0695C171.252 77.8852 171.268 77.3957 171.151 76.7585C171.054 76.2028 170.676 75.744 170.483 75.2393" fill="white"/>
-<path d="M171.201 74.2299C171.171 74.5256 171.92 75.2444 172.053 75.6319C172.231 76.1723 172.038 76.6107 171.757 77.0695C171.252 77.8852 171.268 77.3957 171.151 76.7585C171.054 76.2028 170.676 75.744 170.483 75.2393" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.201 74.2299C171.171 74.5256 171.92 75.2444 172.053 75.6319C172.231 76.1723 172.038 76.6107 171.757 77.0695C171.252 77.8852 171.268 77.3957 171.151 76.7585C171.054 76.2028 170.676 75.744 170.483 75.2393" fill="white"/>
-<path d="M171.201 74.2299C171.171 74.5256 171.92 75.2444 172.053 75.6319C172.231 76.1723 172.038 76.6107 171.757 77.0695C171.252 77.8852 171.268 77.3957 171.151 76.7585C171.054 76.2028 170.676 75.744 170.483 75.2393" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.176 79.649C166.007 80.6125 162.53 82.8811 163.575 80.6788L165.176 79.649Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.986 75.4687C172.608 75.5656 172.527 76.3812 172.394 76.8553C172.297 77.151 171.512 78.4867 171.252 78.3083C170.681 77.8851 171.446 77.2479 171.594 77.0185C171.808 76.6922 172.231 76.0397 172.068 75.6318" fill="white"/>
-<path d="M171.986 75.4687C172.608 75.5656 172.527 76.3812 172.394 76.8553C172.297 77.151 171.512 78.4867 171.252 78.3083C170.681 77.8851 171.446 77.2479 171.594 77.0185C171.808 76.6922 172.231 76.0397 172.068 75.6318" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M171.986 75.4687C172.608 75.5656 172.527 76.3812 172.394 76.8553C172.297 77.151 171.512 78.4867 171.252 78.3083C170.681 77.8851 171.446 77.2479 171.594 77.0185C171.808 76.6922 172.231 76.0397 172.068 75.6318" fill="white"/>
-<path d="M171.986 75.4687C172.608 75.5656 172.527 76.3812 172.394 76.8553C172.297 77.151 171.512 78.4867 171.252 78.3083C170.681 77.8851 171.446 77.2479 171.594 77.0185C171.808 76.6922 172.231 76.0397 172.068 75.6318" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.746 57.7993C165.894 57.9318 168.035 55.6275 167.969 55.5766C167.821 55.4287 167.444 55.2809 167.398 55.1025C167.317 54.7252 167.102 54.1236 167.25 53.7617C167.791 53.9758 168.081 53.4201 168.035 52.895C167.969 52.2425 166.893 51.6715 167.006 52.5535C166.22 52.7319 166.338 52.0131 165.517 51.4574C164.569 51.7531 164.487 51.3912 163.998 51.1006C163.59 52.161 164.079 55.1483 165.369 54.5774C164.895 54.5468 165.384 54.5927 165.435 54.873C165.369 54.8883 164.946 55.9844 164.931 55.9844" fill="white"/>
-<path d="M165.746 57.7993C165.894 57.9318 168.035 55.6275 167.969 55.5766C167.821 55.4287 167.444 55.2809 167.398 55.1025C167.317 54.7252 167.102 54.1236 167.25 53.7617C167.791 53.9758 168.081 53.4201 168.035 52.895C167.969 52.2425 166.893 51.6715 167.006 52.5535C166.22 52.7319 166.338 52.0131 165.517 51.4574C164.569 51.7531 164.487 51.3912 163.998 51.1006C163.59 52.161 164.079 55.1483 165.369 54.5774C164.895 54.5468 165.384 54.5927 165.435 54.873C165.369 54.8883 164.946 55.9844 164.931 55.9844" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.746 57.7993C165.894 57.9318 168.035 55.6275 167.969 55.5766C167.821 55.4287 167.444 55.2809 167.398 55.1025C167.317 54.7252 167.102 54.1236 167.25 53.7617C167.791 53.9758 168.081 53.4201 168.035 52.895C167.969 52.2425 166.893 51.6715 167.006 52.5535C166.22 52.7319 166.338 52.0131 165.517 51.4574C164.569 51.7531 164.487 51.3912 163.998 51.1006C163.59 52.161 164.079 55.1483 165.369 54.5774C164.895 54.5468 165.384 54.5927 165.435 54.873C165.369 54.8883 164.946 55.9844 164.931 55.9844" fill="white"/>
-<path d="M165.746 57.7993C165.894 57.9318 168.035 55.6275 167.969 55.5766C167.821 55.4287 167.444 55.2809 167.398 55.1025C167.317 54.7252 167.102 54.1236 167.25 53.7617C167.791 53.9758 168.081 53.4201 168.035 52.895C167.969 52.2425 166.893 51.6715 167.006 52.5535C166.22 52.7319 166.338 52.0131 165.517 51.4574C164.569 51.7531 164.487 51.3912 163.998 51.1006C163.59 52.161 164.079 55.1483 165.369 54.5774C164.895 54.5468 165.384 54.5927 165.435 54.873C165.369 54.8883 164.946 55.9844 164.931 55.9844" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.228 50.7131C164.671 50.0605 164.962 50.0452 165.635 49.8617C166.257 49.6833 166.924 49.3061 167.613 49.6986C168.28 50.0758 168.316 51.1362 168.627 51.7887C168.969 52.5738 169.657 53.2111 169.835 54.042C170.049 54.9546 169.591 55.2197 168.775 55.4644C168.122 55.6581 167.485 55.5459 167.159 54.924C167.047 54.7099 166.945 54.1899 167.026 53.9452C167.159 53.5679 167.664 53.6036 167.857 53.2926C168.071 52.9664 167.745 52.2323 167.317 52.2628C167.138 52.2781 167.057 52.6554 166.746 52.6707C166.567 52.686 166.042 52.4107 165.93 52.2476C165.798 52.0844 165.833 51.6256 165.635 51.5797C165.42 51.5135 165.145 51.9723 164.946 52.0385C164.161 52.2832 164.131 51.6817 164.013 51.1056" fill="white"/>
-<path d="M164.228 50.7131C164.671 50.0605 164.962 50.0452 165.635 49.8617C166.257 49.6833 166.924 49.3061 167.613 49.6986C168.28 50.0758 168.316 51.1362 168.627 51.7887C168.969 52.5738 169.657 53.2111 169.835 54.042C170.049 54.9546 169.591 55.2197 168.775 55.4644C168.122 55.6581 167.485 55.5459 167.159 54.924C167.047 54.7099 166.945 54.1899 167.026 53.9452C167.159 53.5679 167.664 53.6036 167.857 53.2926C168.071 52.9664 167.745 52.2323 167.317 52.2628C167.138 52.2781 167.057 52.6554 166.746 52.6707C166.567 52.686 166.042 52.4107 165.93 52.2476C165.798 52.0844 165.833 51.6256 165.635 51.5797C165.42 51.5135 165.145 51.9723 164.946 52.0385C164.161 52.2832 164.131 51.6817 164.013 51.1056" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.228 50.7131C164.671 50.0605 164.962 50.0452 165.635 49.8617C166.257 49.6833 166.924 49.3061 167.613 49.6986C168.28 50.0758 168.316 51.1362 168.627 51.7887C168.969 52.5738 169.657 53.2111 169.835 54.042C170.049 54.9546 169.591 55.2197 168.775 55.4644C168.122 55.6581 167.485 55.5459 167.159 54.924C167.047 54.7099 166.945 54.1899 167.026 53.9452C167.159 53.5679 167.664 53.6036 167.857 53.2926C168.071 52.9664 167.745 52.2323 167.317 52.2628C167.138 52.2781 167.057 52.6554 166.746 52.6707C166.567 52.686 166.042 52.4107 165.93 52.2476C165.798 52.0844 165.833 51.6256 165.635 51.5797C165.42 51.5135 165.145 51.9723 164.946 52.0385C164.161 52.2832 164.131 51.6817 164.013 51.1056" fill="#DA3635"/>
-<path d="M164.228 50.7131C164.671 50.0605 164.962 50.0452 165.635 49.8617C166.257 49.6833 166.924 49.3061 167.613 49.6986C168.28 50.0758 168.316 51.1362 168.627 51.7887C168.969 52.5738 169.657 53.2111 169.835 54.042C170.049 54.9546 169.591 55.2197 168.775 55.4644C168.122 55.6581 167.485 55.5459 167.159 54.924C167.047 54.7099 166.945 54.1899 167.026 53.9452C167.159 53.5679 167.664 53.6036 167.857 53.2926C168.071 52.9664 167.745 52.2323 167.317 52.2628C167.138 52.2781 167.057 52.6554 166.746 52.6707C166.567 52.686 166.042 52.4107 165.93 52.2476C165.798 52.0844 165.833 51.6256 165.635 51.5797C165.42 51.5135 165.145 51.9723 164.946 52.0385C164.161 52.2832 164.131 51.6817 164.013 51.1056" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M167.969 55.5613C167.612 56.0507 166.71 56.9836 166.042 57.0142C165.211 57.0652 165.043 55.3981 165.456 54.8578C164.686 54.2868 164.426 55.2809 164.233 55.8518C163.957 56.6828 163.626 57.3863 163.106 58.0898C162.55 58.8749 161.964 59.6396 161.536 60.5063C161.097 61.4188 160.521 62.1376 159.966 62.9533C160.44 63.1011 160.588 63.3764 160.914 63.6874C161.566 63.2133 162.107 62.3007 162.611 61.6635C163.116 60.9957 163.641 60.389 163.952 59.6039C164.263 60.2259 164.064 61.1894 164.64 61.5972C165.099 61.9082 165.945 61.8572 166.486 61.8572C167.072 61.8572 167.893 62.0713 168.219 61.5462C168.678 60.8121 168.168 59.6192 168.515 58.8545C169.448 59.558 169.738 62.0051 170.003 63.1011C170.151 63.7537 170.182 65.7622 171.064 65.8795C171.242 65.8948 171.834 65.6501 171.961 65.5379C172.257 65.2626 172.221 65.2932 172.124 64.8548C172.012 64.3501 171.665 63.9066 171.538 63.3866C171.405 62.8462 171.324 62.2906 171.263 61.74C171.099 60.2871 170.529 59.242 169.973 57.9012C169.662 57.1314 169.565 56.3973 168.795 55.9589C168.525 55.7601 168.326 55.597 167.969 55.5613Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.058 77.2989C165.303 77.4773 165.221 79.1749 165.17 79.5674C165.104 80.1741 164.319 81.2141 163.6 81.1529C163.407 80.6635 163.748 80.0773 163.83 79.5828C163.911 79.0424 163.896 78.4867 163.83 77.9514" fill="white"/>
-<path d="M165.058 77.2989C165.303 77.4773 165.221 79.1749 165.17 79.5674C165.104 80.1741 164.319 81.2141 163.6 81.1529C163.407 80.6635 163.748 80.0773 163.83 79.5828C163.911 79.0424 163.896 78.4867 163.83 77.9514" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.058 77.2989C165.303 77.4773 165.221 79.1749 165.17 79.5674C165.104 80.1741 164.319 81.2141 163.6 81.1529C163.407 80.6635 163.748 80.0773 163.83 79.5828C163.911 79.0424 163.896 78.4867 163.83 77.9514" fill="white"/>
-<path d="M165.058 77.2989C165.303 77.4773 165.221 79.1749 165.17 79.5674C165.104 80.1741 164.319 81.2141 163.6 81.1529C163.407 80.6635 163.748 80.0773 163.83 79.5828C163.911 79.0424 163.896 78.4867 163.83 77.9514" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M168.245 61.4442C169.29 62.5198 169.208 64.401 169.014 65.757C168.821 67.0978 167.725 68.8923 168.637 70.0495C169.193 70.7683 169.601 71.584 170.172 72.2518C170.63 72.7922 171.329 73.3784 171.283 74.1788C171.268 74.5051 171.003 75.0098 170.697 75.1729C170.207 75.4329 170.029 75.0251 169.667 74.6325C168.979 73.8627 168.489 73.0624 167.643 72.4608C166.68 71.7777 166.435 71.1863 166.221 70.075C165.94 68.7699 165.879 67.4598 165.716 66.17C165.42 67.6586 165.685 69.1574 165.42 70.6307C165.273 71.4973 165.094 72.313 165.16 73.2102C165.242 74.2859 165.487 75.3513 165.42 76.4423C165.369 77.2121 165.273 77.6199 164.523 77.8289C164.309 77.8799 163.917 78.0227 163.738 77.9258C163.295 77.6964 163.381 75.8662 163.346 75.4431C163.131 72.3742 162.367 69.3052 162.576 66.2006C162.642 65.3492 162.739 64.2226 162.984 63.4222C163.213 62.6524 163.636 61.4799 164.289 60.9701C164.646 61.8826 165.349 61.8367 166.313 61.8214C166.94 61.801 167.786 61.9132 168.245 61.4442Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.569 50.6009C183.273 50.8813 182.977 52.9358 183.044 53.7056C183.14 54.8832 181.657 55.1585 180.546 54.455C179.811 53.9809 179.485 52.0029 179.419 51.126C179.322 49.5916 181.723 49.4794 182.243 50.7488" fill="white"/>
-<path d="M182.569 50.6009C183.273 50.8813 182.977 52.9358 183.044 53.7056C183.14 54.8832 181.657 55.1585 180.546 54.455C179.811 53.9809 179.485 52.0029 179.419 51.126C179.322 49.5916 181.723 49.4794 182.243 50.7488" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.569 50.6009C183.273 50.8813 182.977 52.9358 183.044 53.7056C183.14 54.8832 181.657 55.1585 180.546 54.455C179.811 53.9809 179.485 52.0029 179.419 51.126C179.322 49.5916 181.723 49.4794 182.243 50.7488" fill="white"/>
-<path d="M182.569 50.6009C183.273 50.8813 182.977 52.9358 183.044 53.7056C183.14 54.8832 181.657 55.1585 180.546 54.455C179.811 53.9809 179.485 52.0029 179.419 51.126C179.322 49.5916 181.723 49.4794 182.243 50.7488" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.998 53.8788C182.295 55.5255 180.383 53.9451 179.975 54.5824C179.679 55.0412 179.679 56.4278 179.618 56.9835C179.506 57.8807 179.537 58.8289 179.537 59.7415C179.537 61.0669 179.047 63.8402 180.633 64.4775C182.641 65.2931 183.508 62.112 183.457 60.7203C183.406 59.6242 183.227 58.5486 183.243 57.4372C183.258 56.4074 183.829 54.5161 182.916 53.7463" fill="white"/>
-<path d="M182.998 53.8788C182.295 55.5255 180.383 53.9451 179.975 54.5824C179.679 55.0412 179.679 56.4278 179.618 56.9835C179.506 57.8807 179.537 58.8289 179.537 59.7415C179.537 61.0669 179.047 63.8402 180.633 64.4775C182.641 65.2931 183.508 62.112 183.457 60.7203C183.406 59.6242 183.227 58.5486 183.243 57.4372C183.258 56.4074 183.829 54.5161 182.916 53.7463" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.998 53.8788C182.295 55.5255 180.383 53.9451 179.975 54.5824C179.679 55.0412 179.679 56.4278 179.618 56.9835C179.506 57.8807 179.537 58.8289 179.537 59.7415C179.537 61.0669 179.047 63.8402 180.633 64.4775C182.641 65.2931 183.508 62.112 183.457 60.7203C183.406 59.6242 183.227 58.5486 183.243 57.4372C183.258 56.4074 183.829 54.5161 182.916 53.7463" fill="white"/>
-<path d="M182.998 53.8788C182.295 55.5255 180.383 53.9451 179.975 54.5824C179.679 55.0412 179.679 56.4278 179.618 56.9835C179.506 57.8807 179.537 58.8289 179.537 59.7415C179.537 61.0669 179.047 63.8402 180.633 64.4775C182.641 65.2931 183.508 62.112 183.457 60.7203C183.406 59.6242 183.227 58.5486 183.243 57.4372C183.258 56.4074 183.829 54.5161 182.916 53.7463" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.305 63.6466C188.417 63.9066 188.6 64.4623 188.743 64.7223C187.617 65.0639 186.913 65.5074 187.01 63.8556" fill="white"/>
-<path d="M188.305 63.6466C188.417 63.9066 188.6 64.4623 188.743 64.7223C187.617 65.0639 186.913 65.5074 187.01 63.8556" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.305 63.6466C188.417 63.9066 188.6 64.4623 188.743 64.7223C187.617 65.0639 186.913 65.5074 187.01 63.8556" fill="white"/>
-<path d="M188.305 63.6466C188.417 63.9066 188.6 64.4623 188.743 64.7223C187.617 65.0639 186.913 65.5074 187.01 63.8556" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M177.196 63.5344C176.758 63.9422 176.967 65.4308 175.973 65.0842C174.943 64.7069 175.81 63.9575 175.958 63.1877C176.365 63.3356 176.885 63.305 177.196 63.5344Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M176.508 65.0484C176.901 65.5684 176.671 66.0272 176.294 66.3076C176.309 66.2923 175.116 66.5676 175.004 66.5013C174.025 66.0119 175.361 64.9822 175.545 64.4622" fill="white"/>
-<path d="M176.508 65.0484C176.901 65.5684 176.671 66.0272 176.294 66.3076C176.309 66.2923 175.116 66.5676 175.004 66.5013C174.025 66.0119 175.361 64.9822 175.545 64.4622" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M176.508 65.0484C176.901 65.5684 176.671 66.0272 176.294 66.3076C176.309 66.2923 175.116 66.5676 175.004 66.5013C174.025 66.0119 175.361 64.9822 175.545 64.4622" fill="white"/>
-<path d="M176.508 65.0484C176.901 65.5684 176.671 66.0272 176.294 66.3076C176.309 66.2923 175.116 66.5676 175.004 66.5013C174.025 66.0119 175.361 64.9822 175.545 64.4622" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M187.535 65.0485C187.484 65.4258 187.438 65.9967 187.372 66.3383C187.438 66.2873 187.586 66.1752 187.668 66.1242C187.29 67.9033 189.839 65.9763 188.565 64.8191" fill="white"/>
-<path d="M187.535 65.0485C187.484 65.4258 187.438 65.9967 187.372 66.3383C187.438 66.2873 187.586 66.1752 187.668 66.1242C187.29 67.9033 189.839 65.9763 188.565 64.8191" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M187.535 65.0485C187.484 65.4258 187.438 65.9967 187.372 66.3383C187.438 66.2873 187.586 66.1752 187.668 66.1242C187.29 67.9033 189.839 65.9763 188.565 64.8191" fill="white"/>
-<path d="M187.535 65.0485C187.484 65.4258 187.438 65.9967 187.372 66.3383C187.438 66.2873 187.586 66.1752 187.668 66.1242C187.29 67.9033 189.839 65.9763 188.565 64.8191" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.282 74.5868C185.705 76.3659 183.895 76.6259 184.221 74.7193C184.532 74.7346 184.859 74.5562 185.073 74.4899" fill="white"/>
-<path d="M185.282 74.5868C185.705 76.3659 183.895 76.6259 184.221 74.7193C184.532 74.7346 184.859 74.5562 185.073 74.4899" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.282 74.5868C185.705 76.3659 183.895 76.6259 184.221 74.7193C184.532 74.7346 184.859 74.5562 185.073 74.4899" fill="white"/>
-<path d="M185.282 74.5868C185.705 76.3659 183.895 76.6259 184.221 74.7193C184.532 74.7346 184.859 74.5562 185.073 74.4899" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.649 77.0847C179.552 77.151 179.434 77.1815 179.353 77.2784C180.056 77.4721 180.087 78.1603 180.413 78.716C180.938 77.8647 180.413 77.1 179.434 77.1" fill="white"/>
-<path d="M179.649 77.0847C179.552 77.151 179.434 77.1815 179.353 77.2784C180.056 77.4721 180.087 78.1603 180.413 78.716C180.938 77.8647 180.413 77.1 179.434 77.1" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.649 77.0847C179.552 77.151 179.434 77.1815 179.353 77.2784C180.056 77.4721 180.087 78.1603 180.413 78.716C180.938 77.8647 180.413 77.1 179.434 77.1" fill="white"/>
-<path d="M179.649 77.0847C179.552 77.151 179.434 77.1815 179.353 77.2784C180.056 77.4721 180.087 78.1603 180.413 78.716C180.938 77.8647 180.413 77.1 179.434 77.1" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.286 78.6039C179.944 77.2172 178.634 76.5953 177.263 76.4474C177.278 77.5435 179.516 80.2709 180.515 78.716" fill="white"/>
-<path d="M180.286 78.6039C179.944 77.2172 178.634 76.5953 177.263 76.4474C177.278 77.5435 179.516 80.2709 180.515 78.716" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.286 78.6039C179.944 77.2172 178.634 76.5953 177.263 76.4474C177.278 77.5435 179.516 80.2709 180.515 78.716" fill="white"/>
-<path d="M180.286 78.6039C179.944 77.2172 178.634 76.5953 177.263 76.4474C177.278 77.5435 179.516 80.2709 180.515 78.716" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.089 75.5655C184.385 76.0243 184.94 75.9886 185.267 75.5808C185.771 76.8706 183.977 76.8706 183.059 76.7584C180.969 76.529 183.712 76.1212 183.875 75.3718C184.186 75.6012 184.66 75.749 185.083 75.6827" fill="white"/>
-<path d="M184.089 75.5655C184.385 76.0243 184.94 75.9886 185.267 75.5808C185.771 76.8706 183.977 76.8706 183.059 76.7584C180.969 76.529 183.712 76.1212 183.875 75.3718C184.186 75.6012 184.66 75.749 185.083 75.6827" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.089 75.5655C184.385 76.0243 184.94 75.9886 185.267 75.5808C185.771 76.8706 183.977 76.8706 183.059 76.7584C180.969 76.529 183.712 76.1212 183.875 75.3718C184.186 75.6012 184.66 75.749 185.083 75.6827" fill="white"/>
-<path d="M184.089 75.5655C184.385 76.0243 184.94 75.9886 185.267 75.5808C185.771 76.8706 183.977 76.8706 183.059 76.7584C180.969 76.529 183.712 76.1212 183.875 75.3718C184.186 75.6012 184.66 75.749 185.083 75.6827" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.82 51.6104C181.851 51.0241 182.702 50.9578 182.799 51.4982C182.85 51.6919 181.948 52.8848 181.8 52.9205C181.096 53.0837 180.658 51.8907 179.888 52.0386C178.955 52.2323 179.2 53.3794 179.807 53.8331C181.147 54.8781 181.897 53.3284 182.631 52.4617C182.957 52.0845 183.171 52.2986 183.334 51.6919C183.431 51.3351 183.268 50.9221 183.202 50.5959C183.039 49.6986 182.875 49.0257 181.943 48.7657C181.142 48.5363 180.031 48.7147 179.409 49.2041C178.512 49.9077 178.869 51.4064 179.705 50.3155C180.148 50.9527 181.127 51.3606 181.892 51.0496" fill="white"/>
-<path d="M181.82 51.6104C181.851 51.0241 182.702 50.9578 182.799 51.4982C182.85 51.6919 181.948 52.8848 181.8 52.9205C181.096 53.0837 180.658 51.8907 179.888 52.0386C178.955 52.2323 179.2 53.3794 179.807 53.8331C181.147 54.8781 181.897 53.3284 182.631 52.4617C182.957 52.0845 183.171 52.2986 183.334 51.6919C183.431 51.3351 183.268 50.9221 183.202 50.5959C183.039 49.6986 182.875 49.0257 181.943 48.7657C181.142 48.5363 180.031 48.7147 179.409 49.2041C178.512 49.9077 178.869 51.4064 179.705 50.3155C180.148 50.9527 181.127 51.3606 181.892 51.0496" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.82 51.6104C181.851 51.0241 182.702 50.9578 182.799 51.4982C182.85 51.6919 181.948 52.8848 181.8 52.9205C181.096 53.0837 180.658 51.8907 179.888 52.0386C178.955 52.2323 179.2 53.3794 179.807 53.8331C181.147 54.8781 181.897 53.3284 182.631 52.4617C182.957 52.0845 183.171 52.2986 183.334 51.6919C183.431 51.3351 183.268 50.9221 183.202 50.5959C183.039 49.6986 182.875 49.0257 181.943 48.7657C181.142 48.5363 180.031 48.7147 179.409 49.2041C178.512 49.9077 178.869 51.4064 179.705 50.3155C180.148 50.9527 181.127 51.3606 181.892 51.0496" fill="#DA3635"/>
-<path d="M181.82 51.6104C181.851 51.0241 182.702 50.9578 182.799 51.4982C182.85 51.6919 181.948 52.8848 181.8 52.9205C181.096 53.0837 180.658 51.8907 179.888 52.0386C178.955 52.2323 179.2 53.3794 179.807 53.8331C181.147 54.8781 181.897 53.3284 182.631 52.4617C182.957 52.0845 183.171 52.2986 183.334 51.6919C183.431 51.3351 183.268 50.9221 183.202 50.5959C183.039 49.6986 182.875 49.0257 181.943 48.7657C181.142 48.5363 180.031 48.7147 179.409 49.2041C178.512 49.9077 178.869 51.4064 179.705 50.3155C180.148 50.9527 181.127 51.3606 181.892 51.0496" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.959 54.2052C180.352 55.1534 179.893 56.9479 180.01 58.0592C180.143 59.4306 180.174 60.8019 180.174 62.209C180.174 63.1062 180.107 63.305 180.78 63.7944C181.565 64.3807 182.167 64.4469 182.447 63.6313C182.906 62.2752 182.269 60.1851 182.233 58.7831C182.203 57.4933 183.803 54.6844 183.166 53.6903C184.915 54.3428 185.501 55.9436 186.153 57.5596C186.775 59.1451 187.754 60.8427 188.162 62.4893C188.295 63.0144 188.519 63.616 188.096 63.9575C187.555 64.4164 186.857 63.9422 186.628 63.5803C186.332 63.1062 186.317 61.8164 186.138 61.2454C185.909 60.4298 185.618 59.6957 185.159 59.0227C184.864 60.0015 185.063 61.1945 185.19 62.1886C185.272 62.8564 185.746 64.5234 185.501 65.1301C185.323 65.5889 184.425 66.1904 184.114 66.8634C183.757 67.5975 183.085 68.4947 182.891 69.2951C182.432 71.1558 184.639 72.3793 185.18 73.9495C185.491 74.8824 184.787 75.1934 184.023 74.602C183.253 74.0158 183.008 72.675 182.06 72.3793C181.112 73.8017 181.127 75.953 180.571 77.5231C177.63 77.1663 180.994 71.4821 180.668 70.2076C180.49 69.4735 179.689 69.0657 179.526 68.2653C179.394 67.5618 179.674 66.8124 179.771 66.1242C179.949 64.9159 179.577 65.1301 179.185 64.294C178.761 63.3968 178.843 61.9286 178.874 60.9651C178.614 61.3423 176.702 65.3085 175.947 63.4987C175.687 62.8921 177.645 60.1035 177.829 59.4816C178.303 57.7483 177.502 53.9605 180.067 54.3224" fill="white"/>
-<path d="M179.959 54.2052C180.352 55.1534 179.893 56.9479 180.01 58.0592C180.143 59.4306 180.174 60.8019 180.174 62.209C180.174 63.1062 180.107 63.305 180.78 63.7944C181.565 64.3807 182.167 64.4469 182.447 63.6313C182.906 62.2752 182.269 60.1851 182.233 58.7831C182.203 57.4933 183.803 54.6844 183.166 53.6903C184.915 54.3428 185.501 55.9436 186.153 57.5596C186.775 59.1451 187.754 60.8427 188.162 62.4893C188.295 63.0144 188.519 63.616 188.096 63.9575C187.555 64.4164 186.857 63.9422 186.628 63.5803C186.332 63.1062 186.317 61.8164 186.138 61.2454C185.909 60.4298 185.618 59.6957 185.159 59.0227C184.864 60.0015 185.063 61.1945 185.19 62.1886C185.272 62.8564 185.746 64.5234 185.501 65.1301C185.323 65.5889 184.425 66.1904 184.114 66.8634C183.757 67.5975 183.085 68.4947 182.891 69.2951C182.432 71.1558 184.639 72.3793 185.18 73.9495C185.491 74.8824 184.787 75.1934 184.023 74.602C183.253 74.0158 183.008 72.675 182.06 72.3793C181.112 73.8017 181.127 75.953 180.571 77.5231C177.63 77.1663 180.994 71.4821 180.668 70.2076C180.49 69.4735 179.689 69.0657 179.526 68.2653C179.394 67.5618 179.674 66.8124 179.771 66.1242C179.949 64.9159 179.577 65.1301 179.185 64.294C178.761 63.3968 178.843 61.9286 178.874 60.9651C178.614 61.3423 176.702 65.3085 175.947 63.4987C175.687 62.8921 177.645 60.1035 177.829 59.4816C178.303 57.7483 177.502 53.9605 180.067 54.3224" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.959 54.2052C180.352 55.1534 179.893 56.9479 180.01 58.0592C180.143 59.4306 180.174 60.8019 180.174 62.209C180.174 63.1062 180.107 63.305 180.78 63.7944C181.565 64.3807 182.167 64.4469 182.447 63.6313C182.906 62.2752 182.269 60.1851 182.233 58.7831C182.203 57.4933 183.803 54.6844 183.166 53.6903C184.915 54.3428 185.501 55.9436 186.153 57.5596C186.775 59.1451 187.754 60.8427 188.162 62.4893C188.295 63.0144 188.519 63.616 188.096 63.9575C187.555 64.4164 186.857 63.9422 186.628 63.5803C186.332 63.1062 186.317 61.8164 186.138 61.2454C185.909 60.4298 185.618 59.6957 185.159 59.0227C184.864 60.0015 185.063 61.1945 185.19 62.1886C185.272 62.8564 185.746 64.5234 185.501 65.1301C185.323 65.5889 184.425 66.1904 184.114 66.8634C183.757 67.5975 183.085 68.4947 182.891 69.2951C182.432 71.1558 184.639 72.3793 185.18 73.9495C185.491 74.8824 184.787 75.1934 184.023 74.602C183.253 74.0158 183.008 72.675 182.06 72.3793C181.112 73.8017 181.127 75.953 180.571 77.5231C177.63 77.1663 180.994 71.4821 180.668 70.2076C180.49 69.4735 179.689 69.0657 179.526 68.2653C179.394 67.5618 179.674 66.8124 179.771 66.1242C179.949 64.9159 179.577 65.1301 179.185 64.294C178.761 63.3968 178.843 61.9286 178.874 60.9651C178.614 61.3423 176.702 65.3085 175.947 63.4987C175.687 62.8921 177.645 60.1035 177.829 59.4816C178.303 57.7483 177.502 53.9605 180.067 54.3224" fill="white"/>
-<path d="M179.959 54.2052C180.352 55.1534 179.893 56.9479 180.01 58.0592C180.143 59.4306 180.174 60.8019 180.174 62.209C180.174 63.1062 180.107 63.305 180.78 63.7944C181.565 64.3807 182.167 64.4469 182.447 63.6313C182.906 62.2752 182.269 60.1851 182.233 58.7831C182.203 57.4933 183.803 54.6844 183.166 53.6903C184.915 54.3428 185.501 55.9436 186.153 57.5596C186.775 59.1451 187.754 60.8427 188.162 62.4893C188.295 63.0144 188.519 63.616 188.096 63.9575C187.555 64.4164 186.857 63.9422 186.628 63.5803C186.332 63.1062 186.317 61.8164 186.138 61.2454C185.909 60.4298 185.618 59.6957 185.159 59.0227C184.864 60.0015 185.063 61.1945 185.19 62.1886C185.272 62.8564 185.746 64.5234 185.501 65.1301C185.323 65.5889 184.425 66.1904 184.114 66.8634C183.757 67.5975 183.085 68.4947 182.891 69.2951C182.432 71.1558 184.639 72.3793 185.18 73.9495C185.491 74.8824 184.787 75.1934 184.023 74.602C183.253 74.0158 183.008 72.675 182.06 72.3793C181.112 73.8017 181.127 75.953 180.571 77.5231C177.63 77.1663 180.994 71.4821 180.668 70.2076C180.49 69.4735 179.689 69.0657 179.526 68.2653C179.394 67.5618 179.674 66.8124 179.771 66.1242C179.949 64.9159 179.577 65.1301 179.185 64.294C178.761 63.3968 178.843 61.9286 178.874 60.9651C178.614 61.3423 176.702 65.3085 175.947 63.4987C175.687 62.8921 177.645 60.1035 177.829 59.4816C178.303 57.7483 177.502 53.9605 180.067 54.3224" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M61.7227 44.7692C63.499 45.7931 63.5063 47.4537 61.7444 48.4811C59.9825 49.505 57.1136 49.505 55.3372 48.4811C53.5609 47.4573 53.5537 45.7967 55.3192 44.7692C57.0847 43.7418 59.95 43.7454 61.7227 44.7692Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M58.6665 22L58.6665 46.6667" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<path d="M66.135 11.3463L66.0994 24.0037C66.0994 24.1153 66.0733 24.2268 66.0234 24.3384L66.059 11.681C66.1089 11.5718 66.135 11.4579 66.135 11.3463Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M50.5181 25.7082L50.5537 13.0508C50.5537 13.3973 50.7886 13.7367 51.2253 13.9883L51.1897 26.6457C50.753 26.3917 50.5181 26.0523 50.5181 25.7082Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M66.0591 11.681L66.0235 24.3383L64.5591 27.5401L64.597 14.8803L66.0591 11.681Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M64.5972 14.8804L64.5616 27.5378C64.3551 27.9911 63.7451 28.3471 62.9619 28.4681L62.9975 15.8108C63.7807 15.6897 64.3907 15.3361 64.5972 14.8804Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M55.2841 16.3283L55.2485 28.9856L51.1899 26.6431L51.2255 13.9857L55.2841 16.3283Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M62.9951 15.8106L62.9595 28.4703L57.439 29.3271L57.4769 16.6698L62.9951 15.8106Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M57.4767 16.6699L57.4411 29.3273C56.6579 29.4483 55.8224 29.3178 55.248 28.9855L55.2837 16.3282C55.858 16.6604 56.6935 16.791 57.4767 16.6699Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M65.4657 10.4115C66.04 10.7438 66.2679 11.2279 66.059 11.6813L64.597 14.8806C64.3905 15.3339 63.7806 15.6899 62.9973 15.811L57.4768 16.6678C56.6936 16.7888 55.8581 16.6583 55.2838 16.326L51.2253 13.9835C50.6509 13.6512 50.423 13.167 50.6295 12.7137L52.0916 9.51433C52.298 9.06101 52.9104 8.705 53.6912 8.58396L59.2118 7.72716C59.995 7.60374 60.8304 7.73428 61.4048 8.06656L65.4657 10.4115Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M66.1279 9.71831C66.1256 9.75866 66.1232 9.79664 66.1184 9.83698C66.116 9.87021 66.1113 9.90581 66.1065 9.93904C66.1018 9.97702 66.0947 10.0174 66.0876 10.0553C66.0804 10.0886 66.0733 10.1242 66.0662 10.1574C66.0567 10.1954 66.0496 10.2333 66.0377 10.2713C66.0282 10.3045 66.0187 10.3401 66.0069 10.3734C65.995 10.4113 65.9831 10.4493 65.9689 10.4849C65.957 10.5182 65.9452 10.5514 65.9309 10.5846C65.9143 10.625 65.8977 10.6629 65.8811 10.7033C65.8668 10.7365 65.8502 10.7697 65.836 10.8006C65.817 10.8386 65.7957 10.8789 65.7767 10.9169C65.7601 10.9477 65.7434 10.9786 65.7244 11.0118C65.6983 11.0569 65.6698 11.1044 65.639 11.1495C65.62 11.178 65.6034 11.2064 65.5844 11.2325C65.5488 11.2824 65.5132 11.3322 65.4752 11.3821C65.4586 11.4034 65.442 11.4272 65.4254 11.4485C65.3613 11.5268 65.2948 11.6075 65.2236 11.6835C65.2047 11.7025 65.1857 11.7238 65.1667 11.7428C65.1097 11.8022 65.0528 11.8615 64.9911 11.9185C64.9626 11.9446 64.9341 11.9707 64.9056 11.9968C64.87 12.03 64.832 12.0632 64.7917 12.0965C64.7561 12.1273 64.7205 12.1558 64.6849 12.1843C64.6445 12.2175 64.6042 12.2484 64.5615 12.2792C64.5235 12.3077 64.4855 12.3362 64.4452 12.3647C64.4024 12.3955 64.3574 12.4264 64.3146 12.4572C64.2743 12.4857 64.2316 12.5142 64.1912 12.5403C64.1461 12.5711 64.0987 12.5996 64.0512 12.6305C63.9919 12.6685 63.9325 12.7041 63.8708 12.742C63.7023 12.8393 63.5243 12.9319 63.3463 13.0173C63.2988 13.0411 63.2513 13.0624 63.2039 13.0838C63.0401 13.1598 62.8764 13.231 62.7055 13.2974C62.6841 13.3069 62.6627 13.3164 62.639 13.3235C62.4563 13.3923 62.2688 13.4564 62.0813 13.5158C61.9507 13.5561 61.8155 13.5941 61.6802 13.6297C61.5781 13.6582 61.4784 13.6866 61.374 13.7128C61.2316 13.746 61.0868 13.7745 60.9444 13.8053C60.84 13.8267 60.7355 13.8504 60.6311 13.8694C60.5884 13.8765 60.5433 13.8836 60.4982 13.8908C60.3202 13.9192 60.1398 13.9454 59.9595 13.9667C59.9072 13.9738 59.855 13.981 59.8028 13.9857C59.6984 13.9976 59.594 14.0023 59.4895 14.0118C59.3139 14.026 59.1406 14.0403 58.9626 14.0474C58.8511 14.0522 58.7371 14.0545 58.6256 14.0569C58.4832 14.0593 58.3408 14.0616 58.1984 14.0593C58.0797 14.0569 57.961 14.0545 57.8424 14.0498C57.7095 14.045 57.5789 14.0379 57.4484 14.0284C57.3273 14.0189 57.2087 14.0094 57.0876 13.9976C56.9571 13.9857 56.8289 13.9715 56.6984 13.9548C56.5821 13.9406 56.4658 13.924 56.3495 13.905C56.2118 13.8836 56.0742 13.8599 55.9365 13.8338C55.8273 13.8124 55.7205 13.7911 55.6137 13.7673C55.45 13.7317 55.2909 13.6914 55.1296 13.6487C55.0251 13.6202 54.9207 13.5965 54.8187 13.5656C54.7641 13.549 54.7095 13.5324 54.6549 13.5158C54.4935 13.4659 54.3368 13.4113 54.1802 13.3544C54.1351 13.3378 54.09 13.3211 54.0449 13.3045C53.9025 13.2499 53.7672 13.1882 53.6296 13.1289C53.5631 13.1004 53.4943 13.0719 53.4302 13.0411C53.2332 12.9485 53.0433 12.8488 52.8582 12.742C51.3226 11.8568 50.5584 10.6938 50.5607 9.53319L50.5513 12.8821C50.5489 14.0427 51.3131 15.2056 52.8487 16.0933C53.0315 16.2001 53.2237 16.2974 53.4207 16.3923C53.4872 16.4232 53.556 16.4493 53.6224 16.4801C53.7387 16.5324 53.8527 16.5846 53.9737 16.632C53.9951 16.6392 54.0164 16.6463 54.0378 16.6558C54.0829 16.6724 54.128 16.689 54.1731 16.7056C54.3274 16.7626 54.4864 16.8172 54.6454 16.867C54.7 16.8836 54.7546 16.9026 54.8091 16.9192C54.8471 16.9311 54.8827 16.943 54.9183 16.9525C54.9824 16.9714 55.0512 16.9833 55.1177 17.0023C55.2767 17.045 55.4381 17.0854 55.6019 17.121C55.6446 17.1305 55.6873 17.1423 55.73 17.1518C55.7941 17.1661 55.8582 17.1732 55.9223 17.185C56.0599 17.2112 56.1976 17.2349 56.3353 17.2563C56.3898 17.2657 56.4444 17.2776 56.499 17.2847C56.5583 17.2942 56.6201 17.2966 56.6818 17.3061C56.8123 17.3227 56.9405 17.3369 57.071 17.3488C57.1327 17.3559 57.1944 17.3654 57.2561 17.3702C57.3131 17.3749 57.3724 17.3749 57.4294 17.3797C57.5599 17.3892 57.6929 17.3963 57.8234 17.401C57.8898 17.4034 57.9563 17.4105 58.0204 17.4105C58.0726 17.4129 58.1272 17.4081 58.1794 17.4105C58.3218 17.4129 58.4642 17.4105 58.6066 17.4081C58.6778 17.4058 58.749 17.4105 58.8178 17.4081C58.8606 17.4058 58.9009 17.401 58.9436 17.3987C59.1193 17.3915 59.2949 17.3773 59.4705 17.3631C59.5417 17.3583 59.6129 17.3559 59.6818 17.3488C59.715 17.3464 59.7482 17.3393 59.7814 17.3369C59.8337 17.3322 59.8859 17.3251 59.9404 17.318C60.1208 17.2966 60.3012 17.2705 60.4792 17.242C60.5219 17.2349 60.567 17.2278 60.6098 17.2206C60.6311 17.2159 60.6525 17.2135 60.6738 17.2112C60.7593 17.1969 60.84 17.1756 60.9254 17.1566C61.0702 17.1281 61.2126 17.0996 61.355 17.064C61.4594 17.0379 61.5591 17.0094 61.6612 16.9809C61.7964 16.9453 61.9317 16.9074 62.0623 16.867C62.0908 16.8575 62.1192 16.8504 62.1477 16.8433C62.3091 16.7911 62.4658 16.7341 62.62 16.6771C62.6414 16.6676 62.6628 16.6582 62.6865 16.651C62.8574 16.5846 63.0211 16.5134 63.1849 16.4374C63.2324 16.4161 63.2798 16.3923 63.3273 16.371C63.5077 16.2832 63.6833 16.193 63.8518 16.0957C63.8827 16.0767 63.9159 16.0577 63.9468 16.0387C63.9752 16.0221 64.0037 16.0031 64.0322 15.9841C64.0797 15.9533 64.1272 15.9248 64.1746 15.8939C64.2173 15.8654 64.2577 15.837 64.298 15.8108C64.3431 15.78 64.3858 15.7491 64.4286 15.7183C64.4689 15.6898 64.5069 15.6613 64.5449 15.6305C64.5852 15.5996 64.6279 15.5664 64.6659 15.5355C64.7015 15.5071 64.7371 15.4762 64.7727 15.4453C64.8107 15.4121 64.8487 15.3813 64.8843 15.348C64.8985 15.3338 64.9151 15.3219 64.9293 15.3077C64.9436 15.2958 64.9555 15.2816 64.9673 15.2697C65.029 15.2127 65.086 15.1534 65.143 15.0941C65.1619 15.0751 65.1809 15.0537 65.1999 15.0347C65.2711 14.9564 65.3399 14.8781 65.4016 14.7998C65.404 14.7974 65.4088 14.7927 65.4112 14.7903C65.4254 14.7713 65.4373 14.7523 65.4515 14.7357C65.4895 14.6859 65.5275 14.636 65.5607 14.5862C65.5797 14.5577 65.5963 14.5316 65.6153 14.5031C65.6437 14.458 65.6746 14.4105 65.7007 14.3654C65.7078 14.3536 65.7173 14.3393 65.7244 14.3275C65.7339 14.3085 65.7434 14.2895 65.7529 14.2705C65.7743 14.2325 65.7933 14.1922 65.8122 14.1542C65.8289 14.121 65.8431 14.0878 65.8574 14.0569C65.874 14.0189 65.8906 13.9786 65.9072 13.9382C65.9143 13.9216 65.9238 13.9026 65.9285 13.886C65.9357 13.8694 65.938 13.8552 65.9452 13.8385C65.9594 13.8006 65.9713 13.7626 65.9832 13.727C65.9926 13.6938 66.0045 13.6582 66.014 13.6249C66.0235 13.587 66.033 13.549 66.0425 13.511C66.0472 13.4897 66.0543 13.4707 66.0567 13.4493C66.0591 13.4351 66.0615 13.4208 66.0638 13.4066C66.071 13.3686 66.0757 13.3283 66.0828 13.2903C66.0876 13.2571 66.0923 13.2215 66.0947 13.1882C66.0994 13.1479 66.1018 13.1099 66.1042 13.0696C66.1066 13.0458 66.1089 13.0245 66.1089 13.0007C66.1089 12.977 66.1089 12.9556 66.1089 12.9319L66.1184 9.58303C66.135 9.62575 66.1303 9.67085 66.1279 9.71831Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M63.835 6.3694C66.8848 8.13047 66.9038 10.9857 63.873 12.7467C60.8421 14.5078 55.9102 14.5078 52.8604 12.7467C49.8106 10.9857 49.7963 8.13047 52.8271 6.3694C55.858 4.60833 60.7852 4.60833 63.835 6.3694Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M62.4301 8.20398C64.6991 9.36457 64.7133 11.2443 62.4586 12.4025C60.2039 13.5631 56.5346 13.5631 54.2656 12.4025C51.9967 11.2419 51.9848 9.3622 54.2395 8.20398C56.4942 7.04576 60.1611 7.04576 62.4301 8.20398Z" fill="#DA3635"/>
-<path d="M63.0615 6.65901C65.6817 8.17087 65.6984 10.625 63.0947 12.1368C60.4911 13.6487 56.2546 13.6487 53.6344 12.1368C51.0141 10.625 51.0022 8.17087 53.6059 6.65901C56.2095 5.14715 60.4413 5.14715 63.0615 6.65901Z" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M66.1279 22.9737C66.1256 23.014 66.1232 23.052 66.1184 23.0923C66.1161 23.1256 66.1113 23.1612 66.1066 23.1944C66.1018 23.2324 66.0947 23.2727 66.0876 23.3107C66.0805 23.3439 66.0734 23.3795 66.0662 23.4127C66.0567 23.4507 66.0496 23.4887 66.0378 23.5267C66.0283 23.5599 66.0188 23.5955 66.0069 23.6287C65.995 23.6667 65.9832 23.7047 65.9689 23.7426C65.957 23.7759 65.9452 23.8091 65.9309 23.8423C65.9143 23.8827 65.8977 23.9206 65.8811 23.961C65.8669 23.9942 65.8503 24.0274 65.836 24.0583C65.817 24.0963 65.7957 24.1366 65.7767 24.1746C65.7601 24.2055 65.7434 24.2363 65.7244 24.2695C65.6983 24.3146 65.6699 24.3621 65.639 24.4072C65.62 24.4357 65.6034 24.4642 65.5844 24.4903C65.5488 24.5401 65.5132 24.5899 65.4753 24.6398C65.4586 24.6611 65.442 24.6849 65.4254 24.7062C65.3613 24.7846 65.2949 24.8653 65.2237 24.9412C65.2047 24.9602 65.1857 24.9816 65.1667 25.0005C65.1097 25.0599 65.0528 25.1192 64.9911 25.1762C64.9626 25.2023 64.9341 25.2284 64.9056 25.2545C64.87 25.2877 64.8321 25.321 64.7917 25.3542C64.7561 25.385 64.7205 25.4135 64.6849 25.442C64.6445 25.4752 64.6042 25.5061 64.5615 25.5369C64.5235 25.5654 64.4855 25.5939 64.4452 25.6224C64.4025 25.6532 64.3574 25.6841 64.3147 25.7149C64.2743 25.7434 64.2316 25.7719 64.1912 25.798C64.1461 25.8289 64.0987 25.8573 64.0512 25.8882C63.9919 25.9262 63.9325 25.9618 63.8708 25.9998C63.7023 26.0971 63.5243 26.1896 63.3463 26.2751C63.2989 26.2988 63.2514 26.3202 63.2039 26.3415C63.0401 26.4175 62.8764 26.4887 62.7055 26.5551C62.6841 26.5646 62.6628 26.5741 62.639 26.5812C62.4563 26.6501 62.2688 26.7141 62.0813 26.7735C61.9507 26.8138 61.8155 26.8518 61.6802 26.8874C61.5781 26.9159 61.4784 26.9444 61.374 26.9705C61.2316 27.0037 61.0868 27.0322 60.9444 27.063C60.84 27.0844 60.7356 27.1081 60.6311 27.1271C60.5884 27.1342 60.5433 27.1414 60.4982 27.1485C60.3202 27.177 60.1398 27.2031 59.9595 27.2244C59.9072 27.2315 59.855 27.2387 59.8028 27.2434C59.6984 27.2553 59.594 27.26 59.4895 27.2695C59.3139 27.2838 59.1406 27.298 58.9626 27.3051C58.8511 27.3099 58.7372 27.3122 58.6256 27.3146C58.4832 27.317 58.3408 27.3194 58.1984 27.317C58.0797 27.3146 57.961 27.3122 57.8424 27.3075C57.7095 27.3027 57.5789 27.2956 57.4484 27.2861C57.3273 27.2766 57.2087 27.2671 57.0876 27.2553C56.9571 27.2434 56.8289 27.2292 56.6984 27.2126C56.5821 27.1983 56.4658 27.1817 56.3495 27.1627C56.2118 27.1414 56.0742 27.1176 55.9365 27.0915C55.8273 27.0702 55.7205 27.0488 55.6137 27.0251C55.45 26.9895 55.2909 26.9491 55.1296 26.9064C55.0251 26.8779 54.9207 26.8542 54.8187 26.8233C54.7641 26.8067 54.7095 26.7901 54.6549 26.7735C54.4935 26.7236 54.3368 26.669 54.1802 26.6121C54.1351 26.5955 54.09 26.5789 54.0449 26.5622C53.9025 26.5077 53.7672 26.4459 53.6296 26.3866C53.5631 26.3581 53.4943 26.3297 53.4302 26.2988C53.2332 26.2062 53.0433 26.1066 52.8582 25.9998C51.3226 25.1145 50.5584 23.9515 50.5607 22.7885L50.5513 26.1374C50.5489 27.298 51.3131 28.461 52.8487 29.3486C53.0315 29.4554 53.2237 29.5527 53.4207 29.6477C53.4872 29.6785 53.556 29.7046 53.6224 29.7355C53.7387 29.7877 53.8527 29.8399 53.9737 29.8874C53.9951 29.8945 54.0164 29.9016 54.0378 29.9111C54.0829 29.9277 54.128 29.9443 54.1731 29.961C54.3274 30.0179 54.4864 30.0725 54.6454 30.1224C54.7 30.139 54.7546 30.158 54.8092 30.1746C54.8471 30.1864 54.8827 30.1983 54.9183 30.2078C54.9824 30.2268 55.0513 30.2386 55.1177 30.2576C55.2767 30.3004 55.4381 30.3407 55.6019 30.3763C55.6446 30.3858 55.6873 30.3977 55.73 30.4072C55.7941 30.4214 55.8582 30.4285 55.9223 30.4404C56.06 30.4665 56.1976 30.4902 56.3353 30.5116C56.3899 30.5211 56.4444 30.5329 56.499 30.5401C56.5584 30.5496 56.6201 30.5519 56.6818 30.5614C56.8123 30.578 56.9405 30.5923 57.071 30.6042C57.1327 30.6113 57.1944 30.6208 57.2561 30.6255C57.3131 30.6303 57.3724 30.6303 57.4294 30.635C57.5599 30.6445 57.6929 30.6516 57.8234 30.6564C57.8899 30.6587 57.9563 30.6659 58.0204 30.6659C58.0726 30.6682 58.1272 30.6635 58.1794 30.6659C58.3218 30.6682 58.4642 30.6659 58.6066 30.6635C58.6778 30.6611 58.749 30.6659 58.8178 30.6635C58.8606 30.6611 58.9009 30.6564 58.9436 30.654C59.1193 30.6469 59.2949 30.6326 59.4705 30.6184C59.5417 30.6136 59.6129 30.6113 59.6818 30.6042C59.715 30.6018 59.7482 30.5947 59.7815 30.5923C59.8337 30.5875 59.8859 30.5804 59.9405 30.5733C60.1208 30.5519 60.3012 30.5258 60.4792 30.4973C60.5219 30.4902 60.5671 30.4831 60.6098 30.476C60.6311 30.4712 60.6525 30.4689 60.6739 30.4665C60.7593 30.4523 60.84 30.4309 60.9254 30.4119C61.0702 30.3834 61.2126 30.3549 61.355 30.3193C61.4595 30.2932 61.5591 30.2648 61.6612 30.2363C61.7965 30.2007 61.9318 30.1627 62.0623 30.1224C62.0908 30.1129 62.1193 30.1057 62.1477 30.0986C62.3091 30.0464 62.4658 29.9894 62.62 29.9325C62.6414 29.923 62.6628 29.9135 62.6865 29.9064C62.8574 29.8399 63.0211 29.7687 63.1849 29.6928C63.2324 29.6714 63.2798 29.6477 63.3273 29.6263C63.5077 29.5385 63.6833 29.4483 63.8518 29.351C63.8827 29.332 63.9159 29.313 63.9468 29.294C63.9752 29.2774 64.0037 29.2584 64.0322 29.2394C64.0797 29.2086 64.1272 29.1801 64.1746 29.1493C64.2174 29.1208 64.2577 29.0923 64.298 29.0662C64.3431 29.0353 64.3859 29.0045 64.4286 28.9736C64.4689 28.9451 64.5069 28.9167 64.5449 28.8858C64.5852 28.855 64.6279 28.8217 64.6659 28.7909C64.7015 28.7624 64.7371 28.7315 64.7727 28.7007C64.8107 28.6675 64.8487 28.6366 64.8843 28.6034C64.8985 28.5891 64.9151 28.5773 64.9294 28.563C64.9436 28.5512 64.9555 28.5369 64.9673 28.5251C65.0291 28.4681 65.086 28.4088 65.143 28.3494C65.162 28.3304 65.1809 28.3091 65.1999 28.2901C65.2711 28.2118 65.34 28.1334 65.4017 28.0551C65.404 28.0527 65.4088 28.048 65.4112 28.0456C65.4254 28.0266 65.4373 28.0076 65.4515 27.991C65.4895 27.9412 65.5275 27.8914 65.5607 27.8415C65.5797 27.813 65.5963 27.7869 65.6153 27.7584C65.6438 27.7133 65.6746 27.6659 65.7007 27.6208C65.7078 27.6089 65.7173 27.5947 65.7244 27.5828C65.7339 27.5638 65.7434 27.5448 65.7529 27.5258C65.7743 27.4879 65.7933 27.4475 65.8123 27.4095C65.8289 27.3763 65.8431 27.3431 65.8574 27.3122C65.874 27.2743 65.8906 27.2339 65.9072 27.1936C65.9143 27.177 65.9238 27.158 65.9286 27.1414C65.9357 27.1247 65.9381 27.1105 65.9452 27.0939C65.9594 27.0559 65.9713 27.0179 65.9832 26.9823C65.9927 26.9491 66.0045 26.9135 66.014 26.8803C66.0235 26.8423 66.033 26.8043 66.0425 26.7664C66.0473 26.745 66.0544 26.726 66.0567 26.7046C66.0591 26.6904 66.0615 26.6762 66.0639 26.6619C66.071 26.624 66.0757 26.5836 66.0828 26.5456C66.0876 26.5124 66.0923 26.4768 66.0947 26.4436C66.0995 26.4032 66.1018 26.3653 66.1042 26.3249C66.1066 26.3012 66.1089 26.2798 66.1089 26.2561C66.1089 26.2323 66.1089 26.211 66.1089 26.1872L66.1184 22.8384C66.1351 22.8835 66.1303 22.9286 66.1279 22.9737Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M75.2494 12.3928C75.2185 12.4189 75.1877 12.4474 75.1568 12.4735C75.1283 12.4949 75.0999 12.5186 75.0714 12.54C75.0382 12.5637 75.0073 12.5874 74.9741 12.6112C74.9432 12.6325 74.9148 12.6515 74.8839 12.6705C74.8507 12.6919 74.8151 12.7132 74.7795 12.7322C74.7486 12.7512 74.7154 12.7678 74.6821 12.7844C74.6465 12.8034 74.6086 12.8224 74.573 12.839C74.5398 12.8556 74.5065 12.8699 74.4709 12.8841C74.4306 12.9007 74.3902 12.9173 74.3475 12.9339C74.3119 12.9482 74.2787 12.9601 74.2431 12.9719C74.2004 12.9862 74.1576 13.0004 74.1126 13.0123C74.077 13.0218 74.0413 13.0336 74.0057 13.0431C73.9535 13.0574 73.8989 13.0692 73.842 13.0811C73.8088 13.0882 73.7755 13.0953 73.7399 13.1025C73.6782 13.1143 73.6141 13.1238 73.5501 13.1309C73.5216 13.1357 73.4931 13.1404 73.4646 13.1428C73.3602 13.1547 73.2534 13.1618 73.1442 13.1665C73.1157 13.1665 73.0872 13.1665 73.0587 13.1689C72.9733 13.1713 72.8879 13.1713 72.8024 13.1689C72.7621 13.1689 72.7241 13.1665 72.6838 13.1642C72.6315 13.1618 72.5817 13.157 72.5295 13.1547C72.482 13.1499 72.4346 13.1476 72.3871 13.1428C72.3349 13.1381 72.2803 13.1309 72.2281 13.1238C72.1782 13.1167 72.1307 13.1096 72.0809 13.1025C72.0263 13.093 71.9717 13.0835 71.9172 13.074C71.8673 13.0645 71.8151 13.055 71.7653 13.0455C71.7107 13.0336 71.6537 13.0218 71.5967 13.0075C71.5255 12.9909 71.4567 12.9743 71.3831 12.9553C71.1885 12.9031 70.9915 12.8414 70.7969 12.7726C70.7447 12.7559 70.6949 12.737 70.6426 12.718C70.4694 12.6539 70.2961 12.5851 70.1228 12.5091C70.0991 12.4996 70.0777 12.4901 70.054 12.4806C69.8713 12.3976 69.6885 12.3074 69.5058 12.2124C69.38 12.146 69.2542 12.0748 69.1284 12.0036C69.0335 11.949 68.9385 11.8968 68.8436 11.8398C68.7154 11.7615 68.5873 11.676 68.4615 11.593C68.3689 11.5313 68.2763 11.4743 68.1861 11.4102C68.1482 11.3841 68.1126 11.3556 68.0746 11.3295C67.9227 11.2203 67.7732 11.1064 67.6236 10.9901C67.5809 10.9569 67.5382 10.9237 67.4955 10.8881C67.4101 10.8192 67.3294 10.748 67.2463 10.6768C67.1086 10.5605 66.971 10.4419 66.8357 10.3185C66.7502 10.2401 66.6672 10.1594 66.5817 10.0787C66.4749 9.97668 66.3705 9.87225 66.2684 9.76782C66.183 9.68001 66.0976 9.58982 66.0145 9.49963C65.9219 9.39995 65.8317 9.29789 65.7416 9.19583C65.6585 9.1009 65.5802 9.00596 65.4995 8.91102C65.414 8.80659 65.3286 8.70216 65.2479 8.59536C65.1743 8.49805 65.1007 8.40312 65.0295 8.30581C64.9441 8.18951 64.861 8.07084 64.7803 7.95217C64.7162 7.85723 64.6522 7.76467 64.5928 7.66736C64.5003 7.52258 64.4124 7.37543 64.327 7.22828C64.2724 7.13335 64.2131 7.03841 64.1609 6.9411C64.1324 6.88888 64.1063 6.83667 64.0778 6.78445C63.9971 6.63018 63.9212 6.47591 63.85 6.31927C63.8286 6.27417 63.8072 6.22908 63.7882 6.18398C63.7242 6.04158 63.6696 5.8968 63.615 5.75202C63.5889 5.68082 63.558 5.61199 63.5319 5.54079C63.456 5.32956 63.3895 5.11595 63.3325 4.90472C62.8579 3.13416 63.1474 1.72436 63.9995 0.879425L61.5454 3.31928C60.6933 4.16659 60.4038 5.57639 60.8785 7.34458C60.9354 7.55581 61.0019 7.76704 61.0778 7.98065C61.1039 8.05185 61.1348 8.12068 61.1609 8.19188C61.2083 8.3153 61.2534 8.43634 61.3057 8.55976C61.3151 8.58112 61.3246 8.60248 61.3341 8.62147C61.3531 8.66656 61.3769 8.71166 61.3958 8.75675C61.467 8.91103 61.543 9.06767 61.6237 9.22194C61.6522 9.27415 61.6783 9.32637 61.7068 9.37859C61.7258 9.41419 61.7424 9.44979 61.7614 9.48302C61.7946 9.54472 61.8349 9.60406 61.8705 9.66339C61.956 9.81054 62.0438 9.9577 62.1387 10.1048C62.1625 10.1428 62.1838 10.1832 62.2099 10.2211C62.2479 10.2781 62.2883 10.3303 62.3262 10.3873C62.4069 10.506 62.49 10.6246 62.5754 10.7433C62.6087 10.7908 62.6395 10.8382 62.6751 10.8857C62.7131 10.9355 62.7558 10.983 62.7938 11.0328C62.8768 11.1397 62.9599 11.2441 63.0477 11.3485C63.0881 11.3984 63.1261 11.4506 63.1688 11.498C63.2068 11.5431 63.2495 11.5859 63.2898 11.6333C63.38 11.7354 63.4702 11.8374 63.5628 11.9371C63.6102 11.987 63.653 12.0392 63.7004 12.089C63.7384 12.1294 63.7788 12.165 63.8167 12.2053C63.9188 12.3097 64.0232 12.4142 64.13 12.5162C64.1822 12.5661 64.2321 12.6207 64.2867 12.6705C64.3175 12.699 64.3531 12.7275 64.384 12.7559C64.5193 12.8794 64.6569 12.998 64.7946 13.1143C64.8492 13.1618 64.9037 13.2116 64.9607 13.2591C64.9868 13.2805 65.0153 13.3018 65.0438 13.3232C65.0865 13.3588 65.1292 13.392 65.1743 13.4252C65.3215 13.5415 65.4734 13.6555 65.6253 13.7646C65.6632 13.7907 65.6988 13.8192 65.7368 13.8453C65.7558 13.8572 65.7724 13.8714 65.7914 13.8857C65.865 13.9355 65.9409 13.9806 66.0145 14.0305C66.1403 14.1135 66.2685 14.199 66.3966 14.2773C66.4916 14.3343 66.5865 14.3865 66.6814 14.4411C66.8072 14.5123 66.933 14.5858 67.0588 14.6499C67.0849 14.6642 67.1134 14.6808 67.1395 14.695C67.2938 14.7733 67.4504 14.8493 67.607 14.9181C67.6308 14.9276 67.6522 14.9371 67.6759 14.9466C67.8491 15.0225 68.0224 15.0914 68.1956 15.1555C68.2479 15.1744 68.2977 15.1934 68.3499 15.21C68.5445 15.2789 68.7392 15.3406 68.9361 15.3928C68.9741 15.4023 69.0097 15.4118 69.0477 15.4213C69.0809 15.4308 69.1142 15.4355 69.1498 15.445C69.2067 15.4592 69.2637 15.4711 69.3183 15.483C69.3705 15.4925 69.4203 15.502 69.4702 15.5115C69.5248 15.521 69.5794 15.5305 69.6339 15.5399C69.6838 15.5471 69.7336 15.5542 69.7835 15.5613C69.8357 15.5684 69.8903 15.5755 69.9425 15.5803C69.9899 15.585 70.0374 15.5898 70.0872 15.5945C70.1395 15.5993 70.1893 15.6017 70.2415 15.604C70.2629 15.604 70.2842 15.6064 70.3056 15.6088C70.3246 15.6088 70.3436 15.6088 70.3626 15.6088C70.4504 15.6111 70.5358 15.6111 70.6189 15.6088C70.6474 15.6088 70.6759 15.6088 70.7044 15.6064C70.8135 15.6017 70.9203 15.5945 71.0248 15.5827C71.0295 15.5827 71.0342 15.5827 71.039 15.5827C71.0627 15.5803 71.0865 15.5755 71.1102 15.5708C71.1743 15.5613 71.2383 15.5518 71.3 15.5399C71.3333 15.5328 71.3665 15.5257 71.3997 15.5186C71.4543 15.5067 71.5089 15.4949 71.5635 15.4806C71.5778 15.4759 71.5944 15.4735 71.6086 15.4711C71.63 15.464 71.6513 15.4569 71.6727 15.4521C71.7154 15.4379 71.7605 15.426 71.8009 15.4118C71.8365 15.3999 71.872 15.3857 71.9053 15.3738C71.9456 15.3572 71.9884 15.3406 72.0287 15.324C72.0477 15.3168 72.0667 15.3097 72.0833 15.3026C72.0999 15.2955 72.1141 15.286 72.1307 15.2789C72.1687 15.2623 72.2043 15.2433 72.2399 15.2243C72.2732 15.2077 72.304 15.1887 72.3372 15.1721C72.3728 15.1507 72.4061 15.1317 72.4417 15.1104C72.4607 15.0985 72.4796 15.089 72.4986 15.0771C72.5105 15.07 72.5224 15.0605 72.5342 15.051C72.5675 15.0273 72.6007 15.0036 72.6316 14.9798C72.66 14.9585 72.6885 14.9371 72.717 14.9134C72.7478 14.8873 72.7787 14.8611 72.8096 14.8327C72.8262 14.8161 72.8452 14.8018 72.8641 14.7852C72.8808 14.7686 72.8974 14.752 72.914 14.7354L75.3681 12.2955C75.3206 12.3311 75.2826 12.362 75.2494 12.3928Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M76.0208 8.26783C76.963 11.7852 74.8887 13.8857 71.3855 12.9577C67.8824 12.0297 64.2772 8.42448 63.3349 4.90709C62.3927 1.38971 64.4694 -0.708383 67.9726 0.219618C71.4757 1.14762 75.0785 4.75045 76.0208 8.26783Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M73.0586 8.44768C73.0776 8.51651 73.0349 8.55686 72.9685 8.54024L66.6172 6.8575C66.5484 6.83851 66.4772 6.76731 66.4606 6.70085L66.012 5.02286C65.993 4.95165 66.0334 4.91368 66.1022 4.93029L72.4534 6.61304C72.5199 6.63203 72.5934 6.70085 72.6101 6.76968L73.0586 8.44768Z" fill="#EDEDED"/>
-<path d="M71.8481 7.74341L71.5586 6.64215L72.9185 5.27507L73.2105 6.37395L71.8481 7.74341Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M67.1581 6.48534L66.8662 5.38645L68.848 3.39279L69.1399 4.49168L67.1581 6.48534Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M69.1401 4.49173L68.8481 3.39284L74.0839 4.79552L74.3758 5.89441L69.1401 4.49173Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M74.3757 5.89438L72.3916 7.88804L71.8481 7.74327L73.2104 6.37381L69.0617 5.26068L67.7017 6.63014L67.1582 6.48536L69.14 4.4917L74.3757 5.89438Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_6867_13593">
-<rect width="200" height="200" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/assets/form/eyePassword.svg b/src/assets/form/eyePassword.svg
deleted file mode 100644
index dfd810d7c8526e9731a9ed8cb61de3fbd4434ac7..0000000000000000000000000000000000000000
--- a/src/assets/form/eyePassword.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="22" height="16" viewBox="0 0 22 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99519 3.00001C8.83101 2.37183 9.87111 2 11 2C13.7667 2 16 4.23333 16 7C16 9.76667 13.7667 12 11 12C8.23333 12 6 9.76667 6 7C6 6.5747 6.05278 6.162 6.15215 5.76809C6.45257 6.49223 7.16566 7 8 7C9.10667 7 10 6.10667 10 5C10 3.89333 9.10667 3 8 3C7.9984 3 7.9968 3 7.99519 3.00001Z" fill="#828282"/>
-<path d="M1 8C2.57273 3.90267 6.45455 1 11 1C15.5455 1 19.4273 3.90267 21 8" stroke="#828282" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M1 8C2.57273 12.0973 6.45455 15 11 15C15.5455 15 19.4273 12.0973 21 8" stroke="#828282" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
diff --git a/src/assets/form/factures.svg b/src/assets/form/factures.svg
deleted file mode 100644
index af7a8847d698b14137c9f62956849aec4f53f139..0000000000000000000000000000000000000000
--- a/src/assets/form/factures.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_4810_101286)">
-<g opacity="0.35" filter="url(#filter0_f_4810_101286)">
-<path d="M101.735 29.5946L30.9591 42.3835L27.9013 73.5339L98.677 60.7449L101.735 29.5946Z" fill="#DC2A59"/>
-<path d="M41.607 101.311L37.8076 136.377L108.583 123.589L112.383 88.5224L98.677 60.7449L27.9013 73.5339L41.607 101.311Z" fill="#DC2A59"/>
-</g>
-<path opacity="0.55" d="M30.7813 41.3995L30.0377 41.5338L29.9639 42.2858L26.9061 73.4362L26.8782 73.7203L27.0045 73.9763L40.5815 101.493L36.8134 136.27L36.6693 137.599L37.9854 137.362L108.761 124.573L109.497 124.44L109.577 123.696L113.377 88.6301L113.408 88.3409L113.279 88.0799L99.7001 60.5585L102.73 29.6923L102.859 28.3752L101.557 28.6105L30.7813 41.3995Z" fill="#348899" stroke="#DC2A59" stroke-width="2"/>
-<path d="M41.6069 101.311L112.383 88.5224L108.583 123.589L37.8075 136.377L41.6069 101.311Z" fill="#FDECF0"/>
-<path d="M41.6068 101.311L112.383 88.5225L98.6767 60.745L27.901 73.5339L41.6068 101.311Z" fill="#F3D0D9"/>
-<path d="M30.959 42.3835L101.735 29.5946L98.677 60.7449L27.9013 73.5339L30.959 42.3835Z" fill="#FDECF0"/>
-<mask id="mask0_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="91" width="59" height="37">
-<path d="M47.7432 101.921L103.836 91.7857L102.852 107.452L80.495 111.491L79.3714 121.647L45.2675 127.81L47.7432 101.921Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask0_4810_101286)">
-<rect x="43.2933" y="105.476" width="66.6075" height="2.70654" transform="rotate(-10.2426 43.2933 105.476)" fill="#DC2A59"/>
-<path d="M42.0508 114.01L104.769 102.678L104.751 105.431L42.532 116.674L42.0508 114.01Z" fill="#DC2A59"/>
-<rect x="41.9158" y="122.571" width="66.6075" height="2.70651" transform="rotate(-10.2426 41.9158 122.571)" fill="#DC2A59"/>
-</g>
-<mask id="mask1_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="33" y="36" width="61" height="37">
-<path d="M35.7004 46.6837L93.9863 36.1517L91.5106 62.0399L33.2247 72.572L35.7004 46.6837Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask1_4810_101286)">
-<path d="M32.3297 60.0132L56.2856 55.6845L55.5942 58.5598L32.8109 62.6766L32.3297 60.0132Z" fill="#DC2A59"/>
-<rect x="30.9914" y="67.8185" width="66.6075" height="2.70654" transform="rotate(-10.2426 30.9914 67.8185)" fill="#DC2A59"/>
-</g>
-<mask id="mask2_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="34" y="64" width="71" height="35">
-<path d="M93.2625 64.1299L34.9767 74.662L46.3558 98.0467L104.642 87.5146L93.2625 64.1299Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask2_4810_101286)">
-<rect x="36.9016" y="85.3156" width="66.6075" height="2.70654" transform="rotate(-10.2426 36.9016 85.3156)" fill="#DC2A59"/>
-<rect x="32.7961" y="77.8063" width="66.6075" height="2.70653" transform="rotate(-10.2426 32.7961 77.8063)" fill="#DC2A59"/>
-<rect x="40.3417" y="92.9451" width="66.6075" height="2.70653" transform="rotate(-10.2426 40.3417 92.9451)" fill="#DC2A59"/>
-</g>
-</g>
-<g clip-path="url(#clip1_4810_101286)">
-<g opacity="0.35" filter="url(#filter1_f_4810_101286)">
-<path d="M159.96 55.7321L90.0298 38.9224L74.6811 66.2007L144.611 83.0105L159.96 55.7321Z" fill="#348899"/>
-<path d="M76.0339 97.1459L58.4288 127.709L128.359 144.519L145.964 113.956L144.611 83.0105L74.6811 66.2007L76.0339 97.1459Z" fill="#348899"/>
-</g>
-<path opacity="0.55" d="M90.2635 37.9501L89.5288 37.7735L89.1583 38.432L73.8096 65.7104L73.6696 65.9592L73.682 66.2444L75.0222 96.8989L57.5623 127.21L56.8948 128.369L58.1951 128.682L128.125 145.491L128.852 145.666L129.225 145.018L146.83 114.455L146.976 114.203L146.963 113.912L145.622 83.252L160.831 56.2224L161.48 55.0691L160.193 54.7598L90.2635 37.9501Z" fill="#348899" stroke="#348899" stroke-width="2"/>
-<path d="M76.034 97.1459L145.964 113.956L128.359 144.519L58.4288 127.709L76.034 97.1459Z" fill="#EAF8FB"/>
-<path d="M76.0338 97.1459L145.964 113.956L144.611 83.0104L74.6808 66.2007L76.0338 97.1459Z" fill="#C9ECF3"/>
-<path d="M90.0299 38.9223L159.96 55.732L144.611 83.0104L74.6812 66.2007L90.0299 38.9223Z" fill="#EAF8FB"/>
-<mask id="mask3_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="68" y="100" width="69" height="31">
-<path d="M81.4043 100.177L136.827 113.499L129.614 127.44L107.525 122.131L102.405 130.973L68.7084 122.873L81.4043 100.177Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask3_4810_101286)">
-<rect x="75.8995" y="101.637" width="66.6075" height="2.70654" transform="rotate(13.5163 75.8995 101.637)" fill="#348899"/>
-<path d="M71.3239 108.948L133.292 123.843L132.167 126.357L70.6913 111.579L71.3239 108.948Z" fill="#348899"/>
-<rect x="67.7513" y="116.728" width="66.6075" height="2.70651" transform="rotate(13.5163 67.7513 116.728)" fill="#348899"/>
-</g>
-<mask id="mask4_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="79" y="44" width="72" height="38">
-<path d="M92.6367 44.7684L150.226 58.6116L137.53 81.3084L79.9408 67.4651L92.6367 44.7684Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask4_4810_101286)">
-<path d="M84.1814 55.6102L107.851 61.2999L106.06 63.6529L83.5488 58.2417L84.1814 55.6102Z" fill="#348899"/>
-<rect x="79.8118" y="62.2148" width="66.6075" height="2.70654" transform="rotate(13.5163 79.8118 62.2148)" fill="#348899"/>
-</g>
-<mask id="mask5_4810_101286" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="80" y="70" width="60" height="40">
-<path d="M138.292 83.9271L80.7024 70.0838L81.6957 96.0711L139.285 109.914L138.292 83.9271Z" fill="#FF0101"/>
-</mask>
-<g mask="url(#mask5_4810_101286)">
-<rect x="78.1721" y="80.6101" width="66.6075" height="2.70654" transform="rotate(13.5163 78.1721 80.6101)" fill="#117083"/>
-<rect x="77.4398" y="72.0832" width="66.6075" height="2.70653" transform="rotate(13.5163 77.4398 72.0832)" fill="#117083"/>
-<rect x="78.2468" y="88.9789" width="66.6075" height="2.70653" transform="rotate(13.5163 78.2468 88.9789)" fill="#117083"/>
-</g>
-</g>
-<defs>
-<filter id="filter0_f_4810_101286" x="15.9013" y="17.5946" width="108.481" height="130.783" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="6" result="effect1_foregroundBlur_4810_101286"/>
-</filter>
-<filter id="filter1_f_4810_101286" x="46.4288" y="26.9224" width="125.531" height="129.597" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="6" result="effect1_foregroundBlur_4810_101286"/>
-</filter>
-<clipPath id="clip0_4810_101286">
-<rect width="109.547" height="112.659" fill="white" transform="translate(5 38.4794) rotate(-10.2426)"/>
-</clipPath>
-<clipPath id="clip1_4810_101286">
-<rect width="109.547" height="112.659" fill="white" transform="translate(67.8438 24.8904) rotate(13.5163)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/assets/form/finish.svg b/src/assets/form/finish.svg
deleted file mode 100644
index 356725562909f5db5ac0e3b8493693b66ab9aba5..0000000000000000000000000000000000000000
--- a/src/assets/form/finish.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="6.01224" y="2.61237" width="1" height="17" rx="0.5" transform="rotate(15 6.01224 2.61237)" stroke="white"/>
-<rect x="6.90873" y="6.99372" width="1" height="1" transform="rotate(15 6.90873 6.99372)" stroke="white"/>
-<rect x="5.87357" y="10.8574" width="1" height="1" transform="rotate(15 5.87357 10.8574)" stroke="white"/>
-<rect x="10.7725" y="8.029" width="1" height="1" transform="rotate(15 10.7725 8.029)" stroke="white"/>
-<rect x="9.73685" y="11.8926" width="1" height="1" transform="rotate(15 9.73685 11.8926)" stroke="white"/>
-<rect x="14.6363" y="9.06428" width="1" height="1" transform="rotate(15 14.6363 9.06428)" stroke="white"/>
-<rect x="13.6006" y="12.9279" width="1" height="1" transform="rotate(15 13.6006 12.9279)" stroke="white"/>
-<rect x="8.32279" y="9.44318" width="1" height="1" transform="rotate(15 8.32279 9.44318)" stroke="white"/>
-<rect x="12.1866" y="10.4785" width="1" height="1" transform="rotate(15 12.1866 10.4785)" stroke="white"/>
-<rect x="16.0503" y="11.5137" width="1" height="1" transform="rotate(15 16.0503 11.5137)" stroke="white"/>
-<rect x="9.35795" y="5.57941" width="1" height="1" transform="rotate(15 9.35795 5.57941)" stroke="white"/>
-<rect x="13.2217" y="6.61469" width="1" height="1" transform="rotate(15 13.2217 6.61469)" stroke="white"/>
-<rect x="17.0855" y="7.64997" width="1" height="1" transform="rotate(15 17.0855 7.64997)" stroke="white"/>
-<rect x="6.71928" y="3.8371" width="13" height="9" transform="rotate(15 6.71928 3.8371)" stroke="white"/>
-</svg>
\ No newline at end of file
diff --git a/src/assets/form/notValidate.svg b/src/assets/form/notValidate.svg
deleted file mode 100644
index 91ed2f0106bb79982cfc8ac2e9d2f49230f328bd..0000000000000000000000000000000000000000
--- a/src/assets/form/notValidate.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="13" cy="13" r="13" fill="#DA6C2E"/>
-<path d="M13.25 14.5L13.25 6.00001" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.25 20.6066L13.25 20" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/assets/form/notValidateWithBorder.svg b/src/assets/form/notValidateWithBorder.svg
deleted file mode 100644
index 5b57de44d6c560745b5134fe4988235ea475c6dc..0000000000000000000000000000000000000000
--- a/src/assets/form/notValidateWithBorder.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="12" cy="12" r="11.5" fill="#DA6C2E" stroke="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0835 7.00067C11.0835 6.49441 11.4939 6.084 12.0001 6.08398C12.5064 6.08397 12.9168 6.49437 12.9168 7.00063L12.917 14.0006C12.917 14.5069 12.5066 14.9173 12.0003 14.9173C11.4941 14.9173 11.0837 14.5069 11.0836 14.0007L11.0835 7.00067ZM11.0837 17.6896C11.0837 17.1833 11.4941 16.7729 12.0004 16.7729C12.5066 16.7729 12.917 17.1833 12.917 17.6896L12.917 18.0318C12.917 18.5381 12.5066 18.9485 12.0004 18.9485C11.4941 18.9485 11.0837 18.5381 11.0837 18.0318L11.0837 17.6896Z" fill="white"/>
-</svg>
diff --git a/src/assets/form/profileQuestions.svg b/src/assets/form/profileQuestions.svg
deleted file mode 100644
index ff870c287bb0fade821f23c7a98b12a6426d0959..0000000000000000000000000000000000000000
--- a/src/assets/form/profileQuestions.svg
+++ /dev/null
@@ -1,212 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect width="200" height="200" fill="white" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M120.104 52.7464C120.131 52.7466 120.159 52.7467 120.187 52.7467C120.214 52.7467 120.242 52.7466 120.27 52.7464H190.285V52.72C190.514 52.7374 190.745 52.7462 190.978 52.7462C195.961 52.7462 200 48.7067 200 43.7238C200 38.9571 196.304 35.0537 191.621 34.724C191.654 34.2581 191.671 33.7878 191.671 33.3134C191.671 22.5809 182.971 13.8806 172.238 13.8806C171.662 13.8806 171.092 13.9056 170.528 13.9548C166.088 5.65012 157.332 0 147.256 0C132.691 0 120.883 11.8077 120.883 26.3731L120.883 26.3916C120.652 26.3796 120.42 26.3735 120.187 26.3735C112.904 26.3735 107 32.2774 107 39.5601C107 46.6106 112.533 52.3687 119.494 52.7288V52.7464H120.104Z"
- fill="#FFDDDD" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M10.8947 90.1842C5.43002 90.1842 1 85.7542 1 80.2895C1 74.8248 5.43002 70.3947 10.8947 70.3947C12.9017 70.3947 14.7691 70.9922 16.3287 72.0191C16.0098 70.4971 15.8421 68.9194 15.8421 67.3026C15.8421 54.6655 26.0865 44.4211 38.7237 44.4211C41.0154 44.4211 43.2284 44.758 45.3159 45.3849C50.1664 40.2235 57.0555 37 64.6974 37C79.3838 37 91.2895 48.9057 91.2895 63.5921C91.2895 66.5533 90.8055 69.4014 89.9123 72.0617C92.9366 73.6455 95.0003 76.8141 95.0003 80.4648C95.0003 85.7001 90.7562 89.9441 85.5209 89.9441C85.3816 89.9441 85.2431 89.9411 85.1053 89.9352V90.1842H64.6974H38.7237H10.8947Z"
- fill="#FFDDDD" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M172.34 38.8476C172.338 38.8476 172.336 38.8476 172.334 38.8476C172.332 38.8476 172.33 38.8476 172.328 38.8476H160.562H159.973V38.8059C157.976 38.5203 156.441 36.8031 156.441 34.7274C156.441 32.4518 158.286 30.6071 160.562 30.6071C161.3 30.6071 161.994 30.8015 162.593 31.142C162.419 30.4033 162.327 29.633 162.327 28.8413C162.327 23.3149 166.807 18.835 172.334 18.835C176.412 18.835 179.92 21.2741 181.479 24.7731C181.761 24.7387 182.048 24.721 182.34 24.721C185.984 24.721 188.983 27.4802 189.363 31.0232C189.908 30.7567 190.521 30.6071 191.169 30.6071C193.445 30.6071 195.29 32.4518 195.29 34.7274C195.29 37.0029 193.445 38.8476 191.169 38.8476C190.969 38.8476 190.773 38.8334 190.581 38.8059V38.8476H182.34H172.34Z"
- fill="white" />
- <path
- d="M70.7209 52.9167C70.106 52.8694 69.5856 52.7038 69.1362 52.4436L64.027 49.487C64.4765 49.7472 64.9968 49.9127 65.6118 49.9837L70.7209 52.9167Z"
- fill="#FF5D5C" />
- <path
- d="M59.655 55.7071L54.5459 52.7504C53.2686 51.9935 52.2279 50.5507 51.6838 48.0434L56.793 51.0001C57.3133 53.5073 58.3541 54.9502 59.655 55.7071Z"
- fill="#FF5D5C" />
- <path
- d="M31.932 26.6375L65.2359 7.40732C66.0638 6.93426 66.797 6.88695 67.3411 7.19444L72.4502 10.1511C71.9062 9.84362 71.1729 9.89093 70.345 10.364L37.0411 29.5942C35.409 30.5403 34.1081 32.8111 34.1081 34.6797L34.179 60.6511C34.179 61.5736 34.5102 62.2359 35.0305 62.5434L29.9214 59.5867C29.401 59.2792 29.0699 58.6169 29.0699 57.6944L28.9989 31.723C28.9753 29.8544 30.2999 27.56 31.932 26.6375Z"
- fill="#FF5D5C" />
- <mask id="path-7-inside-1_14421_60386" fill="white">
- <path
- d="M37.0319 29.5938C35.3998 30.54 34.0989 32.8107 34.0989 34.6793L34.1698 60.6507C34.1698 62.5193 35.4944 63.2762 37.1265 62.3301L56.7825 50.9765C58.4855 58.9477 65.2267 56.2512 68.6565 54.2643C69.9101 53.5547 70.667 52.9634 70.7143 52.9161C67.2373 52.6086 66.5986 48.6112 66.6932 45.2524L70.4068 43.0999C72.0389 42.1538 73.3398 39.8831 73.3398 38.0144L73.2689 12.043C73.2689 10.1744 71.9443 9.4175 70.3122 10.3636L37.0319 29.5938Z" />
- </mask>
- <path
- d="M37.0319 29.5938C35.3998 30.54 34.0989 32.8107 34.0989 34.6793L34.1698 60.6507C34.1698 62.5193 35.4944 63.2762 37.1265 62.3301L56.7825 50.9765C58.4855 58.9477 65.2267 56.2512 68.6565 54.2643C69.9101 53.5547 70.667 52.9634 70.7143 52.9161C67.2373 52.6086 66.5986 48.6112 66.6932 45.2524L70.4068 43.0999C72.0389 42.1538 73.3398 39.8831 73.3398 38.0144L73.2689 12.043C73.2689 10.1744 71.9443 9.4175 70.3122 10.3636L37.0319 29.5938Z"
- fill="white" />
- <path
- d="M37.0319 29.5938L36.7811 29.1613L36.7817 29.1609L37.0319 29.5938ZM34.0989 34.6793L33.5989 34.6807V34.6793H34.0989ZM34.1698 60.6507L34.6698 60.6494V60.6507H34.1698ZM37.1265 62.3301L36.8757 61.8975L36.8764 61.8971L37.1265 62.3301ZM56.7825 50.9765L56.5324 50.5435L57.1278 50.1996L57.2714 50.872L56.7825 50.9765ZM68.6565 54.2643L68.4058 53.8316L68.4102 53.8292L68.6565 54.2643ZM70.7143 52.9161L70.7584 52.418L71.8251 52.5123L71.0679 53.2696L70.7143 52.9161ZM66.6932 45.2524L66.1934 45.2383L66.2013 44.9596L66.4425 44.8198L66.6932 45.2524ZM70.4068 43.0999L70.6576 43.5325L70.6576 43.5325L70.4068 43.0999ZM73.3398 38.0144L73.8398 38.0131V38.0144H73.3398ZM73.2689 12.043L72.7689 12.0444V12.043H73.2689ZM70.3122 10.3636L70.563 10.7962L70.5624 10.7966L70.3122 10.3636ZM37.2827 30.0264C36.5599 30.4454 35.8835 31.1769 35.3867 32.0401C34.8899 32.9033 34.5989 33.8527 34.5989 34.6793H33.5989C33.5989 33.6373 33.9584 32.517 34.52 31.5412C35.0817 30.5653 35.8718 29.6884 36.7811 29.1613L37.2827 30.0264ZM34.5989 34.6779L34.6698 60.6494L33.6698 60.6521L33.5989 34.6807L34.5989 34.6779ZM34.6698 60.6507C34.6698 61.4781 34.9589 61.9267 35.2834 62.1114C35.6094 62.2969 36.1501 62.3182 36.8757 61.8975L37.3773 62.7627C36.4709 63.2881 35.5332 63.4041 34.7888 62.9805C34.0431 62.5561 33.6698 61.6919 33.6698 60.6507H34.6698ZM36.8764 61.8971L56.5324 50.5435L57.0326 51.4095L37.3766 62.7631L36.8764 61.8971ZM57.2714 50.872C57.6825 52.7959 58.3844 54.0151 59.2094 54.7617C60.0295 55.5038 61.0176 55.8209 62.0878 55.8549C64.2659 55.9241 66.7042 54.8174 68.4058 53.8317L68.9071 54.697C67.179 55.6981 64.5318 56.9331 62.0561 56.8544C60.7995 56.8145 59.5685 56.4353 58.5385 55.5032C57.5134 54.5756 56.734 53.1427 56.2935 51.081L57.2714 50.872ZM68.4102 53.8292C69.0229 53.4823 69.5131 53.1651 69.8541 52.9301C70.0246 52.8126 70.1571 52.7162 70.2484 52.6474C70.3559 52.5665 70.3793 52.544 70.3608 52.5625L71.0679 53.2696C71.0257 53.3118 70.9367 53.381 70.8498 53.4464C70.7467 53.524 70.6028 53.6286 70.4215 53.7535C70.0587 54.0035 69.5436 54.3367 68.9028 54.6994L68.4102 53.8292ZM70.6703 53.4141C68.6921 53.2392 67.5309 51.9925 66.9001 50.414C66.2797 48.8614 66.1455 46.9409 66.1934 45.2383L67.193 45.2665C67.1464 46.9226 67.2842 48.6803 67.8287 50.0429C68.3629 51.3797 69.2595 52.2855 70.7584 52.418L70.6703 53.4141ZM66.4425 44.8198L70.1561 42.6673L70.6576 43.5325L66.944 45.685L66.4425 44.8198ZM70.1561 42.6673C70.8788 42.2484 71.5552 41.5168 72.052 40.6537C72.5489 39.7905 72.8398 38.8411 72.8398 38.0144H73.8398C73.8398 39.0564 73.4804 40.1767 72.9187 41.1525C72.357 42.1285 71.5669 43.0053 70.6576 43.5325L70.1561 42.6673ZM72.8398 38.0158L72.7689 12.0444L73.7689 12.0417L73.8398 38.0131L72.8398 38.0158ZM72.7689 12.043C72.7689 11.2156 72.4798 10.767 72.1553 10.5824C71.8293 10.3969 71.2887 10.3755 70.563 10.7962L70.0614 9.93106C70.9678 9.40561 71.9055 9.28965 72.6499 9.71323C73.3957 10.1376 73.7689 11.0018 73.7689 12.043H72.7689ZM70.5624 10.7966L37.2821 30.0268L36.7817 29.1609L70.0621 9.93071L70.5624 10.7966Z"
- fill="#FF5D5C" mask="url(#path-7-inside-1_14421_60386)" />
- <path
- d="M45.4312 38.0156C45.4312 35.3664 47.2998 32.1496 49.5941 30.825C51.6756 29.6187 53.4023 30.3756 53.7098 32.5044C54.0173 30.0444 55.744 27.277 57.8255 26.0707C60.1199 24.7461 61.9885 25.8105 61.9885 28.436C61.9885 29.6187 61.6101 30.9196 60.9714 32.1259L53.7571 45.2062L46.5665 40.6411C45.8806 40.1917 45.4312 39.2929 45.4312 38.0156Z"
- fill="#DA3635" />
- <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.719 90.8662)" fill="#A0C7F0" />
- <path
- d="M99.7218 74.0342L194.232 126.054L194.235 128.601L99.7218 183.168L5.20909 128.601L5.20928 126.053L99.7218 74.0342Z"
- fill="#4277AF" />
- <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.719 71.4873)"
- fill="url(#paint0_linear_14421_60386)" />
- <circle cx="14.177" cy="14.177" r="14.177" transform="matrix(0.866025 -0.5 0.866025 0.5 69.8398 131.177)"
- fill="#A0C7F0" />
- <path
- d="M85.2266 95L89.0903 96.0353L78.2199 136.604C77.934 137.671 76.8373 138.304 75.7704 138.018C74.7034 137.732 74.0703 136.636 74.3562 135.569L85.2266 95Z"
- fill="#D6AD92" />
- <path
- d="M85.2266 95L89.0903 96.0353L83.6772 116.237C83.3913 117.304 82.2947 117.937 81.2277 117.651C80.1608 117.365 79.5276 116.269 79.8135 115.202L85.2266 95Z"
- fill="#AE907B" />
- <path
- d="M85.2266 95L89.0903 96.0353L85.1412 110.774C84.8553 111.84 83.7586 112.474 82.6917 112.188C81.6247 111.902 80.9916 110.805 81.2774 109.738L85.2266 95Z"
- fill="#88674F" />
- <path
- d="M91.2656 77L95.2635 77.1295L93.9042 119.107C93.8684 120.211 92.9445 121.077 91.8405 121.042C90.7365 121.006 89.8705 120.082 89.9063 118.978L91.2656 77Z"
- fill="#AE907B" />
- <path
- d="M91.2656 77L95.2635 77.1295L94.1167 112.543C94.081 113.647 93.157 114.513 92.053 114.478C90.949 114.442 90.0831 113.518 90.1188 112.414L91.2656 77Z"
- fill="#88674F" />
- <path
- d="M100.84 94.0352L104.704 92.9999L115.574 133.569C115.86 134.636 115.227 135.732 114.16 136.018C113.093 136.304 111.996 135.671 111.71 134.604L100.84 94.0352Z"
- fill="#D6AD92" />
- <path
- d="M100.84 94.0352L104.704 92.9999L110.634 115.132C110.92 116.199 110.286 117.295 109.22 117.581C108.153 117.867 107.056 117.234 106.77 116.167L100.84 94.0352Z"
- fill="#AE907B" />
- <path
- d="M100.84 94.0352L104.704 92.9999L109.089 109.367C109.375 110.434 108.742 111.531 107.675 111.817C106.608 112.103 105.511 111.469 105.225 110.402L100.84 94.0352Z"
- fill="#88674F" />
- <ellipse cx="20.1148" cy="20.3939" rx="20.1148" ry="20.3939" transform="matrix(0.866025 -0.5 0.866025 0.5 58 95.115)"
- fill="#AE907B" />
- <circle cx="18.7543" cy="18.7543" r="18.7543" transform="matrix(0.866025 -0.5 0.866025 0.5 60.8398 92.7548)"
- fill="#D6AD92" />
- <circle cx="12.4455" cy="12.4455" r="12.4455" transform="matrix(0.866025 -0.5 0.866025 0.5 71.7671 92.7549)"
- fill="#E6BC9F" />
- <rect width="20.1141" height="8.43723" rx="4.21861" transform="matrix(0.866025 0.5 -0.866025 0.5 125.39 134.488)"
- fill="#DA3635" />
- <path
- d="M120.211 133.595C120.479 130.246 128.116 129.138 131.095 132.016L140.554 141.158C141.877 142.437 141.526 144.071 139.701 145.125C137.417 146.444 133.684 146.385 131.527 144.998L124.26 140.325C121.464 138.527 120.005 136.166 120.198 133.752L120.211 133.595Z"
- fill="#A0C7F0" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M123.654 133.555L134.281 141.767C134.771 142.146 135.058 142.73 135.058 143.349V143.498C135.058 144.782 133.866 145.733 132.615 145.449L132.156 145.344C131.935 145.24 131.725 145.124 131.528 144.998L124.262 140.325C121.466 138.527 120.007 136.166 120.2 133.752L120.213 133.595C120.306 132.422 121.304 131.524 122.689 130.976C122.845 131.221 122.936 131.512 122.936 131.823V132.093C122.936 132.665 123.201 133.205 123.654 133.555Z"
- fill="white" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M140.39 141.009L140.544 141.159C141.868 142.438 141.517 144.072 139.692 145.126C137.408 146.445 133.675 146.387 131.517 144.999L130.218 144.163C130.66 143.429 131.456 142.974 132.322 142.974H133.835H137.316C138.177 142.974 138.988 142.568 139.504 141.88L139.715 141.599C139.899 141.353 140.13 141.154 140.39 141.009Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M135.837 139.757C134.968 140.364 134.146 141.098 133.661 141.583C133.424 141.82 133.04 141.82 132.804 141.583C132.567 141.346 132.567 140.963 132.804 140.726C133.328 140.201 134.204 139.419 135.143 138.764C135.612 138.436 136.11 138.13 136.597 137.905C137.075 137.684 137.59 137.518 138.081 137.518C138.416 137.518 138.687 137.789 138.687 138.124C138.687 138.459 138.416 138.73 138.081 138.73C137.844 138.73 137.516 138.816 137.106 139.006C136.705 139.191 136.271 139.454 135.837 139.757Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M134.384 134.823C134.533 135.122 134.412 135.486 134.113 135.636C134.042 135.671 133.895 135.807 133.709 136.148C133.535 136.466 133.37 136.884 133.222 137.352C132.927 138.287 132.721 139.344 132.623 140.028C132.576 140.36 132.269 140.59 131.937 140.543C131.606 140.495 131.376 140.188 131.423 139.857C131.527 139.127 131.746 138.002 132.067 136.987C132.227 136.481 132.418 135.982 132.645 135.567C132.859 135.174 133.156 134.759 133.57 134.552C133.87 134.402 134.234 134.523 134.384 134.823Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M131.977 135.419C133.431 135.622 134.922 136.027 135.857 136.338C136.175 136.444 136.347 136.787 136.241 137.105C136.135 137.423 135.792 137.594 135.474 137.488C134.591 137.194 133.173 136.81 131.809 136.62C131.127 136.524 130.476 136.48 129.923 136.513C129.355 136.546 128.96 136.657 128.729 136.811C128.45 136.997 128.074 136.922 127.888 136.643C127.703 136.365 127.778 135.989 128.056 135.803C128.552 135.472 129.203 135.341 129.851 135.302C130.514 135.263 131.25 135.317 131.977 135.419Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M129.737 134.107C128.867 134.593 128.046 135.18 127.562 135.567C127.301 135.776 126.919 135.733 126.71 135.472C126.501 135.211 126.543 134.829 126.805 134.62C127.331 134.199 128.208 133.573 129.146 133.049C130.054 132.542 131.134 132.063 132.032 132.063C132.367 132.063 132.638 132.334 132.638 132.669C132.638 133.004 132.367 133.275 132.032 133.275C131.476 133.275 130.637 133.604 129.737 134.107Z"
- fill="#769FCB" />
- <path
- d="M124.342 132.667C125.492 133.331 127.357 133.331 128.508 132.667C129.085 132.333 129.373 131.896 129.371 131.459L129.371 125.398L123.479 125.398L123.479 131.459C123.476 131.896 123.764 132.333 124.342 132.667Z"
- fill="#FFCCB7" />
- <path
- d="M124.342 130.123C125.492 130.788 127.357 130.788 128.508 130.123C129.085 129.79 129.373 129.352 129.371 128.915L129.371 122.854L123.479 122.854L123.479 128.915C123.476 129.352 123.764 129.79 124.342 130.123Z"
- fill="#EF937F" />
- <rect width="20.1141" height="8.43723" rx="4.21861" transform="matrix(0.866025 0.5 -0.866025 0.5 102.277 143.334)"
- fill="#DA3635" />
- <path
- d="M97.0977 142.442C97.3657 139.093 105.003 137.985 107.982 140.863L117.44 150.004C118.764 151.283 118.413 152.918 116.588 153.972C114.304 155.29 110.571 155.232 108.413 153.845L101.147 149.171C98.351 147.373 96.8921 145.012 97.0852 142.599L97.0977 142.442Z"
- fill="#A0C7F0" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M100.59 142.584L111.155 150.614C111.653 150.992 111.945 151.581 111.945 152.206V152.345C111.945 153.629 110.753 154.58 109.502 154.295L109.042 154.191C108.822 154.087 108.612 153.971 108.415 153.845L101.148 149.171C98.3526 147.373 96.8937 145.012 97.0868 142.599L97.0993 142.442C97.1932 141.269 98.191 140.371 99.576 139.823C99.7322 140.067 99.8227 140.358 99.8227 140.67V141.036C99.8227 141.643 100.107 142.216 100.59 142.584Z"
- fill="white" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M117.276 149.856L117.431 150.005C118.755 151.284 118.403 152.919 116.578 153.973C114.295 155.291 110.562 155.233 108.404 153.846L107.105 153.01C107.546 152.276 108.343 151.82 109.209 151.82H110.722H114.203C115.064 151.82 115.875 151.415 116.391 150.726L116.602 150.446C116.786 150.2 117.017 150.001 117.276 149.856Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M112.724 148.604C111.854 149.211 111.033 149.944 110.547 150.43C110.311 150.667 109.927 150.667 109.69 150.43C109.454 150.193 109.454 149.809 109.69 149.573C110.215 149.048 111.091 148.266 112.03 147.61C112.499 147.282 112.997 146.977 113.484 146.752C113.962 146.531 114.477 146.365 114.968 146.365C115.302 146.365 115.574 146.636 115.574 146.971C115.574 147.305 115.302 147.577 114.968 147.577C114.731 147.577 114.402 147.663 113.993 147.852C113.592 148.038 113.158 148.301 112.724 148.604Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M111.27 143.67C111.42 143.969 111.299 144.333 110.999 144.483C110.929 144.518 110.781 144.653 110.595 144.994C110.421 145.313 110.257 145.731 110.109 146.199C109.814 147.134 109.608 148.191 109.51 148.875C109.463 149.207 109.156 149.437 108.824 149.389C108.493 149.342 108.263 149.035 108.31 148.704C108.414 147.974 108.632 146.849 108.953 145.834C109.113 145.328 109.305 144.828 109.531 144.414C109.746 144.021 110.042 143.606 110.457 143.398C110.757 143.249 111.121 143.37 111.27 143.67Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M108.863 144.266C110.318 144.469 111.809 144.873 112.744 145.185C113.062 145.291 113.233 145.634 113.128 145.952C113.022 146.269 112.678 146.441 112.361 146.335C111.478 146.041 110.06 145.657 108.696 145.466C108.013 145.371 107.363 145.326 106.81 145.359C106.242 145.393 105.847 145.504 105.615 145.658C105.337 145.844 104.961 145.769 104.775 145.49C104.589 145.212 104.665 144.835 104.943 144.65C105.439 144.319 106.09 144.188 106.738 144.149C107.4 144.11 108.137 144.164 108.863 144.266Z"
- fill="#769FCB" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M106.624 142.954C105.753 143.44 104.933 144.026 104.449 144.413C104.187 144.622 103.806 144.58 103.597 144.319C103.388 144.057 103.43 143.676 103.692 143.467C104.218 143.046 105.094 142.42 106.032 141.896C106.941 141.388 108.021 140.909 108.919 140.909C109.254 140.909 109.525 141.181 109.525 141.516C109.525 141.85 109.254 142.122 108.919 142.122C108.362 142.122 107.524 142.451 106.624 142.954Z"
- fill="#769FCB" />
- <path
- d="M101.228 141.513C102.379 142.178 104.244 142.178 105.394 141.513C105.972 141.18 106.26 140.743 106.257 140.305L106.257 134.244L100.365 134.244L100.365 140.305C100.363 140.743 100.651 141.18 101.228 141.513Z"
- fill="#FFCCB7" />
- <path
- d="M101.228 138.97C102.379 139.634 104.244 139.634 105.394 138.97C105.972 138.637 106.26 138.199 106.257 137.762L106.257 131.701L100.365 131.701L100.365 137.762C100.363 138.199 100.651 138.637 101.228 138.97Z"
- fill="#EF937F" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M115.386 66C115.15 68.1745 113.594 70.3102 110.715 71.972C104.446 75.5916 94.2811 75.5916 88.0116 71.972C85.6055 70.5828 84.1228 68.8623 83.5635 67.0649C83.4456 67.5414 83.3911 68.0222 83.4001 68.5027L83.3794 68.5001L82.3385 86.0757C82.0156 91.5292 84.9156 96.884 90.562 101.26L99.9317 108.522C101.162 109.475 101.757 110.653 101.607 111.839L98.7226 134.642C98.6791 135.303 99.0943 135.972 99.9682 136.476C101.633 137.438 104.333 137.438 105.998 136.476C106.66 136.094 106.802 135.73 107.008 135.202C107.074 135.034 107.146 134.849 107.243 134.642L118.207 106.897C119.586 103.407 118.838 99.7476 116.087 96.5383L112.081 91.8636L124.126 99.3197C125.847 100.385 126.668 101.835 126.369 103.282L121.589 126.412C121.545 127.073 121.96 127.742 122.834 128.247C124.499 129.208 127.199 129.208 128.864 128.247C129.738 127.742 130.153 127.073 130.109 126.412L140.109 100.746C141.69 96.6882 140.518 92.4345 136.834 88.8601L115.921 68.5715C115.948 67.7072 115.77 66.8412 115.386 66Z"
- fill="#4C4D53" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M131.266 123.512C127.042 128.888 124.18 125.343 126.919 105.506C127.435 101.769 126.133 97.9763 123.319 95.4636L114.545 87.6291C114.149 87.2759 113.556 87.3071 113.13 87.6226C112.36 88.1921 111.594 88.3918 110.35 88.4619C109.447 88.5127 109.005 89.6039 109.661 90.2256L115.058 95.3378L119.003 98.1775C120.194 99.0347 120.857 100.096 120.887 101.195L121.161 111.022L121.34 111.5V117.464L121.588 126.412C121.545 127.073 121.96 127.742 122.834 128.247C124.499 129.208 127.198 129.208 128.863 128.247C129.737 127.742 130.153 127.073 130.109 126.412L131.266 123.512ZM107.795 130.88C104.6 130.986 102.43 123.263 104.387 107.084C104.877 103.029 103.303 98.9535 100.049 96.4832L82.4942 83.1542L82.3234 85.9835C82.0092 91.1869 84.6293 96.3086 89.7896 100.578L98.3496 107.661C99.4006 108.531 99.9401 109.572 99.8886 110.632L98.7223 134.642C98.6788 135.303 99.094 135.972 99.9679 136.477C101.633 137.438 104.332 137.438 105.997 136.477C106.871 135.972 107.287 135.303 107.243 134.642L107.795 130.88Z"
- fill="#333333" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M95.4665 27.3316C85.137 29.577 79.2296 38.3341 79.0057 47.3318H78.8398V64.5647C78.8398 68.5209 80.4809 72.0939 83.1194 74.6401L80.9907 77.9144L96.0867 87.7021C98.9098 89.5325 102.638 87.5062 102.638 84.1417C104.959 82.3429 104.812 78.7919 102.35 77.1914L102.036 76.987L113.341 70.4442C114.208 69.9421 114.889 69.2018 115.318 68.333L119.04 70.7526C121.279 72.2083 124.274 71.5732 125.73 69.334C126.862 67.5925 126.369 65.2628 124.627 64.1305L121.309 61.9733V43.1938L121.39 41.6535C121.856 32.7559 114.509 25.4154 105.612 25.8894L100.961 26.1372L95.4665 27.3316Z"
- fill="#FF9C9B" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M104.438 75.322L102.116 73.8122C99.5937 72.1724 97.9437 69.4842 97.6234 66.4929L95.5682 47.2992C95.5682 47.2987 95.5678 47.2984 95.5674 47.2983C95.5669 47.2983 95.5664 47.2987 95.5664 47.2993V67.3551C95.5664 70.7396 97.2783 73.8944 100.116 75.7391L102.347 77.1895C104.633 78.676 104.923 81.8451 103.093 83.7302C103.084 83.7398 103.075 83.7495 103.066 83.7594C104.93 81.8783 104.649 78.682 102.35 77.1872L101.951 76.9277L104.438 75.322ZM102.602 84.7058C102.596 84.7353 102.591 84.7648 102.587 84.7942C102.582 84.8239 102.578 84.8538 102.575 84.8838C102.585 84.825 102.594 84.7657 102.602 84.7058Z"
- fill="#DA3635" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M105.232 16.6523L95.8566 18.9655L96.2634 26.7943L96.0559 27.8022L94.9165 33.4102C94.4327 35.7913 95.6796 38.1129 97.7792 39.0899L97.9823 40.2209C98.5337 43.2923 101.471 45.3352 104.542 44.7837C107.613 44.2323 109.656 41.2954 109.105 38.224L106.765 25.1884L106.962 24.0477L106.538 23.9248L105.232 16.6523Z"
- fill="#DA3635" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M111.657 5.34717L94.5839 8.41241L96.5731 19.4921L92.5352 19.6622L95.9965 25.4067L95.4724 28.4327C94.9812 31.269 96.8823 33.9666 99.7187 34.4579C101.101 34.6973 102.45 34.3685 103.527 33.6402C104.911 34.1386 106.44 34.2913 107.992 34.0128C112.707 33.1663 115.842 28.6581 114.996 23.9434L111.657 5.34717Z"
- fill="#FFD2C4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M112.234 31.9478C111.16 32.7029 109.908 33.2416 108.531 33.4888C103.477 34.3963 98.6435 31.0344 97.736 25.9798L96.7254 20.3506C96.637 19.8584 96.1987 19.5072 95.6991 19.5282L94.3787 19.5839C93.887 19.6046 93.4835 19.9799 93.4273 20.4688L93.4011 20.6972C93.3758 20.9166 93.424 21.1382 93.538 21.3275L95.2216 24.1217C95.2824 24.2225 95.3605 24.3117 95.4524 24.3852L96.0177 24.8373C96.1824 24.9689 96.425 24.9273 96.5364 24.7483C96.7066 24.4747 97.1246 24.5548 97.1815 24.872L97.9228 29.0009C98.3084 31.1487 99.4539 32.9688 101.033 34.2341C101.236 34.3972 101.502 34.4645 101.756 34.4069C102.226 34.3006 102.675 34.13 103.092 33.9034C103.373 33.751 103.703 33.7072 104.009 33.7976C105.262 34.1674 106.618 34.2587 107.991 34.0121C109.63 33.718 111.077 32.9815 112.234 31.9478Z"
- fill="#EF937F" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M115.014 20.4058H113.153C110.869 20.4058 108.878 18.8513 108.325 16.6355L108.156 15.9608C107.627 13.8454 105.572 12.4823 103.418 12.8175L102.632 12.9397C100.605 13.2551 99.2853 15.2437 99.783 17.2348C100.022 18.1887 99.8465 19.199 99.3011 20.0172L97.1916 23.1814C96.9634 23.5237 96.5447 23.6855 96.1456 23.5858L94.5041 23.1754C92.4758 20.9266 91.2383 17.9309 91.2383 14.6419C91.2383 7.65997 96.815 2 103.694 2C109.467 2 114.323 5.98577 115.735 11.3938C117.3 12.1715 118.382 13.8333 118.382 15.7577C118.382 17.9656 116.958 19.8278 115.014 20.4058Z"
- fill="#333333" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M122.17 71.5074L123.521 67.5586L121.509 67.4367C119.68 67.3259 118.2 65.9074 118.012 64.0846C117.993 63.9011 118.069 63.7208 118.215 63.6075L118.549 63.3473C119.004 62.9934 118.891 62.2775 118.35 62.0806C118.06 61.9753 117.867 61.7001 117.867 61.392V41.4189C117.867 39.8103 116.563 38.5063 114.955 38.5063C114.832 38.5063 114.736 38.6116 114.748 38.7336L115.621 48.1404C115.765 49.692 115.544 51.2558 114.977 52.707L114.864 52.9953C114.773 53.2274 114.727 53.4745 114.727 53.7237V57.6547C114.727 57.8832 114.766 58.11 114.842 58.3253L115.373 59.8179C116.002 61.584 116.063 63.5023 115.549 65.305L115.094 66.8994C114.964 67.3531 115.002 67.8262 115.181 68.2415L119.041 70.751C120.005 71.3776 121.109 71.6168 122.17 71.5074Z"
- fill="#DA3635" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M102.352 85.7497L102.344 85.6175L88.6759 76.3234C87.8045 75.7308 87.9439 74.4066 88.9195 74.0084C90.1944 73.488 89.9219 71.6083 88.5518 71.4713L85.7012 71.1862C84.6538 71.0815 83.8668 70.1827 83.9013 69.1306L84.799 41.7507C84.8249 40.9592 84.4942 40.1978 83.8979 39.6767C82.2844 38.2664 79.7516 39.265 79.5346 41.3969L78.8672 47.9546V73.5629C78.8672 75.3113 79.7646 76.8501 81.124 77.7438L81.0142 77.9126L96.1102 87.7003C98.4459 89.2147 101.402 88.0891 102.352 85.7497Z"
- fill="#DA3635" />
- <ellipse cx="96.4787" cy="21.4493" rx="1.92787" ry="3.08459" fill="#FFD2C4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M98.027 21.7513C98.0457 21.611 98.0556 21.4653 98.0556 21.3159C98.0556 20.1884 97.4931 19.2744 96.7993 19.2744C96.1054 19.2744 95.543 20.1884 95.543 21.3159C95.543 22.0656 95.7917 22.721 96.1623 23.0759C95.971 22.7728 95.8552 22.3772 95.8552 21.9443C95.8552 20.9903 96.4177 20.2169 97.1115 20.2169C97.3609 20.2169 97.3982 20.5724 97.4377 20.9491C97.464 21.1997 97.4913 21.4596 97.5827 21.6302C97.6541 21.7637 97.8295 21.7578 97.9964 21.7523C98.0066 21.7519 98.0168 21.7516 98.027 21.7513Z"
- fill="#EF937F" />
- <ellipse cx="105.301" cy="23.4348" rx="0.765209" ry="1.33954" transform="rotate(2.6285 105.301 23.4348)"
- fill="#333333" />
- <ellipse cx="112.703" cy="22.2175" rx="0.765209" ry="1.33912" transform="rotate(2.6285 112.703 22.2175)"
- fill="#333333" />
- <path d="M103.805 22.9914C104.57 22.5036 105.553 21.9842 106.889 22.3353" stroke="#333333" stroke-linecap="round" />
- <path d="M112.285 20.6782C112.574 20.6782 113.106 20.6782 113.827 20.6782" stroke="#333333" stroke-linecap="round" />
- <ellipse cx="110.34" cy="27" rx="1.5" ry="1" fill="#EF937F" />
- <path d="M108.43 29.5752C108.858 29.9202 109.921 30.3204 110.743 29.1611" stroke="#333333" stroke-linecap="round" />
- <path
- d="M110.812 87.8705C109.744 87.2148 109.15 86.3488 109.15 85.449L109.15 84.587L129.953 73.2443C132.272 71.9795 135.885 71.955 138.256 73.1878L150.851 79.7381L150.851 80.8974C150.851 81.8127 150.236 82.6923 149.136 83.3513L128.685 95.5987C127.227 96.4716 124.801 96.4628 123.363 95.5793L110.812 87.8705Z"
- fill="#989898" />
- <rect width="30.8472" height="21.5482" rx="3" transform="matrix(0.866025 -0.5 0.866025 0.5 107.345 84.5134)"
- fill="#C5C5C5" />
- <rect width="25.3527" height="19.5019" rx="3" transform="matrix(0.866025 -0.5 0.866025 0.5 112.185 82.7427)"
- fill="#444444" />
- <rect width="1.94964" height="3.61134" rx="0.974821" transform="matrix(0.866025 -0.5 0.866025 0.5 115.936 88.1482)"
- fill="#818181" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M114.784 81.2417C113.349 82.0701 113.349 83.4133 114.784 84.2417L115.455 84.629L135.621 88.7133L141.033 85.5888L117.971 79.4015L114.784 81.2417ZM122.658 76.6956L144.185 83.7688L146.341 82.5241L126.448 74.5075L122.658 76.6956ZM128.752 73.177L148.139 81.4858L148.433 81.3163C148.65 81.1907 148.835 81.0533 148.987 80.9077L130.967 71.8981L128.752 73.177Z"
- fill="#656565" />
- <path
- d="M122.381 67.6153C120.929 69.5596 120.723 71.86 121.919 72.7533L123.623 74.4953L128.549 69.1283L127.176 65.7122C125.979 64.8189 123.833 65.6709 122.381 67.6153Z"
- fill="#A0C7F1" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M122.405 72.5504L122.331 71.8357C122.223 70.7934 122.57 69.7552 123.283 68.9873C124.094 68.1139 125.282 67.6934 126.462 67.862L127.092 67.9519C127.974 68.0779 128.756 68.5855 129.23 69.3399L130.432 71.2524C131.623 73.1475 131.089 75.6467 129.226 76.8884L129.06 76.9757L129.801 79.9403C129.899 80.3321 130.251 80.6069 130.655 80.6069C130.789 80.6069 130.897 80.7154 130.897 80.8494V81.3349C130.897 81.6515 130.641 81.9082 130.324 81.9082C129.536 81.9082 128.816 81.463 128.463 80.7582L127.09 78.0124L126.833 78.1479C126.16 78.5022 125.333 78.364 124.811 77.81C123.454 76.3681 122.609 74.52 122.405 72.5504Z"
- fill="#FFD2C4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M122.331 71.8359L122.405 72.5506C122.609 74.5202 123.455 76.3683 124.812 77.8102C125.333 78.3642 126.16 78.5024 126.833 78.1481L127.091 78.0126L127.755 79.3412L127.764 79.3352L126.212 76.2324C125.891 75.5901 125.408 75.0427 124.81 74.6443C123.908 74.043 123.367 73.0307 123.367 71.9466V68.901C123.339 68.9294 123.311 68.9582 123.284 68.9875C122.571 69.7554 122.224 70.7936 122.331 71.8359ZM130.017 76.2031L127.922 73.368L129.115 76.9473L129.226 76.8886C129.524 76.6898 129.789 76.4587 130.017 76.2031Z"
- fill="#EF937F" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M104.046 90.1728L102.077 88.0438L103.936 82.4665L106.167 81.1652L108.584 82.2806C109.947 82.5285 112.86 83.2474 113.603 84.1397C114.193 84.8474 115.83 84.8816 117.043 84.907C117.743 84.9216 118.301 84.9333 118.437 85.0693C118.809 85.4411 118.437 86.3706 117.136 86.5566C116.529 86.6432 115.802 86.4877 115.085 86.3345C114.264 86.1588 113.456 85.9861 112.86 86.1847C111.744 86.5566 111.93 87.8579 112.86 88.4157C113.789 88.9734 116.764 90.8325 117.322 91.3902C117.879 91.948 117.693 92.6916 117.322 93.0634C117.056 93.3289 115.559 92.8362 113.506 91.5853C111.358 92.7231 108.734 92.7582 106.512 91.5617L104.123 90.2752C104.097 90.2411 104.072 90.2069 104.047 90.1728L104.046 90.1728Z"
- fill="#FFD2C4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M102.078 88.0445L104.047 90.1735L104.047 90.1735C104.072 90.2076 104.098 90.2417 104.124 90.2758L106.513 91.5623C108.73 92.7563 111.348 92.7239 113.493 91.5931L112.308 91.0008L109.923 90.6338C107.312 90.2322 105.01 88.7045 103.626 86.4553L102.965 85.3813L102.078 88.0445ZM114.264 92.0281L114.308 92.0008L113.64 91.6665C113.854 91.7955 114.063 91.9161 114.264 92.0281Z"
- fill="#EF937F" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M102.485 89.417C100.926 88.8989 100.345 86.4253 101.187 83.8919C102.028 81.3586 103.975 79.7248 105.534 80.2428L108.028 81.9076L108.01 81.9572C107.89 81.8819 107.762 81.821 107.625 81.7757C106.137 81.2813 104.277 82.8477 103.471 85.2745C102.763 87.4057 103.103 89.4917 104.204 90.3031L102.485 89.417ZM104.717 90.5679L104.868 90.6454L104.88 90.6122C104.825 90.6 104.771 90.5853 104.717 90.5679Z"
- fill="#A0C7F1" />
- <path
- d="M109.973 22.2202V22.2202C110.105 23.19 110.586 24.0785 111.325 24.7202L111.869 25.1929C112.489 25.7314 112.474 26.6989 111.837 27.2172L111.344 27.6182"
- stroke="#333333" stroke-linecap="round" />
- <defs>
- <linearGradient id="paint0_linear_14421_60386" x1="86.6776" y1="54.5845" x2="23.1101" y2="137.189"
- gradientUnits="userSpaceOnUse">
- <stop stop-color="white" />
- <stop offset="1" stop-color="#D9EDFF" />
- </linearGradient>
- </defs>
-</svg>
\ No newline at end of file
diff --git a/src/assets/form/redirection.svg b/src/assets/form/redirection.svg
deleted file mode 100644
index 04d570cc35be7417a64dd928478f541c09738370..0000000000000000000000000000000000000000
--- a/src/assets/form/redirection.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.46967 12.1367C9.17678 12.4296 9.17678 12.9044 9.46967 13.1973C9.76256 13.4902 10.2374 13.4902 10.5303 13.1973L9.46967 12.1367ZM16.8943 6.83336C17.1872 6.54047 17.1872 6.0656 16.8943 5.7727C16.6014 5.47981 16.1265 5.47981 15.8336 5.7727L16.8943 6.83336ZM10.5303 13.1973L16.8943 6.83336L15.8336 5.7727L9.46967 12.1367L10.5303 13.1973Z" fill="#FF7100"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8887 3.82812L19.192 3.47457L18.8384 8.77787L13.8887 3.82812Z" fill="#FF7100"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 6.75C5.86193 6.75 5.75 6.86193 5.75 7V16C5.75 16.1381 5.86193 16.25 6 16.25H16C16.1381 16.25 16.25 16.1381 16.25 16V11.5L17.75 10.2308V16C17.75 16.9665 16.9665 17.75 16 17.75H6C5.0335 17.75 4.25 16.9665 4.25 16V7C4.25 6.0335 5.0335 5.25 6 5.25H12.7143L11 6.75H6Z" fill="#FF7100"/>
-</svg>
diff --git a/src/assets/form/schedule.svg b/src/assets/form/schedule.svg
deleted file mode 100644
index d1c8acb01a20d3ced6cf79cf0a871b96378f6ae8..0000000000000000000000000000000000000000
--- a/src/assets/form/schedule.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="89.5" cy="89.5" r="67.2273" fill="#EAF8FB" stroke="#348899" stroke-width="12"/>
-<path opacity="0.35" d="M91.5 40C91.5 38.8954 90.6046 38 89.5 38C88.3954 38 87.5 38.8954 87.5 40H91.5ZM89.5 89.5H87.5C87.5 90.1511 87.817 90.7615 88.3496 91.1361L89.5 89.5ZM120.35 113.636C121.253 114.271 122.501 114.054 123.136 113.15C123.771 112.247 123.554 110.999 122.65 110.364L120.35 113.636ZM87.5 40V89.5H91.5V40H87.5ZM88.3496 91.1361L120.35 113.636L122.65 110.364L90.6504 87.8639L88.3496 91.1361Z" fill="#348899"/>
-<path d="M62.9482 109V81.1562L55.0908 85.876V79.2842C60.1357 76.8408 64.126 73.8174 67.0615 70.2139H69.8037V109H62.9482ZM83.9365 106.073L86.6523 100.431C89.4473 102.61 91.8467 103.7 93.8506 103.7C98.2803 103.7 100.495 100.976 100.495 95.5264C100.495 92.9072 99.9941 91 98.9922 89.8047C97.9902 88.5918 96.3115 87.9854 93.9561 87.9854C91.8291 87.9854 89.7549 89.0312 87.7334 91.123L85.0176 89.3564V70.2139H105.821V76.041H91.6094V82.9492C92.7695 82.4219 94.1582 82.1582 95.7754 82.1582C99.5723 82.1582 102.49 83.2568 104.529 85.4541C106.586 87.6514 107.614 90.7627 107.614 94.7881C107.614 104.614 103.035 109.527 93.877 109.527C90.0801 109.527 86.7666 108.376 83.9365 106.073ZM124.146 69.1855L126.335 72.1123C124.7 73.3604 123.698 74.2832 123.329 74.8809C122.96 75.4785 122.775 76.1113 122.775 76.7793C122.775 77.4824 123.206 78.2646 124.067 79.126C124.929 79.9873 125.359 80.9102 125.359 81.8945C125.359 84.7422 123.953 86.166 121.141 86.166C119.717 86.166 118.609 85.709 117.818 84.7949C117.045 83.8809 116.658 82.6504 116.658 81.1035C116.658 76.252 119.154 72.2793 124.146 69.1855Z" fill="#DC2A59"/>
-</svg>
diff --git a/src/assets/form/sprite.svg b/src/assets/form/sprite.svg
index ff0953c174f2fa399aae9ee5e304f8e820452596..6fdd9ecd89cad31e28ccd024a4463d223e8e8c27 100644
--- a/src/assets/form/sprite.svg
+++ b/src/assets/form/sprite.svg
@@ -1,22 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg">
- <symbol id="checkVectorFull" width="24" height="24" viewBox="0 0 24 24" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="10" fill="#47C562" />
- <path d="M7 12.8182L10.8889 16L17 9" stroke="white" stroke-width="3" stroke-linecap="round"
- stroke-linejoin="round" />
- </symbol>
-
- <symbol id="checkVectorSquareEmpty" width="24" height="24" viewBox="0 0 24 24" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <rect x="3.5" y="3.5" width="17" height="17" rx="3.5" fill="white" stroke="#696969" />
- </symbol>
-
- <symbol id="checkVectorSquareFull" width="24" height="24" viewBox="0 0 24 24" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <rect x="3" y="3" width="18" height="18" rx="4" fill="#333333" />
- <path d="M7 12.8182L10.8889 16L17 9" stroke="white" stroke-width="2" stroke-linecap="round"
- stroke-linejoin="round" />
- </symbol>
<symbol id="accesLibre" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="44" height="44" rx="22" fill="#FFE5E4" />
@@ -41,65 +23,6 @@
fill="#CD2524" />
</symbol>
- <symbol id="twitter" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M18.1818 6.43077C17.7682 7.04615 17.2807 7.56923 16.7193 8V8.36923C16.7193 9.75385 16.4091 11.0923 15.7886 12.3846C15.1977 13.6769 14.2523 14.7692 12.9523 15.6615C11.6523 16.5538 10.1602 17 8.47614 17C6.85114 17 5.35909 16.5385 4 15.6154C4.20682 15.6462 4.44318 15.6615 4.70909 15.6615C6.03864 15.6615 7.23523 15.2308 8.29886 14.3692C7.67841 14.3692 7.11705 14.1846 6.61477 13.8154C6.1125 13.4154 5.77273 12.9077 5.59545 12.2923C6.06818 12.3538 6.51136 12.3385 6.925 12.2462C6.24545 12.0923 5.68409 11.7385 5.24091 11.1846C4.79773 10.6308 4.57614 9.98462 4.57614 9.24615V9.2C4.98977 9.44615 5.43295 9.58462 5.90568 9.61539C5.66932 9.43077 5.44773 9.2 5.24091 8.92308C5.03409 8.64615 4.87159 8.35385 4.75341 8.04615C4.63523 7.70769 4.57614 7.38462 4.57614 7.07692C4.57614 6.52308 4.70909 6.01539 4.975 5.55385C6.54091 7.52308 8.55 8.58462 11.0023 8.73846C10.7955 7.72308 10.9875 6.84615 11.5784 6.10769C12.1693 5.36923 12.9227 5 13.8386 5C14.6659 5 15.3602 5.32308 15.9216 5.96923C16.5716 5.84615 17.192 5.6 17.783 5.23077C17.5466 5.93846 17.1182 6.49231 16.4977 6.89231C17.0591 6.83077 17.6205 6.67692 18.1818 6.43077Z"
- fill="#696969" />
- </symbol>
-
-
- <symbol id="facebook" width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M9.37737 18.1509H12.3208V12.4151H14.5094L14.9245 9.69811H12.3208V7.92453C12.3208 6.96855 12.8239 6.49056 13.8302 6.49056H15V4.18868C14.2956 4.06289 13.6038 4 12.9245 4C12.195 4 11.5661 4.13836 11.0377 4.41509C10.5346 4.69182 10.1321 5.10692 9.8302 5.66037C9.52832 6.21383 9.37737 6.86792 9.37737 7.62264V9.69811H7.00001V12.4151H9.37737V18.1509Z"
- fill="#696969" />
- </symbol>
-
- <symbol id="linkedin" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M7.925 17H7.88437H5.20312V8.30625H7.925V17ZM6.54375 7.12812C6.11042 7.12812 5.74479 6.97917 5.44687 6.68125C5.14896 6.35625 5 5.99062 5 5.58437C5 5.15104 5.14896 4.78542 5.44687 4.4875C5.74479 4.1625 6.11042 4 6.54375 4C6.97708 4 7.34271 4.1625 7.64062 4.4875C7.96562 4.78542 8.12812 5.15104 8.12812 5.58437C8.12812 5.99062 7.96562 6.35625 7.64062 6.68125C7.34271 6.97917 6.97708 7.12812 6.54375 7.12812ZM18 12.2469V17H15.3187V12.775C15.3187 12.45 15.3052 12.1927 15.2781 12.0031C15.251 11.7865 15.1969 11.5427 15.1156 11.2719C15.0615 11.001 14.926 10.7979 14.7094 10.6625C14.4927 10.5271 14.2219 10.4594 13.8969 10.4594C13.274 10.4594 12.8542 10.6625 12.6375 11.0687C12.4208 11.475 12.3125 12.0167 12.3125 12.6937V17H9.59062V8.30625H12.1906V9.48437H12.2312C12.4208 9.10521 12.7323 8.78021 13.1656 8.50937C13.626 8.23854 14.1677 8.10312 14.7906 8.10312C15.4406 8.10312 15.9823 8.21146 16.4156 8.42812C16.876 8.61771 17.2146 8.91562 17.4312 9.32187C17.6479 9.70104 17.7969 10.1208 17.8781 10.5812C17.9594 11.0417 18 11.5969 18 12.2469Z"
- fill="#696969" />
- </symbol>
-
- <svg id="instagram" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M11 6.89286C9.85714 6.89286 8.88095 7.29764 8.07143 8.10714C7.28571 8.89286 6.89286 9.85714 6.89286 11C6.89286 12.1429 7.28571 13.1191 8.07143 13.9286C8.88095 14.7143 9.85714 15.1071 11 15.1071C12.1429 15.1071 13.1071 14.7143 13.8929 13.9286C14.7024 13.1191 15.1071 12.1429 15.1071 11C15.1071 9.85714 14.7024 8.89286 13.8929 8.10714C13.1071 7.29764 12.1429 6.89286 11 6.89286ZM11 13.6786C10.2619 13.6786 9.63095 13.4166 9.10714 12.8929C8.58334 12.3691 8.32143 11.7381 8.32143 11C8.32143 10.2619 8.58334 9.63093 9.10714 9.10714C9.63095 8.58335 10.2619 8.32143 11 8.32143C11.7381 8.32143 12.3691 8.58335 12.8929 9.10714C13.4167 9.63093 13.6786 10.2619 13.6786 11C13.6786 11.7381 13.4167 12.3691 12.8929 12.8929C12.3691 13.4166 11.7381 13.6786 11 13.6786Z"
- fill="#696969" />
- <path
- d="M16.2143 6.71429C16.2143 6.45236 16.1191 6.23808 15.9286 6.07143C15.7619 5.88093 15.5476 5.78571 15.2857 5.78571C15.0238 5.78571 14.7976 5.88093 14.6071 6.07143C14.4167 6.23808 14.3214 6.45236 14.3214 6.71429C14.3214 6.97621 14.4167 7.20236 14.6071 7.39286C14.7976 7.58335 15.0238 7.67857 15.2857 7.67857C15.5476 7.67857 15.7619 7.58335 15.9286 7.39286C16.1191 7.20236 16.2143 6.97621 16.2143 6.71429Z"
- fill="#696969" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M18.9643 7.71429C18.9881 8.35714 19 9.45236 19 11C19 12.5476 18.9881 13.6429 18.9643 14.2857C18.8929 15.7381 18.4524 16.8691 17.6429 17.6786C16.8571 18.4643 15.7381 18.8809 14.2857 18.9286C13.6429 18.9762 12.5476 19 11 19C9.45238 19 8.35714 18.9762 7.71429 18.9286C6.26191 18.8571 5.14286 18.4286 4.35714 17.6429C4.04762 17.3571 3.79762 17.0238 3.60714 16.6429C3.41666 16.2619 3.2738 15.8929 3.17857 15.5357C3.10714 15.1786 3.07143 14.7619 3.07143 14.2857C3.0238 13.6429 3 12.5476 3 11C3 9.45236 3.0238 8.34522 3.07143 7.67857C3.14286 6.25 3.57143 5.14286 4.35714 4.35714C5.14286 3.54764 6.26191 3.10714 7.71429 3.03571C8.35714 3.01192 9.45238 3 11 3C12.5476 3 13.6429 3.01192 14.2857 3.03571C15.7381 3.10714 16.8571 3.54764 17.6429 4.35714C18.4524 5.14286 18.8929 6.26192 18.9643 7.71429ZM17.4286 15C17.3809 15.2857 17.3214 15.5238 17.25 15.7143C16.9643 16.4286 16.4524 16.9405 15.7143 17.25C15.5238 17.3214 15.2738 17.3809 14.9643 17.4286C14.6786 17.4762 14.3214 17.5119 13.8929 17.5357C13.4881 17.5595 13.1548 17.5714 12.8929 17.5714H9.07143C8.83334 17.5714 8.5 17.5595 8.07143 17.5357C7.66666 17.5119 7.30952 17.4762 7 17.4286C6.71429 17.3809 6.4762 17.3214 6.28571 17.25C5.57143 16.9643 5.05952 16.4524 4.75 15.7143C4.70238 15.5476 4.65477 15.3334 4.60714 15.0714C4.55952 14.8095 4.5238 14.5595 4.5 14.3214C4.4762 14.0595 4.45238 13.75 4.42857 13.3929V9.10714C4.42857 8.84522 4.44048 8.51192 4.46429 8.10714C4.48809 7.67857 4.5238 7.32143 4.57143 7.03571C4.61905 6.72621 4.67857 6.47621 4.75 6.28571C5.03571 5.54764 5.54762 5.03571 6.28571 4.75C6.4762 4.67857 6.71429 4.61907 7 4.57143C7.30952 4.52379 7.66666 4.48808 8.07143 4.46429C8.5 4.4405 8.84523 4.42857 9.10714 4.42857H12.8929C13.1548 4.42857 13.4881 4.4405 13.8929 4.46429C14.3214 4.48808 14.6786 4.52379 14.9643 4.57143C15.2738 4.61907 15.5238 4.67857 15.7143 4.75C16.4524 5.03571 16.9643 5.54764 17.25 6.28571C17.3214 6.47621 17.3809 6.72621 17.4286 7.03571C17.4762 7.32143 17.5119 7.67857 17.5357 8.10714C17.5595 8.51192 17.5714 8.84522 17.5714 9.10714V12.8929C17.5714 13.1548 17.5595 13.5 17.5357 13.9286C17.5119 14.3334 17.4762 14.6905 17.4286 15Z"
- fill="#696969" />
- </svg>
-
-
- <symbol id="show" viewBox="0 0 24 25" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M12 5.5C11.4477 5.5 11 5.94772 11 6.5V11.5H6C5.44772 11.5 5 11.9477 5 12.5C5 13.0523 5.44772 13.5 6 13.5H11V18.5C11 19.0523 11.4477 19.5 12 19.5C12.5523 19.5 13 19.0523 13 18.5V13.5H18C18.5523 13.5 19 13.0523 19 12.5C19 11.9477 18.5523 11.5 18 11.5H13V6.5C13 5.94772 12.5523 5.5 12 5.5Z"
- stroke="none" />
- </symbol>
-
- <symbol id="hide" viewBox="0 0 24 25" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M6 11.5C5.44772 11.5 5 11.9477 5 12.5C5 13.0523 5.44772 13.5 6 13.5C13.0974 13.5 10.2809 13.5 18 13.5C18.5523 13.5 19 13.0523 19 12.5C19 11.9477 18.5523 11.5 18 11.5C10.9004 11.5 13.7065 11.5 6 11.5Z"
- stroke="none" />
- </symbol>
-
- <symbol id="plus" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M16 9.63623L16 22.3642" stroke="none" stroke-width="1.5" stroke-linecap="round" />
- <path d="M22.3633 16L9.63536 16" stroke="none" stroke-width="1.5" stroke-linecap="round" />
- </symbol>
-
- <symbol id="minus" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M21.5 16L10.5 16" stroke="#333333" stroke-width="1.5" stroke-linecap="round" />
- </symbol>
- <symbol id="fold" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M6 16L12.5 9L19 16" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
- </symbol>
-
- <symbol id="unfold" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M6 10L12.5 17L19 10" stroke="black" stroke-linecap="round" stroke-linejoin="round" />
- </symbol>
<symbol id="conseillerNumFranceServices" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="4" fill="#333333" />
@@ -132,8 +55,8 @@
- <symbol id="accesLivresInformatiques" width="44" height="44" fill="none" stroke="none"
- xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 44">
+ <symbol id="accesLivresInformatiques" fill="none" stroke="none" xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 44 44">
<path d="M7 10h30v17a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2V10Z" fill="#fff" />
<rect x="6.25" y="9.25" width="31.5" height="20.5" rx="2.75" stroke="#333" stroke-width="1.5" />
<path d="M6 27a2 2 0 0 0 2 2h28a2 2 0 0 0 2-2H6Z" fill="#333" />
@@ -153,15 +76,7 @@
<rect x="23.594" y="20.318" width="4.686" height=".795" rx=".398" fill="#DA3635" />
</symbol>
- <symbol id="print" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect x="10" y="8" width="12" height="5" stroke-width="2" fill="none" />
- <rect x="10" y="17" width="12" height="8" stroke-width="2" fill="none" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M6 12C5.44772 12 5 12.4477 5 13V21H9V17H23V21H27V13C27 12.4477 26.5523 12 26 12H6Z" />
- </symbol>
-
- <symbol id="donDeMateriels" width="44" height="44" viewBox="0 0 44 44" fill="none" stroke="none"
- xmlns="http://www.w3.org/2000/svg">
+ <symbol id="donDeMateriels" viewBox="0 0 44 44" fill="none" stroke="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M21.2492 15.1816H11.0902C10.3371 15.1816 9.72656 15.7922 9.72656 16.5453V20.6362L21.2492 20.6362V15.1816ZM9.72656 21.9998V30.1816C9.72656 30.9348 10.3371 31.5453 11.0902 31.5453H19.272H21.2492V21.9998H9.72656ZM22.7492 31.5453H24.7266H32.9084C33.6615 31.5453 34.272 30.9348 34.272 30.1816V21.9998H22.7492V31.5453ZM34.272 20.6362L22.7492 20.6362V15.1816H32.9084C33.6615 15.1816 34.272 15.7922 34.272 16.5453V20.6362Z"
fill="#333333" />
@@ -177,7 +92,7 @@
fill="#333333" />
</symbol>
- <symbol id="reconditionnementsDeMateriel" width="44" height="44" viewBox="0 0 44 44" fill="none" stroke="none"
+ <symbol id="reconditionnementsDeMateriel" viewBox="0 0 44 44" fill="none" stroke="none"
xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M30.6441 10.0705C29.1883 9.68168 27.5706 10.0583 26.4285 11.2004C25.2864 12.3425 24.9098 13.9602 25.2985 15.416L21.8192 18.8954L24.9047 21.9809L28.3841 18.5015C29.8399 18.8903 31.4575 18.5136 32.5996 17.3716C33.7417 16.2295 34.1184 14.6118 33.7296 13.1561L31.5712 15.3145L28.9999 14.8002L28.4856 12.2289L30.6441 10.0705ZM22.8477 24.0379L19.7621 20.9524L15.2163 25.4982C13.7605 25.1095 12.1428 25.4861 11.0007 26.6282C9.85863 27.7703 9.48197 29.388 9.87077 30.8438L12.0294 28.6852L14.6007 29.1995L15.1149 31.7708L12.9564 33.9293C14.4121 34.3181 16.0298 33.9414 17.1718 32.7993C18.3139 31.6572 18.6906 30.0396 18.3018 28.5838L22.8477 24.0379Z"
@@ -189,63 +104,12 @@
fill="#DA3635" />
</symbol>
- <symbol id="profileSkip" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M139.5 140C139.5 140.828 140.172 141.5 141 141.5C141.828 141.5 142.5 140.828 142.5 140H139.5ZM26 140H24.5C24.5 140.828 25.1716 141.5 26 141.5V140ZM83.5 87L83.5 85.5L83.5 87ZM103.426 88.0228L103.262 89.5139L103.426 88.0228ZM63.5739 88.0223L63.7373 89.5133L63.5739 88.0223ZM103.426 141.5C104.254 141.5 104.926 140.828 104.926 140C104.926 139.172 104.254 138.5 103.426 138.5V141.5ZM63.7373 89.5133C69.4973 88.882 76.0577 88.4999 83.5 88.5L83.5 85.5C75.9551 85.4999 69.2853 85.8873 63.4105 86.5312L63.7373 89.5133ZM83.5 88.5C90.9421 88.5001 97.5024 88.8825 103.262 89.5139L103.589 86.5318C97.7145 85.8878 91.0448 85.5001 83.5 85.5L83.5 88.5ZM142.5 140C142.5 127.036 139.391 114.431 132.967 104.67C126.52 94.8734 116.745 87.9739 103.589 86.5318L103.262 89.5139C115.443 90.8492 124.456 97.1942 130.461 106.32C136.49 115.481 139.5 127.476 139.5 140H142.5ZM27.5 140C27.5 127.476 30.5094 115.481 36.5387 106.319C42.5441 97.1935 51.5563 90.8484 63.7373 89.5133L63.4105 86.5312C50.2549 87.9731 40.4801 94.8727 34.0327 104.67C27.6093 114.43 24.5 127.036 24.5 140H27.5ZM103.426 138.5H26V141.5H103.426V138.5Z"
- fill="#DA3635" />
- <circle cx="84.0416" cy="63.4879" r="30.9879" fill="white" stroke="#DA3635" stroke-width="3"
- stroke-linejoin="round" />
- <rect width="14.5252" height="61.023" transform="matrix(0.762691 0.646763 -0.646759 0.762694 146.689 79.541)"
- fill="#348899" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
- <path
- d="M157.768 88.9352C155.529 87.0368 150.344 82.6393 146.69 79.541C149.688 76.0059 154.598 75.2431 157.657 77.8373C160.716 80.4314 160.766 85.4002 157.768 88.9352Z"
- fill="#83B6C1" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
- <path
- d="M105.675 141.994C104.089 142.813 102.307 141.301 102.855 139.602L107.22 126.081L118.301 135.478L105.675 141.994Z"
- fill="#83B6C1" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
- </symbol>
-
- <symbol id="eyePassword" viewBox="0 0 22 16" xmlns="http://www.w3.org/2000/svg">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M7.99519 3.00001C8.83101 2.37183 9.87111 2 11 2C13.7667 2 16 4.23333 16 7C16 9.76667 13.7667 12 11 12C8.23333 12 6 9.76667 6 7C6 6.5747 6.05278 6.162 6.15215 5.76809C6.45257 6.49223 7.16566 7 8 7C9.10667 7 10 6.10667 10 5C10 3.89333 9.10667 3 8 3C7.9984 3 7.9968 3 7.99519 3.00001Z"
- stroke="none" />
- <path d="M1 8C2.57273 3.90267 6.45455 1 11 1C15.5455 1 19.4273 3.90267 21 8" fill="none" stroke-width="1.5"
- stroke-linecap="round" />
- <path d="M1 8C2.57273 12.0973 6.45455 15 11 15C15.5455 15 19.4273 12.0973 21 8" fill="none" stroke-width="1.5"
- stroke-linecap="round" />
- </symbol>
-
- <symbol id="eyePasswordInvisible" width="32" height="32" viewBox="0 0 32 32" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <path d="M6 14C7.57273 18.0973 11.4545 21 16 21C20.5455 21 24.4273 18.0973 26 14" stroke="#696969"
- stroke-width="1.5" stroke-linecap="round" />
- </symbol>
-
- <symbol id="eyePasswordVisible" width="32" height="32" viewBox="0 0 32 32" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M12.9952 11C13.831 10.3718 14.8711 10 16 10C18.7667 10 21 12.2333 21 15C21 17.7667 18.7667 20 16 20C13.2333 20 11 17.7667 11 15C11 14.5747 11.0528 14.162 11.1522 13.7681C11.4526 14.4922 12.1657 15 13 15C14.1067 15 15 14.1067 15 13C15 11.8933 14.1067 11 13 11C12.9984 11 12.9968 11 12.9952 11Z"
- fill="#696969" />
- <path d="M6 16C7.57273 11.9027 11.4545 9 16 9C20.5455 9 24.4273 11.9027 26 16" stroke="#696969" stroke-width="1.5"
- stroke-linecap="round" />
- <path d="M6 16C7.57273 20.0973 11.4545 23 16 23C20.5455 23 24.4273 20.0973 26 16" stroke="#696969"
- stroke-width="1.5" stroke-linecap="round" />
- </symbol>
-
<symbol id="notValidate" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M7.99992 1.33337C4.31992 1.33337 1.33325 4.32004 1.33325 8.00004C1.33325 11.68 4.31992 14.6667 7.99992 14.6667C11.6799 14.6667 14.6666 11.68 14.6666 8.00004C14.6666 4.32004 11.6799 1.33337 7.99992 1.33337ZM7.99992 8.66671C7.63325 8.66671 7.33325 8.36671 7.33325 8.00004V5.33337C7.33325 4.96671 7.63325 4.66671 7.99992 4.66671C8.36659 4.66671 8.66659 4.96671 8.66659 5.33337V8.00004C8.66659 8.36671 8.36659 8.66671 7.99992 8.66671ZM8.66659 11.3334H7.33325V10H8.66659V11.3334Z"
fill="#DA3635" />
</symbol>
- <symbol id="notValidateWithBorder" width="24" height="24" viewBox="0 0 24 24" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <circle cx="12" cy="12" r="11.5" fill="#DA6C2E" stroke="white" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M11.0835 7.00067C11.0835 6.49441 11.4939 6.084 12.0001 6.08398C12.5064 6.08397 12.9168 6.49437 12.9168 7.00063L12.917 14.0006C12.917 14.5069 12.5066 14.9173 12.0003 14.9173C11.4941 14.9173 11.0837 14.5069 11.0836 14.0007L11.0835 7.00067ZM11.0837 17.6896C11.0837 17.1833 11.4941 16.7729 12.0004 16.7729C12.5066 16.7729 12.917 17.1833 12.917 17.6896L12.917 18.0318C12.917 18.5381 12.5066 18.9485 12.0004 18.9485C11.4941 18.9485 11.0837 18.5381 11.0837 18.0318L11.0837 17.6896Z"
- fill="white" />
- </symbol>
-
<symbol id="validate" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
@@ -253,53 +117,7 @@
fill="#1D8844" />
</symbol>
- <symbol id="formClock" viewBox="0 0 146 146" fill="none" xmlns="http://www.w3.org/2000/svg">
- <circle cx="73.2273" cy="73.8401" r="67.2273" fill="#EAF8FB" stroke="#348899" stroke-width="12" />
- <path
- d="M75.2275 24.3398C75.2275 23.2353 74.3321 22.3398 73.2275 22.3398C72.123 22.3398 71.2275 23.2353 71.2275 24.3398H75.2275ZM73.2275 73.8398H71.2275C71.2275 74.4855 71.5392 75.0914 72.0645 75.4669L73.2275 73.8398ZM94.4205 91.4476C95.3191 92.0899 96.5683 91.8822 97.2106 90.9836C97.853 90.085 97.6452 88.8358 96.7466 88.1935L94.4205 91.4476ZM71.2275 24.3398V73.8398H75.2275V24.3398H71.2275ZM72.0645 75.4669L94.4205 91.4476L96.7466 88.1935L74.3906 72.2128L72.0645 75.4669Z"
- fill="#DC2A59" />
- </symbol>
-
- <symbol id="allophone" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 38">
- <path stroke="none"
- d="M33.896 6.667H19.25a.79.79 0 00-.244.038l-.185.062a.77.77 0 00-.488.975l.003.007 7.748 22.642-5.103 5.83a.771.771 0 00.581 1.279h12.334a3.854 3.854 0 003.854-3.854V10.52a3.854 3.854 0 00-3.854-3.854z"
- fill="#fff"></path>
- <path stroke="none" fill-rule="evenodd" clip-rule="evenodd"
- d="M21.562 37.5h12.334a3.854 3.854 0 003.854-3.854V10.52a3.854 3.854 0 00-3.854-3.854H19.25a.79.79 0 00-.244.038l-.185.062a.77.77 0 00-.488.975l.003.007 7.748 22.642-5.103 5.83a.771.771 0 00.581 1.279zm.505-1h11.829a2.854 2.854 0 002.854-2.854V10.52a2.854 2.854 0 00-2.854-2.854H19.364l7.854 22.948-5.151 5.885z"
- fill="#4F4F4F"></path>
- <path stroke="none"
- d="M27.66 30.243a.77.77 0 00-.702-.451H19.25a.771.771 0 00-.721 1.042L20.84 37a.77.77 0 001.301.235l5.396-6.166a.77.77 0 00.122-.827z"
- fill="#117083"></path>
- <path stroke="none" d="M33.896 17.458H23.104a.77.77 0 010-1.541h10.792a.77.77 0 010 1.541z" fill="#4F4F4F">
- </path>
- <path stroke="none"
- d="M27.73 17.458a.77.77 0 01-.772-.77v-1.542a.77.77 0 111.542 0v1.541a.77.77 0 01-.77.771zm-2.313 9.25a.77.77 0 01-.448-1.398c3.377-2.399 5.843-7.289 5.843-8.622a.771.771 0 011.542 0c0 2.031-2.97 7.378-6.49 9.877a.77.77 0 01-.447.143z"
- fill="#4F4F4F"></path>
- <path stroke="none"
- d="M31.583 28.25a.77.77 0 01-.52-.202c-.559-.512-5.486-5.063-6.36-7.216a.771.771 0 011.429-.582c.63 1.554 4.526 5.334 5.974 6.659a.77.77 0 01-.523 1.341z"
- fill="#4F4F4F"></path>
- <path stroke="none"
- d="M27.688 30.313L17.666 1.02a.77.77 0 00-.73-.521H4.604A3.854 3.854 0 00.75 4.354V27.48a3.854 3.854 0 003.854 3.854h22.354a.77.77 0 00.73-1.02z"
- fill="#348899"></path>
- <path stroke="none"
- d="M15.396 22.083a.77.77 0 01-.726-.511l-3.128-8.76-3.128 8.76a.77.77 0 01-1.451-.518l3.854-10.792a.802.802 0 011.45 0l3.855 10.791a.77.77 0 01-.726 1.03z"
- fill="#FAFAFA"></path>
- <path stroke="none" d="M13.083 17.458H10a.77.77 0 010-1.541h3.083a.77.77 0 110 1.541z" fill="#FAFAFA"></path>
- </symbol>
-
- <symbol id="handicap" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M14.6842 7.66864C16.614 7.66864 18.1784 6.06389 18.1784 4.08432C18.1784 2.10475 16.614 0.5 14.6842 0.5C12.7545 0.5 11.1901 2.10475 11.1901 4.08432C11.1901 6.06389 12.7545 7.66864 14.6842 7.66864Z"
- fill="#348899" />
- <path stroke="none"
- d="M11.0934 16.9949C10.829 17.0917 10.5701 17.202 10.3177 17.3252C7.53826 18.6817 5.55162 21.5888 5.42994 25.0418C5.25658 29.9618 8.92462 34.0264 13.5426 34.1976C17.3702 34.3395 20.7328 31.7703 21.8737 28.0773L26.3538 29.5417C24.6038 35.2066 19.4074 39.2554 13.3723 39.0317C6.09047 38.7617 0.467055 32.3856 0.731958 24.8677C0.918664 19.5689 3.97543 15.0672 8.30382 12.9548C8.69872 12.7621 9.10428 12.5891 9.51938 12.4373L11.0934 16.9949Z"
- fill="#333333" />
- <path
- d="M17.1672 10.9313C17.016 9.60345 15.8455 8.65494 14.5527 8.81268C13.6717 8.9202 12.9613 9.51373 12.646 10.3012C12.4923 10.5803 12.4335 10.897 12.4695 11.2047C12.469 11.303 12.4743 11.4025 12.4857 11.5026L13.7476 22.5855C13.8759 23.7123 14.749 24.595 15.8478 24.7088L26.2094 25.7814L29.5025 33.4144C30.0295 34.6361 31.4215 35.1857 32.6117 34.6419C33.8018 34.0983 34.3393 32.6672 33.8122 31.4455L29.9653 22.5289C29.6229 21.7351 28.8923 21.1915 28.051 21.1044L18.2096 20.0856L17.8595 17.0114L18.0599 17.21L19.0954 16.1816L18.0599 17.21C18.4504 17.5973 18.9639 17.8388 19.5137 17.8938L23.7649 18.3188C24.6044 18.4027 25.3548 17.7952 25.4409 16.9619C25.527 16.1286 24.9163 15.3851 24.0767 15.3012L20.0573 14.8993L17.3087 12.1738L17.1672 10.9313Z"
- fill="#348899" />
- </symbol>
-
- <symbol id="venteMaterielPrixSolidaire" width="44" height="44" viewBox="0 0 44 44" fill="none" stroke="none"
+ <symbol id="venteMaterielPrixSolidaire" viewBox="0 0 44 44" fill="none" stroke="none"
xmlns="http://www.w3.org/2000/svg">
<path d="M6 14H26V25.5C26 26.0523 25.5523 26.5 25 26.5H7C6.44772 26.5 6 26.0523 6 25.5V14Z" fill="white" />
<rect x="5.25" y="13.25" width="21.5" height="14" rx="1.75" stroke="#333333" stroke-width="1.5" />
@@ -314,44 +132,6 @@
fill="#DA3635" />
</symbol>
- <symbol id="close" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M27.0279 11.9135C27.5486 11.3928 28.2873 11.2873 28.6778 11.6778C29.0683 12.0683 28.9628 12.807 28.4421 13.3277L13.3572 28.4127C12.8365 28.9334 12.0978 29.0389 11.7072 28.6484C11.3167 28.2578 11.4222 27.5192 11.9429 26.9985L27.0279 11.9135Z"
- fill="#333333" />
- <path
- d="M28.0279 27.0279C28.5486 27.5486 28.6541 28.2873 28.2636 28.6778C27.8731 29.0683 27.1344 28.9628 26.6137 28.4421L11.5287 13.3572C11.008 12.8365 10.9025 12.0978 11.293 11.7072C11.6836 11.3167 12.4223 11.4222 12.943 11.9429L28.0279 27.0279Z"
- fill="#333333" />
- </symbol>
- <symbol id="structureCreated" width="180" height="180" viewBox="0 0 180 180" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <mask id="path-1-outside-1_5987_73910" maskUnits="userSpaceOnUse" x="16" y="14" width="109" height="141"
- fill="black">
- <rect fill="white" x="16" y="14" width="109" height="141" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M28.5545 44.4103C21.5551 47.3434 17 54.1911 17 61.7802V153.793L60.9444 153.793V125.543C60.9444 120.343 65.1604 116.127 70.3611 116.127C75.5618 116.127 79.7778 120.343 79.7778 125.543V153.793L123.722 153.793V62.1604C123.722 54.3809 118.939 47.402 111.683 44.5954L102.098 40.8877C99.4214 39.8523 97.0166 38.2188 95.0676 36.1119L79.265 19.0294C74.4112 13.7825 66.1626 13.6404 61.1309 18.717L43.3554 36.6511C41.6129 38.4091 39.541 39.8064 37.258 40.7631L28.5545 44.4103ZM79.7778 37.6544C79.7778 42.8551 75.5618 47.071 70.3611 47.071C65.1604 47.071 60.9444 42.8551 60.9444 37.6544C60.9444 32.4537 65.1604 28.2377 70.3611 28.2377C75.5618 28.2377 79.7778 32.4537 79.7778 37.6544ZM37.4028 109.443C32.9491 110.19 29.5556 114.064 29.5556 118.73V127.113H37.4028V109.443ZM29.5556 146.98V130.252H37.4028V146.98H29.5556ZM40.5417 146.98V130.252H48.3889V146.98H40.5417ZM48.3889 118.73V127.113H40.5417V109.443C44.9953 110.19 48.3889 114.064 48.3889 118.73ZM92.3333 118.73C92.3333 114.064 95.7269 110.19 100.181 109.443V127.113H92.3333V118.73ZM92.3333 130.252V146.98H100.181V130.252H92.3333ZM103.319 130.252V146.98H111.167V130.252H103.319ZM111.167 127.113V118.73C111.167 114.064 107.773 110.19 103.319 109.443V127.113H111.167ZM100.181 59.6266C95.7269 60.3738 92.3333 64.2471 92.3333 68.9131V77.2961H100.181V59.6266ZM92.3333 97.1631V80.435H100.181V97.1631H92.3333ZM103.319 97.1631V80.435H111.167V97.1631H103.319ZM111.167 68.9131V77.2961H103.319V59.6266C107.773 60.3738 111.167 64.2471 111.167 68.9131ZM60.9444 68.9131C60.9444 64.2471 64.338 60.3738 68.7917 59.6266V77.2961H60.9444V68.9131ZM60.9444 80.435V97.1631H68.7917V80.435H60.9444ZM71.9306 80.435V97.1631H79.7778V80.435H71.9306ZM79.7778 77.2961V68.9131C79.7778 64.2471 76.3842 60.3738 71.9306 59.6266V77.2961H79.7778ZM37.4028 59.6266C32.9491 60.3738 29.5556 64.2471 29.5556 68.9131V77.2961H37.4028V59.6266ZM29.5556 97.1631V80.435H37.4028V97.1631H29.5556ZM40.5417 97.1631V80.435H48.3889V97.1631H40.5417ZM48.3889 68.9131V77.2961H40.5417V59.6266C44.9953 60.3738 48.3889 64.2471 48.3889 68.9131Z" />
- </mask>
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M28.5545 44.4103C21.5551 47.3434 17 54.1911 17 61.7802V153.793L60.9444 153.793V125.543C60.9444 120.343 65.1604 116.127 70.3611 116.127C75.5618 116.127 79.7778 120.343 79.7778 125.543V153.793L123.722 153.793V62.1604C123.722 54.3809 118.939 47.402 111.683 44.5954L102.098 40.8877C99.4214 39.8523 97.0166 38.2188 95.0676 36.1119L79.265 19.0294C74.4112 13.7825 66.1626 13.6404 61.1309 18.717L43.3554 36.6511C41.6129 38.4091 39.541 39.8064 37.258 40.7631L28.5545 44.4103ZM79.7778 37.6544C79.7778 42.8551 75.5618 47.071 70.3611 47.071C65.1604 47.071 60.9444 42.8551 60.9444 37.6544C60.9444 32.4537 65.1604 28.2377 70.3611 28.2377C75.5618 28.2377 79.7778 32.4537 79.7778 37.6544ZM37.4028 109.443C32.9491 110.19 29.5556 114.064 29.5556 118.73V127.113H37.4028V109.443ZM29.5556 146.98V130.252H37.4028V146.98H29.5556ZM40.5417 146.98V130.252H48.3889V146.98H40.5417ZM48.3889 118.73V127.113H40.5417V109.443C44.9953 110.19 48.3889 114.064 48.3889 118.73ZM92.3333 118.73C92.3333 114.064 95.7269 110.19 100.181 109.443V127.113H92.3333V118.73ZM92.3333 130.252V146.98H100.181V130.252H92.3333ZM103.319 130.252V146.98H111.167V130.252H103.319ZM111.167 127.113V118.73C111.167 114.064 107.773 110.19 103.319 109.443V127.113H111.167ZM100.181 59.6266C95.7269 60.3738 92.3333 64.2471 92.3333 68.9131V77.2961H100.181V59.6266ZM92.3333 97.1631V80.435H100.181V97.1631H92.3333ZM103.319 97.1631V80.435H111.167V97.1631H103.319ZM111.167 68.9131V77.2961H103.319V59.6266C107.773 60.3738 111.167 64.2471 111.167 68.9131ZM60.9444 68.9131C60.9444 64.2471 64.338 60.3738 68.7917 59.6266V77.2961H60.9444V68.9131ZM60.9444 80.435V97.1631H68.7917V80.435H60.9444ZM71.9306 80.435V97.1631H79.7778V80.435H71.9306ZM79.7778 77.2961V68.9131C79.7778 64.2471 76.3842 60.3738 71.9306 59.6266V77.2961H79.7778ZM37.4028 59.6266C32.9491 60.3738 29.5556 64.2471 29.5556 68.9131V77.2961H37.4028V59.6266ZM29.5556 97.1631V80.435H37.4028V97.1631H29.5556ZM40.5417 97.1631V80.435H48.3889V97.1631H40.5417ZM48.3889 68.9131V77.2961H40.5417V59.6266C44.9953 60.3738 48.3889 64.2471 48.3889 68.9131Z"
- fill="#DA3635" />
- <path
- d="M28.5545 44.4103L28.941 45.3326L28.5545 44.4103ZM17 153.793H16V154.793H17L17 153.793ZM60.9444 153.793V154.793H61.9444V153.793H60.9444ZM79.7778 153.793H78.7778V154.793H79.7778V153.793ZM123.722 153.793V154.793H124.722V153.793H123.722ZM111.683 44.5954L111.323 45.528L111.683 44.5954ZM102.098 40.8877L102.459 39.9551L102.098 40.8877ZM95.0676 36.1119L95.8017 35.4328L95.0676 36.1119ZM79.265 19.0294L79.9991 18.3504V18.3504L79.265 19.0294ZM61.1309 18.717L61.8411 19.4209L61.1309 18.717ZM43.3554 36.6511L44.0657 37.355L43.3554 36.6511ZM37.258 40.7631L36.8716 39.8408L37.258 40.7631ZM37.4028 109.443H38.4028V108.261L37.2373 108.457L37.4028 109.443ZM29.5556 127.113H28.5556V128.113H29.5556V127.113ZM37.4028 127.113V128.113H38.4028V127.113H37.4028ZM29.5556 146.98H28.5556V147.98H29.5556V146.98ZM29.5556 130.252V129.252H28.5556V130.252H29.5556ZM37.4028 130.252H38.4028V129.252H37.4028V130.252ZM37.4028 146.98V147.98H38.4028V146.98H37.4028ZM40.5417 146.98H39.5417V147.98H40.5417V146.98ZM40.5417 130.252V129.252H39.5417V130.252H40.5417ZM48.3889 130.252H49.3889V129.252H48.3889V130.252ZM48.3889 146.98V147.98H49.3889V146.98H48.3889ZM48.3889 127.113V128.113H49.3889V127.113H48.3889ZM40.5417 127.113H39.5417V128.113H40.5417V127.113ZM40.5417 109.443L40.7071 108.457L39.5417 108.261V109.443H40.5417ZM100.181 109.443H101.181V108.261L100.015 108.457L100.181 109.443ZM100.181 127.113V128.113H101.181V127.113H100.181ZM92.3333 127.113H91.3333V128.113H92.3333V127.113ZM92.3333 130.252V129.252H91.3333V130.252H92.3333ZM92.3333 146.98H91.3333V147.98H92.3333V146.98ZM100.181 146.98V147.98H101.181V146.98H100.181ZM100.181 130.252H101.181V129.252H100.181V130.252ZM103.319 130.252V129.252H102.319V130.252H103.319ZM103.319 146.98H102.319V147.98H103.319V146.98ZM111.167 146.98V147.98H112.167V146.98H111.167ZM111.167 130.252H112.167V129.252H111.167V130.252ZM111.167 127.113V128.113H112.167V127.113H111.167ZM103.319 109.443L103.485 108.457L102.319 108.261V109.443H103.319ZM103.319 127.113H102.319V128.113H103.319V127.113ZM100.181 59.6266H101.181V58.4449L100.015 58.6404L100.181 59.6266ZM92.3333 77.2961H91.3333V78.2961H92.3333V77.2961ZM100.181 77.2961V78.2961H101.181V77.2961H100.181ZM92.3333 97.1631H91.3333V98.1631H92.3333V97.1631ZM92.3333 80.435V79.435H91.3333V80.435H92.3333ZM100.181 80.435H101.181V79.435H100.181V80.435ZM100.181 97.1631V98.1631H101.181V97.1631H100.181ZM103.319 97.1631H102.319V98.1631H103.319V97.1631ZM103.319 80.435V79.435H102.319V80.435H103.319ZM111.167 80.435H112.167V79.435H111.167V80.435ZM111.167 97.1631V98.1631H112.167V97.1631H111.167ZM111.167 77.2961V78.2961H112.167V77.2961H111.167ZM103.319 77.2961H102.319V78.2961H103.319V77.2961ZM103.319 59.6266L103.485 58.6404L102.319 58.4449V59.6266H103.319ZM68.7917 59.6266H69.7917V58.4449L68.6262 58.6404L68.7917 59.6266ZM68.7917 77.2961V78.2961H69.7917V77.2961H68.7917ZM60.9444 77.2961H59.9444V78.2961H60.9444V77.2961ZM60.9444 80.435V79.435H59.9444V80.435H60.9444ZM60.9444 97.1631H59.9444V98.1631H60.9444V97.1631ZM68.7917 97.1631V98.1631H69.7917V97.1631H68.7917ZM68.7917 80.435H69.7917V79.435H68.7917V80.435ZM71.9306 80.435V79.435H70.9306V80.435H71.9306ZM71.9306 97.1631H70.9306V98.1631H71.9306V97.1631ZM79.7778 97.1631V98.1631H80.7778V97.1631H79.7778ZM79.7778 80.435H80.7778V79.435H79.7778V80.435ZM79.7778 77.2961V78.2961H80.7778V77.2961H79.7778ZM71.9306 59.6266L72.096 58.6404L70.9306 58.4449V59.6266H71.9306ZM71.9306 77.2961H70.9306V78.2961H71.9306V77.2961ZM37.4028 59.6266H38.4028V58.4449L37.2373 58.6404L37.4028 59.6266ZM29.5556 77.2961H28.5556V78.2961H29.5556V77.2961ZM37.4028 77.2961V78.2961H38.4028V77.2961H37.4028ZM29.5556 97.1631H28.5556V98.1631H29.5556V97.1631ZM29.5556 80.435V79.435H28.5556V80.435H29.5556ZM37.4028 80.435H38.4028V79.435H37.4028V80.435ZM37.4028 97.1631V98.1631H38.4028V97.1631H37.4028ZM40.5417 97.1631H39.5417V98.1631H40.5417V97.1631ZM40.5417 80.435V79.435H39.5417V80.435H40.5417ZM48.3889 80.435H49.3889V79.435H48.3889V80.435ZM48.3889 97.1631V98.1631H49.3889V97.1631H48.3889ZM48.3889 77.2961V78.2961H49.3889V77.2961H48.3889ZM40.5417 77.2961H39.5417V78.2961H40.5417V77.2961ZM40.5417 59.6266L40.7071 58.6404L39.5417 58.4449V59.6266H40.5417ZM28.168 43.488C20.7969 46.5768 16 53.7881 16 61.7802H18C18 54.594 22.3132 48.11 28.941 45.3326L28.168 43.488ZM16 61.7802V153.793H18V61.7802H16ZM17 154.793L60.9444 154.793V152.793L17 152.793L17 154.793ZM61.9444 153.793V125.543H59.9444V153.793H61.9444ZM61.9444 125.543C61.9444 120.895 65.7127 117.127 70.3611 117.127V115.127C64.6081 115.127 59.9444 119.79 59.9444 125.543H61.9444ZM70.3611 117.127C75.0095 117.127 78.7778 120.895 78.7778 125.543H80.7778C80.7778 119.79 76.1141 115.127 70.3611 115.127V117.127ZM78.7778 125.543V153.793H80.7778V125.543H78.7778ZM79.7778 154.793L123.722 154.793V152.793L79.7778 152.793V154.793ZM124.722 153.793V62.1604H122.722V153.793H124.722ZM124.722 62.1604C124.722 53.9678 119.685 46.6183 112.044 43.6627L111.323 45.528C118.193 48.1856 122.722 54.794 122.722 62.1604H124.722ZM112.044 43.6627L102.459 39.9551L101.737 41.8204L111.323 45.528L112.044 43.6627ZM102.459 39.9551C99.9243 38.9746 97.6472 37.4278 95.8017 35.4328L94.3335 36.791C96.386 39.0097 98.9185 40.73 101.737 41.8204L102.459 39.9551ZM95.8017 35.4328L79.9991 18.3504L78.531 19.7085L94.3335 36.791L95.8017 35.4328ZM79.9991 18.3504C74.7587 12.6855 65.8531 12.5321 60.4206 18.013L61.8411 19.4209C66.4721 14.7487 74.0637 14.8795 78.531 19.7085L79.9991 18.3504ZM60.4206 18.013L42.6452 35.9471L44.0657 37.355L61.8411 19.4209L60.4206 18.013ZM42.6452 35.9471C40.9952 37.6118 39.0333 38.9349 36.8716 39.8408L37.6445 41.6854C40.0487 40.6779 42.2307 39.2064 44.0657 37.355L42.6452 35.9471ZM36.8716 39.8408L28.168 43.488L28.941 45.3326L37.6445 41.6854L36.8716 39.8408ZM78.7778 37.6544C78.7778 42.3028 75.0095 46.071 70.3611 46.071V48.071C76.1141 48.071 80.7778 43.4073 80.7778 37.6544H78.7778ZM70.3611 46.071C65.7127 46.071 61.9444 42.3028 61.9444 37.6544H59.9444C59.9444 43.4073 64.6081 48.071 70.3611 48.071V46.071ZM61.9444 37.6544C61.9444 33.006 65.7127 29.2377 70.3611 29.2377V27.2377C64.6081 27.2377 59.9444 31.9014 59.9444 37.6544H61.9444ZM70.3611 29.2377C75.0095 29.2377 78.7778 33.006 78.7778 37.6544H80.7778C80.7778 31.9014 76.1141 27.2377 70.3611 27.2377V29.2377ZM37.2373 108.457C32.31 109.284 28.5556 113.567 28.5556 118.73H30.5556C30.5556 114.56 33.5883 111.097 37.5682 110.429L37.2373 108.457ZM28.5556 118.73V127.113H30.5556V118.73H28.5556ZM29.5556 128.113H37.4028V126.113H29.5556V128.113ZM38.4028 127.113V109.443H36.4028V127.113H38.4028ZM30.5556 146.98V130.252H28.5556V146.98H30.5556ZM29.5556 131.252H37.4028V129.252H29.5556V131.252ZM36.4028 130.252V146.98H38.4028V130.252H36.4028ZM37.4028 145.98H29.5556V147.98H37.4028V145.98ZM41.5417 146.98V130.252H39.5417V146.98H41.5417ZM40.5417 131.252H48.3889V129.252H40.5417V131.252ZM47.3889 130.252V146.98H49.3889V130.252H47.3889ZM48.3889 145.98H40.5417V147.98H48.3889V145.98ZM47.3889 118.73V127.113H49.3889V118.73H47.3889ZM48.3889 126.113H40.5417V128.113H48.3889V126.113ZM41.5417 127.113V109.443H39.5417V127.113H41.5417ZM40.3762 110.429C44.3561 111.097 47.3889 114.56 47.3889 118.73H49.3889C49.3889 113.567 45.6345 109.284 40.7071 108.457L40.3762 110.429ZM93.3333 118.73C93.3333 114.56 96.3661 111.097 100.346 110.429L100.015 108.457C95.0878 109.284 91.3333 113.567 91.3333 118.73H93.3333ZM99.1806 109.443V127.113H101.181V109.443H99.1806ZM100.181 126.113H92.3333V128.113H100.181V126.113ZM93.3333 127.113V118.73H91.3333V127.113H93.3333ZM91.3333 130.252V146.98H93.3333V130.252H91.3333ZM92.3333 147.98H100.181V145.98H92.3333V147.98ZM101.181 146.98V130.252H99.1806V146.98H101.181ZM100.181 129.252H92.3333V131.252H100.181V129.252ZM102.319 130.252V146.98H104.319V130.252H102.319ZM103.319 147.98H111.167V145.98H103.319V147.98ZM112.167 146.98V130.252H110.167V146.98H112.167ZM111.167 129.252H103.319V131.252H111.167V129.252ZM112.167 127.113V118.73H110.167V127.113H112.167ZM112.167 118.73C112.167 113.567 108.412 109.284 103.485 108.457L103.154 110.429C107.134 111.097 110.167 114.56 110.167 118.73H112.167ZM102.319 109.443V127.113H104.319V109.443H102.319ZM103.319 128.113H111.167V126.113H103.319V128.113ZM100.015 58.6404C95.0878 59.467 91.3333 63.7506 91.3333 68.9131H93.3333C93.3333 64.7436 96.3661 61.2805 100.346 60.6128L100.015 58.6404ZM91.3333 68.9131V77.2961H93.3333V68.9131H91.3333ZM92.3333 78.2961H100.181V76.2961H92.3333V78.2961ZM101.181 77.2961V59.6266H99.1806V77.2961H101.181ZM93.3333 97.1631V80.435H91.3333V97.1631H93.3333ZM92.3333 81.435H100.181V79.435H92.3333V81.435ZM99.1806 80.435V97.1631H101.181V80.435H99.1806ZM100.181 96.1631H92.3333V98.1631H100.181V96.1631ZM104.319 97.1631V80.435H102.319V97.1631H104.319ZM103.319 81.435H111.167V79.435H103.319V81.435ZM110.167 80.435V97.1631H112.167V80.435H110.167ZM111.167 96.1631H103.319V98.1631H111.167V96.1631ZM110.167 68.9131V77.2961H112.167V68.9131H110.167ZM111.167 76.2961H103.319V78.2961H111.167V76.2961ZM104.319 77.2961V59.6266H102.319V77.2961H104.319ZM103.154 60.6128C107.134 61.2805 110.167 64.7436 110.167 68.9131H112.167C112.167 63.7506 108.412 59.467 103.485 58.6404L103.154 60.6128ZM61.9444 68.9131C61.9444 64.7436 64.9772 61.2805 68.9571 60.6128L68.6262 58.6404C63.6989 59.467 59.9444 63.7506 59.9444 68.9131H61.9444ZM67.7917 59.6266V77.2961H69.7917V59.6266H67.7917ZM68.7917 76.2961H60.9444V78.2961H68.7917V76.2961ZM61.9444 77.2961V68.9131H59.9444V77.2961H61.9444ZM59.9444 80.435V97.1631H61.9444V80.435H59.9444ZM60.9444 98.1631H68.7917V96.1631H60.9444V98.1631ZM69.7917 97.1631V80.435H67.7917V97.1631H69.7917ZM68.7917 79.435H60.9444V81.435H68.7917V79.435ZM70.9306 80.435V97.1631H72.9306V80.435H70.9306ZM71.9306 98.1631H79.7778V96.1631H71.9306V98.1631ZM80.7778 97.1631V80.435H78.7778V97.1631H80.7778ZM79.7778 79.435H71.9306V81.435H79.7778V79.435ZM80.7778 77.2961V68.9131H78.7778V77.2961H80.7778ZM80.7778 68.9131C80.7778 63.7506 77.0234 59.467 72.096 58.6404L71.7651 60.6128C75.745 61.2805 78.7778 64.7436 78.7778 68.9131H80.7778ZM70.9306 59.6266V77.2961H72.9306V59.6266H70.9306ZM71.9306 78.2961H79.7778V76.2961H71.9306V78.2961ZM37.2373 58.6404C32.31 59.467 28.5556 63.7506 28.5556 68.9131H30.5556C30.5556 64.7436 33.5883 61.2805 37.5682 60.6128L37.2373 58.6404ZM28.5556 68.9131V77.2961H30.5556V68.9131H28.5556ZM29.5556 78.2961H37.4028V76.2961H29.5556V78.2961ZM38.4028 77.2961V59.6266H36.4028V77.2961H38.4028ZM30.5556 97.1631V80.435H28.5556V97.1631H30.5556ZM29.5556 81.435H37.4028V79.435H29.5556V81.435ZM36.4028 80.435V97.1631H38.4028V80.435H36.4028ZM37.4028 96.1631H29.5556V98.1631H37.4028V96.1631ZM41.5417 97.1631V80.435H39.5417V97.1631H41.5417ZM40.5417 81.435H48.3889V79.435H40.5417V81.435ZM47.3889 80.435V97.1631H49.3889V80.435H47.3889ZM48.3889 96.1631H40.5417V98.1631H48.3889V96.1631ZM47.3889 68.9131V77.2961H49.3889V68.9131H47.3889ZM48.3889 76.2961H40.5417V78.2961H48.3889V76.2961ZM41.5417 77.2961V59.6266H39.5417V77.2961H41.5417ZM40.3762 60.6128C44.3561 61.2805 47.3889 64.7436 47.3889 68.9131H49.3889C49.3889 63.7506 45.6345 59.467 40.7071 58.6404L40.3762 60.6128Z"
- fill="#333333" mask="url(#path-1-outside-1_5987_73910)" />
- <path
- d="M161.686 108.624C158.223 105.539 152.92 105.852 149.842 109.322L117.73 145.534L100.143 131.368C96.5313 128.458 91.2499 129.036 88.3486 132.655C85.4489 136.272 86.0227 141.56 89.6326 144.468L113.442 163.646C116.928 166.453 121.998 166.027 124.968 162.678L162.382 120.486C165.458 117.018 165.147 111.708 161.686 108.624Z"
- fill="#47C562" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
- </symbol>
-
- <symbol id="profileUpdated" width="180" height="180" viewBox="0 0 180 180" fill="none"
- xmlns="http://www.w3.org/2000/svg">
- <path
- d="M26 140H24.5C24.5 140.828 25.1716 141.5 26 141.5V140ZM83.5 87L83.5 85.5L83.5 87ZM103.426 88.0228L103.589 86.5318L103.426 88.0228ZM63.5739 88.0223L63.7373 89.5133L63.5739 88.0223ZM83.5 141.5C84.3284 141.5 85 140.828 85 140C85 139.172 84.3284 138.5 83.5 138.5V141.5ZM63.7373 89.5133C69.4973 88.882 76.0577 88.4999 83.5 88.5L83.5 85.5C75.9551 85.4999 69.2853 85.8873 63.4105 86.5312L63.7373 89.5133ZM83.5 88.5C90.9421 88.5001 97.5024 88.8825 103.262 89.5139L103.589 86.5318C97.7145 85.8878 91.0448 85.5001 83.5 85.5L83.5 88.5ZM27.5 140C27.5 127.476 30.5094 115.481 36.5387 106.319C42.5441 97.1935 51.5563 90.8484 63.7373 89.5133L63.4105 86.5312C50.2549 87.9731 40.4801 94.8727 34.0327 104.67C27.6093 114.43 24.5 127.036 24.5 140H27.5ZM83.5 138.5H26V141.5H83.5V138.5ZM129.642 100.23C123.32 92.8079 114.639 87.743 103.589 86.5318L103.262 89.5139C113.517 90.638 121.509 95.3091 127.358 102.176L129.642 100.23Z"
- fill="#696969" />
- <circle cx="84.0416" cy="63.4879" r="30.9879" fill="white" stroke="#696969" stroke-width="3"
- stroke-linejoin="round" />
- <path
- d="M154.686 93.624C151.223 90.5385 145.919 90.8517 142.842 94.3221L110.73 130.534L93.1433 116.368C89.5313 113.458 84.2499 114.036 81.3486 117.655C78.4489 121.272 79.0227 126.56 82.6326 129.468L106.442 148.646C109.928 151.453 114.998 151.027 117.968 147.678L155.382 105.486C158.458 102.018 158.147 96.7077 154.686 93.624Z"
- fill="#47C562" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" />
- </symbol>
@@ -403,65 +183,22 @@
<symbol id="mesPapiers" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#FFE5E4" />
<path
- d="M34.8122 24.0855L35.1053 23.6611H34.1341L33.8541 24.0855H32.2617V29.8295H35.8403V29.0989H33.0142V26.7103H35.8534V25.9797H33.0142V24.8161H35.8534V24.0855H34.8122Z"
- fill="#A50F0E" />
- <path d="M27.1484 24.816H29.0427V29.8295H29.8126V24.816H31.7507V24.0854H27.1484V24.816Z" fill="#A50F0E" />
- <path
- d="M24.6807 23.9365C23.342 23.9365 22.209 25.0958 22.209 26.4651V29.8293H22.9614V26.4651C22.9614 25.4633 23.7139 24.6802 24.6763 24.6802C25.6475 24.6802 26.3475 25.4589 26.3475 26.5307V29.8293H27.1087V26.5307C27.1174 25.1002 26.0238 23.9365 24.6807 23.9365Z"
- fill="#A50F0E" />
- <path
- d="M18.876 23.9365C17.5374 23.9365 16.4043 25.0958 16.4043 26.4651V29.8293H17.1568V27.655H20.5472V29.8293H21.3084V26.5307C21.3084 25.1002 20.2147 23.9365 18.876 23.9365ZM20.5472 26.9288H17.1568V26.4651C17.1568 25.4633 17.9092 24.6802 18.8716 24.6802C19.8428 24.6802 20.5428 25.4589 20.5428 26.5307V26.9288H20.5472Z"
- fill="#A50F0E" />
- <path
- d="M15.6378 28.0839C15.6378 27.2439 15.1653 26.6227 14.2335 26.2421C13.1836 25.7959 13.0961 25.6384 13.0961 25.2797C13.0961 25.0216 13.2011 24.711 13.7129 24.711C14.1241 24.711 14.3035 24.8685 14.3691 25.2972L14.3997 25.5072L15.1347 25.3716L15.0997 25.1703C14.9641 24.4047 14.461 23.9629 13.7216 23.9629C12.9167 23.9629 12.3524 24.5272 12.3524 25.3366C12.3524 25.7215 12.4967 26.0759 12.7548 26.334C12.9692 26.544 13.1879 26.6709 13.7173 26.9158C14.1854 27.1214 14.391 27.2396 14.566 27.4014C14.776 27.6158 14.881 27.8608 14.881 28.1539C14.881 28.7795 14.391 29.2476 13.7391 29.2476C13.1004 29.2476 12.6192 28.8363 12.6192 28.2939V27.6683H11.8799V28.2983C11.8799 29.2213 12.7242 30 13.7216 30C14.7803 30 15.6378 29.1426 15.6378 28.0839Z"
- fill="#A50F0E" />
- <path
- d="M34.1303 22.2346H31.3042V19.8416H34.1478V19.1111H31.3042V17.9474H34.1303V17.2168H30.5518V22.9652H34.1303V22.2346Z"
- fill="#A50F0E" />
- <path
- d="M29.3134 21.7403C28.6353 22.2259 28.2547 22.3834 27.7341 22.3834C26.7498 22.3834 25.9361 21.7666 25.6342 20.8873C25.6255 20.8566 25.6124 20.8304 25.6036 20.7998V20.7954C25.5424 20.5854 25.5074 20.3579 25.5074 20.126C25.5074 19.8898 25.5424 19.6667 25.6036 19.4567V19.4523C25.6124 19.4217 25.6255 19.3911 25.6342 19.3605C25.9361 18.4811 26.7498 17.8687 27.7341 17.8687C28.2547 17.8687 28.6397 18.0262 29.3134 18.5118L29.484 18.6343L29.8996 18.0174L29.7377 17.8993C28.9547 17.3306 28.4122 17.1206 27.7297 17.1206C27.7254 17.1206 27.7254 17.1206 27.721 17.1206C26.9379 17.1206 26.1986 17.4356 25.6342 18.0087C25.0699 18.5774 24.7637 19.3298 24.7637 20.1173C24.7637 20.1217 24.7637 20.126 24.7637 20.1304C24.7637 20.1348 24.7637 20.1392 24.7637 20.1435C24.7637 20.931 25.0743 21.6791 25.6342 22.2522C26.1986 22.8253 26.9379 23.1402 27.721 23.1402C27.7254 23.1402 27.7254 23.1402 27.7297 23.1402C28.4122 23.1402 28.9547 22.9303 29.7377 22.3615L29.8996 22.2434L29.484 21.6266L29.3134 21.7403Z"
- fill="#A50F0E" />
- <path
- d="M21.7491 17.0684C20.4104 17.0684 19.2773 18.2277 19.2773 19.597V22.9611H20.0298V20.7869H23.4202V22.9611H24.1814V19.6626C24.1814 18.232 23.0921 17.0684 21.7491 17.0684ZM20.0298 20.0651V19.6013C20.0298 18.5995 20.7823 17.8164 21.7447 17.8164C22.7159 17.8164 23.4158 18.5951 23.4158 19.667V20.0651H20.0298Z"
- fill="#A50F0E" />
- <path
- d="M15.4277 21.2678H16.7664C17.8207 21.2678 18.8138 20.301 18.8138 19.2773C18.8138 18.7961 18.5557 18.223 18.1707 17.8467C17.9826 17.6674 17.7595 17.523 17.5057 17.4136C17.2126 17.278 16.9414 17.2124 16.6964 17.2124H14.6709V22.9608H15.4234V21.2678H15.4277ZM15.4277 17.9474H16.6877C17.4664 17.9474 18.0569 18.5161 18.0569 19.2729C18.0569 19.9947 17.497 20.5372 16.7533 20.5372H15.4277V17.9474Z"
- fill="#A50F0E" />
- <path
- d="M13.9015 21.2196C13.9015 20.3797 13.429 19.7585 12.4972 19.3779C11.4472 18.9316 11.3597 18.7742 11.3597 18.4154C11.3597 18.1573 11.4647 17.8467 11.9766 17.8467C12.3878 17.8467 12.5672 18.0042 12.6328 18.4329L12.6634 18.6429L13.3984 18.5073L13.3634 18.3061C13.2277 17.5405 12.7246 17.0986 11.9853 17.0986C11.1804 17.0986 10.616 17.663 10.616 18.4723C10.616 18.8573 10.7604 19.2116 11.0185 19.4697C11.2329 19.6797 11.4516 19.8066 11.9809 20.0516C12.449 20.2572 12.6547 20.3753 12.8296 20.5372C13.0396 20.7515 13.1446 20.9965 13.1446 21.2896C13.1446 21.9152 12.6547 22.3833 12.0028 22.3833C11.3641 22.3833 10.8829 21.9721 10.8829 21.4296V20.804H10.1436V21.4296C10.1436 22.3527 10.9879 23.1314 11.9853 23.1314C13.0396 23.1358 13.9015 22.2739 13.9015 21.2196Z"
- fill="#A50F0E" />
- <path
- d="M6.74855 17.9913H9.57463V17.2607H5.99609V23.0091H9.57463V22.2786H6.74855V19.8856H9.59213V19.155H6.74855V17.9913Z"
- fill="#A50F0E" />
- <path
- d="M35.8493 17.0725C35.8493 16.2238 35.1581 15.5283 34.305 15.5283L24.0462 15.5108V12.9297C24.0462 11.4991 22.5413 10.3354 21.1983 10.3354C19.8596 10.3354 18.7266 11.4948 18.7266 12.864V16.2282H19.479V12.864C19.479 11.8622 20.2315 11.0792 21.1939 11.0792C22.1651 11.0792 23.2807 11.8579 23.2807 12.9297V16.2457L34.3006 16.237C34.7425 16.237 35.0881 16.6307 35.0881 17.0725V22.9653H35.8405V17.0725H35.8493Z"
+ d="M34.6582 23.7742L17.3484 33.8334C17.1361 33.956 16.8754 33.9577 16.6631 33.8334L5.34193 27.2976C4.88619 27.0352 4.88619 26.3775 5.34193 26.1133L22.6517 16.0541C22.864 15.9316 23.1247 15.9298 23.337 16.0541L34.6582 22.5899C35.1139 22.8523 35.1139 23.5101 34.6582 23.7742Z"
fill="#A50F0E" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M33.9017 22.1531L17.3485 31.7727C17.1361 31.8953 16.8755 31.897 16.6631 31.7727L6.0985 25.6736L22.6517 16.054C22.864 15.9315 23.1247 15.9297 23.3371 16.054L33.9017 22.1531Z"
+ fill="#FFE5E4" />
<path
- d="M15.0781 16.4166C15.87 16.4166 16.618 16.0973 17.1868 15.5242C17.7555 14.9511 18.0661 14.1942 18.0661 13.3937C18.0661 12.6018 17.7511 11.8538 17.1824 11.285C16.6093 10.712 15.8568 10.397 15.0563 10.397C13.4332 10.397 12.0596 11.7838 12.0596 13.4243C12.0639 15.0429 13.4464 16.4166 15.0781 16.4166ZM15.065 11.1407C16.3337 11.1407 17.3311 12.1337 17.3311 13.398C17.3311 14.6755 16.3424 15.6773 15.0825 15.6773C13.8095 15.6773 12.812 14.6842 12.812 13.4199C12.8077 12.1425 13.8007 11.1407 15.065 11.1407Z"
+ d="M34.6582 19.4705L17.3484 29.5297C17.1361 29.6523 16.8754 29.654 16.6631 29.5297L5.34193 22.9939C4.88619 22.7315 4.88619 22.0738 5.34193 21.8096L22.6517 11.7504C22.864 11.6278 23.1247 11.6261 23.337 11.7504L34.6582 18.2862C35.1139 18.5486 35.1139 19.2064 34.6582 19.4705Z"
fill="#A50F0E" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M34.0494 17.9347L23.3371 11.7504C23.1247 11.6261 22.864 11.6278 22.6517 11.7504L5.94899 21.4568L16.6614 27.6412C16.8737 27.7638 17.1361 27.7638 17.3467 27.6412L34.0494 17.9347Z"
+ fill="#FFE5E4" />
<path
- d="M5.68104 29.103C5.23919 29.103 4.89359 28.7312 4.89359 28.2893V12.2822C4.89359 11.5822 5.37043 11.0923 6.04852 11.0923C6.80972 11.0923 7.38281 11.6522 7.38281 12.3959V16.2369H8.14402V12.3916C8.14402 11.9235 8.22276 11.7047 8.48087 11.4554C8.73461 11.2148 9.07146 11.0835 9.42581 11.0835C10.1301 11.0835 10.6639 11.6479 10.6639 12.3916V16.2369H11.4163V12.3259C11.4163 11.2629 10.4889 10.3311 9.43456 10.3311C8.91835 10.3311 8.37588 10.5585 7.9909 10.9348C7.89028 11.031 7.82029 11.1141 7.75029 11.2235C7.69342 11.1448 7.63655 11.0791 7.5578 10.996L7.54905 10.9873C7.36094 10.8079 7.15095 10.6548 6.94096 10.5454L6.93222 10.541C6.66973 10.4229 6.37662 10.3617 6.07039 10.3617C4.97233 10.3617 4.14551 11.241 4.14551 12.4091V21.7272V28.2981C4.14551 29.1468 4.83672 29.8424 5.68979 29.8424H11.4163V29.1118L5.68104 29.103Z"
+ d="M21.2579 6.10408C21.1891 6.06378 21.1066 6.06378 21.0379 6.10408L15.4962 9.38804C15.3501 9.47391 15.3501 9.68945 15.4962 9.77532L17.1097 10.7251L5.47988 17.6172C5.02795 17.8853 5.02795 18.553 5.47988 18.8193L16.7489 25.4538C16.9602 25.5783 17.2214 25.5783 17.4311 25.4538L34.6611 15.2427C35.113 14.9746 35.113 14.307 34.6611 14.0406L21.2579 6.10408Z"
fill="#A50F0E" />
</symbol>
- <symbol id="finish" width="22" height="28" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect x="6.01224" y="2.61237" width="1" height="17" rx="0.5" transform="rotate(15 6.01224 2.61237)"
- stroke="white" />
- <rect x="6.90873" y="6.99372" width="1" height="1" transform="rotate(15 6.90873 6.99372)" stroke="white" />
- <rect x="5.87357" y="10.8574" width="1" height="1" transform="rotate(15 5.87357 10.8574)" stroke="white" />
- <rect x="10.7725" y="8.029" width="1" height="1" transform="rotate(15 10.7725 8.029)" stroke="white" />
- <rect x="9.73685" y="11.8926" width="1" height="1" transform="rotate(15 9.73685 11.8926)" stroke="white" />
- <rect x="14.6363" y="9.06428" width="1" height="1" transform="rotate(15 14.6363 9.06428)" stroke="white" />
- <rect x="13.6006" y="12.9279" width="1" height="1" transform="rotate(15 13.6006 12.9279)" stroke="white" />
- <rect x="8.32279" y="9.44318" width="1" height="1" transform="rotate(15 8.32279 9.44318)" stroke="white" />
- <rect x="12.1866" y="10.4785" width="1" height="1" transform="rotate(15 12.1866 10.4785)" stroke="white" />
- <rect x="16.0503" y="11.5137" width="1" height="1" transform="rotate(15 16.0503 11.5137)" stroke="white" />
- <rect x="9.35795" y="5.57941" width="1" height="1" transform="rotate(15 9.35795 5.57941)" stroke="white" />
- <rect x="13.2217" y="6.61469" width="1" height="1" transform="rotate(15 13.2217 6.61469)" stroke="white" />
- <rect x="17.0855" y="7.64997" width="1" height="1" transform="rotate(15 17.0855 7.64997)" stroke="white" />
- <rect x="6.71928" y="3.8371" width="13" height="9" transform="rotate(15 6.71928 3.8371)" stroke="white" />
- </symbol>
-
<symbol id="orientationIndex0" viewBox="0 0 44 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="7.54004" y="29.6016" width="1.41595" height="1.41595" fill="#333333" />
@@ -481,8 +218,7 @@
</symbol>
- <symbol id="orientationIndex1" width="44" height="45" viewBox="0 0 44 45" fill="none"
- xmlns="http://www.w3.org/2000/svg">
+ <symbol id="orientationIndex1" viewBox="0 0 44 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 14.875H26V26.375C26 26.9273 25.5523 27.375 25 27.375H7C6.44772 27.375 6 26.9273 6 26.375V14.875Z"
fill="white" />
<rect x="5.5" y="14.375" width="21" height="13" rx="1.5" stroke="#333333" />
@@ -543,282 +279,6 @@
<rect x="13" y="20.875" width="18" height="1.5" fill="#333333" />
</symbol>
- <symbol xmlns="http://www.w3.org/2000/svg" id="rdvsImage" width="200" height="201" fill="none">
- <path stroke="#706F6F" stroke-dasharray="5 8" stroke-linecap="round" stroke-linejoin="round"
- d="m116.463 134.905 68.42-39.502c6.218-3.59 6.218-9.41 0-13L148.679 61.5M21 126.54l23.08-13.326c6.218-3.59 16.3-3.59 22.517 0l35.347 20.408" />
- <path fill="#fff" stroke="#DA3635" stroke-miterlimit="10"
- d="M145.673 140.952c1.319.762 1.324 2.001.017 2.763l-42.158 24.5c-1.311.762-3.454.762-4.773 0l-44.43-25.651c-1.32-.762-1.33-2.002-.019-2.763l42.16-24.5c1.31-.762 3.453-.762 4.773 0l44.43 25.651Z" />
- <path fill="#EDEDED"
- d="M136.825 141.112c1.063.616 1.067 1.617.013 2.228l-33.993 19.753c-1.058.615-2.785.615-3.848 0L63.17 142.41c-1.063-.616-1.071-1.612-.013-2.227l33.993-19.754c1.059-.615 2.786-.615 3.848 0l35.827 20.683Z" />
- <path fill="#fff" d="M68.009 103.646v37.302l32.607 18.646v-37.297l-32.607-18.651Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M68.009 103.646v37.302l32.607 18.646v-37.297l-32.607-18.651Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m100.616 122.299 32.559-18.673-32.559-18.69-32.607 18.712 32.607 18.651Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m100.638 119.544 27.697-15.887-27.697-15.901-27.737 15.923 27.737 15.865Z" />
- <path fill="#fff" d="m133.175 103.625.049 37.323-32.608 18.647v-37.297l32.559-18.673Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m133.175 103.625.049 37.323-32.608 18.647v-37.297l32.559-18.673Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M100.616 80.67 68.009 99.389l32.607 18.646 32.559-18.673-32.559-18.69ZM72.902 99.42l27.736-15.923 27.702 15.9-27.702 15.884-27.736-15.861Z" />
- <path fill="#fff" d="M68.009 99.389v6.686l32.607 18.646v-6.686L68.009 99.389Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M68.009 99.389v6.686l32.607 18.646v-6.686L68.009 99.389Z" />
- <path fill="#fff" d="M100.616 118.033v6.318l32.559-18.677v-6.319l-32.559 18.678Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M100.616 118.033v6.318l32.559-18.677v-6.319l-32.559 18.678Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M100.639 83.496v4.26l23.982 13.771 3.715-2.13-27.697-15.9ZM72.901 99.42l27.737-15.924v4.26l-24.053 13.771-3.684-2.108ZM122.428 115.62v9.75l6.301-3.595 1.027-.58v-9.759l-7.328 4.184Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M122.428 115.624v8.679l6.301-3.595v-8.675l-6.301 3.591ZM113.134 120.735v9.755l6.301-3.596 1.027-.584v-9.755l-7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M113.134 120.74v8.683l6.301-3.596v-8.679l-6.301 3.592ZM104.034 125.491v9.75l6.301-3.591 1.032-.585v-9.754l-7.333 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M104.034 125.495v8.684l6.301-3.596v-8.679l-6.301 3.591ZM122.45 127.523v9.755l6.301-3.595 1.032-.589v-9.755l-7.333 4.184Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M122.45 127.528v8.683l6.301-3.596v-8.678l-6.301 3.591ZM113.156 132.638v9.75l6.301-3.591 1.032-.584v-9.755l-7.333 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M113.156 132.643v8.683l6.301-3.595v-8.679l-6.301 3.591ZM104.062 137.394v9.755l6.296-3.596 1.032-.584v-9.755l-7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M104.062 137.402v8.678l6.296-3.595v-8.674l-6.296 3.591ZM90.644 151.983l.03-24.925 7.758 4.476-.03 24.93-7.758-4.481ZM69.262 139.646l.03-24.929 7.758 4.481-.03 24.925-7.758-4.477Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m87.991 129.367-.067 23.043-11.667-6.739.066-23.039 11.668 6.735Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m74.515 122.513 2.688-1.563-.071 25.24-2.693 1.563.076-25.24ZM88.07 128.503l2.692-1.563-.08 27.069-2.688 1.567.075-27.073Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m72.87 119.732 2.692-1.568 15.197 8.776-2.692 1.563-15.197-8.771Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m88.069 128.503-.075 27.073-1.648-.952.071-25.235-11.902-6.877-.075 25.24-1.643-.952.075-27.069 15.197 8.772Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m74.45 126.356.788-.46 11.168 6.455.009.922-11.965-6.917Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m86.415 133.273-.013 3.936-11.965-6.912.014-3.941 11.964 6.917ZM85.15 140.492l-.01 3.153-1.067-.615.014-3.153 1.062.615Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m84.22 141.29-.177.213a.209.209 0 0 1-.226.066l-.996-.318a.209.209 0 0 0-.27.239c.013.079.07.141.146.163l1.554.488a.21.21 0 0 0 .177-.027l.425-.279a.211.211 0 0 0 0-.35l-.35-.23a.213.213 0 0 0-.283.035Z" />
- <path fill="#fff" d="M68.009 63.35v37.296l32.607 18.647V81.996L68.009 63.35Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M68.009 63.35v37.296l32.607 18.647V81.996L68.009 63.35Z" />
- <path fill="#fff" d="m100.616 81.996 32.559-18.673-32.559-18.686-32.607 18.712 32.607 18.647Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m100.616 81.996 32.559-18.673-32.559-18.686-32.607 18.712 32.607 18.647Z" />
- <path fill="#fff" d="m133.175 63.322.049 37.324-32.608 18.646V81.995l32.559-18.673Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m133.175 63.322.049 37.324-32.608 18.646V81.995l32.559-18.673Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M77.473 75.686v9.755l-6.3-3.596-1.032-.584v-9.755l7.332 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M77.469 75.69v8.684l-6.301-3.6V72.1l6.301 3.59ZM86.768 80.805v9.755l-6.3-3.596-1.032-.584v-9.755l7.332 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M86.764 80.803v8.684l-6.301-3.596v-8.674l6.3 3.586ZM95.862 85.56v9.756l-6.3-3.596-1.028-.584V81.38l7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M95.862 85.564v8.683l-6.3-3.596v-8.678l6.3 3.59ZM77.572 87.589v9.755l-6.302-3.592-1.027-.588v-9.75l7.329 4.175Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M77.572 87.593v8.683l-6.302-3.595v-8.679l6.302 3.591ZM86.867 92.707v9.755l-6.3-3.595-1.028-.585v-9.755l7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M86.866 92.712v8.679l-6.3-3.591V89.12l6.3 3.591ZM95.962 97.463v9.755l-6.297-3.595-1.031-.581v-9.759l7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M95.962 97.47v8.675l-6.3-3.591v-8.679l6.3 3.596ZM122.428 75.32v9.755l6.301-3.596 1.027-.585V71.14l-7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M122.428 75.325v8.678l6.301-3.59v-8.68l-6.301 3.591ZM113.134 80.434v9.76l6.301-3.6 1.027-.585v-9.755l-7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M113.134 80.442v8.679l6.301-3.592v-8.678l-6.301 3.59ZM104.034 85.195v9.75l6.306-3.591 1.027-.589v-9.75l-7.333 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M104.034 85.198v8.683l6.306-3.596v-8.679l-6.306 3.592ZM122.449 87.22v9.755l6.301-3.596 1.032-.584V83.04l-7.333 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M122.449 87.225v8.683l6.301-3.595v-8.68l-6.301 3.592ZM113.155 92.34v9.75l6.301-3.596 1.032-.584v-9.75l-7.333 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M113.155 92.344v8.683l6.301-3.595v-8.68l-6.301 3.592ZM104.061 97.095v9.75l6.301-3.591 1.027-.584v-9.755l-7.328 4.18Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M104.061 97.1v8.679l6.301-3.591v-8.68l-6.301 3.592Z" />
- <path fill="#fff" d="M68.009 61.414v1.935l32.873 19.408v-1.93L68.009 61.413Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M68.009 61.414v1.935l32.873 19.408v-1.93L68.009 61.413Z" />
- <path fill="#fff" d="m100.882 80.826 32.174-18.451-32.825-19.452-32.222 18.491 32.873 19.412Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m100.882 80.826 32.174-18.451-32.825-19.452-32.222 18.491 32.873 19.412Z" />
- <path fill="#fff" d="m133.055 62.374.049 1.962-32.222 18.42v-1.93l32.173-18.452Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m133.055 62.374.049 1.962-32.222 18.42v-1.93l32.173-18.452Z" />
- <path fill="#fff"
- d="M98.761 41.934 69.838 58.539l3.852 2.2 27.188 15.808 25.071-14.378 3.808-2.183-30.996-18.052Zm2.139 32.169L74.177 58.565l24.602-14.12 26.692 15.572-1.638.94L100.9 74.102Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M98.761 41.934 69.838 58.539l3.852 2.2 27.188 15.808 25.071-14.378 3.808-2.183-30.996-18.052Zm2.139 32.169L74.177 58.565l24.602-14.12 26.692 15.572-1.638.94L100.9 74.102Z" />
- <path fill="#fff" d="M69.845 58.537v2.041l31.035 18.013v-2.045L69.845 58.537Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M69.845 58.537v2.041l31.035 18.013v-2.045L69.845 58.537Z" />
- <path fill="#fff" d="M100.88 76.546v2.046l28.884-16.57v-2.037L100.88 76.546Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M100.88 76.546v2.046l28.884-16.57v-2.037L100.88 76.546Z" />
- <path fill="#fff" d="m98.781 44.438.031 2.316 24.655 14.413 2.002-1.155-26.688-15.574Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m98.781 44.438.031 2.316 24.655 14.413 2.002-1.155-26.688-15.574Z" />
- <path fill="#fff" d="m74.179 58.564 24.606-14.126.03 2.316-22.621 12.961-2.015-1.151Z" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m74.179 58.564 24.606-14.126.03 2.316-22.621 12.961-2.015-1.151Z" />
- <path fill="#fff" stroke="#DA3635" stroke-miterlimit="10"
- d="M107.017 55.62c3.87 2.237 3.892 5.854.049 8.09-3.844 2.236-10.1 2.236-13.97 0-3.87-2.236-3.888-5.853-.045-8.09 3.844-2.236 10.096-2.236 13.966 0Z" />
- <path fill="#EDEDED"
- d="M104.372 57.158c2.4 1.386 2.414 3.63.031 5.017-2.382 1.386-6.26 1.386-8.66 0-2.4-1.386-2.41-3.631-.027-5.017 2.382-1.386 6.256-1.386 8.656 0Z" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="m94.597 25.945 6.571-3.821c-.837.487-1.36 1.523-1.36 2.993-.008 2.958 2.077 6.571 4.654 8.06l-6.57 3.82c-2.578-1.487-4.663-5.096-4.655-8.058 0-1.47.523-2.507 1.36-2.994ZM107.783 33.504l-6.571 3.821c-.851.492-2.024.425-3.321-.323l6.571-3.821c1.297.748 2.471.819 3.321.323ZM109.935 37.4l6.571-3.82c-.022 7.629-11.508 23.091-12.115 23.906l-6.57 3.821c.602-.81 12.092-16.273 12.114-23.907ZM89.393 15.8l6.57-3.82c2.188-1.271 5.212-1.094 8.556.836l-6.572 3.822c-3.343-1.927-6.371-2.108-8.554-.837Z" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="m97.944 16.637 6.571-3.822c6.642 3.835 12.009 13.134 11.987 20.763l-6.571 3.822c.022-7.63-5.345-16.929-11.987-20.763Z" />
- <path fill="#DA3635" stroke="#DA3635" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"
- d="M97.944 16.638c6.642 3.835 12.008 13.133 11.986 20.763-.022 7.63-11.508 23.092-12.115 23.906-.597-1.51-11.955-30.159-11.933-37.792.022-7.634 5.424-10.707 12.062-6.877Zm-.058 20.36c2.582 1.488 4.676.292 4.685-2.67.009-2.967-2.072-6.571-4.654-8.06-2.577-1.487-4.676-.296-4.685 2.67-.004 2.963 2.081 6.576 4.654 8.06Z" />
- <path stroke="#706F6F" stroke-dasharray="5 8" stroke-linecap="round" stroke-linejoin="round"
- d="m123.199 156.5 18.75 10.825c6.218 3.59 6.218 9.41 0 13l-13.487 7.787" />
- <path fill="#fff" stroke="#DA3635" stroke-miterlimit="10"
- d="M128.208 154.049c2.04 1.176 2.053 3.086.025 4.262-2.027 1.176-5.324 1.176-7.364 0s-2.049-3.086-.021-4.262c2.028-1.176 5.32-1.176 7.36 0Z" />
- <path fill="#fff" stroke="#DA3635" stroke-dasharray="5 5" stroke-linecap="round" stroke-linejoin="round"
- stroke-miterlimit="10"
- d="M132.538 185.472c5.179 2.991 5.212 7.84.062 10.83-5.145 2.991-13.521 2.991-18.699 0-5.178-2.99-5.206-7.839-.056-10.83 5.151-2.991 13.515-2.991 18.693 0Z" />
- <path fill="#fff" stroke="#706F6F" stroke-miterlimit="10"
- d="M133.431 185.957c-.006.05-.006.1-.011.156l-.017.134c-.006.05-.017.1-.023.151-.011.044-.016.089-.027.134-.012.05-.023.1-.04.15-.011.045-.027.09-.039.134-.016.05-.033.101-.05.145l-.05.134c-.022.05-.045.101-.067.156-.017.045-.039.084-.061.129-.023.05-.051.1-.078.15-.023.039-.045.084-.067.123a2.004 2.004 0 0 1-.112.179 1.174 1.174 0 0 1-.073.111 2.305 2.305 0 0 1-.145.196c-.022.028-.044.055-.067.089-.083.106-.173.206-.262.307-.022.028-.05.05-.072.078a4.946 4.946 0 0 1-.229.229c-.039.033-.073.067-.112.1-.05.045-.1.084-.15.128-.045.04-.09.079-.14.118-.05.044-.106.083-.162.128-.05.039-.1.078-.15.112-.056.039-.112.083-.173.122l-.162.112-.184.117c-.078.05-.157.095-.235.145a12.75 12.75 0 0 1-.686.363c-.061.028-.123.061-.19.089-.212.101-.429.19-.653.279-.028.011-.055.023-.089.034-.24.089-.485.173-.731.251-.173.056-.351.1-.524.15-.134.04-.268.073-.402.106-.184.045-.374.084-.564.123-.139.028-.273.062-.413.084-.055.011-.117.017-.173.028a14.53 14.53 0 0 1-.708.1c-.067.006-.14.017-.207.023-.134.016-.273.022-.413.033-.229.017-.457.034-.692.045-.145.005-.295.011-.44.011a10.38 10.38 0 0 1-.558 0c-.157 0-.313-.006-.469-.011a18.037 18.037 0 0 1-.519-.028c-.156-.011-.313-.022-.474-.039a15.472 15.472 0 0 1-1.507-.218l-.424-.084c-.212-.044-.424-.1-.636-.156-.134-.033-.274-.067-.408-.111l-.212-.067c-.212-.067-.418-.14-.619-.212-.061-.023-.117-.045-.179-.067-.184-.073-.362-.151-.541-.229-.089-.039-.178-.073-.262-.117a10.355 10.355 0 0 1-.748-.391c-2.014-1.161-3.019-2.689-3.013-4.213l-.011 4.392c-.006 1.523.999 3.046 3.013 4.213.24.139.491.267.748.39.083.039.178.078.262.117.151.067.301.14.458.201a.507.507 0 0 0 .083.028 19.559 19.559 0 0 0 .798.279l.218.067c.05.017.095.034.145.045.084.022.173.039.262.061.212.056.419.106.636.156.056.011.112.028.168.039.083.017.167.028.251.045.178.033.363.067.541.095.073.011.145.028.218.039.078.011.162.017.24.028.167.022.34.039.513.056.084.005.162.022.246.028.078.005.15.005.228.011.173.011.346.022.519.028.089.005.173.011.263.011H123.861c.056 0 .112-.011.162-.011.229-.012.463-.028.692-.045l.279-.017.134-.017c.067-.005.139-.016.206-.022.24-.028.474-.061.709-.1.056-.011.117-.017.173-.028.028-.006.056-.006.083-.011.112-.023.218-.051.33-.073.189-.039.379-.078.563-.123.134-.033.268-.072.402-.106.179-.05.352-.095.525-.15l.111-.034a9.996 9.996 0 0 0 .709-.251c.223-.089.441-.178.653-.279.061-.028.128-.056.189-.089.235-.112.469-.235.687-.363.044-.022.083-.05.122-.072.039-.023.073-.045.112-.073l.184-.117c.056-.039.112-.073.162-.112.056-.039.117-.078.173-.123l.151-.117c.055-.039.106-.083.161-.122.051-.04.095-.079.14-.118.05-.044.1-.083.145-.128l.061-.05.051-.05c.078-.079.156-.151.228-.229.023-.028.051-.05.073-.078.095-.101.184-.207.262-.307.006-.006.006-.011.011-.011.017-.023.034-.051.056-.073.05-.067.101-.128.145-.195.023-.039.05-.073.073-.112a7.648 7.648 0 0 0 .139-.229c.017-.022.028-.05.039-.072.028-.05.056-.101.078-.151.023-.044.04-.084.062-.128a9.11 9.11 0 0 0 .067-.156c.011-.023.022-.045.028-.067a.19.19 0 0 1 .022-.062l.05-.15c.011-.045.028-.09.039-.134.011-.05.028-.101.039-.151.006-.028.017-.056.023-.078.005-.017.005-.039.011-.056.011-.05.017-.1.022-.151l.017-.133c.006-.051.006-.101.011-.157 0-.028.006-.061.006-.089v-.089l.011-4.392c-.006.062-.006.123-.011.179Z" />
- <path fill="#fff" stroke="#706F6F" stroke-miterlimit="10"
- d="M130.423 181.566c4.001 2.31 4.023 6.054.05 8.364-3.973 2.31-10.44 2.31-14.441 0-4.001-2.31-4.018-6.054-.045-8.364 3.973-2.311 10.435-2.311 14.436 0Z" />
- <path fill="#DA3635"
- d="m123.755 181.778 2.578 5.814a.135.135 0 0 1-.106.19l-5.524.809a.13.13 0 0 1-.145-.078l-.43-.965a.135.135 0 0 1 .106-.19l3.331-.491c.089-.011.14-.106.106-.19l-1.997-4.514a.134.134 0 0 1 .106-.19l1.835-.268c.056-.016.112.017.14.073Z" />
- <path fill="#fff" stroke="#706F6F" stroke-miterlimit="10"
- d="M24.872 127.409c3.265 1.954 3.284 5.115.04 7.069-3.242 1.954-8.521 1.954-11.787 0-3.265-1.954-3.28-5.115-.037-7.069 3.243-1.954 8.518-1.954 11.784 0Z" />
- <path fill="#EDEDED"
- d="M23.091 128.822c2.09 1.172 2.102 3.071.027 4.242-2.075 1.172-5.454 1.172-7.544 0-2.09-1.171-2.098-3.07-.024-4.242 2.076-1.172 5.45-1.172 7.541 0Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m14.254 101.369 5.722-3.328c-.729.424-1.184 1.326-1.184 2.607-.007 2.575 1.809 5.722 4.053 7.017l-5.722 3.328c-2.244-1.296-4.06-4.438-4.053-7.018 0-1.28.455-2.182 1.184-2.606ZM25.737 107.95l-5.722 3.328c-.74.428-1.762.37-2.892-.282l5.722-3.327c1.13.652 2.152.713 2.892.281ZM27.611 111.343l5.722-3.327c-.02 6.643-10.021 20.108-10.55 20.817l-5.722 3.328c.525-.706 10.53-14.17 10.55-20.818ZM9.724 92.535l5.722-3.328c1.904-1.106 4.538-.952 7.449.73l-5.722 3.327c-2.911-1.678-5.548-1.836-7.45-.73Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="m17.169 93.264 5.722-3.328c5.784 3.34 10.457 11.437 10.438 18.08l-5.723 3.328c.02-6.644-4.653-14.74-10.437-18.08Z" />
- <path fill="#706F6F" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"
- d="M17.17 93.264c5.783 3.34 10.456 11.436 10.437 18.08-.02 6.643-10.021 20.108-10.55 20.817-.52-1.315-10.41-26.262-10.391-32.909.02-6.647 4.723-9.323 10.503-5.988Zm-.05 17.729c2.247 1.295 4.07.254 4.078-2.325.008-2.584-1.804-5.722-4.052-7.018-2.244-1.295-4.072-.258-4.08 2.325-.003 2.58 1.813 5.726 4.053 7.018Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M153.972 87.887c.241 0 .401.156.401.412v5.91c0 .24-.156.401-.401.401-.244 0-.412-.156-.412-.4V88.3c.016-.169.172-.413.412-.413Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M153.972 90.478a3.881 3.881 0 0 0 3.888-3.889 3.884 3.884 0 0 0-3.888-3.888 3.882 3.882 0 0 0-3.888 3.888 3.884 3.884 0 0 0 3.888 3.889Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M153.972 90.478a3.886 3.886 0 0 0 3.888-3.889 3.886 3.886 0 0 0-3.888-3.888 3.887 3.887 0 0 0-3.888 3.888 3.887 3.887 0 0 0 3.888 3.889Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M155.114 89.425a3.881 3.881 0 0 1-3.888-3.888c0-.898.328-1.694.724-2.263-1.141.658-1.95 1.95-1.95 3.32a3.887 3.887 0 0 0 3.888 3.888c1.298 0 2.435-.653 3.164-1.622-.573.396-1.213.565-1.938.565Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M155.114 89.425a3.881 3.881 0 0 1-3.888-3.888c0-.898.328-1.694.724-2.263-1.141.658-1.95 1.95-1.95 3.32a3.887 3.887 0 0 0 3.888 3.888c1.298 0 2.435-.653 3.164-1.622-.573.396-1.213.565-1.938.565ZM177.942 79.63h.244c.329 0 .569.241.569.57v9.638a.554.554 0 0 1-.569.569h-.244a.551.551 0 0 1-.569-.57V80.2c.013-.328.257-.568.569-.568Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M178.027 83.675a6.142 6.142 0 0 0 6.15-6.15 6.144 6.144 0 0 0-6.15-6.151 6.145 6.145 0 0 0-6.155 6.15 6.15 6.15 0 0 0 6.155 6.15Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M178.027 83.675a6.142 6.142 0 0 0 6.15-6.15 6.144 6.144 0 0 0-6.15-6.151 6.145 6.145 0 0 0-6.155 6.15 6.15 6.15 0 0 0 6.155 6.15Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M179.892 82.053a6.142 6.142 0 0 1-6.15-6.15c0-1.382.485-2.591 1.209-3.644-1.866 1.053-3.075 3.075-3.075 5.337a6.145 6.145 0 0 0 6.155 6.15c2.022 0 3.803-.968 4.941-2.506a6.353 6.353 0 0 1-3.08.813Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M179.892 82.053a6.142 6.142 0 0 1-6.15-6.15c0-1.382.485-2.591 1.209-3.644-1.866 1.053-3.075 3.075-3.075 5.337a6.145 6.145 0 0 0 6.155 6.15c2.022 0 3.803-.968 4.941-2.506a6.353 6.353 0 0 1-3.08.813ZM167.33 73.151c.329 0 .569.245.569.57v7.447a.554.554 0 0 1-.569.569.551.551 0 0 1-.568-.57V73.72c.017-.413.257-.569.568-.569Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M167.331 76.383a4.935 4.935 0 0 0 4.941-4.942 4.935 4.935 0 0 0-4.941-4.941 4.935 4.935 0 0 0-4.941 4.941 4.943 4.943 0 0 0 4.941 4.942Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M167.331 76.383a4.935 4.935 0 0 0 4.941-4.942 4.935 4.935 0 0 0-4.941-4.941 4.935 4.935 0 0 0-4.941 4.941 4.943 4.943 0 0 0 4.941 4.942Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M168.801 75.018a4.916 4.916 0 0 1-4.941-4.941c0-1.054.328-2.107.968-2.92-1.453.898-2.434 2.435-2.434 4.213a4.918 4.918 0 0 0 4.941 4.941c1.622 0 3.075-.813 3.972-2.022a4.675 4.675 0 0 1-2.506.729Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M168.801 75.018a4.916 4.916 0 0 1-4.941-4.941c0-1.054.328-2.107.968-2.92-1.453.898-2.434 2.435-2.434 4.213a4.918 4.918 0 0 0 4.941 4.941c1.622 0 3.075-.813 3.972-2.022a4.675 4.675 0 0 1-2.506.729ZM164.913 89.096c.4 0 .813.328.813.813V100.6c0 .4-.329.813-.813.813a.82.82 0 0 1-.813-.813V89.909c0-.485.328-.813.813-.813Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M164.913 93.709a7.049 7.049 0 1 0 0-14.096 7.045 7.045 0 0 0-7.048 7.048 7.04 7.04 0 0 0 7.048 7.047Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M164.913 93.709a7.049 7.049 0 1 0 0-14.096 7.045 7.045 0 0 0-7.048 7.048 7.04 7.04 0 0 0 7.048 7.047Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M167.019 91.847a7.052 7.052 0 0 1-7.047-7.048c0-1.537.484-2.99 1.381-4.128-2.106 1.209-3.488 3.475-3.488 6.079a7.053 7.053 0 0 0 7.048 7.047c2.35 0 4.372-1.137 5.67-2.835-1.142.485-2.266.885-3.564.885Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M167.019 91.847a7.052 7.052 0 0 1-7.047-7.048c0-1.537.484-2.99 1.381-4.128-2.106 1.209-3.488 3.475-3.488 6.079a7.053 7.053 0 0 0 7.048 7.047c2.35 0 4.372-1.137 5.67-2.835-1.142.485-2.266.885-3.564.885Z" />
- <path fill="#fff" stroke="#706F6F" stroke-miterlimit="10"
- d="M156.774 58.633c3.398 1.95 3.412 5.114.042 7.071-3.371 1.95-8.859 1.95-12.258 0-3.398-1.95-3.412-5.114-.034-7.071 3.377-1.958 8.859-1.951 12.25 0Z" />
- <path fill="#fff"
- d="M157.024 51.006c-.354.233-.65.553-.941.868-.611.636-1.286 1.334-1.727 2.106-.587 1.063-.684 2.853-.602 4.051.049.748.5 1.398.966 1.97.883 1.087 2.275.796 3.328-.048.956-.757 1.936-1.737 2.397-2.829.451-1.053 1.014-2.164 1.116-3.338.112-1.213-.33-2.853-1.528-3.416-.748-.344-2.106-.306-2.669.33" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M157.024 51.006c-.354.233-.65.553-.941.868-.611.636-1.286 1.334-1.727 2.106-.587 1.063-.684 2.853-.602 4.051.049.748.5 1.398.966 1.97.883 1.087 2.275.796 3.328-.048.956-.757 1.936-1.737 2.397-2.829.451-1.053 1.014-2.164 1.116-3.338.112-1.213-.33-2.853-1.528-3.416-.748-.344-2.106-.306-2.669.33" />
- <path fill="#fff"
- d="M157.024 51.006c-.354.233-.65.553-.941.868-.611.636-1.286 1.334-1.727 2.106-.587 1.063-.684 2.853-.602 4.051.049.748.5 1.398.966 1.97.883 1.087 2.275.796 3.328-.048.956-.757 1.936-1.737 2.397-2.829.451-1.053 1.014-2.164 1.116-3.338.112-1.213-.33-2.853-1.528-3.416-.748-.344-2.106-.306-2.669.33" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M157.024 51.006c-.354.233-.65.553-.941.868-.611.636-1.286 1.334-1.727 2.106-.587 1.063-.684 2.853-.602 4.051.049.748.5 1.398.966 1.97.883 1.087 2.275.796 3.328-.048.956-.757 1.936-1.737 2.397-2.829.451-1.053 1.014-2.164 1.116-3.338.112-1.213-.33-2.853-1.528-3.416-.748-.344-2.106-.306-2.669.33" />
- <path fill="#fff"
- d="M145.064 58.105c-.747.16-1.543.562-2.091 1.077-.636.587-1.053 1.32-1.529 1.994-.49.674-.931 1.358-1.14 2.178-.32 1.272-.563 2.654.218 3.829.757 1.164 1.994 1.615 3.319 1.101 1.213-.475 2.314-1.504 2.902-2.654.451-.893.907-1.567 1.188-2.741.524-2.189.699-4.11-1.887-4.76" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M145.064 58.105c-.747.16-1.543.562-2.091 1.077-.636.587-1.053 1.32-1.529 1.994-.49.674-.931 1.358-1.14 2.178-.32 1.272-.563 2.654.218 3.829.757 1.164 1.994 1.615 3.319 1.101 1.213-.475 2.314-1.504 2.902-2.654.451-.893.907-1.567 1.188-2.741.524-2.189.699-4.11-1.887-4.76" />
- <path fill="#fff"
- d="M145.064 58.105c-.747.16-1.543.562-2.091 1.077-.636.587-1.053 1.32-1.529 1.994-.49.674-.931 1.358-1.14 2.178-.32 1.272-.563 2.654.218 3.829.757 1.164 1.994 1.615 3.319 1.101 1.213-.475 2.314-1.504 2.902-2.654.451-.893.907-1.567 1.188-2.741.524-2.189.699-4.11-1.887-4.76" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M145.064 58.105c-.747.16-1.543.562-2.091 1.077-.636.587-1.053 1.32-1.529 1.994-.49.674-.931 1.358-1.14 2.178-.32 1.272-.563 2.654.218 3.829.757 1.164 1.994 1.615 3.319 1.101 1.213-.475 2.314-1.504 2.902-2.654.451-.893.907-1.567 1.188-2.741.524-2.189.699-4.11-1.887-4.76" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="M150.489 62.204c-.267 1.14 2.363.626 2.557-.16.073-.306-.049-.441-.33-.441-.427 0-.243.33-.5.562-.553.432-1.3-.203-1.727.04ZM153.327 51.801c.611.097.869.83 1.174 1.296.306.451.65.883 1.014 1.286.33.354.685.732 1.116.98.345.184.723.208 1.102.208.218 0 .218-.344 0-.344-.515 0-.883-.073-1.286-.417-.442-.355-.82-.796-1.174-1.247-.379-.476-.675-.966-.99-1.48-.209-.33-.476-.563-.869-.626-.223-.02-.305.32-.087.344ZM146.116 55.557c-.242 1.31-.674 2.605-1.053 3.891-.184.612-.441 1.223-.611 1.849-.17.65-.218 1.31-.441 1.931.048-.039.111-.087.16-.136h-.049c.049.097.073.194.121.296.015-.014.049-.039.064-.063.16-.16-.088-.403-.243-.243-.015.015-.039.049-.063.063-.112.112-.015.282.121.296h.049c.072.015.135-.063.16-.135.218-.612.272-1.247.417-1.873.17-.65.442-1.272.626-1.922.378-1.271.82-2.571 1.053-3.891.068-.184-.272-.281-.311-.063Z" />
- <path fill="#fff"
- d="M144.243 54.276c-.169.78 1.15 1.091 1.835 1.028.844-.073.868-.65.271-1.174-.393-.345-1.446-.563-1.873-.369" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M144.243 54.276c-.169.78 1.15 1.091 1.835 1.028.844-.073.868-.65.271-1.174-.393-.345-1.446-.563-1.873-.369" />
- <path fill="#fff"
- d="M144.243 54.276c-.169.78 1.15 1.091 1.835 1.028.844-.073.868-.65.271-1.174-.393-.345-1.446-.563-1.873-.369" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M144.243 54.276c-.169.78 1.15 1.091 1.835 1.028.844-.073.868-.65.271-1.174-.393-.345-1.446-.563-1.873-.369" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="M146.029 55.378c.476.61.869 1.32 1.48 1.81.757.587 1.591 1.076 2.363 1.64.184.135.354-.16.17-.306-.723-.524-1.48-.99-2.193-1.519-.651-.475-1.053-1.174-1.529-1.81-.116-.174-.422 0-.291.185ZM153.143 50.151c.014.5.048.99.048 1.48 0 .218.345.218.345 0-.015-.5-.039-.99-.049-1.48 0-.208-.344-.223-.344 0Z" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="M153.118 51.922c.088.355-.233.81-.344 1.14-.194.578-.32 1.175-.442 1.776a21.842 21.842 0 0 1-.844 3.232c-.073.208.257.306.33.097.417-1.15.674-2.339.907-3.537.112-.578.243-1.165.466-1.703.136-.345.354-.709.257-1.102-.034-.218-.378-.121-.33.097Z" />
- <path fill="#fff" stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="M153.07 51.582c-.243.578-.966.908-1.48 1.19-.699.392-1.373.82-2.082 1.212-.184.112-.014.403.17.306.781-.442 1.567-.907 2.339-1.359.524-.305 1.125-.65 1.358-1.247.122-.223-.218-.31-.305-.102ZM151.759 48.279c.403.611 1.31.65 1.849 1.101.17.136.417-.097.243-.242-.258-.218-.563-.33-.859-.476-.296-.136-.733-.281-.932-.563-.116-.174-.422-.004-.301.18ZM155.442 50.258c.039.442-.072.883-.072 1.31-.015.219.33.219.344 0 .015-.441.097-.868.073-1.31-.015-.218-.354-.228-.345 0Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M151.478 58.041c.024-.402.393-.956.732-.417.161.242-.121 1.31-.271 1.543-.418.674-.563.16-.587-.403-.02-.597.005.015.126-.723Z" />
- <path fill="#fff"
- d="M150.023 57.653c-.088 1.174.208 2.581.354 3.746.073.587.014 1.223.66 1.164.427-.048 1.504-.305 1.47-.82-.577-.014-.859.015-.956-.562-.073-.442-.024-.932-.048-1.369-.064-1.101-.112-2.363-.859-3.255" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M150.023 57.653c-.088 1.174.208 2.581.354 3.746.073.587.014 1.223.66 1.164.427-.048 1.504-.305 1.47-.82-.577-.014-.859.015-.956-.562-.073-.442-.024-.932-.048-1.369-.064-1.101-.112-2.363-.859-3.255" />
- <path fill="#fff"
- d="M150.023 57.653c-.088 1.174.208 2.581.354 3.746.073.587.014 1.223.66 1.164.427-.048 1.504-.305 1.47-.82-.577-.014-.859.015-.956-.562-.073-.442-.024-.932-.048-1.369-.064-1.101-.112-2.363-.859-3.255" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M150.023 57.653c-.088 1.174.208 2.581.354 3.746.073.587.014 1.223.66 1.164.427-.048 1.504-.305 1.47-.82-.577-.014-.859.015-.956-.562-.073-.442-.024-.932-.048-1.369-.064-1.101-.112-2.363-.859-3.255" />
- <path fill="#fff"
- d="M149.251 50.957c-1.039.844-.064 2.411.393 3.313.305.626.674 1.223.892 1.873.194.578.563 1.19-.169 1.393-1.141.33-2.989.073-3.096-1.31-.063-.806-.049-1.247-.733-1.761-.587-.452-1.615-.554-2.106-1.092-.684-.757-.072-1.674.563-2.14.418-.306.452-.553.733-.956.32-.45.626-.218 1.092.049" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M149.251 50.957c-1.039.844-.064 2.411.393 3.313.305.626.674 1.223.892 1.873.194.578.563 1.19-.169 1.393-1.141.33-2.989.073-3.096-1.31-.063-.806-.049-1.247-.733-1.761-.587-.452-1.615-.554-2.106-1.092-.684-.757-.072-1.674.563-2.14.418-.306.452-.553.733-.956.32-.45.626-.218 1.092.049" />
- <path fill="#fff"
- d="M149.251 50.957c-1.039.844-.064 2.411.393 3.313.305.626.674 1.223.892 1.873.194.578.563 1.19-.169 1.393-1.141.33-2.989.073-3.096-1.31-.063-.806-.049-1.247-.733-1.761-.587-.452-1.615-.554-2.106-1.092-.684-.757-.072-1.674.563-2.14.418-.306.452-.553.733-.956.32-.45.626-.218 1.092.049" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M149.251 50.957c-1.039.844-.064 2.411.393 3.313.305.626.674 1.223.892 1.873.194.578.563 1.19-.169 1.393-1.141.33-2.989.073-3.096-1.31-.063-.806-.049-1.247-.733-1.761-.587-.452-1.615-.554-2.106-1.092-.684-.757-.072-1.674.563-2.14.418-.306.452-.553.733-.956.32-.45.626-.218 1.092.049" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M152.419 49.172c.5.281 1.286.16 1.824.073.588-.088 1.602.194 1.446 1.038-.451.087-.698-.306-1.125-.306-.345 0-.796.16-1.165.209-.296.039-1.014.257-1.286.097-.368-.194.122-1.174.306-1.111Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M148.945 45.731c1.165-.417 1.655.966 2.14 1.703.354.5.834.917 1.174 1.432.466.684-.015.907-.403 1.518-.635-.441-1.14-1.567-1.397-2.29-.476.524-.553 1.689-.893 2.373-.306.601-.563.475-1.189.33-.524-.112-1.237-.418-1.785-.451-1.752-.136-.781-2.34 0-3.096.514-.5 1.062-.883 1.679-1.247.368-.199.232-.097.674-.272Z" />
- <path fill="#fff"
- d="M147.354 44.669c-.675-1.504 1.552-3.266 2.974-2.742 1.038.393.587 1.359.5 2.14-.097.796-.194 1.592-1.223 1.737-.417.063-.772-.073-1.165.146-.417.242-.562.747-.674 1.188-.16.65-.243 1.126-.805 1.529-.49.354-.723.563-.869 1.174-.281 1.077-1.077 2.188-2.436 1.849-1.028-.267-1.382-1.8-1.455-2.717-.049-.578.136-1.47.723-1.8.587-.33 1.334.12 1.897-.355.587-.5.733-1.518 1.553-1.776.393-.135 1.654.17 1.213-.708-.073.039-.098.087-.161.136" />
- <path stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M147.354 44.669c-.675-1.504 1.552-3.266 2.974-2.742 1.038.393.587 1.359.5 2.14-.097.796-.194 1.592-1.223 1.737-.417.063-.772-.073-1.165.146-.417.242-.562.747-.674 1.188-.16.65-.243 1.126-.805 1.529-.49.354-.723.563-.869 1.174-.281 1.077-1.077 2.188-2.436 1.849-1.028-.267-1.382-1.8-1.455-2.717-.049-.578.136-1.47.723-1.8.587-.33 1.334.12 1.897-.355.587-.5.733-1.518 1.553-1.776.393-.135 1.654.17 1.213-.708-.073.039-.098.087-.161.136" />
- <path fill="#DA3635"
- d="M147.354 44.669c-.675-1.504 1.552-3.266 2.974-2.742 1.038.393.587 1.359.5 2.14-.097.796-.194 1.592-1.223 1.737-.417.063-.772-.073-1.165.146-.417.242-.562.747-.674 1.188-.16.65-.243 1.126-.805 1.529-.49.354-.723.563-.869 1.174-.281 1.077-1.077 2.188-2.436 1.849-1.028-.267-1.382-1.8-1.455-2.717-.049-.578.136-1.47.723-1.8.587-.33 1.334.12 1.897-.355.587-.5.733-1.518 1.553-1.776.393-.135 1.654.17 1.213-.708-.073.039-.098.087-.161.136" />
- <path stroke="#DA3635" stroke-linejoin="round" stroke-miterlimit="10"
- d="M147.354 44.669c-.675-1.504 1.552-3.266 2.974-2.742 1.038.393.587 1.359.5 2.14-.097.796-.194 1.592-1.223 1.737-.417.063-.772-.073-1.165.146-.417.242-.562.747-.674 1.188-.16.65-.243 1.126-.805 1.529-.49.354-.723.563-.869 1.174-.281 1.077-1.077 2.188-2.436 1.849-1.028-.267-1.382-1.8-1.455-2.717-.049-.578.136-1.47.723-1.8.587-.33 1.334.12 1.897-.355.587-.5.733-1.518 1.553-1.776.393-.135 1.654.17 1.213-.708-.073.039-.098.087-.161.136" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M159.036 165.114c1.498.863 1.504 2.264.018 3.131-1.486.863-3.906.863-5.405 0-1.498-.864-1.504-2.264-.015-3.131 1.486-.867 3.906-.867 5.402 0Z" />
- <path fill="#EDEDED"
- d="M158.092 165.66c.97.562.977 1.471.012 2.032-.964.562-2.536.562-3.509 0-.97-.561-.977-1.47-.012-2.032.967-.558 2.536-.558 3.509 0Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M143.649 127.091c-.796.494-.616 1.758 0 2.115l1.358.784a.94.94 0 0 0 .94 0l4.779-2.759c.528-.305.683-1.541 0-1.879l-4.877 2.566-2.2-.827Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M154.876 124.323a3.56 3.56 0 0 0-3.604 0l-1.163.671-.519-.299a1.79 1.79 0 0 0-1.791 0l-4.15 2.396a.927.927 0 0 0 0 1.605l1.358.784a.94.94 0 0 0 .94 0l4.779-2.759a.791.791 0 0 0 0-1.37l-.159-.091.934-.537a3.117 3.117 0 0 1 3.146 0 3.11 3.11 0 0 1 1.575 2.725v25.99h.457v-25.99a3.577 3.577 0 0 0-1.803-3.125ZM154.968 166.633c0 .449.632.812 1.41.812.778 0 1.41-.363 1.41-.812v-.812h-2.823v.812h.003Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M156.381 166.633c.778 0 1.409-.363 1.409-.811 0-.449-.631-.812-1.409-.812-.779 0-1.41.363-1.41.812 0 .448.631.811 1.41.811Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M155.529 165.74c0 .271.382.488.852.488s.851-.22.851-.488v-18.221h-1.703v18.221Z" />
- <path fill="#fff" stroke="#706F6F" stroke-linejoin="round" stroke-miterlimit="10"
- d="M156.381 148.007c.47 0 .851-.219.851-.488 0-.27-.381-.489-.851-.489-.471 0-.852.219-.852.489 0 .269.381.488.852.488Z" />
- </symbol>
- <symbol id="redirect" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M9.46967 12.1367C9.17678 12.4296 9.17678 12.9044 9.46967 13.1973C9.76256 13.4902 10.2374 13.4902 10.5303 13.1973L9.46967 12.1367ZM16.8943 6.83336C17.1872 6.54047 17.1872 6.0656 16.8943 5.7727C16.6014 5.47981 16.1265 5.47981 15.8336 5.7727L16.8943 6.83336ZM10.5303 13.1973L16.8943 6.83336L15.8336 5.7727L9.46967 12.1367L10.5303 13.1973Z"
- fill="#FF7100" />
- <path fill-rule="evenodd" clip-rule="evenodd" d="M13.8887 3.82812L19.192 3.47457L18.8384 8.77787L13.8887 3.82812Z"
- fill="#FF7100" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M6 6.75C5.86193 6.75 5.75 6.86193 5.75 7V16C5.75 16.1381 5.86193 16.25 6 16.25H16C16.1381 16.25 16.25 16.1381 16.25 16V11.5L17.75 10.2308V16C17.75 16.9665 16.9665 17.75 16 17.75H6C5.0335 17.75 4.25 16.9665 4.25 16V7C4.25 6.0335 5.0335 5.25 6 5.25H12.7143L11 6.75H6Z"
- fill="#FF7100" />
- </symbol>
-
- <svg id="eye" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M10.0002 3.75C5.8335 3.75 2.27516 6.34167 0.833496 10C2.27516 13.6583 5.8335 16.25 10.0002 16.25C14.1668 16.25 17.7252 13.6583 19.1668 10C17.7252 6.34167 14.1668 3.75 10.0002 3.75ZM10.0002 14.1667C7.70016 14.1667 5.8335 12.3 5.8335 10C5.8335 7.7 7.70016 5.83333 10.0002 5.83333C12.3002 5.83333 14.1668 7.7 14.1668 10C14.1668 12.3 12.3002 14.1667 10.0002 14.1667ZM10.0002 7.5C8.61683 7.5 7.50016 8.61667 7.50016 10C7.50016 11.3833 8.61683 12.5 10.0002 12.5C11.3835 12.5 12.5002 11.3833 12.5002 10C12.5002 8.61667 11.3835 7.5 10.0002 7.5Z"
- fill="#333333" />
- </svg>
-
<symbol id="aidantsConnect" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#FFE5E4" />
<path
@@ -883,35 +343,6 @@
d="M35.5098 27.5996L28.5664 18.5469V27.4141H26.125V13.0977H27.3457L34.1035 21.7305V13.0977H36.5449V27.5996H35.5098Z"
fill="#A50F0E" />
</symbol>
-
- <symbol id="passNumerique" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect width="40" height="40" rx="20" fill="#FFE5E4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M20.4865 11.2313H31.7452L29.7343 6.91895L20.4865 11.2313ZM19.6542 27.7831H8.39551L10.4064 32.0954L19.6542 27.7831Z"
- fill="#DA3635" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M16.925 11.8307L27.1288 7.07262L23.4839 4.01416L16.925 11.8307ZM33.4459 14.9321L33.4459 14.9321L31.4857 10.7285L31.4858 10.7285L33.4459 14.9321ZM23.1658 27.1835L16.6069 35.0001L12.9619 31.9416L23.1658 27.1835Z"
- fill="#DA3635" />
- <path d="M5.92188 12.1826H34.079V26.8319H5.92188V12.1826Z" fill="#DA3635" />
- <path
- d="M8.9668 16.8436C8.9668 16.4759 9.26492 16.1777 9.63267 16.1777H16.4817C16.8494 16.1777 17.1476 16.4759 17.1476 16.8436C17.1476 17.2114 16.8494 17.5095 16.4817 17.5095H9.63267C9.26492 17.5095 8.9668 17.2114 8.9668 16.8436Z"
- fill="#FFE5E4" />
- <path
- d="M8.9668 19.5072C8.9668 19.1394 9.26492 18.8413 9.63267 18.8413H19.9062C20.274 18.8413 20.5721 19.1394 20.5721 19.5072C20.5721 19.8749 20.274 20.1731 19.9062 20.1731H9.63267C9.26492 20.1731 8.9668 19.8749 8.9668 19.5072Z"
- fill="#FFE5E4" />
- <path
- d="M8.9668 22.1708C8.9668 21.803 9.26492 21.5049 9.63267 21.5049H24.282C24.6497 21.5049 24.9478 21.803 24.9478 22.1708C24.9478 22.5385 24.6497 22.8366 24.282 22.8366H9.63267C9.26492 22.8366 8.9668 22.5385 8.9668 22.1708Z"
- fill="#FFE5E4" />
- <path
- d="M29.3222 19.5073C29.3222 20.0852 28.8538 20.5537 28.2759 20.5537C27.698 20.5537 27.2295 20.0852 27.2295 19.5073C27.2295 18.9294 27.698 18.4609 28.2759 18.4609C28.8538 18.4609 29.3222 18.9294 29.3222 19.5073Z"
- fill="#FFE5E4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M27.0254 16.9421C27.4301 16.7447 27.8759 16.6459 28.3262 16.6538C28.7765 16.6616 29.2185 16.7759 29.6161 16.9874C29.8511 17.1123 30.0665 17.269 30.2568 17.4524C30.4459 17.6347 30.4515 17.9358 30.2692 18.1249C30.0869 18.314 29.7858 18.3196 29.5967 18.1373C29.4698 18.015 29.3262 17.9105 29.1696 17.8273C28.9045 17.6863 28.6098 17.6101 28.3096 17.6049C28.0094 17.5996 27.7122 17.6655 27.4424 17.7971C27.2629 17.8846 27.099 17.9996 26.9561 18.1373C26.767 18.3196 26.4659 18.314 26.2836 18.1249C26.1013 17.9358 26.1068 17.6347 26.2959 17.4524C26.5102 17.2458 26.7562 17.0734 27.0254 16.9421Z"
- fill="#FFE5E4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M28.344 15.7028C27.7436 15.6923 27.1493 15.8241 26.6096 16.0873C26.1658 16.3038 25.7693 16.604 25.4415 16.9706C25.2663 17.1664 24.9657 17.1831 24.7699 17.008C24.5741 16.8329 24.5573 16.5322 24.7324 16.3364C25.1422 15.8783 25.6378 15.5029 26.1926 15.2323C26.8672 14.9033 27.6101 14.7386 28.3606 14.7517C29.111 14.7648 29.8478 14.9553 30.5105 15.3077C31.0063 15.5714 31.4502 15.92 31.8227 16.3364C31.9978 16.5322 31.981 16.8329 31.7852 17.008C31.5895 17.1831 31.2888 17.1664 31.1136 16.9706C30.8157 16.6375 30.4606 16.3585 30.0639 16.1476C29.5337 15.8657 28.9443 15.7133 28.344 15.7028Z"
- fill="#FFE5E4" />
- </symbol>
<symbol id="maisonFranceService" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#FFE5E4" />
<path
@@ -1026,72 +457,6 @@
fill="#A50F0E" />
</symbol>
-
-
-
- <symbol id="pix" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect width="40" height="40" rx="20" fill="#FFE5E4" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M30.9248 22.9876L31.441 22.3612C31.9003 21.8316 32.2268 21.3201 32.4202 20.8163L36.3498 25.614C37.063 26.5278 37.029 26.6971 35.8403 26.6971H35.4328C34.2441 26.6971 33.8026 26.4602 33.0894 25.614L30.9248 22.9876ZM30.9248 16.461L33.0894 13.8346C33.8026 12.9884 34.2441 12.7515 35.4328 12.7515H35.8403C37.029 12.7515 37.063 12.9207 36.3498 13.8346L32.4202 18.6322C32.2268 18.1285 31.9003 17.617 31.441 17.0874L30.9248 16.461Z"
- fill="#A50F0E" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M24.9242 26.6971C23.7356 26.6971 23.7015 26.5278 24.4148 25.614L28.4902 20.6382C28.7958 20.2659 28.9656 19.9612 28.9656 19.7243C28.9656 19.4535 28.7958 19.1488 28.4902 18.8104L24.4148 13.8346C23.7015 12.9207 23.7356 12.7515 24.9242 12.7515H25.3317C26.5204 12.7515 26.9619 12.9884 27.6751 13.8346L30.7996 17.6257C32.1241 19.1488 32.1241 20.2997 30.7996 21.8229L27.6751 25.614C26.9619 26.4602 26.5204 26.6971 25.3317 26.6971H24.9242Z"
- fill="#A50F0E" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M2.83301 31.0362C2.83301 32.0468 3.0865 32.2995 4.10048 32.2995H4.43844C5.45241 32.2995 5.7059 32.0468 5.7059 31.0362V25.1692C6.46638 26.3763 7.84652 26.9939 9.84627 26.9939C13.7613 26.9939 15.7047 24.9446 15.7047 20.8742V18.4319C15.7047 14.3615 13.6205 12.4526 9.25477 12.4526C5.19892 12.4526 2.83301 14.4177 2.83301 18.4319V31.0362ZM12.8037 20.9303C12.8037 23.2884 12.015 24.2709 9.28297 24.2709C6.49454 24.2709 5.7059 23.2603 5.7059 20.9303V18.5161C5.7059 16.1581 6.5509 15.1475 9.28297 15.1475C12.0714 15.1475 12.8037 16.1581 12.8037 18.5161V20.9303Z"
- fill="#A50F0E" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M18.414 25.4C18.414 26.4106 18.6675 26.6633 19.6814 26.6633H20.0475C21.0615 26.6633 21.315 26.4106 21.315 25.4V14.0029C21.315 12.9923 21.0615 12.7396 20.0475 12.7396H19.6814C18.6675 12.7396 18.414 12.9923 18.414 14.0029V25.4ZM18.6111 9.70786C19.3153 10.3816 20.4419 10.3816 21.1179 9.70786C21.822 9.00603 21.822 7.88319 21.1179 7.20947C20.4419 6.50765 19.3153 6.50765 18.6111 7.20947C17.907 7.88319 17.907 9.00603 18.6111 9.70786Z"
- fill="#A50F0E" />
- </symbol>
-
-
-
-
-
- <symbol id="espaceSante" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
- <rect width="40" height="40" rx="20" fill="#FFE5E4" />
- <path
- d="M34.8122 24.0855L35.1053 23.6611H34.1341L33.8541 24.0855H32.2617V29.8295H35.8403V29.0989H33.0142V26.7103H35.8534V25.9797H33.0142V24.8161H35.8534V24.0855H34.8122Z"
- fill="#A50F0E" />
- <path d="M27.1484 24.816H29.0427V29.8295H29.8126V24.816H31.7507V24.0854H27.1484V24.816Z" fill="#A50F0E" />
- <path
- d="M24.6807 23.9365C23.342 23.9365 22.209 25.0958 22.209 26.4651V29.8293H22.9614V26.4651C22.9614 25.4633 23.7139 24.6802 24.6763 24.6802C25.6475 24.6802 26.3475 25.4589 26.3475 26.5307V29.8293H27.1087V26.5307C27.1174 25.1002 26.0238 23.9365 24.6807 23.9365Z"
- fill="#A50F0E" />
- <path
- d="M18.876 23.9365C17.5374 23.9365 16.4043 25.0958 16.4043 26.4651V29.8293H17.1568V27.655H20.5472V29.8293H21.3084V26.5307C21.3084 25.1002 20.2147 23.9365 18.876 23.9365ZM20.5472 26.9288H17.1568V26.4651C17.1568 25.4633 17.9092 24.6802 18.8716 24.6802C19.8428 24.6802 20.5428 25.4589 20.5428 26.5307V26.9288H20.5472Z"
- fill="#A50F0E" />
- <path
- d="M15.6378 28.0839C15.6378 27.2439 15.1653 26.6227 14.2335 26.2421C13.1836 25.7959 13.0961 25.6384 13.0961 25.2797C13.0961 25.0216 13.2011 24.711 13.7129 24.711C14.1241 24.711 14.3035 24.8685 14.3691 25.2972L14.3997 25.5072L15.1347 25.3716L15.0997 25.1703C14.9641 24.4047 14.461 23.9629 13.7216 23.9629C12.9167 23.9629 12.3524 24.5272 12.3524 25.3366C12.3524 25.7215 12.4967 26.0759 12.7548 26.334C12.9692 26.544 13.1879 26.6709 13.7173 26.9158C14.1854 27.1214 14.391 27.2396 14.566 27.4014C14.776 27.6158 14.881 27.8608 14.881 28.1539C14.881 28.7795 14.391 29.2476 13.7391 29.2476C13.1004 29.2476 12.6192 28.8363 12.6192 28.2939V27.6683H11.8799V28.2983C11.8799 29.2213 12.7242 30 13.7216 30C14.7803 30 15.6378 29.1426 15.6378 28.0839Z"
- fill="#A50F0E" />
- <path
- d="M34.1303 22.2346H31.3042V19.8416H34.1478V19.1111H31.3042V17.9474H34.1303V17.2168H30.5518V22.9652H34.1303V22.2346Z"
- fill="#A50F0E" />
- <path
- d="M29.3134 21.7403C28.6353 22.2259 28.2547 22.3834 27.7341 22.3834C26.7498 22.3834 25.9361 21.7666 25.6342 20.8873C25.6255 20.8566 25.6124 20.8304 25.6036 20.7998V20.7954C25.5424 20.5854 25.5074 20.3579 25.5074 20.126C25.5074 19.8898 25.5424 19.6667 25.6036 19.4567V19.4523C25.6124 19.4217 25.6255 19.3911 25.6342 19.3605C25.9361 18.4811 26.7498 17.8687 27.7341 17.8687C28.2547 17.8687 28.6397 18.0262 29.3134 18.5118L29.484 18.6343L29.8996 18.0174L29.7377 17.8993C28.9547 17.3306 28.4122 17.1206 27.7297 17.1206C27.7254 17.1206 27.7254 17.1206 27.721 17.1206C26.9379 17.1206 26.1986 17.4356 25.6342 18.0087C25.0699 18.5774 24.7637 19.3298 24.7637 20.1173C24.7637 20.1217 24.7637 20.126 24.7637 20.1304C24.7637 20.1348 24.7637 20.1392 24.7637 20.1435C24.7637 20.931 25.0743 21.6791 25.6342 22.2522C26.1986 22.8253 26.9379 23.1402 27.721 23.1402C27.7254 23.1402 27.7254 23.1402 27.7297 23.1402C28.4122 23.1402 28.9547 22.9303 29.7377 22.3615L29.8996 22.2434L29.484 21.6266L29.3134 21.7403Z"
- fill="#A50F0E" />
- <path
- d="M21.7491 17.0684C20.4104 17.0684 19.2773 18.2277 19.2773 19.597V22.9611H20.0298V20.7869H23.4202V22.9611H24.1814V19.6626C24.1814 18.232 23.0921 17.0684 21.7491 17.0684ZM20.0298 20.0651V19.6013C20.0298 18.5995 20.7823 17.8164 21.7447 17.8164C22.7159 17.8164 23.4158 18.5951 23.4158 19.667V20.0651H20.0298Z"
- fill="#A50F0E" />
- <path
- d="M15.4277 21.2678H16.7664C17.8207 21.2678 18.8138 20.301 18.8138 19.2773C18.8138 18.7961 18.5557 18.223 18.1707 17.8467C17.9826 17.6674 17.7595 17.523 17.5057 17.4136C17.2126 17.278 16.9414 17.2124 16.6964 17.2124H14.6709V22.9608H15.4234V21.2678H15.4277ZM15.4277 17.9474H16.6877C17.4664 17.9474 18.0569 18.5161 18.0569 19.2729C18.0569 19.9947 17.497 20.5372 16.7533 20.5372H15.4277V17.9474Z"
- fill="#A50F0E" />
- <path
- d="M13.9015 21.2196C13.9015 20.3797 13.429 19.7585 12.4972 19.3779C11.4472 18.9316 11.3597 18.7742 11.3597 18.4154C11.3597 18.1573 11.4647 17.8467 11.9766 17.8467C12.3878 17.8467 12.5672 18.0042 12.6328 18.4329L12.6634 18.6429L13.3984 18.5073L13.3634 18.3061C13.2277 17.5405 12.7246 17.0986 11.9853 17.0986C11.1804 17.0986 10.616 17.663 10.616 18.4723C10.616 18.8573 10.7604 19.2116 11.0185 19.4697C11.2329 19.6797 11.4516 19.8066 11.9809 20.0516C12.449 20.2572 12.6547 20.3753 12.8296 20.5372C13.0396 20.7515 13.1446 20.9965 13.1446 21.2896C13.1446 21.9152 12.6547 22.3833 12.0028 22.3833C11.3641 22.3833 10.8829 21.9721 10.8829 21.4296V20.804H10.1436V21.4296C10.1436 22.3527 10.9879 23.1314 11.9853 23.1314C13.0396 23.1358 13.9015 22.2739 13.9015 21.2196Z"
- fill="#A50F0E" />
- <path
- d="M6.74855 17.9913H9.57463V17.2607H5.99609V23.0091H9.57463V22.2786H6.74855V19.8856H9.59213V19.155H6.74855V17.9913Z"
- fill="#A50F0E" />
- <path
- d="M35.8493 17.0725C35.8493 16.2238 35.1581 15.5283 34.305 15.5283L24.0462 15.5108V12.9297C24.0462 11.4991 22.5413 10.3354 21.1983 10.3354C19.8596 10.3354 18.7266 11.4948 18.7266 12.864V16.2282H19.479V12.864C19.479 11.8622 20.2315 11.0792 21.1939 11.0792C22.1651 11.0792 23.2807 11.8579 23.2807 12.9297V16.2457L34.3006 16.237C34.7425 16.237 35.0881 16.6307 35.0881 17.0725V22.9653H35.8405V17.0725H35.8493Z"
- fill="#A50F0E" />
- <path
- d="M15.0781 16.4166C15.87 16.4166 16.618 16.0973 17.1868 15.5242C17.7555 14.9511 18.0661 14.1942 18.0661 13.3937C18.0661 12.6018 17.7511 11.8538 17.1824 11.285C16.6093 10.712 15.8568 10.397 15.0563 10.397C13.4332 10.397 12.0596 11.7838 12.0596 13.4243C12.0639 15.0429 13.4464 16.4166 15.0781 16.4166ZM15.065 11.1407C16.3337 11.1407 17.3311 12.1337 17.3311 13.398C17.3311 14.6755 16.3424 15.6773 15.0825 15.6773C13.8095 15.6773 12.812 14.6842 12.812 13.4199C12.8077 12.1425 13.8007 11.1407 15.065 11.1407Z"
- fill="#A50F0E" />
- <path
- d="M5.68104 29.103C5.23919 29.103 4.89359 28.7312 4.89359 28.2893V12.2822C4.89359 11.5822 5.37043 11.0923 6.04852 11.0923C6.80972 11.0923 7.38281 11.6522 7.38281 12.3959V16.2369H8.14402V12.3916C8.14402 11.9235 8.22276 11.7047 8.48087 11.4554C8.73461 11.2148 9.07146 11.0835 9.42581 11.0835C10.1301 11.0835 10.6639 11.6479 10.6639 12.3916V16.2369H11.4163V12.3259C11.4163 11.2629 10.4889 10.3311 9.43456 10.3311C8.91835 10.3311 8.37588 10.5585 7.9909 10.9348C7.89028 11.031 7.82029 11.1141 7.75029 11.2235C7.69342 11.1448 7.63655 11.0791 7.5578 10.996L7.54905 10.9873C7.36094 10.8079 7.15095 10.6548 6.94096 10.5454L6.93222 10.541C6.66973 10.4229 6.37662 10.3617 6.07039 10.3617C4.97233 10.3617 4.14551 11.241 4.14551 12.4091V21.7272V28.2981C4.14551 29.1468 4.83672 29.8424 5.68979 29.8424H11.4163V29.1118L5.68104 29.103Z"
- fill="#A50F0E" />
- </symbol>
<symbol id="radio-unchecked" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM12 20C7.58 20 4 16.42 4 12C4 7.58 7.58 4 12 4C16.42 4 20 7.58 20 12C20 16.42 16.42 20 12 20Z"
@@ -1108,8 +473,6 @@
fill="black" />
</symbol>
-
-
<symbol id="visibility" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path id="Vector"
d="M8.00002 3.0386C4.66669 3.0386 1.82002 5.11194 0.666687 8.0386C1.82002 10.9653 4.66669 13.0386 8.00002 13.0386C11.3334 13.0386 14.18 10.9653 15.3334 8.0386C14.18 5.11194 11.3334 3.0386 8.00002 3.0386ZM8.00002 11.3719C6.16002 11.3719 4.66669 9.8786 4.66669 8.0386C4.66669 6.1986 6.16002 4.70527 8.00002 4.70527C9.84002 4.70527 11.3334 6.1986 11.3334 8.0386C11.3334 9.8786 9.84002 11.3719 8.00002 11.3719ZM8.00002 6.0386C6.89335 6.0386 6.00002 6.93194 6.00002 8.0386C6.00002 9.14527 6.89335 10.0386 8.00002 10.0386C9.10669 10.0386 10 9.14527 10 8.0386C10 6.93194 9.10669 6.0386 8.00002 6.0386Z"
@@ -1121,6 +484,4 @@
d="M7.99999 4.70527C9.83999 4.70527 11.3333 6.1986 11.3333 8.0386C11.3333 8.3786 11.2667 8.70527 11.1733 9.01193L13.2133 11.0519C14.14 10.2319 14.8733 9.20527 15.3333 8.03193C14.18 5.11193 11.3333 3.0386 7.99999 3.0386C7.15332 3.0386 6.33999 3.17193 5.57332 3.4186L7.01999 4.86527C7.33332 4.77193 7.65999 4.70527 7.99999 4.70527ZM1.80666 2.4786C1.54666 2.7386 1.54666 3.1586 1.80666 3.4186L3.11999 4.73193C2.03999 5.59193 1.17999 6.72527 0.666656 8.0386C1.81999 10.9653 4.66666 13.0386 7.99999 13.0386C9.01332 13.0386 9.97999 12.8386 10.8733 12.4919L12.6867 14.3053C12.9467 14.5653 13.3667 14.5653 13.6267 14.3053C13.8867 14.0453 13.8867 13.6253 13.6267 13.3653L2.75332 2.4786C2.49332 2.2186 2.06666 2.2186 1.80666 2.4786ZM7.99999 11.3719C6.15999 11.3719 4.66666 9.8786 4.66666 8.0386C4.66666 7.52527 4.78666 7.0386 4.99332 6.61193L6.03999 7.6586C6.01999 7.7786 5.99999 7.90527 5.99999 8.0386C5.99999 9.14527 6.89332 10.0386 7.99999 10.0386C8.13332 10.0386 8.25332 10.0186 8.37999 9.99193L9.42666 11.0386C8.99332 11.2519 8.51332 11.3719 7.99999 11.3719ZM9.97999 7.8186C9.87999 6.88527 9.14666 6.1586 8.21999 6.0586L9.97999 7.8186Z"
fill="black" />
</symbol>
-
-
</svg>
\ No newline at end of file
diff --git a/src/assets/form/validate.svg b/src/assets/form/validate.svg
deleted file mode 100644
index 991694b27aee6ebb7e16c88850251638d0e014f1..0000000000000000000000000000000000000000
--- a/src/assets/form/validate.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="13" cy="13" r="13" fill="#47C562"/>
-<path d="M8 13.8182L11.8889 17L18 10" stroke="white" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/assets/ico/adress.svg b/src/assets/ico/address.svg
similarity index 100%
rename from src/assets/ico/adress.svg
rename to src/assets/ico/address.svg
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 26da3dd6b2ba81b12f3724c6134356649e096c8b..ed18116b8460de4ac8ad10cd625414705c82b247 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -116,7 +116,7 @@
fill="#010176" />
</symbol>
- <symbol id="adress" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M11 2C12.6055 2.0145 14.1397 2.68885 15.265 3.87463C16.3902 5.06042 17.0142 6.66048 16.9998 8.32269C16.9998 11.8208 12.1242 19 11 19C9.87584 19 5.00025 11.8208 5.00025 8.32269C4.98578 6.66048 5.60982 5.06042 6.73504 3.87463C7.86026 2.68885 9.39446 2.0145 11 2ZM10.9999 5.55695C12.0865 5.53677 13.0768 6.19906 13.5059 7.23274C13.9349 8.26643 13.7173 9.4661 12.9553 10.2683C12.1933 11.0704 11.0384 11.3157 10.0329 10.8888C9.02744 10.4619 8.37129 9.44779 8.37266 8.32272C8.36215 6.80858 9.53743 5.57133 10.9999 5.55695Z"
fill="#333333" />
@@ -406,12 +406,17 @@
<path d="M16 6L8 12.5L16 19" fill="currentColor" stroke-linecap="round" stroke-linejoin="round" />
</symbol>
- <symbol id="add" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+ <symbol id="plus" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
<path
d="M12 7C11.45 7 11 7.45 11 8V11H8C7.45 11 7 11.45 7 12C7 12.55 7.45 13 8 13H11V16C11 16.55 11.45 17 12 17C12.55 17 13 16.55 13 16V13H16C16.55 13 17 12.55 17 12C17 11.45 16.55 11 16 11H13V8C13 7.45 12.55 7 12 7Z"
fill="currentColor" />
</symbol>
+ <symbol id="minus" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path d="M18 13H6C5.45 13 5 12.55 5 12C5 11.45 5.45 11 6 11H18C18.55 11 19 11.45 19 12C19 12.55 18.55 13 18 13Z"
+ fill="currentColor" />
+ </symbol>
+
<symbol id="edit" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M3 14.5501V17.0835C3 17.3168 3.18333 17.5001 3.41667 17.5001H5.95C6.05833 17.5001 6.16667 17.4585 6.24167 17.3751L15.3417 8.28346L12.2167 5.15846L3.125 14.2501C3.04167 14.3335 3 14.4335 3 14.5501ZM17.7583 5.8668C18.0833 5.5418 18.0833 5.0168 17.7583 4.6918L15.8083 2.7418C15.4833 2.4168 14.9583 2.4168 14.6333 2.7418L13.1083 4.2668L16.2333 7.3918L17.7583 5.8668Z"
diff --git a/src/assets/img/onlineMediationBeginning.svg b/src/assets/img/onlineMediationBeginning.svg
deleted file mode 100644
index 39de98a87959b2ae17d9c02c7b081a704d62b81f..0000000000000000000000000000000000000000
--- a/src/assets/img/onlineMediationBeginning.svg
+++ /dev/null
@@ -1,233 +0,0 @@
-<svg width="200" height="201" viewBox="0 0 200 201" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_11300_191566)">
-<path d="M34.0001 113.833L12.9833 101.799C6.72166 98.2133 6.70077 92.3723 12.9367 88.7719L40.3447 72.9479C46.5625 69.3581 56.6436 69.3581 62.8614 72.9479L178.986 139.993" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M109.406 131.833L28.0001 178.833" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M34 113.833L115.406 160.833" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M180.084 142.273L190.103 147.951C196.42 151.53 196.467 157.397 190.208 161.011L164.414 175.903C158.196 179.493 148.115 179.493 141.898 175.903L115.292 160.543" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M183.915 137.345C187.146 139.207 187.16 142.228 183.955 144.097C180.75 145.966 175.531 145.959 172.3 144.097C169.069 142.235 169.056 139.214 172.267 137.345C175.472 135.483 180.684 135.483 183.915 137.345Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M178 95.5L178 140.5" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<path d="M94.6214 57.1831C96.4501 58.0939 96.4615 59.5728 94.6441 60.4836C92.8268 61.3944 89.8722 61.3944 88.0435 60.4836C86.2148 59.5728 86.2072 58.0939 88.0246 57.1831C89.8419 56.2723 92.7928 56.2723 94.6214 57.1831Z" fill="#EDEDED"/>
-<path d="M156.014 122.542L119.826 101.614C119.236 101.272 118.282 101.272 117.698 101.614L54.3054 138.519C54.0106 138.687 53.8661 138.913 53.8661 139.139L53.8545 143.089C53.8545 143.314 53.999 143.54 54.2996 143.708L90.4878 164.637C91.0775 164.978 92.0313 164.978 92.6209 164.637L156.014 127.737C156.303 127.569 156.453 127.343 156.453 127.123L156.465 123.173C156.465 123.202 156.453 123.237 156.447 123.266C156.494 123.005 156.355 122.739 156.014 122.542Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M153.395 122.044L118.924 102.106C118.363 101.781 117.455 101.781 116.895 102.106L56.5193 137.257C56.2419 137.419 56.1031 137.633 56.1031 137.847L56.0916 141.606C56.0916 141.82 56.2303 142.034 56.5136 142.196L90.9848 162.135C91.5456 162.459 92.4589 162.459 93.0139 162.135L153.389 126.984C153.667 126.821 153.805 126.613 153.805 126.399L153.817 122.64C153.817 122.669 153.805 122.698 153.8 122.727C153.852 122.478 153.719 122.229 153.395 122.044Z" fill="#EDEDED"/>
-<path d="M97.5812 52.529L100.951 52.5C100.818 52.5 100.68 52.5405 100.547 52.6158L97.1765 52.6448C97.3037 52.5637 97.4424 52.529 97.5812 52.529Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M58.0283 134.39L54.6581 134.419C54.2708 134.425 53.9008 134.136 53.7332 133.661L57.1034 133.632C57.2768 134.112 57.6468 134.396 58.0283 134.39Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M41.6569 86.6729L38.2866 86.7018L97.1763 52.6394L100.546 52.6162L41.6569 86.6729Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M57.1036 133.631L53.7334 133.66L37.7898 88.4098L41.16 88.3809L57.1036 133.631Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M41.1599 88.3812L37.7897 88.4101C37.5585 87.7558 37.7839 86.9914 38.2868 86.7018L41.6571 86.6729C41.1542 86.9624 40.9287 87.7268 41.1599 88.3812Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M100.547 52.6158C101.055 52.3204 101.645 52.6158 101.876 53.2643L117.82 98.5149C118.051 99.1635 117.826 99.9279 117.323 100.217L58.433 134.28C57.9243 134.575 57.3289 134.28 57.1034 133.631L41.1598 88.3808C40.9286 87.7264 41.154 86.962 41.657 86.6724L100.547 52.6158Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M100.061 56.6402C100.541 56.3622 101.096 56.6402 101.316 57.254L116.352 99.9219C116.566 100.536 116.357 101.254 115.883 101.532L60.3582 133.648C59.8784 133.926 59.3177 133.648 59.1038 133.04L44.062 90.3668C43.8481 89.7529 44.0562 89.0291 44.536 88.7569L100.061 56.6402Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M154.02 120.069L154.008 123.845C154.008 124.059 153.87 124.268 153.592 124.43L153.604 120.654C153.881 120.492 154.02 120.284 154.02 120.069Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M55.884 139.116L55.8956 135.34C55.8956 135.554 56.0343 135.768 56.3176 135.936L56.306 139.712C56.0228 139.544 55.884 139.33 55.884 139.116Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M153.604 120.654L153.592 124.43L92.9624 159.732L92.974 155.956L153.604 120.654Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M90.9333 155.956L90.9217 159.732L56.3059 139.712L56.3175 135.937L90.9333 155.956Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M92.9741 155.956L92.9625 159.732C92.4018 160.056 91.4884 160.056 90.9219 159.732L90.9334 155.956C91.4942 156.28 92.4076 156.28 92.9741 155.956Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M153.598 119.473C154.159 119.797 154.164 120.33 153.604 120.654L92.9739 155.956C92.4132 156.28 91.4998 156.28 90.9333 155.956L56.3175 135.936C55.7568 135.612 55.751 135.079 56.3117 134.755L116.941 99.459C117.502 99.1347 118.416 99.1347 118.976 99.459L153.598 119.473Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M127.63 132.653C127.752 132.722 127.752 132.838 127.63 132.908L114.635 140.471C114.514 140.54 114.317 140.54 114.196 140.471L106.779 136.179C106.657 136.11 106.657 135.994 106.779 135.925L119.774 128.362C119.896 128.292 120.092 128.292 120.214 128.362L127.63 132.653Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M74.4121 70.1439C74.8715 69.9128 75.1359 69.5101 75.0027 69.2442C74.8695 68.9784 74.3891 68.9502 73.9297 69.1813C73.4703 69.4123 73.2059 69.8151 73.3391 70.0809C73.4724 70.3467 73.9528 70.3749 74.4121 70.1439Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M78.5153 141.9C78.3303 141.9 78.1569 141.86 78.0355 141.79L75.6076 140.383C75.5093 140.325 75.4919 140.279 75.4919 140.267C75.4919 140.256 75.5093 140.209 75.6018 140.157L79.8218 137.702C79.9432 137.632 80.1166 137.592 80.3016 137.592C80.4866 137.592 80.66 137.632 80.7872 137.702L83.2152 139.109C83.3134 139.167 83.3308 139.213 83.3308 139.225C83.3308 139.236 83.3134 139.283 83.221 139.335L79.0009 141.79C78.868 141.86 78.6945 141.9 78.5153 141.9Z" fill="white"/>
-<path d="M80.296 137.882C80.4521 137.882 80.5735 137.922 80.6371 137.957L82.828 139.225L78.8508 141.542C78.793 141.576 78.6716 141.611 78.5155 141.611C78.3594 141.611 78.238 141.576 78.1802 141.542L75.9892 140.274L79.9665 137.957C80.0185 137.917 80.1399 137.882 80.296 137.882ZM80.296 137.303C80.0705 137.303 79.8451 137.355 79.6716 137.453L75.4516 139.909C75.1105 140.111 75.1105 140.436 75.4574 140.638L77.8854 142.046C78.0588 142.144 78.2842 142.196 78.5097 142.196C78.7351 142.196 78.9606 142.144 79.134 142.046L83.3541 139.59C83.6951 139.387 83.6951 139.063 83.3483 138.866L80.9203 137.459C80.7469 137.355 80.5214 137.303 80.296 137.303Z" fill="#706F6F"/>
-<path d="M73.7231 139.132C73.5381 139.132 73.3647 139.091 73.2433 139.022L70.8153 137.615C70.7171 137.557 70.6997 137.51 70.6997 137.499C70.6997 137.487 70.7171 137.441 70.8095 137.389L77.7177 133.37C77.8391 133.3 78.0125 133.26 78.1975 133.26C78.3825 133.26 78.5559 133.3 78.6831 133.37L81.111 134.777C81.1978 134.829 81.2267 134.875 81.2267 134.893C81.2267 134.904 81.1978 134.957 81.111 135.003L74.2029 139.022C74.0815 139.091 73.9081 139.132 73.7231 139.132Z" fill="white"/>
-<path d="M78.1918 133.544C78.3479 133.544 78.4693 133.584 78.5329 133.619L80.7239 134.887L74.0585 138.767C74.0007 138.802 73.8793 138.837 73.7232 138.837C73.5903 138.837 73.4631 138.808 73.3879 138.762L71.197 137.493L77.8623 133.613C77.9201 133.584 78.0358 133.544 78.1918 133.544ZM78.1918 132.965C77.9664 132.965 77.7409 133.017 77.5675 133.115L70.6594 137.134C70.3183 137.337 70.3183 137.661 70.6652 137.864L73.0931 139.271C73.2665 139.37 73.492 139.422 73.7175 139.422C73.9429 139.422 74.1684 139.37 74.3418 139.271L81.2499 135.252C81.591 135.05 81.591 134.725 81.2441 134.528L78.8162 133.121C78.6485 133.017 78.4173 132.965 78.1918 132.965Z" fill="#706F6F"/>
-<path d="M68.9364 136.364C68.7514 136.364 68.578 136.323 68.4508 136.254L66.0228 134.847C65.9246 134.789 65.9072 134.742 65.9072 134.731C65.9072 134.719 65.9246 134.673 66.0171 134.621L68.4277 133.214C68.5491 133.144 68.7225 133.104 68.9075 133.104C69.0925 133.104 69.2659 133.144 69.3931 133.214L71.821 134.621C71.9193 134.679 71.9367 134.725 71.9367 134.737C71.9367 134.748 71.9193 134.794 71.821 134.847L69.4104 136.254C69.2948 136.323 69.1214 136.364 68.9364 136.364Z" fill="white"/>
-<path d="M68.9133 133.394C69.0694 133.394 69.1908 133.434 69.2544 133.469L71.4453 134.737L69.2717 136.005C69.2139 136.04 69.0925 136.075 68.9365 136.075C68.7804 136.075 68.659 136.034 68.5954 135.999L66.4044 134.731L68.578 133.469C68.6358 133.428 68.7572 133.394 68.9133 133.394ZM68.9133 132.814C68.6879 132.814 68.4566 132.867 68.289 132.965L65.8784 134.372C65.5373 134.575 65.5373 134.899 65.8842 135.102L68.3121 136.509C68.4855 136.608 68.7168 136.66 68.9422 136.66C69.1677 136.66 69.3931 136.608 69.5666 136.509L71.9772 135.102C72.324 134.899 72.324 134.575 71.9714 134.372L69.5434 132.965C69.37 132.861 69.1388 132.814 68.9133 132.814Z" fill="#706F6F"/>
-<path d="M100.384 118.053C100.199 118.053 100.026 118.013 99.8988 117.943L97.4708 116.536C97.3726 116.478 97.3552 116.432 97.3552 116.42C97.3552 116.409 97.3726 116.362 97.4708 116.31L99.8815 114.903C100.003 114.834 100.176 114.793 100.361 114.793C100.546 114.793 100.72 114.834 100.847 114.903L103.275 116.31C103.362 116.362 103.396 116.409 103.396 116.426C103.396 116.438 103.367 116.484 103.281 116.536L100.87 117.943C100.743 118.013 100.564 118.053 100.384 118.053Z" fill="white"/>
-<path d="M100.355 115.088C100.488 115.088 100.616 115.117 100.697 115.163L102.887 116.431L100.714 117.694C100.656 117.729 100.535 117.769 100.379 117.769C100.222 117.769 100.101 117.729 100.038 117.694L97.8466 116.426L100.02 115.163C100.084 115.123 100.205 115.088 100.355 115.088ZM100.355 114.509C100.13 114.509 99.9045 114.561 99.7311 114.659L97.3205 116.067C96.9736 116.269 96.9794 116.594 97.3263 116.796L99.7542 118.203C99.9277 118.302 100.153 118.354 100.384 118.354C100.616 118.354 100.835 118.302 101.009 118.203L103.419 116.796C103.766 116.594 103.76 116.269 103.414 116.067L100.986 114.659C100.812 114.555 100.587 114.509 100.355 114.509Z" fill="#706F6F"/>
-<path d="M109.957 123.594C109.772 123.594 109.599 123.554 109.478 123.484L107.05 122.077C106.951 122.019 106.934 121.973 106.934 121.961C106.934 121.95 106.951 121.903 107.05 121.851L109.46 120.444C109.582 120.375 109.755 120.334 109.94 120.334C110.125 120.334 110.299 120.375 110.426 120.444L112.854 121.851C112.94 121.903 112.969 121.95 112.969 121.967C112.969 121.979 112.94 122.031 112.854 122.077L110.443 123.484C110.316 123.554 110.142 123.594 109.957 123.594Z" fill="white"/>
-<path d="M109.935 120.624C110.068 120.624 110.195 120.653 110.276 120.699L112.467 121.968L110.293 123.23C110.235 123.265 110.114 123.305 109.958 123.305C109.802 123.305 109.68 123.27 109.622 123.236L107.431 121.968L109.605 120.699C109.663 120.665 109.778 120.624 109.935 120.624ZM109.935 120.045C109.709 120.045 109.484 120.097 109.31 120.195L106.9 121.603C106.553 121.805 106.559 122.13 106.905 122.332L109.333 123.74C109.507 123.838 109.732 123.89 109.958 123.89C110.183 123.89 110.414 123.838 110.588 123.74L112.998 122.332C113.345 122.13 113.339 121.805 112.993 121.608L110.565 120.201C110.391 120.097 110.16 120.045 109.935 120.045Z" fill="#706F6F"/>
-<path d="M123.138 110.362C122.953 110.362 122.78 110.322 122.658 110.252L115.438 106.077C115.34 106.019 115.322 105.973 115.322 105.961C115.322 105.95 115.34 105.903 115.432 105.851L117.849 104.444C117.97 104.375 118.143 104.334 118.328 104.334C118.513 104.334 118.687 104.375 118.814 104.444L126.028 108.619C126.115 108.671 126.144 108.718 126.144 108.735C126.144 108.747 126.115 108.799 126.028 108.845L123.612 110.252C123.496 110.322 123.323 110.362 123.138 110.362Z" fill="white"/>
-<path d="M118.328 104.624C118.484 104.624 118.606 104.665 118.669 104.699L125.647 108.736L123.473 109.998C123.415 110.033 123.294 110.068 123.138 110.068C123.005 110.068 122.878 110.039 122.803 109.992L115.819 105.95L117.993 104.688C118.051 104.665 118.172 104.624 118.328 104.624ZM118.328 104.045C118.103 104.045 117.877 104.097 117.704 104.195L115.288 105.603C114.946 105.805 114.946 106.13 115.293 106.332L122.508 110.508C122.681 110.606 122.907 110.658 123.132 110.658C123.358 110.658 123.583 110.606 123.757 110.508L126.173 109.1C126.514 108.898 126.514 108.573 126.167 108.377L118.953 104.201C118.779 104.097 118.554 104.045 118.328 104.045Z" fill="#706F6F"/>
-<path d="M114.449 120.977C114.264 120.977 114.091 120.937 113.97 120.867L111.542 119.46C111.443 119.402 111.426 119.356 111.426 119.344C111.426 119.332 111.443 119.286 111.536 119.234L113.952 117.827C114.074 117.757 114.247 117.717 114.432 117.717C114.617 117.717 114.79 117.757 114.918 117.827L117.346 119.234C117.432 119.286 117.461 119.332 117.461 119.35C117.461 119.361 117.444 119.408 117.351 119.46L114.935 120.867C114.808 120.937 114.634 120.977 114.449 120.977Z" fill="white"/>
-<path d="M114.426 118.007C114.582 118.007 114.704 118.047 114.767 118.082L116.958 119.35L114.785 120.619C114.727 120.653 114.605 120.688 114.449 120.688C114.293 120.688 114.172 120.653 114.114 120.619L111.923 119.35L114.097 118.088C114.154 118.047 114.27 118.007 114.426 118.007ZM114.426 117.428C114.201 117.428 113.975 117.48 113.802 117.578L111.385 118.986C111.044 119.188 111.044 119.512 111.391 119.715L113.819 121.122C113.993 121.221 114.218 121.273 114.444 121.273C114.669 121.273 114.894 121.221 115.068 121.122L117.484 119.715C117.825 119.512 117.825 119.188 117.478 118.991L115.051 117.584C114.883 117.48 114.657 117.428 114.426 117.428Z" fill="#706F6F"/>
-<path d="M119.242 123.747C119.057 123.747 118.883 123.706 118.762 123.637L116.328 122.229C116.23 122.172 116.212 122.125 116.212 122.114C116.212 122.102 116.23 122.056 116.322 122.004L118.739 120.596C118.86 120.527 119.033 120.486 119.218 120.486C119.403 120.486 119.577 120.527 119.698 120.596L122.132 122.004C122.23 122.061 122.248 122.108 122.248 122.119C122.248 122.131 122.23 122.177 122.132 122.229L119.716 123.637C119.594 123.706 119.421 123.747 119.242 123.747Z" fill="white"/>
-<path d="M119.219 120.781C119.375 120.781 119.496 120.816 119.554 120.851L121.745 122.119L119.571 123.387C119.513 123.422 119.392 123.457 119.236 123.457C119.08 123.457 118.959 123.422 118.901 123.387L116.71 122.119L118.883 120.851C118.941 120.816 119.063 120.781 119.219 120.781ZM119.219 120.202C118.993 120.202 118.768 120.254 118.594 120.353L116.178 121.76C115.837 121.963 115.837 122.287 116.184 122.484L118.617 123.891C118.791 123.989 119.016 124.042 119.242 124.042C119.467 124.042 119.693 123.989 119.866 123.891L122.283 122.484C122.624 122.281 122.624 121.957 122.277 121.76L119.843 120.353C119.67 120.248 119.444 120.202 119.219 120.202Z" fill="#706F6F"/>
-<path d="M123.433 115.748C123.248 115.748 123.074 115.707 122.953 115.638L120.525 114.231C120.438 114.179 120.404 114.132 120.404 114.115C120.404 114.103 120.432 114.057 120.519 114.005L127.427 109.986C127.549 109.917 127.722 109.876 127.907 109.876C128.092 109.876 128.266 109.917 128.393 109.986L130.821 111.393C130.907 111.445 130.936 111.492 130.936 111.509C130.936 111.521 130.919 111.567 130.826 111.619L123.918 115.638C123.791 115.707 123.618 115.748 123.433 115.748Z" fill="white"/>
-<path d="M127.907 110.166C128.063 110.166 128.185 110.207 128.248 110.241L130.439 111.51L123.774 115.389C123.716 115.424 123.595 115.459 123.439 115.459C123.282 115.459 123.161 115.418 123.103 115.384L120.912 114.115L127.578 110.235C127.63 110.201 127.751 110.166 127.907 110.166ZM127.907 109.587C127.682 109.587 127.456 109.639 127.283 109.737L120.375 113.756C120.028 113.959 120.034 114.283 120.38 114.486L122.808 115.893C122.982 115.992 123.207 116.044 123.433 116.044C123.658 116.044 123.884 115.992 124.057 115.893L130.965 111.874C131.306 111.672 131.306 111.347 130.959 111.15L128.531 109.743C128.358 109.633 128.133 109.587 127.907 109.587Z" fill="#706F6F"/>
-<path d="M132.717 115.905C132.532 115.905 132.358 115.864 132.237 115.795L129.803 114.388C129.716 114.335 129.688 114.289 129.688 114.272C129.688 114.26 129.705 114.214 129.797 114.162L132.214 112.755C132.335 112.685 132.509 112.645 132.694 112.645C132.879 112.645 133.052 112.685 133.173 112.755L135.607 114.162C135.694 114.214 135.723 114.26 135.723 114.278C135.723 114.289 135.705 114.335 135.613 114.388L133.196 115.795C133.075 115.864 132.902 115.905 132.717 115.905Z" fill="white"/>
-<path d="M132.694 112.935C132.85 112.935 132.971 112.969 133.029 113.004L135.22 114.272L133.046 115.541C132.989 115.575 132.867 115.61 132.711 115.61C132.555 115.61 132.434 115.575 132.376 115.541L130.185 114.272L132.358 113.004C132.422 112.969 132.538 112.935 132.694 112.935ZM132.694 112.355C132.468 112.355 132.243 112.408 132.069 112.506L129.653 113.913C129.312 114.116 129.312 114.44 129.659 114.637L132.093 116.044C132.266 116.143 132.491 116.195 132.717 116.195C132.942 116.195 133.168 116.143 133.341 116.044L135.758 114.637C136.099 114.434 136.099 114.11 135.752 113.913L133.318 112.506C133.145 112.408 132.919 112.355 132.694 112.355Z" fill="#706F6F"/>
-<path d="M118.941 118.366C118.756 118.366 118.583 118.325 118.461 118.256L116.033 116.849C115.935 116.791 115.918 116.744 115.918 116.733C115.918 116.721 115.935 116.675 116.028 116.623L118.444 115.215C118.565 115.146 118.739 115.105 118.924 115.105C119.109 115.105 119.282 115.146 119.409 115.215L121.837 116.623C121.924 116.675 121.953 116.721 121.953 116.739C121.953 116.75 121.936 116.796 121.843 116.849L119.427 118.256C119.3 118.325 119.126 118.366 118.941 118.366Z" fill="white"/>
-<path d="M118.918 115.396C119.074 115.396 119.195 115.436 119.259 115.471L121.45 116.739L119.276 118.007C119.218 118.042 119.097 118.077 118.941 118.077C118.785 118.077 118.664 118.042 118.606 118.007L116.415 116.739L118.588 115.477C118.646 115.43 118.762 115.396 118.918 115.396ZM118.918 114.816C118.692 114.816 118.467 114.869 118.294 114.967L115.877 116.374C115.536 116.577 115.536 116.901 115.883 117.104L118.311 118.511C118.484 118.609 118.71 118.662 118.935 118.662C119.161 118.662 119.386 118.609 119.56 118.511L121.976 117.104C122.317 116.901 122.317 116.577 121.97 116.38L119.542 114.973C119.375 114.869 119.149 114.816 118.918 114.816Z" fill="#706F6F"/>
-<path d="M128.225 118.516C128.04 118.516 127.867 118.476 127.745 118.406L125.311 116.999C125.225 116.947 125.196 116.9 125.196 116.883C125.196 116.872 125.225 116.819 125.311 116.773L127.722 115.366C127.843 115.296 128.023 115.256 128.202 115.256C128.387 115.256 128.56 115.296 128.682 115.366L131.115 116.773C131.214 116.831 131.231 116.877 131.231 116.889C131.231 116.9 131.214 116.947 131.115 116.999L128.705 118.406C128.583 118.476 128.41 118.516 128.225 118.516Z" fill="white"/>
-<path d="M128.202 115.546C128.358 115.546 128.479 115.581 128.537 115.615L130.728 116.884L128.554 118.152C128.497 118.187 128.375 118.221 128.219 118.221C128.063 118.221 127.942 118.187 127.884 118.146L125.693 116.878L127.867 115.615C127.924 115.586 128.046 115.546 128.202 115.546ZM128.202 114.967C127.976 114.967 127.745 115.019 127.572 115.117L125.161 116.525C124.814 116.727 124.82 117.052 125.167 117.248L127.601 118.656C127.774 118.754 127.999 118.806 128.225 118.806C128.45 118.806 128.676 118.754 128.849 118.656L131.26 117.248C131.607 117.046 131.601 116.721 131.26 116.519L128.826 115.112C128.653 115.019 128.427 114.967 128.202 114.967Z" fill="#706F6F"/>
-<path d="M123.733 121.133C123.548 121.133 123.375 121.093 123.253 121.023L120.82 119.616C120.721 119.558 120.704 119.512 120.704 119.5C120.704 119.489 120.721 119.442 120.814 119.39L123.23 117.983C123.352 117.914 123.525 117.873 123.71 117.873C123.895 117.873 124.069 117.914 124.19 117.983L126.624 119.39C126.722 119.448 126.739 119.495 126.739 119.506C126.739 119.518 126.722 119.564 126.629 119.616L124.213 121.023C124.086 121.093 123.912 121.133 123.733 121.133Z" fill="white"/>
-<path d="M123.71 118.163C123.866 118.163 123.988 118.198 124.046 118.233L126.237 119.501L124.063 120.763C124.005 120.798 123.884 120.833 123.728 120.833C123.572 120.833 123.45 120.798 123.392 120.763L121.201 119.495L123.375 118.227C123.433 118.204 123.554 118.163 123.71 118.163ZM123.71 117.584C123.485 117.584 123.259 117.636 123.086 117.735L120.67 119.142C120.329 119.344 120.329 119.669 120.675 119.866L123.109 121.273C123.283 121.371 123.508 121.423 123.733 121.423C123.959 121.423 124.184 121.371 124.358 121.273L126.774 119.866C127.115 119.663 127.115 119.339 126.768 119.142L124.335 117.735C124.161 117.636 123.936 117.584 123.71 117.584Z" fill="#706F6F"/>
-<path d="M118.646 112.98C118.461 112.98 118.288 112.94 118.167 112.87L115.739 111.463C115.652 111.411 115.617 111.364 115.617 111.347C115.617 111.335 115.646 111.289 115.733 111.237L118.143 109.83C118.265 109.76 118.438 109.72 118.623 109.72C118.808 109.72 118.982 109.76 119.109 109.83L121.537 111.237C121.623 111.289 121.652 111.335 121.652 111.353C121.652 111.37 121.623 111.416 121.537 111.463L119.126 112.87C119.005 112.94 118.831 112.98 118.646 112.98Z" fill="white"/>
-<path d="M118.623 110.01C118.779 110.01 118.901 110.05 118.964 110.085L121.155 111.353L118.981 112.621C118.924 112.656 118.802 112.697 118.646 112.697C118.513 112.697 118.386 112.668 118.311 112.621L116.12 111.353L118.294 110.091C118.351 110.045 118.467 110.01 118.623 110.01ZM118.623 109.431C118.398 109.431 118.172 109.483 117.999 109.581L115.588 110.988C115.241 111.191 115.247 111.515 115.594 111.718L118.022 113.125C118.195 113.224 118.421 113.276 118.646 113.276C118.872 113.276 119.097 113.224 119.27 113.125L121.681 111.718C122.028 111.515 122.028 111.191 121.681 110.988L119.253 109.581C119.08 109.483 118.854 109.431 118.623 109.431Z" fill="#706F6F"/>
-<path d="M114.154 115.592C113.969 115.592 113.796 115.552 113.674 115.482L111.246 114.075C111.148 114.017 111.131 113.971 111.131 113.959C111.131 113.948 111.148 113.901 111.24 113.849L113.657 112.442C113.778 112.373 113.952 112.332 114.137 112.332C114.322 112.332 114.495 112.373 114.622 112.442L117.05 113.849C117.137 113.901 117.166 113.948 117.166 113.965C117.166 113.977 117.137 114.029 117.05 114.075L114.634 115.482C114.512 115.552 114.333 115.592 114.154 115.592Z" fill="white"/>
-<path d="M114.131 112.627C114.287 112.627 114.409 112.667 114.472 112.702L116.663 113.97L114.489 115.239C114.432 115.273 114.31 115.308 114.154 115.308C114.021 115.308 113.894 115.279 113.819 115.233L111.628 113.965L113.802 112.702C113.859 112.662 113.975 112.627 114.131 112.627ZM114.131 112.048C113.906 112.048 113.68 112.1 113.507 112.198L111.09 113.606C110.749 113.808 110.749 114.133 111.096 114.335L113.524 115.742C113.697 115.841 113.923 115.893 114.148 115.893C114.374 115.893 114.599 115.841 114.773 115.742L117.189 114.335C117.53 114.133 117.536 113.808 117.183 113.611L114.755 112.204C114.588 112.094 114.356 112.048 114.131 112.048Z" fill="#706F6F"/>
-<path d="M104.876 115.441C104.691 115.441 104.517 115.4 104.39 115.331L101.962 113.924C101.864 113.866 101.847 113.82 101.847 113.808C101.847 113.796 101.864 113.75 101.957 113.698L104.373 112.291C104.494 112.221 104.668 112.181 104.853 112.181C105.038 112.181 105.211 112.221 105.338 112.291L107.766 113.698C107.865 113.756 107.882 113.802 107.882 113.814C107.882 113.825 107.865 113.872 107.772 113.924L105.356 115.331C105.234 115.4 105.061 115.441 104.876 115.441Z" fill="white"/>
-<path d="M104.853 112.471C105.009 112.471 105.13 112.511 105.194 112.546L107.385 113.814L105.211 115.082C105.154 115.117 105.032 115.152 104.876 115.152C104.72 115.152 104.599 115.111 104.535 115.077L102.344 113.808L104.518 112.546C104.575 112.505 104.697 112.471 104.853 112.471ZM104.853 111.892C104.627 111.892 104.402 111.944 104.229 112.042L101.812 113.449C101.471 113.652 101.471 113.976 101.818 114.179L104.246 115.586C104.419 115.685 104.651 115.737 104.876 115.737C105.102 115.737 105.327 115.685 105.5 115.586L107.917 114.179C108.258 113.976 108.258 113.652 107.911 113.449L105.483 112.042C105.304 111.944 105.078 111.892 104.853 111.892Z" fill="#706F6F"/>
-<path d="M109.662 118.21C109.477 118.21 109.304 118.169 109.182 118.1L106.755 116.692C106.656 116.634 106.639 116.588 106.639 116.576C106.639 116.565 106.656 116.519 106.749 116.466L109.165 115.059C109.287 114.99 109.46 114.949 109.645 114.949C109.83 114.949 110.003 114.99 110.131 115.059L112.559 116.466C112.645 116.519 112.674 116.565 112.674 116.582C112.674 116.594 112.645 116.646 112.559 116.692L110.142 118.1C110.021 118.169 109.842 118.21 109.662 118.21Z" fill="white"/>
-<path d="M109.639 115.239C109.795 115.239 109.917 115.28 109.98 115.315L112.171 116.583L109.998 117.845C109.94 117.88 109.819 117.915 109.662 117.915C109.529 117.915 109.402 117.886 109.327 117.839L107.136 116.571L109.31 115.303C109.368 115.28 109.483 115.239 109.639 115.239ZM109.639 114.66C109.414 114.66 109.188 114.712 109.015 114.811L106.599 116.218C106.258 116.421 106.258 116.745 106.604 116.948L109.032 118.355C109.206 118.453 109.431 118.505 109.657 118.505C109.882 118.505 110.108 118.453 110.281 118.355L112.697 116.948C113.038 116.745 113.038 116.421 112.692 116.224L110.264 114.817C110.096 114.712 109.865 114.66 109.639 114.66Z" fill="#706F6F"/>
-<path d="M105.165 120.827C104.98 120.827 104.807 120.786 104.685 120.717L102.257 119.309C102.159 119.252 102.142 119.205 102.142 119.194C102.142 119.182 102.159 119.136 102.257 119.084L104.668 117.676C104.789 117.607 104.963 117.566 105.148 117.566C105.333 117.566 105.506 117.607 105.633 117.676L108.061 119.084C108.16 119.142 108.177 119.188 108.177 119.199C108.177 119.211 108.154 119.257 108.061 119.309L105.651 120.717C105.529 120.786 105.35 120.827 105.165 120.827Z" fill="white"/>
-<path d="M105.148 117.856C105.281 117.856 105.408 117.885 105.489 117.932L107.68 119.2L105.506 120.462C105.448 120.497 105.327 120.538 105.171 120.538C105.015 120.538 104.893 120.503 104.836 120.462L102.645 119.194L104.818 117.932C104.87 117.891 104.992 117.856 105.148 117.856ZM105.148 117.277C104.922 117.277 104.697 117.329 104.523 117.428L102.113 118.835C101.766 119.038 101.772 119.362 102.119 119.565L104.546 120.972C104.72 121.07 104.945 121.123 105.171 121.123C105.396 121.123 105.627 121.07 105.801 120.972L108.212 119.565C108.558 119.362 108.553 119.038 108.206 118.841L105.778 117.434C105.599 117.329 105.373 117.277 105.148 117.277Z" fill="#706F6F"/>
-<path d="M92.2855 139.439C92.1005 139.439 91.9271 139.398 91.8057 139.329L89.372 137.922C89.2853 137.87 89.2563 137.823 89.2563 137.806C89.2563 137.794 89.2853 137.742 89.372 137.696L91.7826 136.289C91.904 136.219 92.0832 136.179 92.2624 136.179C92.4474 136.179 92.6208 136.219 92.7422 136.289L95.176 137.696C95.2742 137.754 95.2916 137.8 95.2916 137.812C95.2916 137.823 95.2742 137.87 95.176 137.922L92.7653 139.329C92.6439 139.398 92.4705 139.439 92.2855 139.439Z" fill="white"/>
-<path d="M92.2683 136.469C92.4244 136.469 92.5458 136.503 92.6036 136.538L94.7945 137.806L92.6209 139.075C92.5631 139.109 92.4417 139.144 92.2856 139.144C92.1296 139.144 92.0082 139.104 91.9503 139.069L89.7594 137.801L91.933 136.538C91.9908 136.509 92.1064 136.469 92.2683 136.469ZM92.2683 135.89C92.0428 135.89 91.8116 135.942 91.644 136.04L89.2333 137.447C88.8865 137.65 88.8923 137.974 89.2391 138.171L91.6729 139.578C91.8463 139.677 92.0717 139.729 92.2972 139.729C92.5227 139.729 92.7481 139.677 92.9215 139.578L95.3321 138.171C95.679 137.969 95.679 137.644 95.3321 137.442L92.8984 136.034C92.7192 135.942 92.4937 135.89 92.2683 135.89Z" fill="#706F6F"/>
-<path d="M96.777 136.822C96.592 136.822 96.4186 136.781 96.2972 136.712L93.8634 135.305C93.7767 135.252 93.7478 135.206 93.7478 135.189C93.7478 135.177 93.7651 135.131 93.8576 135.079L96.274 133.672C96.3954 133.602 96.5689 133.562 96.7538 133.562C96.9388 133.562 97.1123 133.602 97.2337 133.672L99.6674 135.079C99.7541 135.131 99.783 135.177 99.783 135.195C99.783 135.206 99.7657 135.252 99.6732 135.305L97.2568 136.712C97.1354 136.781 96.962 136.822 96.777 136.822Z" fill="white"/>
-<path d="M96.7538 133.856C96.9099 133.856 97.0313 133.891 97.0891 133.926L99.2801 135.194L97.1065 136.462C97.0487 136.497 96.9273 136.532 96.7712 136.532C96.6151 136.532 96.4937 136.497 96.4359 136.462L94.2449 135.194L96.4185 133.926C96.4821 133.891 96.5977 133.856 96.7538 133.856ZM96.7538 133.277C96.5284 133.277 96.3029 133.329 96.1295 133.428L93.7131 134.835C93.372 135.038 93.372 135.362 93.7189 135.559L96.1526 136.966C96.326 137.065 96.5515 137.117 96.7769 137.117C97.0024 137.117 97.2279 137.065 97.4013 136.966L99.8177 135.559C100.159 135.356 100.159 135.032 99.8119 134.835L97.3782 133.428C97.2105 133.324 96.9793 133.277 96.7538 133.277Z" fill="#706F6F"/>
-<path d="M95.8925 120.67C95.7075 120.67 95.534 120.63 95.4069 120.56L92.9789 119.153C92.8806 119.095 92.8633 119.049 92.8633 119.037C92.8633 119.026 92.8806 118.98 92.9731 118.927L95.3895 117.52C95.5109 117.451 95.6843 117.41 95.8693 117.41C96.0543 117.41 96.2277 117.451 96.3549 117.52L98.7829 118.927C98.8812 118.985 98.8985 119.032 98.8985 119.043C98.8985 119.055 98.8812 119.101 98.7887 119.153L96.3723 120.56C96.2509 120.63 96.0717 120.67 95.8925 120.67Z" fill="white"/>
-<path d="M95.8637 117.7C96.0198 117.7 96.1412 117.741 96.2048 117.775L98.3957 119.044L96.2221 120.306C96.1643 120.341 96.0429 120.376 95.8868 120.376C95.7307 120.376 95.6093 120.335 95.5457 120.3L93.3548 119.032L95.5284 117.764C95.592 117.741 95.7134 117.7 95.8637 117.7ZM95.8637 117.121C95.6382 117.121 95.4128 117.173 95.2394 117.272L92.823 118.679C92.4819 118.882 92.4819 119.206 92.8287 119.409L95.2567 120.816C95.4301 120.914 95.6614 120.966 95.8868 120.966C96.1123 120.966 96.3377 120.914 96.5111 120.816L98.9275 119.409C99.2686 119.206 99.2686 118.882 98.9218 118.679L96.4938 117.272C96.3204 117.173 96.0949 117.121 95.8637 117.121Z" fill="#706F6F"/>
-<path d="M91.4008 123.288C91.2158 123.288 91.0423 123.247 90.9152 123.178L88.4872 121.77C88.3889 121.713 88.3716 121.666 88.3716 121.655C88.3716 121.643 88.3889 121.597 88.4814 121.545L90.892 120.137C91.0134 120.068 91.1869 120.027 91.3718 120.027C91.5568 120.027 91.7303 120.068 91.8574 120.137L94.2854 121.545C94.3837 121.602 94.401 121.649 94.401 121.66C94.401 121.672 94.3837 121.718 94.2854 121.77L91.8748 123.178C91.7592 123.247 91.58 123.288 91.4008 123.288Z" fill="white"/>
-<path d="M91.3774 120.317C91.5335 120.317 91.6549 120.358 91.7185 120.393L93.9095 121.661L91.7359 122.929C91.678 122.964 91.5566 122.999 91.4006 122.999C91.2445 122.999 91.1231 122.958 91.0595 122.923L88.8685 121.655L91.0422 120.393C91.1 120.352 91.2214 120.317 91.3774 120.317ZM91.3774 119.738C91.152 119.738 90.9208 119.79 90.7531 119.889L88.3425 121.296C88.0014 121.499 88.0014 121.823 88.3483 122.026L90.7762 123.433C90.9497 123.531 91.1809 123.583 91.4063 123.583C91.6318 123.583 91.8573 123.531 92.0307 123.433L94.4413 122.026C94.7881 121.823 94.7824 121.499 94.4355 121.296L92.0076 119.889C91.8283 119.785 91.6029 119.738 91.3774 119.738Z" fill="#706F6F"/>
-<path d="M100.679 123.439C100.494 123.439 100.321 123.398 100.2 123.329L97.7716 121.922C97.6734 121.864 97.656 121.818 97.656 121.806C97.656 121.794 97.6733 121.748 97.7658 121.696L100.182 120.289C100.304 120.219 100.477 120.179 100.662 120.179C100.847 120.179 101.02 120.219 101.148 120.289L103.576 121.696C103.662 121.748 103.691 121.794 103.691 121.812C103.691 121.823 103.662 121.875 103.576 121.922L101.159 123.329C101.032 123.398 100.859 123.439 100.679 123.439Z" fill="white"/>
-<path d="M100.656 120.469C100.812 120.469 100.933 120.509 100.997 120.544L103.188 121.812L101.014 123.08C100.957 123.115 100.835 123.15 100.679 123.15C100.523 123.15 100.402 123.115 100.344 123.075L98.1528 121.806L100.326 120.544C100.378 120.509 100.5 120.469 100.656 120.469ZM100.656 119.89C100.43 119.89 100.205 119.942 100.032 120.04L97.6152 121.447C97.2741 121.65 97.2741 121.974 97.621 122.177L100.049 123.584C100.222 123.683 100.448 123.735 100.673 123.735C100.899 123.735 101.124 123.683 101.298 123.584L103.714 122.177C104.055 121.974 104.055 121.65 103.708 121.453L101.28 120.046C101.107 119.942 100.881 119.89 100.656 119.89Z" fill="#706F6F"/>
-<path d="M86.9034 125.9C86.7184 125.9 86.545 125.859 86.4178 125.79L83.9899 124.383C83.8916 124.325 83.8743 124.278 83.8743 124.267C83.8743 124.255 83.8916 124.209 83.9899 124.157L86.4005 122.75C86.5219 122.68 86.6953 122.64 86.8803 122.64C87.0653 122.64 87.2387 122.68 87.3659 122.75L89.7939 124.157C89.8806 124.209 89.9153 124.255 89.9153 124.273C89.9153 124.284 89.8864 124.331 89.7996 124.383L87.389 125.79C87.2676 125.859 87.0884 125.9 86.9034 125.9Z" fill="white"/>
-<path d="M86.8801 122.93C87.0131 122.93 87.1402 122.959 87.2212 123.005L89.4121 124.273L87.2385 125.536C87.1807 125.57 87.0593 125.611 86.9032 125.611C86.7471 125.611 86.6258 125.57 86.5622 125.536L84.3712 124.267L86.5448 123.005C86.6084 122.97 86.724 122.93 86.8801 122.93ZM86.8801 122.351C86.6547 122.351 86.4292 122.403 86.2558 122.501L83.8452 123.908C83.4983 124.111 83.5041 124.435 83.8509 124.638L86.2789 126.045C86.4523 126.144 86.6778 126.196 86.909 126.196C87.1345 126.196 87.3657 126.144 87.5333 126.045L89.944 124.638C90.2908 124.435 90.285 124.111 89.9382 123.908L87.5102 122.501C87.3368 122.403 87.1056 122.351 86.8801 122.351Z" fill="#706F6F"/>
-<path d="M96.187 126.056C96.002 126.056 95.8286 126.016 95.7072 125.946L93.2792 124.539C93.1809 124.481 93.1636 124.435 93.1636 124.423C93.1636 124.412 93.1809 124.365 93.2734 124.313L95.684 122.906C95.8054 122.836 95.9789 122.796 96.1638 122.796C96.3488 122.796 96.5223 122.836 96.6494 122.906L99.0774 124.313C99.1641 124.365 99.193 124.412 99.193 124.429C99.193 124.441 99.1641 124.493 99.0774 124.539L96.6668 125.946C96.5454 126.016 96.3662 126.056 96.187 126.056Z" fill="white"/>
-<path d="M96.1643 123.086C96.3204 123.086 96.4418 123.126 96.5054 123.161L98.6963 124.429L96.5227 125.698C96.4649 125.732 96.3435 125.767 96.1874 125.767C96.0545 125.767 95.9273 125.738 95.8521 125.692L93.6612 124.424L95.8348 123.161C95.8868 123.121 96.0082 123.086 96.1643 123.086ZM96.1643 122.507C95.9389 122.507 95.7076 122.559 95.54 122.657L93.1294 124.065C92.7883 124.267 92.7883 124.592 93.1351 124.794L95.5631 126.201C95.7365 126.3 95.962 126.352 96.1874 126.352C96.4129 126.352 96.6383 126.3 96.8118 126.201L99.2224 124.794C99.5692 124.592 99.5692 124.267 99.2224 124.065L96.7944 122.657C96.6152 122.559 96.3898 122.507 96.1643 122.507Z" fill="#706F6F"/>
-<path d="M82.4171 128.517C82.2321 128.517 82.0587 128.477 81.9315 128.407L79.5036 127C79.4053 126.942 79.3879 126.896 79.3879 126.884C79.3879 126.873 79.4053 126.826 79.4978 126.774L81.9142 125.367C82.0356 125.297 82.209 125.257 82.394 125.257C82.579 125.257 82.7524 125.297 82.8796 125.367L85.3075 126.774C85.4058 126.832 85.4232 126.878 85.4232 126.89C85.4232 126.901 85.4058 126.948 85.3133 127L82.8969 128.407C82.7697 128.477 82.5963 128.517 82.4171 128.517Z" fill="white"/>
-<path d="M82.3883 125.547C82.5444 125.547 82.6658 125.587 82.7294 125.622L84.9204 126.89L82.7468 128.153C82.689 128.188 82.5676 128.222 82.4115 128.222C82.2554 128.222 82.134 128.182 82.0704 128.147L79.8795 126.879L82.0531 125.611C82.1166 125.582 82.2323 125.547 82.3883 125.547ZM82.3883 124.968C82.1629 124.968 81.9374 125.02 81.764 125.118L79.3476 126.526C79.0065 126.728 79.0065 127.053 79.3534 127.255L81.7814 128.662C81.9548 128.761 82.186 128.813 82.4115 128.813C82.6369 128.813 82.8624 128.761 83.0358 128.662L85.4522 127.255C85.7933 127.053 85.7933 126.728 85.4464 126.526L83.0185 125.118C82.845 125.02 82.6138 124.968 82.3883 124.968Z" fill="#706F6F"/>
-<path d="M91.6894 128.669C91.5044 128.669 91.331 128.628 91.2096 128.558L88.7816 127.151C88.6834 127.093 88.666 127.047 88.666 127.035C88.666 127.024 88.6834 126.978 88.7816 126.925L91.1923 125.518C91.3137 125.449 91.4871 125.408 91.6721 125.408C91.857 125.408 92.0305 125.449 92.1577 125.518L94.5856 126.925C94.6839 126.983 94.7012 127.03 94.7012 127.041C94.7012 127.053 94.6781 127.099 94.5856 127.151L92.175 128.558C92.0478 128.628 91.8744 128.669 91.6894 128.669Z" fill="white"/>
-<path d="M91.6665 125.703C91.7994 125.703 91.9266 125.732 92.0076 125.778L94.1985 127.047L92.0249 128.309C91.9671 128.344 91.8457 128.384 91.6896 128.384C91.5624 128.384 91.4295 128.355 91.3543 128.309L89.1634 127.041L91.337 125.773C91.3948 125.738 91.5162 125.703 91.6665 125.703ZM91.6665 125.124C91.441 125.124 91.2156 125.176 91.0422 125.275L88.6315 126.682C88.2847 126.884 88.2905 127.209 88.6373 127.411L91.0653 128.819C91.2387 128.917 91.4642 128.969 91.6896 128.969C91.9151 128.969 92.1463 128.917 92.3197 128.819L94.7303 127.411C95.0772 127.209 95.0714 126.884 94.7246 126.688L92.2966 125.28C92.1232 125.17 91.8977 125.124 91.6665 125.124Z" fill="#706F6F"/>
-<path d="M77.9258 131.129C77.7408 131.129 77.5674 131.089 77.4402 131.019L75.0123 129.612C74.9256 129.56 74.8909 129.514 74.8909 129.496C74.8909 129.485 74.9198 129.438 75.0065 129.386L77.4171 127.979C77.5385 127.91 77.7119 127.869 77.8969 127.869C78.0819 127.869 78.2553 127.91 78.3825 127.979L80.8105 129.386C80.9087 129.444 80.9261 129.491 80.9261 129.502C80.9261 129.514 80.9087 129.56 80.8105 129.612L78.3999 131.019C78.2785 131.089 78.105 131.129 77.9258 131.129Z" fill="white"/>
-<path d="M77.8967 128.164C78.0528 128.164 78.1742 128.205 78.2378 128.239L80.4287 129.508L78.2551 130.77C78.1973 130.805 78.0759 130.839 77.9198 130.839C77.7869 130.839 77.6597 130.811 77.5788 130.764L75.3878 129.496L77.5614 128.234C77.625 128.199 77.7406 128.164 77.8967 128.164ZM77.8967 127.585C77.6713 127.585 77.4458 127.637 77.2724 127.736L74.8618 129.143C74.5149 129.345 74.5207 129.67 74.8675 129.872L77.2955 131.28C77.4689 131.378 77.7002 131.43 77.9256 131.43C78.1511 131.43 78.3765 131.378 78.5499 131.28L80.9606 129.872C81.3074 129.67 81.3016 129.345 80.9548 129.143L78.5268 127.736C78.3534 127.631 78.1279 127.585 77.8967 127.585Z" fill="#706F6F"/>
-<path d="M87.1984 131.286C87.0135 131.286 86.84 131.245 86.7186 131.176L84.2907 129.768C84.1924 129.711 84.175 129.664 84.175 129.653C84.175 129.641 84.1924 129.595 84.2849 129.543L86.7013 128.135C86.8227 128.066 86.9961 128.025 87.1811 128.025C87.3661 128.025 87.5395 128.066 87.6667 128.135L90.0947 129.543C90.1814 129.595 90.2103 129.641 90.2103 129.658C90.2103 129.67 90.1814 129.722 90.0947 129.768L87.6783 131.176C87.5569 131.245 87.3834 131.286 87.1984 131.286Z" fill="white"/>
-<path d="M87.1752 128.315C87.3313 128.315 87.4527 128.356 87.5163 128.391L89.7072 129.659L87.5336 130.927C87.4758 130.962 87.3544 130.997 87.1983 130.997C87.0423 130.997 86.9209 130.962 86.863 130.921L84.6721 129.653L86.8457 128.391C86.9035 128.356 87.0249 128.315 87.1752 128.315ZM87.1752 127.736C86.9498 127.736 86.7243 127.788 86.5509 127.887L84.1345 129.294C83.7934 129.497 83.7934 129.821 84.1403 130.024L86.5682 131.431C86.7417 131.529 86.9671 131.582 87.1926 131.582C87.418 131.582 87.6435 131.529 87.8169 131.431L90.2333 130.024C90.5744 129.821 90.5744 129.497 90.2275 129.3L87.7995 127.893C87.6319 127.788 87.4064 127.736 87.1752 127.736Z" fill="#706F6F"/>
-<path d="M96.4768 131.442C96.2918 131.442 96.1183 131.401 95.9969 131.332L93.569 129.925C93.4707 129.867 93.4534 129.82 93.4534 129.809C93.4534 129.797 93.4707 129.751 93.569 129.699L95.9796 128.292C96.101 128.222 96.2744 128.182 96.4594 128.182C96.6444 128.182 96.8178 128.222 96.945 128.292L99.373 129.699C99.4597 129.751 99.4886 129.797 99.4886 129.815C99.4886 129.826 99.4597 129.878 99.373 129.925L96.9624 131.332C96.841 131.396 96.6617 131.442 96.4768 131.442Z" fill="white"/>
-<path d="M96.459 128.472C96.5919 128.472 96.7191 128.501 96.8 128.547L98.991 129.815L96.8174 131.078C96.7596 131.112 96.6382 131.153 96.4821 131.153C96.326 131.153 96.2046 131.118 96.1468 131.083L93.9501 129.809L96.1237 128.547C96.1815 128.506 96.3029 128.472 96.459 128.472ZM96.459 127.893C96.2335 127.893 96.0081 127.945 95.8346 128.043L93.424 129.45C93.0772 129.653 93.0829 129.977 93.4298 130.18L95.8578 131.587C96.0312 131.686 96.2566 131.738 96.4821 131.738C96.7075 131.738 96.9388 131.686 97.1122 131.587L99.5228 130.18C99.8697 129.977 99.8639 129.653 99.517 129.456L97.0891 128.049C96.9099 127.945 96.6844 127.893 96.459 127.893Z" fill="#706F6F"/>
-<path d="M82.7062 133.903C82.5212 133.903 82.3478 133.862 82.2264 133.793L79.7984 132.386C79.7117 132.334 79.677 132.287 79.677 132.27C79.677 132.258 79.7059 132.212 79.7926 132.16L82.2032 130.753C82.3246 130.683 82.4981 130.643 82.6831 130.643C82.868 130.643 83.0415 130.683 83.1686 130.753L85.5966 132.16C85.6833 132.212 85.7122 132.258 85.7122 132.276C85.7122 132.293 85.6833 132.339 85.5966 132.386L83.186 133.793C83.0646 133.857 82.8912 133.903 82.7062 133.903Z" fill="white"/>
-<path d="M82.6889 130.933C82.845 130.933 82.9664 130.973 83.03 131.008L85.221 132.276L83.0474 133.544C82.9896 133.579 82.8682 133.62 82.7121 133.62C82.5791 133.62 82.4519 133.591 82.3768 133.544L80.1858 132.276L82.3594 131.014C82.4115 130.967 82.5329 130.933 82.6889 130.933ZM82.6889 130.354C82.4635 130.354 82.238 130.406 82.0646 130.504L79.654 131.911C79.3071 132.114 79.3129 132.438 79.6598 132.641L82.0877 134.048C82.2612 134.147 82.4866 134.199 82.7121 134.199C82.9375 134.199 83.163 134.147 83.3364 134.048L85.747 132.641C86.0939 132.438 86.0939 132.114 85.747 131.911L83.3191 130.504C83.1399 130.4 82.9144 130.354 82.6889 130.354Z" fill="#706F6F"/>
-<path d="M91.9904 134.053C91.8054 134.053 91.632 134.013 91.5106 133.943L89.0827 132.536C88.9844 132.478 88.967 132.432 88.967 132.42C88.967 132.409 88.9844 132.362 89.0769 132.31L91.4933 130.903C91.6147 130.834 91.7881 130.793 91.9731 130.793C92.1581 130.793 92.3315 130.834 92.4587 130.903L94.8866 132.31C94.9734 132.362 95.0023 132.409 95.0023 132.426C95.0023 132.438 94.9849 132.484 94.8924 132.536L92.476 133.943C92.3488 134.013 92.1696 134.053 91.9904 134.053Z" fill="white"/>
-<path d="M91.9674 131.083C92.1235 131.083 92.2449 131.124 92.3085 131.158L94.4995 132.427L92.3259 133.689C92.2681 133.724 92.1467 133.758 91.9906 133.758C91.8345 133.758 91.7131 133.724 91.6553 133.689L89.4643 132.421L91.6379 131.153C91.69 131.124 91.8114 131.083 91.9674 131.083ZM91.9674 130.504C91.742 130.504 91.5165 130.556 91.3431 130.654L88.9267 132.062C88.5856 132.264 88.5856 132.589 88.9325 132.791L91.3605 134.199C91.5339 134.297 91.7593 134.349 91.9848 134.349C92.2102 134.349 92.4357 134.297 92.6091 134.199L95.0255 132.791C95.3666 132.589 95.3666 132.264 95.0197 132.067L92.5918 130.66C92.4241 130.556 92.1929 130.504 91.9674 130.504Z" fill="#706F6F"/>
-<path d="M84.8339 138.217C84.649 138.217 84.4755 138.176 84.3541 138.107L81.9262 136.699C81.8279 136.642 81.8105 136.595 81.8105 136.584C81.8105 136.572 81.8279 136.526 81.9262 136.474L87.0018 133.52C87.1232 133.451 87.2966 133.41 87.4816 133.41C87.6666 133.41 87.84 133.451 87.9672 133.52L90.3951 134.927C90.4934 134.985 90.5107 135.032 90.5107 135.037C90.5107 135.049 90.4934 135.095 90.3951 135.147L85.3195 138.101C85.1923 138.176 85.0189 138.217 84.8339 138.217Z" fill="white"/>
-<path d="M87.4758 133.7C87.6318 133.7 87.7532 133.741 87.8168 133.775L90.0078 135.044L85.175 137.858C85.1172 137.893 84.9958 137.933 84.8397 137.933C84.6836 137.933 84.5622 137.899 84.5044 137.864L82.3134 136.596L87.1462 133.781C87.1983 133.735 87.3197 133.7 87.4758 133.7ZM87.4758 133.121C87.2503 133.121 87.0191 133.173 86.8514 133.272L81.7758 136.225C81.429 136.428 81.4347 136.752 81.7816 136.955L84.2096 138.362C84.383 138.46 84.6084 138.512 84.8339 138.512C85.0594 138.512 85.2906 138.46 85.464 138.362L90.5396 135.409C90.8865 135.206 90.8807 134.882 90.5396 134.679L88.1116 133.272C87.9324 133.173 87.7012 133.121 87.4758 133.121Z" fill="#706F6F"/>
-<path d="M73.4283 133.747C73.2434 133.747 73.0699 133.706 72.9427 133.637L70.5148 132.229C70.4165 132.171 70.3992 132.125 70.3992 132.114C70.3992 132.102 70.4165 132.056 70.5148 132.004L72.9254 130.596C73.0468 130.527 73.2202 130.486 73.4052 130.486C73.5902 130.486 73.7636 130.527 73.8908 130.596L76.3188 132.004C76.417 132.061 76.4344 132.108 76.4344 132.119C76.4344 132.131 76.417 132.177 76.3246 132.229L73.9139 133.637C73.7868 133.706 73.6133 133.747 73.4283 133.747Z" fill="white"/>
-<path d="M73.405 130.776C73.5611 130.776 73.6825 130.817 73.7461 130.852L75.937 132.12L73.7634 133.382C73.7056 133.417 73.5842 133.458 73.4281 133.458C73.2721 133.458 73.1507 133.417 73.0871 133.382L70.8961 132.114L73.0697 130.852C73.1333 130.817 73.2489 130.776 73.405 130.776ZM73.405 130.197C73.1796 130.197 72.9541 130.249 72.7807 130.348L70.3701 131.755C70.0232 131.958 70.029 132.282 70.3758 132.485L72.8038 133.892C72.9772 133.99 73.2027 134.042 73.4339 134.042C73.6594 134.042 73.8906 133.99 74.0582 133.892L76.4689 132.485C76.8099 132.282 76.8099 131.958 76.4631 131.755L74.0351 130.348C73.8617 130.249 73.6305 130.197 73.405 130.197Z" fill="#706F6F"/>
-<path d="M109.368 112.823C109.183 112.823 109.009 112.783 108.882 112.713L106.454 111.306C106.356 111.248 106.339 111.202 106.339 111.19C106.339 111.179 106.356 111.132 106.448 111.08L113.357 107.061C113.478 106.992 113.651 106.951 113.836 106.951C114.021 106.951 114.195 106.992 114.322 107.061L116.75 108.468C116.848 108.526 116.866 108.573 116.866 108.584C116.866 108.596 116.848 108.642 116.75 108.694L109.842 112.713C109.726 112.783 109.553 112.823 109.368 112.823Z" fill="white"/>
-<path d="M113.836 107.241C113.992 107.241 114.114 107.282 114.177 107.316L116.368 108.585L109.703 112.465C109.645 112.499 109.524 112.534 109.368 112.534C109.212 112.534 109.09 112.494 109.027 112.459L106.836 111.191L113.501 107.311C113.559 107.276 113.68 107.241 113.836 107.241ZM113.836 106.662C113.611 106.662 113.385 106.714 113.212 106.813L106.304 110.832C105.963 111.034 105.963 111.359 106.31 111.561L108.738 112.968C108.911 113.067 109.142 113.119 109.368 113.119C109.593 113.119 109.819 113.067 109.992 112.968L116.9 108.95C117.247 108.747 117.241 108.423 116.894 108.22L114.466 106.813C114.293 106.708 114.062 106.662 113.836 106.662Z" fill="#706F6F"/>
-<path d="M83.3016 144.668C83.1166 144.668 82.9432 144.627 82.8218 144.558L80.3881 143.151C80.2898 143.093 80.2725 143.046 80.2725 143.035C80.2725 143.023 80.2898 142.977 80.3823 142.925L87.2904 138.906C87.4118 138.836 87.5853 138.796 87.7702 138.796C87.9552 138.796 88.1287 138.836 88.2501 138.906L90.6838 140.313C90.7821 140.371 90.7994 140.417 90.7994 140.429C90.7994 140.441 90.7821 140.487 90.6896 140.539L83.7814 144.558C83.66 144.627 83.4866 144.668 83.3016 144.668Z" fill="white"/>
-<path d="M87.7705 139.086C87.9265 139.086 88.0479 139.121 88.1057 139.155L90.2967 140.424L83.6314 144.304C83.5736 144.338 83.4522 144.373 83.2961 144.373C83.14 144.373 83.0186 144.338 82.9608 144.304L80.7698 143.035L87.4352 139.155C87.4988 139.121 87.6144 139.086 87.7705 139.086ZM87.7705 138.507C87.545 138.507 87.3196 138.559 87.1461 138.657L80.238 142.676C79.8969 142.879 79.8969 143.203 80.2438 143.4L82.6775 144.807C82.8509 144.906 83.0764 144.958 83.3019 144.958C83.5273 144.958 83.7528 144.906 83.9262 144.807L90.8343 140.788C91.1754 140.586 91.1754 140.262 90.8285 140.065L88.3948 138.657C88.2214 138.559 87.9959 138.507 87.7705 138.507Z" fill="#706F6F"/>
-<path d="M105.466 126.208C105.281 126.208 105.107 126.167 104.986 126.098L102.558 124.69C102.46 124.632 102.442 124.586 102.442 124.575C102.442 124.563 102.46 124.517 102.552 124.464L104.969 123.057C105.09 122.988 105.263 122.947 105.448 122.947C105.633 122.947 105.807 122.988 105.934 123.057L108.362 124.464C108.46 124.522 108.478 124.569 108.478 124.58C108.478 124.592 108.46 124.638 108.368 124.69L105.951 126.098C105.824 126.167 105.651 126.208 105.466 126.208Z" fill="white"/>
-<path d="M105.443 123.242C105.599 123.242 105.72 123.283 105.784 123.317L107.975 124.586L105.801 125.848C105.743 125.883 105.622 125.918 105.466 125.918C105.31 125.918 105.188 125.883 105.131 125.848L102.94 124.58L105.113 123.312C105.171 123.277 105.287 123.242 105.443 123.242ZM105.443 122.663C105.217 122.663 104.992 122.715 104.818 122.814L102.402 124.221C102.061 124.424 102.061 124.748 102.408 124.951L104.836 126.358C105.009 126.456 105.235 126.508 105.46 126.508C105.686 126.508 105.911 126.456 106.084 126.358L108.501 124.951C108.842 124.748 108.842 124.424 108.495 124.227L106.067 122.819C105.899 122.709 105.668 122.663 105.443 122.663Z" fill="#706F6F"/>
-<path d="M100.974 128.824C100.789 128.824 100.615 128.783 100.494 128.714L98.0658 127.307C97.9675 127.249 97.9502 127.202 97.9502 127.191C97.9502 127.179 97.9675 127.133 98.06 127.081L100.471 125.674C100.592 125.604 100.765 125.563 100.95 125.563C101.135 125.563 101.309 125.604 101.436 125.674L103.864 127.081C103.962 127.139 103.98 127.185 103.98 127.197C103.98 127.208 103.962 127.254 103.864 127.307L101.453 128.714C101.332 128.783 101.159 128.824 100.974 128.824Z" fill="white"/>
-<path d="M100.951 125.854C101.107 125.854 101.228 125.894 101.292 125.929L103.483 127.197L101.309 128.465C101.251 128.5 101.13 128.535 100.974 128.535C100.818 128.535 100.696 128.5 100.639 128.465L98.4476 127.197L100.621 125.935C100.673 125.894 100.795 125.854 100.951 125.854ZM100.951 125.274C100.725 125.274 100.5 125.327 100.326 125.425L97.9157 126.832C97.5747 127.035 97.5747 127.359 97.9215 127.562L100.349 128.969C100.523 129.068 100.748 129.12 100.974 129.12C101.199 129.12 101.425 129.068 101.598 128.969L104.009 127.562C104.356 127.359 104.35 127.035 104.009 126.832L101.581 125.425C101.407 125.327 101.182 125.274 100.951 125.274Z" fill="#706F6F"/>
-<path d="M101.269 134.209C101.084 134.209 100.91 134.169 100.789 134.099L98.3551 132.692C98.2568 132.634 98.2395 132.588 98.2395 132.582C98.2395 132.571 98.2568 132.524 98.3551 132.472L114.143 123.282C114.264 123.212 114.437 123.172 114.622 123.172C114.807 123.172 114.981 123.212 115.102 123.282L117.536 124.689C117.634 124.747 117.652 124.793 117.652 124.805C117.652 124.817 117.634 124.863 117.542 124.915L101.754 134.105C101.627 134.169 101.454 134.209 101.269 134.209Z" fill="white"/>
-<path d="M114.622 123.45C114.779 123.45 114.9 123.485 114.958 123.52L117.149 124.788L101.598 133.839C101.54 133.874 101.419 133.914 101.263 133.914C101.107 133.914 100.985 133.88 100.928 133.845L98.7367 132.577L114.287 123.525C114.351 123.491 114.466 123.456 114.622 123.45ZM114.622 122.871C114.397 122.871 114.172 122.923 113.998 123.022L98.2106 132.212C97.8638 132.415 97.8695 132.739 98.2106 132.942L100.644 134.349C100.818 134.447 101.043 134.499 101.269 134.499C101.494 134.499 101.725 134.447 101.899 134.349L117.686 125.159C118.027 124.956 118.027 124.632 117.681 124.435L115.247 123.027C115.079 122.923 114.848 122.871 114.622 122.871Z" fill="#706F6F"/>
-<path d="M73.875 152.382C75.9153 153.558 75.928 155.468 73.9003 156.644C71.8727 157.82 68.5763 157.82 66.536 156.644C64.4958 155.468 64.4873 153.558 66.5149 152.382C68.5425 151.206 71.8348 151.206 73.875 152.382Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M38.1123 73.8438C43.0202 76.6786 43.0519 81.2745 38.1705 84.1092C33.2943 86.9439 25.3559 86.9439 20.448 84.1092C15.5401 81.2745 15.5137 76.6786 20.3951 73.8438C25.2766 71.0091 33.2044 71.0091 38.1123 73.8438Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<path d="M36.7056 74.5427C40.8255 76.9227 40.852 80.7781 36.7585 83.158C32.665 85.538 26.0013 85.538 21.8761 83.158C17.7562 80.7781 17.735 76.9227 21.8285 74.5427C25.9219 72.1628 32.5804 72.1628 36.7056 74.5427Z" fill="#EDEDED"/>
-<path d="M38.9585 74.3038C38.9532 74.3514 38.9532 74.399 38.9479 74.4519C38.9426 74.4942 38.9373 74.5365 38.932 74.5788C38.9267 74.6264 38.9162 74.674 38.9109 74.7216C38.9056 74.7639 38.895 74.8063 38.8844 74.8486C38.8739 74.8962 38.8633 74.9438 38.8474 74.9914C38.8368 75.0337 38.821 75.076 38.8104 75.1183C38.7945 75.1659 38.7787 75.2135 38.7628 75.2558C38.7469 75.2981 38.7311 75.3404 38.7152 75.3827C38.6941 75.4303 38.6729 75.4779 38.6517 75.5308C38.6359 75.5731 38.6147 75.6101 38.5936 75.6524C38.5724 75.7 38.546 75.7476 38.5195 75.7952C38.4984 75.8323 38.4772 75.8746 38.4561 75.9116C38.4243 75.9698 38.3873 76.0279 38.3503 76.0808C38.3291 76.1179 38.308 76.1496 38.2815 76.1866C38.2392 76.2501 38.1916 76.3135 38.144 76.3717C38.1229 76.3982 38.1017 76.4246 38.0806 76.4563C38.0012 76.5568 37.9166 76.652 37.832 76.7472C37.8108 76.7737 37.7844 76.7948 37.7632 76.8212C37.6945 76.8953 37.6204 76.9693 37.5464 77.0381C37.5094 77.0698 37.4776 77.1016 37.4406 77.1333C37.393 77.1756 37.3454 77.2126 37.2978 77.2549C37.2555 77.2919 37.2132 77.329 37.1656 77.366C37.118 77.4083 37.0651 77.4453 37.0122 77.4876C36.9646 77.5246 36.917 77.5617 36.8694 77.5934C36.8166 77.6304 36.7637 77.6727 36.7055 77.7098C36.6526 77.7468 36.605 77.7785 36.5521 77.8155C36.4939 77.8525 36.4358 77.8896 36.3776 77.9266C36.3036 77.9742 36.2295 78.0165 36.1555 78.0641C35.9439 78.1857 35.7271 78.2968 35.505 78.4079C35.4468 78.4343 35.3886 78.466 35.3251 78.4925C35.1242 78.5877 34.9179 78.6723 34.7064 78.7569C34.6799 78.7675 34.6535 78.7781 34.6217 78.7886C34.3943 78.8733 34.1616 78.9526 33.9289 79.0266C33.765 79.0795 33.5957 79.1218 33.4318 79.1694C33.3049 79.2065 33.1779 79.2382 33.051 79.2699C32.8765 79.3122 32.6967 79.3492 32.5168 79.3863C32.3846 79.4127 32.2577 79.4444 32.1255 79.4656C32.0726 79.4762 32.0144 79.4815 31.9615 79.492C31.7394 79.5291 31.5173 79.5608 31.2899 79.5872C31.2264 79.5925 31.1576 79.6031 31.0942 79.6084C30.9673 79.6243 30.835 79.6296 30.7028 79.6401C30.486 79.656 30.2691 79.6719 30.047 79.6824C29.9095 79.6877 29.7667 79.693 29.6292 79.693C29.4547 79.6983 29.2749 79.6983 29.1003 79.693C28.9523 79.693 28.8042 79.6877 28.6561 79.6824C28.4921 79.6771 28.3282 79.6666 28.1642 79.656C28.0162 79.6454 27.8681 79.6348 27.7147 79.619C27.5507 79.6031 27.3921 79.5872 27.2334 79.5661C27.0906 79.5502 26.9426 79.5291 26.7998 79.5026C26.6252 79.4762 26.456 79.4445 26.2868 79.4127C26.1545 79.3863 26.017 79.3598 25.8848 79.3334C25.6838 79.2911 25.4829 79.2382 25.2819 79.1853C25.155 79.1536 25.0227 79.1218 24.8958 79.0795C24.8271 79.0584 24.7583 79.0372 24.6948 79.0161C24.4939 78.9526 24.2982 78.8838 24.1078 78.8151C24.0496 78.7939 23.9967 78.7728 23.9386 78.7516C23.764 78.6829 23.5948 78.6088 23.4256 78.5348C23.3409 78.4978 23.2563 78.466 23.177 78.4237C22.9337 78.3074 22.6957 78.1857 22.4683 78.0535C20.5591 76.9535 19.6071 75.5044 19.6124 74.0605L19.6018 78.2228C19.5965 79.6666 20.5485 81.1104 22.4577 82.2157C22.6851 82.3479 22.9231 82.4696 23.1664 82.5859C23.2457 82.623 23.3356 82.66 23.415 82.697C23.5578 82.7605 23.7006 82.8292 23.8487 82.8874C23.8751 82.898 23.9015 82.9085 23.928 82.9138C23.9809 82.935 24.0391 82.9561 24.0972 82.9773C24.2876 83.0461 24.4886 83.1148 24.6843 83.1783C24.753 83.1994 24.8218 83.2206 24.8905 83.2417C24.9381 83.2576 24.9804 83.2735 25.028 83.284C25.1074 83.3052 25.192 83.3211 25.2766 83.3422C25.4776 83.3951 25.6733 83.4427 25.8795 83.4903C25.9324 83.5009 25.9853 83.5167 26.0382 83.5273C26.1175 83.5432 26.1968 83.5538 26.2762 83.5696C26.4454 83.6014 26.6199 83.6331 26.7892 83.6595C26.8579 83.6701 26.9267 83.686 26.9954 83.6966C27.0695 83.7071 27.1488 83.7124 27.2228 83.723C27.3815 83.7442 27.5455 83.76 27.7094 83.7759C27.7887 83.7812 27.8628 83.797 27.9421 83.8023C28.0162 83.8076 28.0849 83.8076 28.1589 83.8129C28.3229 83.8235 28.4869 83.8341 28.6508 83.8394C28.7354 83.8446 28.8148 83.8499 28.8994 83.8499C28.9628 83.8499 29.0316 83.8499 29.0951 83.8499C29.2696 83.8499 29.4494 83.8499 29.6239 83.8499C29.7138 83.8499 29.7984 83.8499 29.8884 83.8499C29.9412 83.8499 29.9941 83.8394 30.0417 83.8394C30.2586 83.8288 30.4807 83.8129 30.6975 83.797C30.7874 83.7918 30.8721 83.7865 30.962 83.7812C31.0043 83.7759 31.0466 83.7706 31.0889 83.7653C31.1524 83.76 31.2211 83.7495 31.2846 83.7442C31.512 83.7177 31.7341 83.686 31.9562 83.649C32.0091 83.6384 32.0673 83.6331 32.1202 83.6225C32.1466 83.6172 32.1731 83.6172 32.1995 83.6119C32.3053 83.5908 32.4058 83.5643 32.5116 83.5432C32.6914 83.5062 32.8712 83.4692 33.0457 83.4268C33.1726 83.3951 33.2996 83.3581 33.4265 83.3264C33.5957 83.2788 33.7597 83.2364 33.9236 83.1835C33.9607 83.173 33.9977 83.1624 34.0294 83.1518C34.2304 83.0884 34.4261 83.0196 34.6165 82.9456C34.6429 82.935 34.6693 82.9244 34.7011 82.9138C34.9126 82.8292 35.1189 82.7446 35.3199 82.6494C35.378 82.623 35.4415 82.5965 35.4997 82.5648C35.7218 82.459 35.9439 82.3427 36.1502 82.221C36.1925 82.1999 36.2295 82.1734 36.2665 82.1523C36.3036 82.1311 36.3353 82.11 36.3723 82.0835C36.4305 82.0465 36.4887 82.0095 36.5468 81.9724C36.5997 81.9354 36.6526 81.9037 36.7002 81.8667C36.7531 81.8296 36.8113 81.7926 36.8642 81.7503C36.9118 81.7133 36.9594 81.6763 37.007 81.6393C37.0598 81.6022 37.1074 81.5599 37.1603 81.5229C37.2079 81.4859 37.2502 81.4489 37.2925 81.4118C37.3401 81.3695 37.3877 81.3325 37.43 81.2902C37.4512 81.2743 37.4671 81.2585 37.4882 81.2426C37.5041 81.2267 37.52 81.2109 37.5358 81.195C37.6099 81.121 37.6839 81.0522 37.7527 80.9782C37.7738 80.9517 37.8003 80.9306 37.8214 80.9041C37.9113 80.8089 37.9959 80.7084 38.07 80.6133C38.0753 80.608 38.0753 80.6027 38.0806 80.6027C38.0964 80.5815 38.1123 80.5551 38.1334 80.5339C38.181 80.4705 38.2286 80.4123 38.271 80.3488C38.2921 80.3118 38.3186 80.2801 38.3397 80.243C38.3767 80.1849 38.4137 80.1267 38.4455 80.0738C38.4561 80.0579 38.4666 80.0421 38.4719 80.0262C38.4825 80.005 38.4931 79.9786 38.5089 79.9575C38.5354 79.9099 38.5618 79.8622 38.583 79.8147C38.6041 79.7723 38.62 79.7353 38.6412 79.693C38.6623 79.6454 38.6835 79.5978 38.7046 79.5449C38.7152 79.5238 38.7258 79.5026 38.7311 79.4815C38.7364 79.4603 38.7416 79.4392 38.7522 79.4233C38.7681 79.3757 38.784 79.3281 38.7998 79.2858C38.8104 79.2435 38.8263 79.2012 38.8368 79.1589C38.8474 79.1113 38.8633 79.0637 38.8739 79.0161C38.8792 78.9896 38.8897 78.9632 38.895 78.942C38.9003 78.9262 38.9003 78.905 38.9056 78.8891C38.9162 78.8415 38.9215 78.7939 38.9268 78.7463C38.932 78.704 38.9373 78.6617 38.9426 78.6194C38.9479 78.5718 38.9479 78.5242 38.9532 78.4713C38.9532 78.4449 38.9585 78.4132 38.9585 78.3867C38.9585 78.3603 38.9585 78.3285 38.9585 78.3021L38.9691 74.1399C38.9691 74.1928 38.9638 74.2457 38.9585 74.3038Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M36.1079 70.1421C39.8999 72.3317 39.921 75.8804 36.1555 78.0699C32.3899 80.2594 26.2603 80.2594 22.4683 78.0699C18.6763 75.8804 18.6605 72.3317 22.426 70.1421C26.1916 67.9526 32.3159 67.9526 36.1079 70.1421Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M29.1126 69.7641C29.3652 69.6183 29.7749 69.6183 30.0276 69.7641L31.0125 70.3328C31.2361 70.4619 31.2653 70.6654 31.0815 70.814L29.3903 72.181C29.2252 72.3144 28.9287 72.3701 28.6592 72.3182L27.5969 72.1138C26.8385 73.1413 26.8385 74.3109 27.5969 75.3385L28.6592 75.134C28.9287 75.0822 29.2252 75.1378 29.3903 75.2713L31.0815 76.6382C31.2653 76.7868 31.2361 76.9903 31.0125 77.1195L30.0276 77.6881C29.7749 77.834 29.3652 77.834 29.1126 77.6881L28.1976 77.1598C24.9129 75.2634 24.9129 72.1888 28.1976 70.2924L29.1126 69.7641Z" fill="#DA3635"/>
-<path d="M54.4905 173.511L36.5021 163.126C35.7987 162.721 34.6628 162.721 33.9664 163.126L2.9412 181.156C2.38906 181.459 2.4207 181.884 2.4207 181.884L2.41016 185.626C2.41016 185.893 2.586 186.161 2.9412 186.365L20.9296 196.75C21.633 197.154 22.7654 197.154 23.4653 196.75L54.487 178.719C54.8316 178.519 55.0075 178.255 55.0075 177.991L55.018 174.249C54.9618 173.701 54.4905 173.511 54.4905 173.511Z" fill="#EDEDED"/>
-<path d="M55.8692 173.718L36.9171 162.778C36.1751 162.348 34.9793 162.352 34.2478 162.778L1.55916 181.772C0.97537 182.088 1.01054 182.538 1.01054 182.538L1 186.481C1 186.762 1.18638 187.043 1.55916 187.258L20.5112 198.199C21.2533 198.628 22.4455 198.628 23.1805 198.199L55.8692 179.204C56.2349 178.993 56.4178 178.716 56.4178 178.438L56.4283 174.495C56.3685 173.919 55.8692 173.718 55.8692 173.718Z" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54.3992 173.613L23.4934 191.573L23.4829 195.301L54.3887 177.341C54.7333 177.14 54.9056 176.877 54.9092 176.616L54.9197 172.889C54.9162 173.149 54.7439 173.413 54.3992 173.613Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M3.05029 181.226C2.69861 181.022 2.52277 180.755 2.52277 180.491L2.51221 184.219C2.51221 184.486 2.68805 184.75 3.03973 184.954L20.9578 195.3L20.9684 191.573L3.05029 181.226Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M23.4936 191.573L23.4831 195.301C22.7867 195.706 21.6578 195.706 20.958 195.301L20.9685 191.573C21.6684 191.978 22.7973 191.978 23.4936 191.573Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M54.389 172.15C55.0889 172.554 55.0924 173.208 54.3961 173.613L23.4903 191.573C22.794 191.978 21.6651 191.978 20.9653 191.573L3.04711 181.227C2.34727 180.822 2.34374 180.168 3.04007 179.764L33.9458 161.803C34.6386 161.399 35.771 161.399 36.4709 161.803L54.389 172.15Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M17.318 186.055L15.848 186.91C15.7706 186.956 15.6721 186.956 15.5948 186.91L10.3934 183.907C10.2246 183.808 10.2246 183.565 10.3934 183.467L11.8635 182.612C11.9408 182.567 12.0393 182.567 12.1167 182.612L17.318 185.616C17.4833 185.718 17.4833 185.96 17.318 186.055Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M36.0941 162.601C36.3051 162.721 36.3051 162.918 36.0976 163.037C35.8901 163.157 35.5525 163.157 35.3415 163.037C35.1305 162.918 35.1306 162.721 35.338 162.601C35.549 162.482 35.8866 162.482 36.0941 162.601Z" fill="#706F6F"/>
-<path d="M37.4553 163.333C37.6663 163.452 37.6663 163.649 37.4588 163.769C37.2513 163.888 36.9137 163.888 36.7027 163.769C36.4916 163.649 36.4916 163.452 36.6991 163.333C36.9102 163.213 37.2478 163.213 37.4553 163.333Z" fill="#706F6F"/>
-<path d="M47.4781 169.182C47.6644 169.291 47.6644 169.463 47.4781 169.572C47.2917 169.681 46.9892 169.681 46.8028 169.572L39.6603 165.447C39.4739 165.338 39.4739 165.165 39.6567 165.056C39.8431 164.947 40.1456 164.947 40.332 165.056L47.4781 169.182Z" fill="#706F6F"/>
-<path d="M192.859 54.0173L187.727 51.0346C184.398 49.1005 179.79 49.3714 174.701 52.3104L179.833 55.293C184.922 52.357 189.53 52.0832 192.859 54.0173Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M161.795 95.6582L166.927 98.6409C163.641 96.7301 161.603 92.6698 161.588 86.8996C161.556 75.2835 169.726 61.1304 179.836 55.2932L174.704 52.3105C164.594 58.1477 156.424 72.3008 156.456 83.9169C156.47 89.6871 158.509 93.7475 161.795 95.6582Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M166.924 98.6375C159.786 94.489 159.806 81.1362 166.968 68.8132C174.13 56.4902 185.722 49.8634 192.86 54.0119C199.998 58.1604 199.979 71.5132 192.817 83.8362C185.655 96.1592 174.062 102.786 166.924 98.6375Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M180.914 57.6665C180.593 57.85 180.337 58.2986 180.337 58.6656L180.351 64.0018C180.351 64.3659 180.611 64.5144 180.931 64.3309C181.249 64.1474 181.508 63.7018 181.505 63.3348L181.49 57.9986C181.49 57.6316 181.231 57.483 180.914 57.6665Z" fill="#DA3635"/>
-<path d="M180.998 87.2457C180.678 87.4292 180.421 87.8778 180.421 88.2419L180.436 93.581C180.436 93.9451 180.695 94.0936 181.016 93.9101C181.333 93.7266 181.592 93.2809 181.589 92.9139L181.575 87.5748C181.575 87.2108 181.316 87.0622 180.998 87.2457Z" fill="#DA3635"/>
-<path d="M165.77 83.8991C165.453 84.0826 165.194 84.5282 165.197 84.8952C165.197 85.2623 165.456 85.4108 165.776 85.2273L170.419 82.5476C170.74 82.3641 170.996 81.9155 170.996 81.5485C170.996 81.1844 170.737 81.0358 170.416 81.2193L165.77 83.8991Z" fill="#DA3635"/>
-<path d="M191.511 69.0358C191.19 69.2193 190.934 69.6679 190.934 70.032C190.934 70.399 191.193 70.5475 191.514 70.364L196.157 67.6843C196.474 67.5008 196.733 67.0522 196.733 66.6852C196.733 66.3211 196.471 66.1726 196.154 66.3561L191.511 69.0358Z" fill="#DA3635"/>
-<path d="M170.186 68.9862C170.037 69.0706 169.892 69.2221 169.778 69.4173C169.554 69.8047 169.554 70.227 169.781 70.3552L173.075 72.2339C173.189 72.298 173.338 72.2776 173.483 72.1931C173.632 72.1086 173.777 71.9572 173.891 71.7649C174.115 71.3746 174.115 70.9552 173.888 70.827L170.594 68.9483C170.48 68.8784 170.332 68.8988 170.186 68.9862Z" fill="#DA3635"/>
-<path d="M188.446 79.3899C188.297 79.4744 188.152 79.6259 188.038 79.8181C187.814 80.2084 187.814 80.6278 188.041 80.7589L191.335 82.6347C191.449 82.6988 191.597 82.6813 191.743 82.594C191.892 82.5095 192.037 82.358 192.151 82.1629C192.375 81.7755 192.375 81.356 192.148 81.225L188.854 79.3462C188.743 79.2821 188.594 79.3054 188.446 79.3899Z" fill="#DA3635"/>
-<path d="M173.527 88.0032C173.378 88.0877 173.232 88.2391 173.119 88.4314L169.845 94.1025C169.621 94.4928 169.621 94.9123 169.848 95.0404C169.961 95.1045 170.11 95.0841 170.259 94.9996C170.407 94.9152 170.553 94.7637 170.666 94.5686L173.94 88.9003C174.165 88.51 174.165 88.0906 173.937 87.9595C173.824 87.8954 173.675 87.9187 173.527 88.0032Z" fill="#DA3635"/>
-<path d="M191.67 56.5805C191.522 56.665 191.376 56.8165 191.263 57.0087L187.989 62.6799C187.764 63.0673 187.764 63.4867 187.992 63.6178C188.105 63.6818 188.254 63.6615 188.399 63.577C188.548 63.4925 188.694 63.3411 188.807 63.1488L192.081 57.4777C192.305 57.0903 192.305 56.6679 192.078 56.5398C191.968 56.4728 191.819 56.4932 191.67 56.5805Z" fill="#DA3635"/>
-<path d="M188.53 73.4276L186.477 72.2334L178.968 77.0278L181.021 78.222L188.53 73.4276Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.021 78.2226L178.968 77.0283L179.084 79.3265L181.138 80.5207L181.021 78.2226Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.53 73.4277L181.021 78.2221L181.138 80.5203L188.644 75.7259L188.53 73.4277Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M174.855 66.9267L172.802 65.7324L171.022 67.9432L173.073 69.1374L174.855 66.9267Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M173.073 69.1376L171.022 67.9434L179.067 79.2507L181.121 80.4449L173.073 69.1376Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M174.855 66.9268L173.072 69.1375L181.12 80.4449L182.9 78.2312L174.855 66.9268Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.788 76.8933C182.213 76.6486 182.598 76.6253 182.874 76.7855L183.302 77.0331C183.026 76.8729 182.641 76.8933 182.216 77.1409C181.371 77.6273 180.69 78.8099 180.693 79.7799C180.693 80.2605 180.864 80.6013 181.138 80.7585L180.71 80.511C180.436 80.3508 180.264 80.0129 180.264 79.5323C180.262 78.5623 180.943 77.3797 181.788 76.8933Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M181.139 80.7539C180.543 80.4079 180.545 79.2942 181.143 78.2664C181.74 77.2385 182.707 76.6858 183.302 77.0318C183.897 77.3777 183.896 78.4914 183.298 79.5193C182.701 80.5471 181.734 81.0999 181.139 80.7539Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M143.293 183.592C142.765 183.969 142.041 184.104 141.385 184.083C140.216 184.052 139.053 183.654 138.164 182.982C137.621 182.573 137.047 182.273 136.437 181.979C135.863 181.7 135.336 181.291 134.762 180.976C133.795 180.448 132.807 179.89 131.835 179.352C131.406 179.125 129.534 178.086 130.108 177.496C130.667 177.775 133.081 179.254 133.821 179.662C134.891 180.273 135.909 180.945 136.959 181.586C137.419 181.865 139.11 182.77 139.539 182.868C139.916 182.951 141.069 183.313 142.005 183.08C142.383 182.982 143.598 182.175 143.815 181.911C144.047 182.656 143.851 183.199 143.293 183.592Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M143.768 182.082C143.127 182.889 141.747 183.364 140.697 183.116C140.123 182.987 139.529 182.92 138.955 182.723C138.231 182.475 137.59 181.999 136.949 181.606C135.666 180.821 134.384 180.045 133.086 179.306C132.559 179.026 132.12 178.665 131.623 178.354C131.277 178.142 130.372 177.879 130.212 177.517C129.902 176.876 132.099 176.023 132.559 175.955C133.578 175.826 134.348 176.565 135.155 177.041C135.925 177.501 136.762 177.811 137.538 178.308C138.308 178.799 139.146 179.176 139.937 179.673C140.676 180.133 141.318 180.738 142.088 181.136C142.398 181.301 143.499 182.123 143.794 181.943" fill="white"/>
-<path d="M143.768 182.082C143.127 182.889 141.747 183.364 140.697 183.116C140.123 182.987 139.529 182.92 138.955 182.723C138.231 182.475 137.59 181.999 136.949 181.606C135.666 180.821 134.384 180.045 133.086 179.306C132.559 179.026 132.12 178.665 131.623 178.354C131.277 178.142 130.372 177.879 130.212 177.517C129.902 176.876 132.099 176.023 132.559 175.955C133.578 175.826 134.348 176.565 135.155 177.041C135.925 177.501 136.762 177.811 137.538 178.308C138.308 178.799 139.146 179.176 139.937 179.673C140.676 180.133 141.318 180.738 142.088 181.136C142.398 181.301 143.499 182.123 143.794 181.943" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M143.768 182.082C143.127 182.889 141.747 183.364 140.697 183.116C140.123 182.987 139.529 182.92 138.955 182.723C138.231 182.475 137.59 181.999 136.949 181.606C135.666 180.821 134.384 180.045 133.086 179.306C132.559 179.026 132.12 178.665 131.623 178.354C131.277 178.142 130.372 177.879 130.212 177.517C129.902 176.876 132.099 176.023 132.559 175.955C133.578 175.826 134.348 176.565 135.155 177.041C135.925 177.501 136.762 177.811 137.538 178.308C138.308 178.799 139.146 179.176 139.937 179.673C140.676 180.133 141.318 180.738 142.088 181.136C142.398 181.301 143.499 182.123 143.794 181.943" fill="white"/>
-<path d="M143.768 182.082C143.127 182.889 141.747 183.364 140.697 183.116C140.123 182.987 139.529 182.92 138.955 182.723C138.231 182.475 137.59 181.999 136.949 181.606C135.666 180.821 134.384 180.045 133.086 179.306C132.559 179.026 132.12 178.665 131.623 178.354C131.277 178.142 130.372 177.879 130.212 177.517C129.902 176.876 132.099 176.023 132.559 175.955C133.578 175.826 134.348 176.565 135.155 177.041C135.925 177.501 136.762 177.811 137.538 178.308C138.308 178.799 139.146 179.176 139.937 179.673C140.676 180.133 141.318 180.738 142.088 181.136C142.398 181.301 143.499 182.123 143.794 181.943" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.727 181.063C132.466 180.934 132.368 179.274 131.66 179.486C131.117 179.6 131.117 181.177 131.727 181.063Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.081 182.951C137.373 182.754 137.274 184.399 138.014 184.528C138.624 184.657 138.624 183.065 138.081 182.951Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.728 162.926C140.464 163.092 139.022 163.516 138.624 162.993C138.412 162.714 139.053 161.975 139.053 161.644C139.053 161.267 138.774 160.905 138.805 160.558C138.82 160.248 138.934 160.362 139.136 160.248C139.187 160.233 139.265 160.315 139.348 160.264C139.415 160.212 139.332 160.098 139.363 160.052C139.741 159.576 140.578 158.935 141.25 159.312C141.938 159.69 141.84 160.76 141.416 161.298C141.188 161.577 140.925 161.809 140.594 161.939C140.345 162.037 140.118 162.037 140.201 162.383" fill="white"/>
-<path d="M140.728 162.926C140.464 163.092 139.022 163.516 138.624 162.993C138.412 162.714 139.053 161.975 139.053 161.644C139.053 161.267 138.774 160.905 138.805 160.558C138.82 160.248 138.934 160.362 139.136 160.248C139.187 160.233 139.265 160.315 139.348 160.264C139.415 160.212 139.332 160.098 139.363 160.052C139.741 159.576 140.578 158.935 141.25 159.312C141.938 159.69 141.84 160.76 141.416 161.298C141.188 161.577 140.925 161.809 140.594 161.939C140.345 162.037 140.118 162.037 140.201 162.383" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.728 162.926C140.464 163.092 139.022 163.516 138.624 162.993C138.412 162.714 139.053 161.975 139.053 161.644C139.053 161.267 138.774 160.905 138.805 160.558C138.82 160.248 138.934 160.362 139.136 160.248C139.187 160.233 139.265 160.315 139.348 160.264C139.415 160.212 139.332 160.098 139.363 160.052C139.741 159.576 140.578 158.935 141.25 159.312C141.938 159.69 141.84 160.76 141.416 161.298C141.188 161.577 140.925 161.809 140.594 161.939C140.345 162.037 140.118 162.037 140.201 162.383" fill="white"/>
-<path d="M140.728 162.926C140.464 163.092 139.022 163.516 138.624 162.993C138.412 162.714 139.053 161.975 139.053 161.644C139.053 161.267 138.774 160.905 138.805 160.558C138.82 160.248 138.934 160.362 139.136 160.248C139.187 160.233 139.265 160.315 139.348 160.264C139.415 160.212 139.332 160.098 139.363 160.052C139.741 159.576 140.578 158.935 141.25 159.312C141.938 159.69 141.84 160.76 141.416 161.298C141.188 161.577 140.925 161.809 140.594 161.939C140.345 162.037 140.118 162.037 140.201 162.383" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M141.188 165.573C141.007 165.377 140.201 165.604 140.154 165.821C140.102 166.018 140.925 168.039 141.338 168.401C141.829 168.83 142.667 169.073 143.262 169.368C143.67 169.58 144.151 169.745 144.513 170.025C144.807 170.252 144.942 170.635 145.237 170.862C145.464 171.043 145.847 171.172 146.007 170.811C146.09 170.599 145.924 170.335 145.841 170.138C145.645 169.611 145.547 169.27 145.05 168.991C144.161 168.499 143.163 168.22 142.522 167.398C142.191 166.969 141.271 166.069 141.307 165.526" fill="white"/>
-<path d="M141.188 165.573C141.007 165.377 140.201 165.604 140.154 165.821C140.102 166.018 140.925 168.039 141.338 168.401C141.829 168.83 142.667 169.073 143.262 169.368C143.67 169.58 144.151 169.745 144.513 170.025C144.807 170.252 144.942 170.635 145.237 170.862C145.464 171.043 145.847 171.172 146.007 170.811C146.09 170.599 145.924 170.335 145.841 170.138C145.645 169.611 145.547 169.27 145.05 168.991C144.161 168.499 143.163 168.22 142.522 167.398C142.191 166.969 141.271 166.069 141.307 165.526" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M141.188 165.573C141.007 165.377 140.201 165.604 140.154 165.821C140.102 166.018 140.925 168.039 141.338 168.401C141.829 168.83 142.667 169.073 143.262 169.368C143.67 169.58 144.151 169.745 144.513 170.025C144.807 170.252 144.942 170.635 145.237 170.862C145.464 171.043 145.847 171.172 146.007 170.811C146.09 170.599 145.924 170.335 145.841 170.138C145.645 169.611 145.547 169.27 145.05 168.991C144.161 168.499 143.163 168.22 142.522 167.398C142.191 166.969 141.271 166.069 141.307 165.526" fill="white"/>
-<path d="M141.188 165.573C141.007 165.377 140.201 165.604 140.154 165.821C140.102 166.018 140.925 168.039 141.338 168.401C141.829 168.83 142.667 169.073 143.262 169.368C143.67 169.58 144.151 169.745 144.513 170.025C144.807 170.252 144.942 170.635 145.237 170.862C145.464 171.043 145.847 171.172 146.007 170.811C146.09 170.599 145.924 170.335 145.841 170.138C145.645 169.611 145.547 169.27 145.05 168.991C144.161 168.499 143.163 168.22 142.522 167.398C142.191 166.969 141.271 166.069 141.307 165.526" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.979 164.668C135.604 164.818 136.246 165.159 135.884 165.898C135.573 166.54 135.129 167.031 135.212 167.786C135.279 168.261 135.491 168.737 135.506 169.213C135.522 169.704 135.439 170.428 135.294 170.919C135.196 171.281 134.984 171.705 134.57 171.787C134.224 171.855 133.862 171.575 133.862 171.198C133.878 170.671 134.353 170.195 134.307 169.606C134.276 169.228 134.141 168.866 134.126 168.504C134.11 168.06 134.059 167.615 134.028 167.155C134.012 166.612 134.157 166.266 134.436 165.811C134.601 165.516 135.046 165.071 135.046 164.74" fill="white"/>
-<path d="M134.979 164.668C135.604 164.818 136.246 165.159 135.884 165.898C135.573 166.54 135.129 167.031 135.212 167.786C135.279 168.261 135.491 168.737 135.506 169.213C135.522 169.704 135.439 170.428 135.294 170.919C135.196 171.281 134.984 171.705 134.57 171.787C134.224 171.855 133.862 171.575 133.862 171.198C133.878 170.671 134.353 170.195 134.307 169.606C134.276 169.228 134.141 168.866 134.126 168.504C134.11 168.06 134.059 167.615 134.028 167.155C134.012 166.612 134.157 166.266 134.436 165.811C134.601 165.516 135.046 165.071 135.046 164.74" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.979 164.668C135.604 164.818 136.246 165.159 135.884 165.898C135.573 166.54 135.129 167.031 135.212 167.786C135.279 168.261 135.491 168.737 135.506 169.213C135.522 169.704 135.439 170.428 135.294 170.919C135.196 171.281 134.984 171.705 134.57 171.787C134.224 171.855 133.862 171.575 133.862 171.198C133.878 170.671 134.353 170.195 134.307 169.606C134.276 169.228 134.141 168.866 134.126 168.504C134.11 168.06 134.059 167.615 134.028 167.155C134.012 166.612 134.157 166.266 134.436 165.811C134.601 165.516 135.046 165.071 135.046 164.74" fill="white"/>
-<path d="M134.979 164.668C135.604 164.818 136.246 165.159 135.884 165.898C135.573 166.54 135.129 167.031 135.212 167.786C135.279 168.261 135.491 168.737 135.506 169.213C135.522 169.704 135.439 170.428 135.294 170.919C135.196 171.281 134.984 171.705 134.57 171.787C134.224 171.855 133.862 171.575 133.862 171.198C133.878 170.671 134.353 170.195 134.307 169.606C134.276 169.228 134.141 168.866 134.126 168.504C134.11 168.06 134.059 167.615 134.028 167.155C134.012 166.612 134.157 166.266 134.436 165.811C134.601 165.516 135.046 165.071 135.046 164.74" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.983 175.903C138.624 176.001 137.817 175.195 137.688 175.097C137.326 174.817 137.099 174.554 136.654 174.554C136.261 174.569 135.863 174.652 135.454 174.683C135.077 174.698 134.715 174.631 134.338 174.698C134.059 174.75 133.728 174.812 133.629 175.107C133.547 175.386 133.728 175.779 133.94 175.862C134.167 175.945 134.71 175.846 134.974 175.831C137.14 175.733 133.857 175.65 136.023 175.748C136.535 175.779 137.766 176.374 138.029 175.815" fill="white"/>
-<path d="M137.983 175.903C138.624 176.001 137.817 175.195 137.688 175.097C137.326 174.817 137.099 174.554 136.654 174.554C136.261 174.569 135.863 174.652 135.454 174.683C135.077 174.698 134.715 174.631 134.338 174.698C134.059 174.75 133.728 174.812 133.629 175.107C133.547 175.386 133.728 175.779 133.94 175.862C134.167 175.945 134.71 175.846 134.974 175.831C137.14 175.733 133.857 175.65 136.023 175.748C136.535 175.779 137.766 176.374 138.029 175.815" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.983 175.903C138.624 176.001 137.817 175.195 137.688 175.097C137.326 174.817 137.099 174.554 136.654 174.554C136.261 174.569 135.863 174.652 135.454 174.683C135.077 174.698 134.715 174.631 134.338 174.698C134.059 174.75 133.728 174.812 133.629 175.107C133.547 175.386 133.728 175.779 133.94 175.862C134.167 175.945 134.71 175.846 134.974 175.831C137.14 175.733 133.857 175.65 136.023 175.748C136.535 175.779 137.766 176.374 138.029 175.815" fill="white"/>
-<path d="M137.983 175.903C138.624 176.001 137.817 175.195 137.688 175.097C137.326 174.817 137.099 174.554 136.654 174.554C136.261 174.569 135.863 174.652 135.454 174.683C135.077 174.698 134.715 174.631 134.338 174.698C134.059 174.75 133.728 174.812 133.629 175.107C133.547 175.386 133.728 175.779 133.94 175.862C134.167 175.945 134.71 175.846 134.974 175.831C137.14 175.733 133.857 175.65 136.023 175.748C136.535 175.779 137.766 176.374 138.029 175.815" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M139.43 180.635C139.053 180.764 138.82 180.536 138.526 180.567C138.246 180.583 138.278 180.847 138.262 181.141C138.246 181.865 138.572 182.01 139.131 182.372C139.56 182.651 139.885 182.982 140.444 182.749C141.592 182.289 139.606 181.322 139.508 180.81" fill="white"/>
-<path d="M139.43 180.635C139.053 180.764 138.82 180.536 138.526 180.567C138.246 180.583 138.278 180.847 138.262 181.141C138.246 181.865 138.572 182.01 139.131 182.372C139.56 182.651 139.885 182.982 140.444 182.749C141.592 182.289 139.606 181.322 139.508 180.81" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M139.43 180.635C139.053 180.764 138.82 180.536 138.526 180.567C138.246 180.583 138.278 180.847 138.262 181.141C138.246 181.865 138.572 182.01 139.131 182.372C139.56 182.651 139.885 182.982 140.444 182.749C141.592 182.289 139.606 181.322 139.508 180.81" fill="white"/>
-<path d="M139.43 180.635C139.053 180.764 138.82 180.536 138.526 180.567C138.246 180.583 138.278 180.847 138.262 181.141C138.246 181.865 138.572 182.01 139.131 182.372C139.56 182.651 139.885 182.982 140.444 182.749C141.592 182.289 139.606 181.322 139.508 180.81" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M133.727 174.937C133.531 175.345 133.795 175.511 133.841 175.841C133.872 176.09 133.479 176.333 133.329 176.529C133.148 176.757 132.621 177.698 132.295 177.63C131.933 177.563 131.721 176.581 131.783 176.281C131.882 175.935 132.244 175.112 132.538 174.916C132.9 174.652 133.474 174.999 133.852 174.849" fill="white"/>
-<path d="M133.727 174.937C133.531 175.345 133.795 175.511 133.841 175.841C133.872 176.09 133.479 176.333 133.329 176.529C133.148 176.757 132.621 177.698 132.295 177.63C131.933 177.563 131.721 176.581 131.783 176.281C131.882 175.935 132.244 175.112 132.538 174.916C132.9 174.652 133.474 174.999 133.852 174.849" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M133.727 174.937C133.531 175.345 133.795 175.511 133.841 175.841C133.872 176.09 133.479 176.333 133.329 176.529C133.148 176.757 132.621 177.698 132.295 177.63C131.933 177.563 131.721 176.581 131.783 176.281C131.882 175.935 132.244 175.112 132.538 174.916C132.9 174.652 133.474 174.999 133.852 174.849" fill="white"/>
-<path d="M133.727 174.937C133.531 175.345 133.795 175.511 133.841 175.841C133.872 176.09 133.479 176.333 133.329 176.529C133.148 176.757 132.621 177.698 132.295 177.63C131.933 177.563 131.721 176.581 131.783 176.281C131.882 175.935 132.244 175.112 132.538 174.916C132.9 174.652 133.474 174.999 133.852 174.849" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.387 169.188C135.16 169.761 134.994 170.304 135.123 170.945C135.237 171.519 135.749 171.964 136.044 172.471C136.752 173.639 137.357 174.854 137.734 176.152C137.884 176.679 138.081 180.407 138.624 180.355C138.903 180.34 139.167 180.304 139.43 180.257C140.102 180.128 139.921 176.281 139.808 175.707C139.627 174.87 139.56 174.017 139.348 173.179C139.234 172.75 139.068 172.393 139.084 171.948C139.099 171.519 139.363 170.552 139.311 170.144" fill="white"/>
-<path d="M135.387 169.188C135.16 169.761 134.994 170.304 135.123 170.945C135.237 171.519 135.749 171.964 136.044 172.471C136.752 173.639 137.357 174.854 137.734 176.152C137.884 176.679 138.081 180.407 138.624 180.355C138.903 180.34 139.167 180.304 139.43 180.257C140.102 180.128 139.921 176.281 139.808 175.707C139.627 174.87 139.56 174.017 139.348 173.179C139.234 172.75 139.068 172.393 139.084 171.948C139.099 171.519 139.363 170.552 139.311 170.144" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.387 169.188C135.16 169.761 134.994 170.304 135.123 170.945C135.237 171.519 135.749 171.964 136.044 172.471C136.752 173.639 137.357 174.854 137.734 176.152C137.884 176.679 138.081 180.407 138.624 180.355C138.903 180.34 139.167 180.304 139.43 180.257C140.102 180.128 139.921 176.281 139.808 175.707C139.627 174.87 139.56 174.017 139.348 173.179C139.234 172.75 139.068 172.393 139.084 171.948C139.099 171.519 139.363 170.552 139.311 170.144" fill="white"/>
-<path d="M135.387 169.188C135.16 169.761 134.994 170.304 135.123 170.945C135.237 171.519 135.749 171.964 136.044 172.471C136.752 173.639 137.357 174.854 137.734 176.152C137.884 176.679 138.081 180.407 138.624 180.355C138.903 180.34 139.167 180.304 139.43 180.257C140.102 180.128 139.921 176.281 139.808 175.707C139.627 174.87 139.56 174.017 139.348 173.179C139.234 172.75 139.068 172.393 139.084 171.948C139.099 171.519 139.363 170.552 139.311 170.144" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.841 162.207C138.35 163.407 140.666 163.49 140.289 162.419C141.421 162.487 141.571 163.8 141.654 164.684C141.669 164.932 141.685 165.258 141.638 165.491C141.555 165.868 141.555 165.77 141.261 165.837C141.08 165.868 140.852 165.821 140.671 165.889C140.377 166.018 140.506 165.956 140.408 166.235C140.159 166.907 139.999 167.683 139.818 168.386C139.72 168.779 139.653 169.208 139.622 169.616C139.606 169.782 139.673 170.227 139.591 170.34C139.492 170.521 139.342 170.439 139.131 170.454C138.195 170.506 137.554 170.485 136.716 170.025C136.24 169.777 135.765 169.467 135.336 169.12C134.808 168.691 134.906 168.562 135.186 167.952C135.413 167.445 135.563 166.918 135.76 166.39C135.971 165.847 135.925 165.749 135.548 165.341C135.32 165.092 134.86 164.881 134.937 164.586C135.02 164.276 135.48 164.043 135.728 163.831C136.302 163.34 136.814 162.828 137.517 162.482C137.766 162.352 138.748 162.285 138.784 162.218C138.738 162.156 138.888 162.171 138.841 162.207Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.842 158.133C141.204 158.247 141.416 158.661 141.452 159.023C141.504 159.679 141.24 159.731 140.682 159.829C140.206 159.912 139.663 159.798 139.513 160.356C139.363 160.868 140.004 161.261 139.461 161.706C138.851 162.197 137.44 161.623 137.274 160.967C137.078 160.113 137.44 158.816 138.081 158.221C138.82 157.534 140.449 157.006 140.956 158.252" fill="white"/>
-<path d="M140.842 158.133C141.204 158.247 141.416 158.661 141.452 159.023C141.504 159.679 141.24 159.731 140.682 159.829C140.206 159.912 139.663 159.798 139.513 160.356C139.363 160.868 140.004 161.261 139.461 161.706C138.851 162.197 137.44 161.623 137.274 160.967C137.078 160.113 137.44 158.816 138.081 158.221C138.82 157.534 140.449 157.006 140.956 158.252" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.842 158.133C141.204 158.247 141.416 158.661 141.452 159.023C141.504 159.679 141.24 159.731 140.682 159.829C140.206 159.912 139.663 159.798 139.513 160.356C139.363 160.868 140.004 161.261 139.461 161.706C138.851 162.197 137.44 161.623 137.274 160.967C137.078 160.113 137.44 158.816 138.081 158.221C138.82 157.534 140.449 157.006 140.956 158.252" fill="#DA3635"/>
-<path d="M140.842 158.133C141.204 158.247 141.416 158.661 141.452 159.023C141.504 159.679 141.24 159.731 140.682 159.829C140.206 159.912 139.663 159.798 139.513 160.356C139.363 160.868 140.004 161.261 139.461 161.706C138.851 162.197 137.44 161.623 137.274 160.967C137.078 160.113 137.44 158.816 138.081 158.221C138.82 157.534 140.449 157.006 140.956 158.252" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5807 37.101C12.1007 35.4911 15.6913 34.7774 15.5695 37.0844C15.4976 38.2296 15.1712 38.6612 13.9928 38.7829C13.0412 38.8548 11.4258 37.9862 11.5807 36.8908" fill="white"/>
-<path d="M11.5807 37.101C12.1007 35.4911 15.6913 34.7774 15.5695 37.0844C15.4976 38.2296 15.1712 38.6612 13.9928 38.7829C13.0412 38.8548 11.4258 37.9862 11.5807 36.8908" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5807 37.101C12.1007 35.4911 15.6913 34.7774 15.5695 37.0844C15.4976 38.2296 15.1712 38.6612 13.9928 38.7829C13.0412 38.8548 11.4258 37.9862 11.5807 36.8908" fill="white"/>
-<path d="M11.5807 37.101C12.1007 35.4911 15.6913 34.7774 15.5695 37.0844C15.4976 38.2296 15.1712 38.6612 13.9928 38.7829C13.0412 38.8548 11.4258 37.9862 11.5807 36.8908" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.2391 38.6767C11.9791 39.5066 11.2156 41.1884 12.831 40.7071C13.3345 40.5522 14.4797 40.3088 14.1146 39.6836C13.8711 39.2521 12.8144 39.0751 12.5378 38.5938" fill="white"/>
-<path d="M12.2391 38.6767C11.9791 39.5066 11.2156 41.1884 12.831 40.7071C13.3345 40.5522 14.4797 40.3088 14.1146 39.6836C13.8711 39.2521 12.8144 39.0751 12.5378 38.5938" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.2391 38.6767C11.9791 39.5066 11.2156 41.1884 12.831 40.7071C13.3345 40.5522 14.4797 40.3088 14.1146 39.6836C13.8711 39.2521 12.8144 39.0751 12.5378 38.5938" fill="white"/>
-<path d="M12.2391 38.6767C11.9791 39.5066 11.2156 41.1884 12.831 40.7071C13.3345 40.5522 14.4797 40.3088 14.1146 39.6836C13.8711 39.2521 12.8144 39.0751 12.5378 38.5938" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.0425 54.9596C14.0259 58.0134 12.5487 61.0452 12.8475 64.0769C12.9194 64.7187 13.1407 65.4102 12.9692 66.0686C12.7811 66.7103 11.9955 67.2138 11.4422 66.5167C11.0937 66.0852 11.1822 64.8183 11.1656 64.2816C11.1324 63.3964 11.2707 62.633 11.1158 61.7699C10.7507 59.8834 11.4478 57.9028 10.889 56.0494C10.5958 55.0591 10.3524 54.6995 10.5792 53.676C10.9111 52.2044 10.3192 51.2307 12.1393 51.0426C13.2126 50.9375 14.2748 50.7328 15.3149 50.4894C15.6247 50.4175 16.8253 49.7978 17.1185 49.9693C17.5334 50.2128 17.1849 52.6415 17.1849 53.2279C17.1849 55.2417 16.9746 57.1448 17.1849 59.1033C17.3398 60.4532 16.9082 61.8418 16.7865 63.1751C16.7201 64.005 17.1517 66.0354 15.7132 65.6868C14.4629 65.3936 14.8281 61.7146 14.7783 60.6247C14.7285 59.0646 15.4034 56.2541 14.1863 55.0425" fill="white"/>
-<path d="M14.0425 54.9596C14.0259 58.0134 12.5487 61.0452 12.8475 64.0769C12.9194 64.7187 13.1407 65.4102 12.9692 66.0686C12.7811 66.7103 11.9955 67.2138 11.4422 66.5167C11.0937 66.0852 11.1822 64.8183 11.1656 64.2816C11.1324 63.3964 11.2707 62.633 11.1158 61.7699C10.7507 59.8834 11.4478 57.9028 10.889 56.0494C10.5958 55.0591 10.3524 54.6995 10.5792 53.676C10.9111 52.2044 10.3192 51.2307 12.1393 51.0426C13.2126 50.9375 14.2748 50.7328 15.3149 50.4894C15.6247 50.4175 16.8253 49.7978 17.1185 49.9693C17.5334 50.2128 17.1849 52.6415 17.1849 53.2279C17.1849 55.2417 16.9746 57.1448 17.1849 59.1033C17.3398 60.4532 16.9082 61.8418 16.7865 63.1751C16.7201 64.005 17.1517 66.0354 15.7132 65.6868C14.4629 65.3936 14.8281 61.7146 14.7783 60.6247C14.7285 59.0646 15.4034 56.2541 14.1863 55.0425" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.0425 54.9596C14.0259 58.0134 12.5487 61.0452 12.8475 64.0769C12.9194 64.7187 13.1407 65.4102 12.9692 66.0686C12.7811 66.7103 11.9955 67.2138 11.4422 66.5167C11.0937 66.0852 11.1822 64.8183 11.1656 64.2816C11.1324 63.3964 11.2707 62.633 11.1158 61.7699C10.7507 59.8834 11.4478 57.9028 10.889 56.0494C10.5958 55.0591 10.3524 54.6995 10.5792 53.676C10.9111 52.2044 10.3192 51.2307 12.1393 51.0426C13.2126 50.9375 14.2748 50.7328 15.3149 50.4894C15.6247 50.4175 16.8253 49.7978 17.1185 49.9693C17.5334 50.2128 17.1849 52.6415 17.1849 53.2279C17.1849 55.2417 16.9746 57.1448 17.1849 59.1033C17.3398 60.4532 16.9082 61.8418 16.7865 63.1751C16.7201 64.005 17.1517 66.0354 15.7132 65.6868C14.4629 65.3936 14.8281 61.7146 14.7783 60.6247C14.7285 59.0646 15.4034 56.2541 14.1863 55.0425" fill="white"/>
-<path d="M14.0425 54.9596C14.0259 58.0134 12.5487 61.0452 12.8475 64.0769C12.9194 64.7187 13.1407 65.4102 12.9692 66.0686C12.7811 66.7103 11.9955 67.2138 11.4422 66.5167C11.0937 66.0852 11.1822 64.8183 11.1656 64.2816C11.1324 63.3964 11.2707 62.633 11.1158 61.7699C10.7507 59.8834 11.4478 57.9028 10.889 56.0494C10.5958 55.0591 10.3524 54.6995 10.5792 53.676C10.9111 52.2044 10.3192 51.2307 12.1393 51.0426C13.2126 50.9375 14.2748 50.7328 15.3149 50.4894C15.6247 50.4175 16.8253 49.7978 17.1185 49.9693C17.5334 50.2128 17.1849 52.6415 17.1849 53.2279C17.1849 55.2417 16.9746 57.1448 17.1849 59.1033C17.3398 60.4532 16.9082 61.8418 16.7865 63.1751C16.7201 64.005 17.1517 66.0354 15.7132 65.6868C14.4629 65.3936 14.8281 61.7146 14.7783 60.6247C14.7285 59.0646 15.4034 56.2541 14.1863 55.0425" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.3262 65.4482C15.376 65.7581 15.2211 65.8964 15.0662 66.1564C15.9181 67.0581 16.1228 66.2449 16.4161 65.5865C15.8794 65.7083 15.8075 65.7415 15.4258 65.5534" fill="white"/>
-<path d="M15.3262 65.4482C15.376 65.7581 15.2211 65.8964 15.0662 66.1564C15.9181 67.0581 16.1228 66.2449 16.4161 65.5865C15.8794 65.7083 15.8075 65.7415 15.4258 65.5534" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.3262 65.4482C15.376 65.7581 15.2211 65.8964 15.0662 66.1564C15.9181 67.0581 16.1228 66.2449 16.4161 65.5865C15.8794 65.7083 15.8075 65.7415 15.4258 65.5534" fill="white"/>
-<path d="M15.3262 65.4482C15.376 65.7581 15.2211 65.8964 15.0662 66.1564C15.9181 67.0581 16.1228 66.2449 16.4161 65.5865C15.8794 65.7083 15.8075 65.7415 15.4258 65.5534" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.0663 66.2788C14.2364 67.6287 16.7315 67.5126 17.6001 67.5126C19.1769 67.496 17.8767 66.7491 17.1852 66.4171C16.8588 66.2622 16.5766 66.0686 16.2502 66.1239C15.7468 66.1903 15.6251 66.8155 15.0884 66.1405" fill="white"/>
-<path d="M15.0663 66.2788C14.2364 67.6287 16.7315 67.5126 17.6001 67.5126C19.1769 67.496 17.8767 66.7491 17.1852 66.4171C16.8588 66.2622 16.5766 66.0686 16.2502 66.1239C15.7468 66.1903 15.6251 66.8155 15.0884 66.1405" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.0663 66.2788C14.2364 67.6287 16.7315 67.5126 17.6001 67.5126C19.1769 67.496 17.8767 66.7491 17.1852 66.4171C16.8588 66.2622 16.5766 66.0686 16.2502 66.1239C15.7468 66.1903 15.6251 66.8155 15.0884 66.1405" fill="white"/>
-<path d="M15.0663 66.2788C14.2364 67.6287 16.7315 67.5126 17.6001 67.5126C19.1769 67.496 17.8767 66.7491 17.1852 66.4171C16.8588 66.2622 16.5766 66.0686 16.2502 66.1239C15.7468 66.1903 15.6251 66.8155 15.0884 66.1405" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5806 66.6767C11.5806 66.9534 11.4921 67.147 11.5087 67.4236C12.6705 68.2756 12.5819 67.4402 12.5819 66.6104C12.2887 66.7321 11.9402 66.8206 11.647 66.6823" fill="white"/>
-<path d="M11.5806 66.6767C11.5806 66.9534 11.4921 67.147 11.5087 67.4236C12.6705 68.2756 12.5819 67.4402 12.5819 66.6104C12.2887 66.7321 11.9402 66.8206 11.647 66.6823" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5806 66.6767C11.5806 66.9534 11.4921 67.147 11.5087 67.4236C12.6705 68.2756 12.5819 67.4402 12.5819 66.6104C12.2887 66.7321 11.9402 66.8206 11.647 66.6823" fill="white"/>
-<path d="M11.5806 66.6767C11.5806 66.9534 11.4921 67.147 11.5087 67.4236C12.6705 68.2756 12.5819 67.4402 12.5819 66.6104C12.2887 66.7321 11.9402 66.8206 11.647 66.6823" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.3704 67.3516C11.2819 68.0818 11.2487 68.2699 11.8407 68.8785C12.3275 69.3653 12.7757 69.8301 13.4727 69.902C13.7992 69.1551 12.9859 68.0984 12.5378 67.5452C12.1892 67.7167 11.7024 67.7554 11.5143 67.3737" fill="white"/>
-<path d="M11.3704 67.3516C11.2819 68.0818 11.2487 68.2699 11.8407 68.8785C12.3275 69.3653 12.7757 69.8301 13.4727 69.902C13.7992 69.1551 12.9859 68.0984 12.5378 67.5452C12.1892 67.7167 11.7024 67.7554 11.5143 67.3737" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.3704 67.3516C11.2819 68.0818 11.2487 68.2699 11.8407 68.8785C12.3275 69.3653 12.7757 69.8301 13.4727 69.902C13.7992 69.1551 12.9859 68.0984 12.5378 67.5452C12.1892 67.7167 11.7024 67.7554 11.5143 67.3737" fill="white"/>
-<path d="M11.3704 67.3516C11.2819 68.0818 11.2487 68.2699 11.8407 68.8785C12.3275 69.3653 12.7757 69.8301 13.4727 69.902C13.7992 69.1551 12.9859 68.0984 12.5378 67.5452C12.1892 67.7167 11.7024 67.7554 11.5143 67.3737" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5807 39.7344C11.0662 39.9115 10.6955 40.2379 10.3138 40.603C9.86569 41.0346 9.1686 41.4329 8.89199 42.0249C8.47706 42.9266 8.26683 44.5919 8.18384 45.5766C8.06213 46.7716 8.15064 47.9666 8.25023 49.1672C8.25023 49.1672 8.22257 49.9306 10.0427 49.0178C10.0427 49.0178 9.74951 51.1256 10.7951 51.4742C11.8684 52.0661 12.9804 51.8393 14.192 51.8393C15.5087 51.8227 16.7756 51.5627 17.3123 50.2792C17.6276 49.7315 17.3067 48.1049 17.3067 48.1049C18.1919 48.625 19.3759 47.6955 19.3759 47.6955C19.6027 45.9971 18.4907 44.1936 17.8655 42.6666C17.5336 41.87 17.1518 41.2448 16.582 40.5864C16.3552 40.3098 16.062 39.7566 15.7853 39.5629C15.3372 39.2144 15.6636 39.3361 15.1436 39.4578C14.0703 39.7178 12.3331 41.7095 11.7246 39.751C11.7356 39.751 11.7246 39.6847 11.5807 39.7344Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.7356 39.751C12.3442 41.7095 14.0759 39.7178 15.1547 39.4578C15.6747 39.3361 15.3428 39.2144 15.7964 39.5629C16.073 39.751 16.3663 40.3098 16.5931 40.5864C17.1629 41.2448 17.5447 41.87 17.8766 42.6666C18.5018 44.1936 19.6082 45.9971 19.3869 47.6955C19.3869 47.6955 18.2085 48.625 17.3178 48.1049C17.3178 48.1049 17.6387 49.7315 17.3234 50.2792C16.7867 51.5627 15.5198 51.8227 14.2031 51.8393C12.9915 51.8393 11.8795 52.0661 10.8062 51.4742C9.76059 51.1256 10.0538 49.0178 10.0538 49.0178C8.22812 49.9306 8.26131 49.1672 8.26131 49.1672C8.1562 47.9722 8.07321 46.7772 8.19492 45.5766C8.28344 44.5863 8.48814 42.9266 8.90307 42.0249C9.17969 41.4329 9.87677 41.0346 10.3249 40.603C10.7066 40.2379 11.0718 39.8949 11.5918 39.7344C11.5807 39.7344 11.6748 39.6791 11.7356 39.751Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5322 37.0508C12.6705 37.0176 12.5654 36.7023 12.7424 36.6193C13.1408 36.3924 13.0523 36.741 13.4727 36.741C13.9928 36.741 14.5626 36.1878 15.066 35.9941C15.1546 36.1822 15.2763 36.6525 15.5695 36.6193C15.8793 36.5695 15.9678 35.9609 15.9346 35.7175C15.8461 35.0757 15.2929 34.9706 14.7562 34.8157C14.2528 34.6774 13.6663 34.5391 13.1463 34.5059C12.1947 34.434 11.8462 35.0259 11.481 35.8945C11.2044 36.5363 11.0993 37.1946 11.5308 37.8032C11.896 38.3233 12.6263 39.1365 13.1463 39.5183C13.7383 39.9498 14.9167 40.2098 15.2597 39.4685C15.658 38.6165 15.2597 38.1849 14.5128 38.3952C13.4727 38.705 13.3344 38.7437 12.5543 38.03C12.3441 37.8585 11.7577 37.77 11.7577 37.3551C11.7743 36.8848 12.2611 36.9236 12.416 37.3053" fill="white"/>
-<path d="M12.5322 37.0508C12.6705 37.0176 12.5654 36.7023 12.7424 36.6193C13.1408 36.3924 13.0523 36.741 13.4727 36.741C13.9928 36.741 14.5626 36.1878 15.066 35.9941C15.1546 36.1822 15.2763 36.6525 15.5695 36.6193C15.8793 36.5695 15.9678 35.9609 15.9346 35.7175C15.8461 35.0757 15.2929 34.9706 14.7562 34.8157C14.2528 34.6774 13.6663 34.5391 13.1463 34.5059C12.1947 34.434 11.8462 35.0259 11.481 35.8945C11.2044 36.5363 11.0993 37.1946 11.5308 37.8032C11.896 38.3233 12.6263 39.1365 13.1463 39.5183C13.7383 39.9498 14.9167 40.2098 15.2597 39.4685C15.658 38.6165 15.2597 38.1849 14.5128 38.3952C13.4727 38.705 13.3344 38.7437 12.5543 38.03C12.3441 37.8585 11.7577 37.77 11.7577 37.3551C11.7743 36.8848 12.2611 36.9236 12.416 37.3053" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5322 37.0508C12.6705 37.0176 12.5654 36.7023 12.7424 36.6193C13.1408 36.3924 13.0523 36.741 13.4727 36.741C13.9928 36.741 14.5626 36.1878 15.066 35.9941C15.1546 36.1822 15.2763 36.6525 15.5695 36.6193C15.8793 36.5695 15.9678 35.9609 15.9346 35.7175C15.8461 35.0757 15.2929 34.9706 14.7562 34.8157C14.2528 34.6774 13.6663 34.5391 13.1463 34.5059C12.1947 34.434 11.8462 35.0259 11.481 35.8945C11.2044 36.5363 11.0993 37.1946 11.5308 37.8032C11.896 38.3233 12.6263 39.1365 13.1463 39.5183C13.7383 39.9498 14.9167 40.2098 15.2597 39.4685C15.658 38.6165 15.2597 38.1849 14.5128 38.3952C13.4727 38.705 13.3344 38.7437 12.5543 38.03C12.3441 37.8585 11.7577 37.77 11.7577 37.3551C11.7743 36.8848 12.2611 36.9236 12.416 37.3053" fill="#DA3635"/>
-<path d="M12.5322 37.0508C12.6705 37.0176 12.5654 36.7023 12.7424 36.6193C13.1408 36.3924 13.0523 36.741 13.4727 36.741C13.9928 36.741 14.5626 36.1878 15.066 35.9941C15.1546 36.1822 15.2763 36.6525 15.5695 36.6193C15.8793 36.5695 15.9678 35.9609 15.9346 35.7175C15.8461 35.0757 15.2929 34.9706 14.7562 34.8157C14.2528 34.6774 13.6663 34.5391 13.1463 34.5059C12.1947 34.434 11.8462 35.0259 11.481 35.8945C11.2044 36.5363 11.0993 37.1946 11.5308 37.8032C11.896 38.3233 12.6263 39.1365 13.1463 39.5183C13.7383 39.9498 14.9167 40.2098 15.2597 39.4685C15.658 38.6165 15.2597 38.1849 14.5128 38.3952C13.4727 38.705 13.3344 38.7437 12.5543 38.03C12.3441 37.8585 11.7577 37.77 11.7577 37.3551C11.7743 36.8848 12.2611 36.9236 12.416 37.3053" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 41.9693L8.36513 40.21L10.4398 39.0039L12.1493 39.5571L25.9415 63.2966L21.7922 65.7088L8 41.9693Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M21.7922 65.7092L22.1352 63.9056L24.2099 62.7051L25.9415 63.297L26.7548 69.4767L21.7922 65.7092Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.6138 67.8495L24.8572 67.3682C25.0453 66.992 25.4436 66.7596 25.8696 66.7817L26.4062 66.8094L26.7603 69.4815L24.6138 67.8495Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.4399 39.0039L24.2101 62.7047L25.9417 63.2966L12.1495 39.5571L10.4399 39.0039Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.1352 63.9052L8.36513 40.21L8 41.9693L21.7922 65.7088L22.1352 63.9052Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.90308 48.9343C8.90308 48.9343 10.7066 48.6964 11.5697 47.9053L10.9556 46.7988C10.9556 46.7988 9.35673 47.4185 9.19629 47.6453C9.03585 47.8776 8.90308 48.9343 8.90308 48.9343Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.9612 46.7989C10.9612 46.7989 10.9612 45.7975 11.3484 45.4822C11.7413 45.1724 11.3484 46.218 11.3484 46.218C11.3484 46.218 12.2724 45.4213 12.5379 45.5043C12.8035 45.5873 13.0912 46.4504 13.0082 46.8653C12.9252 47.2802 11.7191 47.7284 11.5697 47.9054L10.9612 46.7989Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.07471 49.4046C9.07471 49.4046 11.3485 48.1598 11.5698 47.9053L10.9557 46.7988C10.9557 46.7988 9.63901 47.2635 9.25728 47.5844" fill="white"/>
-<path d="M9.07471 49.4046C9.07471 49.4046 11.3485 48.1598 11.5698 47.9053L10.9557 46.7988C10.9557 46.7988 9.63901 47.2635 9.25728 47.5844" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.8214 46.1517C17.8214 46.1517 15.5918 45.6815 15.1548 45.1338L16.3553 47.4021C16.3553 47.4021 17.152 48.243 18.4963 48.1047" fill="white"/>
-<path d="M17.8214 46.1517C17.8214 46.1517 15.5918 45.6815 15.1548 45.1338L16.3553 47.4021C16.3553 47.4021 17.152 48.243 18.4963 48.1047" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.5752 42.8545C15.5752 42.8545 16.3331 45.5377 17.1353 45.9858L15.5752 42.8545Z" fill="white"/>
-<path d="M15.5752 42.8545C15.5752 42.8545 16.3331 45.5377 17.1353 45.9858" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_11300_191566">
-<rect width="200" height="200" fill="white" transform="translate(0 0.5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/assets/img/orientationBeginning.svg b/src/assets/img/orientationBeginning.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a530f36e7d36dc3c74c6146937e3efc7a9be7a61
--- /dev/null
+++ b/src/assets/img/orientationBeginning.svg
@@ -0,0 +1,366 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <g id="Rendez-vous en cours" clip-path="url(#clip0_15025_66980)">
+ <circle id="Ellipse 271" cx="183" cy="31" r="17" fill="#FFE4B0" />
+ <path id="Union" fill-rule="evenodd" clip-rule="evenodd"
+ d="M127.201 68.806H150.194H171.418H186.746V68.7836C186.941 68.7984 187.137 68.806 187.336 68.806C191.569 68.806 195 65.3746 195 61.1418C195 57.0928 191.86 53.7772 187.883 53.4968C187.911 53.1011 187.925 52.7015 187.925 52.2985C187.925 43.1817 180.535 35.791 171.418 35.791C170.928 35.791 170.442 35.8124 169.963 35.8543C166.191 28.7997 158.753 24 150.194 24C137.821 24 127.791 34.0302 127.791 46.403L127.791 46.4182C127.596 46.4081 127.399 46.403 127.201 46.403C121.015 46.403 116 51.4181 116 57.6045C116 63.5931 120.7 68.4841 126.612 68.7907V68.806H127.201Z"
+ fill="#FFDDDD" />
+ <path id="Union_2" fill-rule="evenodd" clip-rule="evenodd"
+ d="M178.706 63.2119C178.728 63.2121 178.75 63.2121 178.771 63.2121C178.793 63.2121 178.815 63.2121 178.836 63.2119H192.956C192.975 63.2122 192.995 63.2123 193.015 63.2123C193.035 63.2123 193.055 63.2122 193.075 63.2119H193.727V63.1618C196.143 62.8163 198 60.7387 198 58.2274C198 55.4744 195.768 53.2426 193.015 53.2426C192.121 53.2426 191.281 53.4782 190.556 53.8906C190.766 52.9966 190.877 52.0643 190.877 51.1061C190.877 44.4201 185.457 39 178.771 39C173.838 39 169.594 41.9508 167.708 46.1837C167.367 46.1423 167.02 46.121 166.668 46.121C162.259 46.121 158.63 49.46 158.171 53.7472C157.511 53.424 156.768 53.2426 155.983 53.2426C153.23 53.2426 150.999 55.4744 150.999 58.2274C150.999 60.9805 153.23 63.2123 155.983 63.2123C156.226 63.2123 156.464 63.195 156.697 63.1616V63.2119H166.668H178.706Z"
+ fill="white" />
+ <path id="Vector 179"
+ d="M113 72.4997C113.667 67.6664 116.7 58.2997 123.5 59.4997C132 60.9997 112 77.4999 113 72.4997Z"
+ fill="#66AF82" />
+ <path id="Vector 180"
+ d="M114 69.9997C115.167 66.833 116.8 59.5997 114 55.9997C110.5 51.4997 110.5 72.4997 114 69.9997Z"
+ fill="#3D8C5C" />
+ <path id="Union_3" fill-rule="evenodd" clip-rule="evenodd"
+ d="M10 46C5.58172 46 2 42.4183 2 38C2 33.5817 5.58172 30 10 30C11.6226 30 13.1324 30.4831 14.3934 31.3133C14.1356 30.0827 14 28.8072 14 27.5C14 17.2827 22.2827 9 32.5 9C34.3529 9 36.1421 9.27239 37.8298 9.7793C41.7516 5.60623 47.3214 3 53.5 3C65.3741 3 75 12.6259 75 24.5C75 26.8942 74.6087 29.197 73.8865 31.3479C76.3316 32.6284 78 35.1902 78 38.1418C78 42.3746 74.5686 45.8059 70.3358 45.8059C70.2233 45.8059 70.1113 45.8035 70 45.7987V46H53.5H32.5H10Z"
+ fill="#FFDDDD" />
+ <g id="Group 783">
+ <rect id="Rectangle 1550" width="112.945" height="112.945"
+ transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 87.0557)" fill="#A0C7F0" />
+ <path id="Rectangle 1551"
+ d="M99.7217 69.6358L197.531 123.472L197.535 126.108L99.7217 182.58L1.90882 126.108L1.90903 123.47L99.7217 69.6358Z"
+ fill="#4277AF" />
+ <rect id="Rectangle 1549" width="112.945" height="112.945"
+ transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 67)" fill="url(#paint0_linear_15025_66980)" />
+ </g>
+ <g id="Group 794">
+ <rect id="Rectangle 1553" width="71.9724" height="106.806" rx="2"
+ transform="matrix(0.866025 0.5 -0.866025 0.5 118.176 78.8232)" fill="#769FCB" />
+ <g id="Group">
+ <g id="Group_2">
+ <path id="Vector"
+ d="M91.6952 21.0381L96.1247 21C95.95 21 95.7676 21.0533 95.5929 21.1522L91.1633 21.1903C91.3305 21.0837 91.5128 21.0381 91.6952 21.0381Z"
+ fill="#FF9C9B" />
+ </g>
+ <g id="Group_3">
+ <path id="Vector_2"
+ d="M18.2023 65.9136L13.7727 65.9516L91.1723 21.1828L95.6019 21.1523L18.2023 65.9136Z"
+ fill="#FF9C9B" />
+ </g>
+ <g id="Group_4">
+ <path id="Union_4" fill-rule="evenodd" clip-rule="evenodd"
+ d="M13.1195 68.1964L17.5491 68.1584C17.2452 67.2983 17.5415 66.2936 18.2025 65.9131L13.773 65.9511C13.112 66.3317 12.8156 67.3364 13.1195 68.1964ZM34.0691 127.67L34.0735 127.67C34.294 128.294 34.78 128.674 35.2888 128.667L39.7053 128.629C39.2085 128.63 38.7286 128.258 38.5027 127.631L38.4983 127.631L17.5437 68.1588L13.1141 68.1968L34.0691 127.67Z"
+ fill="#A0C7F1" />
+ </g>
+ <g id="Group_5">
+ <path id="Vector_3"
+ d="M95.5966 21.1518C96.2652 20.7637 97.0402 21.1518 97.3441 22.0043L118.299 81.4779C118.603 82.3303 118.307 83.335 117.646 83.7156L40.2461 128.484C39.5775 128.873 38.7949 128.484 38.4986 127.632L17.5436 68.1584C17.2397 67.2983 17.536 66.2936 18.197 65.9131L95.5966 21.1518Z"
+ fill="#EDF7FF" />
+ </g>
+ <g id="Group_6">
+ <path id="Vector_4"
+ d="M94.9602 26.4417C95.5909 26.0764 96.3203 26.4417 96.609 27.2485L116.371 83.3275C116.652 84.1343 116.379 85.0781 115.756 85.4434L42.778 127.655C42.1474 128.02 41.4104 127.655 41.1293 126.856L21.3596 70.7691C21.0785 69.9623 21.352 69.0109 21.9826 68.6532L94.9602 26.4417Z"
+ fill="#FF9C9B" />
+ <path id="Subtract" fill-rule="evenodd" clip-rule="evenodd"
+ d="M96.607 27.2485C96.3183 26.4417 95.5889 26.0764 94.9583 26.4417L21.9807 68.6532C21.4537 68.9521 21.1761 69.6654 21.2631 70.3626C21.3395 70.287 21.4242 70.2219 21.5166 70.1695L94.4942 27.958C95.1248 27.5927 95.8542 27.958 96.143 28.7648L115.905 84.8438C115.952 84.9773 115.983 85.1145 116 85.2523C116.444 84.8097 116.61 84.0184 116.369 83.3275L96.607 27.2485Z"
+ fill="#DA3635" />
+ </g>
+ <path id="Vector_5"
+ d="M59.1219 45.9868C59.507 45.7931 59.6772 45.3528 59.5021 45.0035C59.327 44.6541 58.8729 44.5279 58.4878 44.7216C58.1027 44.9153 57.9325 45.3555 58.1076 45.7049C58.2827 46.0542 58.7368 46.1804 59.1219 45.9868Z"
+ fill="#333333" />
+ <path id="Intersect" fill-rule="evenodd" clip-rule="evenodd"
+ d="M81.6474 35.3904V105.719L94.3064 97.9283L95.6941 28.0847C95.35 27.7908 94.9028 27.7229 94.4965 27.9583L81.6474 35.3904ZM65.4977 44.7317L64.1194 115.943L59.9821 118.952L58.7636 119.657V48.6268L65.4977 44.7317ZM52.9209 52.0063V123.036L51.9891 123.575L44.6438 126.168L31.5364 64.3755L52.9209 52.0063ZM112.249 74.4636L114.347 80.4171L113.295 86.7299L110.374 87.2168L112.249 74.4636ZM100.873 42.1822L104.301 51.9077L102.584 93.5463L98.6884 95.4939L100.873 42.1822Z"
+ fill="#FFDFDF" />
+ </g>
+ <g id="Group_7">
+ <path id="Vector 174"
+ d="M162.252 108.608C160.418 104.775 157.652 96.2081 161.252 92.6081C165.752 88.1081 164.251 110.108 162.252 108.608Z"
+ fill="#3D8C5C" />
+ <path id="Vector 175"
+ d="M162.752 108.607C163.086 105.274 164.752 98.9075 168.752 100.107C173.752 101.607 163.252 110.108 162.752 108.607Z"
+ fill="#66AF82" />
+ <path id="Vector 176"
+ d="M162.752 108.608C161.919 102.774 159.252 91.8076 155.252 94.6076C150.252 98.1076 161.752 111.108 162.752 108.608Z"
+ fill="#66AF82" />
+ <g id="Group_8">
+ <g id="Group_9">
+ <path id="Vector_6"
+ d="M165.876 109.808L165.861 114.77C165.861 115.052 165.678 115.326 165.313 115.539L165.329 110.576C165.693 110.363 165.876 110.089 165.876 109.808Z"
+ fill="#FF9C9B" />
+ </g>
+ <g id="Group_10">
+ <path id="Vector_7"
+ d="M165.323 110.575L165.308 115.538L85.6211 161.935L85.6363 156.973L165.323 110.575Z"
+ fill="#FF9C9B" />
+ </g>
+ <path id="Union_5" fill-rule="evenodd" clip-rule="evenodd"
+ d="M36.9041 129.879L36.8889 134.841C36.8889 135.122 37.0703 135.403 37.4406 135.624L37.4406 135.626L82.9367 161.937L82.9368 161.902L82.9418 161.937C83.6864 162.363 84.8869 162.363 85.6239 161.937L85.6391 156.974C84.8945 157.4 82.8648 156.781 82.1278 156.355L82.1506 156.512L37.4588 130.665L37.4588 130.663C37.0865 130.442 36.9041 130.161 36.9041 129.879Z"
+ fill="#A0C7F1" />
+ <g id="Group_11">
+ <path id="Vector_8"
+ d="M165.319 109.023C166.056 109.449 166.063 110.15 165.326 110.576L85.6397 156.974C84.9027 157.4 83.7023 157.4 82.9577 156.974L37.4616 130.662C36.7246 130.236 36.717 129.535 37.454 129.109L117.141 82.7191C117.878 82.2929 119.078 82.2929 119.815 82.7191L165.319 109.023Z"
+ fill="#EDF7FF" />
+ </g>
+ <g id="Group_12">
+ <path id="Vector_9"
+ d="M131.187 126.346C131.346 126.437 131.346 126.59 131.187 126.681L114.107 136.621C113.947 136.712 113.689 136.712 113.529 136.621L103.781 130.981C103.621 130.89 103.621 130.738 103.781 130.646L120.861 120.706C121.021 120.615 121.279 120.615 121.439 120.706L131.187 126.346Z"
+ fill="#A0C7F1" />
+ <path id="Subtract_2" fill-rule="evenodd" clip-rule="evenodd"
+ d="M131.188 126.681C131.347 126.59 131.347 126.437 131.188 126.346L121.44 120.706C121.28 120.615 121.022 120.615 120.862 120.706L103.782 130.646C103.623 130.738 103.623 130.89 103.782 130.981L104.57 131.437C104.588 131.416 104.613 131.397 104.644 131.38L120.888 122.335C121.04 122.252 121.285 122.252 121.437 122.335L130.261 127.22L131.188 126.681ZM113.643 136.667L112.861 136.234L113.53 136.621C113.564 136.64 113.602 136.656 113.643 136.667Z"
+ fill="#759FCB" />
+ </g>
+ </g>
+ </g>
+ <g id="Group 793">
+ <path id="Vector_10"
+ d="M66.6382 139.511C66.3951 139.511 66.1672 139.458 66.0076 139.367L62.8165 137.517C62.6873 137.441 62.6646 137.38 62.6646 137.365C62.6646 137.35 62.6873 137.289 62.8089 137.22L68.3554 133.993C68.5149 133.902 68.7429 133.849 68.986 133.849C69.2291 133.849 69.4571 133.902 69.6242 133.993L72.8153 135.843C72.9445 135.919 72.9673 135.98 72.9673 135.995C72.9673 136.01 72.9445 136.071 72.8229 136.14L67.2765 139.367C67.1017 139.458 66.8738 139.511 66.6382 139.511Z"
+ fill="#759FCB" />
+ <path id="Vector_11"
+ d="M60.3467 135.873C60.1036 135.873 59.8757 135.82 59.7161 135.728L56.525 133.879C56.3958 133.803 56.373 133.742 56.373 133.727C56.373 133.711 56.3958 133.651 56.5174 133.582L65.5969 128.3C65.7564 128.209 65.9844 128.155 66.2275 128.155C66.4706 128.155 66.6986 128.209 66.8657 128.3L70.0568 130.149C70.1708 130.218 70.2088 130.279 70.2088 130.302C70.2088 130.317 70.1708 130.385 70.0568 130.446L60.9774 135.728C60.8178 135.82 60.5899 135.873 60.3467 135.873Z"
+ fill="#759FCB" />
+ <path id="Vector_12"
+ d="M54.0553 132.235C53.8121 132.235 53.5842 132.182 53.417 132.091L50.2259 130.241C50.0968 130.165 50.074 130.104 50.074 130.089C50.074 130.074 50.0968 130.013 50.2183 129.944L53.3866 128.095C53.5462 128.003 53.7741 127.95 54.0173 127.95C54.2604 127.95 54.4883 128.003 54.6555 128.095L57.8466 129.944C57.9758 130.02 57.9986 130.081 57.9986 130.097C57.9986 130.112 57.9758 130.173 57.8466 130.241L54.6783 132.091C54.5263 132.182 54.2984 132.235 54.0553 132.235Z"
+ fill="#759FCB" />
+ <path id="Vector_13"
+ d="M95.3875 108.168C95.1444 108.168 94.9165 108.115 94.7493 108.023L91.5582 106.174C91.429 106.098 91.4062 106.037 91.4062 106.022C91.4062 106.006 91.429 105.945 91.5582 105.877L94.7265 104.027C94.8861 103.936 95.114 103.883 95.3571 103.883C95.6003 103.883 95.8282 103.936 95.9954 104.027L99.1865 105.877C99.3004 105.945 99.346 106.006 99.346 106.029C99.346 106.044 99.308 106.105 99.1941 106.174L96.0258 108.023C95.8586 108.115 95.6231 108.168 95.3875 108.168Z"
+ fill="#759FCB" />
+ <path id="Vector_14"
+ d="M107.963 115.452C107.72 115.452 107.492 115.399 107.332 115.307L104.141 113.458C104.012 113.382 103.989 113.321 103.989 113.306C103.989 113.291 104.012 113.23 104.141 113.161L107.31 111.312C107.469 111.22 107.697 111.167 107.94 111.167C108.183 111.167 108.411 111.22 108.578 111.312L111.769 113.161C111.883 113.23 111.921 113.291 111.921 113.313C111.921 113.329 111.883 113.397 111.769 113.458L108.601 115.307C108.434 115.399 108.206 115.452 107.963 115.452Z"
+ fill="#759FCB" />
+ <path id="Vector_15"
+ d="M125.285 98.0609C125.042 98.0609 124.814 98.0076 124.654 97.9163L115.165 92.4287C115.035 92.3525 115.013 92.2917 115.013 92.2764C115.013 92.2612 115.035 92.2003 115.157 92.1318L118.333 90.2823C118.493 90.191 118.72 90.1377 118.964 90.1377C119.207 90.1377 119.435 90.191 119.602 90.2823L129.084 95.77C129.198 95.8385 129.236 95.8993 129.236 95.9222C129.236 95.9374 129.198 96.0059 129.084 96.0668L125.908 97.9163C125.756 98.0076 125.528 98.0609 125.285 98.0609Z"
+ fill="#759FCB" />
+ <path id="Vector_16"
+ d="M113.87 112.012C113.627 112.012 113.399 111.958 113.24 111.867L110.048 110.018C109.919 109.941 109.896 109.881 109.896 109.865C109.896 109.85 109.919 109.789 110.041 109.721L113.217 107.871C113.376 107.78 113.604 107.727 113.847 107.727C114.091 107.727 114.318 107.78 114.486 107.871L117.677 109.721C117.791 109.789 117.829 109.85 117.829 109.873C117.829 109.888 117.806 109.949 117.684 110.018L114.508 111.867C114.341 111.958 114.113 112.012 113.87 112.012Z"
+ fill="#759FCB" />
+ <path id="Vector_17"
+ d="M120.166 115.65C119.922 115.65 119.695 115.597 119.535 115.506L116.336 113.656C116.207 113.58 116.184 113.519 116.184 113.504C116.184 113.489 116.207 113.428 116.329 113.359L119.505 111.51C119.664 111.419 119.892 111.365 120.135 111.365C120.378 111.365 120.606 111.419 120.766 111.51L123.965 113.359C124.094 113.435 124.117 113.496 124.117 113.512C124.117 113.527 124.094 113.588 123.965 113.656L120.789 115.506C120.629 115.597 120.401 115.65 120.166 115.65Z"
+ fill="#759FCB" />
+ <path id="Vector_18"
+ d="M125.673 105.14C125.43 105.14 125.202 105.086 125.043 104.995L121.852 103.145C121.738 103.077 121.692 103.016 121.692 102.993C121.692 102.978 121.73 102.917 121.844 102.849L130.924 97.5665C131.083 97.4751 131.311 97.4219 131.554 97.4219C131.797 97.4219 132.025 97.4751 132.192 97.5665L135.384 99.416C135.497 99.4845 135.535 99.5454 135.535 99.5682C135.535 99.5834 135.513 99.6443 135.391 99.7128L126.312 104.995C126.144 105.086 125.917 105.14 125.673 105.14Z"
+ fill="#759FCB" />
+ <path id="Vector_19"
+ d="M137.88 105.345C137.637 105.345 137.409 105.291 137.249 105.2L134.051 103.351C133.937 103.282 133.899 103.221 133.899 103.198C133.899 103.183 133.921 103.122 134.043 103.054L137.219 101.204C137.379 101.113 137.606 101.06 137.85 101.06C138.093 101.06 138.321 101.113 138.48 101.204L141.679 103.054C141.793 103.122 141.831 103.183 141.831 103.206C141.831 103.221 141.808 103.282 141.687 103.351L138.511 105.2C138.351 105.291 138.123 105.345 137.88 105.345Z"
+ fill="#759FCB" />
+ <path id="Vector_20"
+ d="M119.781 108.58C119.538 108.58 119.31 108.527 119.151 108.435L115.96 106.586C115.83 106.51 115.808 106.449 115.808 106.434C115.808 106.418 115.83 106.358 115.952 106.289L119.128 104.44C119.287 104.348 119.515 104.295 119.759 104.295C120.002 104.295 120.23 104.348 120.397 104.44L123.588 106.289C123.702 106.358 123.74 106.418 123.74 106.441C123.74 106.456 123.717 106.517 123.595 106.586L120.42 108.435C120.252 108.527 120.024 108.58 119.781 108.58Z"
+ fill="#759FCB" />
+ <path id="Vector_21"
+ d="M131.984 108.777C131.741 108.777 131.513 108.724 131.353 108.633L128.155 106.783C128.041 106.715 128.003 106.654 128.003 106.631C128.003 106.616 128.041 106.547 128.155 106.486L131.323 104.637C131.483 104.545 131.718 104.492 131.954 104.492C132.197 104.492 132.425 104.545 132.584 104.637L135.783 106.486C135.912 106.562 135.935 106.623 135.935 106.639C135.935 106.654 135.912 106.715 135.783 106.783L132.615 108.633C132.455 108.724 132.227 108.777 131.984 108.777Z"
+ fill="#759FCB" />
+ <path id="Vector_22"
+ d="M126.069 112.219C125.826 112.219 125.598 112.165 125.439 112.074L122.24 110.225C122.111 110.148 122.088 110.088 122.088 110.072C122.088 110.057 122.111 109.996 122.232 109.928L125.408 108.078C125.568 107.987 125.796 107.934 126.039 107.934C126.282 107.934 126.51 107.987 126.669 108.078L129.868 109.928C129.997 110.004 130.02 110.065 130.02 110.08C130.02 110.095 129.997 110.156 129.876 110.225L126.7 112.074C126.533 112.165 126.305 112.219 126.069 112.219Z"
+ fill="#759FCB" />
+ <path id="Vector_23"
+ d="M119.378 101.501C119.135 101.501 118.907 101.448 118.748 101.356L115.557 99.5068C115.443 99.4383 115.397 99.3774 115.397 99.3546C115.397 99.3393 115.435 99.2784 115.549 99.2099L118.717 97.3604C118.877 97.2691 119.105 97.2158 119.348 97.2158C119.591 97.2158 119.819 97.2691 119.986 97.3604L123.177 99.2099C123.291 99.2784 123.329 99.3393 123.329 99.3622C123.329 99.385 123.291 99.4459 123.177 99.5068L120.009 101.356C119.849 101.448 119.621 101.501 119.378 101.501Z"
+ fill="#759FCB" />
+ <path id="Vector_24"
+ d="M113.471 104.934C113.228 104.934 113 104.88 112.84 104.789L109.649 102.939C109.52 102.863 109.497 102.802 109.497 102.787C109.497 102.772 109.52 102.711 109.641 102.643L112.817 100.793C112.977 100.702 113.205 100.648 113.448 100.648C113.691 100.648 113.919 100.702 114.086 100.793L117.277 102.643C117.391 102.711 117.429 102.772 117.429 102.795C117.429 102.81 117.391 102.879 117.277 102.939L114.101 104.789C113.942 104.88 113.706 104.934 113.471 104.934Z"
+ fill="#759FCB" />
+ <path id="Vector_25"
+ d="M101.287 104.735C101.044 104.735 100.816 104.682 100.649 104.591L97.4579 102.741C97.3287 102.665 97.3059 102.604 97.3059 102.589C97.3059 102.574 97.3287 102.513 97.4503 102.444L100.626 100.595C100.786 100.503 101.014 100.45 101.257 100.45C101.5 100.45 101.728 100.503 101.895 100.595L105.086 102.444C105.215 102.52 105.238 102.581 105.238 102.597C105.238 102.612 105.215 102.673 105.094 102.741L101.918 104.591C101.758 104.682 101.53 104.735 101.287 104.735Z"
+ fill="#759FCB" />
+ <path id="Vector_26"
+ d="M107.575 108.374C107.332 108.374 107.104 108.321 106.944 108.229L103.753 106.38C103.624 106.304 103.601 106.243 103.601 106.228C103.601 106.212 103.624 106.151 103.746 106.083L106.922 104.233C107.081 104.142 107.309 104.089 107.552 104.089C107.795 104.089 108.023 104.142 108.19 104.233L111.382 106.083C111.496 106.151 111.534 106.212 111.534 106.235C111.534 106.25 111.496 106.319 111.382 106.38L108.206 108.229C108.046 108.321 107.811 108.374 107.575 108.374Z"
+ fill="#759FCB" />
+ <path id="Vector_27"
+ d="M101.66 111.814C101.417 111.814 101.189 111.761 101.029 111.67L97.8382 109.82C97.7091 109.744 97.6863 109.683 97.6863 109.668C97.6863 109.653 97.7091 109.592 97.8382 109.523L101.007 107.674C101.166 107.583 101.394 107.529 101.637 107.529C101.88 107.529 102.108 107.583 102.275 107.674L105.467 109.523C105.596 109.6 105.618 109.66 105.618 109.676C105.618 109.691 105.588 109.752 105.467 109.82L102.298 111.67C102.139 111.761 101.903 111.814 101.66 111.814Z"
+ fill="#759FCB" />
+ <path id="Vector_28"
+ d="M84.7293 136.277C84.4862 136.277 84.2583 136.224 84.0987 136.133L80.9 134.283C80.786 134.215 80.748 134.154 80.748 134.131C80.748 134.116 80.786 134.047 80.9 133.986L84.0683 132.137C84.2279 132.045 84.4634 131.992 84.6989 131.992C84.9421 131.992 85.17 132.045 85.3296 132.137L88.5283 133.986C88.6574 134.062 88.6802 134.123 88.6802 134.139C88.6802 134.154 88.6574 134.215 88.5283 134.283L85.36 136.133C85.2004 136.224 84.9725 136.277 84.7293 136.277Z"
+ fill="#759FCB" />
+ <path id="Vector_29"
+ d="M90.6441 132.836C90.401 132.836 90.1731 132.783 90.0135 132.691L86.8148 130.842C86.7008 130.773 86.6628 130.712 86.6628 130.69C86.6628 130.674 86.6856 130.613 86.8072 130.545L89.9831 128.695C90.1427 128.604 90.3706 128.551 90.6137 128.551C90.8569 128.551 91.0848 128.604 91.2444 128.695L94.4431 130.545C94.557 130.613 94.595 130.674 94.595 130.697C94.595 130.712 94.5722 130.773 94.4507 130.842L91.2748 132.691C91.1152 132.783 90.8873 132.836 90.6441 132.836Z"
+ fill="#759FCB" />
+ <path id="Vector_30"
+ d="M89.4801 111.609C89.2369 111.609 89.009 111.556 88.8418 111.465L85.6507 109.615C85.5216 109.539 85.4988 109.478 85.4988 109.463C85.4988 109.448 85.5216 109.387 85.6431 109.318L88.819 107.469C88.9786 107.377 89.2065 107.324 89.4497 107.324C89.6928 107.324 89.9207 107.377 90.0879 107.469L93.279 109.318C93.4082 109.394 93.431 109.455 93.431 109.471C93.431 109.486 93.4082 109.547 93.2866 109.615L90.1107 111.465C89.9511 111.556 89.7156 111.609 89.4801 111.609Z"
+ fill="#759FCB" />
+ <path id="Vector_31"
+ d="M83.5767 115.049C83.3336 115.049 83.1057 114.995 82.9385 114.904L79.7474 113.055C79.6183 112.979 79.5955 112.918 79.5955 112.902C79.5955 112.887 79.6183 112.826 79.7398 112.758L82.9081 110.908C83.0677 110.817 83.2956 110.764 83.5388 110.764C83.7819 110.764 84.0098 110.817 84.177 110.908L87.3681 112.758C87.4973 112.834 87.52 112.895 87.52 112.91C87.52 112.925 87.4973 112.986 87.3681 113.055L84.1998 114.904C84.0478 114.995 83.8123 115.049 83.5767 115.049Z"
+ fill="#759FCB" />
+ <path id="Vector_32"
+ d="M95.7718 115.247C95.5287 115.247 95.3007 115.194 95.1412 115.102L91.9501 113.253C91.8209 113.177 91.7981 113.116 91.7981 113.101C91.7981 113.085 91.8209 113.025 91.9425 112.956L95.1184 111.107C95.2779 111.015 95.5059 110.962 95.749 110.962C95.9921 110.962 96.2201 111.015 96.3872 111.107L99.5783 112.956C99.6923 113.025 99.7303 113.085 99.7303 113.108C99.7303 113.123 99.6923 113.192 99.5783 113.253L96.4024 115.102C96.2353 115.194 96.0073 115.247 95.7718 115.247Z"
+ fill="#759FCB" />
+ <path id="Vector_33"
+ d="M77.6617 118.482C77.4186 118.482 77.1906 118.429 77.0235 118.338L73.8324 116.488C73.7032 116.412 73.6804 116.351 73.6804 116.336C73.6804 116.321 73.7032 116.26 73.8324 116.191L77.0007 114.342C77.1602 114.251 77.3882 114.197 77.6313 114.197C77.8744 114.197 78.1024 114.251 78.2695 114.342L81.4606 116.191C81.5746 116.26 81.6202 116.321 81.6202 116.344C81.6202 116.359 81.5822 116.42 81.4682 116.488L78.2999 118.338C78.1404 118.429 77.9048 118.482 77.6617 118.482Z"
+ fill="#759FCB" />
+ <path id="Vector_34"
+ d="M89.8643 118.687C89.6212 118.687 89.3932 118.634 89.2337 118.543L86.0426 116.693C85.9134 116.617 85.8906 116.556 85.8906 116.541C85.8906 116.526 85.9134 116.465 86.035 116.396L89.2033 114.547C89.3629 114.456 89.5908 114.402 89.8339 114.402C90.0771 114.402 90.305 114.456 90.4721 114.547L93.6633 116.396C93.7772 116.465 93.8152 116.526 93.8152 116.549C93.8152 116.564 93.7772 116.632 93.6633 116.693L90.4949 118.543C90.3354 118.634 90.0999 118.687 89.8643 118.687Z"
+ fill="#759FCB" />
+ <path id="Vector_35"
+ d="M71.7621 121.923C71.5189 121.923 71.291 121.87 71.1238 121.778L67.9327 119.929C67.8036 119.853 67.7808 119.792 67.7808 119.776C67.7808 119.761 67.8036 119.7 67.9251 119.632L71.101 117.782C71.2606 117.691 71.4885 117.638 71.7317 117.638C71.9748 117.638 72.2027 117.691 72.3699 117.782L75.561 119.632C75.6902 119.708 75.7129 119.769 75.7129 119.784C75.7129 119.799 75.6902 119.86 75.5686 119.929L72.3927 121.778C72.2255 121.87 71.9976 121.923 71.7621 121.923Z"
+ fill="#759FCB" />
+ <path id="Vector_36"
+ d="M83.9571 122.12C83.714 122.12 83.486 122.067 83.3265 121.975L80.1354 120.126C80.0062 120.05 79.9834 119.989 79.9834 119.974C79.9834 119.958 80.0062 119.898 80.1354 119.829L83.3037 117.98C83.4632 117.888 83.6912 117.835 83.9343 117.835C84.1774 117.835 84.4054 117.888 84.5725 117.98L87.7636 119.829C87.8928 119.905 87.9156 119.966 87.9156 119.981C87.9156 119.997 87.8852 120.057 87.7636 120.126L84.5953 121.975C84.4282 122.067 84.2002 122.12 83.9571 122.12Z"
+ fill="#759FCB" />
+ <path id="Vector_37"
+ d="M65.8661 125.355C65.623 125.355 65.395 125.302 65.2279 125.211L62.0368 123.361C61.9228 123.293 61.8772 123.232 61.8772 123.209C61.8772 123.194 61.9152 123.133 62.0292 123.064L65.1975 121.215C65.357 121.124 65.585 121.07 65.8281 121.07C66.0712 121.07 66.2992 121.124 66.4663 121.215L69.6574 123.064C69.7866 123.141 69.8094 123.201 69.8094 123.217C69.8094 123.232 69.7866 123.293 69.6574 123.361L66.4891 125.211C66.3296 125.302 66.1016 125.355 65.8661 125.355Z"
+ fill="#759FCB" />
+ <path id="Vector_38"
+ d="M78.0574 125.56C77.8143 125.56 77.5864 125.507 77.4268 125.416L74.2357 123.566C74.1065 123.49 74.0837 123.429 74.0837 123.414C74.0837 123.399 74.1065 123.338 74.2281 123.27L77.404 121.42C77.5636 121.329 77.7915 121.275 78.0346 121.275C78.2778 121.275 78.5057 121.329 78.6729 121.42L81.864 123.27C81.9779 123.338 82.0159 123.399 82.0159 123.422C82.0159 123.437 81.9779 123.505 81.864 123.566L78.6881 125.416C78.5285 125.507 78.3006 125.56 78.0574 125.56Z"
+ fill="#759FCB" />
+ <path id="Vector_39"
+ d="M90.2447 125.766C90.0016 125.766 89.7736 125.712 89.6141 125.621L86.423 123.771C86.2938 123.695 86.271 123.634 86.271 123.619C86.271 123.604 86.2938 123.543 86.423 123.475L89.5913 121.625C89.7508 121.534 89.9788 121.48 90.2219 121.48C90.465 121.48 90.693 121.534 90.8601 121.625L94.0512 123.475C94.1652 123.543 94.2032 123.604 94.2032 123.627C94.2032 123.642 94.1652 123.711 94.0512 123.771L90.8829 125.621C90.7234 125.705 90.4878 125.766 90.2447 125.766Z"
+ fill="#759FCB" />
+ <path id="Vector_40"
+ d="M72.1461 129C71.903 129 71.675 128.947 71.5155 128.855L68.3243 127.006C68.2104 126.937 68.1648 126.876 68.1648 126.854C68.1648 126.838 68.2028 126.777 68.3168 126.709L71.4851 124.859C71.6446 124.768 71.8726 124.715 72.1157 124.715C72.3588 124.715 72.5868 124.768 72.7539 124.859L75.945 126.709C76.059 126.777 76.097 126.838 76.097 126.861C76.097 126.884 76.059 126.945 75.945 127.006L72.7767 128.855C72.6172 128.939 72.3892 129 72.1461 129Z"
+ fill="#759FCB" />
+ <path id="Vector_41"
+ d="M84.3489 129.198C84.1058 129.198 83.8779 129.145 83.7183 129.054L80.5272 127.204C80.398 127.128 80.3752 127.067 80.3752 127.052C80.3752 127.037 80.398 126.976 80.5196 126.907L83.6955 125.058C83.8551 124.966 84.083 124.913 84.3261 124.913C84.5693 124.913 84.7972 124.966 84.9644 125.058L88.1555 126.907C88.2694 126.976 88.3074 127.037 88.3074 127.059C88.3074 127.075 88.2846 127.136 88.1631 127.204L84.9872 129.054C84.82 129.145 84.5845 129.198 84.3489 129.198Z"
+ fill="#759FCB" />
+ <path id="Vector_42"
+ d="M74.9495 134.671C74.7064 134.671 74.4785 134.618 74.3189 134.526L71.1278 132.677C70.9986 132.601 70.9758 132.54 70.9758 132.524C70.9758 132.509 70.9986 132.448 71.1278 132.38L77.7987 128.498C77.9583 128.407 78.1862 128.354 78.4293 128.354C78.6725 128.354 78.9004 128.407 79.0676 128.498L82.2587 130.348C82.3878 130.424 82.4106 130.485 82.4106 130.492C82.4106 130.507 82.3878 130.568 82.2587 130.637L75.5877 134.519C75.4206 134.618 75.1927 134.671 74.9495 134.671Z"
+ fill="#759FCB" />
+ <path id="Vector_43"
+ d="M59.9434 128.795C59.7003 128.795 59.4724 128.742 59.3052 128.65L56.1141 126.801C55.985 126.725 55.9622 126.664 55.9622 126.649C55.9622 126.633 55.985 126.572 56.1141 126.504L59.2824 124.654C59.442 124.563 59.6699 124.51 59.9131 124.51C60.1562 124.51 60.3841 124.563 60.5513 124.654L63.7424 126.504C63.8716 126.58 63.8943 126.641 63.8943 126.656C63.8943 126.671 63.8716 126.732 63.75 126.801L60.5817 128.65C60.4145 128.742 60.1866 128.795 59.9434 128.795Z"
+ fill="#759FCB" />
+ <path id="Vector_44"
+ d="M107.187 101.296C106.944 101.296 106.716 101.243 106.549 101.151L103.358 99.3017C103.228 99.2256 103.206 99.1647 103.206 99.1495C103.206 99.1343 103.228 99.0734 103.35 99.0049L112.429 93.7227C112.589 93.6314 112.817 93.5781 113.06 93.5781C113.303 93.5781 113.531 93.6314 113.698 93.7227L116.889 95.5723C117.019 95.6484 117.041 95.7092 117.041 95.7245C117.041 95.7397 117.019 95.8006 116.889 95.8691L107.81 101.151C107.658 101.243 107.43 101.296 107.187 101.296Z"
+ fill="#759FCB" />
+ <path id="Vector_45"
+ d="M72.9298 143.149C72.6866 143.149 72.4587 143.096 72.2992 143.005L69.1004 141.155C68.9713 141.079 68.9485 141.018 68.9485 141.003C68.9485 140.988 68.9713 140.927 69.0928 140.858L78.1723 135.576C78.3319 135.485 78.5598 135.432 78.8029 135.432C79.0461 135.432 79.274 135.485 79.4336 135.576L82.6323 137.426C82.7614 137.502 82.7842 137.563 82.7842 137.578C82.7842 137.593 82.7614 137.654 82.6399 137.723L73.5604 143.005C73.4008 143.096 73.1729 143.149 72.9298 143.149Z"
+ fill="#759FCB" />
+ <path id="Vector_46"
+ d="M102.063 118.885C101.82 118.885 101.592 118.831 101.433 118.74L98.2416 116.891C98.1124 116.814 98.0896 116.754 98.0896 116.738C98.0896 116.723 98.1124 116.662 98.234 116.594L101.41 114.744C101.569 114.653 101.797 114.6 102.04 114.6C102.284 114.6 102.512 114.653 102.679 114.744L105.87 116.594C105.999 116.67 106.022 116.731 106.022 116.746C106.022 116.761 105.999 116.822 105.877 116.891L102.702 118.74C102.534 118.831 102.306 118.885 102.063 118.885Z"
+ fill="#759FCB" />
+ <path id="Vector_47"
+ d="M96.1558 122.325C95.9127 122.325 95.6848 122.272 95.5252 122.181L92.3341 120.331C92.2049 120.255 92.1821 120.194 92.1821 120.179C92.1821 120.164 92.2049 120.103 92.3265 120.034L95.4948 118.185C95.6544 118.093 95.8823 118.04 96.1254 118.04C96.3686 118.04 96.5965 118.093 96.7636 118.185L99.9548 120.034C100.084 120.11 100.107 120.171 100.107 120.186C100.107 120.202 100.084 120.262 99.9548 120.331L96.7864 122.181C96.6269 122.272 96.399 122.325 96.1558 122.325Z"
+ fill="#759FCB" />
+ <path id="Vector_48"
+ d="M96.5477 129.403C96.3046 129.403 96.0766 129.35 95.9171 129.259L92.7184 127.409C92.5892 127.333 92.5664 127.272 92.5664 127.265C92.5664 127.249 92.5892 127.189 92.7184 127.12L113.468 115.041C113.628 114.95 113.856 114.896 114.099 114.896C114.342 114.896 114.57 114.95 114.729 115.041L117.928 116.891C118.057 116.967 118.08 117.028 118.08 117.043C118.08 117.058 118.057 117.119 117.936 117.187L97.1859 129.266C97.0188 129.35 96.7908 129.403 96.5477 129.403Z"
+ fill="#759FCB" />
+ </g>
+ <g id="Group 792">
+ <path id="Vector_49"
+ d="M66.6382 138.502C66.3951 138.502 66.1672 138.448 66.0076 138.357L62.8165 136.507C62.6873 136.431 62.6646 136.37 62.6646 136.355C62.6646 136.34 62.6873 136.279 62.8089 136.211L68.3554 132.983C68.5149 132.892 68.7429 132.839 68.986 132.839C69.2291 132.839 69.4571 132.892 69.6242 132.983L72.8153 134.833C72.9445 134.909 72.9673 134.97 72.9673 134.985C72.9673 135 72.9445 135.061 72.8229 135.13L67.2765 138.357C67.1017 138.448 66.8738 138.502 66.6382 138.502Z"
+ fill="#A0C7F1" />
+ <path id="Vector_50"
+ d="M60.3467 134.863C60.1036 134.863 59.8757 134.81 59.7161 134.719L56.525 132.869C56.3958 132.793 56.373 132.732 56.373 132.717C56.373 132.702 56.3958 132.641 56.5174 132.572L65.5969 127.29C65.7564 127.199 65.9844 127.146 66.2275 127.146C66.4706 127.146 66.6986 127.199 66.8657 127.29L70.0568 129.14C70.1708 129.208 70.2088 129.269 70.2088 129.292C70.2088 129.307 70.1708 129.376 70.0568 129.436L60.9774 134.719C60.8178 134.81 60.5899 134.863 60.3467 134.863Z"
+ fill="#A0C7F1" />
+ <path id="Vector_51"
+ d="M54.0553 131.226C53.8121 131.226 53.5842 131.172 53.417 131.081L50.2259 129.231C50.0968 129.155 50.074 129.094 50.074 129.079C50.074 129.064 50.0968 129.003 50.2183 128.935L53.3866 127.085C53.5462 126.994 53.7741 126.94 54.0173 126.94C54.2604 126.94 54.4883 126.994 54.6555 127.085L57.8466 128.935C57.9758 129.011 57.9986 129.072 57.9986 129.087C57.9986 129.102 57.9758 129.163 57.8466 129.231L54.6783 131.081C54.5263 131.172 54.2984 131.226 54.0553 131.226Z"
+ fill="#A0C7F1" />
+ <path id="Vector_52"
+ d="M95.3875 107.158C95.1444 107.158 94.9165 107.105 94.7493 107.014L91.5582 105.164C91.429 105.088 91.4062 105.027 91.4062 105.012C91.4062 104.997 91.429 104.936 91.5582 104.867L94.7265 103.018C94.8861 102.926 95.114 102.873 95.3571 102.873C95.6003 102.873 95.8282 102.926 95.9954 103.018L99.1865 104.867C99.3004 104.936 99.346 104.997 99.346 105.019C99.346 105.035 99.308 105.096 99.1941 105.164L96.0258 107.014C95.8586 107.105 95.6231 107.158 95.3875 107.158Z"
+ fill="#A0C7F1" />
+ <path id="Vector_53"
+ d="M107.963 114.442C107.72 114.442 107.492 114.389 107.332 114.298L104.141 112.448C104.012 112.372 103.989 112.311 103.989 112.296C103.989 112.281 104.012 112.22 104.141 112.151L107.31 110.302C107.469 110.211 107.697 110.157 107.94 110.157C108.183 110.157 108.411 110.211 108.578 110.302L111.769 112.151C111.883 112.22 111.921 112.281 111.921 112.304C111.921 112.319 111.883 112.387 111.769 112.448L108.601 114.298C108.434 114.389 108.206 114.442 107.963 114.442Z"
+ fill="#A0C7F1" />
+ <path id="Vector_54"
+ d="M125.285 97.0511C125.042 97.0511 124.814 96.9979 124.654 96.9065L115.165 91.4189C115.035 91.3428 115.013 91.2819 115.013 91.2667C115.013 91.2514 115.035 91.1906 115.157 91.1221L118.333 89.2725C118.493 89.1812 118.72 89.1279 118.964 89.1279C119.207 89.1279 119.435 89.1812 119.602 89.2725L129.084 94.7602C129.198 94.8287 129.236 94.8896 129.236 94.9124C129.236 94.9276 129.198 94.9961 129.084 95.057L125.908 96.9065C125.756 96.9979 125.528 97.0511 125.285 97.0511Z"
+ fill="#A0C7F1" />
+ <path id="Vector_55"
+ d="M113.87 111.002C113.627 111.002 113.399 110.949 113.24 110.857L110.048 109.008C109.919 108.932 109.896 108.871 109.896 108.856C109.896 108.84 109.919 108.779 110.041 108.711L113.217 106.861C113.376 106.77 113.604 106.717 113.847 106.717C114.091 106.717 114.318 106.77 114.486 106.861L117.677 108.711C117.791 108.779 117.829 108.84 117.829 108.863C117.829 108.878 117.806 108.939 117.684 109.008L114.508 110.857C114.341 110.949 114.113 111.002 113.87 111.002Z"
+ fill="#A0C7F1" />
+ <path id="Vector_56"
+ d="M120.166 114.641C119.922 114.641 119.695 114.587 119.535 114.496L116.336 112.646C116.207 112.57 116.184 112.509 116.184 112.494C116.184 112.479 116.207 112.418 116.329 112.35L119.505 110.5C119.664 110.409 119.892 110.355 120.135 110.355C120.378 110.355 120.606 110.409 120.766 110.5L123.965 112.35C124.094 112.426 124.117 112.487 124.117 112.502C124.117 112.517 124.094 112.578 123.965 112.646L120.789 114.496C120.629 114.587 120.401 114.641 120.166 114.641Z"
+ fill="#A0C7F1" />
+ <path id="Vector_57"
+ d="M125.673 104.13C125.43 104.13 125.202 104.077 125.043 103.985L121.852 102.136C121.738 102.067 121.692 102.006 121.692 101.983C121.692 101.968 121.73 101.907 121.844 101.839L130.924 96.5567C131.083 96.4654 131.311 96.4121 131.554 96.4121C131.797 96.4121 132.025 96.4654 132.192 96.5567L135.384 98.4062C135.497 98.4747 135.535 98.5356 135.535 98.5585C135.535 98.5737 135.513 98.6346 135.391 98.7031L126.312 103.985C126.144 104.077 125.917 104.13 125.673 104.13Z"
+ fill="#A0C7F1" />
+ <path id="Vector_58"
+ d="M137.88 104.335C137.637 104.335 137.409 104.282 137.249 104.19L134.051 102.341C133.937 102.272 133.899 102.211 133.899 102.189C133.899 102.173 133.921 102.112 134.043 102.044L137.219 100.194C137.379 100.103 137.606 100.05 137.85 100.05C138.093 100.05 138.321 100.103 138.48 100.194L141.679 102.044C141.793 102.112 141.831 102.173 141.831 102.196C141.831 102.211 141.808 102.272 141.687 102.341L138.511 104.19C138.351 104.282 138.123 104.335 137.88 104.335Z"
+ fill="#A0C7F1" />
+ <path id="Vector_59"
+ d="M119.781 107.57C119.538 107.57 119.31 107.517 119.151 107.426L115.96 105.576C115.83 105.5 115.808 105.439 115.808 105.424C115.808 105.409 115.83 105.348 115.952 105.279L119.128 103.43C119.287 103.338 119.515 103.285 119.759 103.285C120.002 103.285 120.23 103.338 120.397 103.43L123.588 105.279C123.702 105.348 123.74 105.409 123.74 105.432C123.74 105.447 123.717 105.508 123.595 105.576L120.42 107.426C120.252 107.517 120.024 107.57 119.781 107.57Z"
+ fill="#A0C7F1" />
+ <path id="Vector_60"
+ d="M131.984 107.768C131.741 107.768 131.513 107.714 131.353 107.623L128.155 105.773C128.041 105.705 128.003 105.644 128.003 105.621C128.003 105.606 128.041 105.537 128.155 105.477L131.323 103.627C131.483 103.536 131.718 103.482 131.954 103.482C132.197 103.482 132.425 103.536 132.584 103.627L135.783 105.477C135.912 105.553 135.935 105.614 135.935 105.629C135.935 105.644 135.912 105.705 135.783 105.773L132.615 107.623C132.455 107.714 132.227 107.768 131.984 107.768Z"
+ fill="#A0C7F1" />
+ <path id="Vector_61"
+ d="M126.069 111.209C125.826 111.209 125.598 111.156 125.439 111.064L122.24 109.215C122.111 109.139 122.088 109.078 122.088 109.063C122.088 109.047 122.111 108.986 122.232 108.918L125.408 107.068C125.568 106.977 125.796 106.924 126.039 106.924C126.282 106.924 126.51 106.977 126.669 107.068L129.868 108.918C129.997 108.994 130.02 109.055 130.02 109.07C130.02 109.085 129.997 109.146 129.876 109.215L126.7 111.064C126.533 111.156 126.305 111.209 126.069 111.209Z"
+ fill="#A0C7F1" />
+ <path id="Vector_62"
+ d="M119.378 100.491C119.135 100.491 118.907 100.438 118.748 100.347L115.557 98.497C115.443 98.4285 115.397 98.3676 115.397 98.3448C115.397 98.3296 115.435 98.2687 115.549 98.2002L118.717 96.3507C118.877 96.2593 119.105 96.2061 119.348 96.2061C119.591 96.2061 119.819 96.2593 119.986 96.3507L123.177 98.2002C123.291 98.2687 123.329 98.3296 123.329 98.3524C123.329 98.3752 123.291 98.4361 123.177 98.497L120.009 100.347C119.849 100.438 119.621 100.491 119.378 100.491Z"
+ fill="#A0C7F1" />
+ <path id="Vector_63"
+ d="M113.471 103.924C113.228 103.924 113 103.87 112.84 103.779L109.649 101.93C109.52 101.854 109.497 101.793 109.497 101.777C109.497 101.762 109.52 101.701 109.641 101.633L112.817 99.7833C112.977 99.692 113.205 99.6387 113.448 99.6387C113.691 99.6387 113.919 99.692 114.086 99.7833L117.277 101.633C117.391 101.701 117.429 101.762 117.429 101.785C117.429 101.8 117.391 101.869 117.277 101.93L114.101 103.779C113.942 103.87 113.706 103.924 113.471 103.924Z"
+ fill="#A0C7F1" />
+ <path id="Vector_64"
+ d="M101.287 103.726C101.044 103.726 100.816 103.672 100.649 103.581L97.4579 101.731C97.3287 101.655 97.3059 101.594 97.3059 101.579C97.3059 101.564 97.3287 101.503 97.4503 101.435L100.626 99.585C100.786 99.4937 101.014 99.4404 101.257 99.4404C101.5 99.4404 101.728 99.4937 101.895 99.585L105.086 101.435C105.215 101.511 105.238 101.572 105.238 101.587C105.238 101.602 105.215 101.663 105.094 101.731L101.918 103.581C101.758 103.672 101.53 103.726 101.287 103.726Z"
+ fill="#A0C7F1" />
+ <path id="Vector_65"
+ d="M107.575 107.364C107.332 107.364 107.104 107.311 106.944 107.22L103.753 105.37C103.624 105.294 103.601 105.233 103.601 105.218C103.601 105.203 103.624 105.142 103.746 105.073L106.922 103.224C107.081 103.132 107.309 103.079 107.552 103.079C107.795 103.079 108.023 103.132 108.19 103.224L111.382 105.073C111.496 105.142 111.534 105.203 111.534 105.225C111.534 105.241 111.496 105.309 111.382 105.37L108.206 107.22C108.046 107.311 107.811 107.364 107.575 107.364Z"
+ fill="#A0C7F1" />
+ <path id="Vector_66"
+ d="M101.66 110.805C101.417 110.805 101.189 110.751 101.029 110.66L97.8382 108.81C97.7091 108.734 97.6863 108.673 97.6863 108.658C97.6863 108.643 97.7091 108.582 97.8382 108.514L101.007 106.664C101.166 106.573 101.394 106.52 101.637 106.52C101.88 106.52 102.108 106.573 102.275 106.664L105.467 108.514C105.596 108.59 105.618 108.651 105.618 108.666C105.618 108.681 105.588 108.742 105.467 108.81L102.298 110.66C102.139 110.751 101.903 110.805 101.66 110.805Z"
+ fill="#A0C7F1" />
+ <path id="Vector_67"
+ d="M84.7293 135.268C84.4862 135.268 84.2583 135.214 84.0987 135.123L80.9 133.273C80.786 133.205 80.748 133.144 80.748 133.121C80.748 133.106 80.786 133.037 80.9 132.977L84.0683 131.127C84.2279 131.036 84.4634 130.982 84.6989 130.982C84.9421 130.982 85.17 131.036 85.3296 131.127L88.5283 132.977C88.6574 133.053 88.6802 133.114 88.6802 133.129C88.6802 133.144 88.6574 133.205 88.5283 133.273L85.36 135.123C85.2004 135.214 84.9725 135.268 84.7293 135.268Z"
+ fill="#A0C7F1" />
+ <path id="Vector_68"
+ d="M90.6441 131.826C90.401 131.826 90.1731 131.773 90.0135 131.681L86.8148 129.832C86.7008 129.763 86.6628 129.703 86.6628 129.68C86.6628 129.665 86.6856 129.604 86.8072 129.535L89.9831 127.686C90.1427 127.594 90.3706 127.541 90.6137 127.541C90.8569 127.541 91.0848 127.594 91.2444 127.686L94.4431 129.535C94.557 129.604 94.595 129.665 94.595 129.687C94.595 129.703 94.5722 129.763 94.4507 129.832L91.2748 131.681C91.1152 131.773 90.8873 131.826 90.6441 131.826Z"
+ fill="#A0C7F1" />
+ <path id="Vector_69"
+ d="M89.4801 110.6C89.2369 110.6 89.009 110.546 88.8418 110.455L85.6507 108.605C85.5216 108.529 85.4988 108.468 85.4988 108.453C85.4988 108.438 85.5216 108.377 85.6431 108.309L88.819 106.459C88.9786 106.368 89.2065 106.314 89.4497 106.314C89.6928 106.314 89.9207 106.368 90.0879 106.459L93.279 108.309C93.4082 108.385 93.431 108.446 93.431 108.461C93.431 108.476 93.4082 108.537 93.2866 108.605L90.1107 110.455C89.9511 110.546 89.7156 110.6 89.4801 110.6Z"
+ fill="#A0C7F1" />
+ <path id="Vector_70"
+ d="M83.5767 114.039C83.3336 114.039 83.1057 113.986 82.9385 113.894L79.7474 112.045C79.6183 111.969 79.5955 111.908 79.5955 111.893C79.5955 111.877 79.6183 111.817 79.7398 111.748L82.9081 109.899C83.0677 109.807 83.2956 109.754 83.5388 109.754C83.7819 109.754 84.0098 109.807 84.177 109.899L87.3681 111.748C87.4973 111.824 87.52 111.885 87.52 111.9C87.52 111.915 87.4973 111.976 87.3681 112.045L84.1998 113.894C84.0478 113.986 83.8123 114.039 83.5767 114.039Z"
+ fill="#A0C7F1" />
+ <path id="Vector_71"
+ d="M95.7718 114.237C95.5287 114.237 95.3007 114.184 95.1412 114.093L91.9501 112.243C91.8209 112.167 91.7981 112.106 91.7981 112.091C91.7981 112.076 91.8209 112.015 91.9425 111.946L95.1184 110.097C95.2779 110.005 95.5059 109.952 95.749 109.952C95.9921 109.952 96.2201 110.005 96.3872 110.097L99.5783 111.946C99.6923 112.015 99.7303 112.076 99.7303 112.098C99.7303 112.114 99.6923 112.182 99.5783 112.243L96.4024 114.093C96.2353 114.184 96.0073 114.237 95.7718 114.237Z"
+ fill="#A0C7F1" />
+ <path id="Vector_72"
+ d="M77.6617 117.473C77.4186 117.473 77.1906 117.419 77.0235 117.328L73.8324 115.478C73.7032 115.402 73.6804 115.341 73.6804 115.326C73.6804 115.311 73.7032 115.25 73.8324 115.182L77.0007 113.332C77.1602 113.241 77.3882 113.188 77.6313 113.188C77.8744 113.188 78.1024 113.241 78.2695 113.332L81.4606 115.182C81.5746 115.25 81.6202 115.311 81.6202 115.334C81.6202 115.349 81.5822 115.41 81.4682 115.478L78.2999 117.328C78.1404 117.419 77.9048 117.473 77.6617 117.473Z"
+ fill="#A0C7F1" />
+ <path id="Vector_73"
+ d="M89.8643 117.678C89.6212 117.678 89.3932 117.624 89.2337 117.533L86.0426 115.684C85.9134 115.607 85.8906 115.547 85.8906 115.531C85.8906 115.516 85.9134 115.455 86.035 115.387L89.2033 113.537C89.3629 113.446 89.5908 113.393 89.8339 113.393C90.0771 113.393 90.305 113.446 90.4721 113.537L93.6633 115.387C93.7772 115.455 93.8152 115.516 93.8152 115.539C93.8152 115.554 93.7772 115.623 93.6633 115.684L90.4949 117.533C90.3354 117.624 90.0999 117.678 89.8643 117.678Z"
+ fill="#A0C7F1" />
+ <path id="Vector_74"
+ d="M71.7621 120.913C71.5189 120.913 71.291 120.86 71.1238 120.768L67.9327 118.919C67.8036 118.843 67.7808 118.782 67.7808 118.767C67.7808 118.751 67.8036 118.691 67.9251 118.622L71.101 116.773C71.2606 116.681 71.4885 116.628 71.7317 116.628C71.9748 116.628 72.2027 116.681 72.3699 116.773L75.561 118.622C75.6902 118.698 75.7129 118.759 75.7129 118.774C75.7129 118.79 75.6902 118.85 75.5686 118.919L72.3927 120.768C72.2255 120.86 71.9976 120.913 71.7621 120.913Z"
+ fill="#A0C7F1" />
+ <path id="Vector_75"
+ d="M83.9571 121.11C83.714 121.11 83.486 121.057 83.3265 120.966L80.1354 119.116C80.0062 119.04 79.9834 118.979 79.9834 118.964C79.9834 118.949 80.0062 118.888 80.1354 118.819L83.3037 116.97C83.4632 116.878 83.6912 116.825 83.9343 116.825C84.1774 116.825 84.4054 116.878 84.5725 116.97L87.7636 118.819C87.8928 118.895 87.9156 118.956 87.9156 118.972C87.9156 118.987 87.8852 119.048 87.7636 119.116L84.5953 120.966C84.4282 121.057 84.2002 121.11 83.9571 121.11Z"
+ fill="#A0C7F1" />
+ <path id="Vector_76"
+ d="M65.8661 124.346C65.623 124.346 65.395 124.292 65.2279 124.201L62.0368 122.352C61.9228 122.283 61.8772 122.222 61.8772 122.199C61.8772 122.184 61.9152 122.123 62.0292 122.055L65.1975 120.205C65.357 120.114 65.585 120.061 65.8281 120.061C66.0712 120.061 66.2992 120.114 66.4663 120.205L69.6574 122.055C69.7866 122.131 69.8094 122.192 69.8094 122.207C69.8094 122.222 69.7866 122.283 69.6574 122.352L66.4891 124.201C66.3296 124.292 66.1016 124.346 65.8661 124.346Z"
+ fill="#A0C7F1" />
+ <path id="Vector_77"
+ d="M78.0574 124.551C77.8143 124.551 77.5864 124.497 77.4268 124.406L74.2357 122.557C74.1065 122.48 74.0837 122.42 74.0837 122.404C74.0837 122.389 74.1065 122.328 74.2281 122.26L77.404 120.41C77.5636 120.319 77.7915 120.266 78.0346 120.266C78.2778 120.266 78.5057 120.319 78.6729 120.41L81.864 122.26C81.9779 122.328 82.0159 122.389 82.0159 122.412C82.0159 122.427 81.9779 122.496 81.864 122.557L78.6881 124.406C78.5285 124.497 78.3006 124.551 78.0574 124.551Z"
+ fill="#A0C7F1" />
+ <path id="Vector_78"
+ d="M90.2447 124.756C90.0016 124.756 89.7736 124.703 89.6141 124.611L86.423 122.762C86.2938 122.686 86.271 122.625 86.271 122.609C86.271 122.594 86.2938 122.533 86.423 122.465L89.5913 120.615C89.7508 120.524 89.9788 120.471 90.2219 120.471C90.465 120.471 90.693 120.524 90.8601 120.615L94.0512 122.465C94.1652 122.533 94.2032 122.594 94.2032 122.617C94.2032 122.632 94.1652 122.701 94.0512 122.762L90.8829 124.611C90.7234 124.695 90.4878 124.756 90.2447 124.756Z"
+ fill="#A0C7F1" />
+ <path id="Vector_79"
+ d="M72.1461 127.99C71.903 127.99 71.675 127.937 71.5155 127.846L68.3243 125.996C68.2104 125.928 68.1648 125.867 68.1648 125.844C68.1648 125.829 68.2028 125.768 68.3168 125.699L71.4851 123.85C71.6446 123.758 71.8726 123.705 72.1157 123.705C72.3588 123.705 72.5868 123.758 72.7539 123.85L75.945 125.699C76.059 125.768 76.097 125.829 76.097 125.851C76.097 125.874 76.059 125.935 75.945 125.996L72.7767 127.846C72.6172 127.929 72.3892 127.99 72.1461 127.99Z"
+ fill="#A0C7F1" />
+ <path id="Vector_80"
+ d="M84.3489 128.188C84.1058 128.188 83.8779 128.135 83.7183 128.044L80.5272 126.194C80.398 126.118 80.3752 126.057 80.3752 126.042C80.3752 126.027 80.398 125.966 80.5196 125.897L83.6955 124.048C83.8551 123.957 84.083 123.903 84.3261 123.903C84.5693 123.903 84.7972 123.957 84.9644 124.048L88.1555 125.897C88.2694 125.966 88.3074 126.027 88.3074 126.05C88.3074 126.065 88.2846 126.126 88.1631 126.194L84.9872 128.044C84.82 128.135 84.5845 128.188 84.3489 128.188Z"
+ fill="#A0C7F1" />
+ <path id="Vector_81"
+ d="M74.9495 133.661C74.7064 133.661 74.4785 133.608 74.3189 133.516L71.1278 131.667C70.9986 131.591 70.9758 131.53 70.9758 131.515C70.9758 131.499 70.9986 131.439 71.1278 131.37L77.7987 127.488C77.9583 127.397 78.1862 127.344 78.4293 127.344C78.6725 127.344 78.9004 127.397 79.0676 127.488L82.2587 129.338C82.3878 129.414 82.4106 129.475 82.4106 129.482C82.4106 129.498 82.3878 129.559 82.2587 129.627L75.5877 133.509C75.4206 133.608 75.1927 133.661 74.9495 133.661Z"
+ fill="#A0C7F1" />
+ <path id="Vector_82"
+ d="M59.9434 127.785C59.7003 127.785 59.4724 127.732 59.3052 127.64L56.1141 125.791C55.985 125.715 55.9622 125.654 55.9622 125.639C55.9622 125.624 55.985 125.563 56.1141 125.494L59.2824 123.645C59.442 123.553 59.6699 123.5 59.9131 123.5C60.1562 123.5 60.3841 123.553 60.5513 123.645L63.7424 125.494C63.8716 125.57 63.8943 125.631 63.8943 125.646C63.8943 125.662 63.8716 125.722 63.75 125.791L60.5817 127.64C60.4145 127.732 60.1866 127.785 59.9434 127.785Z"
+ fill="#A0C7F1" />
+ <path id="Vector_83"
+ d="M107.187 100.286C106.944 100.286 106.716 100.233 106.549 100.141L103.358 98.292C103.228 98.2158 103.206 98.155 103.206 98.1397C103.206 98.1245 103.228 98.0636 103.35 97.9951L112.429 92.713C112.589 92.6216 112.817 92.5684 113.06 92.5684C113.303 92.5684 113.531 92.6216 113.698 92.713L116.889 94.5625C117.019 94.6386 117.041 94.6995 117.041 94.7147C117.041 94.7299 117.019 94.7908 116.889 94.8593L107.81 100.141C107.658 100.233 107.43 100.286 107.187 100.286Z"
+ fill="#A0C7F1" />
+ <path id="Vector_84"
+ d="M72.9298 142.14C72.6866 142.14 72.4587 142.086 72.2992 141.995L69.1004 140.145C68.9713 140.069 68.9485 140.008 68.9485 139.993C68.9485 139.978 68.9713 139.917 69.0928 139.849L78.1723 134.566C78.3319 134.475 78.5598 134.422 78.8029 134.422C79.0461 134.422 79.274 134.475 79.4336 134.566L82.6323 136.416C82.7614 136.492 82.7842 136.553 82.7842 136.568C82.7842 136.583 82.7614 136.644 82.6399 136.713L73.5604 141.995C73.4008 142.086 73.1729 142.14 72.9298 142.14Z"
+ fill="#A0C7F1" />
+ <path id="Vector_85"
+ d="M102.063 117.875C101.82 117.875 101.592 117.822 101.433 117.73L98.2416 115.881C98.1124 115.805 98.0896 115.744 98.0896 115.729C98.0896 115.713 98.1124 115.652 98.234 115.584L101.41 113.734C101.569 113.643 101.797 113.59 102.04 113.59C102.284 113.59 102.512 113.643 102.679 113.734L105.87 115.584C105.999 115.66 106.022 115.721 106.022 115.736C106.022 115.751 105.999 115.812 105.877 115.881L102.702 117.73C102.534 117.822 102.306 117.875 102.063 117.875Z"
+ fill="#A0C7F1" />
+ <path id="Vector_86"
+ d="M96.1558 121.315C95.9127 121.315 95.6848 121.262 95.5252 121.171L92.3341 119.321C92.2049 119.245 92.1821 119.184 92.1821 119.169C92.1821 119.154 92.2049 119.093 92.3265 119.024L95.4948 117.175C95.6544 117.084 95.8823 117.03 96.1254 117.03C96.3686 117.03 96.5965 117.084 96.7636 117.175L99.9548 119.024C100.084 119.101 100.107 119.161 100.107 119.177C100.107 119.192 100.084 119.253 99.9548 119.321L96.7864 121.171C96.6269 121.262 96.399 121.315 96.1558 121.315Z"
+ fill="#A0C7F1" />
+ <path id="Vector_87"
+ d="M96.5477 128.394C96.3046 128.394 96.0766 128.34 95.9171 128.249L92.7184 126.399C92.5892 126.323 92.5664 126.262 92.5664 126.255C92.5664 126.24 92.5892 126.179 92.7184 126.11L113.468 114.031C113.628 113.94 113.856 113.887 114.099 113.887C114.342 113.887 114.57 113.94 114.729 114.031L117.928 115.881C118.057 115.957 118.08 116.018 118.08 116.033C118.08 116.048 118.057 116.109 117.936 116.178L97.1859 128.257C97.0188 128.34 96.7908 128.394 96.5477 128.394Z"
+ fill="#A0C7F1" />
+ </g>
+ </g>
+ <path id="Vector 172" d="M104 152.5C102.5 147.833 100.6 138.6 105 139C110.5 139.5 104.839 155.5 104 152.5Z"
+ fill="#66AF82" />
+ <path id="Vector 173" d="M104 153C104.5 151.333 104.3 148.1 99.5001 148.5C93.5001 149 102 153.5 104 153Z"
+ fill="#3D8C5C" />
+ <path id="Vector 177"
+ d="M20.9999 116.5C21.6666 112 22.1999 103.5 18.9999 105.5C14.9999 108 19.4999 119.5 20.9999 116.5Z"
+ fill="#3D8C5C" />
+ <path id="Vector 178"
+ d="M20.4999 117C18.1666 114.333 13.2999 109.9 12.4999 113.5C11.4999 118 21.9999 119.5 20.4999 117Z"
+ fill="#66AF82" />
+ </g>
+ <defs>
+ <linearGradient id="paint0_linear_15025_66980" x1="89.7041" y1="56.4904" x2="23.917" y2="141.98"
+ gradientUnits="userSpaceOnUse">
+ <stop stop-color="white" />
+ <stop offset="1" stop-color="#D9EDFF" />
+ </linearGradient>
+ <clipPath id="clip0_15025_66980">
+ <rect width="200" height="200" fill="white" />
+ </clipPath>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/src/assets/img/rdvsBeginning.svg b/src/assets/img/rdvsBeginning.svg
deleted file mode 100644
index a08a04978edb4f207a5816b618a2bd18a61e9453..0000000000000000000000000000000000000000
--- a/src/assets/img/rdvsBeginning.svg
+++ /dev/null
@@ -1,213 +0,0 @@
-<svg width="200" height="201" viewBox="0 0 200 201" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_10191_199277)">
-<path d="M34.0001 113.833L12.9833 101.799C6.72166 98.2133 6.70077 92.3723 12.9367 88.7719L40.3447 72.9479C46.5625 69.3581 56.6436 69.3581 62.8614 72.9479L178.986 139.993" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M109.406 131.833L28.0001 178.833" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M34 113.833L115.406 160.833" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M180.084 142.273L190.103 147.951C196.42 151.53 196.467 157.397 190.208 161.011L164.414 175.903C158.196 179.493 148.115 179.493 141.898 175.903L115.292 160.543" stroke="#706F6F" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 8"/>
-<path d="M183.915 137.345C187.146 139.207 187.16 142.228 183.955 144.097C180.75 145.966 175.531 145.959 172.3 144.097C169.069 142.235 169.056 139.214 172.267 137.345C175.472 135.483 180.684 135.483 183.915 137.345Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M178 107.833L178 140.5" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="5 5"/>
-<rect x="0.433013" y="0.25" width="44.4182" height="78.6483" rx="4.5" transform="matrix(0.866025 -0.5 2.20305e-08 1 156.725 34.945)" fill="white" stroke="#706F6F"/>
-<path d="M197.06 9.24126C197.357 9.06874 197.599 9.20677 197.603 9.55183L197.616 14.3696C197.616 14.7104 197.375 15.1288 197.077 15.3013L193.652 17.2767C193.355 17.4492 193.113 17.3112 193.109 16.9662L193.096 12.1483C193.096 11.8076 193.337 11.3892 193.635 11.2167L197.06 9.24126Z" fill="#DA3635"/>
-<path d="M196.391 11.6265C196.421 11.6093 196.447 11.6049 196.473 11.6179C196.516 11.6438 196.516 11.7257 196.473 11.8033L195.723 13.1016V13.1879L196.477 13.6192C196.521 13.6451 196.521 13.727 196.477 13.8047C196.456 13.8435 196.43 13.8693 196.4 13.8866C196.374 13.9039 196.344 13.9082 196.318 13.8952L195.563 13.4639L195.49 13.507L194.739 14.8053C194.718 14.8441 194.692 14.87 194.662 14.8873C194.631 14.9045 194.606 14.9088 194.58 14.8959C194.537 14.8657 194.537 14.7837 194.58 14.7104L195.33 13.4122V13.3259L194.575 12.8946C194.532 12.8687 194.532 12.7868 194.575 12.7091C194.597 12.6703 194.627 12.6401 194.653 12.6272C194.683 12.6099 194.709 12.6056 194.735 12.6185L195.49 13.0498L195.563 13.0067L196.314 11.7085C196.331 11.674 196.361 11.6438 196.391 11.6265Z" fill="white"/>
-<path d="M165.838 52.925C166.636 52.4635 167.287 52.8344 167.291 53.7531L167.304 58.0835C167.309 59.0022 166.657 60.1237 165.859 60.5852L161.986 62.8237C161.188 63.2852 160.537 62.91 160.537 61.9956L160.524 57.6652C160.52 56.7465 161.171 55.625 161.965 55.1679L165.838 52.925ZM166.998 58.2604L166.985 53.93C166.985 53.2054 166.468 52.9121 165.838 53.2787L161.965 55.5172C161.335 55.8795 160.826 56.7637 160.83 57.4883L160.843 61.8187C160.843 62.5434 161.361 62.8323 161.986 62.47L165.859 60.2315C166.489 59.8649 166.998 58.985 166.998 58.2604Z" fill="#706F6F"/>
-<path d="M165.838 53.2743C166.467 52.912 166.981 53.201 166.985 53.9256L166.998 58.256C166.998 58.9806 166.489 59.8605 165.859 60.2271L161.986 62.4657C161.356 62.828 160.843 62.539 160.843 61.8144L160.83 57.484C160.83 56.7594 161.339 55.8752 161.964 55.5129L165.838 53.2743Z" fill="white"/>
-<path d="M190.315 30.273C190.652 30.0789 190.928 30.2342 190.928 30.6224C190.928 31.0106 190.656 31.485 190.32 31.6791L165.631 45.9341C165.29 46.1282 165.019 45.9686 165.019 45.5848C165.019 45.1966 165.29 44.7264 165.627 44.528L190.315 30.273Z" fill="#DA3635"/>
-<path d="M185.911 29.8414C186.252 29.6473 186.524 29.8026 186.524 30.1907C186.524 30.5789 186.252 31.0491 185.916 31.2475L170.035 40.4173C169.698 40.6114 169.426 40.4518 169.422 40.0679C169.422 39.6797 169.694 39.2096 170.03 39.0155L185.911 29.8414Z" fill="#DA3635"/>
-<path d="M182.068 46.9983C182.236 46.9034 182.374 46.9767 182.374 47.1708C182.374 47.3649 182.236 47.6022 182.068 47.697L169.357 55.038C169.189 55.1329 169.051 55.0596 169.051 54.8612C169.051 54.6671 169.189 54.4342 169.357 54.335L182.068 46.9983Z" fill="#706F6F"/>
-<path d="M187.192 46.1319C187.365 46.0327 187.498 46.1104 187.498 46.3088C187.498 46.5029 187.365 46.7401 187.192 46.835L169.461 57.0744C169.288 57.1736 169.155 57.0917 169.155 56.8976C169.155 56.7035 169.288 56.4706 169.461 56.3714L187.192 46.1319Z" fill="#706F6F"/>
-<path d="M165.838 64.2679C166.636 63.8064 167.287 64.1773 167.291 65.0917L167.304 69.4221C167.309 70.3365 166.657 71.4579 165.859 71.9194L161.986 74.158C161.188 74.6195 160.537 74.2442 160.537 73.3298L160.524 68.9994C160.52 68.085 161.171 66.9636 161.965 66.5021L165.838 64.2679ZM166.998 69.5989L166.985 65.2685C166.985 64.5482 166.467 64.2549 165.838 64.6172L161.965 66.8558C161.335 67.2181 160.826 68.1023 160.83 68.8226L160.843 73.153C160.843 73.8733 161.361 74.1666 161.986 73.8043L165.859 71.5658C166.489 71.2078 166.998 70.3236 166.998 69.5989Z" fill="#706F6F"/>
-<path d="M165.838 64.6171C166.467 64.2548 166.981 64.5438 166.985 65.2684L166.998 69.5988C166.998 70.3191 166.489 71.2033 165.859 71.5699L161.986 73.8084C161.356 74.1708 160.843 73.8775 160.843 73.1572L160.83 68.8267C160.83 68.1064 161.339 67.2222 161.964 66.8599L165.838 64.6171Z" fill="white"/>
-<path d="M185.92 55.7552C186.093 55.656 186.226 55.7379 186.226 55.932C186.226 56.1261 186.093 56.359 185.92 56.4582L169.241 66.0852C169.069 66.1844 168.935 66.1025 168.935 65.9084C168.935 65.7143 169.069 65.4814 169.241 65.3822L185.92 55.7552Z" fill="#706F6F"/>
-<path d="M179.463 61.2582C179.631 61.1633 179.769 61.2409 179.769 61.435C179.769 61.6291 179.631 61.8663 179.463 61.9612L169.275 67.8444C169.107 67.9392 168.969 67.8616 168.969 67.6675C168.969 67.4734 169.107 67.2362 169.275 67.1413L179.463 61.2582Z" fill="#706F6F"/>
-<path d="M165.838 76.3798C166.467 76.0175 166.981 76.3065 166.985 77.0311L166.998 81.3615C166.998 82.0818 166.489 82.966 165.859 83.3326L161.986 85.5711C161.356 85.9334 160.843 85.6401 160.843 84.9198L160.83 80.5894C160.83 79.8648 161.339 78.9806 161.964 78.6183L165.838 76.3798Z" fill="white"/>
-<path d="M165.838 76.0305C166.636 75.569 167.287 75.9399 167.291 76.8586L167.304 81.189C167.309 82.1077 166.657 83.2291 165.859 83.6907L161.986 85.9292C161.188 86.3907 160.537 86.0154 160.537 85.101L160.524 80.7706C160.52 79.8519 161.171 78.7305 161.965 78.2733L165.838 76.0305ZM166.998 81.3615L166.985 77.0311C166.985 76.3065 166.468 76.0132 165.838 76.3798L161.965 78.6184C161.335 78.9807 160.826 79.8649 160.83 80.5895L160.843 84.9199C160.843 85.6402 161.361 85.9335 161.986 85.5712L165.859 83.3327C166.489 82.9704 166.998 82.0861 166.998 81.3615Z" fill="#706F6F"/>
-<path d="M179.511 71.4845C179.679 71.3896 179.817 71.463 179.817 71.6614C179.817 71.8555 179.679 72.0884 179.511 72.1876L169.56 77.9327C169.392 78.0276 169.254 77.9543 169.254 77.7602C169.254 77.5661 169.392 77.3289 169.56 77.234L179.511 71.4845Z" fill="#706F6F"/>
-<path d="M187.434 67.0033C187.602 66.9084 187.74 66.986 187.74 67.1801C187.74 67.3742 187.602 67.6114 187.434 67.7063L181.003 71.42C180.83 71.5192 180.697 71.4415 180.697 71.2431C180.697 71.049 180.83 70.8118 181.003 70.7169L187.434 67.0033Z" fill="#706F6F"/>
-<path d="M187.192 69.2374C187.365 69.1382 187.498 69.2158 187.498 69.4142C187.498 69.6083 187.365 69.8412 187.192 69.9405L169.461 80.1799C169.288 80.2791 169.155 80.2014 169.155 80.0074C169.155 79.8133 169.288 79.5804 169.461 79.4812L187.192 69.2374Z" fill="#706F6F"/>
-<path d="M165.838 88.6378C166.636 88.1763 167.287 88.5429 167.291 89.4616L167.304 93.792C167.309 94.7107 166.657 95.8322 165.859 96.2937L161.986 98.5322C161.188 98.9937 160.537 98.6185 160.537 97.7041L160.524 93.3737C160.52 92.4549 161.171 91.3378 161.965 90.8763L165.838 88.6378ZM166.998 93.9689L166.985 89.6385C166.985 88.9182 166.468 88.6249 165.838 88.9872L161.965 91.2257C161.335 91.588 160.826 92.4722 160.83 93.1925L160.843 97.5229C160.843 98.2475 161.361 98.5408 161.986 98.1785L165.859 95.94C166.489 95.5777 166.998 94.6935 166.998 93.9689Z" fill="#706F6F"/>
-<path d="M165.838 88.9872C166.467 88.6249 166.981 88.9139 166.985 89.6385L166.998 93.9689C166.998 94.6935 166.489 95.5777 165.859 95.94L161.986 98.1786C161.356 98.5409 160.843 98.2476 160.843 97.523L160.83 93.1925C160.83 92.4722 161.339 91.588 161.964 91.2257L165.838 88.9872Z" fill="white"/>
-<path d="M182.068 82.7072C182.236 82.6123 182.374 82.6856 182.374 82.884C182.374 83.0781 182.236 83.3153 182.068 83.4102L169.357 90.7513C169.189 90.8461 169.051 90.7685 169.051 90.5744C169.051 90.3803 169.189 90.1431 169.357 90.0482L182.068 82.7072Z" fill="#706F6F"/>
-<path d="M187.192 81.8401C187.365 81.7409 187.498 81.8229 187.498 82.017C187.498 82.2111 187.365 82.444 187.192 82.5432L169.461 92.7826C169.288 92.8818 169.155 92.7999 169.155 92.6058C169.155 92.4117 169.288 92.1788 169.461 92.0796L187.192 81.8401Z" fill="#706F6F"/>
-<path d="M165.368 66.7228C165.475 66.6581 165.583 66.6451 165.67 66.6926C165.838 66.7875 165.838 67.098 165.67 67.3827L163.927 70.3976C163.819 70.5831 163.681 70.7297 163.53 70.816C163.379 70.9022 163.237 70.9195 163.129 70.8548L162.482 70.4838C162.314 70.3889 162.314 70.0784 162.482 69.7937C162.564 69.6514 162.672 69.5393 162.784 69.4789C162.892 69.4142 163 69.4012 163.086 69.4487L163.535 69.7032L165.074 67.0333C165.152 66.8953 165.26 66.7875 165.368 66.7228Z" fill="#DA3635"/>
-<path d="M165.368 55.8146C165.475 55.7499 165.583 55.7369 165.67 55.7844C165.838 55.8793 165.838 56.1898 165.67 56.4745L163.927 59.4894C163.819 59.6748 163.681 59.8215 163.53 59.9077C163.379 59.994 163.237 60.0112 163.129 59.9466L162.482 59.5756C162.314 59.4807 162.314 59.1702 162.482 58.8855C162.564 58.7432 162.672 58.631 162.784 58.5706C162.892 58.506 163 58.493 163.086 58.5405L163.535 58.7949L165.074 56.1251C165.152 55.9871 165.26 55.8749 165.368 55.8146Z" fill="#DA3635"/>
-<path d="M165.368 78.9161C165.475 78.8514 165.583 78.8385 165.67 78.8859C165.838 78.9808 165.838 79.2914 165.67 79.576L163.927 82.5909C163.819 82.7764 163.681 82.923 163.53 83.0093C163.379 83.0956 163.237 83.1128 163.129 83.0481L162.482 82.6772C162.314 82.5823 162.314 82.2718 162.482 81.9871C162.564 81.8448 162.672 81.7326 162.784 81.6722C162.892 81.6075 163 81.5946 163.086 81.642L163.535 81.8965L165.074 79.2267C165.152 79.0929 165.26 78.9808 165.368 78.9161Z" fill="#DA3635"/>
-<path d="M165.368 91.0148C165.475 90.9501 165.583 90.9371 165.67 90.9846C165.838 91.0794 165.838 91.39 165.67 91.6747L163.927 94.6896C163.819 94.875 163.681 95.0217 163.53 95.1079C163.379 95.1942 163.237 95.2115 163.129 95.1468L162.482 94.7758C162.314 94.6809 162.314 94.3704 162.482 94.0857C162.564 93.9434 162.672 93.8313 162.784 93.7709C162.892 93.7062 163 93.6932 163.086 93.7407L163.535 93.9951L165.074 91.3253C165.152 91.1916 165.26 91.0795 165.368 91.0148Z" fill="#DA3635"/>
-<path d="M94.6214 57.1831C96.4501 58.0939 96.4615 59.5728 94.6441 60.4836C92.8268 61.3944 89.8722 61.3944 88.0435 60.4836C86.2148 59.5728 86.2072 58.0939 88.0246 57.1831C89.8419 56.2723 92.7928 56.2723 94.6214 57.1831Z" fill="#EDEDED"/>
-<path d="M183.136 103.698C185.545 99.5537 185.551 95.0626 183.151 93.6672C180.75 92.2719 176.851 94.5008 174.442 98.6456C172.033 102.79 172.026 107.282 174.427 108.677C176.828 110.072 180.727 107.843 183.136 103.698Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M156.014 122.542L119.826 101.614C119.236 101.272 118.282 101.272 117.698 101.614L54.3054 138.519C54.0106 138.687 53.8661 138.913 53.8661 139.139L53.8545 143.089C53.8545 143.314 53.999 143.54 54.2996 143.708L90.4878 164.637C91.0775 164.978 92.0313 164.978 92.6209 164.637L156.014 127.737C156.303 127.569 156.453 127.343 156.453 127.123L156.465 123.173C156.465 123.202 156.453 123.237 156.447 123.266C156.494 123.005 156.355 122.739 156.014 122.542Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M153.395 122.044L118.924 102.106C118.363 101.781 117.455 101.781 116.895 102.106L56.5193 137.257C56.2419 137.419 56.1031 137.633 56.1031 137.847L56.0916 141.606C56.0916 141.82 56.2303 142.034 56.5136 142.196L90.9848 162.135C91.5456 162.459 92.4589 162.459 93.0139 162.135L153.389 126.984C153.667 126.821 153.805 126.613 153.805 126.399L153.817 122.64C153.817 122.669 153.805 122.698 153.8 122.727C153.852 122.478 153.719 122.229 153.395 122.044Z" fill="#EDEDED"/>
-<path d="M97.5812 52.529L100.951 52.5C100.818 52.5 100.68 52.5405 100.547 52.6158L97.1765 52.6448C97.3037 52.5637 97.4424 52.529 97.5812 52.529Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M58.0283 134.39L54.6581 134.419C54.2708 134.425 53.9008 134.136 53.7332 133.661L57.1034 133.632C57.2768 134.112 57.6468 134.396 58.0283 134.39Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M41.6569 86.6729L38.2866 86.7018L97.1763 52.6394L100.546 52.6162L41.6569 86.6729Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M57.1036 133.631L53.7334 133.66L37.7898 88.4098L41.16 88.3809L57.1036 133.631Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M41.1599 88.3812L37.7897 88.4101C37.5585 87.7558 37.7839 86.9914 38.2868 86.7018L41.6571 86.6729C41.1542 86.9624 40.9287 87.7268 41.1599 88.3812Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M100.547 52.6158C101.055 52.3204 101.645 52.6158 101.876 53.2643L117.82 98.5149C118.051 99.1635 117.826 99.9279 117.323 100.217L58.433 134.28C57.9243 134.575 57.3289 134.28 57.1034 133.631L41.1598 88.3808C40.9286 87.7264 41.154 86.962 41.657 86.6724L100.547 52.6158Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M100.061 56.6402C100.541 56.3622 101.096 56.6402 101.316 57.254L116.352 99.9219C116.566 100.536 116.357 101.254 115.883 101.532L60.3582 133.648C59.8784 133.926 59.3177 133.648 59.1038 133.04L44.062 90.3668C43.8481 89.7529 44.0562 89.0291 44.536 88.7569L100.061 56.6402Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M154.02 120.069L154.008 123.845C154.008 124.059 153.87 124.268 153.592 124.43L153.604 120.654C153.881 120.492 154.02 120.284 154.02 120.069Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M55.884 139.116L55.8956 135.34C55.8956 135.554 56.0343 135.768 56.3176 135.936L56.306 139.712C56.0228 139.544 55.884 139.33 55.884 139.116Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M153.604 120.654L153.592 124.43L92.9624 159.732L92.974 155.956L153.604 120.654Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M90.9333 155.956L90.9217 159.732L56.3059 139.712L56.3175 135.937L90.9333 155.956Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M92.9741 155.956L92.9625 159.732C92.4018 160.056 91.4884 160.056 90.9219 159.732L90.9334 155.956C91.4942 156.28 92.4076 156.28 92.9741 155.956Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M153.598 119.473C154.159 119.797 154.164 120.33 153.604 120.654L92.9739 155.956C92.4132 156.28 91.4998 156.28 90.9333 155.956L56.3175 135.936C55.7568 135.612 55.751 135.079 56.3117 134.755L116.941 99.459C117.502 99.1347 118.416 99.1347 118.976 99.459L153.598 119.473Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M127.63 132.653C127.752 132.722 127.752 132.838 127.63 132.908L114.635 140.471C114.514 140.54 114.317 140.54 114.196 140.471L106.779 136.179C106.657 136.11 106.657 135.994 106.779 135.925L119.774 128.362C119.896 128.292 120.092 128.292 120.214 128.362L127.63 132.653Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M74.4121 70.1439C74.8715 69.9128 75.1359 69.5101 75.0027 69.2442C74.8695 68.9784 74.3891 68.9502 73.9297 69.1813C73.4703 69.4123 73.2059 69.8151 73.3391 70.0809C73.4724 70.3467 73.9528 70.3749 74.4121 70.1439Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M78.5153 141.9C78.3303 141.9 78.1569 141.86 78.0355 141.79L75.6076 140.383C75.5093 140.325 75.4919 140.279 75.4919 140.267C75.4919 140.256 75.5093 140.209 75.6018 140.157L79.8218 137.702C79.9432 137.632 80.1166 137.592 80.3016 137.592C80.4866 137.592 80.66 137.632 80.7872 137.702L83.2152 139.109C83.3134 139.167 83.3308 139.213 83.3308 139.225C83.3308 139.236 83.3134 139.283 83.221 139.335L79.0009 141.79C78.868 141.86 78.6945 141.9 78.5153 141.9Z" fill="white"/>
-<path d="M80.296 137.882C80.4521 137.882 80.5735 137.922 80.6371 137.957L82.828 139.225L78.8508 141.542C78.793 141.576 78.6716 141.611 78.5155 141.611C78.3594 141.611 78.238 141.576 78.1802 141.542L75.9892 140.274L79.9665 137.957C80.0185 137.917 80.1399 137.882 80.296 137.882ZM80.296 137.303C80.0705 137.303 79.8451 137.355 79.6716 137.453L75.4516 139.909C75.1105 140.111 75.1105 140.436 75.4574 140.638L77.8854 142.046C78.0588 142.144 78.2842 142.196 78.5097 142.196C78.7351 142.196 78.9606 142.144 79.134 142.046L83.3541 139.59C83.6951 139.387 83.6951 139.063 83.3483 138.866L80.9203 137.459C80.7469 137.355 80.5214 137.303 80.296 137.303Z" fill="#706F6F"/>
-<path d="M73.7231 139.132C73.5381 139.132 73.3647 139.091 73.2433 139.022L70.8153 137.615C70.7171 137.557 70.6997 137.51 70.6997 137.499C70.6997 137.487 70.7171 137.441 70.8095 137.389L77.7177 133.37C77.8391 133.3 78.0125 133.26 78.1975 133.26C78.3825 133.26 78.5559 133.3 78.6831 133.37L81.111 134.777C81.1978 134.829 81.2267 134.875 81.2267 134.893C81.2267 134.904 81.1978 134.957 81.111 135.003L74.2029 139.022C74.0815 139.091 73.9081 139.132 73.7231 139.132Z" fill="white"/>
-<path d="M78.1918 133.544C78.3479 133.544 78.4693 133.584 78.5329 133.619L80.7239 134.887L74.0585 138.767C74.0007 138.802 73.8793 138.837 73.7232 138.837C73.5903 138.837 73.4631 138.808 73.3879 138.762L71.197 137.493L77.8623 133.613C77.9201 133.584 78.0358 133.544 78.1918 133.544ZM78.1918 132.965C77.9664 132.965 77.7409 133.017 77.5675 133.115L70.6594 137.134C70.3183 137.337 70.3183 137.661 70.6652 137.864L73.0931 139.271C73.2665 139.37 73.492 139.422 73.7175 139.422C73.9429 139.422 74.1684 139.37 74.3418 139.271L81.2499 135.252C81.591 135.05 81.591 134.725 81.2441 134.528L78.8162 133.121C78.6485 133.017 78.4173 132.965 78.1918 132.965Z" fill="#706F6F"/>
-<path d="M68.9364 136.364C68.7514 136.364 68.578 136.323 68.4508 136.254L66.0228 134.847C65.9246 134.789 65.9072 134.742 65.9072 134.731C65.9072 134.719 65.9246 134.673 66.0171 134.621L68.4277 133.214C68.5491 133.144 68.7225 133.104 68.9075 133.104C69.0925 133.104 69.2659 133.144 69.3931 133.214L71.821 134.621C71.9193 134.679 71.9367 134.725 71.9367 134.737C71.9367 134.748 71.9193 134.794 71.821 134.847L69.4104 136.254C69.2948 136.323 69.1214 136.364 68.9364 136.364Z" fill="white"/>
-<path d="M68.9133 133.394C69.0694 133.394 69.1908 133.434 69.2544 133.469L71.4453 134.737L69.2717 136.005C69.2139 136.04 69.0925 136.075 68.9365 136.075C68.7804 136.075 68.659 136.034 68.5954 135.999L66.4044 134.731L68.578 133.469C68.6358 133.428 68.7572 133.394 68.9133 133.394ZM68.9133 132.814C68.6879 132.814 68.4566 132.867 68.289 132.965L65.8784 134.372C65.5373 134.575 65.5373 134.899 65.8842 135.102L68.3121 136.509C68.4855 136.608 68.7168 136.66 68.9422 136.66C69.1677 136.66 69.3931 136.608 69.5666 136.509L71.9772 135.102C72.324 134.899 72.324 134.575 71.9714 134.372L69.5434 132.965C69.37 132.861 69.1388 132.814 68.9133 132.814Z" fill="#706F6F"/>
-<path d="M100.384 118.053C100.199 118.053 100.026 118.013 99.8988 117.943L97.4708 116.536C97.3726 116.478 97.3552 116.432 97.3552 116.42C97.3552 116.409 97.3726 116.362 97.4708 116.31L99.8815 114.903C100.003 114.834 100.176 114.793 100.361 114.793C100.546 114.793 100.72 114.834 100.847 114.903L103.275 116.31C103.362 116.362 103.396 116.409 103.396 116.426C103.396 116.438 103.367 116.484 103.281 116.536L100.87 117.943C100.743 118.013 100.564 118.053 100.384 118.053Z" fill="white"/>
-<path d="M100.355 115.088C100.488 115.088 100.616 115.117 100.697 115.163L102.887 116.431L100.714 117.694C100.656 117.729 100.535 117.769 100.379 117.769C100.222 117.769 100.101 117.729 100.038 117.694L97.8466 116.426L100.02 115.163C100.084 115.123 100.205 115.088 100.355 115.088ZM100.355 114.509C100.13 114.509 99.9045 114.561 99.7311 114.659L97.3205 116.067C96.9736 116.269 96.9794 116.594 97.3263 116.796L99.7542 118.203C99.9277 118.302 100.153 118.354 100.384 118.354C100.616 118.354 100.835 118.302 101.009 118.203L103.419 116.796C103.766 116.594 103.76 116.269 103.414 116.067L100.986 114.659C100.812 114.555 100.587 114.509 100.355 114.509Z" fill="#706F6F"/>
-<path d="M109.957 123.594C109.772 123.594 109.599 123.554 109.478 123.484L107.05 122.077C106.951 122.019 106.934 121.973 106.934 121.961C106.934 121.95 106.951 121.903 107.05 121.851L109.46 120.444C109.582 120.375 109.755 120.334 109.94 120.334C110.125 120.334 110.299 120.375 110.426 120.444L112.854 121.851C112.94 121.903 112.969 121.95 112.969 121.967C112.969 121.979 112.94 122.031 112.854 122.077L110.443 123.484C110.316 123.554 110.142 123.594 109.957 123.594Z" fill="white"/>
-<path d="M109.935 120.624C110.068 120.624 110.195 120.653 110.276 120.699L112.467 121.968L110.293 123.23C110.235 123.265 110.114 123.305 109.958 123.305C109.802 123.305 109.68 123.27 109.622 123.236L107.431 121.968L109.605 120.699C109.663 120.665 109.778 120.624 109.935 120.624ZM109.935 120.045C109.709 120.045 109.484 120.097 109.31 120.195L106.9 121.603C106.553 121.805 106.559 122.13 106.905 122.332L109.333 123.74C109.507 123.838 109.732 123.89 109.958 123.89C110.183 123.89 110.414 123.838 110.588 123.74L112.998 122.332C113.345 122.13 113.339 121.805 112.993 121.608L110.565 120.201C110.391 120.097 110.16 120.045 109.935 120.045Z" fill="#706F6F"/>
-<path d="M123.138 110.362C122.953 110.362 122.78 110.322 122.658 110.252L115.438 106.077C115.34 106.019 115.322 105.973 115.322 105.961C115.322 105.95 115.34 105.903 115.432 105.851L117.849 104.444C117.97 104.375 118.143 104.334 118.328 104.334C118.513 104.334 118.687 104.375 118.814 104.444L126.028 108.619C126.115 108.671 126.144 108.718 126.144 108.735C126.144 108.747 126.115 108.799 126.028 108.845L123.612 110.252C123.496 110.322 123.323 110.362 123.138 110.362Z" fill="white"/>
-<path d="M118.328 104.624C118.484 104.624 118.606 104.665 118.669 104.699L125.647 108.736L123.473 109.998C123.415 110.033 123.294 110.068 123.138 110.068C123.005 110.068 122.878 110.039 122.803 109.992L115.819 105.95L117.993 104.688C118.051 104.665 118.172 104.624 118.328 104.624ZM118.328 104.045C118.103 104.045 117.877 104.097 117.704 104.195L115.288 105.603C114.946 105.805 114.946 106.13 115.293 106.332L122.508 110.508C122.681 110.606 122.907 110.658 123.132 110.658C123.358 110.658 123.583 110.606 123.757 110.508L126.173 109.1C126.514 108.898 126.514 108.573 126.167 108.377L118.953 104.201C118.779 104.097 118.554 104.045 118.328 104.045Z" fill="#706F6F"/>
-<path d="M114.449 120.977C114.264 120.977 114.091 120.937 113.97 120.867L111.542 119.46C111.443 119.402 111.426 119.356 111.426 119.344C111.426 119.332 111.443 119.286 111.536 119.234L113.952 117.827C114.074 117.757 114.247 117.717 114.432 117.717C114.617 117.717 114.79 117.757 114.918 117.827L117.346 119.234C117.432 119.286 117.461 119.332 117.461 119.35C117.461 119.361 117.444 119.408 117.351 119.46L114.935 120.867C114.808 120.937 114.634 120.977 114.449 120.977Z" fill="white"/>
-<path d="M114.426 118.007C114.582 118.007 114.704 118.047 114.767 118.082L116.958 119.35L114.785 120.619C114.727 120.653 114.605 120.688 114.449 120.688C114.293 120.688 114.172 120.653 114.114 120.619L111.923 119.35L114.097 118.088C114.154 118.047 114.27 118.007 114.426 118.007ZM114.426 117.428C114.201 117.428 113.975 117.48 113.802 117.578L111.385 118.986C111.044 119.188 111.044 119.512 111.391 119.715L113.819 121.122C113.993 121.221 114.218 121.273 114.444 121.273C114.669 121.273 114.894 121.221 115.068 121.122L117.484 119.715C117.825 119.512 117.825 119.188 117.478 118.991L115.051 117.584C114.883 117.48 114.657 117.428 114.426 117.428Z" fill="#706F6F"/>
-<path d="M119.242 123.747C119.057 123.747 118.883 123.706 118.762 123.637L116.328 122.229C116.23 122.172 116.212 122.125 116.212 122.114C116.212 122.102 116.23 122.056 116.322 122.004L118.739 120.596C118.86 120.527 119.033 120.486 119.218 120.486C119.403 120.486 119.577 120.527 119.698 120.596L122.132 122.004C122.23 122.061 122.248 122.108 122.248 122.119C122.248 122.131 122.23 122.177 122.132 122.229L119.716 123.637C119.594 123.706 119.421 123.747 119.242 123.747Z" fill="white"/>
-<path d="M119.219 120.781C119.375 120.781 119.496 120.816 119.554 120.851L121.745 122.119L119.571 123.387C119.513 123.422 119.392 123.457 119.236 123.457C119.08 123.457 118.959 123.422 118.901 123.387L116.71 122.119L118.883 120.851C118.941 120.816 119.063 120.781 119.219 120.781ZM119.219 120.202C118.993 120.202 118.768 120.254 118.594 120.353L116.178 121.76C115.837 121.963 115.837 122.287 116.184 122.484L118.617 123.891C118.791 123.989 119.016 124.042 119.242 124.042C119.467 124.042 119.693 123.989 119.866 123.891L122.283 122.484C122.624 122.281 122.624 121.957 122.277 121.76L119.843 120.353C119.67 120.248 119.444 120.202 119.219 120.202Z" fill="#706F6F"/>
-<path d="M123.433 115.748C123.248 115.748 123.074 115.707 122.953 115.638L120.525 114.231C120.438 114.179 120.404 114.132 120.404 114.115C120.404 114.103 120.432 114.057 120.519 114.005L127.427 109.986C127.549 109.917 127.722 109.876 127.907 109.876C128.092 109.876 128.266 109.917 128.393 109.986L130.821 111.393C130.907 111.445 130.936 111.492 130.936 111.509C130.936 111.521 130.919 111.567 130.826 111.619L123.918 115.638C123.791 115.707 123.618 115.748 123.433 115.748Z" fill="white"/>
-<path d="M127.907 110.166C128.063 110.166 128.185 110.207 128.248 110.241L130.439 111.51L123.774 115.389C123.716 115.424 123.595 115.459 123.439 115.459C123.282 115.459 123.161 115.418 123.103 115.384L120.912 114.115L127.578 110.235C127.63 110.201 127.751 110.166 127.907 110.166ZM127.907 109.587C127.682 109.587 127.456 109.639 127.283 109.737L120.375 113.756C120.028 113.959 120.034 114.283 120.38 114.486L122.808 115.893C122.982 115.992 123.207 116.044 123.433 116.044C123.658 116.044 123.884 115.992 124.057 115.893L130.965 111.874C131.306 111.672 131.306 111.347 130.959 111.15L128.531 109.743C128.358 109.633 128.133 109.587 127.907 109.587Z" fill="#706F6F"/>
-<path d="M132.717 115.905C132.532 115.905 132.358 115.864 132.237 115.795L129.803 114.388C129.716 114.335 129.688 114.289 129.688 114.272C129.688 114.26 129.705 114.214 129.797 114.162L132.214 112.755C132.335 112.685 132.509 112.645 132.694 112.645C132.879 112.645 133.052 112.685 133.173 112.755L135.607 114.162C135.694 114.214 135.723 114.26 135.723 114.278C135.723 114.289 135.705 114.335 135.613 114.388L133.196 115.795C133.075 115.864 132.902 115.905 132.717 115.905Z" fill="white"/>
-<path d="M132.694 112.935C132.85 112.935 132.971 112.969 133.029 113.004L135.22 114.272L133.046 115.541C132.989 115.575 132.867 115.61 132.711 115.61C132.555 115.61 132.434 115.575 132.376 115.541L130.185 114.272L132.358 113.004C132.422 112.969 132.538 112.935 132.694 112.935ZM132.694 112.355C132.468 112.355 132.243 112.408 132.069 112.506L129.653 113.913C129.312 114.116 129.312 114.44 129.659 114.637L132.093 116.044C132.266 116.143 132.491 116.195 132.717 116.195C132.942 116.195 133.168 116.143 133.341 116.044L135.758 114.637C136.099 114.434 136.099 114.11 135.752 113.913L133.318 112.506C133.145 112.408 132.919 112.355 132.694 112.355Z" fill="#706F6F"/>
-<path d="M118.941 118.366C118.756 118.366 118.583 118.325 118.461 118.256L116.033 116.849C115.935 116.791 115.918 116.744 115.918 116.733C115.918 116.721 115.935 116.675 116.028 116.623L118.444 115.215C118.565 115.146 118.739 115.105 118.924 115.105C119.109 115.105 119.282 115.146 119.409 115.215L121.837 116.623C121.924 116.675 121.953 116.721 121.953 116.739C121.953 116.75 121.936 116.796 121.843 116.849L119.427 118.256C119.3 118.325 119.126 118.366 118.941 118.366Z" fill="white"/>
-<path d="M118.918 115.396C119.074 115.396 119.195 115.436 119.259 115.471L121.45 116.739L119.276 118.007C119.218 118.042 119.097 118.077 118.941 118.077C118.785 118.077 118.664 118.042 118.606 118.007L116.415 116.739L118.588 115.477C118.646 115.43 118.762 115.396 118.918 115.396ZM118.918 114.816C118.692 114.816 118.467 114.869 118.294 114.967L115.877 116.374C115.536 116.577 115.536 116.901 115.883 117.104L118.311 118.511C118.484 118.609 118.71 118.662 118.935 118.662C119.161 118.662 119.386 118.609 119.56 118.511L121.976 117.104C122.317 116.901 122.317 116.577 121.97 116.38L119.542 114.973C119.375 114.869 119.149 114.816 118.918 114.816Z" fill="#706F6F"/>
-<path d="M128.225 118.516C128.04 118.516 127.867 118.476 127.745 118.406L125.311 116.999C125.225 116.947 125.196 116.9 125.196 116.883C125.196 116.872 125.225 116.819 125.311 116.773L127.722 115.366C127.843 115.296 128.023 115.256 128.202 115.256C128.387 115.256 128.56 115.296 128.682 115.366L131.115 116.773C131.214 116.831 131.231 116.877 131.231 116.889C131.231 116.9 131.214 116.947 131.115 116.999L128.705 118.406C128.583 118.476 128.41 118.516 128.225 118.516Z" fill="white"/>
-<path d="M128.202 115.546C128.358 115.546 128.479 115.581 128.537 115.615L130.728 116.884L128.554 118.152C128.497 118.187 128.375 118.221 128.219 118.221C128.063 118.221 127.942 118.187 127.884 118.146L125.693 116.878L127.867 115.615C127.924 115.586 128.046 115.546 128.202 115.546ZM128.202 114.967C127.976 114.967 127.745 115.019 127.572 115.117L125.161 116.525C124.814 116.727 124.82 117.052 125.167 117.248L127.601 118.656C127.774 118.754 127.999 118.806 128.225 118.806C128.45 118.806 128.676 118.754 128.849 118.656L131.26 117.248C131.607 117.046 131.601 116.721 131.26 116.519L128.826 115.112C128.653 115.019 128.427 114.967 128.202 114.967Z" fill="#706F6F"/>
-<path d="M123.733 121.133C123.548 121.133 123.375 121.093 123.253 121.023L120.82 119.616C120.721 119.558 120.704 119.512 120.704 119.5C120.704 119.489 120.721 119.442 120.814 119.39L123.23 117.983C123.352 117.914 123.525 117.873 123.71 117.873C123.895 117.873 124.069 117.914 124.19 117.983L126.624 119.39C126.722 119.448 126.739 119.495 126.739 119.506C126.739 119.518 126.722 119.564 126.629 119.616L124.213 121.023C124.086 121.093 123.912 121.133 123.733 121.133Z" fill="white"/>
-<path d="M123.71 118.163C123.866 118.163 123.988 118.198 124.046 118.233L126.237 119.501L124.063 120.763C124.005 120.798 123.884 120.833 123.728 120.833C123.572 120.833 123.45 120.798 123.392 120.763L121.201 119.495L123.375 118.227C123.433 118.204 123.554 118.163 123.71 118.163ZM123.71 117.584C123.485 117.584 123.259 117.636 123.086 117.735L120.67 119.142C120.329 119.344 120.329 119.669 120.675 119.866L123.109 121.273C123.283 121.371 123.508 121.423 123.733 121.423C123.959 121.423 124.184 121.371 124.358 121.273L126.774 119.866C127.115 119.663 127.115 119.339 126.768 119.142L124.335 117.735C124.161 117.636 123.936 117.584 123.71 117.584Z" fill="#706F6F"/>
-<path d="M118.646 112.98C118.461 112.98 118.288 112.94 118.167 112.87L115.739 111.463C115.652 111.411 115.617 111.364 115.617 111.347C115.617 111.335 115.646 111.289 115.733 111.237L118.143 109.83C118.265 109.76 118.438 109.72 118.623 109.72C118.808 109.72 118.982 109.76 119.109 109.83L121.537 111.237C121.623 111.289 121.652 111.335 121.652 111.353C121.652 111.37 121.623 111.416 121.537 111.463L119.126 112.87C119.005 112.94 118.831 112.98 118.646 112.98Z" fill="white"/>
-<path d="M118.623 110.01C118.779 110.01 118.901 110.05 118.964 110.085L121.155 111.353L118.981 112.621C118.924 112.656 118.802 112.697 118.646 112.697C118.513 112.697 118.386 112.668 118.311 112.621L116.12 111.353L118.294 110.091C118.351 110.045 118.467 110.01 118.623 110.01ZM118.623 109.431C118.398 109.431 118.172 109.483 117.999 109.581L115.588 110.988C115.241 111.191 115.247 111.515 115.594 111.718L118.022 113.125C118.195 113.224 118.421 113.276 118.646 113.276C118.872 113.276 119.097 113.224 119.27 113.125L121.681 111.718C122.028 111.515 122.028 111.191 121.681 110.988L119.253 109.581C119.08 109.483 118.854 109.431 118.623 109.431Z" fill="#706F6F"/>
-<path d="M114.154 115.592C113.969 115.592 113.796 115.552 113.674 115.482L111.246 114.075C111.148 114.017 111.131 113.971 111.131 113.959C111.131 113.948 111.148 113.901 111.24 113.849L113.657 112.442C113.778 112.373 113.952 112.332 114.137 112.332C114.322 112.332 114.495 112.373 114.622 112.442L117.05 113.849C117.137 113.901 117.166 113.948 117.166 113.965C117.166 113.977 117.137 114.029 117.05 114.075L114.634 115.482C114.512 115.552 114.333 115.592 114.154 115.592Z" fill="white"/>
-<path d="M114.131 112.627C114.287 112.627 114.409 112.667 114.472 112.702L116.663 113.97L114.489 115.239C114.432 115.273 114.31 115.308 114.154 115.308C114.021 115.308 113.894 115.279 113.819 115.233L111.628 113.965L113.802 112.702C113.859 112.662 113.975 112.627 114.131 112.627ZM114.131 112.048C113.906 112.048 113.68 112.1 113.507 112.198L111.09 113.606C110.749 113.808 110.749 114.133 111.096 114.335L113.524 115.742C113.697 115.841 113.923 115.893 114.148 115.893C114.374 115.893 114.599 115.841 114.773 115.742L117.189 114.335C117.53 114.133 117.536 113.808 117.183 113.611L114.755 112.204C114.588 112.094 114.356 112.048 114.131 112.048Z" fill="#706F6F"/>
-<path d="M104.876 115.441C104.691 115.441 104.517 115.4 104.39 115.331L101.962 113.924C101.864 113.866 101.847 113.82 101.847 113.808C101.847 113.796 101.864 113.75 101.957 113.698L104.373 112.291C104.494 112.221 104.668 112.181 104.853 112.181C105.038 112.181 105.211 112.221 105.338 112.291L107.766 113.698C107.865 113.756 107.882 113.802 107.882 113.814C107.882 113.825 107.865 113.872 107.772 113.924L105.356 115.331C105.234 115.4 105.061 115.441 104.876 115.441Z" fill="white"/>
-<path d="M104.853 112.471C105.009 112.471 105.13 112.511 105.194 112.546L107.385 113.814L105.211 115.082C105.154 115.117 105.032 115.152 104.876 115.152C104.72 115.152 104.599 115.111 104.535 115.077L102.344 113.808L104.518 112.546C104.575 112.505 104.697 112.471 104.853 112.471ZM104.853 111.892C104.627 111.892 104.402 111.944 104.229 112.042L101.812 113.449C101.471 113.652 101.471 113.976 101.818 114.179L104.246 115.586C104.419 115.685 104.651 115.737 104.876 115.737C105.102 115.737 105.327 115.685 105.5 115.586L107.917 114.179C108.258 113.976 108.258 113.652 107.911 113.449L105.483 112.042C105.304 111.944 105.078 111.892 104.853 111.892Z" fill="#706F6F"/>
-<path d="M109.662 118.21C109.477 118.21 109.304 118.169 109.182 118.1L106.755 116.692C106.656 116.634 106.639 116.588 106.639 116.576C106.639 116.565 106.656 116.519 106.749 116.466L109.165 115.059C109.287 114.99 109.46 114.949 109.645 114.949C109.83 114.949 110.003 114.99 110.131 115.059L112.559 116.466C112.645 116.519 112.674 116.565 112.674 116.582C112.674 116.594 112.645 116.646 112.559 116.692L110.142 118.1C110.021 118.169 109.842 118.21 109.662 118.21Z" fill="white"/>
-<path d="M109.639 115.239C109.795 115.239 109.917 115.28 109.98 115.315L112.171 116.583L109.998 117.845C109.94 117.88 109.819 117.915 109.662 117.915C109.529 117.915 109.402 117.886 109.327 117.839L107.136 116.571L109.31 115.303C109.368 115.28 109.483 115.239 109.639 115.239ZM109.639 114.66C109.414 114.66 109.188 114.712 109.015 114.811L106.599 116.218C106.258 116.421 106.258 116.745 106.604 116.948L109.032 118.355C109.206 118.453 109.431 118.505 109.657 118.505C109.882 118.505 110.108 118.453 110.281 118.355L112.697 116.948C113.038 116.745 113.038 116.421 112.692 116.224L110.264 114.817C110.096 114.712 109.865 114.66 109.639 114.66Z" fill="#706F6F"/>
-<path d="M105.165 120.827C104.98 120.827 104.807 120.786 104.685 120.717L102.257 119.309C102.159 119.252 102.142 119.205 102.142 119.194C102.142 119.182 102.159 119.136 102.257 119.084L104.668 117.676C104.789 117.607 104.963 117.566 105.148 117.566C105.333 117.566 105.506 117.607 105.633 117.676L108.061 119.084C108.16 119.142 108.177 119.188 108.177 119.199C108.177 119.211 108.154 119.257 108.061 119.309L105.651 120.717C105.529 120.786 105.35 120.827 105.165 120.827Z" fill="white"/>
-<path d="M105.148 117.856C105.281 117.856 105.408 117.885 105.489 117.932L107.68 119.2L105.506 120.462C105.448 120.497 105.327 120.538 105.171 120.538C105.015 120.538 104.893 120.503 104.836 120.462L102.645 119.194L104.818 117.932C104.87 117.891 104.992 117.856 105.148 117.856ZM105.148 117.277C104.922 117.277 104.697 117.329 104.523 117.428L102.113 118.835C101.766 119.038 101.772 119.362 102.119 119.565L104.546 120.972C104.72 121.07 104.945 121.123 105.171 121.123C105.396 121.123 105.627 121.07 105.801 120.972L108.212 119.565C108.558 119.362 108.553 119.038 108.206 118.841L105.778 117.434C105.599 117.329 105.373 117.277 105.148 117.277Z" fill="#706F6F"/>
-<path d="M92.2855 139.439C92.1005 139.439 91.9271 139.398 91.8057 139.329L89.372 137.922C89.2853 137.87 89.2563 137.823 89.2563 137.806C89.2563 137.794 89.2853 137.742 89.372 137.696L91.7826 136.289C91.904 136.219 92.0832 136.179 92.2624 136.179C92.4474 136.179 92.6208 136.219 92.7422 136.289L95.176 137.696C95.2742 137.754 95.2916 137.8 95.2916 137.812C95.2916 137.823 95.2742 137.87 95.176 137.922L92.7653 139.329C92.6439 139.398 92.4705 139.439 92.2855 139.439Z" fill="white"/>
-<path d="M92.2683 136.469C92.4244 136.469 92.5458 136.503 92.6036 136.538L94.7945 137.806L92.6209 139.075C92.5631 139.109 92.4417 139.144 92.2856 139.144C92.1296 139.144 92.0082 139.104 91.9503 139.069L89.7594 137.801L91.933 136.538C91.9908 136.509 92.1064 136.469 92.2683 136.469ZM92.2683 135.89C92.0428 135.89 91.8116 135.942 91.644 136.04L89.2333 137.447C88.8865 137.65 88.8923 137.974 89.2391 138.171L91.6729 139.578C91.8463 139.677 92.0717 139.729 92.2972 139.729C92.5227 139.729 92.7481 139.677 92.9215 139.578L95.3321 138.171C95.679 137.969 95.679 137.644 95.3321 137.442L92.8984 136.034C92.7192 135.942 92.4937 135.89 92.2683 135.89Z" fill="#706F6F"/>
-<path d="M96.777 136.822C96.592 136.822 96.4186 136.781 96.2972 136.712L93.8634 135.305C93.7767 135.252 93.7478 135.206 93.7478 135.189C93.7478 135.177 93.7651 135.131 93.8576 135.079L96.274 133.672C96.3954 133.602 96.5689 133.562 96.7538 133.562C96.9388 133.562 97.1123 133.602 97.2337 133.672L99.6674 135.079C99.7541 135.131 99.783 135.177 99.783 135.195C99.783 135.206 99.7657 135.252 99.6732 135.305L97.2568 136.712C97.1354 136.781 96.962 136.822 96.777 136.822Z" fill="white"/>
-<path d="M96.7538 133.856C96.9099 133.856 97.0313 133.891 97.0891 133.926L99.2801 135.194L97.1065 136.462C97.0487 136.497 96.9273 136.532 96.7712 136.532C96.6151 136.532 96.4937 136.497 96.4359 136.462L94.2449 135.194L96.4185 133.926C96.4821 133.891 96.5977 133.856 96.7538 133.856ZM96.7538 133.277C96.5284 133.277 96.3029 133.329 96.1295 133.428L93.7131 134.835C93.372 135.038 93.372 135.362 93.7189 135.559L96.1526 136.966C96.326 137.065 96.5515 137.117 96.7769 137.117C97.0024 137.117 97.2279 137.065 97.4013 136.966L99.8177 135.559C100.159 135.356 100.159 135.032 99.8119 134.835L97.3782 133.428C97.2105 133.324 96.9793 133.277 96.7538 133.277Z" fill="#706F6F"/>
-<path d="M95.8925 120.67C95.7075 120.67 95.534 120.63 95.4069 120.56L92.9789 119.153C92.8806 119.095 92.8633 119.049 92.8633 119.037C92.8633 119.026 92.8806 118.98 92.9731 118.927L95.3895 117.52C95.5109 117.451 95.6843 117.41 95.8693 117.41C96.0543 117.41 96.2277 117.451 96.3549 117.52L98.7829 118.927C98.8812 118.985 98.8985 119.032 98.8985 119.043C98.8985 119.055 98.8812 119.101 98.7887 119.153L96.3723 120.56C96.2509 120.63 96.0717 120.67 95.8925 120.67Z" fill="white"/>
-<path d="M95.8637 117.7C96.0198 117.7 96.1412 117.741 96.2048 117.775L98.3957 119.044L96.2221 120.306C96.1643 120.341 96.0429 120.376 95.8868 120.376C95.7307 120.376 95.6093 120.335 95.5457 120.3L93.3548 119.032L95.5284 117.764C95.592 117.741 95.7134 117.7 95.8637 117.7ZM95.8637 117.121C95.6382 117.121 95.4128 117.173 95.2394 117.272L92.823 118.679C92.4819 118.882 92.4819 119.206 92.8287 119.409L95.2567 120.816C95.4301 120.914 95.6614 120.966 95.8868 120.966C96.1123 120.966 96.3377 120.914 96.5111 120.816L98.9275 119.409C99.2686 119.206 99.2686 118.882 98.9218 118.679L96.4938 117.272C96.3204 117.173 96.0949 117.121 95.8637 117.121Z" fill="#706F6F"/>
-<path d="M91.4008 123.288C91.2158 123.288 91.0423 123.247 90.9152 123.178L88.4872 121.77C88.3889 121.713 88.3716 121.666 88.3716 121.655C88.3716 121.643 88.3889 121.597 88.4814 121.545L90.892 120.137C91.0134 120.068 91.1869 120.027 91.3718 120.027C91.5568 120.027 91.7303 120.068 91.8574 120.137L94.2854 121.545C94.3837 121.602 94.401 121.649 94.401 121.66C94.401 121.672 94.3837 121.718 94.2854 121.77L91.8748 123.178C91.7592 123.247 91.58 123.288 91.4008 123.288Z" fill="white"/>
-<path d="M91.3774 120.317C91.5335 120.317 91.6549 120.358 91.7185 120.393L93.9095 121.661L91.7359 122.929C91.678 122.964 91.5566 122.999 91.4006 122.999C91.2445 122.999 91.1231 122.958 91.0595 122.923L88.8685 121.655L91.0422 120.393C91.1 120.352 91.2214 120.317 91.3774 120.317ZM91.3774 119.738C91.152 119.738 90.9208 119.79 90.7531 119.889L88.3425 121.296C88.0014 121.499 88.0014 121.823 88.3483 122.026L90.7762 123.433C90.9497 123.531 91.1809 123.583 91.4063 123.583C91.6318 123.583 91.8573 123.531 92.0307 123.433L94.4413 122.026C94.7881 121.823 94.7824 121.499 94.4355 121.296L92.0076 119.889C91.8283 119.785 91.6029 119.738 91.3774 119.738Z" fill="#706F6F"/>
-<path d="M100.679 123.439C100.494 123.439 100.321 123.398 100.2 123.329L97.7716 121.922C97.6734 121.864 97.656 121.818 97.656 121.806C97.656 121.794 97.6733 121.748 97.7658 121.696L100.182 120.289C100.304 120.219 100.477 120.179 100.662 120.179C100.847 120.179 101.02 120.219 101.148 120.289L103.576 121.696C103.662 121.748 103.691 121.794 103.691 121.812C103.691 121.823 103.662 121.875 103.576 121.922L101.159 123.329C101.032 123.398 100.859 123.439 100.679 123.439Z" fill="white"/>
-<path d="M100.656 120.469C100.812 120.469 100.933 120.509 100.997 120.544L103.188 121.812L101.014 123.08C100.957 123.115 100.835 123.15 100.679 123.15C100.523 123.15 100.402 123.115 100.344 123.075L98.1528 121.806L100.326 120.544C100.378 120.509 100.5 120.469 100.656 120.469ZM100.656 119.89C100.43 119.89 100.205 119.942 100.032 120.04L97.6152 121.447C97.2741 121.65 97.2741 121.974 97.621 122.177L100.049 123.584C100.222 123.683 100.448 123.735 100.673 123.735C100.899 123.735 101.124 123.683 101.298 123.584L103.714 122.177C104.055 121.974 104.055 121.65 103.708 121.453L101.28 120.046C101.107 119.942 100.881 119.89 100.656 119.89Z" fill="#706F6F"/>
-<path d="M86.9034 125.9C86.7184 125.9 86.545 125.859 86.4178 125.79L83.9899 124.383C83.8916 124.325 83.8743 124.278 83.8743 124.267C83.8743 124.255 83.8916 124.209 83.9899 124.157L86.4005 122.75C86.5219 122.68 86.6953 122.64 86.8803 122.64C87.0653 122.64 87.2387 122.68 87.3659 122.75L89.7939 124.157C89.8806 124.209 89.9153 124.255 89.9153 124.273C89.9153 124.284 89.8864 124.331 89.7996 124.383L87.389 125.79C87.2676 125.859 87.0884 125.9 86.9034 125.9Z" fill="white"/>
-<path d="M86.8801 122.93C87.0131 122.93 87.1402 122.959 87.2212 123.005L89.4121 124.273L87.2385 125.536C87.1807 125.57 87.0593 125.611 86.9032 125.611C86.7471 125.611 86.6258 125.57 86.5622 125.536L84.3712 124.267L86.5448 123.005C86.6084 122.97 86.724 122.93 86.8801 122.93ZM86.8801 122.351C86.6547 122.351 86.4292 122.403 86.2558 122.501L83.8452 123.908C83.4983 124.111 83.5041 124.435 83.8509 124.638L86.2789 126.045C86.4523 126.144 86.6778 126.196 86.909 126.196C87.1345 126.196 87.3657 126.144 87.5333 126.045L89.944 124.638C90.2908 124.435 90.285 124.111 89.9382 123.908L87.5102 122.501C87.3368 122.403 87.1056 122.351 86.8801 122.351Z" fill="#706F6F"/>
-<path d="M96.187 126.056C96.002 126.056 95.8286 126.016 95.7072 125.946L93.2792 124.539C93.1809 124.481 93.1636 124.435 93.1636 124.423C93.1636 124.412 93.1809 124.365 93.2734 124.313L95.684 122.906C95.8054 122.836 95.9789 122.796 96.1638 122.796C96.3488 122.796 96.5223 122.836 96.6494 122.906L99.0774 124.313C99.1641 124.365 99.193 124.412 99.193 124.429C99.193 124.441 99.1641 124.493 99.0774 124.539L96.6668 125.946C96.5454 126.016 96.3662 126.056 96.187 126.056Z" fill="white"/>
-<path d="M96.1643 123.086C96.3204 123.086 96.4418 123.126 96.5054 123.161L98.6963 124.429L96.5227 125.698C96.4649 125.732 96.3435 125.767 96.1874 125.767C96.0545 125.767 95.9273 125.738 95.8521 125.692L93.6612 124.424L95.8348 123.161C95.8868 123.121 96.0082 123.086 96.1643 123.086ZM96.1643 122.507C95.9389 122.507 95.7076 122.559 95.54 122.657L93.1294 124.065C92.7883 124.267 92.7883 124.592 93.1351 124.794L95.5631 126.201C95.7365 126.3 95.962 126.352 96.1874 126.352C96.4129 126.352 96.6383 126.3 96.8118 126.201L99.2224 124.794C99.5692 124.592 99.5692 124.267 99.2224 124.065L96.7944 122.657C96.6152 122.559 96.3898 122.507 96.1643 122.507Z" fill="#706F6F"/>
-<path d="M82.4171 128.517C82.2321 128.517 82.0587 128.477 81.9315 128.407L79.5036 127C79.4053 126.942 79.3879 126.896 79.3879 126.884C79.3879 126.873 79.4053 126.826 79.4978 126.774L81.9142 125.367C82.0356 125.297 82.209 125.257 82.394 125.257C82.579 125.257 82.7524 125.297 82.8796 125.367L85.3075 126.774C85.4058 126.832 85.4232 126.878 85.4232 126.89C85.4232 126.901 85.4058 126.948 85.3133 127L82.8969 128.407C82.7697 128.477 82.5963 128.517 82.4171 128.517Z" fill="white"/>
-<path d="M82.3883 125.547C82.5444 125.547 82.6658 125.587 82.7294 125.622L84.9204 126.89L82.7468 128.153C82.689 128.188 82.5676 128.222 82.4115 128.222C82.2554 128.222 82.134 128.182 82.0704 128.147L79.8795 126.879L82.0531 125.611C82.1166 125.582 82.2323 125.547 82.3883 125.547ZM82.3883 124.968C82.1629 124.968 81.9374 125.02 81.764 125.118L79.3476 126.526C79.0065 126.728 79.0065 127.053 79.3534 127.255L81.7814 128.662C81.9548 128.761 82.186 128.813 82.4115 128.813C82.6369 128.813 82.8624 128.761 83.0358 128.662L85.4522 127.255C85.7933 127.053 85.7933 126.728 85.4464 126.526L83.0185 125.118C82.845 125.02 82.6138 124.968 82.3883 124.968Z" fill="#706F6F"/>
-<path d="M91.6894 128.669C91.5044 128.669 91.331 128.628 91.2096 128.558L88.7816 127.151C88.6834 127.093 88.666 127.047 88.666 127.035C88.666 127.024 88.6834 126.978 88.7816 126.925L91.1923 125.518C91.3137 125.449 91.4871 125.408 91.6721 125.408C91.857 125.408 92.0305 125.449 92.1577 125.518L94.5856 126.925C94.6839 126.983 94.7012 127.03 94.7012 127.041C94.7012 127.053 94.6781 127.099 94.5856 127.151L92.175 128.558C92.0478 128.628 91.8744 128.669 91.6894 128.669Z" fill="white"/>
-<path d="M91.6665 125.703C91.7994 125.703 91.9266 125.732 92.0076 125.778L94.1985 127.047L92.0249 128.309C91.9671 128.344 91.8457 128.384 91.6896 128.384C91.5624 128.384 91.4295 128.355 91.3543 128.309L89.1634 127.041L91.337 125.773C91.3948 125.738 91.5162 125.703 91.6665 125.703ZM91.6665 125.124C91.441 125.124 91.2156 125.176 91.0422 125.275L88.6315 126.682C88.2847 126.884 88.2905 127.209 88.6373 127.411L91.0653 128.819C91.2387 128.917 91.4642 128.969 91.6896 128.969C91.9151 128.969 92.1463 128.917 92.3197 128.819L94.7303 127.411C95.0772 127.209 95.0714 126.884 94.7246 126.688L92.2966 125.28C92.1232 125.17 91.8977 125.124 91.6665 125.124Z" fill="#706F6F"/>
-<path d="M77.9258 131.129C77.7408 131.129 77.5674 131.089 77.4402 131.019L75.0123 129.612C74.9256 129.56 74.8909 129.514 74.8909 129.496C74.8909 129.485 74.9198 129.438 75.0065 129.386L77.4171 127.979C77.5385 127.91 77.7119 127.869 77.8969 127.869C78.0819 127.869 78.2553 127.91 78.3825 127.979L80.8105 129.386C80.9087 129.444 80.9261 129.491 80.9261 129.502C80.9261 129.514 80.9087 129.56 80.8105 129.612L78.3999 131.019C78.2785 131.089 78.105 131.129 77.9258 131.129Z" fill="white"/>
-<path d="M77.8967 128.164C78.0528 128.164 78.1742 128.205 78.2378 128.239L80.4287 129.508L78.2551 130.77C78.1973 130.805 78.0759 130.839 77.9198 130.839C77.7869 130.839 77.6597 130.811 77.5788 130.764L75.3878 129.496L77.5614 128.234C77.625 128.199 77.7406 128.164 77.8967 128.164ZM77.8967 127.585C77.6713 127.585 77.4458 127.637 77.2724 127.736L74.8618 129.143C74.5149 129.345 74.5207 129.67 74.8675 129.872L77.2955 131.28C77.4689 131.378 77.7002 131.43 77.9256 131.43C78.1511 131.43 78.3765 131.378 78.5499 131.28L80.9606 129.872C81.3074 129.67 81.3016 129.345 80.9548 129.143L78.5268 127.736C78.3534 127.631 78.1279 127.585 77.8967 127.585Z" fill="#706F6F"/>
-<path d="M87.1984 131.286C87.0135 131.286 86.84 131.245 86.7186 131.176L84.2907 129.768C84.1924 129.711 84.175 129.664 84.175 129.653C84.175 129.641 84.1924 129.595 84.2849 129.543L86.7013 128.135C86.8227 128.066 86.9961 128.025 87.1811 128.025C87.3661 128.025 87.5395 128.066 87.6667 128.135L90.0947 129.543C90.1814 129.595 90.2103 129.641 90.2103 129.658C90.2103 129.67 90.1814 129.722 90.0947 129.768L87.6783 131.176C87.5569 131.245 87.3834 131.286 87.1984 131.286Z" fill="white"/>
-<path d="M87.1752 128.315C87.3313 128.315 87.4527 128.356 87.5163 128.391L89.7072 129.659L87.5336 130.927C87.4758 130.962 87.3544 130.997 87.1983 130.997C87.0423 130.997 86.9209 130.962 86.863 130.921L84.6721 129.653L86.8457 128.391C86.9035 128.356 87.0249 128.315 87.1752 128.315ZM87.1752 127.736C86.9498 127.736 86.7243 127.788 86.5509 127.887L84.1345 129.294C83.7934 129.497 83.7934 129.821 84.1403 130.024L86.5682 131.431C86.7417 131.529 86.9671 131.582 87.1926 131.582C87.418 131.582 87.6435 131.529 87.8169 131.431L90.2333 130.024C90.5744 129.821 90.5744 129.497 90.2275 129.3L87.7995 127.893C87.6319 127.788 87.4064 127.736 87.1752 127.736Z" fill="#706F6F"/>
-<path d="M96.4768 131.442C96.2918 131.442 96.1183 131.401 95.9969 131.332L93.569 129.925C93.4707 129.867 93.4534 129.82 93.4534 129.809C93.4534 129.797 93.4707 129.751 93.569 129.699L95.9796 128.292C96.101 128.222 96.2744 128.182 96.4594 128.182C96.6444 128.182 96.8178 128.222 96.945 128.292L99.373 129.699C99.4597 129.751 99.4886 129.797 99.4886 129.815C99.4886 129.826 99.4597 129.878 99.373 129.925L96.9624 131.332C96.841 131.396 96.6617 131.442 96.4768 131.442Z" fill="white"/>
-<path d="M96.459 128.472C96.5919 128.472 96.7191 128.501 96.8 128.547L98.991 129.815L96.8174 131.078C96.7596 131.112 96.6382 131.153 96.4821 131.153C96.326 131.153 96.2046 131.118 96.1468 131.083L93.9501 129.809L96.1237 128.547C96.1815 128.506 96.3029 128.472 96.459 128.472ZM96.459 127.893C96.2335 127.893 96.0081 127.945 95.8346 128.043L93.424 129.45C93.0772 129.653 93.0829 129.977 93.4298 130.18L95.8578 131.587C96.0312 131.686 96.2566 131.738 96.4821 131.738C96.7075 131.738 96.9388 131.686 97.1122 131.587L99.5228 130.18C99.8697 129.977 99.8639 129.653 99.517 129.456L97.0891 128.049C96.9099 127.945 96.6844 127.893 96.459 127.893Z" fill="#706F6F"/>
-<path d="M82.7062 133.903C82.5212 133.903 82.3478 133.862 82.2264 133.793L79.7984 132.386C79.7117 132.334 79.677 132.287 79.677 132.27C79.677 132.258 79.7059 132.212 79.7926 132.16L82.2032 130.753C82.3246 130.683 82.4981 130.643 82.6831 130.643C82.868 130.643 83.0415 130.683 83.1686 130.753L85.5966 132.16C85.6833 132.212 85.7122 132.258 85.7122 132.276C85.7122 132.293 85.6833 132.339 85.5966 132.386L83.186 133.793C83.0646 133.857 82.8912 133.903 82.7062 133.903Z" fill="white"/>
-<path d="M82.6889 130.933C82.845 130.933 82.9664 130.973 83.03 131.008L85.221 132.276L83.0474 133.544C82.9896 133.579 82.8682 133.62 82.7121 133.62C82.5791 133.62 82.4519 133.591 82.3768 133.544L80.1858 132.276L82.3594 131.014C82.4115 130.967 82.5329 130.933 82.6889 130.933ZM82.6889 130.354C82.4635 130.354 82.238 130.406 82.0646 130.504L79.654 131.911C79.3071 132.114 79.3129 132.438 79.6598 132.641L82.0877 134.048C82.2612 134.147 82.4866 134.199 82.7121 134.199C82.9375 134.199 83.163 134.147 83.3364 134.048L85.747 132.641C86.0939 132.438 86.0939 132.114 85.747 131.911L83.3191 130.504C83.1399 130.4 82.9144 130.354 82.6889 130.354Z" fill="#706F6F"/>
-<path d="M91.9904 134.053C91.8054 134.053 91.632 134.013 91.5106 133.943L89.0827 132.536C88.9844 132.478 88.967 132.432 88.967 132.42C88.967 132.409 88.9844 132.362 89.0769 132.31L91.4933 130.903C91.6147 130.834 91.7881 130.793 91.9731 130.793C92.1581 130.793 92.3315 130.834 92.4587 130.903L94.8866 132.31C94.9734 132.362 95.0023 132.409 95.0023 132.426C95.0023 132.438 94.9849 132.484 94.8924 132.536L92.476 133.943C92.3488 134.013 92.1696 134.053 91.9904 134.053Z" fill="white"/>
-<path d="M91.9674 131.083C92.1235 131.083 92.2449 131.124 92.3085 131.158L94.4995 132.427L92.3259 133.689C92.2681 133.724 92.1467 133.758 91.9906 133.758C91.8345 133.758 91.7131 133.724 91.6553 133.689L89.4643 132.421L91.6379 131.153C91.69 131.124 91.8114 131.083 91.9674 131.083ZM91.9674 130.504C91.742 130.504 91.5165 130.556 91.3431 130.654L88.9267 132.062C88.5856 132.264 88.5856 132.589 88.9325 132.791L91.3605 134.199C91.5339 134.297 91.7593 134.349 91.9848 134.349C92.2102 134.349 92.4357 134.297 92.6091 134.199L95.0255 132.791C95.3666 132.589 95.3666 132.264 95.0197 132.067L92.5918 130.66C92.4241 130.556 92.1929 130.504 91.9674 130.504Z" fill="#706F6F"/>
-<path d="M84.8339 138.217C84.649 138.217 84.4755 138.176 84.3541 138.107L81.9262 136.699C81.8279 136.642 81.8105 136.595 81.8105 136.584C81.8105 136.572 81.8279 136.526 81.9262 136.474L87.0018 133.52C87.1232 133.451 87.2966 133.41 87.4816 133.41C87.6666 133.41 87.84 133.451 87.9672 133.52L90.3951 134.927C90.4934 134.985 90.5107 135.032 90.5107 135.037C90.5107 135.049 90.4934 135.095 90.3951 135.147L85.3195 138.101C85.1923 138.176 85.0189 138.217 84.8339 138.217Z" fill="white"/>
-<path d="M87.4758 133.7C87.6318 133.7 87.7532 133.741 87.8168 133.775L90.0078 135.044L85.175 137.858C85.1172 137.893 84.9958 137.933 84.8397 137.933C84.6836 137.933 84.5622 137.899 84.5044 137.864L82.3134 136.596L87.1462 133.781C87.1983 133.735 87.3197 133.7 87.4758 133.7ZM87.4758 133.121C87.2503 133.121 87.0191 133.173 86.8514 133.272L81.7758 136.225C81.429 136.428 81.4347 136.752 81.7816 136.955L84.2096 138.362C84.383 138.46 84.6084 138.512 84.8339 138.512C85.0594 138.512 85.2906 138.46 85.464 138.362L90.5396 135.409C90.8865 135.206 90.8807 134.882 90.5396 134.679L88.1116 133.272C87.9324 133.173 87.7012 133.121 87.4758 133.121Z" fill="#706F6F"/>
-<path d="M73.4283 133.747C73.2434 133.747 73.0699 133.706 72.9427 133.637L70.5148 132.229C70.4165 132.171 70.3992 132.125 70.3992 132.114C70.3992 132.102 70.4165 132.056 70.5148 132.004L72.9254 130.596C73.0468 130.527 73.2202 130.486 73.4052 130.486C73.5902 130.486 73.7636 130.527 73.8908 130.596L76.3188 132.004C76.417 132.061 76.4344 132.108 76.4344 132.119C76.4344 132.131 76.417 132.177 76.3246 132.229L73.9139 133.637C73.7868 133.706 73.6133 133.747 73.4283 133.747Z" fill="white"/>
-<path d="M73.405 130.776C73.5611 130.776 73.6825 130.817 73.7461 130.852L75.937 132.12L73.7634 133.382C73.7056 133.417 73.5842 133.458 73.4281 133.458C73.2721 133.458 73.1507 133.417 73.0871 133.382L70.8961 132.114L73.0697 130.852C73.1333 130.817 73.2489 130.776 73.405 130.776ZM73.405 130.197C73.1796 130.197 72.9541 130.249 72.7807 130.348L70.3701 131.755C70.0232 131.958 70.029 132.282 70.3758 132.485L72.8038 133.892C72.9772 133.99 73.2027 134.042 73.4339 134.042C73.6594 134.042 73.8906 133.99 74.0582 133.892L76.4689 132.485C76.8099 132.282 76.8099 131.958 76.4631 131.755L74.0351 130.348C73.8617 130.249 73.6305 130.197 73.405 130.197Z" fill="#706F6F"/>
-<path d="M109.368 112.823C109.183 112.823 109.009 112.783 108.882 112.713L106.454 111.306C106.356 111.248 106.339 111.202 106.339 111.19C106.339 111.179 106.356 111.132 106.448 111.08L113.357 107.061C113.478 106.992 113.651 106.951 113.836 106.951C114.021 106.951 114.195 106.992 114.322 107.061L116.75 108.468C116.848 108.526 116.866 108.573 116.866 108.584C116.866 108.596 116.848 108.642 116.75 108.694L109.842 112.713C109.726 112.783 109.553 112.823 109.368 112.823Z" fill="white"/>
-<path d="M113.836 107.241C113.992 107.241 114.114 107.282 114.177 107.316L116.368 108.585L109.703 112.465C109.645 112.499 109.524 112.534 109.368 112.534C109.212 112.534 109.09 112.494 109.027 112.459L106.836 111.191L113.501 107.311C113.559 107.276 113.68 107.241 113.836 107.241ZM113.836 106.662C113.611 106.662 113.385 106.714 113.212 106.813L106.304 110.832C105.963 111.034 105.963 111.359 106.31 111.561L108.738 112.968C108.911 113.067 109.142 113.119 109.368 113.119C109.593 113.119 109.819 113.067 109.992 112.968L116.9 108.95C117.247 108.747 117.241 108.423 116.894 108.22L114.466 106.813C114.293 106.708 114.062 106.662 113.836 106.662Z" fill="#706F6F"/>
-<path d="M83.3016 144.668C83.1166 144.668 82.9432 144.627 82.8218 144.558L80.3881 143.151C80.2898 143.093 80.2725 143.046 80.2725 143.035C80.2725 143.023 80.2898 142.977 80.3823 142.925L87.2904 138.906C87.4118 138.836 87.5853 138.796 87.7702 138.796C87.9552 138.796 88.1287 138.836 88.2501 138.906L90.6838 140.313C90.7821 140.371 90.7994 140.417 90.7994 140.429C90.7994 140.441 90.7821 140.487 90.6896 140.539L83.7814 144.558C83.66 144.627 83.4866 144.668 83.3016 144.668Z" fill="white"/>
-<path d="M87.7705 139.086C87.9265 139.086 88.0479 139.121 88.1057 139.155L90.2967 140.424L83.6314 144.304C83.5736 144.338 83.4522 144.373 83.2961 144.373C83.14 144.373 83.0186 144.338 82.9608 144.304L80.7698 143.035L87.4352 139.155C87.4988 139.121 87.6144 139.086 87.7705 139.086ZM87.7705 138.507C87.545 138.507 87.3196 138.559 87.1461 138.657L80.238 142.676C79.8969 142.879 79.8969 143.203 80.2438 143.4L82.6775 144.807C82.8509 144.906 83.0764 144.958 83.3019 144.958C83.5273 144.958 83.7528 144.906 83.9262 144.807L90.8343 140.788C91.1754 140.586 91.1754 140.262 90.8285 140.065L88.3948 138.657C88.2214 138.559 87.9959 138.507 87.7705 138.507Z" fill="#706F6F"/>
-<path d="M105.466 126.208C105.281 126.208 105.107 126.167 104.986 126.098L102.558 124.69C102.46 124.632 102.442 124.586 102.442 124.575C102.442 124.563 102.46 124.517 102.552 124.464L104.969 123.057C105.09 122.988 105.263 122.947 105.448 122.947C105.633 122.947 105.807 122.988 105.934 123.057L108.362 124.464C108.46 124.522 108.478 124.569 108.478 124.58C108.478 124.592 108.46 124.638 108.368 124.69L105.951 126.098C105.824 126.167 105.651 126.208 105.466 126.208Z" fill="white"/>
-<path d="M105.443 123.242C105.599 123.242 105.72 123.283 105.784 123.317L107.975 124.586L105.801 125.848C105.743 125.883 105.622 125.918 105.466 125.918C105.31 125.918 105.188 125.883 105.131 125.848L102.94 124.58L105.113 123.312C105.171 123.277 105.287 123.242 105.443 123.242ZM105.443 122.663C105.217 122.663 104.992 122.715 104.818 122.814L102.402 124.221C102.061 124.424 102.061 124.748 102.408 124.951L104.836 126.358C105.009 126.456 105.235 126.508 105.46 126.508C105.686 126.508 105.911 126.456 106.084 126.358L108.501 124.951C108.842 124.748 108.842 124.424 108.495 124.227L106.067 122.819C105.899 122.709 105.668 122.663 105.443 122.663Z" fill="#706F6F"/>
-<path d="M100.974 128.824C100.789 128.824 100.615 128.783 100.494 128.714L98.0658 127.307C97.9675 127.249 97.9502 127.202 97.9502 127.191C97.9502 127.179 97.9675 127.133 98.06 127.081L100.471 125.674C100.592 125.604 100.765 125.563 100.95 125.563C101.135 125.563 101.309 125.604 101.436 125.674L103.864 127.081C103.962 127.139 103.98 127.185 103.98 127.197C103.98 127.208 103.962 127.254 103.864 127.307L101.453 128.714C101.332 128.783 101.159 128.824 100.974 128.824Z" fill="white"/>
-<path d="M100.951 125.854C101.107 125.854 101.228 125.894 101.292 125.929L103.483 127.197L101.309 128.465C101.251 128.5 101.13 128.535 100.974 128.535C100.818 128.535 100.696 128.5 100.639 128.465L98.4476 127.197L100.621 125.935C100.673 125.894 100.795 125.854 100.951 125.854ZM100.951 125.274C100.725 125.274 100.5 125.327 100.326 125.425L97.9157 126.832C97.5747 127.035 97.5747 127.359 97.9215 127.562L100.349 128.969C100.523 129.068 100.748 129.12 100.974 129.12C101.199 129.12 101.425 129.068 101.598 128.969L104.009 127.562C104.356 127.359 104.35 127.035 104.009 126.832L101.581 125.425C101.407 125.327 101.182 125.274 100.951 125.274Z" fill="#706F6F"/>
-<path d="M101.269 134.209C101.084 134.209 100.91 134.169 100.789 134.099L98.3551 132.692C98.2568 132.634 98.2395 132.588 98.2395 132.582C98.2395 132.571 98.2568 132.524 98.3551 132.472L114.143 123.282C114.264 123.212 114.437 123.172 114.622 123.172C114.807 123.172 114.981 123.212 115.102 123.282L117.536 124.689C117.634 124.747 117.652 124.793 117.652 124.805C117.652 124.817 117.634 124.863 117.542 124.915L101.754 134.105C101.627 134.169 101.454 134.209 101.269 134.209Z" fill="white"/>
-<path d="M114.622 123.45C114.779 123.45 114.9 123.485 114.958 123.52L117.149 124.788L101.598 133.839C101.54 133.874 101.419 133.914 101.263 133.914C101.107 133.914 100.985 133.88 100.928 133.845L98.7367 132.577L114.287 123.525C114.351 123.491 114.466 123.456 114.622 123.45ZM114.622 122.871C114.397 122.871 114.172 122.923 113.998 123.022L98.2106 132.212C97.8638 132.415 97.8695 132.739 98.2106 132.942L100.644 134.349C100.818 134.447 101.043 134.499 101.269 134.499C101.494 134.499 101.725 134.447 101.899 134.349L117.686 125.159C118.027 124.956 118.027 124.632 117.681 124.435L115.247 123.027C115.079 122.923 114.848 122.871 114.622 122.871Z" fill="#706F6F"/>
-<path d="M73.875 152.382C75.9153 153.558 75.928 155.468 73.9003 156.644C71.8727 157.82 68.5763 157.82 66.536 156.644C64.4958 155.468 64.4873 153.558 66.5149 152.382C68.5425 151.206 71.8348 151.206 73.875 152.382Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M35.2055 75.4088C38.4708 77.3628 38.4895 80.5239 35.2466 82.4779C32.0037 84.4319 26.7246 84.4319 23.4593 82.4779C20.194 80.5239 20.179 77.3628 23.4219 75.4088C26.6648 73.4549 31.9402 73.4549 35.2055 75.4088Z" fill="white" stroke="#706F6F" stroke-miterlimit="10"/>
-<path d="M33.4245 76.8223C35.5151 77.9942 35.5266 79.8925 33.4515 81.0644C31.3764 82.2363 27.9977 82.2363 25.9072 81.0644C23.8167 79.8925 23.809 77.9942 25.884 76.8223C27.9591 75.6504 31.334 75.6504 33.4245 76.8223Z" fill="#EDEDED"/>
-<path d="M24.5883 49.3686L30.3103 46.041C29.5816 46.4652 29.1265 47.3674 29.1265 48.6475C29.1188 51.2232 30.9349 54.3695 33.179 55.6651L27.457 58.9926C25.2129 57.6971 23.3969 54.5546 23.4046 51.9751C23.4046 50.695 23.8595 49.7927 24.5883 49.3686Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M36.0708 55.9504L30.3489 59.2779C29.6086 59.7059 28.5868 59.6481 27.457 58.9965L33.179 55.6689C34.3087 56.3206 35.3305 56.3823 36.0708 55.9504Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M37.9447 59.3432L43.6667 56.0156C43.6474 62.6591 33.6455 76.1236 33.1172 76.8331L27.3953 80.1606C27.9197 79.455 37.9254 65.9906 37.9447 59.3432Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M20.0576 40.5349L25.7796 37.2074C27.6844 36.1008 30.3179 36.255 33.229 37.9361L27.507 41.2637C24.5959 39.5864 21.9585 39.4283 20.0576 40.5349Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M27.5032 41.2641L33.2251 37.9365C39.0088 41.2756 43.6821 49.3728 43.6628 56.0163L37.9408 59.3438C37.96 52.7003 33.2869 44.6032 27.5032 41.2641Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linejoin="round"/>
-<path d="M27.5032 41.264C33.2869 44.6031 37.9601 52.7002 37.9408 59.3437C37.9215 65.9873 27.9196 79.4517 27.3914 80.1612C26.8708 78.8463 16.9807 53.8994 17 47.252C17.0193 40.6046 21.7234 37.9287 27.5032 41.264ZM27.4531 58.9929C29.701 60.2884 31.5248 59.2473 31.5325 56.6678C31.5402 54.0844 29.728 50.9459 27.48 49.6503C25.236 48.3548 23.4083 49.392 23.4006 51.9753C23.3968 54.5549 25.2129 57.7012 27.4531 58.9929Z" fill="#706F6F" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5672 182.287C7.97666 183.78 7.96057 186.205 10.5351 187.698C13.1096 189.192 17.2951 189.192 19.8856 187.698C22.4762 186.205 22.4869 183.78 19.9124 182.287C17.3433 180.794 13.1578 180.794 10.5672 182.287Z" fill="white" stroke="#DA3635" stroke-miterlimit="10"/>
-<path d="M13.1056 158.77C12.8323 159.41 11.7389 159.543 11.5456 158.737C11.4323 158.29 11.3389 158.35 11.0922 157.963C10.8656 157.577 10.5789 157.95 10.3656 157.463C10.0789 156.803 10.1389 154.81 10.6856 154.31C11.1989 153.843 11.599 153.97 12.0856 154.377C12.3256 154.603 12.4523 154.877 12.7123 155.083C12.9056 155.23 13.1923 155.31 13.3523 155.37C14.4589 155.837 13.7056 156.51 13.5456 157.183C13.4789 157.443 13.499 157.823 13.399 158.07C13.2723 158.39 12.999 158.55 12.899 158.843" fill="white"/>
-<path d="M13.1056 158.77C12.8323 159.41 11.7389 159.543 11.5456 158.737C11.4323 158.29 11.3389 158.35 11.0922 157.963C10.8656 157.577 10.5789 157.95 10.3656 157.463C10.0789 156.803 10.1389 154.81 10.6856 154.31C11.1989 153.843 11.599 153.97 12.0856 154.377C12.3256 154.603 12.4523 154.877 12.7123 155.083C12.9056 155.23 13.1923 155.31 13.3523 155.37C14.4589 155.837 13.7056 156.51 13.5456 157.183C13.4789 157.443 13.499 157.823 13.399 158.07C13.2723 158.39 12.999 158.55 12.899 158.843" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1056 158.77C12.8323 159.41 11.7389 159.543 11.5456 158.737C11.4323 158.29 11.3389 158.35 11.0922 157.963C10.8656 157.577 10.5789 157.95 10.3656 157.463C10.0789 156.803 10.1389 154.81 10.6856 154.31C11.1989 153.843 11.599 153.97 12.0856 154.377C12.3256 154.603 12.4523 154.877 12.7123 155.083C12.9056 155.23 13.1923 155.31 13.3523 155.37C14.4589 155.837 13.7056 156.51 13.5456 157.183C13.4789 157.443 13.499 157.823 13.399 158.07C13.2723 158.39 12.999 158.55 12.899 158.843" fill="white"/>
-<path d="M13.1056 158.77C12.8323 159.41 11.7389 159.543 11.5456 158.737C11.4323 158.29 11.3389 158.35 11.0922 157.963C10.8656 157.577 10.5789 157.95 10.3656 157.463C10.0789 156.803 10.1389 154.81 10.6856 154.31C11.1989 153.843 11.599 153.97 12.0856 154.377C12.3256 154.603 12.4523 154.877 12.7123 155.083C12.9056 155.23 13.1923 155.31 13.3523 155.37C14.4589 155.837 13.7056 156.51 13.5456 157.183C13.4789 157.443 13.499 157.823 13.399 158.07C13.2723 158.39 12.999 158.55 12.899 158.843" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.37894 162.983C7.68561 164.203 7.73229 165.73 7.73229 167.143C7.73229 168.703 7.33227 170.15 7.37894 171.69C7.92561 171.803 8.48562 167.723 8.56562 167.123C8.71229 166.177 8.80561 165.143 8.63227 164.217C8.56561 163.83 7.84562 161.883 7.23229 162.69" fill="white"/>
-<path d="M7.37894 162.983C7.68561 164.203 7.73229 165.73 7.73229 167.143C7.73229 168.703 7.33227 170.15 7.37894 171.69C7.92561 171.803 8.48562 167.723 8.56562 167.123C8.71229 166.177 8.80561 165.143 8.63227 164.217C8.56561 163.83 7.84562 161.883 7.23229 162.69" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.37894 162.983C7.68561 164.203 7.73229 165.73 7.73229 167.143C7.73229 168.703 7.33227 170.15 7.37894 171.69C7.92561 171.803 8.48562 167.723 8.56562 167.123C8.71229 166.177 8.80561 165.143 8.63227 164.217C8.56561 163.83 7.84562 161.883 7.23229 162.69" fill="white"/>
-<path d="M7.37894 162.983C7.68561 164.203 7.73229 165.73 7.73229 167.143C7.73229 168.703 7.33227 170.15 7.37894 171.69C7.92561 171.803 8.48562 167.723 8.56562 167.123C8.71229 166.177 8.80561 165.143 8.63227 164.217C8.56561 163.83 7.84562 161.883 7.23229 162.69" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M16.8789 164.557C17.9722 164.397 17.7989 168.51 17.8123 169.33C17.8256 170.263 17.9056 171.017 18.2456 171.903C18.3589 172.177 18.8389 172.897 18.5189 173.19C18.0856 173.59 17.6056 172.837 17.5056 172.497C17.5723 172.837 17.4256 172.85 17.2989 173.03C16.9456 172.37 16.9456 171.343 16.7389 170.617C16.5123 169.783 16.3056 169.01 16.3056 168.143C16.3056 167.163 16.2389 166.197 16.2389 165.25C16.2389 165.043 16.1122 164.223 16.2722 164.077C16.6122 163.77 17.0256 164.257 17.0256 164.61" fill="white"/>
-<path d="M16.8789 164.557C17.9722 164.397 17.7989 168.51 17.8123 169.33C17.8256 170.263 17.9056 171.017 18.2456 171.903C18.3589 172.177 18.8389 172.897 18.5189 173.19C18.0856 173.59 17.6056 172.837 17.5056 172.497C17.5723 172.837 17.4256 172.85 17.2989 173.03C16.9456 172.37 16.9456 171.343 16.7389 170.617C16.5123 169.783 16.3056 169.01 16.3056 168.143C16.3056 167.163 16.2389 166.197 16.2389 165.25C16.2389 165.043 16.1122 164.223 16.2722 164.077C16.6122 163.77 17.0256 164.257 17.0256 164.61" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M16.8789 164.557C17.9722 164.397 17.7989 168.51 17.8123 169.33C17.8256 170.263 17.9056 171.017 18.2456 171.903C18.3589 172.177 18.8389 172.897 18.5189 173.19C18.0856 173.59 17.6056 172.837 17.5056 172.497C17.5723 172.837 17.4256 172.85 17.2989 173.03C16.9456 172.37 16.9456 171.343 16.7389 170.617C16.5123 169.783 16.3056 169.01 16.3056 168.143C16.3056 167.163 16.2389 166.197 16.2389 165.25C16.2389 165.043 16.1122 164.223 16.2722 164.077C16.6122 163.77 17.0256 164.257 17.0256 164.61" fill="white"/>
-<path d="M16.8789 164.557C17.9722 164.397 17.7989 168.51 17.8123 169.33C17.8256 170.263 17.9056 171.017 18.2456 171.903C18.3589 172.177 18.8389 172.897 18.5189 173.19C18.0856 173.59 17.6056 172.837 17.5056 172.497C17.5723 172.837 17.4256 172.85 17.2989 173.03C16.9456 172.37 16.9456 171.343 16.7389 170.617C16.5123 169.783 16.3056 169.01 16.3056 168.143C16.3056 167.163 16.2389 166.197 16.2389 165.25C16.2389 165.043 16.1122 164.223 16.2722 164.077C16.6122 163.77 17.0256 164.257 17.0256 164.61" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.6589 177.043C16.0589 177.523 16.4922 178.023 16.9455 178.476C17.6722 179.216 17.7189 179.743 17.6722 180.789C17.6056 181.756 16.5122 183.136 16.6722 181.429C16.7522 180.576 16.7722 180.656 16.1122 180.223C15.4522 179.789 14.5055 179.036 14.1322 178.323C13.5855 177.263 15.1455 176.056 15.8189 176.969" fill="white"/>
-<path d="M15.6589 177.043C16.0589 177.523 16.4922 178.023 16.9455 178.476C17.6722 179.216 17.7189 179.743 17.6722 180.789C17.6056 181.756 16.5122 183.136 16.6722 181.429C16.7522 180.576 16.7722 180.656 16.1122 180.223C15.4522 179.789 14.5055 179.036 14.1322 178.323C13.5855 177.263 15.1455 176.056 15.8189 176.969" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.6589 177.043C16.0589 177.523 16.4922 178.023 16.9455 178.476C17.6722 179.216 17.7189 179.743 17.6722 180.789C17.6056 181.756 16.5122 183.136 16.6722 181.429C16.7522 180.576 16.7722 180.656 16.1122 180.223C15.4522 179.789 14.5055 179.036 14.1322 178.323C13.5855 177.263 15.1455 176.056 15.8189 176.969" fill="white"/>
-<path d="M15.6589 177.043C16.0589 177.523 16.4922 178.023 16.9455 178.476C17.6722 179.216 17.7189 179.743 17.6722 180.789C17.6056 181.756 16.5122 183.136 16.6722 181.429C16.7522 180.576 16.7722 180.656 16.1122 180.223C15.4522 179.789 14.5055 179.036 14.1322 178.323C13.5855 177.263 15.1455 176.056 15.8189 176.969" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.3855 177.336C10.3855 178.896 10.1788 180.436 10.1121 182.016C10.0788 182.79 10.1921 183.703 10.1121 184.456C10.0321 185.276 9.17882 185.776 8.53882 186.323C8.05882 185.763 8.73213 184.476 8.76546 183.77C8.83213 182.63 8.53881 181.55 8.36548 180.443C8.26548 179.783 7.72547 177.87 8.10547 177.23C8.7188 176.203 10.1655 177.163 10.4055 177.983" fill="white"/>
-<path d="M10.3855 177.336C10.3855 178.896 10.1788 180.436 10.1121 182.016C10.0788 182.79 10.1921 183.703 10.1121 184.456C10.0321 185.276 9.17882 185.776 8.53882 186.323C8.05882 185.763 8.73213 184.476 8.76546 183.77C8.83213 182.63 8.53881 181.55 8.36548 180.443C8.26548 179.783 7.72547 177.87 8.10547 177.23C8.7188 176.203 10.1655 177.163 10.4055 177.983" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.3855 177.336C10.3855 178.896 10.1788 180.436 10.1121 182.016C10.0788 182.79 10.1921 183.703 10.1121 184.456C10.0321 185.276 9.17882 185.776 8.53882 186.323C8.05882 185.763 8.73213 184.476 8.76546 183.77C8.83213 182.63 8.53881 181.55 8.36548 180.443C8.26548 179.783 7.72547 177.87 8.10547 177.23C8.7188 176.203 10.1655 177.163 10.4055 177.983" fill="white"/>
-<path d="M10.3855 177.336C10.3855 178.896 10.1788 180.436 10.1121 182.016C10.0788 182.79 10.1921 183.703 10.1121 184.456C10.0321 185.276 9.17882 185.776 8.53882 186.323C8.05882 185.763 8.73213 184.476 8.76546 183.77C8.83213 182.63 8.53881 181.55 8.36548 180.443C8.26548 179.783 7.72547 177.87 8.10547 177.23C8.7188 176.203 10.1655 177.163 10.4055 177.983" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.6723 179.183C18.8456 179.309 17.8989 182.669 17.0589 182.989C16.1456 183.343 16.7856 181.829 16.9656 181.383C17.1922 180.789 17.6389 179.649 17.5922 179.036" fill="white"/>
-<path d="M17.6723 179.183C18.8456 179.309 17.8989 182.669 17.0589 182.989C16.1456 183.343 16.7856 181.829 16.9656 181.383C17.1922 180.789 17.6389 179.649 17.5922 179.036" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.6723 179.183C18.8456 179.309 17.8989 182.669 17.0589 182.989C16.1456 183.343 16.7856 181.829 16.9656 181.383C17.1922 180.789 17.6389 179.649 17.5922 179.036" fill="white"/>
-<path d="M17.6723 179.183C18.8456 179.309 17.8989 182.669 17.0589 182.989C16.1456 183.343 16.7856 181.829 16.9656 181.383C17.1922 180.789 17.6389 179.649 17.5922 179.036" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.159 184.116C10.7723 185.196 10.059 186.256 9.07897 186.896C8.64563 187.182 7.98561 187.522 7.72561 186.896C7.49895 186.336 8.17891 185.496 8.35224 184.996C8.33891 187.116 9.75229 184.869 10.1523 184.062C10.299 184.142 10.2523 184.209 10.2789 184.336" fill="white"/>
-<path d="M10.159 184.116C10.7723 185.196 10.059 186.256 9.07897 186.896C8.64563 187.182 7.98561 187.522 7.72561 186.896C7.49895 186.336 8.17891 185.496 8.35224 184.996C8.33891 187.116 9.75229 184.869 10.1523 184.062C10.299 184.142 10.2523 184.209 10.2789 184.336" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.159 184.116C10.7723 185.196 10.059 186.256 9.07897 186.896C8.64563 187.182 7.98561 187.522 7.72561 186.896C7.49895 186.336 8.17891 185.496 8.35224 184.996C8.33891 187.116 9.75229 184.869 10.1523 184.062C10.299 184.142 10.2523 184.209 10.2789 184.336" fill="white"/>
-<path d="M10.159 184.116C10.7723 185.196 10.059 186.256 9.07897 186.896C8.64563 187.182 7.98561 187.522 7.72561 186.896C7.49895 186.336 8.17891 185.496 8.35224 184.996C8.33891 187.116 9.75229 184.869 10.1523 184.062C10.299 184.142 10.2523 184.209 10.2789 184.336" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.6987 169.909C24.1187 170.103 23.9121 170.923 24.0055 171.449C24.0721 171.789 24.2121 172.009 24.2321 172.383C24.2454 172.689 24.1187 173.216 24.3787 173.396C24.6387 173.576 25.2321 173.296 25.3921 173.089C25.6988 172.669 25.5188 172.449 25.5055 172.043C25.4921 171.596 26.1987 171.463 26.0187 170.996C25.8521 170.603 25.1321 169.703 24.6987 169.909Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.6521 175.409C27.4921 176.163 27.5054 177.003 27.4454 177.756C27.3787 178.369 27.6387 179.843 27.2854 180.329C26.5121 181.409 26.3187 179.109 26.2854 178.689C26.1921 177.629 26.5254 176.843 26.592 175.829" fill="white"/>
-<path d="M27.6521 175.409C27.4921 176.163 27.5054 177.003 27.4454 177.756C27.3787 178.369 27.6387 179.843 27.2854 180.329C26.5121 181.409 26.3187 179.109 26.2854 178.689C26.1921 177.629 26.5254 176.843 26.592 175.829" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.6521 175.409C27.4921 176.163 27.5054 177.003 27.4454 177.756C27.3787 178.369 27.6387 179.843 27.2854 180.329C26.5121 181.409 26.3187 179.109 26.2854 178.689C26.1921 177.629 26.5254 176.843 26.592 175.829" fill="white"/>
-<path d="M27.6521 175.409C27.4921 176.163 27.5054 177.003 27.4454 177.756C27.3787 178.369 27.6387 179.843 27.2854 180.329C26.5121 181.409 26.3187 179.109 26.2854 178.689C26.1921 177.629 26.5254 176.843 26.592 175.829" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M26.3854 181.549C26.3721 181.709 26.3987 181.903 26.4654 182.029C27.3987 182.256 29.9054 182.463 29.1521 183.669C28.6187 183.716 27.9921 183.383 27.4654 183.249C26.9054 183.103 26.2921 183.103 25.7321 182.943C25.1187 182.783 24.7988 182.463 25.0054 181.756C25.1188 181.356 25.0854 181.243 25.6187 181.256C25.9254 181.269 26.1654 181.209 26.2321 181.609" fill="white"/>
-<path d="M26.3854 181.549C26.3721 181.709 26.3987 181.903 26.4654 182.029C27.3987 182.256 29.9054 182.463 29.1521 183.669C28.6187 183.716 27.9921 183.383 27.4654 183.249C26.9054 183.103 26.2921 183.103 25.7321 182.943C25.1187 182.783 24.7988 182.463 25.0054 181.756C25.1188 181.356 25.0854 181.243 25.6187 181.256C25.9254 181.269 26.1654 181.209 26.2321 181.609" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M26.3854 181.549C26.3721 181.709 26.3987 181.903 26.4654 182.029C27.3987 182.256 29.9054 182.463 29.1521 183.669C28.6187 183.716 27.9921 183.383 27.4654 183.249C26.9054 183.103 26.2921 183.103 25.7321 182.943C25.1187 182.783 24.7988 182.463 25.0054 181.756C25.1188 181.356 25.0854 181.243 25.6187 181.256C25.9254 181.269 26.1654 181.209 26.2321 181.609" fill="white"/>
-<path d="M26.3854 181.549C26.3721 181.709 26.3987 181.903 26.4654 182.029C27.3987 182.256 29.9054 182.463 29.1521 183.669C28.6187 183.716 27.9921 183.383 27.4654 183.249C26.9054 183.103 26.2921 183.103 25.7321 182.943C25.1187 182.783 24.7988 182.463 25.0054 181.756C25.1188 181.356 25.0854 181.243 25.6187 181.256C25.9254 181.269 26.1654 181.209 26.2321 181.609" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M23.9388 181.55C24.2121 181.903 24.0188 183.417 24.0055 184.023C23.9922 185.003 24.0188 186.27 22.8655 186.19C22.8321 185.083 22.8788 183.99 22.9321 182.897C22.9454 182.543 22.7522 181.657 22.9188 181.383C23.1655 181.03 23.9388 180.937 23.9388 181.55Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.2122 182.976C29.9522 182.043 29.9389 183.796 29.6589 184.276C29.0189 185.436 29.0989 183.15 29.2255 182.91" fill="white"/>
-<path d="M29.2122 182.976C29.9522 182.043 29.9389 183.796 29.6589 184.276C29.0189 185.436 29.0989 183.15 29.2255 182.91" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.2122 182.976C29.9522 182.043 29.9389 183.796 29.6589 184.276C29.0189 185.436 29.0989 183.15 29.2255 182.91" fill="white"/>
-<path d="M29.2122 182.976C29.9522 182.043 29.9389 183.796 29.6589 184.276C29.0189 185.436 29.0989 183.15 29.2255 182.91" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.4455 158.417C10.4655 158.417 9.38549 158.27 8.72549 159.137C8.29215 159.717 6.99218 161.583 7.08551 162.27C7.17885 162.997 8.22545 163.25 8.35879 164.003C8.48545 164.73 8.34547 165.87 8.29214 166.61C8.16547 168.51 7.67883 170.323 7.65216 172.25C7.63883 173.277 7.17215 174.277 7.21881 175.27C7.25215 175.963 7.83211 177.31 8.51878 177.583C9.03211 177.777 9.3388 177.437 9.79214 177.357C10.2921 177.29 10.5188 177.47 10.9521 177.677C12.2255 178.317 13.2655 178.483 14.4721 177.61C14.8921 177.323 15.2122 177.03 15.6588 176.79C16.2722 176.483 16.4788 176.597 16.5121 175.743C16.5788 174.923 16.4654 174.103 16.5121 173.297C16.5788 172.19 16.1122 171.017 15.8988 169.923C15.6722 168.637 15.8322 167.817 16.0788 166.563C16.1455 166.243 15.9988 165.323 16.2588 165.103C16.5988 164.797 17.3521 165.377 17.7188 165.037C18.3455 164.503 16.8655 162.11 16.3988 161.617C15.6255 160.763 14.6655 159.803 13.7788 159.09C13.6788 159.023 13.3455 158.737 13.2188 158.723C12.7521 158.657 13.0588 158.823 12.7188 158.95C12.1388 159.257 11.7855 159.27 11.4455 158.417Z" fill="white" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.45217 158.917C9.4655 158.77 9.59885 158.757 9.46551 158.643C9.99885 161.697 11.8922 164.463 13.1655 167.29C13.3922 167.803 13.7255 168.783 14.2455 169.01C14.7589 169.217 15.7255 168.997 16.2588 168.93C17.3521 168.817 17.1121 169.41 17.2588 170.363C17.4188 171.443 17.7055 171.857 16.3255 171.923C15.4722 171.97 14.0255 172.21 13.5455 171.363C13.0455 170.497 13.1922 169.13 14.2722 169.117C13.6322 168.957 12.9988 167.43 12.5188 166.677C11.9722 165.81 11.5722 164.617 10.9922 163.77C10.3189 162.803 9.51219 161.583 9.14553 160.457C9.01886 160.057 8.66553 158.11 9.56553 158.577" fill="white"/>
-<path d="M9.45217 158.917C9.4655 158.77 9.59885 158.757 9.46551 158.643C9.99885 161.697 11.8922 164.463 13.1655 167.29C13.3922 167.803 13.7255 168.783 14.2455 169.01C14.7589 169.217 15.7255 168.997 16.2588 168.93C17.3521 168.817 17.1121 169.41 17.2588 170.363C17.4188 171.443 17.7055 171.857 16.3255 171.923C15.4722 171.97 14.0255 172.21 13.5455 171.363C13.0455 170.497 13.1922 169.13 14.2722 169.117C13.6322 168.957 12.9988 167.43 12.5188 166.677C11.9722 165.81 11.5722 164.617 10.9922 163.77C10.3189 162.803 9.51219 161.583 9.14553 160.457C9.01886 160.057 8.66553 158.11 9.56553 158.577" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.45217 158.917C9.4655 158.77 9.59885 158.757 9.46551 158.643C9.99885 161.697 11.8922 164.463 13.1655 167.29C13.3922 167.803 13.7255 168.783 14.2455 169.01C14.7589 169.217 15.7255 168.997 16.2588 168.93C17.3521 168.817 17.1121 169.41 17.2588 170.363C17.4188 171.443 17.7055 171.857 16.3255 171.923C15.4722 171.97 14.0255 172.21 13.5455 171.363C13.0455 170.497 13.1922 169.13 14.2722 169.117C13.6322 168.957 12.9988 167.43 12.5188 166.677C11.9722 165.81 11.5722 164.617 10.9922 163.77C10.3189 162.803 9.51219 161.583 9.14553 160.457C9.01886 160.057 8.66553 158.11 9.56553 158.577" fill="white"/>
-<path d="M9.45217 158.917C9.4655 158.77 9.59885 158.757 9.46551 158.643C9.99885 161.697 11.8922 164.463 13.1655 167.29C13.3922 167.803 13.7255 168.783 14.2455 169.01C14.7589 169.217 15.7255 168.997 16.2588 168.93C17.3521 168.817 17.1121 169.41 17.2588 170.363C17.4188 171.443 17.7055 171.857 16.3255 171.923C15.4722 171.97 14.0255 172.21 13.5455 171.363C13.0455 170.497 13.1922 169.13 14.2722 169.117C13.6322 168.957 12.9988 167.43 12.5188 166.677C11.9722 165.81 11.5722 164.617 10.9922 163.77C10.3189 162.803 9.51219 161.583 9.14553 160.457C9.01886 160.057 8.66553 158.11 9.56553 158.577" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.0254 155.556C12.9921 155.783 12.8788 156.036 12.7521 156.196C12.7188 155.41 12.2388 154.49 11.4654 154.17C10.4721 153.77 10.5321 154.683 10.4388 155.436C10.3588 156.243 10.1654 157.03 10.8721 157.576C11.1321 157.77 11.8522 157.756 11.3388 158.19C11.1122 158.383 10.5321 158.123 10.2321 158.383C10.0521 157.903 10.1388 157.47 9.89212 156.97C9.65212 156.436 9.27881 155.943 9.41214 155.33C9.63881 154.35 11.1655 153.416 12.0788 153.21C13.3988 152.903 14.1054 154.316 14.3588 155.443C14.5054 156.103 14.4254 156.423 14.9521 156.903C15.4988 157.403 16.1921 157.676 16.7054 158.256C17.5254 159.17 17.6721 160.89 16.6388 161.73C16.1588 161.07 15.4321 160.783 14.8055 160.283C14.3521 159.93 13.3388 159.303 13.0855 158.836C12.7655 158.243 13.0721 157.456 13.3255 156.99C13.4721 156.73 13.8587 156.396 13.7587 156.056C13.6454 155.716 13.2454 155.576 13.0187 155.83" fill="white"/>
-<path d="M13.0254 155.556C12.9921 155.783 12.8788 156.036 12.7521 156.196C12.7188 155.41 12.2388 154.49 11.4654 154.17C10.4721 153.77 10.5321 154.683 10.4388 155.436C10.3588 156.243 10.1654 157.03 10.8721 157.576C11.1321 157.77 11.8522 157.756 11.3388 158.19C11.1122 158.383 10.5321 158.123 10.2321 158.383C10.0521 157.903 10.1388 157.47 9.89212 156.97C9.65212 156.436 9.27881 155.943 9.41214 155.33C9.63881 154.35 11.1655 153.416 12.0788 153.21C13.3988 152.903 14.1054 154.316 14.3588 155.443C14.5054 156.103 14.4254 156.423 14.9521 156.903C15.4988 157.403 16.1921 157.676 16.7054 158.256C17.5254 159.17 17.6721 160.89 16.6388 161.73C16.1588 161.07 15.4321 160.783 14.8055 160.283C14.3521 159.93 13.3388 159.303 13.0855 158.836C12.7655 158.243 13.0721 157.456 13.3255 156.99C13.4721 156.73 13.8587 156.396 13.7587 156.056C13.6454 155.716 13.2454 155.576 13.0187 155.83" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.0254 155.556C12.9921 155.783 12.8788 156.036 12.7521 156.196C12.7188 155.41 12.2388 154.49 11.4654 154.17C10.4721 153.77 10.5321 154.683 10.4388 155.436C10.3588 156.243 10.1654 157.03 10.8721 157.576C11.1321 157.77 11.8522 157.756 11.3388 158.19C11.1122 158.383 10.5321 158.123 10.2321 158.383C10.0521 157.903 10.1388 157.47 9.89212 156.97C9.65212 156.436 9.27881 155.943 9.41214 155.33C9.63881 154.35 11.1655 153.416 12.0788 153.21C13.3988 152.903 14.1054 154.316 14.3588 155.443C14.5054 156.103 14.4254 156.423 14.9521 156.903C15.4988 157.403 16.1921 157.676 16.7054 158.256C17.5254 159.17 17.6721 160.89 16.6388 161.73C16.1588 161.07 15.4321 160.783 14.8055 160.283C14.3521 159.93 13.3388 159.303 13.0855 158.836C12.7655 158.243 13.0721 157.456 13.3255 156.99C13.4721 156.73 13.8587 156.396 13.7587 156.056C13.6454 155.716 13.2454 155.576 13.0187 155.83" fill="#DA3635"/>
-<path d="M13.0254 155.556C12.9921 155.783 12.8788 156.036 12.7521 156.196C12.7188 155.41 12.2388 154.49 11.4654 154.17C10.4721 153.77 10.5321 154.683 10.4388 155.436C10.3588 156.243 10.1654 157.03 10.8721 157.576C11.1321 157.77 11.8522 157.756 11.3388 158.19C11.1122 158.383 10.5321 158.123 10.2321 158.383C10.0521 157.903 10.1388 157.47 9.89212 156.97C9.65212 156.436 9.27881 155.943 9.41214 155.33C9.63881 154.35 11.1655 153.416 12.0788 153.21C13.3988 152.903 14.1054 154.316 14.3588 155.443C14.5054 156.103 14.4254 156.423 14.9521 156.903C15.4988 157.403 16.1921 157.676 16.7054 158.256C17.5254 159.17 17.6721 160.89 16.6388 161.73C16.1588 161.07 15.4321 160.783 14.8055 160.283C14.3521 159.93 13.3388 159.303 13.0855 158.836C12.7655 158.243 13.0721 157.456 13.3255 156.99C13.4721 156.73 13.8587 156.396 13.7587 156.056C13.6454 155.716 13.2454 155.576 13.0187 155.83" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M25.5322 172.897C25.7255 173.443 26.4455 173.41 26.8655 173.75C27.1855 174.023 27.6722 174.443 27.6522 175.15C27.6389 175.73 27.1389 175.55 26.8789 175.923C26.7189 176.163 26.7989 177.063 26.7322 177.383C26.6522 177.863 26.6056 178.283 26.5856 178.783C26.5523 179.717 26.7456 180.583 26.7322 181.517C26.4589 181.617 25.1256 181.857 24.8856 181.677C24.5789 181.45 24.6922 180.197 24.6589 179.843C24.5789 180.197 24.5589 181.063 24.3056 181.323C24.0456 181.597 23.1322 181.757 22.9056 181.53C22.6189 181.223 22.8922 179.603 22.8589 179.183C22.8455 178.59 22.7589 177.997 22.7122 177.417C22.5989 176.15 22.1989 174.457 22.7789 173.27C23.0522 172.71 23.6322 172.29 24.1922 172.63C24.5122 172.823 24.2055 173.29 24.8522 173.323C25.0322 173.337 25.3322 172.983 25.4122 172.97" fill="white"/>
-<path d="M25.5322 172.897C25.7255 173.443 26.4455 173.41 26.8655 173.75C27.1855 174.023 27.6722 174.443 27.6522 175.15C27.6389 175.73 27.1389 175.55 26.8789 175.923C26.7189 176.163 26.7989 177.063 26.7322 177.383C26.6522 177.863 26.6056 178.283 26.5856 178.783C26.5523 179.717 26.7456 180.583 26.7322 181.517C26.4589 181.617 25.1256 181.857 24.8856 181.677C24.5789 181.45 24.6922 180.197 24.6589 179.843C24.5789 180.197 24.5589 181.063 24.3056 181.323C24.0456 181.597 23.1322 181.757 22.9056 181.53C22.6189 181.223 22.8922 179.603 22.8589 179.183C22.8455 178.59 22.7589 177.997 22.7122 177.417C22.5989 176.15 22.1989 174.457 22.7789 173.27C23.0522 172.71 23.6322 172.29 24.1922 172.63C24.5122 172.823 24.2055 173.29 24.8522 173.323C25.0322 173.337 25.3322 172.983 25.4122 172.97" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M25.5322 172.897C25.7255 173.443 26.4455 173.41 26.8655 173.75C27.1855 174.023 27.6722 174.443 27.6522 175.15C27.6389 175.73 27.1389 175.55 26.8789 175.923C26.7189 176.163 26.7989 177.063 26.7322 177.383C26.6522 177.863 26.6056 178.283 26.5856 178.783C26.5523 179.717 26.7456 180.583 26.7322 181.517C26.4589 181.617 25.1256 181.857 24.8856 181.677C24.5789 181.45 24.6922 180.197 24.6589 179.843C24.5789 180.197 24.5589 181.063 24.3056 181.323C24.0456 181.597 23.1322 181.757 22.9056 181.53C22.6189 181.223 22.8922 179.603 22.8589 179.183C22.8455 178.59 22.7589 177.997 22.7122 177.417C22.5989 176.15 22.1989 174.457 22.7789 173.27C23.0522 172.71 23.6322 172.29 24.1922 172.63C24.5122 172.823 24.2055 173.29 24.8522 173.323C25.0322 173.337 25.3322 172.983 25.4122 172.97" fill="white"/>
-<path d="M25.5322 172.897C25.7255 173.443 26.4455 173.41 26.8655 173.75C27.1855 174.023 27.6722 174.443 27.6522 175.15C27.6389 175.73 27.1389 175.55 26.8789 175.923C26.7189 176.163 26.7989 177.063 26.7322 177.383C26.6522 177.863 26.6056 178.283 26.5856 178.783C26.5523 179.717 26.7456 180.583 26.7322 181.517C26.4589 181.617 25.1256 181.857 24.8856 181.677C24.5789 181.45 24.6922 180.197 24.6589 179.843C24.5789 180.197 24.5589 181.063 24.3056 181.323C24.0456 181.597 23.1322 181.757 22.9056 181.53C22.6189 181.223 22.8922 179.603 22.8589 179.183C22.8455 178.59 22.7589 177.997 22.7122 177.417C22.5989 176.15 22.1989 174.457 22.7789 173.27C23.0522 172.71 23.6322 172.29 24.1922 172.63C24.5122 172.823 24.2055 173.29 24.8522 173.323C25.0322 173.337 25.3322 172.983 25.4122 172.97" stroke="#706F6F" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.4388 168.77C24.9055 168.996 24.7455 169.496 25.0788 169.75C25.4322 170.023 25.8654 169.763 26.2654 170.25C27.0188 171.15 26.3655 171.983 25.3655 172.196C25.3655 172.196 24.2721 171.456 24.5455 170.043C24.4521 169.636 24.2788 169.136 24.4388 168.77Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.7856 131.985L15.511 129.82C15.9124 129.585 16.1695 129.094 16.2913 128.336L12.5658 130.501C12.4441 131.259 12.1825 131.75 11.7856 131.985Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M21.9697 141.037L25.6951 138.872C25.6184 138.917 25.5417 138.958 25.4605 138.998C24.4502 139.503 23.2641 139.643 21.902 139.409C20.5444 139.179 19.0831 138.61 17.5226 137.708C15.8629 136.752 14.4016 135.701 13.1297 134.551C11.8623 133.401 10.7618 132.242 9.84177 131.069C9.6794 130.862 9.53057 130.722 9.39978 130.645C9.25996 130.564 9.14268 130.555 9.04797 130.609L5.32261 132.774C5.41733 132.72 5.53455 132.729 5.67436 132.81C5.80516 132.887 5.95399 133.027 6.11635 133.234C7.04094 134.407 8.13694 135.566 9.40881 136.716C10.6807 137.862 12.142 138.917 13.8017 139.873C15.3622 140.775 16.819 141.339 18.1811 141.574C19.5387 141.808 20.7248 141.668 21.7396 141.163C21.8163 141.123 21.893 141.082 21.9697 141.037Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.4147 129.5L14.1401 127.335C14.1176 127.348 14.095 127.357 14.0725 127.366C13.9011 127.439 13.7072 127.443 13.4817 127.375C13.2607 127.308 13.0216 127.204 12.769 127.06C12.2323 126.753 11.7272 126.284 11.2491 125.657C10.771 125.03 10.3471 124.29 9.98628 123.438C9.62546 122.59 9.33679 121.652 9.12481 120.633C8.91284 119.613 8.80913 118.558 8.81364 117.471C8.81815 115.744 9.06622 114.364 9.55332 113.344C9.97727 112.456 10.541 111.806 11.2356 111.4L7.51019 113.565C6.81111 113.971 6.25186 114.616 5.8279 115.509C5.33629 116.533 5.09273 117.909 5.08822 119.636C5.08371 120.727 5.18742 121.783 5.3994 122.798C5.61138 123.817 5.89553 124.751 6.26086 125.603C6.62618 126.451 7.04565 127.191 7.52373 127.822C8.00181 128.449 8.50695 128.918 9.04366 129.225C9.29172 129.369 9.53074 129.477 9.75625 129.54C9.98176 129.608 10.1757 129.603 10.3471 129.531C10.3696 129.522 10.3922 129.513 10.4147 129.5Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.8925 133.586L21.6179 131.421C21.2661 131.624 20.7835 131.552 20.1701 131.196C19.8319 131.002 19.4891 130.74 19.1463 130.415C18.8035 130.095 18.4743 129.685 18.1496 129.184C17.8293 128.684 17.5362 128.088 17.2701 127.394C17.004 126.704 16.783 125.896 16.5981 124.972L12.8727 127.137C13.0576 128.061 13.2786 128.868 13.5447 129.559C13.8108 130.253 14.1039 130.848 14.4241 131.349C14.7444 131.85 15.0781 132.26 15.4209 132.58C15.7637 132.905 16.1064 133.162 16.4447 133.361C17.0536 133.717 17.5362 133.789 17.8925 133.586Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8726 127.136L16.5935 124.976L15.3667 118.711L11.6413 120.876L12.8726 127.136Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M19.6919 136.287L23.4173 134.122C23.494 134.077 23.5707 134.023 23.6428 133.964C23.9676 133.694 24.2066 133.292 24.369 132.756C24.5313 132.219 24.608 131.588 24.6125 130.861C24.617 129.797 24.4411 128.62 24.0893 127.33C23.7375 126.04 23.2144 124.759 22.5198 123.487C21.8252 122.215 20.9547 120.998 19.9174 119.848C18.8801 118.693 17.6758 117.723 16.3138 116.939C15.5831 116.515 14.9427 116.212 14.3879 116.027C13.8377 115.843 13.3145 115.73 12.8229 115.698L9.09748 117.863C9.58909 117.895 10.1123 118.007 10.6625 118.192C11.2127 118.377 11.8577 118.684 12.5884 119.103C13.9504 119.888 15.1546 120.858 16.192 122.012C17.2293 123.163 18.0998 124.376 18.7944 125.652C19.4889 126.929 20.0121 128.209 20.3639 129.495C20.7157 130.785 20.887 131.962 20.887 133.026C20.887 133.753 20.8059 134.384 20.6435 134.921C20.4812 135.457 20.2421 135.859 19.9174 136.129C19.8452 136.188 19.7686 136.242 19.6919 136.287Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M23.5708 143.418L27.2962 141.253C28.3696 140.631 29.222 139.629 29.8579 138.258C30.5435 136.77 30.8908 134.84 30.8998 132.458C30.9043 131.092 30.7555 129.689 30.4623 128.25C30.1692 126.811 29.7452 125.386 29.204 123.975C28.6627 122.563 28.0088 121.183 27.2511 119.834C26.4934 118.486 25.6409 117.218 24.7073 116.032C23.7692 114.846 22.7634 113.759 21.6855 112.78C20.6075 111.802 19.4755 110.967 18.2983 110.286C17.2971 109.709 16.3139 109.267 15.3532 108.965C14.3925 108.662 13.486 108.505 12.6245 108.5C11.7676 108.496 10.9783 108.644 10.2567 108.951C10.0718 109.028 9.89585 109.118 9.72446 109.217L5.9991 111.382C6.17049 111.283 6.34636 111.193 6.53127 111.116C7.2529 110.814 8.04218 110.665 8.89912 110.665C9.75605 110.669 10.6671 110.827 11.6278 111.13C12.5885 111.432 13.5716 111.874 14.5729 112.451C15.7501 113.132 16.8821 113.962 17.9601 114.945C19.038 115.924 20.0483 117.011 20.9819 118.197C21.92 119.383 22.768 120.651 23.5257 121.999C24.2879 123.348 24.9373 124.728 25.4786 126.139C26.0198 127.551 26.4392 128.976 26.7369 130.415C27.0346 131.854 27.1789 133.256 27.1744 134.623C27.1699 137.004 26.8226 138.939 26.1325 140.423C25.4966 141.799 24.6397 142.796 23.5708 143.418Z" fill="white" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.09755 117.859L10.5994 125.521C10.8024 126.581 10.9061 127.42 10.9016 128.029C10.9016 128.48 10.852 128.827 10.7528 129.062C10.6535 129.301 10.5182 129.454 10.3513 129.526C10.18 129.599 9.98604 129.603 9.76053 129.535C9.53954 129.468 9.30046 129.364 9.04789 129.22C8.51118 128.913 8.00604 128.444 7.52796 127.817C7.04988 127.19 6.62596 126.45 6.26514 125.598C5.90433 124.75 5.61566 123.812 5.40368 122.793C5.1917 121.773 5.088 120.718 5.09251 119.631C5.09702 117.904 5.34508 116.523 5.83218 115.504C6.31928 114.48 6.99128 113.777 7.83919 113.398C8.68711 113.015 9.68387 112.938 10.8385 113.168C11.9886 113.398 13.2334 113.903 14.5639 114.67C16.0252 115.513 17.3918 116.623 18.6681 117.998C19.9445 119.374 21.054 120.903 21.9967 122.576C22.9438 124.254 23.688 126.022 24.2292 127.876C24.7704 129.729 25.0365 131.569 25.032 133.387C25.0275 135.516 24.7298 137.221 24.139 138.493C23.5527 139.764 22.7498 140.657 21.7395 141.163C20.7293 141.668 19.5431 141.808 18.181 141.573C16.8234 141.343 15.3622 140.775 13.8016 139.873C12.1419 138.917 10.6806 137.866 9.40873 136.716C8.14137 135.565 7.04086 134.406 6.11627 133.234C5.95391 133.026 5.80508 132.886 5.67428 132.81C5.44426 132.679 5.27738 132.733 5.16463 132.968L4.75424 133.973C5.91787 135.547 7.24384 137.022 8.7322 138.393C10.2206 139.764 11.9074 141 13.7926 142.087C15.6824 143.179 17.4369 143.846 19.0605 144.094C20.6887 144.342 22.1004 144.162 23.3001 143.558C24.4998 142.949 25.4425 141.902 26.128 140.418C26.8135 138.93 27.1608 137 27.1698 134.618C27.1743 133.252 27.0255 131.849 26.7323 130.41C26.4392 128.972 26.0152 127.546 25.474 126.135C24.9328 124.723 24.2788 123.343 23.5211 121.994C22.7634 120.646 21.911 119.378 20.9774 118.192C20.0392 117.006 19.0334 115.919 17.9555 114.94C16.8776 113.962 15.7456 113.127 14.5684 112.446C13.5671 111.869 12.5839 111.427 11.6232 111.125C10.6626 110.823 9.756 110.665 8.89456 110.66C8.03762 110.656 7.24834 110.805 6.52671 111.111C5.80508 111.418 5.18268 111.887 4.66401 112.523C4.14534 113.159 3.73493 113.962 3.44176 114.945C3.1486 115.924 2.99978 117.083 2.99978 118.427C2.99527 119.78 3.15761 121.128 3.48686 122.463C3.8161 123.803 4.27164 125.061 4.85345 126.234C5.43527 127.411 6.12079 128.466 6.91007 129.396C7.69935 130.329 8.55179 131.06 9.46736 131.588C10.3198 132.079 11.0098 132.246 11.5465 132.079C12.0833 131.917 12.4215 131.389 12.5659 130.492C13.1973 131.872 13.8829 132.995 14.6225 133.861C15.3622 134.727 16.1605 135.408 17.0084 135.895C17.6623 136.274 18.2306 136.472 18.7087 136.495C19.1913 136.513 19.5927 136.391 19.913 136.116C20.2377 135.845 20.4767 135.444 20.6391 134.907C20.8015 134.37 20.8781 133.739 20.8827 133.013C20.8872 131.948 20.7113 130.771 20.3595 129.481C20.0077 128.191 19.4845 126.91 18.7899 125.639C18.0954 124.367 17.2249 123.149 16.1875 121.999C15.1502 120.844 13.946 119.875 12.5839 119.09C11.8533 118.666 11.2128 118.364 10.6581 118.179C10.1078 118.003 9.58916 117.895 9.09755 117.859ZM12.8726 127.136L11.6458 120.876C12.0697 121.007 12.5343 121.219 13.0349 121.507C13.8513 121.981 14.6045 122.612 15.2855 123.402C15.9665 124.186 16.5484 125.043 17.04 125.968C17.5271 126.888 17.9104 127.844 18.1855 128.832C18.4606 129.82 18.596 130.744 18.596 131.61C18.5915 132.512 18.4111 133.13 18.0502 133.468C17.6894 133.807 17.1527 133.77 16.4446 133.36C16.1063 133.166 15.7636 132.904 15.4208 132.58C15.078 132.26 14.7488 131.849 14.424 131.348C14.1038 130.848 13.8107 130.252 13.5446 129.558C13.2785 128.868 13.053 128.061 12.8726 127.136Z" fill="#DA3635" stroke="#DA3635" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-<line x1="0.5" y1="-0.5" x2="29.5" y2="-0.5" transform="matrix(-4.37114e-08 -1 -1 4.37114e-08 18.8359 172.833)" stroke="#DA3635" stroke-linecap="round"/>
-</g>
-<defs>
-<clipPath id="clip0_10191_199277">
-<rect width="200" height="200" fill="white" transform="translate(0 0.5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/assets/logos/caf.svg b/src/assets/logos/caf.svg
index 6dbdde3cde99ba89f507b1919ebfcde6c8f5d9a0..04b91a7f1f11ec97d185aa25df4f170f4d47b518 100644
--- a/src/assets/logos/caf.svg
+++ b/src/assets/logos/caf.svg
@@ -1,51 +1,51 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_8017_41417)">
-<path d="M35.6008 0.402954H4.40234C2.1932 0.402954 0.402344 2.19382 0.402344 4.40296V35.5972C0.402344 37.8063 2.1932 39.5972 4.40234 39.5972H35.6008C37.81 39.5972 39.6008 37.8063 39.6008 35.5972V4.40295C39.6008 2.19382 37.81 0.402954 35.6008 0.402954Z" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9429 16.0653L15.1899 15.9277H14.7337C14.8107 15.9777 14.8817 16.0241 14.9429 16.0653Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7084 17.7451C18.5096 17.6723 18.354 17.5214 18.2708 17.3197C18.2571 17.2873 18.2465 17.2539 18.2374 17.2194C18.1334 17.3252 18.0142 17.419 17.8799 17.4939L16.6852 18.1586H18.5762C18.6141 18.0158 18.6698 17.8807 18.7419 17.755L18.7084 17.7451Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3508 17.4768C22.2287 17.3962 22.125 17.2946 22.041 17.1787C22.0141 17.2606 21.9762 17.3407 21.9262 17.4125C21.7662 17.6448 21.522 17.7765 21.275 17.7897C21.317 17.9071 21.3429 18.0313 21.3546 18.1589H23.3029C23.3055 18.1412 23.3076 18.1239 23.3099 18.1062L22.3508 17.4768Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.199 15.9274C29.2911 16.5294 28.9839 17.1746 28.4102 17.4934C28.4102 17.4934 27.625 17.931 27.2149 18.1586H34.9466V15.9274H29.199Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.7799 18.1062L11.8203 17.4768C11.5395 17.2915 11.3503 16.9993 11.286 16.6535C11.2422 16.4145 11.2611 16.1644 11.3386 15.9274H5.09412V18.1586H12.7727C12.775 18.141 12.7776 18.1239 12.7799 18.1062Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2634 15.9274C25.3415 15.9775 25.4112 16.0241 25.4726 16.0651L25.7202 15.9274H25.2634Z" fill="#696969"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.3266 4.99122C22.0268 4.99122 22.6764 4.4344 22.7772 3.74642C22.8786 3.05973 22.392 2.50187 21.6916 2.50187C20.9924 2.50187 20.3418 3.05947 20.241 3.74642C20.1399 4.4344 20.6259 4.99122 21.3266 4.99122Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.6953 4.50283C25.4452 3.93642 24.7365 3.74303 24.1128 4.06992L21.2465 5.57084L18.8227 4.06992C18.2942 3.74303 17.5282 3.93642 17.1118 4.50283C16.6958 5.06898 16.7878 5.79273 17.3156 6.11962L18.9954 7.15367L18.5607 10.114C18.5498 10.1902 18.5573 10.2675 18.5884 10.3377C18.683 10.5524 18.9529 10.6257 19.1893 10.5018L20.6339 9.74593L21.8557 10.5018C22.0561 10.626 22.3469 10.5524 22.5048 10.3377C22.5564 10.2675 22.5872 10.1902 22.5994 10.114L23.0333 7.15367L25.0159 6.11962C25.6412 5.79247 25.945 5.06872 25.6953 4.50283Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.1134 13.2566C20.8128 13.2566 21.4624 12.6988 21.564 12.0118C21.6644 11.3246 21.1788 10.767 20.4784 10.767C19.778 10.767 19.1286 11.3244 19.0278 12.0118C18.9269 12.6988 19.4122 13.2566 20.1134 13.2566Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.4824 12.7677C24.2323 12.2016 23.5235 12.0077 22.8988 12.3343L20.0336 13.8357L17.6093 12.3343C17.0807 12.0077 16.3147 12.2016 15.8987 12.7677C15.4826 13.3339 15.5741 14.0579 16.1024 14.3835L17.7819 15.4183L17.3467 18.3787C17.3361 18.4557 17.3446 18.5321 17.3755 18.6024C17.4701 18.817 17.7392 18.8904 17.9764 18.767L19.4205 18.01L20.642 18.767C20.8429 18.8906 21.1335 18.817 21.2906 18.6024C21.3421 18.5321 21.374 18.4557 21.3847 18.3787L21.8196 15.4183L23.8027 14.3835C24.4282 14.0579 24.7318 13.3339 24.4824 12.7677Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4609 9.1256C14.1611 9.1256 14.8107 8.56878 14.9115 7.8808C15.0129 7.19411 14.5263 6.636 13.8261 6.636C13.1257 6.636 12.4764 7.19385 12.3753 7.8808C12.2744 8.56852 12.7605 9.1256 13.4609 9.1256Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8299 8.6367C17.58 8.07055 16.871 7.87717 16.2465 8.2038L13.3811 9.70549L10.9573 8.2038C10.4287 7.87717 9.66246 8.07055 9.24641 8.6367C8.83087 9.20285 8.92186 9.92713 9.45016 10.2538L11.1297 11.2881L10.6952 14.2484C10.6843 14.3241 10.6929 14.4014 10.7237 14.4719C10.8181 14.6865 11.0877 14.7596 11.3241 14.6357L12.7685 13.8798L13.9908 14.6357C14.1917 14.7599 14.4817 14.6865 14.6393 14.4719C14.6907 14.4014 14.7215 14.3241 14.7332 14.2484L15.1679 11.2881L17.1512 10.2538C17.7757 9.92687 18.0795 9.20259 17.8299 8.6367Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2469 17.3908C12.9479 17.3908 13.597 16.8334 13.6981 16.1457C13.7992 15.4585 13.3134 14.9014 12.6132 14.9014C11.9128 14.9014 11.2632 15.4585 11.1621 16.1457C11.0612 16.8332 11.5468 17.3908 12.2469 17.3908Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6165 16.9016C16.3666 16.336 15.6578 16.1421 15.0336 16.4692L12.1679 17.9699L9.74334 16.4692C9.21478 16.1421 8.44902 16.336 8.03296 16.9016C7.61691 17.4678 7.70815 18.1918 8.23672 18.5176L9.91624 19.553L9.48152 22.5138C9.47063 22.5893 9.47919 22.6663 9.51029 22.737C9.60491 22.9512 9.87373 23.025 10.1109 22.9011L11.5545 22.1447L12.7768 22.9011C12.9774 23.0253 13.2685 22.9512 13.4256 22.737C13.4777 22.6663 13.5086 22.5893 13.5203 22.5138L13.955 19.553L15.9378 18.5176C16.5625 18.1918 16.8663 17.4678 16.6165 16.9016Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.982 9.1256C27.2823 9.1256 26.7952 8.56878 26.8963 7.8808C26.9972 7.19411 27.6468 6.636 28.3475 6.636C29.0476 6.636 29.5337 7.19385 29.4331 7.8808C29.3312 8.56852 28.6821 9.1256 27.982 9.1256Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.7563 8.6367C24.1724 8.07055 24.9386 7.87717 25.4667 8.2038L27.8915 9.70549L30.7572 8.2038C31.3814 7.87717 32.0904 8.07055 32.3398 8.6367C32.5892 9.20285 32.2856 9.92713 31.6614 10.2538L29.6778 11.2881L29.2433 14.2484C29.2322 14.3241 29.2019 14.4014 29.1498 14.4719C28.9914 14.6865 28.7008 14.7596 28.5001 14.6357L27.2779 13.8798L25.834 14.6357C25.5981 14.7599 25.3283 14.6865 25.2336 14.4719C25.2028 14.4014 25.1942 14.3241 25.2054 14.2484L25.6404 11.2881L23.9608 10.2538C23.4312 9.92687 23.3405 9.20259 23.7563 8.6367Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.7688 17.3908C26.0681 17.3908 25.582 16.8334 25.6831 16.1457C25.784 15.4585 26.4339 14.9014 27.1343 14.9014C27.8347 14.9014 28.32 15.4585 28.2199 16.1457C28.1181 16.8332 27.4689 17.3908 26.7688 17.3908Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.5431 16.9016C22.9589 16.336 23.7244 16.1421 24.2535 16.4692L26.6773 17.9699L29.543 16.4692C30.1678 16.1421 30.8767 16.336 31.1261 16.9016C31.3763 17.4678 31.0725 18.1918 30.4477 18.5176L28.4646 19.553L28.0297 22.5138C28.019 22.5893 27.9887 22.6663 27.9366 22.737C27.7782 22.9512 27.4881 23.025 27.287 22.9011L26.0647 22.1447L24.6208 22.9011C24.3839 23.0253 24.1156 22.9512 24.0205 22.737C23.9891 22.6663 23.9811 22.5893 23.9922 22.5138L24.4267 19.553L22.7469 18.5176C22.2181 18.1918 22.1266 17.4678 22.5431 16.9016Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8995 21.5215C19.5999 21.5215 20.2492 20.9642 20.3509 20.2765C20.4512 19.589 19.9649 19.0319 19.2647 19.0319C18.5645 19.0319 17.9149 19.5887 17.8138 20.2765C17.7127 20.9642 18.1993 21.5215 18.8995 21.5215Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2682 21.0331C23.0186 20.467 22.3098 20.2731 21.6856 20.5997L18.8204 22.1019L16.3961 20.5997C15.8675 20.2731 15.101 20.467 14.685 21.0331C14.2692 21.5988 14.3602 22.3228 14.8892 22.6492L16.5688 23.683L16.134 26.6444C16.1231 26.7208 16.1309 26.7973 16.1623 26.8675C16.2572 27.0822 16.5255 27.1555 16.7629 27.0316L18.2068 26.2757L19.4291 27.0316C19.6289 27.1558 19.9203 27.0822 20.0782 26.8675C20.1292 26.7973 20.1608 26.7208 20.1723 26.6444L20.6067 23.683L22.5893 22.6492C23.2145 22.3225 23.5189 21.5985 23.2682 21.0331Z" fill="white"/>
-<path d="M4.86834 29.7424L4.65604 28.5795L3.97972 29.7424H4.86834ZM3.79126 30.0482C3.59373 30.4265 3.41383 30.7367 3.25674 31.0815C3.18001 31.0761 3.10898 31.0654 3.03121 31.0654C2.9537 31.0654 2.87412 31.0761 2.79506 31.0815L4.83724 27.6209C4.89841 27.631 4.95596 27.6361 5.01895 27.6361C5.08195 27.6361 5.14079 27.631 5.20637 27.6209L5.90473 31.0911C5.76553 31.0815 5.63254 31.0652 5.49152 31.0652C5.3505 31.0652 5.21208 31.0813 5.0695 31.0911C5.02751 30.722 4.99044 30.3824 4.922 30.0482H3.79126Z" fill="white"/>
-<path d="M7.25347 30.7064C7.67627 30.7064 8.04229 30.6709 8.37825 30.6369C8.35544 30.7064 8.32692 30.7813 8.31344 30.8516C8.30022 30.9216 8.30074 30.996 8.29737 31.0652H6.45765L7.10053 27.6654C7.22003 27.6755 7.33824 27.6908 7.45955 27.6908C7.58061 27.6908 7.7053 27.6755 7.82869 27.6654L7.25347 30.7064Z" fill="white"/>
-<path d="M9.77807 30.7064C10.2001 30.7064 10.5659 30.6709 10.9023 30.6369C10.8798 30.7064 10.851 30.7813 10.838 30.8516C10.8248 30.9216 10.8248 30.996 10.8209 31.0652H8.98199L9.62435 27.6654C9.74437 27.6755 9.86258 27.6908 9.9839 27.6908C10.1052 27.6908 10.2291 27.6755 10.3528 27.6654L9.77807 30.7064Z" fill="white"/>
-<path d="M12.3615 29.5186C12.2386 30.1667 12.3944 30.8563 13.1229 30.8563C13.8702 30.8563 14.3503 30.0876 14.5071 29.2584C14.6287 28.615 14.4768 27.8752 13.7497 27.8752C13.0744 27.8752 12.5725 28.3998 12.3615 29.5186ZM13.042 31.1554C11.9696 31.1554 11.3692 30.5068 11.5833 29.3732C11.771 28.3793 12.6267 27.5763 13.8347 27.5763C15.2184 27.5763 15.4362 28.5792 15.2944 29.3533C15.1155 30.3272 14.2308 31.1554 13.042 31.1554Z" fill="white"/>
-<path d="M18.3559 30.5115L18.1674 30.9408C17.847 31.0963 17.4916 31.1554 17.1663 31.1554C16.1276 31.1554 15.4655 30.4972 15.6597 29.4735C15.9051 28.1699 16.8915 27.5765 17.9491 27.5765C18.2695 27.5765 18.6423 27.661 18.8935 27.821C18.8178 27.9905 18.7569 28.1603 18.6846 28.3353H18.6164C18.4881 28.0654 18.2128 27.8752 17.8981 27.8752C17.0919 27.8752 16.617 28.6694 16.4778 29.4033C16.3168 30.2569 16.6115 30.8562 17.3581 30.8562C17.6593 30.8562 18.0391 30.6973 18.2981 30.4817L18.3559 30.5115Z" fill="white"/>
-<path d="M20.6998 29.7424L20.4877 28.5795L19.8117 29.7424H20.6998ZM19.6235 30.0482C19.4249 30.4265 19.2455 30.7367 19.0877 31.0815C19.0114 31.0761 18.9404 31.0654 18.8629 31.0654C18.7854 31.0654 18.7056 31.0761 18.627 31.0815L20.6695 27.6209C20.7301 27.631 20.7879 27.6361 20.8507 27.6361C20.9129 27.6361 20.9727 27.631 21.037 27.6209L21.7362 31.0911C21.597 31.0815 21.4648 31.0652 21.3235 31.0652C21.1822 31.0652 21.044 31.0813 20.9012 31.0911C20.8597 30.722 20.8211 30.3824 20.7534 30.0482H19.6235Z" fill="white"/>
-<path d="M23.6534 31.0911C23.5339 31.0815 23.4154 31.0652 23.2933 31.0652C23.1723 31.0652 23.0484 31.0813 22.9258 31.0911L23.5054 28.0203C23.1611 28.0203 22.8488 28.0548 22.5895 28.0903C22.6124 28.0203 22.6396 27.9506 22.6543 27.8752C22.6681 27.8052 22.6655 27.7359 22.6691 27.6654H25.1688C25.1465 27.7357 25.1193 27.8052 25.1051 27.8752C25.0908 27.9506 25.0934 28.0206 25.0898 28.0903C24.8098 28.0548 24.5293 28.0203 24.233 28.0203L23.6534 31.0911Z" fill="white"/>
-<path d="M25.8099 27.6657C25.9294 27.6758 26.0479 27.6911 26.1689 27.6911C26.2905 27.6911 26.4144 27.6758 26.5381 27.6657L25.8905 31.0914C25.7715 31.0818 25.652 31.0654 25.5315 31.0654C25.4099 31.0654 25.2855 31.0815 25.1629 31.0914L25.8099 27.6657Z" fill="white"/>
-<path d="M27.6325 29.5186C27.5099 30.1667 27.666 30.8563 28.3944 30.8563C29.1417 30.8563 29.6216 30.0876 29.7787 29.2584C29.9007 28.615 29.7494 27.8752 29.0207 27.8752C28.3464 27.8752 27.844 28.3998 27.6325 29.5186ZM28.313 31.1554C27.2411 31.1554 26.6407 30.5068 26.8543 29.3732C27.0423 28.3793 27.8977 27.5763 29.1067 27.5763C30.49 27.5763 30.7072 28.5792 30.5654 29.3533C30.3873 30.3272 29.5028 31.1554 28.313 31.1554Z" fill="white"/>
-<path d="M31.5543 27.6657H32.0344C32.5773 28.4397 33.1574 29.1988 33.6901 30.0029L34.1316 27.6657C34.1933 27.6758 34.2591 27.681 34.3224 27.681C34.3856 27.681 34.4551 27.6758 34.5194 27.6657L33.8724 31.0914L33.4607 31.0862C33.0198 30.4423 32.6117 29.8276 32.1757 29.2338L31.754 28.6642L31.2967 31.0818C31.2355 31.0763 31.1681 31.0657 31.1064 31.0657C31.0432 31.0657 30.9726 31.0763 30.9094 31.0818L31.5543 27.6657Z" fill="white"/>
-<path d="M36.7752 28.3101C36.729 28.0449 36.5755 27.8752 36.2987 27.8752C35.9153 27.8752 35.7261 28.0807 35.6729 28.3648C35.5454 29.0393 37.045 28.9146 36.8283 30.0573C36.7078 30.6973 36.0872 31.1559 35.3346 31.1559C35.0679 31.1559 34.7939 31.0911 34.5935 30.9408C34.6912 30.7316 34.7848 30.5221 34.8548 30.3064H34.9466C34.9541 30.6522 35.1781 30.8563 35.5132 30.8563C35.8139 30.8563 36.1136 30.681 36.1784 30.3373C36.3298 29.5383 34.8291 29.8274 35.0565 28.6254C35.1648 28.0496 35.6377 27.5763 36.3759 27.5763C36.7249 27.5763 37.0103 27.7111 37.0969 27.8153C37.0092 27.9752 36.9289 28.1398 36.8477 28.3099L36.7752 28.3101Z" fill="white"/>
-<path d="M5.29113 36.1968C5.15244 36.1862 5.01531 36.1704 4.87455 36.1704C4.73379 36.1704 4.58992 36.1862 4.44631 36.1968L5.19755 32.6628H7.34316C7.3162 32.7346 7.28328 32.8116 7.26747 32.8837C7.25243 32.9555 7.25295 33.033 7.2488 33.105C6.91311 33.069 6.5546 33.0332 5.96356 33.0332L5.72818 34.1409H6.3244C6.54423 34.1409 6.7739 34.1202 7.01576 34.0942C6.98906 34.1671 6.95614 34.2441 6.94084 34.3164C6.92581 34.3882 6.92581 34.4657 6.92218 34.5378C6.68991 34.517 6.46983 34.4916 6.24482 34.4916H5.65327L5.29113 36.1968Z" fill="white"/>
-<path d="M9.32055 34.8053L9.07454 33.6048L8.29064 34.8053H9.32055ZM8.07185 35.1197C7.84218 35.5117 7.6335 35.8305 7.45075 36.1859C7.36183 36.1808 7.2794 36.1701 7.18945 36.1701C7.0995 36.1701 7.00695 36.1808 6.91597 36.1859L9.28477 32.6164C9.35554 32.6255 9.42216 32.6317 9.49526 32.6317C9.56862 32.6317 9.63732 32.6257 9.71301 32.6164L10.5231 36.1966C10.3621 36.1859 10.2081 36.1701 10.0448 36.1701C9.88151 36.1701 9.72053 36.1859 9.55488 36.1966C9.50641 35.8147 9.46234 35.4655 9.38354 35.1197H8.07185Z" fill="white"/>
-<path d="M15.4134 32.6628C15.4893 32.6734 15.565 32.6887 15.6444 32.6887C15.7229 32.6887 15.8105 32.6734 15.8917 32.6628C15.7719 34.0481 15.663 35.1716 15.6363 36.1968C15.4808 36.1862 15.332 36.1704 15.1746 36.1704C15.0168 36.1704 14.8729 36.1862 14.713 36.1968C14.8418 35.3782 14.897 34.5894 14.9807 33.7954C14.3853 34.5842 13.7956 35.372 13.2258 36.1704C13.1553 36.1598 13.0884 36.1551 13.0124 36.1704C12.8032 35.4596 12.5279 34.6617 12.2716 33.8526C11.9494 34.7599 11.7075 35.4749 11.5369 36.1968C11.4493 36.1862 11.3684 36.1704 11.2782 36.1704C11.1877 36.1704 11.1058 36.1862 11.0138 36.1968C11.4363 35.161 11.8703 33.9657 12.3387 32.6628C12.4154 32.6734 12.4849 32.6887 12.5637 32.6887C12.6428 32.6887 12.725 32.6734 12.8061 32.6628C13.0394 33.4718 13.3134 34.2749 13.5869 35.084C14.1471 34.3516 14.7977 33.5436 15.4134 32.6628Z" fill="white"/>
-<path d="M17.2031 32.6628C17.3418 32.6734 17.4789 32.6887 17.6204 32.6887C17.7607 32.6887 17.9048 32.6734 18.0479 32.6628L17.2967 36.1968C17.1585 36.1862 17.0211 36.1704 16.8801 36.1704C16.7393 36.1704 16.5955 36.1862 16.4521 36.1968L17.2031 32.6628Z" fill="white"/>
-<path d="M19.2492 35.7997C19.7399 35.7997 20.1637 35.7631 20.5541 35.7268C20.5282 35.7997 20.4945 35.8772 20.4797 35.949C20.4639 36.0208 20.4644 36.0983 20.4595 36.1704H18.3263L19.0716 32.6628C19.2105 32.6734 19.3479 32.6887 19.4887 32.6887C19.6289 32.6887 19.7733 32.6734 19.9161 32.6628L19.2492 35.7997Z" fill="white"/>
-<path d="M22.005 32.6628C22.1437 32.6734 22.2813 32.6887 22.421 32.6887C22.5623 32.6887 22.7072 32.6734 22.8498 32.6628L22.0991 36.1968C21.9599 36.1862 21.8228 36.1704 21.682 36.1704C21.5412 36.1704 21.3974 36.1862 21.2537 36.1968L22.005 32.6628Z" fill="white"/>
-<path d="M25.1522 34.8053L24.9062 33.6048L24.1226 34.8053H25.1522ZM23.9025 35.1197C23.6731 35.5117 23.4649 35.8305 23.2822 36.1859C23.193 36.1808 23.1111 36.1701 23.0199 36.1701C22.9302 36.1701 22.8381 36.1808 22.7469 36.1859L25.1154 32.6164C25.1867 32.6255 25.2536 32.6317 25.327 32.6317C25.3998 32.6317 25.4688 32.6257 25.5442 32.6164L26.3543 36.1966C26.1933 36.1859 26.0383 36.1701 25.8747 36.1701C25.7117 36.1701 25.5512 36.1859 25.3855 36.1966C25.3373 35.8147 25.2935 35.4655 25.2145 35.1197H23.9025Z" fill="white"/>
-<path d="M27.863 35.7997C28.3537 35.7997 28.7778 35.7631 29.1682 35.7268C29.1417 35.7997 29.1088 35.8772 29.0927 35.949C29.0774 36.0208 29.0785 36.0983 29.0741 36.1704H26.9401L27.6849 32.6628C27.8241 32.6734 27.9612 32.6887 28.1025 32.6887C28.2438 32.6887 28.3871 32.6734 28.5307 32.6628L27.863 35.7997Z" fill="white"/>
-<path d="M32.7486 32.6628C32.7214 32.7346 32.6874 32.8116 32.6726 32.8837C32.6574 32.9555 32.6574 33.033 32.654 33.105C32.3198 33.0646 31.9453 33.0231 31.3674 33.0332L31.1331 34.1409H31.7184C31.9725 34.1409 32.2076 34.1202 32.4212 34.0942C32.3942 34.1671 32.3611 34.2441 32.3458 34.3164C32.331 34.3882 32.331 34.4657 32.3271 34.5378C32.1252 34.5124 31.8983 34.4916 31.644 34.4916H31.0582L30.7803 35.7999C31.356 35.7953 31.7449 35.7691 32.0966 35.7271C32.0702 35.7999 32.037 35.8774 32.0222 35.9492C32.0062 36.021 32.0064 36.0986 32.002 36.1706H29.8569L30.6027 32.663L32.7486 32.6628Z" fill="white"/>
-<path d="M35.1299 33.3269C35.0741 33.0534 34.8984 32.8785 34.5774 32.8785C34.1324 32.8785 33.9133 33.09 33.8503 33.3837C33.702 34.0795 35.4417 33.9499 35.191 35.1298C35.0503 35.7891 34.3309 36.264 33.4584 36.264C33.1481 36.264 32.83 36.1966 32.5982 36.0418C32.712 35.8256 32.8199 35.6094 32.9005 35.3878H33.0083C33.0169 35.7432 33.2761 35.9539 33.665 35.9539C34.0134 35.9539 34.3618 35.7743 34.4375 35.4194C34.6122 34.5945 32.8704 34.8934 33.1343 33.652C33.2608 33.0592 33.8094 32.57 34.6653 32.57C35.0702 32.57 35.401 32.7092 35.5018 32.8176C35.3992 32.9816 35.3074 33.1517 35.2133 33.3275L35.1299 33.3269Z" fill="white"/>
+<path d="M0.402161 20.0001C0.402161 30.8233 9.17821 39.5972 20.0014 39.5972C30.8246 39.5972 39.6006 30.8233 39.6006 20.0001C39.6006 9.17689 30.8246 0.402954 20.0014 0.402954C9.17821 0.402954 0.402161 9.17689 0.402161 20.0001Z" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.7857 16.721L15.9916 16.6063H15.6114C15.6755 16.648 15.7347 16.6866 15.7857 16.721Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.9236 18.1208C18.7579 18.0601 18.6283 17.9344 18.559 17.7663C18.5475 17.7393 18.5387 17.7115 18.5311 17.6827C18.4445 17.7709 18.3451 17.8491 18.2332 17.9115L17.2376 18.4654H18.8134C18.845 18.3463 18.8914 18.2338 18.9515 18.129L18.9236 18.1208Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9589 17.8972C21.8572 17.8301 21.7708 17.7454 21.7008 17.6488C21.6783 17.7171 21.6468 17.7838 21.6051 17.8437C21.4718 18.0372 21.2683 18.147 21.0624 18.158C21.0974 18.2558 21.119 18.3593 21.1288 18.4656H22.7524C22.7545 18.4509 22.7563 18.4364 22.7582 18.4217L21.9589 17.8972Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.6658 16.6061C27.7425 17.1077 27.4865 17.6454 27.0084 17.9111C27.0084 17.9111 26.3541 18.2757 26.0124 18.4654H32.4554V16.6061H27.6658Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9832 18.4217L13.1835 17.8972C12.9495 17.7428 12.7918 17.4993 12.7383 17.2111C12.7018 17.012 12.7175 16.8035 12.7821 16.6061H7.57837V18.4654H13.9771C13.9791 18.4507 13.9813 18.4364 13.9832 18.4217Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.3861 16.6061C24.4512 16.6478 24.5093 16.6866 24.5605 16.7208L24.7668 16.6061H24.3861Z" fill="#DA3635" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.1054 7.49256C21.6889 7.49256 22.2303 7.02855 22.3143 6.45522C22.3988 5.88298 21.9933 5.4181 21.4096 5.4181C20.827 5.4181 20.2848 5.88277 20.2007 6.45522C20.1165 7.02855 20.5215 7.49256 21.1054 7.49256Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.746 7.08557C24.5376 6.61356 23.947 6.45241 23.4272 6.72481L21.0387 7.97558L19.0189 6.72481C18.5784 6.45241 17.9401 6.61356 17.5931 7.08557C17.2464 7.55736 17.3231 8.16049 17.7629 8.43289L19.1627 9.2946L18.8005 11.7616C18.7914 11.8251 18.7977 11.8895 18.8236 11.948C18.9024 12.1269 19.1273 12.188 19.3243 12.0847L20.5282 11.4548L21.5463 12.0847C21.7133 12.1882 21.9557 12.1269 22.0873 11.948C22.1302 11.8895 22.1559 11.8251 22.1661 11.7616L22.5277 9.2946L24.1799 8.43289C24.7009 8.16027 24.9541 7.55714 24.746 7.08557Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.0944 14.3804C20.6773 14.3804 21.2186 13.9155 21.3033 13.3431C21.3869 12.7704 20.9823 12.3057 20.3986 12.3057C19.8149 12.3057 19.2738 12.7702 19.1898 13.3431C19.1057 13.9155 19.5101 14.3804 20.0944 14.3804Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.7353 13.973C23.5268 13.5012 22.9362 13.3396 22.4156 13.6118L20.0279 14.863L18.0077 13.6118C17.5672 13.3396 16.9289 13.5012 16.5822 13.973C16.2354 14.4448 16.3117 15.0481 16.7519 15.3194L18.1516 16.1818L17.7889 18.6488C17.78 18.7129 17.7871 18.7767 17.8128 18.8352C17.8917 19.0141 18.1159 19.0752 18.3136 18.9724L19.517 18.3416L20.5349 18.9724C20.7023 19.0754 20.9445 19.0141 21.0754 18.8352C21.1184 18.7767 21.145 18.7129 21.1538 18.6488L21.5163 16.1818L23.1689 15.3194C23.6901 15.0481 23.9431 14.4448 23.7353 13.973Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5507 10.9379C15.1342 10.9379 15.6755 10.4739 15.7595 9.90054C15.844 9.3283 15.4385 8.86321 14.8551 8.86321C14.2714 8.86321 13.7302 9.32809 13.646 9.90054C13.562 10.4736 13.967 10.9379 14.5507 10.9379Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.1915 10.5305C17.9833 10.0587 17.3925 9.89752 16.8721 10.1697L14.4842 11.4211L12.4644 10.1697C12.0239 9.89752 11.3853 10.0587 11.0386 10.5305C10.6923 11.0023 10.7682 11.6058 11.2084 11.878L12.608 12.7399L12.246 15.2069C12.2369 15.27 12.244 15.3344 12.2697 15.3931C12.3483 15.572 12.573 15.6329 12.77 15.5296L13.9737 14.8997L14.9922 15.5296C15.1597 15.6331 15.4014 15.572 15.5327 15.3931C15.5755 15.3344 15.6012 15.27 15.6109 15.2069L15.9732 12.7399L17.626 11.878C18.1464 11.6056 18.3995 11.002 18.1915 10.5305Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5391 17.8255C14.1232 17.8255 14.6641 17.3611 14.7483 16.788C14.8326 16.2153 14.4278 15.7511 13.8443 15.7511C13.2606 15.7511 12.7193 16.2153 12.635 16.788C12.551 17.3609 12.9556 17.8255 13.5391 17.8255Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1803 17.4179C16.9721 16.9465 16.3815 16.7849 15.8613 17.0576L13.4732 18.3081L11.4527 17.0576C11.0123 16.7849 10.3741 16.9465 10.0274 17.4179C9.68069 17.8897 9.75673 18.493 10.1972 18.7646L11.5968 19.6273L11.2345 22.0947C11.2255 22.1576 11.2326 22.2218 11.2585 22.2807C11.3374 22.4592 11.5614 22.5207 11.759 22.4175L12.9621 21.7871L13.9806 22.4175C14.1478 22.521 14.3904 22.4592 14.5213 22.2807C14.5647 22.2218 14.5904 22.1576 14.6002 22.0947L14.9624 19.6273L16.6148 18.7646C17.1354 18.493 17.3886 17.8897 17.1803 17.4179Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6516 10.9379C26.0685 10.9379 25.6626 10.4739 25.7469 9.90054C25.8309 9.3283 26.3723 8.86321 26.9562 8.86321C27.5396 8.86321 27.9447 9.32809 27.8609 9.90054C27.776 10.4736 27.235 10.9379 26.6516 10.9379Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.1302 10.5305C23.4769 10.0587 24.1155 9.89752 24.5555 10.1697L26.5762 11.4211L28.9643 10.1697C29.4845 9.89752 30.0753 10.0587 30.2831 10.5305C30.4909 11.0023 30.238 11.6058 29.7178 11.878L28.0648 12.7399L27.7027 15.2069C27.6934 15.27 27.6682 15.3344 27.6247 15.3931C27.4928 15.572 27.2506 15.6329 27.0834 15.5296L26.0649 14.8997L24.8616 15.5296C24.665 15.6331 24.4402 15.572 24.3613 15.3931C24.3356 15.3344 24.3285 15.27 24.3378 15.2069L24.7002 12.7399L23.3006 11.878C22.8593 11.6056 22.7837 11.002 23.1302 10.5305Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.6406 17.8255C25.0567 17.8255 24.6516 17.3611 24.7359 16.788C24.8199 16.2153 25.3615 15.7511 25.9452 15.7511C26.5289 15.7511 26.9333 16.2153 26.8499 16.788C26.765 17.3609 26.2241 17.8255 25.6406 17.8255Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.1192 17.4179C22.4657 16.9465 23.1036 16.7849 23.5445 17.0576L25.5643 18.3081L27.9525 17.0576C28.4731 16.7849 29.0639 16.9465 29.2717 17.4179C29.4802 17.8897 29.227 18.493 28.7064 18.7646L27.0538 19.6273L26.6913 22.0947C26.6825 22.1576 26.6572 22.2218 26.6138 22.2807C26.4818 22.4592 26.24 22.5207 26.0724 22.4175L25.0539 21.7871L23.8506 22.4175C23.6532 22.521 23.4296 22.4592 23.3503 22.2807C23.3242 22.2218 23.3175 22.1576 23.3268 22.0947L23.6888 19.6273L22.289 18.7646C21.8483 18.493 21.7721 17.8897 22.1192 17.4179Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0828 21.2678C19.6665 21.2678 20.2076 20.8034 20.2923 20.2303C20.3759 19.6574 19.9707 19.1931 19.3872 19.1931C18.8037 19.1931 18.2624 19.6572 18.1781 20.2303C18.0939 20.8034 18.4993 21.2678 19.0828 21.2678Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.7234 20.8608C22.5154 20.389 21.9248 20.2275 21.4046 20.4996L19.0169 21.7515L16.9967 20.4996C16.5562 20.2275 15.9175 20.389 15.5707 20.8608C15.2242 21.3322 15.3001 21.9355 15.741 22.2075L17.1406 23.069L16.7783 25.5368C16.7692 25.6006 16.7757 25.6643 16.8018 25.7228C16.8809 25.9017 17.1045 25.9628 17.3024 25.8596L18.5056 25.2297L19.5242 25.8596C19.6907 25.963 19.9335 25.9017 20.0651 25.7228C20.1076 25.6643 20.134 25.6006 20.1435 25.5368L20.5055 23.069L22.1577 22.2075C22.6787 21.9353 22.9323 21.332 22.7234 20.8608Z" fill="#A50F0E"/>
+<path d="M7.39023 28.1185L7.2133 27.1494L6.6497 28.1185H7.39023ZM6.49266 28.3734C6.32805 28.6886 6.17813 28.9472 6.04722 29.2345C5.98328 29.2299 5.92409 29.2211 5.85928 29.2211C5.79469 29.2211 5.72837 29.2299 5.66249 29.2345L7.3643 26.3506C7.41528 26.359 7.46324 26.3633 7.51573 26.3633C7.56823 26.3633 7.61726 26.359 7.67192 26.3506L8.25388 29.2425C8.13788 29.2345 8.02706 29.2209 7.90954 29.2209C7.79203 29.2209 7.67667 29.2343 7.55786 29.2425C7.52286 28.9349 7.49197 28.6519 7.43494 28.3734H6.49266Z" fill="#A50F0E"/>
+<path d="M9.37783 28.9219C9.73016 28.9219 10.0352 28.8923 10.3151 28.864C10.2961 28.9219 10.2724 28.9843 10.2611 29.0429C10.2501 29.1012 10.2506 29.1632 10.2477 29.2209H8.71464L9.25038 26.3877C9.34996 26.3962 9.44847 26.4089 9.54957 26.4089C9.65045 26.4089 9.75436 26.3962 9.85718 26.3877L9.37783 28.9219Z" fill="#A50F0E"/>
+<path d="M11.4817 28.9219C11.8333 28.9219 12.1382 28.8923 12.4186 28.864C12.3998 28.9219 12.3758 28.9843 12.365 29.0429C12.354 29.1012 12.354 29.1632 12.3507 29.2209H10.8183L11.3536 26.3877C11.4536 26.3962 11.5521 26.4089 11.6532 26.4089C11.7543 26.4089 11.8575 26.3962 11.9606 26.3877L11.4817 28.9219Z" fill="#A50F0E"/>
+<path d="M13.6345 27.9321C13.5321 28.4721 13.662 29.0468 14.269 29.0468C14.8918 29.0468 15.2919 28.4062 15.4226 27.7152C15.5239 27.179 15.3973 26.5625 14.7913 26.5625C14.2286 26.5625 13.8104 26.9997 13.6345 27.9321ZM14.2016 29.296C13.3079 29.296 12.8076 28.7556 12.986 27.8109C13.1424 26.9827 13.8555 26.3134 14.8622 26.3134C16.0153 26.3134 16.1968 27.1492 16.0786 27.7943C15.9296 28.6059 15.1923 29.296 14.2016 29.296Z" fill="#A50F0E"/>
+<path d="M18.6298 28.7594L18.4728 29.1172C18.2058 29.2468 17.9096 29.296 17.6385 29.296C16.7729 29.296 16.2212 28.7476 16.383 27.8945C16.5876 26.8081 17.4095 26.3136 18.2909 26.3136C18.5579 26.3136 18.8685 26.3841 19.0779 26.5174C19.0148 26.6586 18.964 26.8001 18.9037 26.9459H18.8469C18.74 26.7211 18.5106 26.5625 18.2483 26.5625C17.5765 26.5625 17.1807 27.2244 17.0647 27.8359C16.9306 28.5473 17.1762 29.0467 17.7984 29.0467C18.0494 29.0467 18.3658 28.9143 18.5817 28.7346L18.6298 28.7594Z" fill="#A50F0E"/>
+<path d="M20.5831 28.1185L20.4064 27.1494L19.843 28.1185H20.5831ZM19.6862 28.3734C19.5207 28.6886 19.3712 28.9472 19.2397 29.2345C19.1761 29.2299 19.117 29.2211 19.0524 29.2211C18.9878 29.2211 18.9212 29.2299 18.8558 29.2345L20.5578 26.3506C20.6084 26.359 20.6565 26.3633 20.7088 26.3633C20.7607 26.3633 20.8106 26.359 20.8641 26.3506L21.4467 29.2425C21.3307 29.2345 21.2206 29.2209 21.1028 29.2209C20.9851 29.2209 20.87 29.2343 20.7509 29.2425C20.7164 28.9349 20.6842 28.6519 20.6278 28.3734H19.6862Z" fill="#A50F0E"/>
+<path d="M23.0444 29.2425C22.9449 29.2345 22.8461 29.2209 22.7444 29.2209C22.6435 29.2209 22.5402 29.2343 22.4381 29.2425L22.9211 26.6835C22.6342 26.6835 22.3739 26.7122 22.1579 26.7418C22.1769 26.6835 22.1996 26.6254 22.2119 26.5625C22.2233 26.5042 22.2212 26.4465 22.2242 26.3877H24.3073C24.2887 26.4463 24.266 26.5042 24.2542 26.5625C24.2423 26.6254 24.2444 26.6837 24.2414 26.7418C24.0081 26.7122 23.7744 26.6835 23.5275 26.6835L23.0444 29.2425Z" fill="#A50F0E"/>
+<path d="M24.8415 26.388C24.9411 26.3964 25.0398 26.4091 25.1407 26.4091C25.242 26.4091 25.3453 26.3964 25.4483 26.388L24.9087 29.2427C24.8096 29.2347 24.71 29.2211 24.6095 29.2211C24.5082 29.2211 24.4045 29.2345 24.3023 29.2427L24.8415 26.388Z" fill="#A50F0E"/>
+<path d="M26.3604 27.9321C26.2582 28.4721 26.3882 29.0468 26.9953 29.0468C27.618 29.0468 28.0179 28.4062 28.1488 27.7152C28.2506 27.179 28.1244 26.5625 27.5172 26.5625C26.9553 26.5625 26.5366 26.9997 26.3604 27.9321ZM26.9274 29.296C26.0342 29.296 25.5339 28.7556 25.7119 27.8109C25.8685 26.9827 26.5814 26.3134 27.5889 26.3134C28.7416 26.3134 28.9226 27.1492 28.8044 27.7943C28.656 28.6059 27.919 29.296 26.9274 29.296Z" fill="#A50F0E"/>
+<path d="M29.6286 26.388H30.0286C30.481 27.033 30.9644 27.6655 31.4084 28.3356L31.7763 26.388C31.8277 26.3964 31.8825 26.4007 31.9352 26.4007C31.988 26.4007 32.0458 26.3964 32.0994 26.388L31.5602 29.2427L31.2172 29.2384C30.8497 28.7018 30.5097 28.1896 30.1464 27.6947L29.7949 27.2201L29.4138 29.2347C29.3629 29.2302 29.3067 29.2213 29.2553 29.2213C29.2026 29.2213 29.1438 29.2302 29.0911 29.2347L29.6286 26.388Z" fill="#A50F0E"/>
+<path d="M33.9792 26.925C33.9408 26.704 33.8129 26.5625 33.5822 26.5625C33.2627 26.5625 33.105 26.7338 33.0607 26.9706C32.9544 27.5327 34.2041 27.4288 34.0235 28.381C33.9231 28.9143 33.4059 29.2965 32.7788 29.2965C32.5565 29.2965 32.3282 29.2425 32.1612 29.1172C32.2426 28.9428 32.3206 28.7683 32.3789 28.5886H32.4554C32.4617 28.8767 32.6483 29.0468 32.9276 29.0468C33.1782 29.0468 33.4279 28.9007 33.482 28.6143C33.6081 27.9485 32.3576 28.1894 32.547 27.1877C32.6373 26.7079 33.0313 26.3134 33.6466 26.3134C33.9373 26.3134 34.1752 26.4258 34.2473 26.5126C34.1743 26.6459 34.1073 26.7831 34.0397 26.9248L33.9792 26.925Z" fill="#A50F0E"/>
+<path d="M7.74255 33.4972C7.62698 33.4884 7.5127 33.4752 7.3954 33.4752C7.2781 33.4752 7.15821 33.4884 7.03853 33.4972L7.66456 30.5522H9.45257C9.43011 30.612 9.40267 30.6762 9.3895 30.7363C9.37697 30.7961 9.3774 30.8607 9.37394 30.9207C9.09419 30.8907 8.79544 30.8609 8.30291 30.8609L8.10676 31.784H8.60361C8.7868 31.784 8.97819 31.7667 9.17974 31.7451C9.15749 31.8058 9.13005 31.8699 9.11731 31.9302C9.10478 31.99 9.10478 32.0546 9.10175 32.1147C8.9082 32.0974 8.7248 32.0762 8.53729 32.0762H8.04433L7.74255 33.4972Z" fill="#A50F0E"/>
+<path d="M11.1004 32.3376L10.8954 31.3372L10.2421 32.3376H11.1004ZM10.0598 32.5997C9.86842 32.9263 9.69452 33.192 9.54223 33.4882C9.46813 33.4838 9.39944 33.475 9.32448 33.475C9.24952 33.475 9.1724 33.4838 9.09658 33.4882L11.0706 30.5135C11.1296 30.5211 11.1851 30.5263 11.246 30.5263C11.3071 30.5263 11.3644 30.5213 11.4274 30.5135L12.1025 33.497C11.9684 33.4882 11.8401 33.475 11.704 33.475C11.5679 33.475 11.4337 33.4882 11.2957 33.497C11.2553 33.1788 11.2186 32.8878 11.1529 32.5997H10.0598Z" fill="#A50F0E"/>
+<path d="M16.1778 30.5522C16.2411 30.5611 16.3041 30.5738 16.3702 30.5738C16.4357 30.5738 16.5087 30.5611 16.5763 30.5522C16.4765 31.7066 16.3858 32.6429 16.3635 33.4972C16.2339 33.4884 16.1099 33.4752 15.9788 33.4752C15.8472 33.4752 15.7274 33.4884 15.5941 33.4972C15.7014 32.815 15.7474 32.1577 15.8172 31.496C15.321 32.1534 14.8296 32.8098 14.3548 33.4752C14.296 33.4663 14.2403 33.4624 14.177 33.4752C14.0026 32.8829 13.7732 32.2179 13.5596 31.5437C13.2911 32.2998 13.0895 32.8956 12.9474 33.4972C12.8744 33.4884 12.807 33.4752 12.7318 33.4752C12.6564 33.4752 12.5881 33.4884 12.5114 33.4972C12.8636 32.634 13.2252 31.6379 13.6155 30.5522C13.6795 30.5611 13.7374 30.5738 13.803 30.5738C13.8689 30.5738 13.9374 30.5611 14.005 30.5522C14.1994 31.2264 14.4278 31.8956 14.6557 32.5698C15.1225 31.9596 15.6647 31.2862 16.1778 30.5522Z" fill="#A50F0E"/>
+<path d="M17.6692 30.5522C17.7847 30.5611 17.899 30.5738 18.017 30.5738C18.1338 30.5738 18.2539 30.5611 18.3732 30.5522L17.7472 33.4972C17.632 33.4884 17.5175 33.4752 17.4 33.4752C17.2827 33.4752 17.1628 33.4884 17.0434 33.4972L17.6692 30.5522Z" fill="#A50F0E"/>
+<path d="M19.3742 33.1663C19.7832 33.1663 20.1364 33.1358 20.4617 33.1056C20.4401 33.1663 20.412 33.2309 20.3997 33.2907C20.3865 33.3505 20.3869 33.4151 20.3828 33.4752H18.6052L19.2263 30.5522C19.342 30.5611 19.4565 30.5738 19.5738 30.5738C19.6907 30.5738 19.811 30.5611 19.9301 30.5522L19.3742 33.1663Z" fill="#A50F0E"/>
+<path d="M21.6708 30.5522C21.7863 30.5611 21.901 30.5738 22.0175 30.5738C22.1352 30.5738 22.256 30.5611 22.3748 30.5522L21.7492 33.4972C21.6332 33.4884 21.5189 33.4752 21.4016 33.4752C21.2843 33.4752 21.1644 33.4884 21.0447 33.4972L21.6708 30.5522Z" fill="#A50F0E"/>
+<path d="M24.2935 32.3376L24.0885 31.3372L23.4354 32.3376H24.2935ZM23.252 32.5997C23.0609 32.9263 22.8874 33.192 22.7351 33.4882C22.6608 33.4838 22.5925 33.475 22.5165 33.475C22.4417 33.475 22.3651 33.4838 22.289 33.4882L24.2628 30.5135C24.3222 30.5211 24.3779 30.5263 24.4391 30.5263C24.4998 30.5263 24.5572 30.5213 24.6201 30.5135L25.2952 33.497C25.161 33.4882 25.0318 33.475 24.8955 33.475C24.7596 33.475 24.6259 33.4882 24.4879 33.497C24.4477 33.1788 24.4112 32.8878 24.3453 32.5997H23.252Z" fill="#A50F0E"/>
+<path d="M26.5524 33.1663C26.9613 33.1663 27.3148 33.1358 27.6401 33.1056C27.6181 33.1663 27.5906 33.2309 27.5772 33.2907C27.5645 33.3505 27.5653 33.4151 27.5617 33.4752H25.7834L26.404 30.5522C26.52 30.5611 26.6343 30.5738 26.752 30.5738C26.8698 30.5738 26.9892 30.5611 27.1089 30.5522L26.5524 33.1663Z" fill="#A50F0E"/>
+<path d="M30.6238 30.5522C30.6011 30.612 30.5728 30.6762 30.5605 30.7363C30.5477 30.7961 30.5477 30.8607 30.5449 30.9207C30.2665 30.887 29.9543 30.8525 29.4728 30.8609L29.2775 31.784H29.7653C29.977 31.784 30.1729 31.7667 30.3509 31.7451C30.3285 31.8058 30.3008 31.8699 30.2881 31.9302C30.2758 31.99 30.2758 32.0546 30.2725 32.1147C30.1042 32.0935 29.9152 32.0762 29.7033 32.0762H29.2151L28.9835 33.1665C29.4633 33.1626 29.7873 33.1408 30.0805 33.1058C30.0584 33.1665 30.0308 33.2311 30.0185 33.2909C30.0051 33.3508 30.0053 33.4153 30.0016 33.4754H28.2141L28.8355 30.5524L30.6238 30.5522Z" fill="#A50F0E"/>
+<path d="M32.6081 31.1057C32.5617 30.8778 32.4152 30.7319 32.1478 30.7319C31.7769 30.7319 31.5944 30.9082 31.5419 31.153C31.4183 31.7328 32.868 31.6248 32.6591 32.6081C32.5418 33.1574 31.9424 33.5532 31.2152 33.5532C30.9567 33.5532 30.6916 33.497 30.4985 33.368C30.5933 33.1879 30.6832 33.0077 30.7504 32.823H30.8402C30.8474 33.1192 31.0634 33.2948 31.3874 33.2948C31.6777 33.2948 31.9681 33.1451 32.0312 32.8494C32.1768 32.162 30.7253 32.4111 30.9452 31.3765C31.0506 30.8825 31.5077 30.4749 32.221 30.4749C32.5585 30.4749 32.8341 30.5909 32.9181 30.6812C32.8326 30.8179 32.7561 30.9596 32.6777 31.1061L32.6081 31.1057Z" fill="#A50F0E"/>
</g>
<defs>
<clipPath id="clip0_8017_41417">
-<rect width="40" height="40" rx="4" fill="white"/>
+<rect width="40" height="40" rx="20" fill="white"/>
</clipPath>
</defs>
</svg>
diff --git a/src/assets/logos/foreigners.svg b/src/assets/logos/foreigners.svg
index ff9184305b20ffbf716349a15363a691dc69d819..df8bbb5526ba1ffd60b424e7c5615eb27a92b525 100644
--- a/src/assets/logos/foreigners.svg
+++ b/src/assets/logos/foreigners.svg
@@ -1,5 +1,5 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 10.0583C8.5 8.95378 9.39543 8.05835 10.5 8.05835H22.9287C24.0333 8.05835 24.9287 8.95378 24.9287 10.0583V15.0195C24.9287 16.124 24.0333 17.0195 22.9287 17.0195H13.1053L11.1743 19.3367C10.8478 19.7285 10.2132 19.4374 10.297 18.9344L10.6162 17.0195H10.5C9.39543 17.0195 8.5 16.124 8.5 15.0195V10.0583ZM13.7276 13.2856C14.14 13.2856 14.4743 12.9513 14.4743 12.5388C14.4743 12.1264 14.14 11.7921 13.7276 11.7921C13.3152 11.7921 12.9808 12.1264 12.9808 12.5388C12.9808 12.9513 13.3152 13.2856 13.7276 13.2856ZM17.4612 12.5389C17.4612 12.9513 17.1268 13.2856 16.7144 13.2856C16.302 13.2856 15.9677 12.9513 15.9677 12.5389C15.9677 12.1264 16.302 11.7921 16.7144 11.7921C17.1268 11.7921 17.4612 12.1264 17.4612 12.5389ZM19.7014 13.2856C20.1138 13.2856 20.4481 12.9513 20.4481 12.5389C20.4481 12.1264 20.1138 11.7921 19.7014 11.7921C19.289 11.7921 18.9546 12.1264 18.9546 12.5389C18.9546 12.9513 19.289 13.2856 19.7014 13.2856Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M31.5003 21.2675C31.5003 20.1629 30.6048 19.2675 29.5003 19.2675H15.1001C13.9955 19.2675 13.1001 20.1629 13.1001 21.2675V27.3039C13.1001 28.4085 13.9955 29.3039 15.1001 29.3039H26.4061L28.6534 31.776C28.9914 32.1478 29.6052 31.8446 29.5153 31.3502L29.1433 29.3039H29.5003C30.6048 29.3039 31.5003 28.4085 31.5003 27.3039V21.2675ZM17.3537 22.0629C17.4253 21.9998 17.5032 21.9398 17.5874 21.8829C17.6737 21.8261 17.7664 21.7766 17.8653 21.7345C17.9642 21.6924 18.0716 21.6598 18.1874 21.6366C18.3032 21.6114 18.4284 21.5987 18.5632 21.5987C18.7463 21.5987 18.9126 21.624 19.0621 21.6745C19.2137 21.725 19.3431 21.7977 19.4505 21.8924C19.5579 21.985 19.641 22.0977 19.7 22.2303C19.7589 22.3629 19.7884 22.5113 19.7884 22.6755C19.7884 22.8355 19.7652 22.9745 19.7189 23.0923C19.6726 23.2081 19.6136 23.3092 19.5421 23.3955C19.4726 23.4818 19.3968 23.5565 19.3147 23.6197L19.081 23.7997C19.0074 23.8544 18.9431 23.9092 18.8884 23.9639C18.8358 24.0165 18.8042 24.0765 18.7937 24.1439L18.7211 24.6049H18.1874L18.1337 24.0902C18.1316 24.0797 18.1306 24.0712 18.1306 24.0649V24.0365C18.1306 23.9439 18.1537 23.8639 18.2 23.7965C18.2463 23.7271 18.3042 23.6628 18.3737 23.6039C18.4432 23.5429 18.5179 23.4839 18.5979 23.4271C18.6779 23.3702 18.7526 23.3092 18.8221 23.2439C18.8916 23.1766 18.9495 23.1008 18.9958 23.0166C19.0421 22.9324 19.0652 22.8334 19.0652 22.7197C19.0652 22.6439 19.0505 22.5766 19.021 22.5176C18.9937 22.4566 18.9547 22.405 18.9042 22.3629C18.8537 22.3187 18.7926 22.285 18.7211 22.2619C18.6516 22.2387 18.5758 22.2271 18.4937 22.2271C18.3737 22.2271 18.2716 22.2408 18.1874 22.2682C18.1053 22.2934 18.0348 22.3229 17.9758 22.3566C17.919 22.3882 17.8706 22.4176 17.8306 22.445C17.7906 22.4703 17.7548 22.4829 17.7232 22.4829C17.6474 22.4829 17.5927 22.4513 17.559 22.3882L17.3537 22.0629ZM17.9506 25.7859C17.9506 25.7206 17.9621 25.6585 17.9853 25.5996C18.0106 25.5407 18.0442 25.4901 18.0863 25.448C18.1306 25.4059 18.1821 25.3722 18.2411 25.347C18.3 25.3217 18.3632 25.3091 18.4305 25.3091C18.4958 25.3091 18.5579 25.3217 18.6168 25.347C18.6758 25.3722 18.7263 25.4059 18.7684 25.448C18.8105 25.4901 18.8442 25.5407 18.8695 25.5996C18.8947 25.6585 18.9074 25.7206 18.9074 25.7859C18.9074 25.8533 18.8947 25.9164 18.8695 25.9754C18.8442 26.0322 18.8105 26.0817 18.7684 26.1238C18.7263 26.1659 18.6758 26.1985 18.6168 26.2217C18.5579 26.2469 18.4958 26.2596 18.4305 26.2596C18.3632 26.2596 18.3 26.2469 18.2411 26.2217C18.1821 26.1985 18.1306 26.1659 18.0863 26.1238C18.0442 26.0817 18.0106 26.0322 17.9853 25.9754C17.9621 25.9164 17.9506 25.8533 17.9506 25.7859ZM21.0224 22.0629C21.094 21.9998 21.1719 21.9398 21.2561 21.8829C21.3424 21.8261 21.435 21.7766 21.534 21.7345C21.6329 21.6924 21.7403 21.6598 21.8561 21.6366C21.9718 21.6114 22.0971 21.5987 22.2318 21.5987C22.415 21.5987 22.5813 21.624 22.7308 21.6745C22.8823 21.725 23.0118 21.7977 23.1192 21.8924C23.2265 21.985 23.3097 22.0977 23.3686 22.2303C23.4276 22.3629 23.457 22.5113 23.457 22.6755C23.457 22.8355 23.4339 22.9745 23.3876 23.0923C23.3413 23.2081 23.2823 23.3092 23.2107 23.3955C23.1413 23.4818 23.0655 23.5565 22.9834 23.6197L22.7497 23.7997C22.676 23.8544 22.6118 23.9092 22.5571 23.9639C22.5044 24.0165 22.4729 24.0765 22.4623 24.1439L22.3897 24.6049H21.8561L21.8024 24.0902C21.8003 24.0797 21.7992 24.0712 21.7992 24.0649V24.0365C21.7992 23.9439 21.8224 23.8639 21.8687 23.7965C21.915 23.7271 21.9729 23.6628 22.0424 23.6039C22.1118 23.5429 22.1866 23.4839 22.2666 23.4271C22.3466 23.3702 22.4213 23.3092 22.4908 23.2439C22.5602 23.1766 22.6181 23.1008 22.6644 23.0166C22.7108 22.9324 22.7339 22.8334 22.7339 22.7197C22.7339 22.6439 22.7192 22.5766 22.6897 22.5176C22.6623 22.4566 22.6234 22.405 22.5729 22.3629C22.5223 22.3187 22.4613 22.285 22.3897 22.2619C22.3202 22.2387 22.2445 22.2271 22.1624 22.2271C22.0424 22.2271 21.9403 22.2408 21.8561 22.2682C21.774 22.2934 21.7034 22.3229 21.6445 22.3566C21.5876 22.3882 21.5392 22.4176 21.4992 22.445C21.4592 22.4703 21.4234 22.4829 21.3919 22.4829C21.3161 22.4829 21.2613 22.4513 21.2277 22.3882L21.0224 22.0629ZM21.6192 25.7859C21.6192 25.7206 21.6308 25.6585 21.654 25.5996C21.6792 25.5407 21.7129 25.4901 21.755 25.448C21.7992 25.4059 21.8508 25.3722 21.9097 25.347C21.9687 25.3217 22.0318 25.3091 22.0992 25.3091C22.1645 25.3091 22.2266 25.3217 22.2855 25.347C22.3445 25.3722 22.395 25.4059 22.4371 25.448C22.4792 25.4901 22.5129 25.5407 22.5381 25.5996C22.5634 25.6585 22.576 25.7206 22.576 25.7859C22.576 25.8533 22.5634 25.9164 22.5381 25.9754C22.5129 26.0322 22.4792 26.0817 22.4371 26.1238C22.395 26.1659 22.3445 26.1985 22.2855 26.2217C22.2266 26.2469 22.1645 26.2596 22.0992 26.2596C22.0318 26.2596 21.9687 26.2469 21.9097 26.2217C21.8508 26.1985 21.7992 26.1659 21.755 26.1238C21.7129 26.0817 21.6792 26.0322 21.654 25.9754C21.6308 25.9164 21.6192 25.8533 21.6192 25.7859ZM24.9247 21.8829C24.8405 21.9398 24.7626 21.9998 24.6911 22.0629L24.8963 22.3882C24.93 22.4513 24.9847 22.4829 25.0605 22.4829C25.0921 22.4829 25.1279 22.4703 25.1679 22.445C25.2079 22.4176 25.2563 22.3882 25.3131 22.3566C25.3721 22.3229 25.4426 22.2934 25.5247 22.2682C25.6089 22.2408 25.711 22.2271 25.831 22.2271C25.9131 22.2271 25.9889 22.2387 26.0584 22.2619C26.13 22.285 26.191 22.3187 26.2415 22.3629C26.2921 22.405 26.331 22.4566 26.3584 22.5176C26.3878 22.5766 26.4026 22.6439 26.4026 22.7197C26.4026 22.8334 26.3794 22.9324 26.3331 23.0166C26.2868 23.1008 26.2289 23.1766 26.1594 23.2439C26.09 23.3092 26.0152 23.3702 25.9352 23.4271C25.8552 23.4839 25.7805 23.5429 25.711 23.6039C25.6416 23.6628 25.5837 23.7271 25.5373 23.7965C25.491 23.8639 25.4679 23.9439 25.4679 24.0365V24.0649C25.4679 24.0712 25.4689 24.0797 25.471 24.0902L25.5247 24.6049H26.0584L26.131 24.1439C26.1415 24.0765 26.1731 24.0165 26.2257 23.9639C26.2805 23.9092 26.3447 23.8544 26.4184 23.7997L26.652 23.6197C26.7341 23.5565 26.8099 23.4818 26.8794 23.3955C26.951 23.3092 27.0099 23.2081 27.0562 23.0923C27.1025 22.9745 27.1257 22.8355 27.1257 22.6755C27.1257 22.5113 27.0962 22.3629 27.0373 22.2303C26.9783 22.0977 26.8952 21.985 26.7878 21.8924C26.6805 21.7977 26.551 21.725 26.3994 21.6745C26.2499 21.624 26.0836 21.5987 25.9005 21.5987C25.7658 21.5987 25.6405 21.6114 25.5247 21.6366C25.4089 21.6598 25.3016 21.6924 25.2026 21.7345C25.1037 21.7766 25.0111 21.8261 24.9247 21.8829ZM25.3226 25.5996C25.2995 25.6585 25.2879 25.7206 25.2879 25.7859C25.2879 25.8533 25.2995 25.9164 25.3226 25.9754C25.3479 26.0322 25.3816 26.0817 25.4237 26.1238C25.4679 26.1659 25.5195 26.1985 25.5784 26.2217C25.6373 26.2469 25.7005 26.2596 25.7679 26.2596C25.8331 26.2596 25.8952 26.2469 25.9542 26.2217C26.0131 26.1985 26.0636 26.1659 26.1057 26.1238C26.1478 26.0817 26.1815 26.0322 26.2068 25.9754C26.2321 25.9164 26.2447 25.8533 26.2447 25.7859C26.2447 25.7206 26.2321 25.6585 26.2068 25.5996C26.1815 25.5407 26.1478 25.4901 26.1057 25.448C26.0636 25.4059 26.0131 25.3722 25.9542 25.347C25.8952 25.3217 25.8331 25.3091 25.7679 25.3091C25.7005 25.3091 25.6373 25.3217 25.5784 25.347C25.5195 25.3722 25.4679 25.4059 25.4237 25.448C25.3816 25.4901 25.3479 25.5407 25.3226 25.5996Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.49985 10.0583C8.49985 8.95378 9.39528 8.05835 10.4998 8.05835H22.9286C24.0331 8.05835 24.9286 8.95378 24.9286 10.0583V15.0195C24.9286 16.124 24.0331 17.0195 22.9286 17.0195H13.1052L11.1741 19.3367C10.8477 19.7285 10.213 19.4374 10.2968 18.9344L10.616 17.0195H10.4998C9.39528 17.0195 8.49985 16.124 8.49985 15.0195V10.0583ZM13.7274 13.2856C14.1399 13.2856 14.4742 12.9513 14.4742 12.5388C14.4742 12.1264 14.1399 11.7921 13.7274 11.7921C13.315 11.7921 12.9807 12.1264 12.9807 12.5388C12.9807 12.9513 13.315 13.2856 13.7274 13.2856ZM17.461 12.5389C17.461 12.9513 17.1267 13.2856 16.7143 13.2856C16.3018 13.2856 15.9675 12.9513 15.9675 12.5389C15.9675 12.1264 16.3018 11.7921 16.7143 11.7921C17.1267 11.7921 17.461 12.1264 17.461 12.5389ZM19.7012 13.2856C20.1137 13.2856 20.448 12.9513 20.448 12.5389C20.448 12.1264 20.1137 11.7921 19.7012 11.7921C19.2888 11.7921 18.9545 12.1264 18.9545 12.5389C18.9545 12.9513 19.2888 13.2856 19.7012 13.2856Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.5 21.2675C31.5 20.1629 30.6046 19.2675 29.5 19.2675H15.0999C13.9953 19.2675 13.0999 20.1629 13.0999 21.2675V27.3039C13.0999 28.4085 13.9953 29.3039 15.0999 29.3039H26.4059L28.6532 31.776C28.9912 32.1478 29.605 31.8446 29.5151 31.3502L29.1431 29.3039H29.5C30.6046 29.3039 31.5 28.4085 31.5 27.3039V21.2675ZM17.3535 22.0629C17.4251 21.9998 17.503 21.9398 17.5872 21.8829C17.6735 21.8261 17.7661 21.7766 17.8651 21.7345C17.964 21.6924 18.0714 21.6598 18.1872 21.6366C18.303 21.6114 18.4282 21.5987 18.563 21.5987C18.7461 21.5987 18.9124 21.624 19.0619 21.6745C19.2134 21.725 19.3429 21.7977 19.4503 21.8924C19.5576 21.985 19.6408 22.0977 19.6997 22.2303C19.7587 22.3629 19.7882 22.5113 19.7882 22.6755C19.7882 22.8355 19.765 22.9745 19.7187 23.0923C19.6724 23.2081 19.6134 23.3092 19.5419 23.3955C19.4724 23.4818 19.3966 23.5565 19.3145 23.6197L19.0808 23.7997C19.0071 23.8544 18.9429 23.9092 18.8882 23.9639C18.8356 24.0165 18.804 24.0765 18.7935 24.1439L18.7208 24.6049H18.1872L18.1335 24.0902C18.1314 24.0797 18.1303 24.0712 18.1303 24.0649V24.0365C18.1303 23.9439 18.1535 23.8639 18.1998 23.7965C18.2461 23.7271 18.304 23.6628 18.3735 23.6039C18.443 23.5429 18.5177 23.4839 18.5977 23.4271C18.6777 23.3702 18.7524 23.3092 18.8219 23.2439C18.8914 23.1766 18.9493 23.1008 18.9956 23.0166C19.0419 22.9324 19.065 22.8334 19.065 22.7197C19.065 22.6439 19.0503 22.5766 19.0208 22.5176C18.9935 22.4566 18.9545 22.405 18.904 22.3629C18.8535 22.3187 18.7924 22.285 18.7208 22.2619C18.6514 22.2387 18.5756 22.2271 18.4935 22.2271C18.3735 22.2271 18.2714 22.2408 18.1872 22.2682C18.1051 22.2934 18.0346 22.3229 17.9756 22.3566C17.9188 22.3882 17.8704 22.4176 17.8304 22.445C17.7904 22.4703 17.7546 22.4829 17.723 22.4829C17.6472 22.4829 17.5925 22.4513 17.5588 22.3882L17.3535 22.0629ZM17.9503 25.7859C17.9503 25.7206 17.9619 25.6585 17.9851 25.5996C18.0103 25.5407 18.044 25.4901 18.0861 25.448C18.1303 25.4059 18.1819 25.3722 18.2409 25.347C18.2998 25.3217 18.363 25.3091 18.4303 25.3091C18.4956 25.3091 18.5577 25.3217 18.6166 25.347C18.6756 25.3722 18.7261 25.4059 18.7682 25.448C18.8103 25.4901 18.844 25.5407 18.8693 25.5996C18.8945 25.6585 18.9071 25.7206 18.9071 25.7859C18.9071 25.8533 18.8945 25.9164 18.8693 25.9754C18.844 26.0322 18.8103 26.0817 18.7682 26.1238C18.7261 26.1659 18.6756 26.1985 18.6166 26.2217C18.5577 26.2469 18.4956 26.2596 18.4303 26.2596C18.363 26.2596 18.2998 26.2469 18.2409 26.2217C18.1819 26.1985 18.1303 26.1659 18.0861 26.1238C18.044 26.0817 18.0103 26.0322 17.9851 25.9754C17.9619 25.9164 17.9503 25.8533 17.9503 25.7859ZM21.0222 22.0629C21.0938 21.9998 21.1717 21.9398 21.2559 21.8829C21.3422 21.8261 21.4348 21.7766 21.5338 21.7345C21.6327 21.6924 21.7401 21.6598 21.8558 21.6366C21.9716 21.6114 22.0969 21.5987 22.2316 21.5987C22.4148 21.5987 22.5811 21.624 22.7305 21.6745C22.8821 21.725 23.0116 21.7977 23.1189 21.8924C23.2263 21.985 23.3095 22.0977 23.3684 22.2303C23.4273 22.3629 23.4568 22.5113 23.4568 22.6755C23.4568 22.8355 23.4337 22.9745 23.3874 23.0923C23.341 23.2081 23.2821 23.3092 23.2105 23.3955C23.141 23.4818 23.0653 23.5565 22.9832 23.6197L22.7495 23.7997C22.6758 23.8544 22.6116 23.9092 22.5569 23.9639C22.5042 24.0165 22.4727 24.0765 22.4621 24.1439L22.3895 24.6049H21.8558L21.8022 24.0902C21.8001 24.0797 21.799 24.0712 21.799 24.0649V24.0365C21.799 23.9439 21.8222 23.8639 21.8685 23.7965C21.9148 23.7271 21.9727 23.6628 22.0421 23.6039C22.1116 23.5429 22.1864 23.4839 22.2663 23.4271C22.3463 23.3702 22.4211 23.3092 22.4906 23.2439C22.56 23.1766 22.6179 23.1008 22.6642 23.0166C22.7105 22.9324 22.7337 22.8334 22.7337 22.7197C22.7337 22.6439 22.719 22.5766 22.6895 22.5176C22.6621 22.4566 22.6232 22.405 22.5727 22.3629C22.5221 22.3187 22.4611 22.285 22.3895 22.2619C22.32 22.2387 22.2442 22.2271 22.1621 22.2271C22.0421 22.2271 21.94 22.2408 21.8558 22.2682C21.7737 22.2934 21.7032 22.3229 21.6443 22.3566C21.5874 22.3882 21.539 22.4176 21.499 22.445C21.459 22.4703 21.4232 22.4829 21.3917 22.4829C21.3159 22.4829 21.2611 22.4513 21.2275 22.3882L21.0222 22.0629ZM21.619 25.7859C21.619 25.7206 21.6306 25.6585 21.6537 25.5996C21.679 25.5407 21.7127 25.4901 21.7548 25.448C21.799 25.4059 21.8506 25.3722 21.9095 25.347C21.9685 25.3217 22.0316 25.3091 22.099 25.3091C22.1642 25.3091 22.2264 25.3217 22.2853 25.347C22.3442 25.3722 22.3948 25.4059 22.4369 25.448C22.479 25.4901 22.5127 25.5407 22.5379 25.5996C22.5632 25.6585 22.5758 25.7206 22.5758 25.7859C22.5758 25.8533 22.5632 25.9164 22.5379 25.9754C22.5127 26.0322 22.479 26.0817 22.4369 26.1238C22.3948 26.1659 22.3442 26.1985 22.2853 26.2217C22.2264 26.2469 22.1642 26.2596 22.099 26.2596C22.0316 26.2596 21.9685 26.2469 21.9095 26.2217C21.8506 26.1985 21.799 26.1659 21.7548 26.1238C21.7127 26.0817 21.679 26.0322 21.6537 25.9754C21.6306 25.9164 21.619 25.8533 21.619 25.7859ZM24.9245 21.8829C24.8403 21.9398 24.7624 21.9998 24.6909 22.0629L24.8961 22.3882C24.9298 22.4513 24.9845 22.4829 25.0603 22.4829C25.0919 22.4829 25.1277 22.4703 25.1677 22.445C25.2077 22.4176 25.2561 22.3882 25.3129 22.3566C25.3719 22.3229 25.4424 22.2934 25.5245 22.2682C25.6087 22.2408 25.7108 22.2271 25.8308 22.2271C25.9129 22.2271 25.9887 22.2387 26.0582 22.2619C26.1297 22.285 26.1908 22.3187 26.2413 22.3629C26.2918 22.405 26.3308 22.4566 26.3582 22.5176C26.3876 22.5766 26.4024 22.6439 26.4024 22.7197C26.4024 22.8334 26.3792 22.9324 26.3329 23.0166C26.2866 23.1008 26.2287 23.1766 26.1592 23.2439C26.0897 23.3092 26.015 23.3702 25.935 23.4271C25.855 23.4839 25.7803 23.5429 25.7108 23.6039C25.6413 23.6628 25.5835 23.7271 25.5371 23.7965C25.4908 23.8639 25.4677 23.9439 25.4677 24.0365V24.0649C25.4677 24.0712 25.4687 24.0797 25.4708 24.0902L25.5245 24.6049H26.0582L26.1308 24.1439C26.1413 24.0765 26.1729 24.0165 26.2255 23.9639C26.2803 23.9092 26.3445 23.8544 26.4181 23.7997L26.6518 23.6197C26.7339 23.5565 26.8097 23.4818 26.8792 23.3955C26.9508 23.3092 27.0097 23.2081 27.056 23.0923C27.1023 22.9745 27.1255 22.8355 27.1255 22.6755C27.1255 22.5113 27.096 22.3629 27.0371 22.2303C26.9781 22.0977 26.895 21.985 26.7876 21.8924C26.6802 21.7977 26.5508 21.725 26.3992 21.6745C26.2497 21.624 26.0834 21.5987 25.9003 21.5987C25.7655 21.5987 25.6403 21.6114 25.5245 21.6366C25.4087 21.6598 25.3014 21.6924 25.2024 21.7345C25.1035 21.7766 25.0108 21.8261 24.9245 21.8829ZM25.3224 25.5996C25.2993 25.6585 25.2877 25.7206 25.2877 25.7859C25.2877 25.8533 25.2993 25.9164 25.3224 25.9754C25.3477 26.0322 25.3814 26.0817 25.4235 26.1238C25.4677 26.1659 25.5192 26.1985 25.5782 26.2217C25.6371 26.2469 25.7003 26.2596 25.7677 26.2596C25.8329 26.2596 25.895 26.2469 25.954 26.2217C26.0129 26.1985 26.0634 26.1659 26.1055 26.1238C26.1476 26.0817 26.1813 26.0322 26.2066 25.9754C26.2318 25.9164 26.2445 25.8533 26.2445 25.7859C26.2445 25.7206 26.2318 25.6585 26.2066 25.5996C26.1813 25.5407 26.1476 25.4901 26.1055 25.448C26.0634 25.4059 26.0129 25.3722 25.954 25.347C25.895 25.3217 25.8329 25.3091 25.7677 25.3091C25.7003 25.3091 25.6371 25.3217 25.5782 25.347C25.5192 25.3722 25.4677 25.4059 25.4235 25.448C25.3814 25.4901 25.3477 25.5407 25.3224 25.5996Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/franceConnect.svg b/src/assets/logos/franceConnect.svg
index e7332f7dc503ba3f5d8d454fdebf64a250cfda21..19f7b8ac3a4e51acb5fc8b00652e341cd706c076 100644
--- a/src/assets/logos/franceConnect.svg
+++ b/src/assets/logos/franceConnect.svg
@@ -1,7 +1,7 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path d="M31.9717 13.366L19.9779 6.90125L7.98105 13.4288C7.83105 13.5092 7.7373 13.6593 7.7373 13.82V26.4491C7.74668 26.6062 7.8373 26.7529 7.98105 26.8367L19.9748 33.2456L31.9717 26.7599C32.1154 26.6726 32.2061 26.5294 32.2154 26.3687V13.7606C32.2154 13.5965 32.1217 13.4463 31.9717 13.366Z" fill="#333333"/>
-<path d="M15.6907 13.7397L11.6688 20.1695L8.02197 13.331L12.3345 11.012L15.9251 13.366L15.6907 13.7397ZM32.2157 26.3897V13.7571C32.2157 13.593 32.122 13.4463 31.972 13.366L19.9782 6.90125" fill="#696969"/>
-<path d="M7.7373 26.3897L19.9779 6.90125V33.2491L7.98105 26.8367C7.8373 26.7529 7.74668 26.6062 7.7373 26.4491V13.82V26.3897ZM27.4748 10.9421L31.8404 13.2926L28.2498 20.1101L23.9404 13.2298L27.4748 10.9421Z" fill="#4C4D53"/>
-<path d="M35.6844 11.2843L20.3313 3.07334C20.1219 2.97555 19.8781 2.97555 19.6687 3.07334L4.31562 11.2843C4.12812 11.3996 4.00938 11.5917 4 11.8012V28.1953C4.00938 28.4048 4.12812 28.6004 4.31562 28.7157L19.6656 36.9267C19.875 37.0244 20.1219 37.0244 20.3313 36.9267L35.6844 28.7157C35.8719 28.6004 35.9906 28.4048 36 28.1953V11.8012C35.9906 11.5917 35.8719 11.3996 35.6844 11.2843ZM12.6094 24.5141H12.6719C12.6406 24.5141 12.6094 24.5211 12.6094 24.5525C12.6094 24.6259 12.7312 24.5525 12.7688 24.6259C12.5781 24.6294 12.4 24.7062 12.2656 24.8319C12.2656 24.8704 12.3469 24.8704 12.3875 24.8704C12.3281 24.9437 12.2063 24.9053 12.1656 24.9821C12.1875 25.0031 12.2156 25.0136 12.2469 25.0205C12.2062 25.0205 12.1656 25.0205 12.1656 25.059V25.1707C12.0656 25.1707 12.025 25.2441 11.9438 25.2825C12.1031 25.3942 12.2063 25.2825 12.3656 25.2825C11.9438 25.4327 11.6031 25.6387 11.1781 25.7505C11.1 25.7505 11.1781 25.8622 11.1 25.8622C11.2188 25.9391 11.2812 25.8273 11.4 25.8273C10.8781 26.1067 10.3344 26.3477 9.77188 26.669C9.72813 26.7109 9.7 26.7633 9.69062 26.8192H9.53125C9.45 26.8576 9.49062 26.9484 9.40938 27.0253C9.59063 27.137 9.80938 26.8751 9.93438 27.0253C9.975 27.0253 9.85313 27.0637 9.775 27.0637C9.73438 27.0637 9.73438 27.137 9.69375 27.137H9.57188C9.49062 27.1929 9.40938 27.2313 9.40938 27.3431C9.34063 27.3291 9.26875 27.3606 9.22812 27.4164C10.0875 27.4129 10.9406 27.2663 11.7438 26.9869C12.3688 26.69 12.9344 26.2988 13.4156 25.8238C13.4375 25.8448 13.45 25.8727 13.4562 25.9007C13.3375 26.2255 13.1125 26.5049 12.8094 26.704C12.5875 26.8157 12.4281 26.9834 12.25 27.0602C12.1312 27.1231 12.0188 27.1894 11.9094 27.2663C11.4031 27.4129 10.8844 27.5142 10.3562 27.5736L10.1125 27.605C9.93125 27.6295 9.75312 27.6574 9.575 27.6854L7.98125 26.8367C7.8625 26.7703 7.78125 26.6586 7.75 26.5328C7.77812 26.5188 7.80312 26.5014 7.825 26.4839C7.80312 26.4595 7.77188 26.442 7.7375 26.4315V25.9461C8.575 25.8099 9.39062 25.5724 10.1656 25.2476C9.43125 24.7726 8.60938 24.4303 7.7375 24.2452V23.1171C8.18125 23.1835 8.61875 23.2813 9.04688 23.407C9.37813 23.5222 9.69375 23.6654 9.99375 23.8401C10.1094 23.9448 10.2375 24.0391 10.375 24.1195C10.5719 24.2242 10.8094 24.2382 11.0156 24.1579H11.2812C11.8531 24.0706 12.3906 23.8366 12.8281 23.4838C12.8281 23.5187 12.8688 23.5187 12.9094 23.5187C12.8469 23.8156 12.7312 24.102 12.5688 24.3639C12.5688 24.4024 12.5281 24.4757 12.6094 24.5141ZM14.8625 27.1754C15.0625 27.0986 15.1844 26.9694 15.3656 26.8926C15.325 26.931 15.325 27.0078 15.2875 27.0427C15.1375 27.13 14.9938 27.2313 14.8625 27.3396C14.4125 27.7133 13.9875 28.1149 13.5969 28.541C13.3938 28.7646 13.175 28.9706 12.9562 29.1767C12.8781 29.243 12.7969 29.3059 12.7094 29.3618L10.6875 28.2791C10.975 28.3035 11.2625 28.2896 11.5469 28.2407C11.7812 28.1778 12.0125 28.0975 12.2312 27.9962V28.0695C12.7906 27.8635 13.2156 27.3955 13.7812 27.2278C13.8 27.2278 13.8812 27.3012 13.9625 27.2663C14.2562 26.9275 14.7 26.7319 15.1688 26.7424C15.1688 26.7808 15.1688 26.8192 15.2094 26.8192H15.2281C15.1094 26.9135 14.9688 27.0043 14.8281 27.0986C14.7844 27.137 14.8219 27.1754 14.8625 27.1754ZM7.7375 22.5827V22.443C8.15 22.3418 8.57812 22.2964 9.00625 22.3033C9.13438 22.2859 9.2625 22.2859 9.39062 22.3033C8.825 22.3033 8.26562 22.3976 7.7375 22.5827ZM32.2156 26.3722C32.2063 26.5328 32.1156 26.676 31.9719 26.7633L23.9094 31.122C22.9844 30.8776 22.0719 30.5807 21.1812 30.2384C20.9219 29.711 20.9062 29.1068 21.1438 28.569C21.2062 28.3385 21.3 28.1184 21.425 27.9089C21.4438 27.8914 21.4625 27.874 21.4625 27.853C21.475 27.853 21.4844 27.846 21.4844 27.8355C21.5719 27.6889 21.675 27.5526 21.7844 27.4199L21.7969 27.4095L21.8125 27.3955L21.825 27.3815C21.825 27.364 21.8469 27.3466 21.8656 27.3256C21.8844 27.2872 21.925 27.2697 21.9469 27.2313C22.0875 27.0951 22.2406 26.9694 22.4094 26.8611C22.5781 26.8017 22.7531 26.7598 22.9312 26.7284C23.5813 26.7738 24.225 26.8541 24.8625 26.9729C24.9438 26.9834 25.0188 27.0078 25.0844 27.0462C25.325 27.0916 25.575 27.0777 25.8094 27.0078C26.1187 26.9554 26.3781 26.7563 26.4937 26.4839C26.6375 26.2394 26.65 25.9496 26.5344 25.6946C26.3906 25.4885 26.5219 25.3698 26.6781 25.2545L26.7313 25.2126C26.8031 25.1672 26.8656 25.1148 26.9188 25.052C27.0188 24.8634 26.8375 24.7551 26.7969 24.584C26.7563 24.5106 26.6156 24.5456 26.5344 24.4338C26.8156 24.322 27.2188 24.116 27.0375 23.7947C26.9188 23.627 26.7375 23.3267 26.9594 23.159C27.2406 23.0088 27.6438 23.0438 27.7625 22.7993C27.8438 22.5129 27.7563 22.2055 27.5281 21.9925L27.4688 21.9122C27.4094 21.8353 27.3531 21.755 27.3 21.6747C27.175 21.4756 27.0312 21.287 26.8781 21.1089C26.7031 20.8784 26.5594 20.6234 26.4563 20.358C26.3344 20.0751 26.4969 19.8306 26.4969 19.5512C26.5094 19.0064 26.4188 18.4685 26.2344 17.9516C26.1344 17.6897 26.0938 17.4068 25.9719 17.1623C25.9562 17.0051 25.8938 16.855 25.7906 16.7327C25.7531 16.6524 25.7531 16.5651 25.7906 16.4882C25.9562 16.38 26.1094 16.2612 26.2563 16.1285C26.3469 15.9399 26.2781 15.7199 26.0938 15.6046C25.8344 15.4929 25.8562 15.8491 25.6719 15.9224H25.5531C25.5125 15.8281 25.5906 15.7932 25.6719 15.7164C25.6719 15.6815 25.6719 15.6046 25.6313 15.6046C25.4719 15.6046 25.3312 15.5662 25.2906 15.4929C24.9062 15.0458 24.3875 14.7105 23.8031 14.5324C23.9531 14.5778 24.1063 14.6023 24.2656 14.6092C24.5344 14.6616 24.8156 14.6372 25.0688 14.5324C25.25 14.4765 25.2906 14.1762 25.3719 14.0085C25.4031 13.8409 25.3594 13.6697 25.25 13.537C25.0688 13.2926 24.8188 13.097 24.525 12.9747C24.3406 12.8944 24.1594 12.8071 23.9813 12.7128C23.9219 12.6709 23.8531 12.6394 23.7812 12.6185C21.4094 11.5113 16.525 12.4683 16.1531 12.6185H16.1469C15.8031 12.7093 15.4688 12.828 15.1469 12.9712C14.25 13.2821 13.5531 13.9596 13.2562 14.8083C12.8 15.0877 12.4312 15.4754 12.1906 15.9329C11.8469 16.5301 11.3438 17.0575 11.425 17.7316C11.5062 18.3113 11.6469 18.8352 11.7688 19.436C11.8 19.6385 11.8562 19.8376 11.9281 20.0332C12.0063 20.2392 11.9281 20.5012 12.0469 20.6688C12.1094 20.7806 12.0688 20.9133 12.2281 20.9901V21.1368C12.2688 21.1752 12.2688 21.2137 12.35 21.2137V21.3603C12.6969 21.6782 12.9969 22.0379 13.2375 22.4291C13.3156 22.6351 12.8531 22.5408 12.675 22.4675C12.3438 22.2649 12.0406 22.0274 11.7719 21.755C11.7469 21.776 11.7344 21.8004 11.7281 21.8284C11.8906 22.0903 12.4531 22.4116 12.1531 22.5793C11.9906 22.6526 11.8094 22.4675 11.65 22.6177C11.6094 22.6735 11.65 22.7469 11.65 22.8237C11.4281 22.6735 11.1875 22.7469 10.9656 22.6735C10.8063 22.6351 10.7625 22.3557 10.5812 22.3557C10.1062 22.2475 9.62188 22.1636 9.13438 22.1112C8.67188 22.0484 8.20938 22.0065 7.74375 21.9925V13.8199C7.74375 13.6593 7.8375 13.5091 7.9875 13.4288L19.9781 6.90118L31.9719 13.3659C32.1219 13.4462 32.2156 13.5964 32.2156 13.7571V26.3722ZM25.8531 20.2183C25.8031 20.2881 25.7188 20.33 25.6281 20.33C25.5469 20.3929 25.4719 20.4593 25.4031 20.5326C25.4813 20.5326 25.4031 20.6444 25.4813 20.6444C25.3188 20.8085 25.5438 21.1613 25.3188 21.2346C25.0219 21.308 24.7125 21.308 24.4156 21.2346C24.4594 21.2241 24.5063 21.2206 24.55 21.2241H24.6187C24.7188 21.2346 24.8219 21.1962 24.8875 21.1229V20.9762C24.8875 20.9377 24.8469 20.9377 24.8094 20.9377C24.7875 20.9587 24.7594 20.9727 24.7281 20.9762C24.725 20.9063 24.675 20.8469 24.6063 20.826C24.3875 20.8539 24.1719 20.7771 24.0312 20.6234C24.1375 20.5745 24.2625 20.5606 24.3781 20.585C24.4813 20.585 24.4406 20.4209 24.5625 20.344H24.6875C24.9312 20.0681 25.3844 19.9948 25.4656 19.7188C25.4656 19.642 25.2406 19.642 25.0781 19.6071C24.8563 19.5826 24.6344 19.5931 24.4219 19.642C24.1344 19.6804 23.85 19.7503 23.5813 19.8481C23.8031 19.6944 24.0531 19.5757 24.3188 19.4953C24.5031 19.429 24.6969 19.3801 24.8938 19.3486L24.9969 19.3277L25.1063 19.3067C25.25 19.2683 25.4031 19.2683 25.55 19.3067C25.7344 19.3836 26.0406 19.3836 26.0813 19.4918C26.1625 19.6944 25.9594 19.897 25.7344 20.0471C25.6875 20.1065 25.8531 20.1484 25.8531 20.2183Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path d="M31.9717 13.366L19.9779 6.90125L7.98105 13.4288C7.83105 13.5092 7.7373 13.6593 7.7373 13.82V26.4491C7.74668 26.6062 7.8373 26.7529 7.98105 26.8367L19.9748 33.2456L31.9717 26.7599C32.1154 26.6726 32.2061 26.5294 32.2154 26.3687V13.7606C32.2154 13.5965 32.1217 13.4463 31.9717 13.366Z" fill="#FFE5E4"/>
+<path d="M15.6907 13.7397L11.6688 20.1695L8.02197 13.331L12.3345 11.012L15.9251 13.366L15.6907 13.7397ZM32.2157 26.3897V13.7571C32.2157 13.593 32.122 13.4463 31.972 13.366L19.9782 6.90125" fill="#CD2524" fill-opacity="0.25"/>
+<path d="M7.7373 26.3897L19.9779 6.90125V33.2491L7.98105 26.8367C7.8373 26.7529 7.74668 26.6062 7.7373 26.4491V13.82V26.3897ZM27.4748 10.9421L31.8404 13.2926L28.2498 20.1101L23.9404 13.2298L27.4748 10.9421Z" fill="#CD2524" fill-opacity="0.25"/>
+<path d="M35.6844 11.2843L20.3313 3.07334C20.1219 2.97555 19.8781 2.97555 19.6687 3.07334L4.31562 11.2843C4.12812 11.3996 4.00938 11.5917 4 11.8012V28.1953C4.00938 28.4048 4.12812 28.6004 4.31562 28.7157L19.6656 36.9267C19.875 37.0244 20.1219 37.0244 20.3313 36.9267L35.6844 28.7157C35.8719 28.6004 35.9906 28.4048 36 28.1953V11.8012C35.9906 11.5917 35.8719 11.3996 35.6844 11.2843ZM12.6094 24.5141H12.6719C12.6406 24.5141 12.6094 24.5211 12.6094 24.5525C12.6094 24.6259 12.7312 24.5525 12.7688 24.6259C12.5781 24.6294 12.4 24.7062 12.2656 24.8319C12.2656 24.8704 12.3469 24.8704 12.3875 24.8704C12.3281 24.9437 12.2063 24.9053 12.1656 24.9821C12.1875 25.0031 12.2156 25.0136 12.2469 25.0205C12.2062 25.0205 12.1656 25.0205 12.1656 25.059V25.1707C12.0656 25.1707 12.025 25.2441 11.9438 25.2825C12.1031 25.3942 12.2063 25.2825 12.3656 25.2825C11.9438 25.4327 11.6031 25.6387 11.1781 25.7505C11.1 25.7505 11.1781 25.8622 11.1 25.8622C11.2188 25.9391 11.2812 25.8273 11.4 25.8273C10.8781 26.1067 10.3344 26.3477 9.77188 26.669C9.72813 26.7109 9.7 26.7633 9.69062 26.8192H9.53125C9.45 26.8576 9.49062 26.9484 9.40938 27.0253C9.59063 27.137 9.80938 26.8751 9.93438 27.0253C9.975 27.0253 9.85313 27.0637 9.775 27.0637C9.73438 27.0637 9.73438 27.137 9.69375 27.137H9.57188C9.49062 27.1929 9.40938 27.2313 9.40938 27.3431C9.34063 27.3291 9.26875 27.3606 9.22812 27.4164C10.0875 27.4129 10.9406 27.2663 11.7438 26.9869C12.3688 26.69 12.9344 26.2988 13.4156 25.8238C13.4375 25.8448 13.45 25.8727 13.4562 25.9007C13.3375 26.2255 13.1125 26.5049 12.8094 26.704C12.5875 26.8157 12.4281 26.9834 12.25 27.0602C12.1312 27.1231 12.0188 27.1894 11.9094 27.2663C11.4031 27.4129 10.8844 27.5142 10.3562 27.5736L10.1125 27.605C9.93125 27.6295 9.75312 27.6574 9.575 27.6854L7.98125 26.8367C7.8625 26.7703 7.78125 26.6586 7.75 26.5328C7.77812 26.5188 7.80312 26.5014 7.825 26.4839C7.80312 26.4595 7.77188 26.442 7.7375 26.4315V25.9461C8.575 25.8099 9.39062 25.5724 10.1656 25.2476C9.43125 24.7726 8.60938 24.4303 7.7375 24.2452V23.1171C8.18125 23.1835 8.61875 23.2813 9.04688 23.407C9.37813 23.5222 9.69375 23.6654 9.99375 23.8401C10.1094 23.9448 10.2375 24.0391 10.375 24.1195C10.5719 24.2242 10.8094 24.2382 11.0156 24.1579H11.2812C11.8531 24.0706 12.3906 23.8366 12.8281 23.4838C12.8281 23.5187 12.8688 23.5187 12.9094 23.5187C12.8469 23.8156 12.7312 24.102 12.5688 24.3639C12.5688 24.4024 12.5281 24.4757 12.6094 24.5141ZM14.8625 27.1754C15.0625 27.0986 15.1844 26.9694 15.3656 26.8926C15.325 26.931 15.325 27.0078 15.2875 27.0427C15.1375 27.13 14.9938 27.2313 14.8625 27.3396C14.4125 27.7133 13.9875 28.1149 13.5969 28.541C13.3938 28.7646 13.175 28.9706 12.9562 29.1767C12.8781 29.243 12.7969 29.3059 12.7094 29.3618L10.6875 28.2791C10.975 28.3035 11.2625 28.2896 11.5469 28.2407C11.7812 28.1778 12.0125 28.0975 12.2312 27.9962V28.0695C12.7906 27.8635 13.2156 27.3955 13.7812 27.2278C13.8 27.2278 13.8812 27.3012 13.9625 27.2663C14.2562 26.9275 14.7 26.7319 15.1688 26.7424C15.1688 26.7808 15.1688 26.8192 15.2094 26.8192H15.2281C15.1094 26.9135 14.9688 27.0043 14.8281 27.0986C14.7844 27.137 14.8219 27.1754 14.8625 27.1754ZM7.7375 22.5827V22.443C8.15 22.3418 8.57812 22.2964 9.00625 22.3033C9.13438 22.2859 9.2625 22.2859 9.39062 22.3033C8.825 22.3033 8.26562 22.3976 7.7375 22.5827ZM32.2156 26.3722C32.2063 26.5328 32.1156 26.676 31.9719 26.7633L23.9094 31.122C22.9844 30.8776 22.0719 30.5807 21.1812 30.2384C20.9219 29.711 20.9062 29.1068 21.1438 28.569C21.2062 28.3385 21.3 28.1184 21.425 27.9089C21.4438 27.8914 21.4625 27.874 21.4625 27.853C21.475 27.853 21.4844 27.846 21.4844 27.8355C21.5719 27.6889 21.675 27.5526 21.7844 27.4199L21.7969 27.4095L21.8125 27.3955L21.825 27.3815C21.825 27.364 21.8469 27.3466 21.8656 27.3256C21.8844 27.2872 21.925 27.2697 21.9469 27.2313C22.0875 27.0951 22.2406 26.9694 22.4094 26.8611C22.5781 26.8017 22.7531 26.7598 22.9312 26.7284C23.5813 26.7738 24.225 26.8541 24.8625 26.9729C24.9438 26.9834 25.0188 27.0078 25.0844 27.0462C25.325 27.0916 25.575 27.0777 25.8094 27.0078C26.1187 26.9554 26.3781 26.7563 26.4937 26.4839C26.6375 26.2394 26.65 25.9496 26.5344 25.6946C26.3906 25.4885 26.5219 25.3698 26.6781 25.2545L26.7313 25.2126C26.8031 25.1672 26.8656 25.1148 26.9188 25.052C27.0188 24.8634 26.8375 24.7551 26.7969 24.584C26.7563 24.5106 26.6156 24.5456 26.5344 24.4338C26.8156 24.322 27.2188 24.116 27.0375 23.7947C26.9188 23.627 26.7375 23.3267 26.9594 23.159C27.2406 23.0088 27.6438 23.0438 27.7625 22.7993C27.8438 22.5129 27.7563 22.2055 27.5281 21.9925L27.4688 21.9122C27.4094 21.8353 27.3531 21.755 27.3 21.6747C27.175 21.4756 27.0312 21.287 26.8781 21.1089C26.7031 20.8784 26.5594 20.6234 26.4563 20.358C26.3344 20.0751 26.4969 19.8306 26.4969 19.5512C26.5094 19.0064 26.4188 18.4685 26.2344 17.9516C26.1344 17.6897 26.0938 17.4068 25.9719 17.1623C25.9562 17.0051 25.8938 16.855 25.7906 16.7327C25.7531 16.6524 25.7531 16.5651 25.7906 16.4882C25.9562 16.38 26.1094 16.2612 26.2563 16.1285C26.3469 15.9399 26.2781 15.7199 26.0938 15.6046C25.8344 15.4929 25.8562 15.8491 25.6719 15.9224H25.5531C25.5125 15.8281 25.5906 15.7932 25.6719 15.7164C25.6719 15.6815 25.6719 15.6046 25.6313 15.6046C25.4719 15.6046 25.3312 15.5662 25.2906 15.4929C24.9062 15.0458 24.3875 14.7105 23.8031 14.5324C23.9531 14.5778 24.1063 14.6023 24.2656 14.6092C24.5344 14.6616 24.8156 14.6372 25.0688 14.5324C25.25 14.4765 25.2906 14.1762 25.3719 14.0085C25.4031 13.8409 25.3594 13.6697 25.25 13.537C25.0688 13.2926 24.8188 13.097 24.525 12.9747C24.3406 12.8944 24.1594 12.8071 23.9813 12.7128C23.9219 12.6709 23.8531 12.6394 23.7812 12.6185C21.4094 11.5113 16.525 12.4683 16.1531 12.6185H16.1469C15.8031 12.7093 15.4688 12.828 15.1469 12.9712C14.25 13.2821 13.5531 13.9596 13.2562 14.8083C12.8 15.0877 12.4312 15.4754 12.1906 15.9329C11.8469 16.5301 11.3438 17.0575 11.425 17.7316C11.5062 18.3113 11.6469 18.8352 11.7688 19.436C11.8 19.6385 11.8562 19.8376 11.9281 20.0332C12.0063 20.2392 11.9281 20.5012 12.0469 20.6688C12.1094 20.7806 12.0688 20.9133 12.2281 20.9901V21.1368C12.2688 21.1752 12.2688 21.2137 12.35 21.2137V21.3603C12.6969 21.6782 12.9969 22.0379 13.2375 22.4291C13.3156 22.6351 12.8531 22.5408 12.675 22.4675C12.3438 22.2649 12.0406 22.0274 11.7719 21.755C11.7469 21.776 11.7344 21.8004 11.7281 21.8284C11.8906 22.0903 12.4531 22.4116 12.1531 22.5793C11.9906 22.6526 11.8094 22.4675 11.65 22.6177C11.6094 22.6735 11.65 22.7469 11.65 22.8237C11.4281 22.6735 11.1875 22.7469 10.9656 22.6735C10.8063 22.6351 10.7625 22.3557 10.5812 22.3557C10.1062 22.2475 9.62188 22.1636 9.13438 22.1112C8.67188 22.0484 8.20938 22.0065 7.74375 21.9925V13.8199C7.74375 13.6593 7.8375 13.5091 7.9875 13.4288L19.9781 6.90118L31.9719 13.3659C32.1219 13.4462 32.2156 13.5964 32.2156 13.7571V26.3722ZM25.8531 20.2183C25.8031 20.2881 25.7188 20.33 25.6281 20.33C25.5469 20.3929 25.4719 20.4593 25.4031 20.5326C25.4813 20.5326 25.4031 20.6444 25.4813 20.6444C25.3188 20.8085 25.5438 21.1613 25.3188 21.2346C25.0219 21.308 24.7125 21.308 24.4156 21.2346C24.4594 21.2241 24.5063 21.2206 24.55 21.2241H24.6187C24.7188 21.2346 24.8219 21.1962 24.8875 21.1229V20.9762C24.8875 20.9377 24.8469 20.9377 24.8094 20.9377C24.7875 20.9587 24.7594 20.9727 24.7281 20.9762C24.725 20.9063 24.675 20.8469 24.6063 20.826C24.3875 20.8539 24.1719 20.7771 24.0312 20.6234C24.1375 20.5745 24.2625 20.5606 24.3781 20.585C24.4813 20.585 24.4406 20.4209 24.5625 20.344H24.6875C24.9312 20.0681 25.3844 19.9948 25.4656 19.7188C25.4656 19.642 25.2406 19.642 25.0781 19.6071C24.8563 19.5826 24.6344 19.5931 24.4219 19.642C24.1344 19.6804 23.85 19.7503 23.5813 19.8481C23.8031 19.6944 24.0531 19.5757 24.3188 19.4953C24.5031 19.429 24.6969 19.3801 24.8938 19.3486L24.9969 19.3277L25.1063 19.3067C25.25 19.2683 25.4031 19.2683 25.55 19.3067C25.7344 19.3836 26.0406 19.3836 26.0813 19.4918C26.1625 19.6944 25.9594 19.897 25.7344 20.0471C25.6875 20.1065 25.8531 20.1484 25.8531 20.2183Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/health.svg b/src/assets/logos/health.svg
index 12f2a469b3a7e0bba6c1e8285fb144a1edb96799..cbb81d7d90986ab0f4d385e22e4106e82ef73432 100644
--- a/src/assets/logos/health.svg
+++ b/src/assets/logos/health.svg
@@ -1,4 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.4 12H17.6V17.6H12V22.4H17.6V28H22.4V22.4H28V17.6H22.4V12Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.4 12H17.6V17.6H12V22.4H17.6V28H22.4V22.4H28V17.6H22.4V12Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/housing.svg b/src/assets/logos/housing.svg
index d3604d9c5a7913a49af1d8b3b9dfd00c9c526f6b..47ac7c16914247195e63e2c6759091c210b7c8e9 100644
--- a/src/assets/logos/housing.svg
+++ b/src/assets/logos/housing.svg
@@ -1,13 +1,13 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.7613 9.5H18.6309V19.6759C19.5106 20.4343 20.7056 21.4476 21.9697 22.3956L22.3697 22.6956V23.1956V23.5818V23.5835V30.5L27.7613 30.5V9.5ZM18.6309 30.5L20.3697 30.5H21.3697V29.5V23.5835V23.5818V23.1956C20.3756 22.4501 19.4216 21.6634 18.6309 20.9923V30.5Z" fill="white"/>
-<rect x="20.457" y="16.8043" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="20.457" y="12.2391" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="24.1084" y="16.8043" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="24.1084" y="12.2391" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="24.1084" y="21.3695" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="24.1084" y="25.9348" width="1.82609" height="1.82609" fill="#333333"/>
-<path d="M17.0609 19.6416C16.9077 19.5107 16.7012 19.5107 16.548 19.6416C15.7561 20.318 14.5219 21.3695 12.2393 23.1956V23.5825V30.5H21.3697V23.5835V23.5818V23.1956C19.5436 21.8261 17.8528 20.318 17.0609 19.6416Z" fill="white"/>
-<rect x="14.0654" y="25.0217" width="1.82609" height="1.82609" fill="#333333"/>
-<rect x="17.7178" y="25.0217" width="1.82609" height="1.82609" fill="#333333"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.761 9.5H18.6306V19.6759C19.5103 20.4343 20.7053 21.4476 21.9694 22.3956L22.3694 22.6956V23.1956V23.5818V23.5835V30.5L27.761 30.5V9.5ZM18.6306 30.5L20.3694 30.5H21.3694V29.5V23.5835V23.5818V23.1956C20.3753 22.4501 19.4213 21.6634 18.6306 20.9923V30.5Z" fill="#A50F0E"/>
+<rect x="20.4566" y="16.8043" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="20.4566" y="12.2391" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="24.1084" y="16.8043" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="24.1084" y="12.2391" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="24.1084" y="21.3695" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="24.1084" y="25.9348" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<path d="M17.0608 19.6416C16.9076 19.5107 16.7011 19.5107 16.5479 19.6416C15.756 20.318 14.5218 21.3695 12.2392 23.1956V23.5825V30.5H21.3696V23.5835V23.5818V23.1956C19.5435 21.8261 17.8527 20.318 17.0608 19.6416Z" fill="#A50F0E"/>
+<rect x="14.0653" y="25.0217" width="1.82609" height="1.82609" fill="#FFE5E4"/>
+<rect x="17.7175" y="25.0217" width="1.82609" height="1.82609" fill="#FFE5E4"/>
</svg>
diff --git a/src/assets/logos/idDoc.svg b/src/assets/logos/idDoc.svg
index bb302820e4e84dc66c6ba84ce465c5816db401aa..bac23c531baf07426ad7a27868e54bd187dc8207 100644
--- a/src/assets/logos/idDoc.svg
+++ b/src/assets/logos/idDoc.svg
@@ -1,4 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 13.7581C9 13.4819 9.22386 13.2581 9.5 13.2581H30.5C30.7761 13.2581 31 13.4819 31 13.7581V26.2419C31 26.5181 30.7761 26.7419 30.5 26.7419H9.5C9.22386 26.7419 9 26.5181 9 26.2419V13.7581ZM19.645 16.0564C19.645 15.6422 19.9808 15.3064 20.395 15.3064H23.8628C24.277 15.3064 24.6128 15.6422 24.6128 16.0564C24.6128 16.4706 24.277 16.8064 23.8628 16.8064H20.395C19.9808 16.8064 19.645 16.4706 19.645 16.0564ZM20.1451 19.3549C19.8689 19.3549 19.6451 19.5788 19.6451 19.8549C19.6451 20.1311 19.8689 20.3549 20.1451 20.3549H28.3709C28.647 20.3549 28.8709 20.1311 28.8709 19.8549C28.8709 19.5788 28.647 19.3549 28.3709 19.3549H20.1451ZM19.6451 22.6936C19.6451 22.4175 19.8689 22.1936 20.1451 22.1936H25.5322C25.8083 22.1936 26.0322 22.4175 26.0322 22.6936C26.0322 22.9698 25.8083 23.1936 25.5322 23.1936H20.1451C19.8689 23.1936 19.6451 22.9698 19.6451 22.6936ZM20.1451 23.6129C19.8689 23.6129 19.6451 23.8368 19.6451 24.1129C19.6451 24.3891 19.8689 24.6129 20.1451 24.6129H27.6612C27.9373 24.6129 28.1612 24.3891 28.1612 24.1129C28.1612 23.8368 27.9373 23.6129 27.6612 23.6129H20.1451ZM12.1743 21.2772C12.5171 20.9344 12.982 20.7418 13.4668 20.7418H16.1224C16.6071 20.7418 17.072 20.9344 17.4148 21.2772C17.7576 21.6199 17.9502 22.0848 17.9502 22.5696V23.7978C17.9502 24.0739 17.7263 24.2978 17.4502 24.2978C17.174 24.2978 16.9502 24.0739 16.9502 23.7978V22.5696C16.9502 22.3501 16.863 22.1395 16.7077 21.9843C16.5525 21.829 16.3419 21.7418 16.1224 21.7418H13.4668C13.2472 21.7418 13.0367 21.829 12.8814 21.9843C12.7262 22.1395 12.6389 22.3501 12.6389 22.5696V23.7978C12.6389 24.0739 12.4151 24.2978 12.1389 24.2978C11.8628 24.2978 11.6389 24.0739 11.6389 23.7978V22.5696C11.6389 22.0848 11.8315 21.6199 12.1743 21.2772ZM14.7936 20.462C16.0793 20.462 17.1215 19.4198 17.1215 18.1342C17.1215 16.8486 16.0793 15.8064 14.7936 15.8064C13.508 15.8064 12.4658 16.8486 12.4658 18.1342C12.4658 19.4198 13.508 20.462 14.7936 20.462ZM14.7936 19.462C15.527 19.462 16.1215 18.8675 16.1215 18.1342C16.1215 17.4009 15.527 16.8064 14.7936 16.8064C14.0603 16.8064 13.4658 17.4009 13.4658 18.1342C13.4658 18.8675 14.0603 19.462 14.7936 19.462Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 13.7581C9 13.4819 9.22386 13.2581 9.5 13.2581H30.5C30.7761 13.2581 31 13.4819 31 13.7581V26.2419C31 26.5181 30.7761 26.7419 30.5 26.7419H9.5C9.22386 26.7419 9 26.5181 9 26.2419V13.7581ZM19.645 16.0564C19.645 15.6422 19.9808 15.3064 20.395 15.3064H23.8628C24.277 15.3064 24.6128 15.6422 24.6128 16.0564C24.6128 16.4706 24.277 16.8064 23.8628 16.8064H20.395C19.9808 16.8064 19.645 16.4706 19.645 16.0564ZM20.1451 19.3549C19.8689 19.3549 19.6451 19.5788 19.6451 19.8549C19.6451 20.1311 19.8689 20.3549 20.1451 20.3549H28.3709C28.647 20.3549 28.8709 20.1311 28.8709 19.8549C28.8709 19.5788 28.647 19.3549 28.3709 19.3549H20.1451ZM19.6451 22.6936C19.6451 22.4175 19.8689 22.1936 20.1451 22.1936H25.5322C25.8083 22.1936 26.0322 22.4175 26.0322 22.6936C26.0322 22.9698 25.8083 23.1936 25.5322 23.1936H20.1451C19.8689 23.1936 19.6451 22.9698 19.6451 22.6936ZM20.1451 23.6129C19.8689 23.6129 19.6451 23.8368 19.6451 24.1129C19.6451 24.3891 19.8689 24.6129 20.1451 24.6129H27.6612C27.9373 24.6129 28.1612 24.3891 28.1612 24.1129C28.1612 23.8368 27.9373 23.6129 27.6612 23.6129H20.1451ZM12.1743 21.2772C12.5171 20.9344 12.982 20.7418 13.4668 20.7418H16.1224C16.6071 20.7418 17.072 20.9344 17.4148 21.2772C17.7576 21.6199 17.9502 22.0848 17.9502 22.5696V23.7978C17.9502 24.0739 17.7263 24.2978 17.4502 24.2978C17.174 24.2978 16.9502 24.0739 16.9502 23.7978V22.5696C16.9502 22.3501 16.863 22.1395 16.7077 21.9843C16.5525 21.829 16.3419 21.7418 16.1224 21.7418H13.4668C13.2472 21.7418 13.0367 21.829 12.8814 21.9843C12.7262 22.1395 12.6389 22.3501 12.6389 22.5696V23.7978C12.6389 24.0739 12.4151 24.2978 12.1389 24.2978C11.8628 24.2978 11.6389 24.0739 11.6389 23.7978V22.5696C11.6389 22.0848 11.8315 21.6199 12.1743 21.2772ZM14.7936 20.462C16.0793 20.462 17.1215 19.4198 17.1215 18.1342C17.1215 16.8486 16.0793 15.8064 14.7936 15.8064C13.508 15.8064 12.4658 16.8486 12.4658 18.1342C12.4658 19.4198 13.508 20.462 14.7936 20.462ZM14.7936 19.462C15.527 19.462 16.1215 18.8675 16.1215 18.1342C16.1215 17.4009 15.527 16.8064 14.7936 16.8064C14.0603 16.8064 13.4658 17.4009 13.4658 18.1342C13.4658 18.8675 14.0603 19.462 14.7936 19.462Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/needs.svg b/src/assets/logos/needs.svg
index d12a7cf32ac3124d13dfc244d7bdf96f6a6439cd..3b11d67acad7a1eb221702c82ba8124ac14ae49b 100644
--- a/src/assets/logos/needs.svg
+++ b/src/assets/logos/needs.svg
@@ -1,9 +1,9 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<rect x="12" y="13.2" width="12.8" height="16.8" rx="2" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.1997 10C15.6474 10 15.1997 10.4477 15.1997 11V13.2H23.8C24.3523 13.2 24.8 13.6477 24.8 14.2V26.8H26.9997C27.552 26.8 27.9997 26.3523 27.9997 25.8V11C27.9997 10.4477 27.552 10 26.9997 10H16.1997Z" fill="white"/>
-<path d="M15.1997 13.2H14.4497V13.95H15.1997V13.2ZM24.8 26.8H24.05V27.55H24.8V26.8ZM15.9497 11C15.9497 10.8619 16.0616 10.75 16.1997 10.75V9.25C15.2332 9.25 14.4497 10.0335 14.4497 11H15.9497ZM15.9497 13.2V11H14.4497V13.2H15.9497ZM15.1997 13.95H23.8V12.45H15.1997V13.95ZM23.8 13.95C23.9381 13.95 24.05 14.0619 24.05 14.2H25.55C25.55 13.2335 24.7665 12.45 23.8 12.45V13.95ZM24.05 14.2V26.8H25.55V14.2H24.05ZM26.9997 26.05H24.8V27.55H26.9997V26.05ZM27.2497 25.8C27.2497 25.9381 27.1378 26.05 26.9997 26.05V27.55C27.9662 27.55 28.7497 26.7665 28.7497 25.8H27.2497ZM27.2497 11V25.8H28.7497V11H27.2497ZM26.9997 10.75C27.1378 10.75 27.2497 10.8619 27.2497 11H28.7497C28.7497 10.0335 27.9662 9.25 26.9997 9.25V10.75ZM16.1997 10.75H26.9997V9.25H16.1997V10.75Z" fill="white"/>
-<path d="M15.1997 25.4286H21.5997" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M16.5718 27.7142L20.0004 27.7142" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M19.8634 20.1844L19.4259 20.5821C19.1058 20.8731 18.5867 20.8731 18.2666 20.5821L17.3916 19.7866C17.0714 19.4956 17.0714 19.0237 17.3916 18.7327L17.8291 18.335C17.9499 18.2252 17.9499 18.0474 17.8291 17.9379L16.2847 16.5339C16.1639 16.4241 15.9684 16.4241 15.8479 16.5339L15.0708 17.2403C14.9171 17.3801 14.8283 17.5699 14.8393 17.7673C14.9981 20.6182 17.3514 22.7579 20.4879 22.9023C20.705 22.9123 20.9138 22.8316 21.0675 22.6919L21.8446 21.9854C21.9654 21.8756 21.9654 21.6979 21.8446 21.5884L20.3002 20.1844C20.1797 20.0748 19.9839 20.0748 19.8634 20.1844Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<rect x="12" y="13.2" width="12.8" height="16.8" rx="2" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.1998 10C15.6475 10 15.1998 10.4477 15.1998 11V13.2H23.8002C24.3524 13.2 24.8002 13.6477 24.8002 14.2V26.8H26.9999C27.5521 26.8 27.9999 26.3523 27.9999 25.8V11C27.9999 10.4477 27.5521 10 26.9999 10H16.1998Z" fill="#A50F0E"/>
+<path d="M15.1998 13.2H14.4498V13.95H15.1998V13.2ZM24.8002 26.8H24.0502V27.55H24.8002V26.8ZM15.9498 11C15.9498 10.8619 16.0618 10.75 16.1998 10.75V9.25C15.2333 9.25 14.4498 10.0335 14.4498 11H15.9498ZM15.9498 13.2V11H14.4498V13.2H15.9498ZM15.1998 13.95H23.8002V12.45H15.1998V13.95ZM23.8002 13.95C23.9382 13.95 24.0502 14.0619 24.0502 14.2H25.5502C25.5502 13.2335 24.7666 12.45 23.8002 12.45V13.95ZM24.0502 14.2V26.8H25.5502V14.2H24.0502ZM26.9999 26.05H24.8002V27.55H26.9999V26.05ZM27.2499 25.8C27.2499 25.9381 27.1379 26.05 26.9999 26.05V27.55C27.9664 27.55 28.7499 26.7665 28.7499 25.8H27.2499ZM27.2499 11V25.8H28.7499V11H27.2499ZM26.9999 10.75C27.1379 10.75 27.2499 10.8619 27.2499 11H28.7499C28.7499 10.0335 27.9664 9.25 26.9999 9.25V10.75ZM16.1998 10.75H26.9999V9.25H16.1998V10.75Z" fill="#A50F0E"/>
+<path d="M15.1998 25.4286H21.5998" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M16.5717 27.7142L20.0003 27.7142" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M19.8635 20.1844L19.426 20.5821C19.1059 20.8731 18.5869 20.8731 18.2667 20.5821L17.3917 19.7866C17.0716 19.4956 17.0716 19.0237 17.3917 18.7327L17.8292 18.335C17.95 18.2252 17.95 18.0474 17.8292 17.9379L16.2848 16.5339C16.164 16.4241 15.9685 16.4241 15.848 16.5339L15.071 17.2403C14.9172 17.3801 14.8284 17.5699 14.8394 17.7673C14.9983 20.6182 17.3515 22.7579 20.488 22.9023C20.7051 22.9123 20.9139 22.8316 21.0676 22.6919L21.8447 21.9854C21.9655 21.8756 21.9655 21.6979 21.8447 21.5884L20.3003 20.1844C20.1798 20.0748 19.984 20.0748 19.8635 20.1844Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/passNumerique.svg b/src/assets/logos/passNumerique.svg
deleted file mode 100644
index 9341bf49737843e86a97371e5f26e721deac0ac7..0000000000000000000000000000000000000000
--- a/src/assets/logos/passNumerique.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20.4865 11.2313H31.7452L29.7343 6.91895L20.4865 11.2313ZM19.6542 27.7831H8.39551L10.4064 32.0954L19.6542 27.7831Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9245 11.8306L27.1283 7.07249L23.4834 4.01404L16.9245 11.8306ZM33.4454 14.932L33.4454 14.932L31.4852 10.7284L31.4853 10.7284L33.4454 14.932ZM23.1653 27.1834L16.6064 35L12.9614 31.9415L23.1653 27.1834Z" fill="white"/>
-<path d="M5.92139 12.1824H34.0785V26.8317H5.92139V12.1824Z" fill="white"/>
-<path d="M8.96582 16.8435C8.96582 16.4757 9.26394 16.1776 9.6317 16.1776H16.4807C16.8485 16.1776 17.1466 16.4757 17.1466 16.8435C17.1466 17.2112 16.8485 17.5094 16.4807 17.5094H9.6317C9.26394 17.5094 8.96582 17.2112 8.96582 16.8435Z" fill="#333333"/>
-<path d="M8.96582 19.5071C8.96582 19.1393 9.26394 18.8412 9.6317 18.8412H19.9052C20.273 18.8412 20.5711 19.1393 20.5711 19.5071C20.5711 19.8748 20.273 20.1729 19.9052 20.1729H9.6317C9.26394 20.1729 8.96582 19.8748 8.96582 19.5071Z" fill="#333333"/>
-<path d="M8.96582 22.1705C8.96582 21.8028 9.26394 21.5046 9.6317 21.5046H24.281C24.6487 21.5046 24.9469 21.8028 24.9469 22.1705C24.9469 22.5383 24.6487 22.8364 24.281 22.8364H9.6317C9.26394 22.8364 8.96582 22.5383 8.96582 22.1705Z" fill="#333333"/>
-<path d="M29.3213 19.507C29.3213 20.0849 28.8528 20.5534 28.2749 20.5534C27.697 20.5534 27.2285 20.0849 27.2285 19.507C27.2285 18.9291 27.697 18.4606 28.2749 18.4606C28.8528 18.4606 29.3213 18.9291 29.3213 19.507Z" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0249 16.942C27.4297 16.7446 27.8754 16.6458 28.3257 16.6536C28.776 16.6615 29.218 16.7758 29.6157 16.9872C29.8506 17.1121 30.066 17.2688 30.2563 17.4523C30.4455 17.6345 30.451 17.9356 30.2687 18.1248C30.0864 18.3139 29.7853 18.3194 29.5962 18.1372C29.4693 18.0149 29.3257 17.9104 29.1691 17.8271C28.904 17.6862 28.6093 17.61 28.3091 17.6047C28.0089 17.5995 27.7117 17.6654 27.4419 17.797C27.2624 17.8845 27.0985 17.9995 26.9556 18.1372C26.7665 18.3194 26.4654 18.3139 26.2831 18.1248C26.1008 17.9356 26.1063 17.6345 26.2955 17.4522C26.5097 17.2457 26.7557 17.0733 27.0249 16.942Z" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.343 15.7026C27.7426 15.6921 27.1483 15.8238 26.6086 16.0871C26.1648 16.3035 25.7683 16.6038 25.4405 16.9703C25.2654 17.1661 24.9647 17.1829 24.7689 17.0077C24.5731 16.8326 24.5564 16.5319 24.7315 16.3362C25.1412 15.878 25.6368 15.5027 26.1916 15.2321C26.8662 14.9031 27.6091 14.7384 28.3596 14.7515C29.1101 14.7646 29.8468 14.9551 30.5095 15.3075C31.0054 15.5711 31.4493 15.9198 31.8217 16.3362C31.9968 16.5319 31.9801 16.8326 31.7843 17.0077C31.5885 17.1829 31.2878 17.1661 31.1127 16.9703C30.8147 16.6372 30.4596 16.3583 30.0629 16.1474C29.5327 15.8655 28.9434 15.713 28.343 15.7026Z" fill="#333333"/>
-</svg>
diff --git a/src/assets/logos/retirement.svg b/src/assets/logos/retirement.svg
index 8f408777749df397592ddde7a0fd4d4a5755fa6f..ff0cd00b0a60a8bc369f9ede23bd64401d44e398 100644
--- a/src/assets/logos/retirement.svg
+++ b/src/assets/logos/retirement.svg
@@ -1,8 +1,8 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path d="M19.7151 14.4034L20.2809 14.138C20.201 13.9676 20.0484 13.8422 19.8657 13.7968C19.683 13.7515 19.4895 13.7909 19.3391 13.9041L19.7151 14.4034ZM12.1867 28.877C12.0754 29.2037 12.25 29.5589 12.5767 29.6702C12.9035 29.7815 13.2586 29.6069 13.3699 29.2802L12.1867 28.877ZM17.4028 14.0765L17.8071 14.5532C18.0313 14.363 18.0927 14.0422 17.9544 13.7827C17.8162 13.5232 17.5157 13.3951 17.2328 13.4751L17.4028 14.0765ZM16.5221 23.4471L17.1396 23.3505C17.1234 23.247 17.0815 23.1492 17.0176 23.0662L16.5221 23.4471ZM16.7853 29.1752C16.8386 29.5162 17.1583 29.7494 17.4994 29.6961C17.8404 29.6428 18.0736 29.3231 18.0203 28.982L16.7853 29.1752ZM21.3047 17.7926L20.7389 18.058C20.8084 18.2062 20.9331 18.3212 21.0865 18.3783L21.3047 17.7926ZM24.4103 19.617C24.7338 19.7375 25.0937 19.573 25.2142 19.2496C25.3348 18.9262 25.1703 18.5662 24.8468 18.4457L24.4103 19.617ZM15.476 15.7109L15.0717 15.2343L14.95 15.3376L14.8927 15.4866L15.476 15.7109ZM17.1104 16.3647L16.7345 15.8654L16.5809 15.9811L16.5188 16.1631L17.1104 16.3647ZM12.905 18.7902C12.9809 19.127 13.3154 19.3384 13.6521 19.2626C13.9889 19.1867 14.2003 18.8522 14.1245 18.5155L12.905 18.7902ZM13.8591 21.0085L16.0266 23.828L17.0176 23.0662L14.8501 20.2467L13.8591 21.0085ZM15.9046 23.5437L16.7853 29.1752L18.0203 28.982L17.1396 23.3505L15.9046 23.5437ZM19.1492 14.6688L20.7389 18.058L21.8706 17.5272L20.2809 14.138L19.1492 14.6688ZM21.0865 18.3783L24.4103 19.617L24.8468 18.4457L21.523 17.207L21.0865 18.3783ZM16.9985 13.5999L15.0717 15.2343L15.8803 16.1876L17.8071 14.5532L16.9985 13.5999ZM14.8927 15.4866L13.5604 18.9505L14.7271 19.3993L16.0594 15.9353L14.8927 15.4866ZM19.3391 13.9041L16.7345 15.8654L17.4864 16.864L20.091 14.9027L19.3391 13.9041ZM16.5188 16.1631L12.1867 28.877L13.3699 29.2802L17.702 16.5663L16.5188 16.1631ZM17.2328 13.4751L13.0641 14.6537L13.4042 15.8566L17.5729 14.678L17.2328 13.4751ZM12.2727 15.9836L12.905 18.7902L14.1245 18.5155L13.4922 15.7088L12.2727 15.9836ZM13.0641 14.6537C12.4889 14.8164 12.1413 15.4004 12.2727 15.9836L13.4922 15.7088C13.5068 15.7736 13.4681 15.8385 13.4042 15.8566L13.0641 14.6537ZM14.8501 20.2467C14.6642 20.0049 14.6176 19.6839 14.7271 19.3993L13.5604 18.9505C13.2946 19.6417 13.4077 20.4214 13.8591 21.0085L14.8501 20.2467Z" fill="white"/>
-<circle cx="20.7054" cy="11.4613" r="1.21128" fill="white" stroke="white" stroke-width="1.5"/>
-<ellipse cx="18.7689" cy="14.0201" rx="1.33306" ry="0.597577" transform="rotate(14.2529 18.7689 14.0201)" fill="white"/>
-<path d="M24.1004 20.7929L24.0632 20.4462C24.0016 19.8718 24.4173 19.3562 24.9917 19.2946V19.2946C25.5661 19.233 26.0817 19.6487 26.1433 20.2231L27.2213 30.277" stroke="white" stroke-linecap="round"/>
-<path d="M14.0815 19.9603L15.4762 22.0523L16.8709 16.4736L19.6603 14.3815L17.9169 13.6842L15.4762 15.7762L14.0815 19.9603Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path d="M19.7152 14.4034L20.281 14.138C20.2011 13.9676 20.0485 13.8422 19.8658 13.7968C19.6831 13.7515 19.4896 13.7909 19.3392 13.9041L19.7152 14.4034ZM12.1868 28.877C12.0755 29.2037 12.2501 29.5589 12.5769 29.6702C12.9036 29.7815 13.2587 29.6069 13.37 29.2802L12.1868 28.877ZM17.4029 14.0765L17.8072 14.5532C18.0315 14.363 18.0928 14.0422 17.9545 13.7827C17.8163 13.5232 17.5158 13.3951 17.2329 13.4751L17.4029 14.0765ZM16.5222 23.4471L17.1397 23.3505C17.1235 23.247 17.0816 23.1492 17.0177 23.0662L16.5222 23.4471ZM16.7854 29.1752C16.8388 29.5162 17.1585 29.7494 17.4995 29.6961C17.8405 29.6428 18.0738 29.3231 18.0204 28.982L16.7854 29.1752ZM21.3048 17.7926L20.739 18.058C20.8085 18.2062 20.9333 18.3212 21.0866 18.3783L21.3048 17.7926ZM24.4104 19.617C24.7339 19.7375 25.0938 19.573 25.2143 19.2496C25.3349 18.9262 25.1704 18.5662 24.8469 18.4457L24.4104 19.617ZM15.4762 15.7109L15.0719 15.2343L14.9501 15.3376L14.8928 15.4866L15.4762 15.7109ZM17.1105 16.3647L16.7346 15.8654L16.581 15.9811L16.5189 16.1631L17.1105 16.3647ZM12.9052 18.7902C12.981 19.127 13.3155 19.3384 13.6522 19.2626C13.989 19.1867 14.2005 18.8522 14.1246 18.5155L12.9052 18.7902ZM13.8592 21.0085L16.0267 23.828L17.0177 23.0662L14.8502 20.2467L13.8592 21.0085ZM15.9047 23.5437L16.7854 29.1752L18.0204 28.982L17.1397 23.3505L15.9047 23.5437ZM19.1493 14.6688L20.739 18.058L21.8707 17.5272L20.281 14.138L19.1493 14.6688ZM21.0866 18.3783L24.4104 19.617L24.8469 18.4457L21.5231 17.207L21.0866 18.3783ZM16.9986 13.5999L15.0719 15.2343L15.8804 16.1876L17.8072 14.5532L16.9986 13.5999ZM14.8928 15.4866L13.5605 18.9505L14.7272 19.3993L16.0595 15.9353L14.8928 15.4866ZM19.3392 13.9041L16.7346 15.8654L17.4865 16.864L20.0911 14.9027L19.3392 13.9041ZM16.5189 16.1631L12.1868 28.877L13.37 29.2802L17.7021 16.5663L16.5189 16.1631ZM17.2329 13.4751L13.0642 14.6537L13.4043 15.8566L17.573 14.678L17.2329 13.4751ZM12.2728 15.9836L12.9052 18.7902L14.1246 18.5155L13.4923 15.7088L12.2728 15.9836ZM13.0642 14.6537C12.489 14.8164 12.1415 15.4004 12.2728 15.9836L13.4923 15.7088C13.5069 15.7736 13.4682 15.8385 13.4043 15.8566L13.0642 14.6537ZM14.8502 20.2467C14.6643 20.0049 14.6177 19.6839 14.7272 19.3993L13.5605 18.9505C13.2947 19.6417 13.4078 20.4214 13.8592 21.0085L14.8502 20.2467Z" fill="#A50F0E"/>
+<circle cx="20.7056" cy="11.4613" r="1.21128" fill="#A50F0E" stroke="#A50F0E" stroke-width="1.5"/>
+<ellipse cx="18.7692" cy="14.0201" rx="1.33306" ry="0.597577" transform="rotate(14.2529 18.7692 14.0201)" fill="#A50F0E"/>
+<path d="M24.1006 20.7929L24.0634 20.4462C24.0019 19.8718 24.4176 19.3562 24.992 19.2946V19.2946C25.5664 19.233 26.082 19.6487 26.1436 20.2231L27.2216 30.277" stroke="#A50F0E" stroke-linecap="round"/>
+<path d="M14.0816 19.9603L15.4763 22.0523L16.871 16.4736L19.6604 14.3815L17.917 13.6842L15.4763 15.7762L14.0816 19.9603Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/scolarity.svg b/src/assets/logos/scolarity.svg
index 370e36a1f2d9b83950e1ba25b3699b90d0d68aba..fa7ac4b9a1d58d10b1fc255025abe2496d1d3ab3 100644
--- a/src/assets/logos/scolarity.svg
+++ b/src/assets/logos/scolarity.svg
@@ -1,13 +1,13 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path d="M24.5635 21.6679L20.6951 21.1152" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M28.6509 25.2976L28.202 23.4247L26.6249 21.7195" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="25.6799" cy="18.8948" r="1.65788" fill="white"/>
-<path d="M26.7847 30.4999V25.1927V21.9496C26.7847 21.7708 26.6837 21.6073 26.5238 21.5274V21.5274C25.9923 21.2616 25.3667 21.2616 24.8351 21.5274V21.5274C24.6752 21.6073 24.5742 21.7708 24.5742 21.9496V25.1927V30.4999" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M25.0742 22.0924L25.8324 21.8672L26.2847 22.0539V25.3417C25.9 25.2024 25.459 25.2024 25.0742 25.3417V22.0924Z" fill="white" stroke="white"/>
-<path d="M11.3496 21.1667L12.1274 17.9341L14.5804 14.8848" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.5713 14.9445L20.7061 21.1051" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="16.0158" cy="11.6389" r="2.13888" fill="white"/>
-<path d="M17.5725 30.5V20.912V15.1853C17.5725 15.0856 17.5243 14.9921 17.443 14.9344V14.9344C16.5891 14.3277 15.4448 14.3277 14.5909 14.9344V14.9344C14.5097 14.9921 14.4614 15.0856 14.4614 15.1853V20.912V30.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.4592 15.2278V22.865C16.7325 21.7751 15.1309 21.7751 14.4043 22.865V14.846L15.9317 14.4641L17.4592 15.2278Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path d="M24.5635 21.6679L20.6951 21.1152" stroke="#A50F0E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.6506 25.2976L28.2018 23.4247L26.6246 21.7195" stroke="#A50F0E" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="25.6798" cy="18.8948" r="1.65788" fill="#A50F0E"/>
+<path d="M26.7847 30.4999V25.1927V21.9496C26.7847 21.7708 26.6837 21.6073 26.5238 21.5274V21.5274C25.9923 21.2616 25.3667 21.2616 24.8351 21.5274V21.5274C24.6752 21.6073 24.5742 21.7708 24.5742 21.9496V25.1927V30.4999" stroke="#A50F0E" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.0742 22.0924L25.8324 21.8672L26.2847 22.0539V25.3417C25.9 25.2024 25.459 25.2024 25.0742 25.3417V22.0924Z" fill="#A50F0E" stroke="#A50F0E"/>
+<path d="M11.3495 21.1667L12.1273 17.9341L14.5803 14.8848" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.5714 14.9445L20.7062 21.1051" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="16.016" cy="11.6389" r="2.13888" fill="#A50F0E"/>
+<path d="M17.5727 30.5V20.912V15.1853C17.5727 15.0856 17.5244 14.9921 17.4432 14.9344V14.9344C16.5893 14.3277 15.445 14.3277 14.5911 14.9344V14.9344C14.5098 14.9921 14.4616 15.0856 14.4616 15.1853V20.912V30.5" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.4591 15.2278V22.865C16.7325 21.7751 15.1309 21.7751 14.4042 22.865V14.846L15.9317 14.4641L17.4591 15.2278Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/taxes.svg b/src/assets/logos/taxes.svg
index 7386123598c39ea7186ffd34a4dfc27121126e01..497b6be314acc883edfb9a4fe962c59687fd2f0a 100644
--- a/src/assets/logos/taxes.svg
+++ b/src/assets/logos/taxes.svg
@@ -1,7 +1,13 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<rect y="13" width="40" height="14.4" fill="#333333"/>
-<path d="M16.6183 25.7296C16.778 25.5712 16.9376 25.4128 17.0827 25.24C17.373 24.9088 17.6633 24.6064 17.9971 24.3184C18.0987 24.232 18.2003 24.1456 18.3019 24.088C18.3309 24.0592 18.3309 24.0016 18.36 23.9728C18.2293 24.0304 18.1423 24.1312 17.9971 24.1888C17.9681 24.1888 17.9391 24.16 17.9681 24.1312C18.0697 24.0592 18.1713 23.9872 18.2584 23.9152H18.2439C18.2148 23.9152 18.2148 23.8864 18.2148 23.8576C17.852 23.8 17.5907 24.0448 17.344 24.2608C17.2859 24.2896 17.2279 24.232 17.2134 24.232C16.807 24.3616 16.5022 24.7216 16.0958 24.88V24.8224C15.9362 24.88 15.7765 24.9808 15.6023 25.0096C15.3556 25.0672 15.1379 25.0384 14.9202 25.0384C14.5864 25.0672 14.2526 25.1392 13.9187 25.2112C13.9042 25.2112 13.9042 25.2112 13.8897 25.2256C13.7155 25.2688 13.5414 25.3408 13.3817 25.4272L13.3237 25.4848C13.2656 25.5424 13.2076 25.6144 13.135 25.6432C12.9608 25.7296 12.8302 25.8736 12.6851 26.0032C12.6705 26.0176 12.656 26.0176 12.6415 26.0176C12.4964 26.1616 12.3512 26.3056 12.2061 26.4352C12.1916 26.4496 12.1481 26.4496 12.119 26.4496C12.119 26.4352 12.1335 26.4352 12.1335 26.4208C12.1626 26.3776 12.1771 26.3488 12.2061 26.3056L12.2932 26.176C12.3367 26.1184 12.3658 26.0608 12.4093 26.0176C12.4238 26.0032 12.4238 25.9888 12.4093 25.9888C12.3948 25.9744 12.3803 25.9744 12.3658 25.9744C12.4964 25.8448 12.6705 25.7296 12.8302 25.6288C12.8157 25.6288 12.7867 25.6144 12.8012 25.6C12.8157 25.5712 12.8302 25.5568 12.8447 25.528C12.8447 25.5136 12.8447 25.5136 12.8592 25.4992C12.8592 25.4848 12.8447 25.4848 12.8447 25.4704L12.7141 25.5568C12.6415 25.6144 12.598 25.7296 12.4964 25.7296H12.4528C12.4383 25.7296 12.4238 25.7296 12.4238 25.7152V25.7008C12.4238 25.6864 12.4383 25.6864 12.4383 25.672C12.4383 25.6576 12.4528 25.6576 12.4528 25.6432C12.4528 25.6432 12.4528 25.6288 12.4674 25.6288C12.4674 25.6144 12.4819 25.6 12.4819 25.6C12.4819 25.5856 12.4964 25.5856 12.4964 25.5712C12.5109 25.5568 12.5254 25.528 12.5254 25.5136C12.5254 25.4992 12.5399 25.4992 12.5399 25.4848C12.5544 25.4704 12.5544 25.456 12.569 25.4416C12.5835 25.4128 12.569 25.3984 12.5544 25.3984C12.598 25.3264 12.6706 25.2832 12.7431 25.24H12.7286C12.8302 25.1824 12.9463 25.1248 13.0479 25.0672L13.0914 25.024C12.9318 25.0816 12.8012 25.1536 12.656 25.24C12.656 25.24 12.627 25.2544 12.6125 25.2688C12.6125 25.2688 12.5835 25.2832 12.5399 25.24V25.2256C12.569 25.168 12.656 25.1392 12.6996 25.096C12.7286 25.096 12.7576 25.096 12.7576 25.1248C13.643 24.448 14.8476 24.6064 15.8636 24.2608C15.9507 24.2032 16.0232 24.1456 16.1103 24.1024C16.2409 24.0448 16.3571 23.9152 16.5167 23.8288C16.7344 23.6704 16.8941 23.4688 16.9811 23.2096C16.9811 23.1808 16.9521 23.152 16.9521 23.152C16.5893 23.5264 16.1829 23.8288 15.7475 24.0448C15.1669 24.3472 14.5428 24.2896 13.9333 24.376C13.9623 24.3184 14.0203 24.3184 14.0639 24.3184C14.0639 24.232 14.1219 24.2032 14.18 24.16H14.2671C14.2961 24.16 14.2961 24.1024 14.3251 24.1024C14.3832 24.1024 14.4703 24.0736 14.4412 24.0736C14.3542 23.9584 14.1945 24.16 14.0639 24.0736C14.1219 24.016 14.0929 23.944 14.151 23.9152H14.2671C14.2671 23.8576 14.3251 23.8 14.3251 23.8C14.7315 23.5552 15.1234 23.368 15.5007 23.152C15.4137 23.152 15.3701 23.2384 15.283 23.1808C15.3411 23.1808 15.283 23.0944 15.3411 23.0944C15.6459 23.008 15.8926 22.8496 16.1974 22.7344C16.0813 22.7344 16.0087 22.8208 15.8926 22.7344C15.9507 22.7056 15.9797 22.648 16.0523 22.648V22.5616C16.0523 22.5328 16.0813 22.5328 16.1103 22.5328C16.0813 22.5328 16.0523 22.504 16.0523 22.504C16.0813 22.4464 16.1684 22.4752 16.2119 22.4176C16.1829 22.4176 16.1248 22.4176 16.1248 22.3888C16.2119 22.2736 16.3425 22.2592 16.4877 22.2304C16.4587 22.1728 16.3716 22.2304 16.3716 22.1728C16.3716 22.144 16.4006 22.144 16.4296 22.144H16.3716C16.3135 22.1152 16.3425 22.0576 16.3425 22.0288C16.5022 21.8416 16.5022 21.5968 16.5893 21.3808C16.5602 21.3808 16.5312 21.3808 16.5312 21.352C16.2555 21.6544 15.82 21.7552 15.4137 21.8704H15.225C15.0944 21.928 14.8912 21.928 14.7605 21.8416C14.6444 21.784 14.6009 21.712 14.4848 21.6256C14.2671 21.496 14.0494 21.3808 13.8026 21.2944C13.1205 21.0784 12.4093 20.9632 11.6981 20.992C12.0029 20.8336 12.3367 20.8192 12.656 20.7184C13.1205 20.5888 13.5559 20.416 14.0494 20.4448C13.9623 20.416 13.8607 20.4448 13.7736 20.4448C13.3962 20.416 13.0044 20.5312 12.598 20.6032C12.3222 20.6608 12.0755 20.7616 11.7997 20.8192C11.6401 20.8768 11.553 21.0352 11.3643 21.0064V20.92C11.6401 20.5888 11.9739 20.272 12.4093 20.2432C12.9028 20.1568 13.3672 20.2432 13.8607 20.3008C14.2235 20.3296 14.5428 20.416 14.9057 20.488C15.0363 20.488 15.0653 20.704 15.1814 20.7328C15.3411 20.7904 15.5153 20.7328 15.6749 20.848C15.6749 20.7904 15.6459 20.7328 15.6749 20.6896C15.791 20.5744 15.9216 20.7184 16.0378 20.6608C16.2555 20.5312 15.8491 20.2864 15.733 20.0848C15.733 20.056 15.762 20.0272 15.762 20.0272C15.9797 20.2144 16.1393 20.4304 16.4151 20.5744C16.5457 20.632 16.8796 20.704 16.8215 20.5456C16.6909 20.2432 16.4151 19.9984 16.1829 19.7248V19.6096C16.1248 19.6096 16.1248 19.5808 16.0958 19.552V19.4368C15.9797 19.3792 16.0087 19.2784 15.9652 19.192C15.8781 19.0624 15.9362 18.8608 15.8781 18.7024C15.82 18.544 15.791 18.4 15.762 18.2416C15.6749 17.7808 15.5733 17.3776 15.5153 16.9312C15.4572 16.4128 15.82 16.0096 16.0668 15.5488C16.2555 15.2176 16.4732 14.9008 16.836 14.6848C16.9231 14.3536 17.1408 14.08 17.3585 13.8208C17.5762 13.5616 17.9391 13.3888 18.2003 13.2736C18.5777 13.1008 18.926 13 18.926 13L2 13V27.4H13.4543C13.9768 27.0256 14.4993 26.8528 15.225 26.4928C15.5733 26.3488 16.3571 25.9888 16.6183 25.7296ZM12.4093 23.7712C12.3512 23.7712 12.2496 23.8 12.2787 23.7424C12.3077 23.6128 12.4964 23.6128 12.6125 23.5552C12.6705 23.5264 12.7431 23.4688 12.8012 23.4976C12.8592 23.584 12.9318 23.5552 12.9899 23.6128C12.8157 23.7712 12.598 23.6992 12.4093 23.7712ZM8.2003 23.1808C8.2003 23.1808 8.17127 23.152 8.17127 23.1232C8.53412 22.6624 8.79536 22.2304 9.05661 21.7408C9.41946 21.5536 9.70973 21.28 9.9855 20.9776C10.4499 20.488 10.9434 20.056 11.524 19.7824C11.7417 19.696 12.0174 19.7248 12.2351 19.8112C12.1481 19.9264 12.0174 19.8976 11.9013 19.9696C11.8723 19.9696 11.8433 19.9696 11.8142 19.9408C11.8433 19.912 11.8433 19.8832 11.8433 19.8544C11.5675 20.1568 11.1901 20.2864 10.9724 20.6464C10.8128 20.92 10.6967 21.2656 10.3483 21.352C10.2322 21.3808 10.3774 21.2656 10.3193 21.2944C9.463 21.8128 8.86793 22.4464 8.2003 23.1808ZM10.479 21.3808C10.4499 21.4384 10.4209 21.4384 10.3919 21.496C10.3629 21.5536 10.3338 21.5824 10.2758 21.6112C10.2467 21.6112 10.2177 21.6112 10.2177 21.5824C10.2467 21.4672 10.3338 21.3664 10.4354 21.3376C10.479 21.3232 10.479 21.352 10.479 21.3808ZM11.7562 25.456C11.7417 25.4848 11.7126 25.5136 11.6836 25.5424C11.7126 25.5424 11.7417 25.5712 11.7126 25.5856C11.6546 25.6432 11.582 25.7008 11.5094 25.7296H11.4659C11.4369 25.7584 11.3933 25.7872 11.3643 25.8304C11.3353 25.8592 11.1756 25.8448 11.2192 25.8016C11.2917 25.744 11.3498 25.672 11.4224 25.6144C11.4659 25.5856 11.5094 25.5424 11.5385 25.4992C11.553 25.4704 11.5675 25.456 11.5965 25.4416C11.6401 25.4128 11.7852 25.3984 11.7562 25.456ZM11.2627 25.24C11.1466 25.312 11.045 25.384 10.9434 25.456C10.8273 25.528 10.6967 25.5712 10.5806 25.6288C10.566 25.6144 10.5515 25.6144 10.537 25.6144C10.4354 25.672 10.3483 25.744 10.2613 25.8304L10.2177 25.8736L10.1742 25.9168L10.1161 25.9744C10.1016 25.9888 10.1016 26.0032 10.0726 26.0176C10.0581 26.032 10.0145 26.032 10.0145 26.0032C10 26.0176 9.9855 26.0176 9.97098 26.032C9.95647 26.0464 9.94195 26.0464 9.92744 26.0608H9.89841C9.86939 26.0896 9.82584 26.1184 9.79682 26.1472C9.73876 26.2048 9.68071 26.248 9.63717 26.32V26.3344L9.62265 26.3488C9.62265 26.3488 9.62265 26.3632 9.60814 26.3632C9.60814 26.3776 9.59362 26.3776 9.59362 26.392C9.59362 26.392 9.57911 26.4064 9.5646 26.4064L9.55008 26.392C9.55008 26.392 9.55008 26.3776 9.53557 26.3776C9.52105 26.3632 9.52106 26.3488 9.50654 26.3344V26.32C9.53557 26.2912 9.5646 26.2624 9.59362 26.2192C9.60814 26.2048 9.60814 26.1904 9.62265 26.1904C9.63717 26.176 9.65168 26.1472 9.66619 26.1328C9.66619 26.1184 9.68071 26.1184 9.68071 26.104C9.70973 26.0608 9.73876 26.032 9.76779 25.9888L9.7823 25.9744C9.79682 25.96 9.81133 25.9312 9.82584 25.9168C9.84036 25.9024 9.84036 25.888 9.85487 25.8592V25.8448C9.86939 25.816 9.86939 25.8016 9.8839 25.7872V25.7728C9.8839 25.7584 9.8839 25.7584 9.89841 25.744C9.89841 25.7296 9.89841 25.7152 9.91293 25.7008V25.6864C9.94196 25.6288 9.9855 25.5856 10.029 25.5424H10.0145C9.97098 25.5712 9.94196 25.6 9.91293 25.6288C9.8839 25.6576 9.82584 25.6144 9.86939 25.5856C9.89841 25.5712 9.91293 25.5424 9.92744 25.528C9.97098 25.4848 10.0145 25.4272 10.0726 25.384C10.1016 25.3552 10.1306 25.3408 10.1597 25.3264L10.1742 25.312C10.1887 25.2832 10.2177 25.2688 10.2322 25.24C10.4935 24.9952 10.9434 24.9952 11.2772 24.8368C11.4078 24.7792 11.582 24.8656 11.7126 24.8368C11.7997 24.8368 11.8723 24.8368 11.9594 24.8944C11.7126 24.9376 11.4949 25.096 11.2627 25.24ZM11.8287 23.3392C11.7997 23.3104 11.9158 23.3392 11.9449 23.2816H11.7272C11.6981 23.2816 11.6981 23.2528 11.6981 23.224C11.5675 23.2528 11.3933 23.3104 11.2627 23.3392C11.074 23.3968 10.8999 23.5264 10.6822 23.584C10.3774 23.6992 10.1306 23.944 9.81133 24.0448C9.7823 24.0448 9.7823 24.016 9.7823 23.9872C9.81133 23.9008 9.91293 23.872 9.97098 23.8C9.97098 23.7712 9.97098 23.7424 9.94195 23.7424C10.1597 23.44 10.4645 23.2816 10.7402 23.0368V22.9504C10.8273 22.8352 10.9579 22.792 11.016 22.648C11.045 22.5616 11.1611 22.4608 11.2917 22.4032C11.2627 22.3744 11.2047 22.3744 11.2047 22.3168C11.0885 22.3168 10.9869 22.3744 10.8708 22.288C10.9289 22.2448 10.9869 22.216 11.045 22.1872C11.016 22.1872 11.0015 22.1728 10.9869 22.144C10.9579 22.0864 11.045 22.0288 11.1176 22.0144C11.2337 21.9856 11.3643 21.9856 11.4514 21.8992C11.2627 21.8704 11.045 21.9568 10.8418 21.8416C10.9724 21.4816 11.2047 21.1936 11.524 21.0208C11.553 21.0208 11.611 21.0208 11.611 21.0496C11.611 21.1792 11.524 21.2944 11.3933 21.3232C11.611 21.3808 11.8287 21.3808 12.0465 21.4816C12.0174 21.5392 11.9594 21.5104 11.9303 21.5104C12.061 21.5968 12.2351 21.5392 12.3658 21.64C12.2787 21.7264 12.2061 21.64 12.119 21.64C12.9753 21.8848 13.8752 22.072 14.5864 22.6192C13.9768 22.9216 13.3527 23.0512 12.6996 23.1952C12.6125 23.1952 12.569 23.1952 12.4819 23.1664C12.4819 23.1952 12.4819 23.2528 12.4528 23.2528C12.3367 23.2528 12.2642 23.2528 12.1771 23.3104C12.0755 23.3968 11.9158 23.4256 11.8287 23.3392Z" fill="white"/>
-<path d="M37.9855 13L24.3984 13C24.3984 13 24.4275 13 24.5436 13.072C24.6742 13.144 24.8338 13.2304 24.9354 13.2736C25.1386 13.3744 25.3273 13.504 25.4579 13.7056C25.516 13.792 25.5885 13.9504 25.545 14.0656C25.4869 14.1952 25.4579 14.4256 25.3273 14.4688C25.1676 14.5552 24.9499 14.5552 24.7468 14.5264C24.6307 14.5264 24.5291 14.4976 24.413 14.4688C24.8193 14.6272 25.2112 14.8288 25.4869 15.2032C25.516 15.2608 25.6176 15.2896 25.7337 15.2896C25.7627 15.2896 25.7627 15.3472 25.7627 15.376C25.7046 15.4336 25.6466 15.4624 25.6756 15.5344H25.7627C25.8933 15.4768 25.8788 15.2032 26.0675 15.2896C26.1981 15.376 26.2561 15.5632 26.1836 15.6928C26.0675 15.808 25.9659 15.88 25.8498 15.9664C25.8207 16.024 25.8207 16.096 25.8498 16.1536C25.9368 16.2688 25.9659 16.3696 25.9804 16.4848C26.0675 16.672 26.0965 16.888 26.1691 17.0896C26.2852 17.4928 26.3868 17.9104 26.3577 18.3136C26.3577 18.5296 26.2416 18.7168 26.3287 18.9328C26.3868 19.1488 26.5174 19.3072 26.6335 19.5088C26.7496 19.6672 26.8512 19.7824 26.9383 19.9408C27.0979 20.2144 27.4027 20.488 27.2721 20.8048C27.185 20.992 26.8947 20.9632 26.6915 21.0784C26.5319 21.208 26.6625 21.4384 26.7496 21.568C26.8802 21.8128 26.5899 21.9712 26.3868 22.0432C26.4448 22.1296 26.5464 22.1008 26.5754 22.1584C26.6045 22.288 26.7351 22.3744 26.6625 22.5184C26.5464 22.6768 26.2271 22.7632 26.3868 23.008C26.5029 23.1952 26.4303 23.4112 26.3577 23.6128C26.2706 23.8288 26.082 23.9728 25.8643 24.016C25.7046 24.0736 25.5014 24.0736 25.3418 24.0448C25.2837 24.016 25.2257 23.9872 25.1822 23.9872C24.7177 23.9296 24.2533 23.8 23.7889 23.8C23.6583 23.8288 23.5131 23.8576 23.4115 23.9008C23.2954 23.9872 23.1793 24.088 23.0777 24.1888C23.0632 24.2176 23.0342 24.232 23.0197 24.2608C23.0052 24.2752 22.9907 24.2896 22.9907 24.304L22.9616 24.3328C22.8745 24.4336 22.8165 24.5344 22.7439 24.6496C22.7439 24.664 22.7294 24.664 22.7294 24.664C22.7294 24.6784 22.7149 24.6928 22.7004 24.7072C22.6133 24.8656 22.5407 25.0384 22.4972 25.2112C22.3085 25.8304 22.3956 26.3632 22.5262 26.4928C22.5553 26.5216 23.4261 26.7952 24.0356 27.0688C24.3259 27.1984 24.5145 27.2848 24.6887 27.4H38V13H37.9855Z" fill="white"/>
-<path d="M25.3266 18.2705C25.4427 18.2993 25.6023 18.2993 25.6023 18.3569C25.5443 18.5729 25.225 18.6304 25.0508 18.8464H24.9637C24.8767 18.904 24.9057 19.0336 24.8331 19.0336C24.746 19.0048 24.6735 19.0336 24.5864 19.0624C24.7025 19.1776 24.8331 19.2496 24.9928 19.2208C25.0218 19.2208 25.0799 19.2784 25.0799 19.336C25.0799 19.336 25.1089 19.336 25.1379 19.3072C25.1669 19.3072 25.196 19.3072 25.196 19.336V19.4512C25.1089 19.5664 24.9783 19.5088 24.8621 19.5376C25.0799 19.5952 25.2976 19.5952 25.5007 19.5376C25.6604 19.48 25.5007 19.2064 25.6169 19.0768C25.5588 19.0768 25.6169 18.9904 25.5588 18.9904C25.6169 18.9328 25.6749 18.8608 25.7185 18.832C25.7765 18.832 25.8491 18.8032 25.8781 18.7456C25.8781 18.688 25.762 18.6592 25.791 18.616C25.9507 18.5009 26.0958 18.3425 26.0378 18.1841C26.0087 18.0977 25.791 18.0977 25.6604 18.0401C25.5298 17.9825 25.3556 18.0401 25.196 18.0689C25.0653 18.0689 24.9202 18.1553 24.7896 18.1841C24.6009 18.2417 24.4267 18.3425 24.2671 18.4577C24.4558 18.3713 24.6444 18.3425 24.8621 18.2993C25.0218 18.2705 25.1524 18.2417 25.3266 18.2705Z" fill="white"/>
+<g clip-path="url(#clip0_8017_41418)">
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path d="M16.6183 25.7296C16.778 25.5712 16.9376 25.4128 17.0827 25.24C17.373 24.9088 17.6633 24.6064 17.9971 24.3184C18.0987 24.232 18.2003 24.1456 18.3019 24.088C18.3309 24.0592 18.3309 24.0016 18.36 23.9728C18.2293 24.0304 18.1423 24.1312 17.9971 24.1888C17.9681 24.1888 17.9391 24.16 17.9681 24.1312C18.0697 24.0592 18.1713 23.9872 18.2584 23.9152H18.2439C18.2148 23.9152 18.2148 23.8864 18.2148 23.8576C17.852 23.8 17.5907 24.0448 17.344 24.2608C17.2859 24.2896 17.2279 24.232 17.2134 24.232C16.807 24.3616 16.5022 24.7216 16.0958 24.88V24.8224C15.9362 24.88 15.7765 24.9808 15.6023 25.0096C15.3556 25.0672 15.1379 25.0384 14.9202 25.0384C14.5864 25.0672 14.2526 25.1392 13.9187 25.2112C13.9042 25.2112 13.9042 25.2112 13.8897 25.2256C13.7155 25.2688 13.5414 25.3408 13.3817 25.4272L13.3237 25.4848C13.2656 25.5424 13.2076 25.6144 13.135 25.6432C12.9608 25.7296 12.8302 25.8736 12.6851 26.0032C12.6705 26.0176 12.656 26.0176 12.6415 26.0176C12.4964 26.1616 12.3512 26.3056 12.2061 26.4352C12.1916 26.4496 12.1481 26.4496 12.119 26.4496C12.119 26.4352 12.1335 26.4352 12.1335 26.4208C12.1626 26.3776 12.1771 26.3488 12.2061 26.3056L12.2932 26.176C12.3367 26.1184 12.3658 26.0608 12.4093 26.0176C12.4238 26.0032 12.4238 25.9888 12.4093 25.9888C12.3948 25.9744 12.3803 25.9744 12.3658 25.9744C12.4964 25.8448 12.6705 25.7296 12.8302 25.6288C12.8157 25.6288 12.7867 25.6144 12.8012 25.6C12.8157 25.5712 12.8302 25.5568 12.8447 25.528C12.8447 25.5136 12.8447 25.5136 12.8592 25.4992C12.8592 25.4848 12.8447 25.4848 12.8447 25.4704L12.7141 25.5568C12.6415 25.6144 12.598 25.7296 12.4964 25.7296H12.4528C12.4383 25.7296 12.4238 25.7296 12.4238 25.7152V25.7008C12.4238 25.6864 12.4383 25.6864 12.4383 25.672C12.4383 25.6576 12.4528 25.6576 12.4528 25.6432C12.4528 25.6432 12.4528 25.6288 12.4674 25.6288C12.4674 25.6144 12.4819 25.6 12.4819 25.6C12.4819 25.5856 12.4964 25.5856 12.4964 25.5712C12.5109 25.5568 12.5254 25.528 12.5254 25.5136C12.5254 25.4992 12.5399 25.4992 12.5399 25.4848C12.5544 25.4704 12.5544 25.456 12.569 25.4416C12.5835 25.4128 12.569 25.3984 12.5544 25.3984C12.598 25.3264 12.6706 25.2832 12.7431 25.24H12.7286C12.8302 25.1824 12.9463 25.1248 13.0479 25.0672L13.0914 25.024C12.9318 25.0816 12.8012 25.1536 12.656 25.24C12.656 25.24 12.627 25.2544 12.6125 25.2688C12.6125 25.2688 12.5835 25.2832 12.5399 25.24V25.2256C12.569 25.168 12.656 25.1392 12.6996 25.096C12.7286 25.096 12.7576 25.096 12.7576 25.1248C13.643 24.448 14.8476 24.6064 15.8636 24.2608C15.9507 24.2032 16.0232 24.1456 16.1103 24.1024C16.2409 24.0448 16.3571 23.9152 16.5167 23.8288C16.7344 23.6704 16.8941 23.4688 16.9811 23.2096C16.9811 23.1808 16.9521 23.152 16.9521 23.152C16.5893 23.5264 16.1829 23.8288 15.7475 24.0448C15.1669 24.3472 14.5428 24.2896 13.9333 24.376C13.9623 24.3184 14.0203 24.3184 14.0639 24.3184C14.0639 24.232 14.1219 24.2032 14.18 24.16H14.2671C14.2961 24.16 14.2961 24.1024 14.3251 24.1024C14.3832 24.1024 14.4703 24.0736 14.4412 24.0736C14.3542 23.9584 14.1945 24.16 14.0639 24.0736C14.1219 24.016 14.0929 23.944 14.151 23.9152H14.2671C14.2671 23.8576 14.3251 23.8 14.3251 23.8C14.7315 23.5552 15.1234 23.368 15.5007 23.152C15.4137 23.152 15.3701 23.2384 15.283 23.1808C15.3411 23.1808 15.283 23.0944 15.3411 23.0944C15.6459 23.008 15.8926 22.8496 16.1974 22.7344C16.0813 22.7344 16.0087 22.8208 15.8926 22.7344C15.9507 22.7056 15.9797 22.648 16.0523 22.648V22.5616C16.0523 22.5328 16.0813 22.5328 16.1103 22.5328C16.0813 22.5328 16.0523 22.504 16.0523 22.504C16.0813 22.4464 16.1684 22.4752 16.2119 22.4176C16.1829 22.4176 16.1248 22.4176 16.1248 22.3888C16.2119 22.2736 16.3425 22.2592 16.4877 22.2304C16.4587 22.1728 16.3716 22.2304 16.3716 22.1728C16.3716 22.144 16.4006 22.144 16.4296 22.144H16.3716C16.3135 22.1152 16.3425 22.0576 16.3425 22.0288C16.5022 21.8416 16.5022 21.5968 16.5893 21.3808C16.5602 21.3808 16.5312 21.3808 16.5312 21.352C16.2555 21.6544 15.82 21.7552 15.4137 21.8704H15.225C15.0944 21.928 14.8912 21.928 14.7605 21.8416C14.6444 21.784 14.6009 21.712 14.4848 21.6256C14.2671 21.496 14.0494 21.3808 13.8026 21.2944C13.1205 21.0784 12.4093 20.9632 11.6981 20.992C12.0029 20.8336 12.3367 20.8192 12.656 20.7184C13.1205 20.5888 13.5559 20.416 14.0494 20.4448C13.9623 20.416 13.8607 20.4448 13.7736 20.4448C13.3962 20.416 13.0044 20.5312 12.598 20.6032C12.3222 20.6608 12.0755 20.7616 11.7997 20.8192C11.6401 20.8768 11.553 21.0352 11.3643 21.0064V20.92C11.6401 20.5888 11.9739 20.272 12.4093 20.2432C12.9028 20.1568 13.3672 20.2432 13.8607 20.3008C14.2235 20.3296 14.5428 20.416 14.9057 20.488C15.0363 20.488 15.0653 20.704 15.1814 20.7328C15.3411 20.7904 15.5153 20.7328 15.6749 20.848C15.6749 20.7904 15.6459 20.7328 15.6749 20.6896C15.791 20.5744 15.9216 20.7184 16.0378 20.6608C16.2555 20.5312 15.8491 20.2864 15.733 20.0848C15.733 20.056 15.762 20.0272 15.762 20.0272C15.9797 20.2144 16.1393 20.4304 16.4151 20.5744C16.5457 20.632 16.8796 20.704 16.8215 20.5456C16.6909 20.2432 16.4151 19.9984 16.1829 19.7248V19.6096C16.1248 19.6096 16.1248 19.5808 16.0958 19.552V19.4368C15.9797 19.3792 16.0087 19.2784 15.9652 19.192C15.8781 19.0624 15.9362 18.8608 15.8781 18.7024C15.82 18.544 15.791 18.4 15.762 18.2416C15.6749 17.7808 15.5733 17.3776 15.5153 16.9312C15.4572 16.4128 15.82 16.0096 16.0668 15.5488C16.2555 15.2176 16.4732 14.9008 16.836 14.6848C16.9231 14.3536 17.1408 14.08 17.3585 13.8208C17.5762 13.5616 17.9391 13.3888 18.2003 13.2736C18.5777 13.1008 18.926 13 18.926 13H-1.5V27.4H13.4543C13.9768 27.0256 14.4993 26.8528 15.225 26.4928C15.5733 26.3488 16.3571 25.9888 16.6183 25.7296ZM12.4093 23.7712C12.3512 23.7712 12.2496 23.8 12.2787 23.7424C12.3077 23.6128 12.4964 23.6128 12.6125 23.5552C12.6705 23.5264 12.7431 23.4688 12.8012 23.4976C12.8592 23.584 12.9318 23.5552 12.9899 23.6128C12.8157 23.7712 12.598 23.6992 12.4093 23.7712ZM8.2003 23.1808C8.2003 23.1808 8.17127 23.152 8.17127 23.1232C8.53412 22.6624 8.79536 22.2304 9.05661 21.7408C9.41946 21.5536 9.70973 21.28 9.9855 20.9776C10.4499 20.488 10.9434 20.056 11.524 19.7824C11.7417 19.696 12.0174 19.7248 12.2351 19.8112C12.1481 19.9264 12.0174 19.8976 11.9013 19.9696C11.8723 19.9696 11.8433 19.9696 11.8142 19.9408C11.8433 19.912 11.8433 19.8832 11.8433 19.8544C11.5675 20.1568 11.1901 20.2864 10.9724 20.6464C10.8128 20.92 10.6967 21.2656 10.3483 21.352C10.2322 21.3808 10.3774 21.2656 10.3193 21.2944C9.463 21.8128 8.86793 22.4464 8.2003 23.1808ZM10.479 21.3808C10.4499 21.4384 10.4209 21.4384 10.3919 21.496C10.3629 21.5536 10.3338 21.5824 10.2758 21.6112C10.2467 21.6112 10.2177 21.6112 10.2177 21.5824C10.2467 21.4672 10.3338 21.3664 10.4354 21.3376C10.479 21.3232 10.479 21.352 10.479 21.3808ZM11.7562 25.456C11.7417 25.4848 11.7126 25.5136 11.6836 25.5424C11.7126 25.5424 11.7417 25.5712 11.7126 25.5856C11.6546 25.6432 11.582 25.7008 11.5094 25.7296H11.4659C11.4369 25.7584 11.3933 25.7872 11.3643 25.8304C11.3353 25.8592 11.1756 25.8448 11.2192 25.8016C11.2917 25.744 11.3498 25.672 11.4224 25.6144C11.4659 25.5856 11.5094 25.5424 11.5385 25.4992C11.553 25.4704 11.5675 25.456 11.5965 25.4416C11.6401 25.4128 11.7852 25.3984 11.7562 25.456ZM11.2627 25.24C11.1466 25.312 11.045 25.384 10.9434 25.456C10.8273 25.528 10.6967 25.5712 10.5806 25.6288C10.566 25.6144 10.5515 25.6144 10.537 25.6144C10.4354 25.672 10.3483 25.744 10.2613 25.8304L10.2177 25.8736L10.1742 25.9168L10.1161 25.9744C10.1016 25.9888 10.1016 26.0032 10.0726 26.0176C10.0581 26.032 10.0145 26.032 10.0145 26.0032C10 26.0176 9.9855 26.0176 9.97098 26.032C9.95647 26.0464 9.94195 26.0464 9.92744 26.0608H9.89841C9.86939 26.0896 9.82584 26.1184 9.79682 26.1472C9.73876 26.2048 9.68071 26.248 9.63717 26.32V26.3344L9.62265 26.3488C9.62265 26.3488 9.62265 26.3632 9.60814 26.3632C9.60814 26.3776 9.59362 26.3776 9.59362 26.392C9.59362 26.392 9.57911 26.4064 9.5646 26.4064L9.55008 26.392C9.55008 26.392 9.55008 26.3776 9.53557 26.3776C9.52105 26.3632 9.52106 26.3488 9.50654 26.3344V26.32C9.53557 26.2912 9.5646 26.2624 9.59362 26.2192C9.60814 26.2048 9.60814 26.1904 9.62265 26.1904C9.63717 26.176 9.65168 26.1472 9.66619 26.1328C9.66619 26.1184 9.68071 26.1184 9.68071 26.104C9.70973 26.0608 9.73876 26.032 9.76779 25.9888L9.7823 25.9744C9.79682 25.96 9.81133 25.9312 9.82584 25.9168C9.84036 25.9024 9.84036 25.888 9.85487 25.8592V25.8448C9.86939 25.816 9.86939 25.8016 9.8839 25.7872V25.7728C9.8839 25.7584 9.8839 25.7584 9.89841 25.744C9.89841 25.7296 9.89841 25.7152 9.91293 25.7008V25.6864C9.94196 25.6288 9.9855 25.5856 10.029 25.5424H10.0145C9.97098 25.5712 9.94196 25.6 9.91293 25.6288C9.8839 25.6576 9.82584 25.6144 9.86939 25.5856C9.89841 25.5712 9.91293 25.5424 9.92744 25.528C9.97098 25.4848 10.0145 25.4272 10.0726 25.384C10.1016 25.3552 10.1306 25.3408 10.1597 25.3264L10.1742 25.312C10.1887 25.2832 10.2177 25.2688 10.2322 25.24C10.4935 24.9952 10.9434 24.9952 11.2772 24.8368C11.4078 24.7792 11.582 24.8656 11.7126 24.8368C11.7997 24.8368 11.8723 24.8368 11.9594 24.8944C11.7126 24.9376 11.4949 25.096 11.2627 25.24ZM11.8287 23.3392C11.7997 23.3104 11.9158 23.3392 11.9449 23.2816H11.7272C11.6981 23.2816 11.6981 23.2528 11.6981 23.224C11.5675 23.2528 11.3933 23.3104 11.2627 23.3392C11.074 23.3968 10.8999 23.5264 10.6822 23.584C10.3774 23.6992 10.1306 23.944 9.81133 24.0448C9.7823 24.0448 9.7823 24.016 9.7823 23.9872C9.81133 23.9008 9.91293 23.872 9.97098 23.8C9.97098 23.7712 9.97098 23.7424 9.94195 23.7424C10.1597 23.44 10.4645 23.2816 10.7402 23.0368V22.9504C10.8273 22.8352 10.9579 22.792 11.016 22.648C11.045 22.5616 11.1611 22.4608 11.2917 22.4032C11.2627 22.3744 11.2047 22.3744 11.2047 22.3168C11.0885 22.3168 10.9869 22.3744 10.8708 22.288C10.9289 22.2448 10.9869 22.216 11.045 22.1872C11.016 22.1872 11.0015 22.1728 10.9869 22.144C10.9579 22.0864 11.045 22.0288 11.1176 22.0144C11.2337 21.9856 11.3643 21.9856 11.4514 21.8992C11.2627 21.8704 11.045 21.9568 10.8418 21.8416C10.9724 21.4816 11.2047 21.1936 11.524 21.0208C11.553 21.0208 11.611 21.0208 11.611 21.0496C11.611 21.1792 11.524 21.2944 11.3933 21.3232C11.611 21.3808 11.8287 21.3808 12.0465 21.4816C12.0174 21.5392 11.9594 21.5104 11.9303 21.5104C12.061 21.5968 12.2351 21.5392 12.3658 21.64C12.2787 21.7264 12.2061 21.64 12.119 21.64C12.9753 21.8848 13.8752 22.072 14.5864 22.6192C13.9768 22.9216 13.3527 23.0512 12.6996 23.1952C12.6125 23.1952 12.569 23.1952 12.4819 23.1664C12.4819 23.1952 12.4819 23.2528 12.4528 23.2528C12.3367 23.2528 12.2642 23.2528 12.1771 23.3104C12.0755 23.3968 11.9158 23.4256 11.8287 23.3392Z" fill="#A50F0E"/>
+<path d="M42.5 13H24.3982C24.3982 13 24.4272 13 24.5433 13.072C24.6739 13.144 24.8336 13.2304 24.9352 13.2736C25.1384 13.3744 25.327 13.504 25.4577 13.7056C25.5157 13.792 25.5883 13.9504 25.5447 14.0656C25.4867 14.1952 25.4577 14.4256 25.327 14.4688C25.1674 14.5552 24.9497 14.5552 24.7465 14.5264C24.6304 14.5264 24.5288 14.4976 24.4127 14.4688C24.8191 14.6272 25.2109 14.8288 25.4867 15.2032C25.5157 15.2608 25.6173 15.2896 25.7334 15.2896C25.7624 15.2896 25.7624 15.3472 25.7624 15.376C25.7044 15.4336 25.6463 15.4624 25.6754 15.5344H25.7624C25.8931 15.4768 25.8785 15.2032 26.0672 15.2896C26.1978 15.376 26.2559 15.5632 26.1833 15.6928C26.0672 15.808 25.9656 15.88 25.8495 15.9664C25.8205 16.024 25.8205 16.096 25.8495 16.1536C25.9366 16.2688 25.9656 16.3696 25.9801 16.4848C26.0672 16.672 26.0962 16.888 26.1688 17.0896C26.2849 17.4928 26.3865 17.9104 26.3575 18.3136C26.3575 18.5296 26.2414 18.7168 26.3285 18.9328C26.3865 19.1488 26.5171 19.3072 26.6332 19.5088C26.7493 19.6672 26.8509 19.7824 26.938 19.9408C27.0977 20.2144 27.4024 20.488 27.2718 20.8048C27.1847 20.992 26.8945 20.9632 26.6913 21.0784C26.5316 21.208 26.6623 21.4384 26.7493 21.568C26.88 21.8128 26.5897 21.9712 26.3865 22.0432C26.4446 22.1296 26.5462 22.1008 26.5752 22.1584C26.6042 22.288 26.7348 22.3744 26.6623 22.5184C26.5462 22.6768 26.2269 22.7632 26.3865 23.008C26.5026 23.1952 26.43 23.4112 26.3575 23.6128C26.2704 23.8288 26.0817 23.9728 25.864 24.016C25.7044 24.0736 25.5012 24.0736 25.3416 24.0448C25.2835 24.016 25.2254 23.9872 25.1819 23.9872C24.7175 23.9296 24.2531 23.8 23.7886 23.8C23.658 23.8288 23.5129 23.8576 23.4113 23.9008C23.2952 23.9872 23.1791 24.088 23.0775 24.1888C23.063 24.2176 23.0339 24.232 23.0194 24.2608C23.0049 24.2752 22.9904 24.2896 22.9904 24.304L22.9614 24.3328C22.8743 24.4336 22.8163 24.5344 22.7437 24.6496C22.7437 24.664 22.7292 24.664 22.7292 24.664C22.7292 24.6784 22.7147 24.6928 22.7001 24.7072C22.6131 24.8656 22.5405 25.0384 22.497 25.2112C22.3083 25.8304 22.3954 26.3632 22.526 26.4928C22.555 26.5216 23.4258 26.7952 24.0354 27.0688C24.3256 27.1984 24.5143 27.2848 24.6885 27.4H42.5145V13H42.5Z" fill="#A50F0E"/>
+<path d="M25.3265 18.2704C25.4426 18.2992 25.6022 18.2992 25.6022 18.3568C25.5442 18.5728 25.2249 18.6304 25.0507 18.8464H24.9636C24.8765 18.904 24.9056 19.0336 24.833 19.0336C24.7459 19.0048 24.6733 19.0336 24.5863 19.0624C24.7024 19.1775 24.833 19.2495 24.9926 19.2207C25.0217 19.2207 25.0797 19.2783 25.0797 19.3359C25.0797 19.3359 25.1088 19.3359 25.1378 19.3071C25.1668 19.3071 25.1958 19.3071 25.1958 19.3359V19.4511C25.1088 19.5663 24.9781 19.5087 24.862 19.5375C25.0797 19.5951 25.2974 19.5951 25.5006 19.5375C25.6603 19.4799 25.5006 19.2063 25.6167 19.0768C25.5587 19.0768 25.6167 18.9904 25.5587 18.9904C25.6167 18.9328 25.6748 18.8608 25.7183 18.832C25.7764 18.832 25.849 18.8032 25.878 18.7456C25.878 18.688 25.7619 18.6592 25.7909 18.616C25.9505 18.5008 26.0957 18.3424 26.0376 18.184C26.0086 18.0976 25.7909 18.0976 25.6603 18.04C25.5297 17.9824 25.3555 18.04 25.1958 18.0688C25.0652 18.0688 24.9201 18.1552 24.7895 18.184C24.6008 18.2416 24.4266 18.3424 24.267 18.4576C24.4556 18.3712 24.6443 18.3424 24.862 18.2992C25.0217 18.2704 25.1523 18.2416 25.3265 18.2704Z" fill="#A50F0E"/>
+</g>
+<defs>
+<clipPath id="clip0_8017_41418">
+<rect width="40" height="40" rx="20" fill="white"/>
+</clipPath>
+</defs>
</svg>
diff --git a/src/assets/logos/training.svg b/src/assets/logos/training.svg
index ad5d59bd22930e8b855f4671a2b6a3f1053f5a58..0a35068fd118cf44257f2243d33e5eb0da0fa205 100644
--- a/src/assets/logos/training.svg
+++ b/src/assets/logos/training.svg
@@ -1,9 +1,11 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path d="M20.2495 23.1198V29.1197" stroke="white" stroke-linecap="round"/>
-<path d="M19.9751 27.1198L18.0002 28.6198" stroke="white" stroke-linecap="round"/>
-<path d="M20.5005 27.1198L22.4753 28.6198" stroke="white" stroke-linecap="round"/>
-<path d="M10 10.8804L30 10.8804" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10 22.8805L30 22.8805" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.6678 10.8804C28.4166 11.8404 27.9142 14.7684 27.9142 16.8804C27.9142 18.9924 28.3329 21.8404 28.6678 22.8804H11.3345C11.5857 21.8404 12.0881 19.1844 12.0881 16.8804C12.0881 14.5764 11.5857 11.9204 11.3345 10.8804H28.6678ZM22.0538 15.9364C22.0194 16.1875 21.9447 16.4258 21.8364 16.6444C22.0698 16.7712 22.3373 16.8431 22.6216 16.8431C23.5317 16.8431 24.2696 16.1053 24.2696 15.1952C24.2696 14.285 23.5317 13.5472 22.6216 13.5472C22.1626 13.5472 21.7474 13.7348 21.4486 14.0376C21.6175 14.2174 21.758 14.4242 21.8629 14.6508C22.0323 14.415 22.309 14.2614 22.6216 14.2614C23.1373 14.2614 23.5553 14.6795 23.5553 15.1952C23.5553 15.7108 23.1373 16.1289 22.6216 16.1289C22.408 16.1289 22.2111 16.0571 22.0538 15.9364ZM21.5514 15.6199C21.5514 16.6068 20.7512 17.407 19.7642 17.407C18.7772 17.407 17.9771 16.6068 17.9771 15.6199C17.9771 14.6329 18.7772 13.8327 19.7642 13.8327C20.7512 13.8327 21.5514 14.6329 21.5514 15.6199ZM20.8847 15.6199C20.8847 16.2387 20.383 16.7403 19.7642 16.7403C19.1454 16.7403 18.6438 16.2387 18.6438 15.6199C18.6438 15.001 19.1454 14.4994 19.7642 14.4994C20.383 14.4994 20.8847 15.001 20.8847 15.6199ZM17.6176 18.1494C17.8902 17.8767 18.26 17.7236 18.6455 17.7236H20.8864C21.272 17.7236 21.6418 17.8767 21.9144 18.1494C22.1871 18.422 22.3402 18.7918 22.3402 19.1774V20.2137C22.3402 20.3978 22.191 20.547 22.0069 20.547C21.8228 20.547 21.6736 20.3978 21.6736 20.2137V19.1774C21.6736 18.9686 21.5906 18.7684 21.443 18.6208C21.2954 18.4732 21.0952 18.3902 20.8864 18.3902H18.6455C18.4368 18.3902 18.2366 18.4732 18.089 18.6208C17.9414 18.7684 17.8584 18.9686 17.8584 19.1774V20.2137C17.8584 20.3978 17.7092 20.547 17.5251 20.547C17.341 20.547 17.1918 20.3978 17.1918 20.2137V19.1774C17.1918 18.7918 17.3449 18.422 17.6176 18.1494ZM22.121 17.8211C21.7981 17.527 21.3805 17.3574 20.9433 17.3435C21.1598 17.1906 21.4197 17.1069 21.6883 17.1069H23.5557C23.8981 17.1069 24.2264 17.2429 24.4685 17.4849C24.7106 17.727 24.8466 18.0554 24.8466 18.3977V19.2613C24.8466 19.4586 24.6867 19.6185 24.4894 19.6185C24.2922 19.6185 24.1323 19.4586 24.1323 19.2613V18.3977C24.1323 18.2448 24.0716 18.0981 23.9634 17.99C23.8553 17.8819 23.7087 17.8211 23.5557 17.8211H22.121ZM17.3936 17.8211C17.7165 17.527 18.1341 17.3574 18.5713 17.3435C18.3548 17.1906 18.0949 17.1069 17.8263 17.1069H15.9589C15.6165 17.1069 15.2882 17.2429 15.0461 17.4849C14.804 17.727 14.668 18.0554 14.668 18.3977V19.2613C14.668 19.4586 14.8279 19.6185 15.0252 19.6185C15.2224 19.6185 15.3823 19.4586 15.3823 19.2613V18.3977C15.3823 18.2448 15.443 18.0981 15.5512 17.99C15.6593 17.8819 15.8059 17.8211 15.9589 17.8211H17.3936ZM17.4593 15.9364C17.4936 16.1875 17.5684 16.4258 17.6767 16.6444C17.4432 16.7712 17.1758 16.8431 16.8915 16.8431C15.9813 16.8431 15.2435 16.1053 15.2435 15.1952C15.2435 14.285 15.9813 13.5472 16.8915 13.5472C17.3505 13.5472 17.7657 13.7348 18.0645 14.0376C17.8956 14.2174 17.7551 14.4242 17.6502 14.6508C17.4807 14.415 17.204 14.2614 16.8915 14.2614C16.3758 14.2614 15.9578 14.6795 15.9578 15.1952C15.9578 15.7108 16.3758 16.1289 16.8915 16.1289C17.1051 16.1289 17.3019 16.0571 17.4593 15.9364Z" fill="white"/>
-</svg>
+ <rect width="40" height="40" rx="20" fill="#FFE5E4" />
+ <path d="M20.2494 23.1198V29.1197" stroke="#A50F0E" stroke-linecap="round" />
+ <path d="M19.9755 27.1198L18.0006 28.6198" stroke="#A50F0E" stroke-linecap="round" />
+ <path d="M20.5007 27.1198L22.4756 28.6198" stroke="#A50F0E" stroke-linecap="round" />
+ <path d="M10 10.8804L30 10.8804" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M10 22.8805L30 22.8805" stroke="#A50F0E" stroke-width="1.5" stroke-linecap="round" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M28.6676 10.8804C28.4164 11.8404 27.914 14.7684 27.914 16.8804C27.914 18.9924 28.3326 21.8404 28.6676 22.8804H11.3342C11.5855 21.8404 12.0879 19.1844 12.0879 16.8804C12.0879 14.5764 11.5855 11.9204 11.3342 10.8804H28.6676ZM22.0536 15.9364C22.0192 16.1875 21.9445 16.4258 21.8362 16.6444C22.0696 16.7712 22.3371 16.8431 22.6214 16.8431C23.5315 16.8431 24.2694 16.1053 24.2694 15.1952C24.2694 14.285 23.5315 13.5472 22.6214 13.5472C22.1623 13.5472 21.7471 13.7348 21.4483 14.0376C21.6173 14.2174 21.7578 14.4242 21.8626 14.6508C22.0321 14.415 22.3088 14.2614 22.6214 14.2614C23.137 14.2614 23.5551 14.6795 23.5551 15.1952C23.5551 15.7108 23.137 16.1289 22.6214 16.1289C22.4077 16.1289 22.2109 16.0571 22.0536 15.9364ZM21.5511 15.6199C21.5511 16.6068 20.751 17.407 19.764 17.407C18.777 17.407 17.9769 16.6068 17.9769 15.6199C17.9769 14.6329 18.777 13.8327 19.764 13.8327C20.751 13.8327 21.5511 14.6329 21.5511 15.6199ZM20.8845 15.6199C20.8845 16.2387 20.3828 16.7403 19.764 16.7403C19.1452 16.7403 18.6436 16.2387 18.6436 15.6199C18.6436 15.001 19.1452 14.4994 19.764 14.4994C20.3828 14.4994 20.8845 15.001 20.8845 15.6199ZM17.6173 18.1494C17.89 17.8767 18.2598 17.7236 18.6453 17.7236H20.8862C21.2718 17.7236 21.6416 17.8767 21.9142 18.1494C22.1868 18.422 22.34 18.7918 22.34 19.1774V20.2137C22.34 20.3978 22.1908 20.547 22.0067 20.547C21.8226 20.547 21.6733 20.3978 21.6733 20.2137V19.1774C21.6733 18.9686 21.5904 18.7684 21.4428 18.6208C21.2952 18.4732 21.095 18.3902 20.8862 18.3902H18.6453C18.4366 18.3902 18.2364 18.4732 18.0887 18.6208C17.9411 18.7684 17.8582 18.9686 17.8582 19.1774V20.2137C17.8582 20.3978 17.709 20.547 17.5249 20.547C17.3408 20.547 17.1915 20.3978 17.1915 20.2137V19.1774C17.1915 18.7918 17.3447 18.422 17.6173 18.1494ZM22.1207 17.8211C21.7979 17.527 21.3802 17.3574 20.9431 17.3435C21.1595 17.1906 21.4195 17.1069 21.6881 17.1069H23.5555C23.8979 17.1069 24.2262 17.2429 24.4683 17.4849C24.7104 17.727 24.8464 18.0554 24.8464 18.3977V19.2613C24.8464 19.4586 24.6865 19.6185 24.4892 19.6185C24.292 19.6185 24.1321 19.4586 24.1321 19.2613V18.3977C24.1321 18.2448 24.0713 18.0981 23.9632 17.99C23.8551 17.8819 23.7084 17.8211 23.5555 17.8211H22.1207ZM17.3934 17.8211C17.7163 17.527 18.1339 17.3574 18.5711 17.3435C18.3546 17.1906 18.0946 17.1069 17.826 17.1069H15.9586C15.6163 17.1069 15.2879 17.2429 15.0459 17.4849C14.8038 17.727 14.6678 18.0554 14.6678 18.3977V19.2613C14.6678 19.4586 14.8277 19.6185 15.0249 19.6185C15.2222 19.6185 15.3821 19.4586 15.3821 19.2613V18.3977C15.3821 18.2448 15.4428 18.0981 15.5509 17.99C15.6591 17.8819 15.8057 17.8211 15.9586 17.8211H17.3934ZM17.459 15.9364C17.4934 16.1875 17.5681 16.4258 17.6765 16.6444C17.443 16.7712 17.1755 16.8431 16.8912 16.8431C15.9811 16.8431 15.2433 16.1053 15.2433 15.1952C15.2433 14.285 15.9811 13.5472 16.8912 13.5472C17.3503 13.5472 17.7655 13.7348 18.0643 14.0376C17.8953 14.2174 17.7548 14.4242 17.65 14.6508C17.4805 14.415 17.2038 14.2614 16.8912 14.2614C16.3756 14.2614 15.9575 14.6795 15.9575 15.1952C15.9575 15.7108 16.3756 16.1289 16.8912 16.1289C17.1049 16.1289 17.3017 16.0571 17.459 15.9364Z"
+ fill="#A50F0E" />
+</svg>
\ No newline at end of file
diff --git a/src/assets/logos/transport.svg b/src/assets/logos/transport.svg
index f1673d06ab204a4a8309c93c14cb313f1d9b1f7b..14425c65dd2290a56ad1e35c3d818ef113e74e30 100644
--- a/src/assets/logos/transport.svg
+++ b/src/assets/logos/transport.svg
@@ -1,4 +1,4 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0759 24.1666H24.9243C24.9244 22.493 26.2811 21.1364 27.9546 21.1364C29.6282 21.1364 30.9849 22.493 30.9849 24.1666H31.5C32.0523 24.1666 32.5 23.7189 32.5 23.1666V23.106C32.5 20.3446 30.2614 18.106 27.5 18.106H26.4394C25.0465 15.3202 22.1993 13.5605 19.0847 13.5605H15.0766C13.1961 13.5605 11.4535 14.5472 10.486 16.1597L10.1908 16.6517C9.92101 17.1013 9.49931 17.4396 9.00189 17.6054C8.10498 17.9043 7.5 18.7437 7.5 19.6891V23.1666C7.5 23.7189 7.94772 24.1666 8.5 24.1666H9.01526C9.01527 22.493 10.372 21.1363 12.0456 21.1363C13.7192 21.1363 15.0759 22.493 15.0759 24.1666ZM19.8637 18.106H24.1685C24.4799 18.106 24.6576 17.7505 24.4708 17.5013C23.2993 15.9393 21.593 14.864 19.6784 14.481L19.3636 14.4181C19.105 14.3664 18.8637 14.5642 18.8637 14.8279V17.106C18.8637 17.6583 19.3114 18.106 19.8637 18.106ZM12.9824 18.106H16.3483C16.9006 18.106 17.3483 17.6583 17.3483 17.106V14.6803C17.3483 14.4803 17.1861 14.3181 16.9861 14.3181H15.9708C14.9009 14.3181 13.8628 14.6822 13.0274 15.3506C12.6389 15.6614 12.3788 16.1046 12.297 16.5954L12.1993 17.1816C12.1187 17.6655 12.4918 18.106 12.9824 18.106ZM14.3181 24.1666C14.3181 25.4218 13.3006 26.4394 12.0454 26.4394C10.7902 26.4394 9.77263 25.4218 9.77263 24.1666C9.77263 22.9114 10.7902 21.8939 12.0454 21.8939C13.3006 21.8939 14.3181 22.9114 14.3181 24.1666ZM30.227 24.1666C30.227 25.4218 29.2095 26.4394 27.9543 26.4394C26.6991 26.4394 25.6816 25.4218 25.6816 24.1666C25.6816 22.9114 26.6991 21.8939 27.9543 21.8939C29.2095 21.8939 30.227 22.9114 30.227 24.1666Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0759 24.1666H24.9243C24.9244 22.493 26.2811 21.1364 27.9546 21.1364C29.6282 21.1364 30.9849 22.493 30.9849 24.1666H31.5C32.0523 24.1666 32.5 23.7189 32.5 23.1666V23.106C32.5 20.3446 30.2614 18.106 27.5 18.106H26.4394C25.0465 15.3202 22.1993 13.5605 19.0847 13.5605H15.0766C13.1961 13.5605 11.4535 14.5472 10.486 16.1597L10.1908 16.6517C9.92101 17.1013 9.49931 17.4396 9.00189 17.6054C8.10498 17.9043 7.5 18.7437 7.5 19.6891V23.1666C7.5 23.7189 7.94772 24.1666 8.5 24.1666H9.01526C9.01527 22.493 10.372 21.1363 12.0456 21.1363C13.7192 21.1363 15.0759 22.493 15.0759 24.1666ZM19.8637 18.106H24.1685C24.4799 18.106 24.6576 17.7505 24.4708 17.5013C23.2993 15.9393 21.593 14.864 19.6784 14.481L19.3636 14.4181C19.105 14.3664 18.8637 14.5642 18.8637 14.8279V17.106C18.8637 17.6583 19.3114 18.106 19.8637 18.106ZM12.9824 18.106H16.3483C16.9006 18.106 17.3483 17.6583 17.3483 17.106V14.6803C17.3483 14.4803 17.1861 14.3181 16.9861 14.3181H15.9708C14.9009 14.3181 13.8628 14.6822 13.0274 15.3506C12.6389 15.6614 12.3788 16.1046 12.297 16.5954L12.1993 17.1816C12.1187 17.6655 12.4918 18.106 12.9824 18.106ZM14.3181 24.1666C14.3181 25.4218 13.3006 26.4394 12.0454 26.4394C10.7902 26.4394 9.77263 25.4218 9.77263 24.1666C9.77263 22.9114 10.7902 21.8939 12.0454 21.8939C13.3006 21.8939 14.3181 22.9114 14.3181 24.1666ZM30.227 24.1666C30.227 25.4218 29.2095 26.4394 27.9543 26.4394C26.6991 26.4394 25.6816 25.4218 25.6816 24.1666C25.6816 22.9114 26.6991 21.8939 27.9543 21.8939C29.2095 21.8939 30.227 22.9114 30.227 24.1666Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/logos/work.svg b/src/assets/logos/work.svg
index 0b5b73fc353453885fb589e09533771b396dc11c..c29201d91a6f99a751952320d341d98f12925805 100644
--- a/src/assets/logos/work.svg
+++ b/src/assets/logos/work.svg
@@ -1,5 +1,5 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="4" fill="#333333"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0442 16.3462C10.9896 16.3462 10.1348 17.1875 10.1348 18.2253V27.6209C10.1348 28.6587 10.9896 29.5 12.0442 29.5H27.9561C29.0106 29.5 29.8655 28.6587 29.8655 27.6209V18.2253C29.8655 17.1875 29.0106 16.3462 27.9561 16.3462H12.0442ZM11.6653 18.0135C11.802 17.8111 12.0947 17.747 12.319 17.8704L19.6019 21.8763C20.078 22.1382 20.6795 22.1258 21.1419 21.8447L27.6619 17.8809C27.8798 17.7485 28.1754 17.8005 28.3222 17.9971C28.4689 18.1937 28.4113 18.4605 28.1934 18.593L21.8275 22.4631V24.0385C21.8275 24.6333 21.4111 25.1154 20.8974 25.1154H19.8345C19.3208 25.1154 18.9044 24.6333 18.9044 24.0385V22.4981L11.8239 18.6035C11.5996 18.4801 11.5285 18.216 11.6653 18.0135ZM19.7016 22.8432C20.1368 22.9534 20.5982 22.9493 21.0303 22.8319V24.0385C21.0303 24.1235 20.9708 24.1924 20.8974 24.1924H19.8345C19.7611 24.1924 19.7016 24.1235 19.7016 24.0385V22.8432Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6131 11.9615C18.3236 11.9615 17.184 12.7524 16.801 13.9134L16.65 14.3708C16.5229 14.7561 16.0885 14.9713 15.6798 14.8514C15.2711 14.7315 15.0428 14.322 15.17 13.9366L15.3209 13.4792C15.9056 11.7073 17.6449 10.5 19.6131 10.5H20.8872C22.8554 10.5 24.5947 11.7073 25.1794 13.4792L25.3303 13.9366C25.4575 14.322 25.2292 14.7315 24.8205 14.8514C24.4118 14.9713 23.9774 14.7561 23.8503 14.3708L23.6993 13.9134C23.3163 12.7524 22.1767 11.9615 20.8872 11.9615H19.6131Z" fill="white"/>
+<rect width="40" height="40" rx="20" fill="#FFE5E4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.044 16.3462C10.9895 16.3462 10.1346 17.1875 10.1346 18.2253V27.6209C10.1346 28.6587 10.9895 29.5 12.044 29.5H27.9559C29.0105 29.5 29.8654 28.6587 29.8654 27.6209V18.2253C29.8654 17.1875 29.0105 16.3462 27.9559 16.3462H12.044ZM11.6651 18.0135C11.8019 17.8111 12.0946 17.747 12.3189 17.8704L19.6017 21.8763C20.0778 22.1382 20.6793 22.1258 21.1418 21.8447L27.6617 17.8809C27.8796 17.7485 28.1752 17.8005 28.322 17.9971C28.4688 18.1937 28.4112 18.4605 28.1933 18.593L21.8274 22.4631V24.0385C21.8274 24.6333 21.4109 25.1154 20.8973 25.1154H19.8343C19.3207 25.1154 18.9043 24.6333 18.9043 24.0385V22.4981L11.8237 18.6035C11.5994 18.4801 11.5284 18.216 11.6651 18.0135ZM19.7015 22.8432C20.1367 22.9534 20.5981 22.9493 21.0302 22.8319V24.0385C21.0302 24.1235 20.9707 24.1924 20.8973 24.1924H19.8343C19.761 24.1924 19.7015 24.1235 19.7015 24.0385V22.8432Z" fill="#A50F0E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6127 11.9615C18.3232 11.9615 17.1837 12.7524 16.8006 13.9134L16.6497 14.3708C16.5225 14.7561 16.0881 14.9713 15.6794 14.8514C15.2707 14.7315 15.0424 14.322 15.1696 13.9366L15.3205 13.4792C15.9052 11.7073 17.6445 10.5 19.6127 10.5H20.8868C22.855 10.5 24.5944 11.7073 25.179 13.4792L25.33 13.9366C25.4571 14.322 25.2289 14.7315 24.8202 14.8514C24.4114 14.9713 23.977 14.7561 23.8499 14.3708L23.699 13.9134C23.3159 12.7524 22.1763 11.9615 20.8868 11.9615H19.6127Z" fill="#A50F0E"/>
</svg>
diff --git a/src/assets/scss/_buttons.scss b/src/assets/scss/_buttons.scss
deleted file mode 100644
index 29c063e9f5ec8f9679e863f65f83df625959b439..0000000000000000000000000000000000000000
--- a/src/assets/scss/_buttons.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-@import './color';
-@import './shapes';
-@import './typography';
-
-@mixin btn-filter {
- background: $white;
- height: 40px;
- width: 190px;
- border: 1px solid $grey-5;
- padding: 3px 8px 3px 16px;
- outline: none;
- border-radius: 4px;
- cursor: pointer;
- @include btn-normal;
- @include font-regular-13;
- transition: all 300ms ease;
- & > * {
- transition: all 300ms ease;
- }
-}
-
-@mixin btn-search-filter {
- background: $primary-color;
- height: 36px;
- color: $white;
- padding: 4px 37px;
- border-radius: 4px;
- outline: none;
- border: 1px solid transparent;
- cursor: pointer;
- @include font-regular-13;
- line-break: 18px;
-}
-
-@mixin btn-grey {
- box-sizing: border-box;
- border-radius: 6px;
- background: $white;
- color: $grey-1;
- border: 1px solid $grey-1;
- cursor: pointer;
- @include font-regular-12;
- line-height: 18px;
- padding: 8px 15px;
-}
-@mixin btn-red {
- border-radius: 6px;
- background: $red;
- color: $white;
- cursor: pointer;
- @include font-regular-12;
- line-height: 18px;
- padding: 8px 15px;
-}
-
-button {
- transition: all 0.1s;
-}
-
-.btn-primary {
- background: $primary-color;
- border-radius: 4px;
- outline: none;
- cursor: pointer;
- color: $white;
- height: 40px;
- width: 192px;
- @include btn-bold;
- stroke: $white;
- border: 1px solid $grey-1;
- &.small {
- width: 149px;
- }
- &.invalid {
- opacity: 0.4;
- }
- &:focus {
- background: $white;
- color: $primary-color;
- border: 1px solid $primary-color;
- stroke: $primary-color;
- }
-}
-
-// V3REMOVE we should probably rename this to "tagList" or something like this
-.btn-grid {
- display: inline-flex;
- flex-wrap: wrap;
- gap: 12px 8px;
-}
-
-.tags-cloud {
- font-style: normal;
- justify-content: center;
- align-items: center;
- height: 28px;
- border-radius: 20px;
- padding: 5px 15px;
- color: $white;
- border-style: none;
- margin-top: 5px;
- background: $grey-1;
- &.unchecked {
- background: $grey-5;
- }
-}
diff --git a/src/assets/scss/_color.scss b/src/assets/scss/_color.scss
index 76a0ac0c046b73b15f289daa7ae9644e7220f831..2f6a9185b86e0ee7bd48d0d8b8dddb1e33af6f41 100644
--- a/src/assets/scss/_color.scss
+++ b/src/assets/scss/_color.scss
@@ -1,28 +1,31 @@
$black: #000000;
$white: #ffffff;
-/* GREYS */
+/* GREYS */
$grey-0: $black;
-$grey: #b4bbbf;
$grey-1: #333333;
-$grey-2-v3: #4c4d53;
+$grey-2: #4c4d53;
$grey-3: #696969;
$grey-4: #949494;
-$grey-4-text: #767676;
$grey-5: #bdbdbd;
$grey-6: #dedede;
$grey-7: #e9e9e9;
$grey-8: #f4f4f4;
$grey-9: #f8f8f8;
$grey-10: $white;
-/* GREY Accessibility Ratio 4,5:1 */
+/* GREY Accessibility Ratio 4,5:1 */
$grey-4-5-1: #767676;
/* REDS */
$red-darker: #a50f0e;
-$red-dark: #ba1615;
+$red-dark: #cd2524;
$red: #da3635;
-$red-light: #ffe5e4;
-$red-pressed: #ff4544;
+$red-20: #da363533; // main red with 20% opacity
+$red-light: #ff5d5c;
+$red-lighter: #ffe5e4;
+
+/* Element state colors */
+$blue-focus: #0078f3;
+$red-hover: #c02423;
/* Border color for hours */
$border-hours: #ff6e6e;
@@ -32,8 +35,6 @@ $info-success: #1d8844;
$info-warning: #cf4b00;
$info-blue: #0073e9;
$info-error: #da3635;
-/* BLUE */
-$blue-focus: #0078f3; // not referenced in figma doc, keep it ?
// Additional colors for button effects
$warning-hover: #b24000;
@@ -41,19 +42,6 @@ $warning-pressed: #f1742e;
$success-hover: #066629;
$success-pressed: #46c374;
-/*
-OLD COLORS
-AFTER V3 DELETE FOLLOWING COLORS
-*/
-$grey-2: #4f4f4f; // to delete after v3
-$grey-3-15: #33333326;
-$grey-3-20: #33333333;
-
-$red-20: #da363533; // main red with 20% opacity
-$red-hover: #c02423;
-$red-1: #f35453;
-$red-error: #ff0000;
-
/* GOLD */
$gold: #bd9e6a;
/* form colors */
@@ -68,16 +56,6 @@ $red-error: #e1000f;
$blue: #348899;
$blue-light: #c9ecf3;
/* APP COLORS */
-$primary-color: $red;
-$primary-color-dark: $red-dark;
-$primary-color-light: #fef0f0;
-$default-link-color: $grey-2;
-$button-secondary: $red-dark;
-$app-background: $grey-9;
$modal-background-transparent: rgba($grey-1, 0);
$modal-background: rgba($grey-1, 0.25);
-$app-background: $grey-9;
-$scrollbar-track: rgba($grey-9, 0.65);
-$scrollbar-thumb: $grey-1;
-$focus-color: $grey-1;
$box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1);
diff --git a/src/assets/scss/_ghost.scss b/src/assets/scss/_ghost.scss
index b6f27098d64bf1eac6ec249ee124ca8a6ffafa38..32a51bbb8aa63e99a7346e4ff9bb2bf363f0a020 100644
--- a/src/assets/scss/_ghost.scss
+++ b/src/assets/scss/_ghost.scss
@@ -1,12 +1,11 @@
@import 'color';
@import 'layout';
@import 'breakpoint';
-@import 'hyperlink';
$margin-post: 20px;
:root {
- --ghost-accent-color: #{$primary-color};
+ --ghost-accent-color: #{$red};
}
.postContainer {
diff --git a/src/assets/scss/_hyperlink.scss b/src/assets/scss/_hyperlink.scss
deleted file mode 100644
index 92d4bbb241e95f5a5d4e2748c3c78c1f30cb5a58..0000000000000000000000000000000000000000
--- a/src/assets/scss/_hyperlink.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import './typography.scss';
-@mixin hyperlink {
- border: 1px solid transparent;
- padding: 8px 8px 6px 8px;
- color: $primary-color;
- outline: none;
- @include btn-bold-underline;
- &:hover {
- color: $primary-color-dark;
- }
- &:focus {
- color: $primary-color;
- border-color: $primary-color;
- border-radius: 4px;
- }
- &:active {
- border: none;
- color: $blue-light;
- }
-}
diff --git a/src/assets/scss/_inputs.scss b/src/assets/scss/_inputs.scss
index 43c5c9296a3c31fd58c9df9c5bf218e87aaf3e50..aae8122f6e42507e3346e408e5b0871e599cb233 100644
--- a/src/assets/scss/_inputs.scss
+++ b/src/assets/scss/_inputs.scss
@@ -1,23 +1,13 @@
@import './color';
-@import './shapes';
@import './typography';
-@mixin input-search {
- width: 100%;
- border: none;
- text-overflow: ellipsis;
- background-color: $grey-9;
- color: $grey-3;
- outline: none;
- font-style: italic;
-}
-
+// V3REMOVE
.form-input {
width: 296px;
background: $grey-9;
border: 1px solid $grey-5;
box-sizing: border-box;
- border-radius: $input-radius;
+ border-radius: 4px;
height: 36px;
padding: 8px;
@include font-regular-14;
diff --git a/src/assets/scss/_layout.scss b/src/assets/scss/_layout.scss
index 8aec0e8f53891e234b80ec8db8c9ef2dcbb81813..716e30d9043dec074b1fb83644939f5ca9063b87 100644
--- a/src/assets/scss/_layout.scss
+++ b/src/assets/scss/_layout.scss
@@ -3,6 +3,5 @@ $footer-height: 56px;
$header-height-phone: 70px;
$footer-height-phone: 75px;
$header-post-height: 180px;
-$content-desktop-width: 980px;
$orientation-progressBarAndButtons: 119px;
$progress-bar-height: 49px;
diff --git a/src/assets/scss/_shapes.scss b/src/assets/scss/_shapes.scss
deleted file mode 100644
index 7c4bd789cf3ba4968bbbf2cb1f0893723942225a..0000000000000000000000000000000000000000
--- a/src/assets/scss/_shapes.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import './color';
-
-$card-radius: 0.625em;
-$bouton-radius: 0.625em;
-$input-radius: 4px;
-$bouton-width: 12.25em;
-$round-bouton-radius: 1.25em;
-$round-radius: 50%;
-$round-button: 40px;
-$simple-shadow: 0px 0px 4px rgba(0, 0, 0, 0.25);
-$menu-shadow: 0px 0px 4px rgba(0, 0, 0, 0.25);
-$mat-tab-shadow: 0px 2px 7px rgba(0, 0, 0, 0.25);
-
-@mixin background-hash($color) {
- background: $color !important;
- padding: 0 0 1px 1px;
- .body-wrap {
- background-color: $white;
- }
-}
diff --git a/src/styles.scss b/src/styles.scss
index 0e5697a9f05049f42f7ae428c84b57942fb01a5e..35fff78d839528d96f38f352920de57ef253d032 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -5,9 +5,7 @@
@import 'color';
@import 'breakpoint';
@import 'inputs';
-@import 'hyperlink';
@import 'layout';
-@import 'buttons';
@import '../node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css';
@import '../node_modules/leaflet/dist/leaflet.css';
@import '../node_modules/ngx-toastr/toastr';
@@ -54,23 +52,7 @@ body {
a {
color: $grey-1;
- background-color: transparent;
cursor: pointer;
- &:focus {
- text-decoration: none;
- outline-color: $primary-color;
- }
- &:hover {
- text-decoration: underline;
- outline-color: $primary-color;
- }
- &.primary {
- @include hyperlink;
- width: 100%;
- }
- &.right {
- text-align: right;
- }
}
.clickable {
@@ -128,6 +110,7 @@ a {
.content-container {
margin: 0;
padding-top: 16px;
+ padding-bottom: 16px;
width: 100%;
box-sizing: border-box;
&.medium-pt {
@@ -182,9 +165,6 @@ form p.notRequired {
}
/** Inputs **/
-.form-group .addressRow {
- padding-bottom: 1.5rem;
-}
.formView {
form {
padding-bottom: 1rem;
@@ -195,11 +175,12 @@ form p.notRequired {
}
/** Textarea **/
+// V3REMOVE
textarea {
padding: 13px 8px;
background: $grey-9;
border: 1px solid $grey-5;
- border-radius: $input-radius;
+ border-radius: 4px;
resize: none;
outline: none;
@include font-regular-16;
@@ -209,92 +190,11 @@ textarea {
}
/** Buttons **/
+// V3REMOVE
button {
&:focus,
&:focus-within {
- outline-color: $primary-color;
- }
-}
-
-/** Checkboxes **/
-.checkbox {
- list-style-type: none;
- width: 100%;
- input {
- opacity: 0;
- display: none;
- &:checked ~ .customCheck {
- background-color: $grey-3;
- border-color: transparent;
- }
- &:checked ~ .customCheckPrimary {
- background-color: $grey-1;
- border-color: transparent;
- }
- &:checked ~ .customCheck:after {
- display: block;
- }
- }
- label {
- grid-template-columns: min-content auto;
- display: inline-grid;
- cursor: pointer;
- }
- .label {
- padding-left: 8px;
- padding-right: 10px;
- @include btn-pass;
- &.pass {
- @include font-regular-16;
- }
- }
- .customCheck {
- display: inline-grid;
- width: 18px;
- height: 18px;
- min-width: 18px;
- min-height: 18px;
- background-color: $white;
- border: 1px solid $grey-3;
- cursor: pointer;
- position: relative;
- border-radius: 4px;
- top: 0;
- left: 0;
- &:hover {
- background-color: $grey-9;
- }
- &:after {
- content: '';
- position: absolute;
- display: none;
- left: 7px;
- top: 3px;
- width: 4px;
- height: 8px;
- border: solid $white;
- border-width: 0 2px 2px 0;
- transform: rotate(45deg);
- -webkit-transform: rotate(45deg);
- -ms-transform: rotate(45deg);
- }
- }
- &.no-width {
- width: unset;
- }
-}
-.halfCheck {
- position: relative;
- &:before {
- content: '';
- position: absolute;
- display: block;
- width: 10px;
- left: 4px;
- top: 8px;
- transform: rotate(0deg);
- border-bottom: solid 2px $grey-2;
- border-radius: 0;
+ outline-color: $red;
}
}
@@ -324,7 +224,6 @@ button {
}
// PRINT
-
@media print {
body,
html,
@@ -350,37 +249,6 @@ button {
margin: 0 !important;
}
-// V3REMOVE
-.backLink {
- cursor: pointer;
- color: $grey-2;
- margin-bottom: 40px;
- @include font-bold-16;
- &:hover {
- opacity: 0.4;
- }
-}
-
-.userList {
- max-width: 50%;
-}
-
-.userBlock {
- max-width: 50%;
- margin: 0 auto;
-}
-
-.tooltip {
- position: absolute;
- bottom: 100%;
- white-space: nowrap;
- left: 0;
- padding: 10px;
- background: $grey;
- color: $white;
- box-shadow: 0 2px 1px rgba(0, 0, 0, 0.6);
-}
-
.hide-on-desktop {
display: none;
@media #{$tablet} {
@@ -394,7 +262,6 @@ button {
}
// AUTOCOMPLETE
-
.autocomplete-items {
width: 100%;
padding-right: 16px;
@@ -469,6 +336,10 @@ p {
sup {
color: $red;
}
+.sup-input {
+ font-size: $font-size-xxxxsmall;
+ color: unset;
+}
.formGroup {
display: flex;
@@ -477,9 +348,16 @@ sup {
max-width: 600px;
}
+/* CONTAINERS */
div.inline {
display: flex;
flex-direction: row;
align-items: center;
gap: 8px;
}
+
+.tagList {
+ display: inline-flex;
+ flex-wrap: wrap;
+ gap: 12px 8px;
+}