diff --git a/src/app/map/services/map.service.ts b/src/app/map/services/map.service.ts index 800d845b47ea61149dfd0508860857b7fc61bb2f..ff72624dddfba6708c7e3130c8ebaa9b1488262b 100644 --- a/src/app/map/services/map.service.ts +++ b/src/app/map/services/map.service.ts @@ -56,7 +56,7 @@ export class MapService { if (id) { const markerIcon = divIcon({ className: null, - html: "<div class='ico-marker-pin selected'></div>", + html: '<svg width="56" height="65"><use xlink:href="assets/ico/sprite.svg#map-marker-locate"></use></svg>', iconSize: [35, 41], iconAnchor: [13, 41], }); 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 c54f7829f53b240346f612ea20e6d73dc48f64ac..5edf8c8a507a9a924630e3bbfa01e93413c14806 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 @@ -28,14 +28,6 @@ <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]="'pass'"></app-svg-icon> - <p>TODO: PASS</p> - </div> - <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px"> - <app-svg-icon [type]="'ico'" [icon]="'structure'"></app-svg-icon> - <p>TODO: FABLAB</p> - </div> </div> </div> </div> diff --git a/src/app/structure-list/components/structure-details/structure-details.component.ts b/src/app/structure-list/components/structure-details/structure-details.component.ts index a067d43183502e1121f047c91df97a42930364c6..ff53b7c38e0d39c97a87b2b0f766c6b01a7217dc 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.ts +++ b/src/app/structure-list/components/structure-details/structure-details.component.ts @@ -59,9 +59,6 @@ export class StructureDetailsComponent implements OnInit { this.accessRights = this.toNumbers(this.structure.accesAuxDroits).map((rights) => _.find(this.accessRightsReferentiel.modules, { id: rights }) ); - - console.log(this.baseSkills); - console.log(this.accessRights); } public keepOriginalOrder = (a, b) => a.key; diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg index c895525b686b8d46f058d2eebcf3a0f2f50dba14..6b473d4eae447a66804571046bd48db7d78f0ed1 100644 --- a/src/assets/ico/sprite.svg +++ b/src/assets/ico/sprite.svg @@ -1,6 +1,10 @@ <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="56" height="65" viewBox="0 0 56 65" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M26.8462 62.7307L27.5529 63.391L28.2364 62.7067C31.2278 59.7122 34.1647 57.0374 36.9355 54.5141L37.1199 54.3462C46.4373 45.8615 54.0578 38.9222 54.0578 27.5556C54.0578 12.8903 42.1814 1 27.5289 1C12.8764 1 1 12.8903 1 27.5556C1 33.5349 2.54974 37.9485 5.56487 42.1422C8.52174 46.2548 12.892 50.1538 18.4588 55.1202L18.5381 55.1909C21.0508 57.4327 23.8201 59.9034 26.8462 62.7307ZM36.5185 27.5556C36.5185 32.5271 32.4927 36.5556 27.5289 36.5556C22.5651 36.5556 18.5393 32.5271 18.5393 27.5556C18.5393 22.584 22.5651 18.5556 27.5289 18.5556C32.4927 18.5556 36.5185 22.584 36.5185 27.5556Z" fill="#D50000" stroke="white" 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"> <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> diff --git a/src/index.html b/src/index.html index 5780f878168941405fa8739e6417f88057c8efe0..9e350807caa211c6211153b2bd75853378be4ac2 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8" /> - <title>Ram</title> + <title>RÊseau des Acteurs de la MÊdiation</title> <base href="/" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link rel="icon" type="image/x-icon" href="favicon.ico" />