diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f49e4bb521a868341ea506516742e4255eea7f4a..e951cd68bad1da63920dfe5dc9a205f29dae98db 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,6 +21,7 @@ import { StructureOpeningStatusComponent } from './structure-list/components/str
import { ModalFilterComponent } from './structure-list/components/modal-filter/modal-filter.component';
import { LegalNoticeComponent } from './legal-notice/legal-notice.component';
import { AboutComponent } from './about/about.component';
+import { MenuPhoneComponent } from './menu-phone/menu-phone.component';
@NgModule({
declarations: [
@@ -36,6 +37,7 @@ import { AboutComponent } from './about/about.component';
StructureOpeningStatusComponent,
LegalNoticeComponent,
AboutComponent,
+ MenuPhoneComponent,
],
imports: [
BrowserModule,
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 75df53093fed86c6cd8c88be4044b65d405cd320..9398ecc033252e7f2061ec146926f8019a3e89b0 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -26,8 +26,9 @@
height: 37px;
width: 22px;
}
+
@media #{$large-phone} {
- height: unset;
+ display: none !important;
font-size: 0.75em;
div {
margin: 20px 0;
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 600d0e766cf551823721765db01a3edc70d9f31b..3e9740a8e9c152ce124d430a5e4e279c937e8064 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,13 +1,13 @@
<div fxLayout="row" class="header hide-on-print">
<div class="logo clickable" routerLink="/home">
- <div fxLayout="row">
- <!-- <img class="logo-grand-lyon" src="/assets/logos/ram_logo.svg" alt /> -->
- <div fxLayout="column" fxLayoutAlign="center">
- <p>Réseau des Acteurs de la Médiation Numérique</p>
- <p>de la Métropole de Lyon</p>
- </div>
+ <img class="logo-grand-lyon" src="/assets/logos/ram_logo.svg" alt />
+ <div class="logo-text" fxLayout="column" fxLayoutAlign="center">
+ <p>Réseau des Acteurs de la Médiation Numérique de la Métropole de Lyon</p>
</div>
</div>
+ <div class="containerIconMenu" (click)="openMenu()">
+ <span class="ico-menu"></span>
+ </div>
<div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw">
<a routerLink="/home" [routerLinkActive]="'active'" i18n>Acteurs de la médiation numérique</a>
<!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a>
@@ -21,3 +21,4 @@
></a> -->
</div>
</div>
+<app-menu-phone *ngIf="showMenu" (closeEvent)="closeMenu($event)"></app-menu-phone>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 0f02934cc371f7f9806836005e582678722b6cfd..2e49b9b20033d675c95908e45891060915d44157 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -30,6 +30,9 @@
}
}
.right-header {
+ @media #{$tablet} {
+ display: none !important;
+ }
height: 100%;
}
}
@@ -41,6 +44,10 @@
p {
margin: 0;
}
+ @media #{$tablet} {
+ text-align: center;
+ width: 100%;
+ }
}
@media print {
@@ -48,3 +55,17 @@
display: none !important;
}
}
+
+.containerIconMenu {
+ display: none;
+ padding-right: 20px;
+ @media #{$tablet} {
+ display: block;
+ }
+}
+
+@media #{$tablet} {
+ .logo-text {
+ display: none !important;
+ }
+}
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 84aef6db8fbadce29570082f014cde44c5ca17a3..b645bfde04ca991c8c78fe03cd11123e4b27f1f0 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -6,7 +6,15 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./header.component.scss'],
})
export class HeaderComponent implements OnInit {
- constructor() {}
+ public showMenu = false;
+ constructor() {}
ngOnInit(): void {}
+
+ public openMenu(): void {
+ this.showMenu = true;
+ }
+ public closeMenu(): void {
+ this.showMenu = false;
+ }
}
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 84956ea1870f36dfd8b0c488b8c7450450a8a919..c293e365a0c102ae4b61eb12e57cc25a49be47a4 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -7,13 +7,23 @@
(selectedMarkerId)="setSelectedMarkerId($event)"
[selectedStructure]="currentStructure"
class="left-pane"
+ [ngClass]="{ mapPhone: isMapPhone == true }"
fxLayout="column"
></app-structure-list>
+ <div class="btnSwitch">
+ <app-button
+ [style]="'roundedButton'"
+ [text]="isMapPhone ? 'Liste' : 'Carte'"
+ [iconBtn]="isMapPhone ? 'liste' : 'map-marker'"
+ (action)="switchMapList()"
+ ></app-button>
+ </div>
<app-map
[structures]="structures"
[toogleToolTipId]="displayMarkerId"
[selectedMarkerId]="selectedMarkerId"
(selectedStructure)="showDetailStructure($event)"
class="right-pane"
+ [ngClass]="{ mapPhone: isMapPhone == true }"
></app-map>
</div>
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
index bfa9fd02cfa8fcfc20683307ba925805ecc98d91..52be626370cf202a6e380b7ca10dbaf58d2d1e65 100644
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@@ -1,11 +1,49 @@
+@import '../../assets/scss/breakpoint';
+@import '../../assets/scss/layout';
+@import '../../assets/scss/z-index';
+
.left-pane {
width: 640px;
min-width: 640px;
+ @media #{$tablet} {
+ width: 100%;
+ min-width: unset;
+ &.mapPhone {
+ display: none !important;
+ }
+ }
}
.right-pane {
width: 80%;
padding: 0 40px;
+ @media #{$tablet} {
+ display: none;
+ &.mapPhone {
+ display: block;
+ }
+ width: 100%;
+ padding: 0;
+ }
}
.content-container {
height: 100%;
+ @media #{$tablet} {
+ padding: 0;
+ }
+}
+.btnSwitch {
+ position: fixed;
+ left: 50%;
+ bottom: $footer-height;
+ transform: translate(-50%, -50%);
+ margin: 0 auto;
+ display: none;
+ @media #{$tablet} {
+ display: block;
+ opacity: 0.8;
+ z-index: $btn-phone-switch-map-list-z-index;
+ }
+ @media #{$large-phone} {
+ bottom: 20px;
+ }
}
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index ce2ef32e617452c32f52628c318aa39d23aaae5f..8ccaba5fc7a2c28232b0ff8513a15724420c6065 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -24,6 +24,7 @@ export class HomeComponent implements OnInit {
public currentStructure: Structure;
public userLatitude: number;
public userLongitude: number;
+ public isMapPhone = false;
constructor(private structureService: StructureService, private geoJsonService: GeojsonService) {}
ngOnInit(): void {
@@ -119,13 +120,20 @@ export class HomeComponent implements OnInit {
}
public getLocation(): void {
- navigator.geolocation.getCurrentPosition((position) => {
- this.geolocation = true;
- this.userLongitude = position.coords.longitude;
- this.userLatitude = position.coords.latitude;
- this.getAddress(position.coords.longitude, position.coords.latitude);
- this.getStructures(null);
- });
+ navigator.geolocation.getCurrentPosition(
+ (position) => {
+ this.geolocation = true;
+ this.userLongitude = position.coords.longitude;
+ this.userLatitude = position.coords.latitude;
+ this.getAddress(position.coords.longitude, position.coords.latitude);
+ this.getStructures(null);
+ },
+ (err) => {
+ if (err.PERMISSION_DENIED) {
+ this.getStructures(null);
+ }
+ }
+ );
}
/**
@@ -155,4 +163,8 @@ export class HomeComponent implements OnInit {
public showDetailStructure(structure: Structure): void {
this.currentStructure = new Structure(structure);
}
+
+ public switchMapList(): void {
+ this.isMapPhone = !this.isMapPhone;
+ }
}
diff --git a/src/app/map/components/map.component.scss b/src/app/map/components/map.component.scss
index 0e07fe89a00487da7b9b57d720ff44119ad7a581..a0b56f0dc94c670afc6542e44726f9432d31257b 100644
--- a/src/app/map/components/map.component.scss
+++ b/src/app/map/components/map.component.scss
@@ -4,6 +4,7 @@
@import '../../../assets/scss/typography';
@import '../../../assets/scss/shapes';
@import '../../../assets/scss/buttons';
+@import '../../../assets/scss/breakpoint';
.map-wrapper {
border-radius: 6px;
@@ -15,6 +16,12 @@
height: calc(100vh - #{$header-height} - #{$footer-height} - 87px);
border: 10px solid $white;
border-radius: 6px;
+ @media #{$tablet} {
+ height: calc(100vh - #{$header-height} - #{$footer-height} - 24px);
+ }
+ @media #{$large-phone} {
+ height: calc(100vh - #{$header-height} - 28px);
+ }
}
::ng-deep .leaflet-popup-close-button {
@@ -105,6 +112,9 @@
border-radius: 6px;
border: 1px solid $grey-4;
}
+::ng-deep .leaflet-popup-content {
+ width: 240px;
+}
::ng-deep .leaflet-popup-tip-container {
display: none;
}
diff --git a/src/app/map/components/map.component.ts b/src/app/map/components/map.component.ts
index 875be42c0cd0ab14df2bc9411a601106a8861bb4..c2938329097567d9ca7640579eec19bb464bf9c4 100644
--- a/src/app/map/components/map.component.ts
+++ b/src/app/map/components/map.component.ts
@@ -81,8 +81,10 @@ export class MapComponent implements OnChanges {
}
// Handle map marker selection
if (changes.selectedMarkerId) {
+ this.map.closePopup();
if (changes.selectedMarkerId.currentValue === undefined) {
this.mapService.setDefaultMarker(changes.selectedMarkerId.previousValue);
+ this.map.setView(this.mapOptions.center, this.mapOptions.zoom);
} else {
this.mapService.setSelectedMarker(changes.selectedMarkerId.currentValue);
this.centerLeafletMapOnMarker(changes.selectedMarkerId.currentValue);
diff --git a/src/app/map/services/map.service.ts b/src/app/map/services/map.service.ts
index dac2b55e2d9b7a1d76b3a99d2b0d686f73f46cc0..58594ff2388e9a06ffeb01abbb29ad578f4f45f6 100644
--- a/src/app/map/services/map.service.ts
+++ b/src/app/map/services/map.service.ts
@@ -17,7 +17,8 @@ export class MapService {
});
public markerIcon = divIcon({
className: null,
- html: '<svg width="40" height="46"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
+ html:
+ '<svg width="40" height="46" fill="#348899" stroke="#fff" stroke-width="2"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
iconSize: [40, 46],
iconAnchor: [20, 46],
popupAnchor: [0, -46],
@@ -133,7 +134,8 @@ export class MapService {
if (id) {
const markerIcon = divIcon({
className: null,
- html: '<svg width="40" height="46"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
+ html:
+ '<svg width="40" height="46" fill="#348899" stroke="#fff" stroke-width="2"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>',
iconSize: [35, 41],
iconAnchor: [13, 41],
});
diff --git a/src/app/menu-phone/menu-phone.component.html b/src/app/menu-phone/menu-phone.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..dbd120b9ff22f45e37e9db833924ce1d415657cb
--- /dev/null
+++ b/src/app/menu-phone/menu-phone.component.html
@@ -0,0 +1,29 @@
+<div class="containerMenu" fxLayout="row">
+ <div class="outside" (click)="closeMenu()"></div>
+ <div class="contentMenu" fxLayout="column" fxLayoutAlign="space-between">
+ <div>
+ <div class="titleFilter" fxLayout="row" fxLayoutAlign="space-between">
+ <span>Menu</span>
+ <div (click)="closeMenu()" class="ico-close-details"></div>
+ </div>
+ <div fxLayout="column" class="right-header" fxLayoutGap="3vw">
+ <a routerLink="/home" [routerLinkActive]="'active'" (click)="closeMenu()" i18n
+ >Acteurs de la médiation numérique</a
+ >
+ <!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a>
+ <a routerLink="/projects" [routerLinkActive]="'active'" i18n>Projets</a> -->
+ <a routerLink="/about" [routerLinkActive]="'active'" (click)="closeMenu()" i18n>Qui sommes-nous ?</a>
+ <!--<a routerLink="/login" [routerLinkActive]="'active'" i18n><span class="clickable ico-mglass purple"></span></a>
+ <a routerLink="/home" [routerLinkActive]="'active'" i18n
+ ><span class="ico-profile" fxLayout="column" fxLayoutAlign="center center">
+ <span class="head"></span>
+ <span class="body"></span> </span
+ ></a> -->
+ </div>
+ </div>
+ <!--<div class="footer" fxLayout="row" fxLayoutGap="1.5vh">
+ <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="'user'" [iconColor]="'currentColor'"></app-svg-icon>
+ <a>Mon compte</a>
+ </div>-->
+ </div>
+</div>
diff --git a/src/app/menu-phone/menu-phone.component.scss b/src/app/menu-phone/menu-phone.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..75987578ef5d16697f119b1c0819cf7412d23ba2
--- /dev/null
+++ b/src/app/menu-phone/menu-phone.component.scss
@@ -0,0 +1,74 @@
+@import '../../assets/scss/color';
+@import '../../assets/scss/z-index';
+@import '../../assets/scss/typography';
+@import '../../assets/scss/breakpoint';
+
+@keyframes slideMenu {
+ from {
+ width: 0;
+ }
+ to {
+ width: 100%;
+ }
+}
+@keyframes background-fade {
+ 0% {
+ background: none;
+ }
+ 100% {
+ background: none;
+ }
+}
+.containerMenu {
+ position: fixed;
+ top: 0;
+ right: 0;
+ width: 100%;
+ height: 100%;
+ z-index: $modal-menu-phone-z-index;
+ animation: slideMenu 0.5s;
+ .contentMenu {
+ background-color: $white;
+ height: 100vh;
+ width: 350px;
+ padding: 27px 25px;
+ }
+ .outside {
+ width: calc(100% - 350px);
+ height: 100vh;
+ opacity: 0.65;
+ animation: background-fade 0.1s;
+ background-color: $black;
+ }
+}
+.titleFilter {
+ margin-bottom: 35px;
+ @include cn-bold-28;
+}
+.footer {
+ a {
+ height: unset;
+ display: table-cell;
+ vertical-align: middle;
+ margin: auto 0 auto 0;
+ }
+}
+a {
+ @include cn-bold-18;
+ font-style: italic;
+ color: $grey-2;
+ height: 70px;
+ margin: 0;
+ &.active {
+ font-weight: bold;
+ color: $grey-1;
+ &:before {
+ color: $primary-color;
+ content: '// ';
+ }
+ &:after {
+ color: $primary-color;
+ content: ' //';
+ }
+ }
+}
diff --git a/src/app/menu-phone/menu-phone.component.spec.ts b/src/app/menu-phone/menu-phone.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..718d9c8417b95c7bb804e680b2fff8d41cdcd19d
--- /dev/null
+++ b/src/app/menu-phone/menu-phone.component.spec.ts
@@ -0,0 +1,26 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { MenuPhoneComponent } from './menu-phone.component';
+
+describe('HeaderComponent', () => {
+ let component: MenuPhoneComponent;
+ let fixture: ComponentFixture<MenuPhoneComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [RouterTestingModule],
+ declarations: [MenuPhoneComponent],
+ }).compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(MenuPhoneComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/menu-phone/menu-phone.component.ts b/src/app/menu-phone/menu-phone.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c0d48f25e3e4b7f96dd5c016bbc398faee42abec
--- /dev/null
+++ b/src/app/menu-phone/menu-phone.component.ts
@@ -0,0 +1,17 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+
+@Component({
+ selector: 'app-menu-phone',
+ templateUrl: './menu-phone.component.html',
+ styleUrls: ['./menu-phone.component.scss'],
+})
+export class MenuPhoneComponent implements OnInit {
+ constructor() {}
+
+ @Output() closeEvent = new EventEmitter();
+ ngOnInit(): void {}
+
+ closeMenu(): void {
+ this.closeEvent.emit();
+ }
+}
diff --git a/src/app/shared/components/button/button.component.html b/src/app/shared/components/button/button.component.html
index 5b059dee959364d697fb6dabbe58e52ca0e63c43..91c9e7a6792241a67693e48fec034bbe6331820f 100644
--- a/src/app/shared/components/button/button.component.html
+++ b/src/app/shared/components/button/button.component.html
@@ -17,3 +17,23 @@
<ng-container *ngIf="style === 'button'">
<button class="btn-search-filter" type="{{ type }}">{{ text }}</button>
</ng-container>
+
+<ng-container *ngIf="style === 'buttonPhone'">
+ <button class="btn-filter-phone" [ngClass]="extraClass" type="{{ type }}" (click)="doAction()">{{ text }}</button>
+</ng-container>
+
+<ng-container *ngIf="style === 'roundedButton'">
+ <button class="btn-switch-phone" type="{{ type }}" (click)="doAction()">
+ <div *ngIf="!iconBtn" class="searchButton">{{ text }}</div>
+ <div
+ *ngIf="iconBtn"
+ fxLayout="row center"
+ class="searchButton withIcon"
+ fxLayoutAlign="space-between center"
+ fxLayoutGap="13px"
+ >
+ <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon>
+ {{ text }}
+ </div>
+ </button>
+</ng-container>
diff --git a/src/app/shared/components/button/button.component.scss b/src/app/shared/components/button/button.component.scss
index 6506693b2e69be5ada4de9237f274d9d5755e2e9..6aecd56b10568465baba8e6b0eb62b1ccca405b2 100644
--- a/src/app/shared/components/button/button.component.scss
+++ b/src/app/shared/components/button/button.component.scss
@@ -41,7 +41,7 @@ button {
.searchButton {
background: $white;
height: 31px;
- color: $primary-color;
+ color: $secondary-color;
padding: 3px 16px 3px 16px;
display: table-cell;
vertical-align: middle;
@@ -52,6 +52,13 @@ button {
}
}
}
+.btn-switch-phone {
+ background: $black;
+ height: 40px;
+ color: $white;
+ padding: 4px 37px 4px 37px;
+ border-radius: 20px;
+}
.btn-search-filter {
background: $secondary-color;
height: 40px;
@@ -72,3 +79,14 @@ button {
background-color: $blue-active;
}
}
+.btn-filter-phone {
+ background: $white;
+ height: 40px;
+ color: $grey-1;
+ padding: 4px 37px 4px 37px;
+ border-color: $grey-4;
+ @include btn-normal;
+ &.containCheckedFilters {
+ border-color: $secondary-color;
+ }
+}
diff --git a/src/app/shared/components/button/button.component.ts b/src/app/shared/components/button/button.component.ts
index dbba3226aa3fa27d42032cd155a595f95fc3cc5f..aa73494e4f8bc42e1ef0f0d8db6c99260dd636e4 100644
--- a/src/app/shared/components/button/button.component.ts
+++ b/src/app/shared/components/button/button.component.ts
@@ -10,7 +10,9 @@ export class ButtonComponent implements OnInit {
@Input() public text: string;
@Input() public type: string;
@Input() public iconBtn: string;
+ @Input() public extraClass: string;
@Output() public action = new EventEmitter();
+
constructor() {}
ngOnInit(): void {}
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 3cc35f78f332a4ec3b744ff6f7ccb9ba60df9c89..1ca5994277262cbede562652752548b0646a1dcf 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 fxLayout="column" fxLayoutAlign="center center" *ngIf="name">
<img [src]="'assets/logos/' + getLogoKey(name) + '.svg'" [alt]="'logo ' + name" />
- <p>{{ name }}</p>
+ <p>{{ getName(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 5f13e6fd4aae25e4f9f45b6a7fc29bae8616b69a..ed7ddbcf3ccf49734257b16655e47f6f2c6fa062 100644
--- a/src/app/shared/components/logo-card/logo-card.component.ts
+++ b/src/app/shared/components/logo-card/logo-card.component.ts
@@ -17,6 +17,15 @@ export class LogoCardComponent implements OnInit {
ngOnInit(): void {}
+ // Get the custom or default name from a demarche.
+ public getName(demarche: string): string {
+ switch (demarche) {
+ case Demarches.caf:
+ return 'Caf';
+ default:
+ return demarche;
+ }
+ }
public getLogoKey(demarche: string): string {
switch (demarche) {
case Demarches.caf:
@@ -50,6 +59,8 @@ export class LogoCardComponent implements OnInit {
return 'franceservices';
case Labels.pass_numerique:
return 'pass';
+ case Labels.territoire:
+ return 'territoire';
default:
throw new Error(`${demarche} is not handled by getLabelKey and getLogoKey`);
}
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 f151f4bb01f95b8d68cebd0c2739bb796a7f0706..b90ab6a10f78c53381b8b7d9efde1a89a4365911 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.html
+++ b/src/app/shared/components/svg-icon/svg-icon.component.html
@@ -1,3 +1,3 @@
-<svg aria-hidden="true" class="icon" [ngClass]="iconClass">
+<svg aria-hidden="true" class="icon" [ngClass]="iconClass" [attr.fill]="iconColor ? iconColor : 'none'">
<use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon"></use>
</svg>
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 afdc21e25e283aea375248395358c07a2be274d5..6a3242f11a94b926d1115fc25f27559dabe8936e 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -1,15 +1,15 @@
.icon {
display: inline-block;
- height: 24px;
- width: 24px;
+ height: 2em;
+ width: 1.5em;
&.icon-32 {
- height: 32px;
- width: 32px;
+ width: 2em;
}
}
svg {
// Scale the SVG to cover the whole app-icon container.
- height: 100%;
- width: 100%;
+
+ top: 0.125em;
+ position: relative;
}
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 324fd4076a3de2d68be5a7e9b6f6848cbdec8da0..72c221e3d48b4fe7d81f70537140cd39fdf05543 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.ts
+++ b/src/app/shared/components/svg-icon/svg-icon.component.ts
@@ -9,5 +9,6 @@ export class SvgIconComponent {
@Input() icon: string;
@Input() iconClass: string;
@Input() type: string;
+ @Input() iconColor: string;
constructor() {}
}
diff --git a/src/app/shared/enum/labels.emum.ts b/src/app/shared/enum/labels.emum.ts
index c4749ceff271839d4eb87216f409e6f7d18c678a..627e7c7a48395620bad62af22425d6276832e7fe 100644
--- a/src/app/shared/enum/labels.emum.ts
+++ b/src/app/shared/enum/labels.emum.ts
@@ -2,4 +2,5 @@ export enum Labels {
pass_numerique = 'Pass numérique',
maison_france_service = 'Maison France Service',
aidants_connect = 'Aidants Connect',
+ territoire = 'Fabrique de territoire',
}
diff --git a/src/app/shared/pipes/index.ts b/src/app/shared/pipes/index.ts
index a00b240b7db73847576c25a80d48c3d26bed34c9..21bf9cf7e194188fe39c2c3257bb4e42f813da2a 100644
--- a/src/app/shared/pipes/index.ts
+++ b/src/app/shared/pipes/index.ts
@@ -1,6 +1,8 @@
import { DayPipe } from './day.pipe';
+import { PhonePipe } from './phone.pipe';
+import { UrlPipe } from './url.pipe';
-export { DayPipe };
+export { DayPipe, PhonePipe, UrlPipe };
// tslint:disable-next-line:variable-name
-export const SharedPipes = [DayPipe];
+export const SharedPipes = [DayPipe, PhonePipe, UrlPipe];
diff --git a/src/app/shared/pipes/phone.pipe.ts b/src/app/shared/pipes/phone.pipe.ts
new file mode 100644
index 0000000000000000000000000000000000000000..af1e964f77bab9faf286c0171103acb5573fa631
--- /dev/null
+++ b/src/app/shared/pipes/phone.pipe.ts
@@ -0,0 +1,10 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'phone' })
+export class PhonePipe implements PipeTransform {
+ transform(value: string): string {
+ //Remove dot and space from the phone string and add space in each 2 numbers
+ const regexArray = value.replace(/\s|\./g, '').match(/.{1,2}/g);
+ return regexArray.join(' ');
+ }
+}
diff --git a/src/app/shared/pipes/url.pipe.ts b/src/app/shared/pipes/url.pipe.ts
new file mode 100644
index 0000000000000000000000000000000000000000..65cc2c56299ffc1c33f87aafb2d48aeea2d5a21f
--- /dev/null
+++ b/src/app/shared/pipes/url.pipe.ts
@@ -0,0 +1,14 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'url' })
+export class UrlPipe implements PipeTransform {
+ transform(value: string): string {
+ const valueSplitted = value.split('/');
+ if (value.includes('//')) {
+ value = valueSplitted[2];
+ } else {
+ value = valueSplitted[0];
+ }
+ return value;
+ }
+}
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index 8bedea0fb332e5f4a969c2eae62cacf22520427e..d3e08f7aae28886324dbc9c729ac5238c197efa5 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -8,7 +8,7 @@
fxLayoutAlign="end center"
fxLayoutGap="20px"
>
- <div fxLayout="row" fxLayoutAlign="center center">
+ <div class="isntPhoneContent" fxLayout="row" fxLayoutAlign="center center">
<span class="indicatorDistance" *ngFor="let i of [].constructor(structure.getDistanceRange())"></span>
</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 47ca330e629dde8fd95ebc8a2882410dc19c4795..c67da08bcb55bef292a9b4c3f4757cc02c2db4cf 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -1,6 +1,7 @@
@import '../../../../assets/scss/icons';
@import '../../../../assets/scss/color';
@import '../../../../assets/scss/typography';
+@import '../../../../assets/scss/breakpoint';
.indicatorDistance {
width: 34px;
@@ -42,3 +43,9 @@
border-bottom: none;
}
}
+
+@media #{$large-phone} {
+ .isntPhoneContent {
+ display: none !important;
+ }
+}
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.html b/src/app/structure-list/components/modal-filter/modal-filter.component.html
index 84740d349587af4e71c2601a88f8d56ca2721aa0..ca72316c5e08ca40509a656d02d67fb9ff116b63 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.html
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.html
@@ -1,11 +1,15 @@
<div *ngIf="modalType" fxLayout="column" fxLayoutAlign="space-between" [ngClass]="['modal', 'modal' + getModalType()]">
- <div class="body-wrap">
+ <div class="body-wrap" fxLayout="column" fxLayoutAlign="space-between">
+ <div class="titleFilter" fxLayout="row" fxLayoutAlign="space-between">
+ <span>Filtres</span>
+ <div (click)="closeModal()" class="ico-close-details"></div>
+ </div>
<div class="contentModal" fxLayout="row wrap" fxLayoutAlign="flex-start" *ngIf="categories.length > 0">
<div class="blockFiltre" *ngFor="let c of categories">
<h4>{{ c.name }}</h4>
<ul class="blockLigne">
- <div fxLayout="row" class="ligneFiltre" fxLayoutAlign="center" *ngFor="let module of c.modules">
+ <div fxLayout="row" class="ligneFiltre" *ngFor="let module of c.modules">
<li class="checkbox">
<div class="checkboxItem">
<label>
@@ -35,7 +39,7 @@
</div>
<div class="footer" fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="3vw">
<a (click)="clearFilters()" tabindex="0">Effacer</a>
- <app-button [style]="'button'" [link]="" [text]="'Appliquer'" (click)="emitModules(checkedModules)"></app-button>
+ <app-button [style]="'button'" [text]="'Appliquer'" (click)="emitModules(checkedModules)"></app-button>
</div>
</div>
</div>
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.scss b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
index e33b41fe5c000c1de41f1696708677f5f73befbd..c81e0a111d8863ebd8513c5ec1ef7fb7166c29ba 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.scss
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
@@ -4,6 +4,7 @@
@import '../../../../assets/scss/breakpoint';
@import '../../../../assets/scss/shapes';
@import '../../../../assets/scss/hyperlink';
+@import '../../../../assets/scss/z-index';
.modaltraining {
@media #{$desktop} {
@@ -22,10 +23,20 @@
max-height: 648px;
max-width: 754px;
width: 94%;
- z-index: 1001 !important;
+ z-index: $modal-filter-structure-z-index !important;
position: absolute;
border-radius: 6px;
margin-top: 3.5px;
+ @media #{$large-phone} {
+ max-height: auto;
+ max-width: auto;
+ width: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ border: none;
+ padding: 0;
+ }
@include background-hash;
border: 1px solid $grey-4;
::-webkit-scrollbar {
@@ -38,12 +49,29 @@
background: $grey;
border-radius: 6px;
}
+ .body-wrap {
+ @media #{$large-phone} {
+ height: 100vh;
+ }
+ .titleFilter {
+ display: none !important;
+ margin: 27px 25px 0px 25px;
+ @include cn-bold-28;
+ @media #{$large-phone} {
+ display: flex !important;
+ }
+ }
+ }
.contentModal {
overflow-y: auto;
max-width: 1100px;
border-bottom: 1px solid $grey;
margin-bottom: 16px;
max-height: 438px;
+ @media #{$large-phone} {
+ max-height: none;
+ height: 100%;
+ }
.blockFiltre {
width: 100%;
margin: 0 32px;
@@ -55,6 +83,11 @@
padding-bottom: 32px;
border-bottom: none;
}
+ @media #{$large-phone} {
+ margin: 0 18px;
+ padding: 25px 0;
+ min-width: 0;
+ }
}
.blockLigne {
padding-left: 0;
diff --git a/src/app/structure-list/components/search/search.component.html b/src/app/structure-list/components/search/search.component.html
index 197c25733caee16ad744a9ee80b54822e64993b7..6dc43c676b89de977f4d726e526817dec4d8fa2a 100644
--- a/src/app/structure-list/components/search/search.component.html
+++ b/src/app/structure-list/components/search/search.component.html
@@ -16,11 +16,16 @@
<span class="separator"></span>
<button (click)="locateMe()" class="icon pin" type="button"><div class="ico-pin-search"></div></button>
</div>
- <app-button [style]="'buttonWithHash'" [text]="'Rechercher'" [type]="'submit'"></app-button>
+ <app-button
+ class="isntPhoneContent"
+ [style]="'buttonWithHash'"
+ [text]="'Rechercher'"
+ [type]="'submit'"
+ ></app-button>
</form>
</div>
<div (clickOutside)="closeModal()">
- <div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
+ <div class="btnSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
<button
class="btn-filter"
type="button"
@@ -75,7 +80,18 @@
</div>
</div>
</div>
-<div class="footerSearchSection" fxLayout="row" fxLayoutAlign="space-between center">
+<div class="phoneSection">
+ <div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center">
+ <app-button
+ [style]="'buttonPhone'"
+ [extraClass]="numberAccompanimentChecked ? 'containCheckedFilters' : ''"
+ [text]="'Filtres'"
+ (action)="openModal(TypeModal.accompaniment)"
+ ></app-button>
+ <a (click)="openConfirmationModal()" tabindex="0">Ajouter une structure</a>
+ </div>
+</div>
+<div class="footerSearchSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center">
<div class="checkbox">
<div class="checkboxItem">
<label>
diff --git a/src/app/structure-list/components/search/search.component.scss b/src/app/structure-list/components/search/search.component.scss
index af7bfa1ad8d7bf3c6628b4b7fdb0a46c2174b40c..d73591af5bd27ce063d6a9cf55c828c027213aad 100644
--- a/src/app/structure-list/components/search/search.component.scss
+++ b/src/app/structure-list/components/search/search.component.scss
@@ -2,6 +2,7 @@
@import '../../../../assets/scss/typography';
@import '../../../../assets/scss/inputs';
@import '../../../../assets/scss/hyperlink';
+@import '../../../../assets/scss/breakpoint';
.header {
.title {
@@ -34,48 +35,48 @@
height: 40px;
}
}
- .btnSection {
- padding: 16px 0 0px 0;
- button {
- background: $white;
- height: 40px;
- width: 100%;
- border: 1px solid $grey-4;
- padding: 3px 16px 3px 16px;
- outline: none;
- border-radius: 4px;
- cursor: pointer;
- @include btn-normal;
- .arrow {
- background-color: transparent;
- border-bottom: 1px solid $grey-2;
- border-right: 1px solid $grey-2;
- transform: translateY(-25%) rotate(45deg);
- margin: 0 5px 0 10px;
- height: 7px;
- width: 7px;
- }
- &:focus {
- border-color: $blue-hover;
- }
+}
+.btnSection {
+ padding: 16px 0 0px 0;
+ button {
+ background: $white;
+ height: 40px;
+ width: 100%;
+ border: 1px solid $grey-4;
+ padding: 3px 16px 3px 16px;
+ outline: none;
+ border-radius: 4px;
+ cursor: pointer;
+ @include btn-normal;
+ .arrow {
+ background-color: transparent;
+ border-bottom: 1px solid $grey-2;
+ border-right: 1px solid $grey-2;
+ transform: translateY(-25%) rotate(45deg);
+ margin: 0 5px 0 10px;
+ height: 7px;
+ width: 7px;
}
- .selected {
- border-color: $primary-color !important;
- color: inherit;
- .arrow {
- background-color: transparent;
- border-bottom: 1px solid $primary-color;
- border-right: 1px solid $primary-color;
- transform: translateY(25%) rotate(-135deg);
- margin: 0 5px 0 10px;
- height: 7px;
- width: 7px;
- }
+ &:focus {
+ border-color: $blue-hover;
}
- .containCheckedFilters {
- border-color: $secondary-color;
+ }
+ .selected {
+ border-color: $primary-color !important;
+ color: inherit;
+ .arrow {
+ background-color: transparent;
+ border-bottom: 1px solid $primary-color;
+ border-right: 1px solid $primary-color;
+ transform: translateY(25%) rotate(-135deg);
+ margin: 0 5px 0 10px;
+ height: 7px;
+ width: 7px;
}
}
+ .containCheckedFilters {
+ border-color: $secondary-color;
+ }
}
.footerSearchSection {
@@ -119,4 +120,21 @@
}
a {
@include hyperlink;
+ width: 100%;
+ text-align: right;
+}
+.phoneSection {
+ margin: 9px 0px 18px 0px;
+ display: none;
+ .btnSection {
+ padding: 0;
+ }
+}
+@media #{$large-phone} {
+ .isntPhoneContent {
+ display: none !important;
+ }
+ .phoneSection {
+ display: block;
+ }
}
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 15e99c89685f7298e7ee17ef46401e57b1d1fb96..0fd98a06c505924fbddd3c99fc9724a657de196c 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
@@ -10,7 +10,7 @@
<h2 class="bold">{{ structure.nomDeVotreStructure }}</h2>
<h3>{{ structure.typeDeStructure }}</h3>
</div>
- <div fxLayout="column" fxLayoutAlign="end">
+ <div class="printButton" fxLayout="column" fxLayoutAlign="end">
<app-button
class="hide-on-print"
[type]="'button'"
@@ -21,8 +21,8 @@
></app-button>
</div>
</div>
- <div fxLayout="row">
- <div fxLayout="column" fxFlex="60%">
+ <div fxLayout="row" fxLayout.lt-sm="column">
+ <div fxLayout="column" fxFlex="50%">
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-structure-opening-status
class="hide-on-print"
@@ -36,21 +36,26 @@
</div>
<div *ngIf="structure.siteWeb" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'web'"></app-svg-icon>
- <a target="_blank" rel="noopener noreferrer" [href]="structure.siteWeb">{{ structure.siteWeb }}</a>
+ <a
+ target="_blank"
+ rel="noopener noreferrer"
+ [href]="structure.siteWeb.includes('http') ? structure.siteWeb : 'http://' + structure.siteWeb"
+ >{{ structure.siteWeb | url }}</a
+ >
</div>
<div *ngIf="structure.telephone" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'tel'"></app-svg-icon>
- <p>{{ structure.telephone }}</p>
+ <p>{{ structure.telephone | phone }}</p>
</div>
</div>
- <div fxLayout="column" fxFlex="40%">
+ <div fxLayout="column" fxFlex="50%">
<div *ngIf="structure.courriel" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'email'"></app-svg-icon>
<a [href]="'mailto:' + structure.courriel">{{ structure.courriel }}</a>
</div>
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'calendar'"></app-svg-icon>
- <p>Mise-à-jour le {{ structure.derniereModification | date: 'mediumDate' }}</p>
+ <p>Mise à jour le {{ structure.derniereModification | date: 'mediumDate' }}</p>
</div>
</div>
</div>
@@ -93,7 +98,7 @@
<app-svg-icon [type]="'ico'" [icon]="'services'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Services</h2>
</div>
- <div fxLayout="row" class="w-100">
+ <div fxLayout="row" class="w-100" fxLayout.lt-sm="column">
<div fxFlex="50%" *ngIf="isBaseSkills()">
<h3 class="subtitle">Compétences de base</h3>
<p *ngFor="let skill of baseSkills">{{ skill.text }}</p>
@@ -111,8 +116,8 @@
<h2>Accueil</h2>
</div>
<!-- Openning Hours -->
- <div fxLayout="row" class="w-100">
- <div fxFlex="70%">
+ <div fxLayout="row" class="w-100" fxLayout.lt-sm="column">
+ <div fxFlex="50%">
<h3 class="subtitle">Horaires d’ouverture au public :</h3>
<div fxLayout="column">
<div *ngFor="let day of structure.hours | keyvalue: keepOriginalOrder">
@@ -131,7 +136,7 @@
</div>
</div>
<!-- modalitesDacces -->
- <div fxFlex="30%">
+ <div fxFlex="50%">
<h3 class="subtitle">Accès</h3>
<div
*ngFor="let acces of structure.modalitesDacces"
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 5e622e0772105b722aadad011f81b10b2398956a..1eafa486069ebe4c536600adef22211be920fc77 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
@@ -3,8 +3,10 @@
@import '../../../../assets/scss/typography';
@import '../../../../assets/scss/z-index';
@import '../../../../assets/scss/layout';
+@import '../../../../assets/scss/breakpoint';
.structrue-details-container {
+ border-right: solid 1px $grey-4;
background-color: $white;
z-index: $structure-details-z-index;
position: absolute;
@@ -15,10 +17,21 @@
height: calc(100vh - #{$header-height} - #{$footer-height});
padding: 10px 24px;
overflow: auto;
+ @media #{$tablet} {
+ position: fixed;
+ padding: 0;
+ height: 100vh;
+ .printButton {
+ display: none !important;
+ }
+ }
+ .printButton {
+ margin-right: 75px;
+ }
}
.structrue-details-container > .structure-details-block {
- padding: 0px 68px 24px 0;
+ padding: 0px 0px 24px 0;
border-bottom: 1px dashed $grey-2;
.subtitle {
text-transform: uppercase;
@@ -27,7 +40,7 @@
}
.structrue-details-container > .structure-details-block ~ .structure-details-block {
- padding: 24px 68px 24px 0;
+ padding: 24px 0;
}
.structure-details-block:last-child {
diff --git a/src/app/structure-list/structure-list.component.scss b/src/app/structure-list/structure-list.component.scss
index 46a1d312fee5bcae2a828c8a32d052e2eedfdeb8..6af9e153e647e422abebf4e0fb13416b61842904 100644
--- a/src/app/structure-list/structure-list.component.scss
+++ b/src/app/structure-list/structure-list.component.scss
@@ -8,7 +8,7 @@
display: grid;
align-items: center;
height: 32px;
- background-color: $secondary-color;
+ background-color: $grey-4;
padding-left: 9px;
margin: 0 16px;
}
diff --git a/src/assets/ico/liste.svg b/src/assets/ico/liste.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0b72214f2340c4762f2c94357caab95645a1d73d
--- /dev/null
+++ b/src/assets/ico/liste.svg
@@ -0,0 +1,8 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<rect x="10" y="9" width="16" height="2" rx="1" />
+<rect x="10" y="15" width="16" height="2" rx="1" />
+<rect x="10" y="21" width="16" height="2" rx="1" />
+<rect x="6" y="9" width="2" height="2" rx="1" />
+<rect x="6" y="15" width="2" height="2" rx="1" />
+<rect x="6" y="21" width="2" height="2" rx="1"/>
+</svg>
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index f7075a3295b2f261e313ef46118300735ba53c7a..af978258768a57371e2532553c7fc11a3bc5dd01 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -1,89 +1,104 @@
<svg xmlns="http://www.w3.org/2000/svg">
-<symbol id="map-marker" width="40" height="46" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z" fill="#348899" stroke="#fff" stroke-width="2"/></symbol>
-<symbol id="map-marker-locate" width="40" height="46" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z" fill="#D50000" stroke="#fff" stroke-width="2"/></symbol>
+<symbol id="map-marker" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z"/></symbol>
+<symbol id="map-marker-locate" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M19.72 43.73l.706.66.683-.683c2.038-2.04 4.04-3.864 5.934-5.588l.179-.163c6.32-5.755 11.624-10.585 11.624-18.493C38.846 9.267 30.59 1 20.402 1 10.214 1 1.957 9.267 1.957 19.463c0 4.152 1.08 7.233 3.179 10.152 2.04 2.84 5.05 5.523 8.833 8.899l.078.07c1.717 1.531 3.607 3.217 5.672 5.147zm6.508-24.267a5.83 5.83 0 01-5.826 5.833 5.83 5.83 0 01-5.826-5.833 5.83 5.83 0 015.826-5.833 5.83 5.83 0 015.826 5.833z" fill="#117083" stroke="#fff" stroke-width="2"/></symbol>
-<symbol id="adress" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="adress" 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"/>
</symbol>
-<symbol id="computer" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="liste" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<rect x="10" y="9" width="16" height="2" rx="1" />
+<rect x="10" y="15" width="16" height="2" rx="1" />
+<rect x="10" y="21" width="16" height="2" rx="1" />
+<rect x="6" y="9" width="2" height="2" rx="1" />
+<rect x="6" y="15" width="2" height="2" rx="1" />
+<rect x="6" y="21" width="2" height="2" rx="1"/>
+</symbol>
+
+<svg id="user" viewBox="0 0 28 25" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.0256 13.9213C22.2638 12.4488 23 10.5413 23 8.5C22.9665 3.81496 19.185 0 14.5 0C9.81496 0 6 3.81496 6 8.5C6 13.185 9.81496 17 14.5 17C16.5079 17 18.3819 16.2972 19.8209 15.126C20.2289 14.717 20.2289 14.717 21.0256 13.9213ZM7.67323 8.5C7.67323 4.7185 10.7185 1.67323 14.5 1.67323C18.2815 1.67323 21.3268 4.7185 21.3268 8.5C21.3268 12.2815 18.2815 15.3268 14.5 15.3268C10.7185 15.3268 7.67323 12.248 7.67323 8.5Z" fill="#333333"/>
+<path d="M13.2564 17.0414C11.6597 16.8372 10.0864 16.1466 8.76423 15H8.68966C3.89049 15 0 19.1129 0 24.1864V23.9793C0 24.543 0.432277 25 0.965517 25C1.49876 25 1.93103 24.543 1.93103 23.9793V24.1864C1.93103 20.2403 4.95697 17.0414 8.68966 17.0414H13.2564Z" fill="#333333"/>
+<path d="M15.3566 17.0414H19.3103C23.043 17.0414 26.069 20.2403 26.069 24.1864V23.9793C26.069 24.543 26.5012 25 27.0345 25C27.5677 25 28 24.543 28 23.9793V24.1864C28 19.335 24.4427 15.3619 19.9351 15.0234C18.5996 16.1728 16.9994 16.8552 15.3566 17.0414Z" fill="#333333"/>
+</svg>
+
+<symbol id="computer" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<rect x="2.5" y="3.5" width="17" height="11" rx="0.5" stroke="#333333"/>
<rect x="2" y="12" width="18" height="2" fill="#333333"/>
<rect x="9" y="15" width="4" height="2" fill="#333333"/>
<path d="M7 17.382C7 17.1479 7.13226 16.9339 7.34164 16.8292L8.78885 16.1056C8.92771 16.0361 9.08082 16 9.23607 16H12.7639C12.9192 16 13.0723 16.0361 13.2111 16.1056L14.6584 16.8292C14.8677 16.9339 15 17.1479 15 17.382C15 17.7233 14.7233 18 14.382 18H7.61803C7.2767 18 7 17.7233 7 17.382Z" fill="#333333"/>
</symbol>
-<symbol id="date" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="date" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M8 10H5V13H8V10Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 2C5.44772 2 5 2.44772 5 3V4H3C2.44771 4 2 4.44772 2 5V19C2 19.5523 2.44771 20 3 20H19C19.5523 20 20 19.5523 20 19V5C20 4.44772 19.5523 4 19 4H17V3C17 2.44772 16.5523 2 16 2C15.4477 2 15 2.44772 15 3V4H7V3C7 2.44772 6.55228 2 6 2ZM4 9V18H18V9H4Z" fill="#333333"/>
</symbol>
-<symbol id ="email" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id ="email" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 4H19.5C20.3284 4 21 4.67157 21 5.5V16.0714C21 16.8998 20.3284 17.5714 19.5 17.5714H3.5C2.67157 17.5714 2 16.8998 2 16.0714V5.5C2 4.67157 2.67157 4 3.5 4ZM2.91716 6.02444C3.04832 5.78143 3.35163 5.69075 3.59464 5.8219L11.2431 9.94966C11.5474 10.1138 11.9148 10.1093 12.2149 9.93753L19.3945 5.82797C19.6341 5.69079 19.9396 5.77387 20.0768 6.01353C20.214 6.25318 20.1309 6.55867 19.8913 6.69585L12.7116 10.8054C12.1116 11.1489 11.3767 11.1581 10.7682 10.8297L3.11971 6.70192C2.8767 6.57077 2.78602 6.26745 2.91716 6.02444Z" fill="#333333"/>
</symbol>
-<symbol id="pass" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="pass" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.55556 5C1.24873 5 1 5.24873 1 5.55556V14.4444C1 14.7513 1.24873 15 1.55556 15H20.4444C20.7513 15 21 14.7513 21 14.4444V5.55556C21 5.24873 20.7513 5 20.4444 5H1.55556ZM4.77222 8.76388C4.78333 8.77499 4.79722 8.78055 4.81389 8.78055H4.91667C4.93333 8.78055 4.94722 8.77499 4.95833 8.76388C4.96944 8.75277 4.97683 8.73888 4.98055 8.72221L5.03055 8.3861H5.43889L5.38889 8.72221C5.38705 8.73888 5.39167 8.75277 5.40278 8.76388C5.41389 8.77499 5.42778 8.78055 5.44444 8.78055H5.54722C5.56389 8.78055 5.57778 8.77499 5.58889 8.76388C5.6 8.75277 5.60739 8.73888 5.61111 8.72221L5.66111 8.3861H5.99444C6.01294 8.3861 6.02778 8.38055 6.03889 8.36943C6.05183 8.35832 6.05833 8.34349 6.05833 8.32499V8.23055C6.05833 8.21205 6.05183 8.19721 6.03889 8.1861C6.02778 8.17499 6.01294 8.16943 5.99444 8.16943H5.69444L5.76667 7.68055H6.06667C6.08517 7.68055 6.1 7.67499 6.11111 7.66388C6.12406 7.65277 6.13056 7.63793 6.13056 7.61943V7.52499C6.13056 7.50649 6.12406 7.49166 6.11111 7.48055C6.1 7.46943 6.08517 7.46388 6.06667 7.46388H5.79722L5.84722 7.12777C5.84905 7.1111 5.84444 7.09721 5.83333 7.0861C5.82222 7.07499 5.80833 7.06943 5.79167 7.06943H5.68889C5.67222 7.06943 5.65833 7.07499 5.64722 7.0861C5.63794 7.09721 5.6315 7.1111 5.62778 7.12777L5.57778 7.46388H5.16667L5.21667 7.12777C5.2185 7.1111 5.21389 7.09721 5.20278 7.0861C5.19167 7.07499 5.17778 7.06943 5.16111 7.06943H5.05833C5.04167 7.06943 5.02778 7.07499 5.01667 7.0861C5.00739 7.09721 5.00094 7.1111 4.99722 7.12777L4.94722 7.46388H4.60555C4.58705 7.46388 4.57222 7.46943 4.56111 7.48055C4.55 7.49166 4.54444 7.50649 4.54444 7.52499V7.61943C4.54444 7.63793 4.55 7.65277 4.56111 7.66388C4.57222 7.67499 4.58705 7.68055 4.60555 7.68055H4.91389L4.84167 8.16943H4.53333C4.51483 8.16943 4.5 8.17499 4.48889 8.1861C4.47778 8.19721 4.47222 8.21205 4.47222 8.23055V8.32499C4.47222 8.34349 4.47778 8.35832 4.48889 8.36943C4.5 8.38055 4.51483 8.3861 4.53333 8.3861H4.80833L4.75833 8.72221C4.7565 8.73888 4.76111 8.75277 4.77222 8.76388ZM6.34239 8.87221C6.3535 8.88332 6.3665 8.88888 6.38128 8.88888H6.52294C6.5415 8.88888 6.55628 8.88427 6.56739 8.87499C6.58039 8.86388 6.58872 8.85277 6.59239 8.84166L6.74517 8.44721H7.65628L7.80905 8.84166C7.81278 8.85277 7.82017 8.86388 7.83128 8.87499C7.84239 8.88427 7.85817 8.88888 7.8785 8.88888H8.02017C8.035 8.88888 8.04794 8.88332 8.05906 8.87221C8.07017 8.8611 8.07572 8.84816 8.07572 8.83332L8.07017 8.80277L7.38406 7.00555C7.36928 6.96482 7.33961 6.94443 7.29517 6.94443H7.10628C7.06183 6.94443 7.03222 6.96482 7.01739 7.00555L6.3285 8.80277C6.32667 8.80832 6.32572 8.81849 6.32572 8.83332C6.32572 8.84816 6.33128 8.8611 6.34239 8.87221ZM8.38939 8.87221C8.40239 8.88332 8.41811 8.88888 8.43661 8.88888H8.58383C8.60239 8.88888 8.61811 8.88332 8.63106 8.87221C8.64406 8.85927 8.6505 8.84349 8.6505 8.82499V8.13055H9.14217C9.35328 8.13055 9.51811 8.08054 9.63661 7.98054C9.757 7.87871 9.81717 7.73149 9.81717 7.53888C9.81717 7.34627 9.757 7.19904 9.63661 7.09721C9.51628 6.99538 9.35144 6.94443 9.14217 6.94443H8.43661C8.41811 6.94443 8.40239 6.95093 8.38939 6.96388C8.37828 6.97499 8.37272 6.99071 8.37272 7.0111V8.82499C8.37272 8.84349 8.37828 8.85927 8.38939 8.87221ZM10.5966 8.87221C10.6096 8.88332 10.6253 8.88888 10.6438 8.88888H10.7883C10.8068 8.88888 10.8226 8.88332 10.8355 8.87221C10.8485 8.85927 10.8549 8.84349 10.8549 8.82499V7.19166H11.3855C11.4041 7.19166 11.4198 7.1861 11.4327 7.17499C11.4457 7.16205 11.4522 7.14627 11.4522 7.12777V7.0111C11.4522 6.99071 11.4457 6.97499 11.4327 6.96388C11.4216 6.95093 11.4059 6.94443 11.3855 6.94443H10.0466C10.0281 6.94443 10.0124 6.95093 9.99939 6.96388C9.98828 6.97682 9.98272 6.9926 9.98272 7.0111V7.12777C9.98272 7.14627 9.98828 7.16205 9.99939 7.17499C10.0124 7.1861 10.0281 7.19166 10.0466 7.19166H10.5799V8.82499C10.5799 8.84349 10.5855 8.85927 10.5966 8.87221ZM11.7803 8.87221C11.7932 8.88332 11.8089 8.88888 11.8275 8.88888H11.9747C11.9932 8.88888 12.0081 8.88332 12.0192 8.87221C12.0321 8.85927 12.0386 8.84349 12.0386 8.82499V7.00832C12.0386 6.98982 12.0321 6.97499 12.0192 6.96388C12.0081 6.95093 11.9932 6.94443 11.9747 6.94443H11.8275C11.8089 6.94443 11.7932 6.95093 11.7803 6.96388C11.7692 6.97499 11.7636 6.98982 11.7636 7.00832V8.82499C11.7636 8.84349 11.7692 8.85927 11.7803 8.87221ZM12.6564 8.71666C12.7861 8.84999 12.975 8.91666 13.2231 8.91666C13.3879 8.91666 13.5278 8.88793 13.6426 8.83055C13.7574 8.77127 13.8444 8.69443 13.9037 8.59999C13.9629 8.50554 13.9953 8.40371 14.0009 8.29443C14.0028 8.27777 13.9972 8.26482 13.9842 8.25555C13.9731 8.24443 13.9592 8.23888 13.9426 8.23888H13.7898C13.7713 8.23888 13.7564 8.24349 13.7453 8.25277C13.7342 8.26204 13.7259 8.27871 13.7203 8.30277C13.6907 8.44166 13.6342 8.53982 13.5509 8.59721C13.4694 8.65277 13.3602 8.68055 13.2231 8.68055C12.9046 8.68055 12.7398 8.50371 12.7287 8.14999C12.7268 8.09627 12.7259 8.0176 12.7259 7.91388C12.7259 7.81016 12.7268 7.73332 12.7287 7.68332C12.7398 7.3296 12.9046 7.15277 13.2231 7.15277C13.3602 7.15277 13.4694 7.18149 13.5509 7.23888C13.6324 7.29443 13.6889 7.39166 13.7203 7.53055C13.7296 7.57316 13.7528 7.59443 13.7898 7.59443H13.9426C13.9574 7.59443 13.9703 7.58982 13.9814 7.58055C13.9944 7.56943 14.0009 7.55649 14.0009 7.54166V7.5361C13.9953 7.42871 13.9629 7.32777 13.9037 7.23332C13.8444 7.13888 13.7574 7.06293 13.6426 7.00555C13.5278 6.94627 13.3879 6.91666 13.2231 6.91666C12.9768 6.91666 12.7889 6.98427 12.6592 7.11943C12.5296 7.25277 12.4602 7.4361 12.4509 7.66943C12.4491 7.72127 12.4481 7.8046 12.4481 7.91943C12.4481 8.03238 12.4491 8.11388 12.4509 8.16388C12.4602 8.39904 12.5287 8.58332 12.6564 8.71666ZM4.25 11C4.11193 11 4 11.1119 4 11.25C4 11.3881 4.11193 11.5 4.25 11.5H12.7259C12.864 11.5 12.9759 11.3881 12.9759 11.25C12.9759 11.1119 12.864 11 12.7259 11H4.25ZM16.6144 11.9418H16.0068C16.0133 12.1185 16.0594 12.249 16.1451 12.3333C16.2321 12.4177 16.3749 12.4598 16.5735 12.4598C16.702 12.4598 16.8163 12.4398 16.9163 12.3996L17 12.9398C16.8273 12.9799 16.6566 13 16.4878 13C16.1373 13 15.8575 12.9063 15.6485 12.7189C15.4408 12.5315 15.3317 12.2724 15.3213 11.9418H15V11.6205H15.3213V11.3755H15V11.0562H15.3272C15.3518 10.7242 15.4726 10.4652 15.6894 10.2791C15.9062 10.093 16.1925 10 16.5482 10C16.6858 10 16.8364 10.0207 17 10.0622L16.9163 10.6044C16.815 10.5629 16.7066 10.5422 16.591 10.5422C16.4119 10.5422 16.2749 10.5843 16.1801 10.6687C16.0854 10.7517 16.0295 10.8809 16.0127 11.0562H16.6144V11.3755H16.0068V11.6205H16.6144V11.9418ZM9.12828 7.89721C9.2635 7.89721 9.36533 7.86666 9.43383 7.80554C9.50422 7.74443 9.53939 7.65554 9.53939 7.53888C9.53939 7.42221 9.50517 7.33332 9.43661 7.27221C9.36811 7.20927 9.26533 7.17777 9.12828 7.17777H8.64772V7.89721H9.12828ZM7.20072 7.22221L7.57572 8.20832H6.82572L7.20072 7.22221ZM5.54444 7.68055L5.47222 8.16943H5.06389L5.13611 7.68055H5.54444ZM19.75 6C19.6119 6 19.5 6.11193 19.5 6.25V6.75C19.5 6.88807 19.6119 7 19.75 7C19.8881 7 20 6.88807 20 6.75V6.25C20 6.11193 19.8881 6 19.75 6ZM19.5 8.25C19.5 8.11193 19.6119 8 19.75 8C19.8881 8 20 8.11193 20 8.25V10.75C20 10.8881 19.8881 11 19.75 11C19.6119 11 19.5 10.8881 19.5 10.75V8.25ZM19.75 12C19.6119 12 19.5 12.1119 19.5 12.25V13.75C19.5 13.8881 19.6119 14 19.75 14C19.8881 14 20 13.8881 20 13.75V12.25C20 12.1119 19.8881 12 19.75 12Z" fill="#333333"/>
</symbol>
-<symbol id="public" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="public" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M13.0474 10.437C14.2168 9.73893 15 8.46093 15 7C15 4.79086 13.2091 3 11 3C8.79086 3 7 4.79086 7 7C7 8.46093 7.7832 9.73893 8.95263 10.437C7.21207 11.2192 6 12.9681 6 15V18H16V15C16 12.9681 14.7879 11.2192 13.0474 10.437Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.917 14H21V11.8C21 10.3099 20.1516 9.02743 18.9332 8.45382C19.7518 7.94188 20.3 7.00468 20.3 5.93333C20.3 4.3133 19.0464 3 17.5 3C16.542 3 15.6963 3.50407 15.1915 4.27286C15.7028 5.05718 16 5.99389 16 7C16 7.44599 15.9416 7.87827 15.832 8.28963C15.9075 8.34834 15.9858 8.40316 16.0668 8.45382C15.9493 8.50916 15.8352 8.57108 15.725 8.63916C15.5088 9.26223 15.173 9.82915 14.7453 10.3124C15.8722 11.214 16.6677 12.514 16.917 14ZM14.9929 7.24086C14.9976 7.16118 15 7.08087 15 7C15 6.48461 14.9025 5.99199 14.725 5.53957C14.7085 5.66836 14.7 5.79981 14.7 5.93333C14.7 6.40316 14.8054 6.84718 14.9929 7.24086ZM15.9 14H14V11.8C14 11.5447 14.0249 11.2955 14.0723 11.055C14.9949 11.7745 15.6585 12.8106 15.9 14Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.80852 4.27286C6.30371 3.50407 5.45804 3 4.5 3C2.9536 3 1.7 4.3133 1.7 5.93333C1.7 7.00468 2.24824 7.94188 3.06684 8.45382C1.84845 9.02743 1 10.3099 1 11.8V14H5.08296C5.33228 12.514 6.12778 11.214 7.25473 10.3124C6.82705 9.82915 6.49117 9.26223 6.27499 8.63916C6.16478 8.57108 6.05069 8.50916 5.93316 8.45382C6.01417 8.40316 6.09253 8.34834 6.16797 8.28963C6.05843 7.87827 6 7.44599 6 7C6 5.99389 6.29717 5.05718 6.80852 4.27286ZM7.9277 11.055C7.0051 11.7745 6.34145 12.8106 6.10002 14H8V11.8C8 11.5447 7.9751 11.2955 7.9277 11.055ZM7.27499 5.53957C7.29148 5.66836 7.3 5.79981 7.3 5.93333C7.3 6.40316 7.19457 6.84718 7.00713 7.24086C7.0024 7.16118 7 7.08087 7 7C7 6.48461 7.09747 5.99199 7.27499 5.53957Z" fill="#333333"/>
</symbol>
-<symbol id="structure" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="structure" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 3C11.2228 3.00746 11.4372 3.08448 11.612 3.21953L11.6211 3.21857L11.6971 3.28918L18.6775 9.0457C18.6952 9.06031 18.7119 9.07606 18.7275 9.09284C18.8592 9.23463 18.9477 9.40976 18.983 9.59841C19.0181 9.78692 18.9987 9.9816 18.9268 10.1599C18.8549 10.3383 18.7333 10.4933 18.5761 10.6073C18.4187 10.7214 18.232 10.7899 18.037 10.8052C18.0232 10.8063 18.0092 10.8068 17.9953 10.8068H17.2786L17.3466 17.9693L17.3466 17.974C17.3466 18.246 17.2364 18.5068 17.0402 18.6991C16.844 18.8913 16.5779 18.9994 16.3003 18.9994H13.1615C12.884 18.9994 12.6178 18.8913 12.4216 18.6991C12.2254 18.5068 12.1152 18.246 12.1152 17.974V14.493C12.1152 14.4908 12.1152 14.4886 12.1152 14.4864C12.1152 14.4837 12.1153 14.481 12.1154 14.4783C12.1389 13.6731 12.0857 13.088 11.9055 12.7135C11.8228 12.5416 11.7197 12.4288 11.5913 12.3537C11.4661 12.2806 11.2814 12.2228 11 12.2171V12.2177C10.7186 12.2234 10.5339 12.2812 10.4087 12.3543C10.2803 12.4294 10.1772 12.5422 10.0945 12.7141C9.91426 13.0886 9.86107 13.6737 9.88462 14.4789C9.88469 14.4815 9.88475 14.4841 9.88478 14.4867C9.88481 14.489 9.88483 14.4913 9.88483 14.4936V17.9746C9.88483 18.2466 9.77456 18.5074 9.57838 18.6997C9.38219 18.8919 9.11604 19 8.83854 19H5.69966C5.42215 19 5.156 18.8919 4.95982 18.6997C4.76364 18.5074 4.65336 18.2466 4.65336 17.9746L4.65339 17.9699L4.72135 10.8074H4.00466C3.99075 10.8074 3.97684 10.8069 3.96298 10.8058C3.76805 10.7905 3.58128 10.722 3.42389 10.6079C3.26667 10.4939 3.14509 10.3389 3.07317 10.1605C3.0013 9.9822 2.98192 9.78752 3.01705 9.599C3.0523 9.41035 3.14082 9.23522 3.27253 9.09344C3.28812 9.07666 3.30483 9.06091 3.32255 9.04629L10.3029 3.28978L10.3789 3.21917L10.388 3.22013C10.5628 3.08508 10.7772 3.00806 11 3.0006V3Z" fill="#333333"/>
</symbol>
-<symbol id="tel" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="tel" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M14.4979 12.1969L11.9719 14.7228L6.92 9.67091L9.44596 7.14494C9.74589 6.84502 9.74589 6.35946 9.44596 6.0603L5.61061 2.22494C5.31068 1.92502 4.82512 1.92502 4.52597 2.22494L2 4.75091C2 13.2401 8.40121 19.6428 16.8919 19.6428L19.4179 17.1169C19.7178 16.8169 19.7178 16.3314 19.4179 16.0322L15.5825 12.1969C15.2834 11.8977 14.7971 11.8977 14.4979 12.1969Z" fill="#333333"/>
</symbol>
-<symbol id="web" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="web" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M11 4C7.13895 4 4 7.13895 4 11C4 14.8611 7.13895 18 11 18C14.8611 18 18 14.8611 18 11C18 7.13895 14.8611 4 11 4ZM16.2611 8.31789H14.4926C14.2568 7.25684 13.9032 6.32842 13.4316 5.60632C14.6547 6.16632 15.6568 7.12421 16.2611 8.31789ZM16.9095 11C16.9095 11.5453 16.8358 12.0905 16.6884 12.5916H14.6842C14.7432 12.0758 14.7726 11.5453 14.7726 11C14.7726 10.4547 14.7432 9.92421 14.6842 9.40842H16.7032C16.8358 9.90948 16.9095 10.4547 16.9095 11ZM5.09053 11C5.09053 10.4547 5.16421 9.90948 5.31158 9.40842H7.33052C7.27158 9.92421 7.24211 10.4547 7.24211 11C7.24211 11.5453 7.27158 12.0758 7.33052 12.5916H5.31158C5.16421 12.0905 5.09053 11.5453 5.09053 11ZM8.31789 11C8.31789 10.4695 8.3621 9.93895 8.43579 9.40842H10.4695V12.5916H8.43579C8.3621 12.0611 8.31789 11.5305 8.31789 11ZM11.5453 5.22316C12.3558 5.60631 13.0042 6.84421 13.3579 8.33263H11.5453V5.22316ZM10.4547 5.22316V8.33263H8.64211C8.99579 6.84421 9.64421 5.60631 10.4547 5.22316ZM10.4547 13.6821V16.7916C9.64421 16.4084 8.99579 15.1705 8.64211 13.6821H10.4547ZM11.5453 16.7768V13.6674H13.3579C13.0042 15.1558 12.3558 16.3937 11.5453 16.7768ZM11.5453 12.5916V9.40842H13.5789C13.6526 9.93895 13.6968 10.4695 13.6968 11C13.6968 11.5305 13.6526 12.0611 13.5789 12.5916H11.5453ZM8.56842 5.62105C8.11158 6.34316 7.74316 7.27158 7.50737 8.33263H5.73895C6.34316 7.12421 7.34526 6.16632 8.56842 5.62105ZM5.73895 13.6821H7.50737C7.74316 14.7432 8.09684 15.6716 8.56842 16.3937C7.34526 15.8337 6.34316 14.8758 5.73895 13.6821ZM13.4316 16.3789C13.8884 15.6568 14.2568 14.7284 14.4926 13.6674H16.2611C15.6568 14.8758 14.6547 15.8337 13.4316 16.3789Z" fill="#333333"/>
</symbol>
-<symbol id="accueil" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="accueil" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="M17.375 10.8789C19.724 11.194 21.6862 12.2539 23.2617 14.0586C24.8372 15.8633 25.625 17.9688 25.625 20.375H6.375C6.375 17.9688 7.16276 15.8633 8.73828 14.0586C10.3138 12.2539 12.276 11.194 14.625 10.8789V10.0625H13.9375C13.737 10.0625 13.5651 10.0052 13.4219 9.89062C13.3073 9.7474 13.25 9.57552 13.25 9.375V8.6875C13.25 8.48698 13.3073 8.32943 13.4219 8.21484C13.5651 8.07161 13.737 8 13.9375 8H18.0625C18.263 8 18.4206 8.07161 18.5352 8.21484C18.6784 8.32943 18.75 8.48698 18.75 8.6875V9.375C18.75 9.57552 18.6784 9.7474 18.5352 9.89062C18.4206 10.0052 18.263 10.0625 18.0625 10.0625H17.375V10.8789ZM26.3125 21.75C26.513 21.75 26.6706 21.8216 26.7852 21.9648C26.9284 22.0794 27 22.237 27 22.4375V23.8125C27 24.013 26.9284 24.1849 26.7852 24.3281C26.6706 24.4427 26.513 24.5 26.3125 24.5H5.6875C5.48698 24.5 5.3151 24.4427 5.17188 24.3281C5.05729 24.1849 5 24.013 5 23.8125V22.4375C5 22.237 5.05729 22.0794 5.17188 21.9648C5.3151 21.8216 5.48698 21.75 5.6875 21.75H26.3125Z" fill="black"/>
</symbol>
-<symbol id="demarches" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="demarches" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect x="11" y="10" width="2" height="2" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 11C8.23858 11 6 13.2386 6 16V23C6 26.3137 8.68629 29 12 29C15.3137 29 18 26.3137 18 23V16C18 13.2386 15.7614 11 13 11H11ZM12 14.5C11.4477 14.5 11 14.9477 11 15.5V18.5C11 19.0523 11.4477 19.5 12 19.5C12.5523 19.5 13 19.0523 13 18.5V15.5C13 14.9477 12.5523 14.5 12 14.5Z" fill="black"/>
<path d="M12 10.5C12 9.33333 12 9.7 12 8.5C12 7 13 3 16.9999 3C20.9998 3 21.9999 7 21.9999 9.5C21.9999 12 21.9999 11 21.9999 12.5C21.9999 14 22.4999 17 24.9999 17C27.4999 17 27.9999 14.5 27.9999 12.5" stroke="black"/>
</symbol>
-<symbol id="equipement" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="equipement" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="M18.75 19.0625V17H27V23.1875C27 23.7318 26.7852 24.2044 26.3555 24.6055C25.9544 25.0352 25.4818 25.25 24.9375 25.25H7.0625C6.51823 25.25 6.03125 25.0352 5.60156 24.6055C5.20052 24.2044 5 23.7318 5 23.1875V17H13.25V19.0625C13.25 19.263 13.3073 19.4349 13.4219 19.5781C13.5651 19.6927 13.737 19.75 13.9375 19.75H18.0625C18.263 19.75 18.4206 19.6927 18.5352 19.5781C18.6784 19.4349 18.75 19.263 18.75 19.0625ZM24.9375 10.125C25.4818 10.125 25.9544 10.3398 26.3555 10.7695C26.7852 11.1706 27 11.6432 27 12.1875V15.625H5V12.1875C5 11.6432 5.20052 11.1706 5.60156 10.7695C6.03125 10.3398 6.51823 10.125 7.0625 10.125H10.5V8.0625C10.5 7.51823 10.7005 7.04557 11.1016 6.64453C11.5312 6.21484 12.0182 6 12.5625 6H19.4375C19.9818 6 20.4544 6.21484 20.8555 6.64453C21.2852 7.04557 21.5 7.51823 21.5 8.0625V10.125H24.9375ZM18.75 10.125V8.75H13.25V10.125H18.75Z" fill="black"/>
</symbol>
-<symbol id ="label" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id ="label" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="M6.375 26.75V24H25.625V26.75H6.375ZM22.875 15.75C24.0208 15.75 24.9948 16.151 25.7969 16.9531C26.599 17.7552 27 18.7292 27 19.875V21.25C27 21.6224 26.8568 21.9518 26.5703 22.2383C26.3125 22.4961 25.9974 22.625 25.625 22.625H6.375C6.0026 22.625 5.67318 22.4961 5.38672 22.2383C5.12891 21.9518 5 21.6224 5 21.25V19.875C5 18.7292 5.40104 17.7552 6.20312 16.9531C7.00521 16.151 7.97917 15.75 9.125 15.75H12.0039C12.3477 15.75 12.6341 15.6354 12.8633 15.4062C13.1211 15.1484 13.25 14.8477 13.25 14.5039V14.4609C13.25 13.3151 12.9206 12.026 12.2617 10.5938C12.0039 10.0495 11.875 9.47656 11.875 8.875C11.875 7.61458 12.362 6.56901 13.3359 5.73828C14.3099 4.90755 15.4414 4.60677 16.7305 4.83594C17.5612 4.97917 18.2773 5.36589 18.8789 5.99609C19.5091 6.59766 19.9102 7.3138 20.082 8.14453C20.2253 9.0612 20.082 9.92057 19.6523 10.7227C19.0508 11.9258 18.75 13.043 18.75 14.0742V14.5039C18.75 14.8477 18.8646 15.1484 19.0938 15.4062C19.3516 15.6354 19.6523 15.75 19.9961 15.75H22.875Z" fill="black"/>
</symbol>
-<symbol id="services" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="services" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="M26.1416 18.2344C26.3994 18.349 26.4854 18.5495 26.3994 18.8359C25.9124 20.3542 25.1247 21.7005 24.0361 22.875C23.8643 23.0755 23.6637 23.1185 23.4346 23.0039L21.5869 21.9297C20.8135 22.5885 19.9398 23.0898 18.9658 23.4336V25.5391C18.9658 25.8255 18.8369 25.9974 18.5791 26.0547C17.0036 26.3984 15.4424 26.3984 13.8955 26.0547C13.609 25.9974 13.4658 25.8255 13.4658 25.5391V23.4336C12.4919 23.0898 11.6182 22.5885 10.8447 21.9297L9.04004 23.0039C8.78223 23.1185 8.56738 23.0755 8.39551 22.875C7.30697 21.7005 6.51921 20.3542 6.03223 18.8359C5.94629 18.5781 6.03223 18.3776 6.29004 18.2344L8.09473 17.1602C8.00879 16.6732 7.96582 16.1719 7.96582 15.6562C7.96582 15.1406 8.00879 14.6393 8.09473 14.1523L6.29004 13.0781C6.03223 12.9635 5.94629 12.763 6.03223 12.4766C6.51921 10.9583 7.30697 9.61198 8.39551 8.4375C8.56738 8.23698 8.78223 8.20833 9.04004 8.35156L10.8447 9.38281C11.6182 8.72396 12.4919 8.22266 13.4658 7.87891V5.77344C13.4658 5.48698 13.5947 5.3151 13.8525 5.25781C15.4281 4.91406 17.0036 4.91406 18.5791 5.25781C18.8369 5.3151 18.9658 5.48698 18.9658 5.77344V7.87891C19.9398 8.22266 20.8135 8.72396 21.5869 9.38281L23.3916 8.30859C23.6494 8.19401 23.8643 8.23698 24.0361 8.4375C25.1247 9.61198 25.9124 10.9583 26.3994 12.4766C26.4854 12.763 26.3994 12.9635 26.1416 13.0781L24.3369 14.1523C24.5088 15.1549 24.5088 16.1576 24.3369 17.1602L26.1416 18.2344ZM13.7666 18.1055C14.4541 18.7643 15.2705 19.0938 16.2158 19.0938C17.1611 19.0938 17.9632 18.7643 18.6221 18.1055C19.3096 17.418 19.6533 16.6016 19.6533 15.6562C19.6533 14.7109 19.3096 13.9089 18.6221 13.25C17.9632 12.5625 17.1611 12.2188 16.2158 12.2188C15.2705 12.2188 14.4541 12.5625 13.7666 13.25C13.1077 13.9089 12.7783 14.7109 12.7783 15.6562C12.7783 16.6016 13.1077 17.418 13.7666 18.1055Z" fill="black"/>
</symbol>
-<symbol id="print" width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="print" fill="none" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect x="10" y="8" width="12" height="5" stroke="black" stroke-width="2"/>
<rect x="10" y="17" width="12" height="8" stroke="black" stroke-width="2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 12C5.44772 12 5 12.4477 5 13V21H9V17H23V21H27V13C27 12.4477 26.5523 12 26 12H6Z" fill="black"/>
</symbol>
-<symbol id="calendar" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="calendar" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M8 10H5V13H8V10Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6 2C5.44772 2 5 2.44772 5 3V4H3C2.44772 4 2 4.44772 2 5V19C2 19.5523 2.44772 20 3 20H19C19.5523 20 20 19.5523 20 19V5C20 4.44772 19.5523 4 19 4H17V3C17 2.44772 16.5523 2 16 2C15.4477 2 15 2.44772 15 3V4H7V3C7 2.44772 6.55229 2 6 2ZM4 9V18H18V9H4Z" fill="#333333"/>
</symbol>
-<symbol id="group" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="group" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M13.0474 10.437C14.2168 9.73893 15 8.46093 15 7C15 4.79086 13.2091 3 11 3C8.79086 3 7 4.79086 7 7C7 8.46093 7.7832 9.73893 8.95263 10.437C7.21207 11.2192 6 12.9681 6 15V18H16V15C16 12.9681 14.7879 11.2192 13.0474 10.437Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.917 14H21V11.8C21 10.3099 20.1516 9.02743 18.9332 8.45382C19.7518 7.94188 20.3 7.00468 20.3 5.93333C20.3 4.3133 19.0464 3 17.5 3C16.542 3 15.6963 3.50407 15.1915 4.27286C15.7028 5.05718 16 5.99389 16 7C16 7.44599 15.9416 7.87827 15.832 8.28963C15.9075 8.34834 15.9858 8.40316 16.0668 8.45382C15.9493 8.50916 15.8352 8.57108 15.725 8.63916C15.5088 9.26223 15.173 9.82915 14.7453 10.3124C15.8722 11.214 16.6677 12.514 16.917 14ZM14.9929 7.24086C14.9976 7.16118 15 7.08087 15 7C15 6.48461 14.9025 5.99199 14.725 5.53957C14.7085 5.66836 14.7 5.79981 14.7 5.93333C14.7 6.40316 14.8054 6.84718 14.9929 7.24086ZM15.9 14H14V11.8C14 11.5447 14.0249 11.2955 14.0723 11.055C14.9949 11.7745 15.6585 12.8106 15.9 14Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.80852 4.27286C6.30371 3.50407 5.45804 3 4.5 3C2.9536 3 1.7 4.3133 1.7 5.93333C1.7 7.00468 2.24824 7.94188 3.06684 8.45382C1.84845 9.02743 1 10.3099 1 11.8V14H5.08296C5.33228 12.514 6.12778 11.214 7.25473 10.3124C6.82705 9.82915 6.49117 9.26223 6.27499 8.63916C6.16478 8.57108 6.05069 8.50916 5.93316 8.45382C6.01417 8.40316 6.09253 8.34834 6.16797 8.28963C6.05843 7.87827 6 7.44599 6 7C6 5.99389 6.29717 5.05718 6.80852 4.27286ZM7.9277 11.055C7.0051 11.7745 6.34145 12.8106 6.10002 14H8V11.8C8 11.5447 7.9751 11.2955 7.9277 11.055ZM7.27499 5.53957C7.29148 5.66836 7.3 5.79981 7.3 5.93333C7.3 6.40316 7.19457 6.84718 7.00713 7.24086C7.0024 7.16118 7 7.08087 7 7C7 6.48461 7.09747 5.99199 7.27499 5.53957Z" fill="#333333"/>
</symbol>
-<symbol id="mdm" width="19" height="24" viewBox="0 0 19 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="mdm" viewBox="0 0 19 24" xmlns="http://www.w3.org/2000/svg">
<mask id="path-1-outside-1" maskUnits="userSpaceOnUse" x="0" y="-0.108661" width="19" height="24" fill="black">
<rect fill="white" y="-0.108661" width="19" height="24"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34019C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617Z"/>
@@ -92,7 +107,7 @@
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34018C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617ZM11 4.5C11 5.32843 10.3284 6 9.5 6C8.67157 6 8 5.32843 8 4.5C8 3.67157 8.67157 3 9.5 3C10.3284 3 11 3.67157 11 4.5ZM4.25 15.9354C3.54057 16.0544 3 16.6714 3 17.4146V18.75H4.25V15.9354ZM3 21.9146V19.25H4.25V21.9146H3ZM4.75 21.9146V19.25H6V21.9146H4.75ZM6 17.4146V18.75H4.75V15.9354C5.45943 16.0544 6 16.6714 6 17.4146ZM13 17.4146C13 16.6714 13.5406 16.0544 14.25 15.9354V18.75H13V17.4146ZM13 19.25V21.9146H14.25V19.25H13ZM14.75 19.25V21.9146H16V19.25H14.75ZM16 18.75V17.4146C16 16.6714 15.4594 16.0544 14.75 15.9354V18.75H16ZM14.25 8C13.5406 8.11902 13 8.73601 13 9.47926V10.8146H14.25V8ZM13 13.9793V11.3146H14.25V13.9793H13ZM14.75 13.9793V11.3146H16V13.9793H14.75ZM16 9.47926V10.8146H14.75V8C15.4594 8.11902 16 8.73601 16 9.47926ZM8 9.47926C8 8.73601 8.54057 8.11902 9.25 8V10.8146H8V9.47926ZM8 11.3146V13.9793H9.25V11.3146H8ZM9.75 11.3146V13.9793H11V11.3146H9.75ZM11 10.8146V9.47926C11 8.73601 10.4594 8.11902 9.75 8V10.8146H11ZM4.25 8C3.54057 8.11902 3 8.73601 3 9.47926V10.8146H4.25V8ZM3 13.9793V11.3146H4.25V13.9793H3ZM4.75 13.9793V11.3146H6V13.9793H4.75ZM6 9.47926V10.8146H4.75V8C5.45943 8.11902 6 8.73601 6 9.47926Z" fill="#D4C4A9"/>
</symbol>
-<symbol id="mdm-hover" width="19" height="24" viewBox="0 0 19 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<symbol id="mdm-hover" viewBox="0 0 19 24" xmlns="http://www.w3.org/2000/svg">
<mask id="path-1-outside-1" maskUnits="userSpaceOnUse" x="0" y="-0.108661" width="19" height="24" fill="black">
<rect fill="white" y="-0.108661" width="19" height="24"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.84054 5.57617C1.72559 6.04339 1 7.13416 1 8.34305V23H8V18.5C8 17.6716 8.67157 17 9.5 17C10.3284 17 11 17.6716 11 18.5V23H18V8.40362C18 7.1644 17.2381 6.05271 16.0823 5.60565L14.5555 5.01505C14.1291 4.85011 13.746 4.5899 13.4355 4.2543L10.9183 1.5332C10.1451 0.6974 8.83121 0.674761 8.0297 1.48343L5.19821 4.34019C4.92065 4.62023 4.5906 4.84281 4.22694 4.9952L2.84054 5.57617Z"/>
@@ -102,7 +117,7 @@
</symbol>
-<symbol id="wifi" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/symbol">
+<symbol id="wifi" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/symbol">
<g clip-path="url(#clip0)">
<path d="M1.08488 8.63175C3.61838 6.09825 7.11838 4.53125 10.9844 4.53125C14.8504 4.53125 18.3504 6.09825 20.8839 8.63175L19.4697 10.046C17.2981 7.87439 14.2981 6.53125 10.9844 6.53125C7.67067 6.53125 4.67067 7.8744 2.4991 10.046L1.08488 8.63175Z" fill="#333333"/>
<path d="M0.987882 8.72971C-1.46518 11.2313 -2.98671 14.6496 -3.01522 18.4233C-3.00846 17.5465 -2.91931 16.6682 -2.74662 15.8C-2.21539 13.1293 -0.917109 10.6726 0.987882 8.72971Z" fill="#333333"/>
diff --git a/src/assets/ico/user.svg b/src/assets/ico/user.svg
new file mode 100644
index 0000000000000000000000000000000000000000..eb1d88b158b69c85f647f85ed6a3c67d9676f3d7
--- /dev/null
+++ b/src/assets/ico/user.svg
@@ -0,0 +1,5 @@
+<svg width="28" height="25" viewBox="0 0 28 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.0256 13.9213C22.2638 12.4488 23 10.5413 23 8.5C22.9665 3.81496 19.185 0 14.5 0C9.81496 0 6 3.81496 6 8.5C6 13.185 9.81496 17 14.5 17C16.5079 17 18.3819 16.2972 19.8209 15.126C20.2289 14.717 20.2289 14.717 21.0256 13.9213ZM7.67323 8.5C7.67323 4.7185 10.7185 1.67323 14.5 1.67323C18.2815 1.67323 21.3268 4.7185 21.3268 8.5C21.3268 12.2815 18.2815 15.3268 14.5 15.3268C10.7185 15.3268 7.67323 12.248 7.67323 8.5Z" fill="#333333"/>
+<path d="M13.2564 17.0414C11.6597 16.8372 10.0864 16.1466 8.76423 15H8.68966C3.89049 15 0 19.1129 0 24.1864V23.9793C0 24.543 0.432277 25 0.965517 25C1.49876 25 1.93103 24.543 1.93103 23.9793V24.1864C1.93103 20.2403 4.95697 17.0414 8.68966 17.0414H13.2564Z" fill="#333333"/>
+<path d="M15.3566 17.0414H19.3103C23.043 17.0414 26.069 20.2403 26.069 24.1864V23.9793C26.069 24.543 26.5012 25 27.0345 25C27.5677 25 28 24.543 28 23.9793V24.1864C28 19.335 24.4427 15.3619 19.9351 15.0234C18.5996 16.1728 16.9994 16.8552 15.3566 17.0414Z" fill="#333333"/>
+</svg>
diff --git a/src/assets/logos/ram_logo.svg b/src/assets/logos/ram_logo.svg
index d8bd6173f4eab84d1adc18939d150f298eea15df..a2a1b876580f495af8135d7ef47045725d0ba2d6 100644
--- a/src/assets/logos/ram_logo.svg
+++ b/src/assets/logos/ram_logo.svg
@@ -1,9 +1,25 @@
-<svg width="127" height="70" viewBox="0 0 127 70" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M24.1764 46.3997V30.7881M24.1764 30.7881V17.6632C24.1764 17.1109 24.6234 16.6632 25.1757 16.6632C27.6739 16.6632 31.7707 16.6632 33.8408 16.6632C36.8145 16.6632 40.5315 18.15 40.5315 24.0973C40.5315 30.0446 34.5842 30.7881 27.8935 30.7881C22.5409 30.7881 23.1852 30.7881 24.1764 30.7881Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M42.0178 46.3998C42.2656 46.8954 42.0225 46.3998 40.531 42.6828C38.4226 37.4283 36.0726 30.7881 26.4082 30.7881H22" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M49.4521 46.4028C50.4434 42.1902 52.8718 32.5754 54.656 27.8175C56.4402 23.0597 58.8687 18.401 59.8599 16.6663C60.8511 17.9053 63.4283 21.8702 65.8072 27.8175C68.1862 33.7648 70.7633 42.6858 71.7545 46.4028" stroke="#D50000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M49.5063 31.5336L66.8166 31.5336" stroke="#D50000" stroke-width="2" stroke-linecap="round"/>
-<path d="M91.0928 33.7628C91.6875 34.9522 92.3318 34.2584 92.5796 33.7628C95.5533 28.8067 101.649 18.5972 102.244 17.4077C102.987 15.9209 104.474 15.1775 104.474 17.4077C104.474 19.1919 104.474 37.7276 104.474 46.4008" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M92.5771 33.7628C91.9824 34.9522 91.3381 34.2584 91.0903 33.7628C88.1167 28.8067 82.0207 18.5972 81.426 17.4077C80.6825 15.9209 79.1957 15.1775 79.1957 17.4077C79.1957 19.1919 79.1957 37.7276 79.1957 46.4008" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M41.7603 45.7377L43.9372 50.7621C44.571 52.225 46.0131 53.1718 47.6075 53.1718L75.243 53.1718C77.4521 53.1718 79.243 51.3809 79.243 49.1718V45.7377" stroke="black" stroke-width="2"/>
+<svg width="118" height="22" viewBox="0 0 118 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<rect x="32.2148" y="20.4286" width="11.7857" height="1.57143" rx="0.785714" fill="black"/>
+<rect x="66" y="20.4286" width="11.7857" height="1.57143" rx="0.785714" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.3583 17.2857V11.7857C24.3583 10.4839 25.4136 9.42855 26.7154 9.42855C28.0172 9.42855 29.0725 10.4839 29.0725 11.7857V17.2857C29.0725 18.5875 28.0172 19.6428 26.7154 19.6428C25.4136 19.6428 24.3583 18.5875 24.3583 17.2857ZM26.7154 7.07141C29.319 7.07141 31.4297 9.18207 31.4297 11.7857V17.2857C31.4297 19.8893 29.319 22 26.7154 22C24.1118 22 22.0011 19.8893 22.0011 17.2857V11.7857C22.0011 9.18207 24.1118 7.07141 26.7154 7.07141Z" fill="#D50000"/>
+<rect width="2.35714" height="16.5" transform="matrix(-1 0 0 1 24.3555 0)" fill="#D50000"/>
+<rect width="2.35714" height="16.5" transform="matrix(-1 0 0 1 2.35547 0)" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.07143 22H9.42857V11.7857C9.42857 9.18207 7.31791 7.07141 4.71429 7.07141C2.11066 7.07141 0 9.18207 0 11.7857V22H2.35714V11.7857C2.35714 10.4839 3.41247 9.42855 4.71429 9.42855C6.0161 9.42855 7.07143 10.4839 7.07143 11.7857V22Z" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0714 7.85714H20.4286V17.2857C20.4286 19.8893 18.3179 22 15.7143 22C13.1107 22 11 19.8893 11 17.2857V7.85714H13.3571V17.2857C13.3571 18.5875 14.4125 19.6429 15.7143 19.6429C17.0161 19.6429 18.0714 18.5875 18.0714 17.2857V7.85714Z" fill="#D50000"/>
+<rect width="2.35715" height="11" transform="matrix(-1 0 0 1 80.9258 7.07141)" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M85.6417 22H87.9989V11.7857C87.9989 9.18207 85.8882 7.07141 83.2846 7.07141C80.681 7.07141 78.5703 9.18207 78.5703 11.7857V22H80.9275V11.7857C80.9275 10.4839 81.9828 9.42855 83.2846 9.42855C84.5864 9.42855 85.6417 10.4839 85.6417 11.7857V22Z" fill="#D50000"/>
+<rect width="2.35714" height="11" transform="matrix(-1 0 0 1 102.926 7.07141)" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M107.642 22H109.999V11.7857C109.999 9.18207 107.888 7.07141 105.285 7.07141C102.681 7.07141 100.57 9.18207 100.57 11.7857V22H102.927V11.7857C102.927 10.4839 103.983 9.42855 105.285 9.42855C106.586 9.42855 107.642 10.4839 107.642 11.7857V22Z" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M114.712 22H117.069V11.7857C117.069 9.18207 114.959 7.07141 112.355 7.07141C109.751 7.07141 107.641 9.18207 107.641 11.7857V22H109.998V11.7857C109.998 10.4839 111.053 9.42855 112.355 9.42855C113.657 9.42855 114.712 10.4839 114.712 11.7857V22Z" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M96.6417 7.85714H98.9989V17.2857C98.9989 19.8893 96.8882 22 94.2846 22C91.681 22 89.5703 19.8893 89.5703 17.2857V7.85714H91.9275V17.2857C91.9275 18.5875 92.9828 19.6429 94.2846 19.6429C95.5864 19.6429 96.6417 18.5875 96.6417 17.2857V7.85714Z" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M51.8566 17.2857V11.7857C51.8566 10.4839 50.8013 9.42855 49.4994 9.42855C48.1976 9.42855 47.1423 10.4839 47.1423 11.7857V17.2857C47.1423 18.5875 48.1976 19.6428 49.4994 19.6428C50.8013 19.6428 51.8566 18.5875 51.8566 17.2857ZM49.4994 7.07141C46.8958 7.07141 44.7852 9.18207 44.7852 11.7857V17.2857C44.7852 19.8893 46.8958 22 49.4994 22C52.1031 22 54.2137 19.8893 54.2137 17.2857V11.7857C54.2137 9.18207 52.1031 7.07141 49.4994 7.07141Z" fill="#D50000"/>
+<rect x="51.8594" width="2.35714" height="16.5" fill="#D50000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.8566 7.85714H65.2137V17.2857C65.2137 19.8893 63.1031 22 60.4994 22C57.8958 22 55.7852 19.8893 55.7852 17.2857V7.85714H58.1423V17.2857C58.1423 18.5875 59.1976 19.6429 60.4994 19.6429C61.8013 19.6429 62.8566 18.5875 62.8566 17.2857V7.85714Z" fill="#D50000"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="117.071" height="22" fill="white"/>
+</clipPath>
+</defs>
</svg>
diff --git a/src/assets/logos/territoire.svg b/src/assets/logos/territoire.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1c1cb3b1ab8f90acb949df51efeba0355c6deb96
--- /dev/null
+++ b/src/assets/logos/territoire.svg
@@ -0,0 +1,5 @@
+<svg width="120" height="56" viewBox="0 0 120 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M67.2273 20.667H65.6731V24.4108H67.2273C68.0184 24.4108 68.6205 24.2445 69.0371 23.9102C69.4536 23.5759 69.6602 23.0823 69.6602 22.4278C69.6602 21.7732 69.4519 21.3164 69.0371 21.0573C68.6223 20.7965 68.0184 20.667 67.2273 20.667ZM67.4723 18.2727L67.6229 18.2744C68.2757 18.2832 68.89 18.3514 69.4659 18.4774C70.0855 18.614 70.628 18.8415 71.0919 19.1635C71.5557 19.4838 71.9232 19.9109 72.1963 20.4412C72.4693 20.9733 72.6058 21.6349 72.6058 22.426C72.6058 23.4079 72.3905 24.2165 71.9617 24.8501C71.5329 25.4837 70.9571 25.958 70.2342 26.2713L73.2604 31.6096H69.8859L67.3288 26.8016H65.6731V31.6096H62.6662V18.2727H67.4723ZM60.8687 18.2727V20.8105H55.5304V23.4902H60.0705V26.007H55.5304V29.0752H61.0717V31.6113H52.5235V18.2744H60.8687V18.2727ZM50.4407 18.2727V31.6096H47.4337V18.2727H50.4407ZM46.4133 18.2727V20.8105H42.7536V31.6113H39.7274V20.8105H36.0676V18.2727H46.4133ZM78.3309 18.0276C79.108 18.0276 79.8746 18.1782 80.6307 18.4774C81.3868 18.7767 82.0519 19.2143 82.6242 19.7866L81.091 21.6892L80.9983 21.6174C80.5939 21.3111 80.1879 21.0731 79.7836 20.9015C79.3478 20.7178 78.863 20.625 78.3309 20.625C77.8128 20.625 77.3997 20.73 77.0935 20.9418C76.7872 21.1536 76.6331 21.4494 76.6331 21.8309C76.6331 22.0357 76.6839 22.209 76.7872 22.3525C76.8887 22.496 77.0322 22.6255 77.216 22.7411C77.3997 22.8566 77.615 22.9668 77.8601 23.0683C78.1051 23.1699 78.3711 23.2836 78.6582 23.4061L80.3752 24.101L80.4679 24.1395C81.2415 24.4633 81.8541 24.9009 82.3074 25.4504C82.7783 26.0228 83.0128 26.7806 83.0128 27.7205C83.0128 28.2788 82.9008 28.8074 82.675 29.3062C82.4492 29.8033 82.1237 30.2409 81.6931 30.6154C81.2643 30.99 80.7357 31.291 80.1074 31.5151C79.4808 31.7408 78.7719 31.8528 77.9808 31.8528C77.1075 31.8528 76.2393 31.6918 75.373 31.3715C74.5066 31.0512 73.733 30.5699 73.0521 29.9293L74.7691 27.864L74.8654 27.9445C75.317 28.3173 75.814 28.6236 76.3549 28.8669C76.9342 29.126 77.503 29.2555 78.0631 29.2555C78.6897 29.2555 79.157 29.14 79.4633 28.9072C79.7696 28.6761 79.9236 28.3611 79.9236 27.9655C79.9236 27.7608 79.8799 27.584 79.7906 27.4335C79.7013 27.2829 79.5718 27.1499 79.402 27.0344C79.2323 26.9189 79.0275 26.8086 78.7877 26.7071C78.5497 26.6056 78.2871 26.4918 78.0001 26.3693L76.2621 25.6325L76.1483 25.5852C75.8473 25.4557 75.555 25.2947 75.2697 25.1004C74.9494 24.8816 74.6624 24.6261 74.4103 24.3338C74.1583 24.0397 73.957 23.7002 73.8065 23.3116C73.656 22.9231 73.5807 22.4838 73.5807 21.9919C73.5807 21.4459 73.6962 20.9313 73.929 20.4482C74.16 19.9634 74.4873 19.5416 74.9109 19.1793C75.3327 18.8187 75.835 18.5352 76.4144 18.3304C76.9972 18.1309 77.6343 18.0276 78.3309 18.0276ZM76.4336 33.274L77.5993 35.7909L77.6745 35.9484C77.7988 36.2145 77.9248 36.4928 78.0491 36.7815C78.1996 37.1299 78.3694 37.5149 78.5602 37.9367H78.6424L78.6914 37.7967C78.8245 37.4291 78.954 37.0896 79.0817 36.7798C79.2253 36.4315 79.3653 36.1007 79.5018 35.7874L80.566 33.2706H83.7759L80.3192 39.8987L83.9999 46.6092H80.6465L79.318 43.8893L79.1553 43.5358C79.0485 43.3012 78.9417 43.0667 78.8367 42.8357C78.6792 42.4874 78.5059 42.1093 78.3151 41.6998H78.2329L78.1769 41.852C78.0456 42.2038 77.9143 42.5311 77.7831 42.8357C77.6325 43.184 77.4838 43.534 77.3332 43.8893L76.0853 46.6092H72.8544L76.5561 39.757L73.0801 33.2723H76.4336V33.274ZM59.6522 33.274V35.8102H54.314V38.4898H58.8541V41.0067H54.314V44.0748H59.8553V46.6109H51.307V33.274H59.6522ZM49.0107 33.274V46.6109H46.0038V33.274H49.0107ZM39.2688 33.274V44.0748H44.5458V46.6109H36.2637V33.274H39.2688ZM64.6072 33.274V40.8386C64.6159 42.0953 64.8137 42.9774 65.2005 43.4815C65.5961 43.9996 66.1684 44.2586 66.9175 44.2586C67.6666 44.2586 68.2459 43.9996 68.6555 43.4815C69.0651 42.9634 69.2698 42.0498 69.2698 40.7406V33.274H72.1735V40.5516C72.1578 42.7271 71.7114 44.3181 70.8346 45.3228C69.9419 46.3449 68.6363 46.8577 66.9175 46.8577C65.1865 46.8577 63.8633 46.3467 62.9497 45.3228C62.0361 44.3006 61.5793 42.6711 61.5793 40.4343V33.274H64.6072Z" fill="#4232C5"/>
+<path d="M65.7327 50.1237H52.9559V53.4072H65.7327V50.1237Z" fill="#E8336D"/>
+<path d="M77.9546 13.3755C78.0141 13.1059 78.0701 12.8697 78.1226 12.6684C78.1751 12.4653 78.2399 12.2781 78.3169 12.103C78.3939 11.928 78.4989 11.76 78.6355 11.5972C78.7702 11.4344 78.9575 11.2524 79.192 11.0494C79.1693 11.3189 79.1325 11.557 79.0853 11.7652C79.038 11.9735 78.968 12.1661 78.8735 12.3463C78.779 12.5266 78.6582 12.6999 78.5112 12.8697C78.3642 13.0394 78.1786 13.2075 77.9546 13.3755ZM78.8875 16.9547C79.0818 16.9547 79.3181 16.932 79.5981 16.8865C79.8781 16.841 80.1722 16.7727 80.4802 16.6799C80.7883 16.5889 81.0998 16.4734 81.4131 16.3369C81.7264 16.2004 82.0064 16.0429 82.2515 15.8661C82.4965 15.6893 82.696 15.4898 82.8501 15.2657C83.0041 15.0435 83.0811 14.8054 83.0811 14.5551C83.0811 14.4641 83.0688 14.3731 83.0461 14.2804C83.0233 14.1893 82.9551 14.1438 82.8413 14.1438C82.7275 14.1438 82.619 14.1858 82.5158 14.2716C82.4125 14.3574 82.3162 14.4571 82.2252 14.5709C82.1342 14.6847 82.0449 14.7967 81.9592 14.9052C81.8734 15.0137 81.8017 15.096 81.7457 15.1537C81.3343 15.4845 80.8845 15.7243 80.3927 15.8731C79.9026 16.0218 79.3881 16.0954 78.8507 16.0954C78.6687 16.0954 78.4989 16.0866 78.3449 16.0691C78.1909 16.0516 78.0544 16.0061 77.9336 15.9326C77.8146 15.8591 77.7201 15.7576 77.6518 15.6333C77.5836 15.5073 77.5486 15.3428 77.5486 15.1362V15.1012C77.5486 15.0662 77.5608 15.0102 77.5836 14.9297C77.6063 14.8492 77.6238 14.7932 77.6343 14.7582C78.0001 14.4501 78.3257 14.1561 78.611 13.876C78.8963 13.596 79.1395 13.2967 79.3391 12.9764C79.5386 12.6561 79.6874 12.3078 79.7836 11.9315C79.8799 11.5552 79.9289 11.1212 79.9289 10.6293C79.9289 10.5838 79.9254 10.5016 79.9201 10.3808C79.9149 10.26 79.9114 10.1778 79.9114 10.1323C79.8659 10.0062 79.8116 9.88898 79.7486 9.78046C79.6856 9.67195 79.5806 9.61769 79.4318 9.61769C79.0328 9.61769 78.6985 9.70695 78.4307 9.88373C78.1629 10.0605 77.9424 10.2863 77.7708 10.5611C77.5993 10.8359 77.4663 11.1317 77.3683 11.452C77.272 11.7722 77.188 12.0698 77.1197 12.3428C77.097 12.4111 77.0655 12.5406 77.0252 12.7279C76.985 12.9169 76.9395 13.1129 76.8887 13.3195C76.838 13.526 76.7854 13.7168 76.7347 13.8935C76.6839 14.0703 76.6454 14.1928 76.6227 14.2628L76.5369 15.446C76.6857 16.0516 76.9622 16.4542 77.3683 16.6537C77.7761 16.855 78.2819 16.9547 78.8875 16.9547ZM70.7226 16.9547C70.8696 16.9547 70.9974 16.9512 71.1041 16.946C71.2109 16.9407 71.3159 16.925 71.4174 16.9022C71.5189 16.8795 71.6327 16.8532 71.757 16.8235C71.8812 16.7937 72.0335 16.7517 72.2155 16.6939C72.3521 16.6362 72.5638 16.5522 72.8509 16.4419C73.1397 16.3316 73.4355 16.2196 73.7418 16.1041C74.0463 15.9886 74.3333 15.8783 74.5976 15.7751C74.8637 15.6718 75.0352 15.607 75.1157 15.5843C75.3992 15.4565 75.695 15.3007 76.0066 15.1152C76.3181 14.9297 76.6034 14.7162 76.8625 14.4729C77.1232 14.2296 77.3403 13.9583 77.5153 13.6573C77.6903 13.3562 77.7778 13.0219 77.7778 12.6509C77.7778 12.5354 77.7586 12.4163 77.7183 12.2956C77.6781 12.1748 77.5853 12.1135 77.4383 12.1135C77.2808 12.1135 77.1617 12.1713 77.0812 12.2868C77.0025 12.4023 76.9307 12.5389 76.8695 12.6946C76.8064 12.8504 76.7504 13.0097 76.6997 13.1707C76.6489 13.3317 76.5894 13.4595 76.5212 13.5522C76.2271 13.8883 75.8316 14.2086 75.3345 14.5149C74.8374 14.8212 74.3088 15.0837 73.7488 15.3042C73.1887 15.5248 72.6321 15.6998 72.0773 15.8328C71.5224 15.9658 71.0429 16.0324 70.6351 16.0324C70.6123 16.0324 70.5336 16.0289 70.397 16.0236C70.2605 16.0183 70.1765 16.0149 70.1432 16.0149C70.0522 15.9571 69.9542 15.8993 69.8457 15.8416C69.7389 15.7838 69.6724 15.6963 69.6514 15.5808V15.425C69.6514 15.355 69.6479 15.2867 69.6427 15.2167C69.6374 15.1467 69.6339 15.0785 69.6339 15.0085V14.8527C69.6339 14.4834 69.6759 14.1648 69.7617 13.8988C69.8457 13.6328 69.9647 13.3842 70.1187 13.1532C70.271 12.9222 70.4495 12.6929 70.6526 12.4688C70.8556 12.2431 71.0761 11.9858 71.3142 11.697C71.3247 11.6742 71.3509 11.6427 71.3912 11.6025C71.4314 11.5622 71.4559 11.536 71.4682 11.5237H71.5364C71.6275 11.5465 71.701 11.5867 71.757 11.6445C71.813 11.7022 71.8672 11.76 71.918 11.8178C71.9688 11.8755 72.0283 11.9245 72.0965 11.9648C72.1648 12.005 72.2435 12.026 72.3346 12.026C72.4816 12.026 72.6111 11.9963 72.7249 11.9385C72.8386 11.8808 72.8946 11.7775 72.8946 11.627C72.8946 11.4887 72.8684 11.3347 72.8176 11.1667C72.7669 10.9986 72.6934 10.8394 72.5971 10.6906C72.5008 10.5418 72.3906 10.4123 72.2663 10.309C72.142 10.2058 72.0003 10.1533 71.8427 10.1533C71.764 10.1533 71.7045 10.162 71.6642 10.1795C71.624 10.197 71.5907 10.2198 71.5627 10.2495C71.5347 10.2793 71.4997 10.3073 71.4612 10.337C71.4209 10.3668 71.3737 10.3983 71.3177 10.4316C71.1024 10.351 70.8504 10.4141 70.5633 10.6223C70.2763 10.8306 69.9927 11.1247 69.7144 11.5062C69.4379 11.8878 69.1946 12.3446 68.9846 12.8767C68.7746 13.4087 68.6433 13.9688 68.5855 14.5586C68.6083 14.9524 68.6555 15.2955 68.729 15.5913C68.8026 15.8871 68.9181 16.1339 69.0773 16.3369C69.2349 16.5399 69.4484 16.6922 69.7127 16.7972C69.9787 16.9022 70.3148 16.9547 70.7226 16.9547ZM61.7998 16.9547C61.8733 16.9547 61.9451 16.946 62.0133 16.9285C62.0816 16.911 62.1411 16.8847 62.1919 16.8497C62.2426 16.8147 62.2636 16.7622 62.2514 16.6922C62.2619 16.5977 62.2846 16.4454 62.3196 16.2354C62.3529 16.0254 62.3914 15.8013 62.4299 15.5685C62.4702 15.334 62.5122 15.1117 62.5577 14.9017C62.6032 14.6917 62.6364 14.5446 62.6592 14.4624C62.7274 14.2278 62.8377 13.9303 62.9917 13.5663C63.1458 13.2039 63.3278 12.8451 63.5378 12.4951C63.7478 12.1433 63.9876 11.8458 64.2537 11.599C64.5214 11.3522 64.791 11.2297 65.064 11.2297V11.809L64.3989 15.2167V15.4443C64.3989 15.6315 64.4077 15.8066 64.4252 15.9711C64.4427 16.1356 64.4812 16.2844 64.5442 16.4192C64.6072 16.5539 64.7 16.6624 64.826 16.7447C64.9503 16.827 65.1218 16.8672 65.3371 16.8672C65.5523 16.8672 65.8149 16.827 66.1212 16.7447C66.4275 16.6624 66.7443 16.5522 67.0681 16.4104C67.3919 16.2704 67.7209 16.1006 68.057 15.9011C68.393 15.7016 68.687 15.4915 68.9443 15.2692C69.1999 15.047 69.4099 14.8089 69.5744 14.5586C69.7389 14.3066 69.8212 14.0528 69.8212 13.7938C69.8212 13.7115 69.7949 13.645 69.7442 13.5925C69.6934 13.54 69.6269 13.5137 69.5482 13.5137H69.4799C69.2524 13.7833 68.9846 14.0616 68.6783 14.3486C68.372 14.6357 68.0412 14.8894 67.6894 15.1135C67.3376 15.3358 66.97 15.5213 66.5902 15.6665C66.2087 15.8136 65.8429 15.8853 65.4911 15.8853V14.4624L66.1387 11.459V11.3889C66.1387 11.3662 66.1422 11.3504 66.1474 11.3452L66.1509 11.3399C66.1544 11.3329 66.1562 11.3189 66.1562 11.3014C66.1562 10.9741 66.0617 10.7046 65.8744 10.4928C65.6871 10.2828 65.4281 10.176 65.099 10.176C64.9398 10.176 64.7717 10.2163 64.5967 10.2985C64.4199 10.3808 64.2694 10.4806 64.1451 10.5978C64.1119 10.6451 64.0366 10.7203 63.9229 10.8254C63.8091 10.9304 63.6866 11.0424 63.5571 11.1597C63.4258 11.2769 63.3033 11.3872 63.1913 11.494C63.0775 11.599 62.9987 11.669 62.9532 11.704V10.5086C62.9532 10.4036 62.8937 10.3178 62.7747 10.253C62.6557 10.1883 62.5507 10.1568 62.4597 10.1568C62.4264 10.1568 62.3634 10.1603 62.2724 10.1655C62.1814 10.1708 62.1184 10.197 62.0851 10.2443L61.7438 12.5809V13.0727L61.1592 16.5854V16.6379C61.1592 16.778 61.21 16.8655 61.3132 16.9022C61.4148 16.9372 61.518 16.9547 61.6195 16.9547H61.7998ZM53.5579 16.0604V15.579L53.9727 13.4927C53.985 13.4577 54.0042 13.4122 54.0322 13.3597C54.0602 13.3055 54.0952 13.2495 54.1355 13.1899C54.1757 13.1304 54.2125 13.0797 54.2475 13.0377C54.2825 12.9957 54.3052 12.9747 54.3157 12.9747C54.3735 12.9152 54.4803 12.8031 54.6343 12.6369C54.7883 12.4706 54.9563 12.2921 55.1349 12.1013C55.3134 11.9105 55.4832 11.7355 55.6442 11.5762C55.8052 11.4169 55.9207 11.3067 55.989 11.2472C56.0117 11.2349 56.0607 11.2297 56.136 11.2297H56.283C56.4563 11.2297 56.5928 11.2419 56.6978 11.2647C56.8011 11.2892 56.9271 11.3662 57.0776 11.4957C57.0776 11.5202 57.0811 11.5552 57.0864 11.6025L57.0899 11.6287C57.0934 11.6637 57.0951 11.69 57.0951 11.7092C57.0951 12.054 57.0514 12.3901 56.9656 12.7156C56.8799 13.0429 56.8309 13.3842 56.8186 13.7413C56.6803 13.9548 56.4843 14.1963 56.2323 14.4624C55.9785 14.7302 55.6984 14.9822 55.3869 15.2202C55.0754 15.4583 54.7603 15.6578 54.4383 15.8171C54.1145 15.9798 53.8222 16.0604 53.5579 16.0604ZM53.4214 16.9547C53.7312 16.9547 54.0357 16.8917 54.3333 16.764C54.6308 16.6362 54.9231 16.4857 55.2101 16.3124C55.4972 16.1391 55.772 15.9466 56.0362 15.7383C56.3005 15.53 56.5473 15.3323 56.7766 15.1467C56.7538 15.3673 56.7573 15.579 56.7854 15.7821C56.8134 15.9851 56.8694 16.1584 56.9481 16.3036C57.0286 16.4489 57.1494 16.5644 57.3087 16.6519C57.4697 16.7395 57.6762 16.7832 57.9283 16.7832C58.0893 16.7832 58.2696 16.7622 58.4708 16.7219C58.6721 16.6817 58.8751 16.6257 59.0817 16.5574C59.2882 16.4874 59.4895 16.4157 59.6838 16.3404C59.878 16.2651 60.0566 16.1811 60.2176 16.0884C60.3086 16.0534 60.4609 15.9781 60.6727 15.8626C60.8844 15.7471 61.112 15.6245 61.3517 15.4968C61.5933 15.369 61.8191 15.2535 62.0308 15.1485C62.2426 15.0435 62.3896 14.9629 62.4702 14.9052C62.5279 14.8579 62.5594 14.8089 62.5647 14.7564C62.5699 14.7039 62.5734 14.6497 62.5734 14.5919C62.5734 14.4764 62.5367 14.3836 62.4614 14.3136C62.3861 14.2436 62.2916 14.2086 62.1779 14.2086C62.1656 14.2086 62.1464 14.2121 62.1184 14.2173L62.0991 14.2208C62.0816 14.2243 62.0676 14.2261 62.0589 14.2261L58.7911 15.7576C58.6756 15.8048 58.5653 15.8293 58.4551 15.8363C58.3448 15.8433 58.2346 15.8451 58.119 15.8451C58.0963 15.8451 58.0385 15.8416 57.9475 15.8363C57.8565 15.8311 57.7987 15.8276 57.776 15.8276C57.7637 15.8048 57.7497 15.7383 57.7322 15.628C57.7147 15.5178 57.7007 15.4513 57.6885 15.4285V15.3235C57.6885 15.0102 57.72 14.7109 57.783 14.4274C57.846 14.1438 57.9143 13.8568 57.9895 13.5663C58.0648 13.2757 58.133 12.9887 58.1961 12.7051C58.2591 12.4216 58.2906 12.1275 58.2906 11.8265C58.2906 11.606 58.2713 11.3854 58.2311 11.1649C58.1908 10.9444 58.1225 10.7466 58.0245 10.5733C57.9265 10.4001 57.7952 10.2565 57.629 10.1463C57.4627 10.036 57.2527 9.98174 57.0006 9.98174H56.6908C56.003 10.0623 55.3694 10.2863 54.7901 10.6521C54.2107 11.0179 53.7347 11.4695 53.3619 12.0085C52.9891 12.5476 52.7318 13.1532 52.5883 13.827C52.4447 14.4991 52.471 15.1835 52.6653 15.8801V16.4192C52.723 16.6047 52.8193 16.7412 52.9576 16.8287C53.0958 16.911 53.2498 16.9547 53.4214 16.9547ZM49.2103 16.9547C49.3713 16.9547 49.6023 16.9022 49.9051 16.7972C50.2079 16.6922 50.5405 16.5522 50.901 16.3754C51.2616 16.2004 51.6309 16.0043 52.0089 15.7873C52.387 15.5703 52.73 15.3515 53.0398 15.1292C53.3496 14.9069 53.6016 14.6899 53.7959 14.4799C53.9902 14.2699 54.0882 14.0931 54.0882 13.9531C54.0882 13.9181 54.083 13.8655 54.0707 13.7955C54.0585 13.7255 54.0357 13.6905 54.0025 13.6905H53.4879C53.3969 13.7605 53.3111 13.8305 53.2306 13.9005C53.1476 13.9674 53.071 14.0257 53.0008 14.0764C52.9348 14.1242 52.8744 14.165 52.8193 14.1998C52.751 14.2471 52.6793 14.2961 52.604 14.3486C52.5287 14.4011 52.4692 14.4694 52.4237 14.5499L50.9133 15.4985C50.7872 15.5213 50.6665 15.5598 50.5527 15.6123C50.4389 15.6648 50.3217 15.7208 50.2009 15.7786C50.0801 15.8363 49.9629 15.8906 49.8491 15.9361C49.7353 15.9816 49.6093 16.0061 49.4711 16.0061C49.4133 16.0061 49.3538 16.0026 49.2908 15.9973C49.2278 15.9921 49.2015 15.9361 49.2138 15.8311V15.3743C49.2138 15.1397 49.24 14.8789 49.2908 14.5936C49.3415 14.3066 49.394 14.0196 49.4448 13.7325C49.4956 13.4455 49.5481 13.1619 49.5988 12.8802C49.6496 12.5984 49.6758 12.3481 49.6758 12.1258C49.6758 11.8808 49.6321 11.69 49.5463 11.5552C49.4606 11.4204 49.3153 11.2944 49.1088 11.1772C48.925 11.0826 48.7132 10.9951 48.4734 10.9146C48.2336 10.8341 48.0061 10.7571 47.7943 10.6871C47.5825 10.6171 47.4058 10.5523 47.2622 10.4946C47.1187 10.4368 47.054 10.3825 47.0645 10.337C46.9507 10.337 46.8527 10.3773 46.7722 10.4596C46.6917 10.5418 46.6234 10.6381 46.5656 10.7501C46.5079 10.8621 46.4659 10.9811 46.4361 11.1107C46.4081 11.2402 46.3924 11.3504 46.3924 11.445C46.3924 11.5395 46.3959 11.6182 46.4011 11.6812C46.4064 11.746 46.4326 11.8195 46.4781 11.9C46.3521 12.2168 46.2611 12.5056 46.2033 12.7699C46.1456 13.0324 46.0721 13.2827 45.9793 13.5155C45.8883 13.75 45.764 13.9846 45.61 14.2173C45.456 14.4519 45.218 14.6917 44.8977 14.9367C44.8854 15.1467 44.8924 15.3077 44.9152 15.4198C44.9379 15.5318 44.9694 15.6123 45.0097 15.6648C45.0499 15.7173 45.0902 15.7488 45.1304 15.7611C45.1707 15.7733 45.1969 15.7786 45.2074 15.7786C45.6538 15.4618 45.9723 15.1397 46.1613 14.8124C46.3504 14.4851 46.4939 14.1561 46.5901 13.8288C46.6864 13.5015 46.7844 13.1847 46.8824 12.8802C46.9805 12.5756 47.1537 12.2886 47.4058 12.019C47.4058 12.0313 47.488 12.075 47.6543 12.1503C47.8206 12.2256 48.0008 12.3148 48.1951 12.4128C48.3894 12.5126 48.5697 12.6036 48.736 12.6841C48.9022 12.7664 48.9845 12.8136 48.9845 12.8241C48.9845 12.9642 48.9442 13.1514 48.8637 13.386C48.7832 13.6205 48.6922 13.8603 48.5889 14.1053C48.4857 14.3504 48.3947 14.5919 48.3141 14.8247C48.2336 15.0592 48.1934 15.2395 48.1934 15.369C48.1934 15.544 48.2074 15.7226 48.2371 15.9046C48.2651 16.0866 48.3194 16.2529 48.3999 16.4052C48.4804 16.5574 48.5837 16.6869 48.7097 16.792C48.8392 16.9022 49.0055 16.9547 49.2103 16.9547ZM38.2817 16.7762C38.4007 16.7762 38.483 16.7412 38.5302 16.6729L39.5209 14.8334L40.5115 11.5657L40.6831 10.225H41.0069C41.0979 10.225 41.1924 10.2215 41.2886 10.2163C41.3849 10.211 41.4672 10.2075 41.5372 10.2075C42.015 10.2075 42.4911 10.239 42.9636 10.302C43.4362 10.365 43.9 10.3966 44.3551 10.3966C44.5038 10.3966 44.6544 10.351 44.8084 10.2583C44.9624 10.1673 45.0394 10.0342 45.0394 9.86272C45.0394 9.72445 44.9817 9.62469 44.8679 9.56168C44.7541 9.49867 44.6194 9.45317 44.4671 9.42341C44.3131 9.39541 44.1626 9.37966 44.0138 9.37966H40.9228C40.8318 9.40241 40.7828 9.38841 40.7776 9.3359C40.7723 9.28339 40.7688 9.23614 40.7688 9.18888C40.7688 8.73031 40.7828 8.2805 40.8108 7.83944L40.8266 7.5734C40.8441 7.2181 40.8546 6.8558 40.8546 6.48999C40.8546 6.20295 40.8406 5.92291 40.8126 5.64812C40.7846 5.37334 40.7706 5.09855 40.7706 4.82201V4.70124L44.9222 4.35644C45.0587 4.34419 45.2074 4.28468 45.3667 4.17617C45.526 4.06765 45.6065 3.93813 45.6065 3.78936C45.6065 3.77711 45.603 3.75786 45.5978 3.72985L45.5943 3.7106C45.5908 3.6931 45.589 3.6791 45.589 3.67035C45.554 3.63534 45.512 3.58458 45.4612 3.51632C45.4105 3.44806 45.3475 3.3728 45.274 3.29229C45.2004 3.21178 45.1199 3.14352 45.0342 3.08576C44.9484 3.028 44.8609 3 44.7699 3C44.6561 3 44.5879 3.02625 44.5651 3.07701C44.5424 3.12777 44.5336 3.19253 44.5389 3.26604C44.5441 3.3413 44.5441 3.41306 44.5389 3.48132C44.5336 3.54958 44.5021 3.58983 44.4443 3.60208C43.921 3.70535 43.3819 3.77186 42.8306 3.79986C42.2775 3.82787 41.7402 3.84362 41.2169 3.84362C41.0349 3.84362 40.8668 3.82612 40.7128 3.79286C40.5588 3.75786 40.4083 3.7211 40.2595 3.68085C40.1107 3.64059 39.9602 3.60033 39.8062 3.56008C39.6522 3.51982 39.5016 3.50057 39.3529 3.50057C39.3301 3.50057 39.2881 3.50407 39.2251 3.50932L39.1953 3.51282C39.1481 3.51632 39.1166 3.51807 39.0973 3.51807C39.0518 3.57583 39.0256 3.63009 39.0203 3.68085C39.0151 3.7316 39.0116 3.78761 39.0116 3.84362C39.0116 3.96964 39.0343 4.06765 39.0798 4.13591C39.1253 4.20417 39.1831 4.26718 39.2514 4.32494C39.3196 4.3827 39.3914 4.4457 39.4649 4.51396C39.5384 4.58222 39.6154 4.66799 39.6959 4.77125C39.7992 4.92002 39.8674 5.09155 39.9007 5.28757C39.934 5.4836 39.9585 5.67963 39.969 5.88091C39.9812 6.08219 39.9812 6.28172 39.969 6.48299C39.9567 6.68427 39.9515 6.86455 39.9515 7.02557C39.9515 7.17434 39.9567 7.35812 39.969 7.57515C39.9812 7.79218 39.983 8.01446 39.9777 8.23674C39.9725 8.46078 39.9515 8.67606 39.9182 8.88083C39.8849 9.08561 39.8324 9.25364 39.7642 9.37966C39.4334 9.40241 39.0746 9.43041 38.6878 9.46542C38.301 9.50042 37.9072 9.53368 37.5099 9.56868C37.1126 9.60369 36.7135 9.62644 36.3144 9.63694C35.9154 9.64744 35.5461 9.64919 35.2048 9.63694C35.1015 9.61419 35.042 9.63694 35.0263 9.7052C35.0105 9.77346 35 9.83122 35 9.87673C35 9.95724 35.0088 10.0255 35.0263 10.0833C35.0438 10.141 35.1033 10.1865 35.2048 10.2215C35.3185 10.2443 35.4131 10.2583 35.4866 10.2653C35.5601 10.2723 35.6353 10.2775 35.7088 10.2828C35.7824 10.288 35.8576 10.2915 35.9311 10.2915H36.1954C36.731 10.2915 37.2631 10.2793 37.7934 10.2565C38.3237 10.2338 38.8558 10.2215 39.3914 10.2215C39.4824 10.2215 39.5559 10.2303 39.6137 10.2478C39.6714 10.2653 39.6994 10.3248 39.6994 10.4281C39.6994 10.8516 39.6574 11.2682 39.5717 11.6742C39.4859 12.0803 39.3774 12.4828 39.2479 12.8784C39.1183 13.274 38.9661 13.6608 38.7945 14.0388C38.623 14.4169 38.4532 14.7897 38.2817 15.1572C38.2135 15.2832 38.1452 15.3918 38.0769 15.4845C38.0087 15.5773 37.9457 15.6648 37.8897 15.7506C37.8336 15.8363 37.7846 15.9343 37.7444 16.0429C37.7041 16.1514 37.6849 16.2914 37.6849 16.4647C37.6849 16.5329 37.6884 16.5872 37.6936 16.6274C37.6989 16.6677 37.7251 16.7167 37.7706 16.7745H38.2817V16.7762Z" fill="#E8336D"/>
+</svg>
diff --git a/src/assets/scss/_breakpoint.scss b/src/assets/scss/_breakpoint.scss
index 3b5108e7549f448ef37a3ce8871556cc6efa592b..d58c83c3fb8a88245ea232ed63dabf134a8a6916 100644
--- a/src/assets/scss/_breakpoint.scss
+++ b/src/assets/scss/_breakpoint.scss
@@ -1,8 +1,8 @@
$width-small-phone: 320px;
$width-phone: 576px;
-$width-large-phone: 768px;
-$width-tablet: 992px;
-$width-desktop: 1200px;
+$width-large-phone: 600px;
+$width-tablet: 980px;
+$width-desktop: 1280px;
$width-large-desktop: 1201px;
$small-phone: 'only screen and (max-width : #{$width-small-phone})';
diff --git a/src/assets/scss/_icons.scss b/src/assets/scss/_icons.scss
index cb0071742502503ad4227e4b5eca4dfcc129fbd5..b06335f3bed29635c9b6481adaa64dc09dddc020 100644
--- a/src/assets/scss/_icons.scss
+++ b/src/assets/scss/_icons.scss
@@ -52,7 +52,7 @@
border-radius: 50% 50% 50% 0;
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg);
- background-color: $secondary-color;
+ background-color: $grey-3;
&:before {
content: '';
position: absolute;
@@ -584,10 +584,8 @@
display: flex;
justify-content: center;
align-items: center;
+ opacity: 0.8;
cursor: pointer;
- &:active {
- opacity: 0.8;
- }
&:before,
&:after {
@@ -606,3 +604,23 @@
transform: rotate(-45deg);
}
}
+.ico-menu,
+.ico-menu:before,
+.ico-menu:after {
+ cursor: pointer;
+ border-radius: 1px;
+ height: 2px;
+ width: 23px;
+ background: $black;
+ position: absolute;
+ display: block;
+ content: '';
+}
+.ico-menu {
+ &:before {
+ top: -6px;
+ }
+ &:after {
+ bottom: -6px;
+ }
+}
diff --git a/src/assets/scss/_z-index.scss b/src/assets/scss/_z-index.scss
index 5180807ab293ecf5bb1d08d0aebdba09b4d42a53..1f6dbcd22289984b44529458df1b94e40d7cfb2d 100644
--- a/src/assets/scss/_z-index.scss
+++ b/src/assets/scss/_z-index.scss
@@ -1,2 +1,5 @@
-$structure-details-z-index: 1001;
-$modal-add-structure-z-index: 1001;
+$structure-details-z-index: 1002;
+$modal-add-structure-z-index: 1002;
+$modal-filter-structure-z-index: 1002;
+$modal-menu-phone-z-index: 1002;
+$btn-phone-switch-map-list-z-index: 1001;
diff --git a/src/styles.scss b/src/styles.scss
index 5cd277a87fbe203db36d839f62688173bf716355..88dd595a8f77f871b37e81a339d5b56c8bd12ab4 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -76,6 +76,7 @@ a {
.checkbox {
list-style-type: none;
+ width: 100%;
input {
opacity: 0;
display: none;
@@ -95,7 +96,6 @@ a {
.label {
padding: 0 16px;
@include btn-pass;
- width: 232px;
}
.customCheck {
display: inline-grid;