src/app/services/geojson.service.ts

@@ -49,7 +49,7 @@ export class GeojsonService {
    */
   public getCoord(numero: string, address: string, zipcode: string): Observable<GeoJson> {
     return this.http
-      .get('/geocoding/photon-bal/api' + '?q=' + numero + ' ' + address + ' ' + zipcode, { headers: { skip: 'true' } })
+      .get('/geocoding/photon/api' + '?q=' + numero + ' ' + address + ' ' + zipcode, { headers: { skip: 'true' } })
       .pipe(map((data: { features: any[]; type: string }) => new GeoJson(data.features[0])));
   }
 

src/app/services/notification.service.spec.ts

+import { TestBed } from '@angular/core/testing';
+
+import { NotificationService } from './notification.service';
+
+describe('NotificationService', () => {
+  let service: NotificationService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(NotificationService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/notification.service.ts

+import { Injectable } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NotificationService {
+  constructor(private toastr: ToastrService) {}
+
+  showSuccess(message: string, title: string, timespan: number = 10000): void {
+    this.toastr.success(message, title, {
+      timeOut: timespan,
+    });
+  }
+
+  // Par defaut, l'erreur reste affichée jusqu'à ce qu'on clique dessus
+  showError(message: string, title: string, timespan: number = 0): void {
+    this.toastr.error(message, title, {
+      timeOut: timespan,
+      disableTimeOut: timespan ? false : true,
+    });
+  }
+}

src/app/shared/components/address-autocomplete/address-autocomplete.component.html

@@ -12,7 +12,7 @@
   </div>
   <div class="autocomplete-items" *ngIf="!isAlreadySearching">
     <p *ngFor="let hit of data" (click)="selectedResult(hit)" class="autocomplete-item">
-      {{ parseHitToAddress(hit) }}
+      {{ hit.displayedName }}
     </p>
   </div>
 </div>

src/app/shared/components/address-autocomplete/address-autocomplete.component.ts

@@ -19,18 +19,14 @@ export class AddressAutocompleteComponent implements OnInit {
   constructor(private addressService: AddressService) {}
 
   ngOnInit(): void {
-    if (this.address) {
-      let address_str = null;
-      if (this.address.numero) {
-        address_str = this.address.numero + ' ' + this.address.street + ' ' + this.address.commune;
-      } else {
-        address_str = this.address.street + ' ' + this.address.commune;
-      }
-      this.searchAddress.nativeElement.value = address_str;
-    }
+    this.lauchSearch();
   }
 
   ngOnChanges(): void {
+    this.lauchSearch();
+  }
+
+  public lauchSearch(): void {
     if (this.address) {
       let address_str = null;
       if (this.address.numero) {
@@ -46,7 +42,12 @@ export class AddressAutocompleteComponent implements OnInit {
     if (!this.isAlreadySearching) {
       this.isAlreadySearching = true;
       this.addressService.searchAddress(searchString).subscribe((data) => {
-        this.data = data.features;
+        data.features = data.features.map((el) => {
+          el.displayedName = this.parseHitToAddress(el);
+          return el;
+        });
+        // Filtering duplicate displayed string. This duplication is caused by the API used for gathering addresse info.
+        this.data = [...new Map(data.features.map((item) => [item['displayedName'], item])).values()];
         this.isAlreadySearching = false;
       });
     }
@@ -67,10 +68,17 @@ export class AddressAutocompleteComponent implements OnInit {
     this.selectedAddress.emit(address);
   }
 
-  public parseHitToAddress(hit: any): string {
+  private parseHitToAddress(hit: any): string {
+    let parsedAddress = '';
     if (hit.properties.housenumber) {
-      return `${hit.properties.housenumber} ${hit.properties.street} ${hit.properties.city}`;
+      parsedAddress += `${hit.properties.housenumber} `;
+    }
+    if (hit.properties.street) {
+      parsedAddress += `${hit.properties.street}, `;
+    } else {
+      parsedAddress += `${hit.properties.name}, `;
     }
-    return `${hit.properties.street} ${hit.properties.city}`;
+    parsedAddress += `${hit.properties.city}`;
+    return parsedAddress;
   }
 }

src/app/shared/components/svg-icon/svg-icon.component.scss

@@ -3,6 +3,10 @@
   display: inline-block;
   height: 2em;
   width: 1.5em;
+  &.icon-full {
+    width: unset;
+    height: unset;
+  }
   &.icon-28 {
     width: 28px;
     height: 28px;

src/app/structure-list/components/structure-details/structure-details.component.html

 <div class="structrue-details-container" *ngIf="structure && !isLoading">
   <!-- Header info -->
-  <div fxLayout="row" fxLayoutAlign="end center">
-    <div (click)="close()" class="ico-close-details"></div>
+  <div fxLayout="space-between wrap-reverse" class="sticky-title">
+    <div fxLayout="column" class="no-margin" fxLayoutAlign="end end">
+      <h2 class="bold">{{ structure.structureName }}</h2>
+    </div>
+    <div fxLayout="column" fxLayoutAlign="end start" class="ico-close">
+      <div (click)="close()" class="ico-close-details"></div>
+    </div>
   </div>
   <div fxLayout="row" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="8px">
     <div fxLayout="column" fxLayoutGap="10px" fxFlex="100%">
-      <div fxLayout="column" class="no-margin" fxLayoutAlign="space-between start">
-        <h2 class="bold">{{ structure.structureName }}</h2>
-      </div>
       <div fxLayout="row" fxLayoutAlign="space-between center">
         <div class="typeInformationHeader" fxLayout="column">
           <h3>{{ structure.getLabelTypeStructure() }}</h3>

src/app/structure-list/components/structure-details/structure-details.component.scss

@@ -18,13 +18,14 @@ a {
   left: 0;
   max-width: 980px;
   width: 100%;
-  height: calc(100vh - #{$header-height} - #{$footer-height} - 20px);
-  padding: 10px 24px;
+  height: calc(100vh - #{$header-height} - #{$footer-height});
+  padding: 0px 24px;
   overflow: auto;
   @media #{$tablet} {
     width: calc(100% - 2 * 24px);
     position: inherit;
     height: 100%;
+    overflow: unset;
     .printButton {
       display: none !important;
     }
@@ -50,7 +51,7 @@ a {
 }
 
 .structure-details-block:last-child {
-  border-bottom: none;
+  border-bottom: none !important;
 }
 
 .opening-time {
@@ -131,3 +132,30 @@ p,
   gap: 20px 30px;
   grid-template-columns: 1fr 1fr;
 }
+.ico-close {
+  margin-left: auto;
+  padding-top: 10px;
+}
+.sticky-title {
+  position: sticky;
+  top: 0px;
+  max-width: 980px;
+  width: 100%;
+  background-color: $white;
+  height: 60px;
+  z-index: 1;
+  border-bottom: solid 1px $grey-4;
+  padding-bottom: 2px;
+  @media #{$tablet} {
+    height: auto;
+  }
+  @media #{$small-phone} {
+    width: 111%;
+    padding-right: 20px;
+  }
+  h2 {
+    @media #{$large-phone} {
+      font-size: $font-size-medium;
+    }
+  }
+}

src/app/utils/utils.ts

+import { Injectable } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class Utils {
+  public modifyPhoneInput(form: FormGroup, controlName: string, phoneNumber: string): void {
+    // Take length of phone number without spaces.
+    const phoneNoSpace = phoneNumber.replace(/\s/g, '');
+    // Check to refresh every 2 number.
+    if (phoneNoSpace.length % 2 === 0) {
+      // Add space every 2 number
+      form.get(controlName).setValue(phoneNoSpace.replace(/(?!^)(?=(?:\d{2})+$)/g, ' ')); //NOSONAR
+    }
+  }
+}

src/assets/geojson/brignais.json

-{
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [4.725423572838992, 45.67523492540029],
-            [4.725556205086396, 45.67536799809434],
-            [4.72593053033344, 45.67665926826292],
-            [4.725897408725562, 45.67724523002701],
-            [4.724498364095213, 45.67894195987662],
-            [4.724136912235676, 45.67971308733658],
-            [4.724174998822853, 45.680523132991055],
-            [4.724394519781781, 45.680970121651505],
-            [4.7253742587434235, 45.684368766945326],
-            [4.726012834038375, 45.68589017252987],
-            [4.728784560500518, 45.687405878667384],
-            [4.72848312066644, 45.68804099459657],
-            [4.728627880181792, 45.68979513877095],
-            [4.728809686695279, 45.691089357368675],
-            [4.7291322400729285, 45.69112944192117],
-            [4.729902992424156, 45.69111760886067],
-            [4.730600785997002, 45.690827674081646],
-            [4.730837815634237, 45.69059885727743],
-            [4.731204878749306, 45.69000776130103],
-            [4.73139897139636, 45.69004981338818],
-            [4.731662645758953, 45.690261928769566],
-            [4.732023405137734, 45.69111204879683],
-            [4.732488514263196, 45.69160028260697],
-            [4.732940942926815, 45.691683394012664],
-            [4.734099621090595, 45.691746627435876],
-            [4.73434948614329, 45.69151760548787],
-            [4.734075638062059, 45.69098140009308],
-            [4.7343768828349795, 45.69075158713616],
-            [4.734521008493132, 45.690839438290624],
-            [4.734719058126453, 45.6910075220864],
-            [4.73505121379295, 45.691353680573016],
-            [4.735606549566667, 45.691029880343955],
-            [4.736235995079525, 45.69102018090333],
-            [4.737120505040019, 45.690538179796015],
-            [4.738317135484041, 45.69058277024951],
-            [4.739604079560944, 45.69022964404202],
-            [4.740797406330327, 45.689760858170914],
-            [4.741113249907205, 45.6904044834425],
-            [4.74169253500404, 45.691251197126086],
-            [4.743756539358913, 45.69067884477155],
-            [4.745787361237172, 45.69027810209865],
-            [4.74597720467782, 45.69018508940489],
-            [4.7459672618832425, 45.689869996869504],
-            [4.746732024821265, 45.68966899316945],
-            [4.7468675851401905, 45.68989206732954],
-            [4.747075902224951, 45.6903842244931],
-            [4.748746972517031, 45.690394324128704],
-            [4.748913884913081, 45.69120236785876],
-            [4.749881307355184, 45.691313443446006],
-            [4.750266682621687, 45.69130745660553],
-            [4.75034087972368, 45.69162155085391],
-            [4.750980041352062, 45.69151254047945],
-            [4.750833350277468, 45.6909383685811],
-            [4.750960383323937, 45.690891358869365],
-            [4.752247522979393, 45.69095240896389],
-            [4.7520834134073064, 45.69023439647343],
-            [4.753175002560322, 45.6902084063704],
-            [4.75319928549635, 45.68935235728534],
-            [4.754283721018561, 45.689101290815316],
-            [4.754480682609426, 45.68923332935833],
-            [4.75465195760291, 45.6901764038525],
-            [4.755291379643046, 45.690076371654506],
-            [4.755418406923607, 45.69002935691955],
-            [4.755388424697647, 45.68948939989777],
-            [4.756477139743565, 45.689373351606974],
-            [4.756255937661885, 45.690097366294154],
-            [4.755758685048976, 45.690627527691774],
-            [4.7568813848931875, 45.690366832941145],
-            [4.757649546809886, 45.690273786526994],
-            [4.757752907713235, 45.69069550639201],
-            [4.758773120845915, 45.690445398852184],
-            [4.758964374007231, 45.690397377334136],
-            [4.759429714788022, 45.69088549987699],
-            [4.759622400423712, 45.69088249029222],
-            [4.760566922030581, 45.69027326534666],
-            [4.760890926169576, 45.69035827201069],
-            [4.761283457897996, 45.69057731264884],
-            [4.7620467414810825, 45.690331191963],
-            [4.762730363945926, 45.690005248751916],
-            [4.764257182723493, 45.68952198522801],
-            [4.765205780326249, 45.688237124358565],
-            [4.768167149814534, 45.68881216982346],
-            [4.770277909252294, 45.68931043794418],
-            [4.770730713369078, 45.688600766684736],
-            [4.771480342785376, 45.68873309432069],
-            [4.77193136502855, 45.68877103624345],
-            [4.772205568931809, 45.68930714947986],
-            [4.772463628393492, 45.6893391178],
-            [4.772913213953938, 45.6893320429134],
-            [4.773703568347919, 45.688328818358265],
-            [4.7746336027736085, 45.68767466501034],
-            [4.774950393746933, 45.687534566990124],
-            [4.774193555047427, 45.68637556484896],
-            [4.774691747769191, 45.68588133254685],
-            [4.7748034452827195, 45.68535715987414],
-            [4.773808079621646, 45.685174682308215],
-            [4.773805051924615, 45.68467933870828],
-            [4.773956010522631, 45.683776249949695],
-            [4.774792025710137, 45.683799108658405],
-            [4.774636306084858, 45.68335120641176],
-            [4.775605376060246, 45.68351607645404],
-            [4.775926185622656, 45.683502011630814],
-            [4.776104397271003, 45.6830488457035],
-            [4.776486822059296, 45.682952743560215],
-            [4.7778351319935375, 45.68292246280935],
-            [4.778737091105642, 45.68299829393771],
-            [4.778906775391038, 45.68268036475559],
-            [4.779160466215576, 45.6825772793951],
-            [4.779351674493231, 45.68252922330023],
-            [4.780010484689922, 45.68143795840417],
-            [4.779189696950867, 45.68028900776877],
-            [4.779048241725939, 45.67988592162209],
-            [4.779862670961972, 45.679638868976355],
-            [4.779908065588893, 45.67905268841031],
-            [4.780027807598072, 45.67878058222422],
-            [4.779218635843911, 45.677991733987284],
-            [4.779207058904248, 45.6776316319511],
-            [4.779750128780947, 45.676938509964614],
-            [4.779832415604619, 45.67590139035096],
-            [4.779538415080308, 45.675149437991905],
-            [4.779854832445264, 45.67500032376799],
-            [4.781560873442728, 45.674513984782806],
-            [4.781547833073028, 45.67410887037405],
-            [4.781236435009352, 45.672816770058226],
-            [4.779990236096869, 45.67281846013053],
-            [4.779668356221317, 45.671598578939054],
-            [4.779206942552515, 45.67163289129457],
-            [4.778745750915616, 45.67087457192298],
-            [4.7782528164999505, 45.669927602756324],
-            [4.777540551502218, 45.67055133186952],
-            [4.775529743361716, 45.6715468149248],
-            [4.775274363821313, 45.671595876680605],
-            [4.7751808286750155, 45.66948068088587],
-            [4.775048091273325, 45.669347666713165],
-            [4.774662871571942, 45.66935373830436],
-            [4.773637349458038, 45.66942393812807],
-            [4.773185041670769, 45.66934099029003],
-            [4.772406241968541, 45.66909204510558],
-            [4.772337715040516, 45.66895801718882],
-            [4.771868249713578, 45.668740227731874],
-            [4.771349154747806, 45.66857725966596],
-            [4.771175149240492, 45.66876013863497],
-            [4.770519195438096, 45.669941376444186],
-            [4.770328022971875, 45.66998941749999],
-            [4.76966047647199, 45.66960359791103],
-            [4.76842076011509, 45.66900158424274],
-            [4.76777441727613, 45.668876626441644],
-            [4.766430753412082, 45.669041825409025],
-            [4.765847181522396, 45.66887083651429],
-            [4.76512544693445, 45.66839576972117],
-            [4.764905647005159, 45.66794886093501],
-            [4.765083898794231, 45.667495712998836],
-            [4.765885284015383, 45.66684364558067],
-            [4.7662974300263965, 45.666071579427125],
-            [4.766158977366456, 45.66575850330744],
-            [4.766337211845127, 45.66530535346818],
-            [4.765471412252013, 45.66474247875827],
-            [4.765278817909219, 45.66474549833979],
-            [4.763831164052034, 45.66527258093708],
-            [4.762811437637273, 45.6655227337891],
-            [4.761523158650894, 45.665407788976516],
-            [4.761145215259903, 45.66402661250905],
-            [4.760952623171668, 45.66402962469188],
-            [4.758959929173959, 45.66397970796059],
-            [4.75916954801526, 45.66289558578311],
-            [4.759136683116868, 45.66226560499678],
-            [4.7586861715644595, 45.66223661452678],
-            [4.758677591471066, 45.661966536766236],
-            [4.758773121288069, 45.66133455043102],
-            [4.759075212500354, 45.66073536520345],
-            [4.7593575921304385, 45.659920317686144],
-            [4.7585847066096605, 45.659851328893375],
-            [4.756455211153323, 45.659533295372896],
-            [4.7563068481391095, 45.65931043355558],
-            [4.754567101508066, 45.65913039705785],
-            [4.75154780564835, 45.659105352958626],
-            [4.751469373071419, 45.65865622119097],
-            [4.750488825819278, 45.65851835130557],
-            [4.748934830133477, 45.658524487946195],
-            [4.747950264726445, 45.65866587642288],
-            [4.747970682982501, 45.659719381930906],
-            [4.747696712339127, 45.66039916230322],
-            [4.747920607095225, 45.66098114366396],
-            [4.747825806721737, 45.66164012862579],
-            [4.747259471385523, 45.66160388350693],
-            [4.746623999017551, 45.66222622116816],
-            [4.746056967942222, 45.66298259915003],
-            [4.745567023045599, 45.66333246283877],
-            [4.745690682366697, 45.66440238199589],
-            [4.745562286214036, 45.66440437253454],
-            [4.744977692531974, 45.66419726506753],
-            [4.744525470411494, 45.66411420217368],
-            [4.743614191503186, 45.66536227946326],
-            [4.744227592544672, 45.665668025185646],
-            [4.743622256781896, 45.66643399042955],
-            [4.743856781825376, 45.66653844292826],
-            [4.743574140240937, 45.66735345200182],
-            [4.743134085012219, 45.667657496767916],
-            [4.742725855794389, 45.668564517774435],
-            [4.742391735935124, 45.669785636321016],
-            [4.742054767883991, 45.67091672759077],
-            [4.741343123760939, 45.670756600745676],
-            [4.741032007343306, 45.67107665693612],
-            [4.740987721924457, 45.67130251712942],
-            [4.741841950343499, 45.67191079217109],
-            [4.741977447470289, 45.672133871909935],
-            [4.741549337153295, 45.672410704036544],
-            [4.740783378089855, 45.67256665906743],
-            [4.739619434613251, 45.67232344151881],
-            [4.738656323818675, 45.672338315084986],
-            [4.737700561249222, 45.672587249382026],
-            [4.736867273381311, 45.6726451393355],
-            [4.736286861425061, 45.67257302643793],
-            [4.734556355669604, 45.672698770900475],
-            [4.7342339057562945, 45.67265870193287],
-            [4.7331398347676, 45.6725944818514],
-            [4.732757406343585, 45.67269043675427],
-            [4.731731769421744, 45.672760255017],
-            [4.731233762765472, 45.67285798191712],
-            [4.729887079598486, 45.672932718252156],
-            [4.729247809710637, 45.67303260613895],
-            [4.727912361852489, 45.67346742583567],
-            [4.726629868391131, 45.673541138039994],
-            [4.726138864959061, 45.67386390944757],
-            [4.725602171277048, 45.67478183974645],
-            [4.725423572838992, 45.67523492540029]
-          ]
-        ]
-      },
-      "properties": {
-        "code_epci": "246900757",
-        "insee_reg": 84,
-        "insee_arr": "1",
-        "nom_epci": "CC de la Vall\u00e9e du Garon (Ccvg)",
-        "statut": "Commune simple",
-        "nom_reg": "AUVERGNE-RHONE-ALPES",
-        "geo_point_2d": [45.6778041264, 4.75264949198],
-        "insee_com": "69027",
-        "nom_com": "Brignais",
-        "id": "BDCSURCO0000000009605506",
-        "nom_dep": "RHONE",
-        "insee_dep": "69",
-        "population": 11381
-      }
-    }
-  ]
-}

src/assets/ico/sprite.svg

@@ -247,6 +247,16 @@
 <path d="M16.9696 9.5759C18.0037 8.95863 18.6962 7.82861 18.6962 6.53684C18.6962 4.5835 17.1127 3 15.1593 3C13.206 3 11.6225 4.5835 11.6225 6.53684C11.6225 7.82861 12.315 8.95863 13.349 9.5759C11.81 10.2675 10.7383 11.8139 10.7383 13.6105V15.1579H19.5804V13.6105C19.5804 11.8139 18.5087 10.2675 16.9696 9.5759Z" stroke="none"/>
 </symbol>
 
+<symbol id="news-header" viewBox="0 0 89 88" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M63.5 72H27.0391C29.1476 70.3259 30.5 67.7505 30.5 64.8571V17H70.5V65C70.5 68.866 67.3659 72 63.5 72Z" stroke="#828282" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.5 52C36.5 51.4477 36.9477 51 37.5 51H63.5C64.0523 51 64.5 51.4477 64.5 52C64.5 52.5523 64.0523 53 63.5 53H37.5C36.9477 53 36.5 52.5523 36.5 52ZM36.5 58C36.5 57.4477 36.9477 57 37.5 57H63.5C64.0523 57 64.5 57.4477 64.5 58C64.5 58.5523 64.0523 59 63.5 59H37.5C36.9477 59 36.5 58.5523 36.5 58ZM37.5 63C36.9477 63 36.5 63.4477 36.5 64C36.5 64.5523 36.9477 65 37.5 65H52.5C53.0523 65 53.5 64.5523 53.5 64C53.5 63.4477 53.0523 63 52.5 63H37.5Z" fill="#828282"/>
+<path d="M30.5 72C27 72 27 72 23 72C18.8055 71.702 15.5 68.3806 15.5 64.327V55H30" stroke="#828282" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9211 67.663C16.1618 68.4235 16.5012 69.1312 16.9283 69.7667L29.5 57.195V55L28.5841 55L15.9211 67.663ZM20.9667 72.7284C20.1942 72.5073 19.4861 72.1679 18.8539 71.7302L29.5 61.0841V64.195L20.9667 72.7284ZM25.4046 72.1795C26.7069 71.4951 27.7523 70.4308 28.4608 69.1232L25.4046 72.1795ZM24.695 55L21.5841 55L15.5 61.0841V64.195L24.695 55ZM15.5 55L17.695 55L15.5 57.195V55Z" fill="#828282"/>
+<rect x="34.5" y="24" width="32" height="20" rx="2" fill="#BDBDBD"/>
+</symbol>
+
+
+
 <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"/>

src/assets/post/sprite.svg

 <svg xmlns="http://www.w3.org/2000/svg">
 
+
+<symbol id="aap" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 322 180"><path fill="#fff" d="M0 0h322v180H0z"/><path d="m0 0 83.5.5L108 84l7-12.5L147.5 180H0V0Z" fill="#348899"/><path d="M29.5 107.8c2.9-.8 6.4-2.5 10.3-4.6A154.8 154.8 0 0 0 77 74.5v.1l.1.1V75l.1.1V75.5l.1.1V75.9l.1.1V76.2l.1.1v.4h.1v.4l.1.1v.2l.1.2V78l.1.1V78.3l.1.1v.2l.1.2v.4h.1v.4h.1V80l.1.1V80.3l.1.1v.4l.1.1V81.2l.1.1V81.6l.1.1V82l.1.2v.2l.1.2v.2h.1v.4l.1.1V83.6l.1.1v.4h.1v.4h.1v.4l.1.1v.2l.1.2v.2l.1.2V86.1l.1.1v.2l.1.2V87l.1.1V87.3l.1.2v.2l.1.1v.4h.1v.4l.1.1V89h.1v.4l.1.1v.2l.1.2V90.2l.1.2v.2l.1.1v.4h.1V91.5l.1.1v.4l.1.1v.2l.1.2V92.8l.1.1v.2l.1.2v.2l.1.2V94l.1.1v.2l.1.2v.4h.1V95.2l.1.2v.2l.1.1V96l.1.2v.2l.1.2V96.9l.1.2v.2l.1.1V97.6h.1v.5h.1V98.5l.1.1v.2l.1.2V99.2l.1.2v.2l.1.2v.2l.1.1v.4l.1.1v.2l.1.2v.2l.1.2V101.8l.1.2v.2l.1.1V102.5h.1v.5h.1V103.4l.1.2v.2l.1.1V104.1l.1.2V104.6h.1V105l.1.1v.4l.1.1v.2l.1.2v.4h.1V106.7l.1.1v.2l.1.2v.4h.1V107.9l.1.2V108.4l.1.1v.2l.1.2v.2l.1.2V109.6l.1.1V110h.1v.4l.1.2v.2l.1.1v.4h.1V111.6l.1.1v.4l.1.1v.2l.1.2V112.9l.1.1v.2l.1.2V113.7l.1.1V114l.1.2v.2l.1.1v.4h.1V115.3l.1.1V115.6l.1.2v.2l.1.2v.2l.1.1V116.8l.1.2V117.4l.1.1V117.7l.1.1V118.1l.1.2v.2h.1v.4l.1.1V119.3l.1.1V119.7l.1.1v.4h.1v.4h.1v.4h.1v.4h.1v.4l.1.2v.2l.1.1V122.6l.1.1V123l.1.1V123.4l.1.2v.2l.1.2V124.3l.1.1V124.7h.1v.4l.1.1V125.5a179.1 179.1 0 0 0-56.6-4l-3.3-13.7Z" stroke="#fff" stroke-width="2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M77.6 72.4C66.3 85.4 40 104.2 28.3 107l3.8 15.6c2.4-.6 7.4-1 11.3-1.1L41 136a5.4 5.4 0 1 0 10.9-.8l-.5-14-.6-1.5-.2-.4 14-34.3 3.9-1-15.3 37.5c13.1.6 28.2 2.6 37.6 5.3l-6.6-27-9.1 22.2-4 1 10.6-26 2.4 2.7-4-16.5-15.6 36.5-3.9 1 17.3-41 2 2.3-2.4-9.7ZM51.4 97.2l-4 1-5.3 14.7 1.4 5.8 7.9-21.5Z" fill="#fff"/><path d="m157.3 77.1-1.5-3.8-7 1.7-1.3 4.5-3.6 1 7-22.7 1.2-.3 8.8 18.8-3.6.8ZM152 63.8l-2.2 8.3 5-1.3-2.8-7Zm13.7 3.8.5 7.4-3.6.9-1-20.3 4.1-1.4c5.2-1.2 8.2 0 9.1 4 .6 2.1.2 4-1 5.7a9.7 9.7 0 0 1-5.7 3.3l-2.4.4Zm-.6-9.8.4 6.7c.5 0 1.1 0 1.8-.3 1.5-.3 2.6-1 3.4-1.8.7-.9 1-1.9.6-3.1-.5-2-1.9-2.8-4.2-2.2-.6.1-1.3.4-2 .7Zm16.5 5.9.4 7.5-3.5.8-1-20.3a45 45 0 0 1 4.1-1.3c5.1-1.3 8.2 0 9.1 3.9.6 2.2.2 4-1 5.7a9.7 9.7 0 0 1-5.7 3.3c-.8.2-1.6.4-2.4.4Zm-.6-9.8.4 6.7c.5 0 1.1 0 1.8-.2 1.5-.4 2.6-1 3.4-1.9.7-.8.9-1.9.6-3-.5-2.1-1.9-2.9-4.2-2.3-.6.1-1.3.4-2 .7Zm24.8-6-9 2.2.3 4.7 6.5-1.6.1 3-6.4 1.6.4 6.3 8.8-2.1.2 3.2-12.4 3-1.2-20.4 12.6-3 .1 3.1Zm17 13.3-12.2 3-1.2-20.3 3.5-.9 1 17.2 8.7-2.2.2 3.2Zm-58 46-1.6-3.7-7 1.7-1.3 4.5-3.6.8 7-22.6 1.3-.3 8.8 18.8-3.6.9ZM159.2 94l-2.2 8.2 5.1-1.2-2.9-7Zm-2-7.2-3.2-4 3.8-.8 1.5 4.3-2.2.5Zm24 8.9.4 7.4-3.5 1-1.1-20.4a45 45 0 0 1 4.2-1.3c5.1-1.3 8.2 0 9 3.9.6 2.2.3 4-1 5.7a9.7 9.7 0 0 1-5.6 3.3l-2.4.4Zm-.6-9.8.4 6.7c.5 0 1 0 1.8-.2 1.5-.4 2.6-1 3.3-1.9.7-.8 1-1.9.7-3.1-.5-2-2-2.8-4.3-2.2-.6.1-1.2.4-2 .7Zm21.8 3 6.5 7.6-4 1-5.6-7.2-2.2.4.4 8.6-3.5.8-1.2-20.3a132 132 0 0 1 5-1.4 9 9 0 0 1 5.3 0 4 4 0 0 1 2.7 3c.4 1.6.3 3-.4 4.4a6.3 6.3 0 0 1-3 3.1Zm-5.9-6.8.4 5.6 1.4-.2c3.3-.8 4.7-2.3 4.2-4.4-.2-1-.7-1.5-1.4-1.7-.7-.2-1.8-.1-3.3.2l-1.3.5Zm13.3 6.5c-.8-3.5-.6-6.7.7-9.6 1.3-2.9 3.5-4.7 6.5-5.5 2.3-.5 4.3-.3 5.8.6 1.6 1 2.6 2.5 3.2 4.9 1 3.8.7 7.2-.6 10a10 10 0 0 1-7 5.5c-2.1.5-4 .3-5.5-.8a8.4 8.4 0 0 1-3-5.1Zm3.5-1.2c.4 1.5 1 2.6 1.8 3.3a3 3 0 0 0 3 .7 5.8 5.8 0 0 0 4.2-4c.8-2.2.8-4.7.2-7.3-.7-3-2.4-4.1-5-3.5-1.9.5-3.2 1.8-3.9 4a12 12 0 0 0-.3 6.8Zm15-.4 3-.7c.3 1.1.9 1.6 1.8 1.4.8-.2 1.4-.5 1.8-.9.4-.3.7-.8.8-1.3.2-.6.2-1.7 0-3.3l-.7-12.7 3.5-.8.7 12.7c.2 3.2-.2 5.4-1.1 6.7a7.6 7.6 0 0 1-4.6 2.7c-1.3.3-2.4.2-3.3-.3-1-.5-1.5-1.3-1.8-2.5l-.1-1ZM255 67.8l-9 2.2.4 4.7 6.4-1.6.2 3-6.5 1.6.4 6.3 8.8-2.1.2 3.1-12.4 3-1.1-20.3 12.5-3 .1 3.1Zm18.6-4.5-6.2 1.5 1 17.2-3.4.8-1-17.1-6.2 1.5-.2-3.2 15.8-3.8.2 3.1Zm12.8-2.3a5.4 5.4 0 0 0-3.4-.3c-2.1.5-3 1.6-2.6 3.2.2.7 1 1.3 2.3 2l2.4 1.2 1.6.9 1 .8 1 1.2.5 1.3a5 5 0 0 1-1 4.6 8.6 8.6 0 0 1-4.9 2.8c-1.7.4-3.4.5-5.2 0l.3-3.6c1.4.6 3 .7 4.5.3 1-.2 1.7-.6 2.2-1.1a2 2 0 0 0 .5-2c-.2-.7-1-1.4-2.3-2l-2.5-1.2-1.6-.8a5.7 5.7 0 0 1-1.5-7.9 7 7 0 0 1 4.3-2.7 17.4 17.4 0 0 1 4.7-.4l-.3 3.7Z" fill="#348899"/></symbol>
+
 <symbol id="appels" viewBox="0 0 80 60" xmlns="http://www.w3.org/2000/svg">
 <path d="M1.66016 23.2006C4.67429 23.0597 8.52282 22.3132 12.7892 21.1547C17.5608 19.8591 22.9197 18.0302 28.3314 15.8906C38.369 11.9223 48.6614 6.85659 55.7703 2.08884V2.14843V2.22928V2.31051V2.39211V2.47407V2.5564V2.6391V2.72216V2.80559V2.88938V2.97352V3.05802V3.14288V3.2281V3.31367V3.39959V3.48586V3.57248V3.65944V3.74676V3.83441V3.92241V4.01075V4.09943V4.18845V4.27781V4.3675V4.45752V4.54788V4.63856V4.72958V4.82092V4.91259V5.00458V5.0969V5.18954V5.2825V5.37577V5.46937V5.56327V5.6575V5.75203V5.84688V5.94203V6.03749V6.13326V6.22933V6.32571V6.42239V6.51937V6.61664V6.71422V6.81209V6.91025V7.0087V7.10745V7.20649V7.30581V7.40542V7.50532V7.6055V7.70596V7.8067V7.90772V8.00901V8.11059V8.21243V8.31455V8.41694V8.5196V8.62253V8.72573V8.82918V8.93291V9.03689V9.14114V9.24565V9.35041V9.45543V9.5607V9.66622V9.772V9.87803V9.9843V10.0908V10.1976V10.3046V10.4119V10.5194V10.6271V10.7351V10.8433V10.9517V11.0604V11.1693V11.2784V11.3878V11.4974V11.6072V11.7172V11.8275V11.938V12.0487V12.1596V12.2708V12.3821V12.4937V12.6054V12.7174V12.8296V12.942V13.0546V13.1675V13.2805V13.3937V13.5071V13.6207V13.7345V13.8485V13.9628V14.0771V14.1917V14.3065V14.4215V14.5366V14.6519V14.7674V14.8831V14.999V15.1151V15.2313V15.3477V15.4643V15.581V15.6979V15.815V15.9323V16.0497V16.1673V16.2851V16.403V16.521V16.6393V16.7577V16.8762V16.9949V17.1137V17.2327V17.3519V17.4712V17.5906V17.7102V17.83V17.9498V18.0698V18.19V18.3103V18.4307V18.5513V18.672V18.7928V18.9137V19.0348V19.156V19.2774V19.3988V19.5204V19.6421V19.7639V19.8858V20.0079V20.1301V20.2523V20.3747V20.4972V20.6198V20.7425V20.8654V20.9883V21.1113V21.2344V21.3576V21.481V21.6044V21.7279V21.8515V21.9752V22.099V22.2229V22.3468V22.4709V22.595V22.7192V22.8435V22.9679V23.0923V23.2169V23.3415V23.4661V23.5909V23.7157V23.8406V23.9655V24.0905V24.2156V24.3408V24.466V24.5912V24.7166V24.8419V24.9674V25.0929V25.2184V25.344V25.4696V25.5953V25.7211V25.8468V25.9726V26.0985V26.2244V26.3503V26.4763V26.6023V26.7284V26.8544V26.9806V27.1067V27.2328V27.359V27.4852V27.6115V27.7377V27.864V27.9903V28.1166V28.243V28.3693V28.4956V28.622V28.7484V28.8748V29.0012V29.1275V29.2539V29.3803V29.5067V29.6331V29.7595V29.8859V30.0123V30.1387V30.265V30.3914V30.5177V30.6441V30.7704V30.8967V31.023V31.1492V31.2754V31.4017V31.5279V31.654V31.7802V31.9063V32.0323V32.1584V32.2844V32.4104V32.5363V32.6622V32.7881V32.9139V33.0397V33.1654V33.2911V33.4168V33.5424V33.6679V33.7934V33.9188V34.0442V34.1696V34.2948V34.42V34.5452V34.6703V34.7953V34.9203V35.0452V35.17V35.2947V35.4194V35.544V35.6686V35.793V35.9174V36.0417V36.1659V36.2901V36.4141V36.5381V36.662V36.7858V36.9095V37.0331V37.1566V37.2801V37.4034V37.5266V37.6498V37.7728V37.8957V38.0186V38.1413V38.2639V38.3864V38.5088V38.6311V38.7533V38.8754V38.9973V39.1191V39.2408V39.3624V39.4839V39.6053V39.7265V39.8476V39.9685V40.0894V40.2101V40.3307V40.4511V40.5714V40.6916V40.8116V40.9315V41.0512V41.1708V41.2903V41.4096V41.5288V41.6478V41.7667V41.8854V42.004V42.1224V42.2406V42.3587V42.4766V42.5944V42.712V42.8294V42.9467V43.0638V43.1808V43.2975V43.4141V43.5306V43.6468V43.7629V43.8788V43.9945V44.11V44.2254V44.3406V44.4555V44.5703V44.6849V44.7993V44.9136V45.0276V45.1414V45.2551V45.3685V45.4818V45.5948V45.7076V45.8203V45.9327V46.0449V46.1569V46.2687V46.3803V46.4917V46.6029V46.7138V46.8245V46.9351V47.0453V47.1554V47.2653V47.3749V47.4843V47.5934V47.7024V47.8111V47.9195V48.0278V48.1358V48.2435V48.3511V48.4583V48.5654V48.6722V48.7787V48.885V48.9911V49.0969V49.2024V49.3078V49.4128V49.5176V49.6221V49.7264V49.8304V49.9342V50.0377V50.1409V50.2439V50.3465V50.449V50.5511V50.653V50.7546V50.8559V50.957V51.0578V51.1582V51.2585V51.3584V51.458V51.5574V51.6565V51.7552V51.8537V51.9519V52.0498V52.1474V52.2448V52.3418V52.4385V52.5349V52.631V52.7268V52.8223V52.9175V53.0124V53.1069V53.2012V53.2952V53.3888V53.4821V53.5751V53.6678V53.7601V53.8521V53.9439V54.0352V54.1263V54.217V54.3074V54.3975V54.4872V54.5766V54.5932C48.6675 50.7584 38.3441 46.5962 28.2733 43.3173C18.0609 39.9923 7.95384 37.5244 1.66016 37.2769V23.2006Z" fill="none" stroke-width="2"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M56.7703 0.181641C42.7428 10.2013 12.6838 22.2249 0.660156 22.2249V38.2564C3.19182 38.2564 8.06936 39.0833 11.8822 39.8595L6.27117 53.4863C5.78047 56.4517 7.78661 59.2534 10.752 59.7441C13.7174 60.2349 16.5192 58.2287 17.0099 55.2633L19.8979 41.4627L19.6442 39.9086L19.5098 39.51L41.2658 9.45105H45.2737L21.5122 42.2809C34.1261 45.936 48.342 51.4756 56.7703 56.2918V28.5373L42.6898 47.8979H38.682L55.0188 25.106L56.7703 28.386V11.4099L32.9349 43.1831H28.9271L55.4659 7.44562L56.7703 10.1451V0.181641ZM25.4388 18.068H21.4309L12.6838 31.1271V37.1106L25.4388 18.068Z" stroke="none"/>

src/assets/scss/_breakpoint.scss

@@ -4,10 +4,12 @@ $width-large-phone: 600px;
 $width-tablet: 980px;
 $width-desktop: 1280px;
 $width-large-desktop: 1201px;
+$width-news-max: 830px;
 
 $small-phone: 'only screen and (max-width : #{$width-small-phone})';
 $phone: 'only screen and (max-width : #{$width-phone})';
 $large-phone: 'only screen and (max-width : #{$width-large-phone})';
+$news-max: 'only screen and (max-width :  #{$width-news-max})';
 $tablet: 'only screen and (max-width : #{$width-tablet})';
 $desktop: 'only screen and (max-width : #{$width-desktop})';
 $large-desktop: 'only screen and (min-width : #{$width-large-desktop})';

src/assets/scss/_typography.scss

@@ -9,10 +9,11 @@ $font-size-small: 1em; // 16px
 $font-size-smedium: 1.125em; // 18px
 $font-size-medium: 1.25em; // 20px
 $font-size-xmedium: 1.375em; // 22px
-
+$font-size-xxmedium: 1.5em; // 24px
 $font-size-large: 1.625em; // 26px
 $font-size-xlarge: 1.75em; // 28px
-$font-size-xxlarge: 1.875em; // 28px
+$font-size-xxlarge: 1.875em; // 30px
+$font-size-xcxlarge: 2em; // 32px
 
 html,
 body,
@@ -45,6 +46,12 @@ h6,
   font-size: $font-size-small;
 }
 
+@mixin cn-regular-32 {
+  font-family: $title-font;
+  font-style: normal;
+  font-weight: bold;
+  font-size: $font-size-xcxlarge;
+}
 @mixin cn-bold-30 {
   font-family: $title-font;
   font-style: normal;
@@ -72,6 +79,12 @@ h6,
   font-size: $font-size-large;
 }
 
+@mixin cn-regular-24 {
+  font-family: $text-font;
+  font-style: normal;
+  font-weight: normal;
+  font-size: $font-size-xxmedium;
+}
 @mixin cn-regular-22 {
   font-family: $text-font;
   font-style: normal;

src/index.html

@@ -48,6 +48,8 @@
       rel="stylesheet"
       href="https://cdn.jsdelivr.net/npm/leaflet.locatecontrol@0.72.0/dist/L.Control.Locate.min.css"
     />
+    <link rel="stylesheet" href="https://unpkg.com/ag-grid-community/dist/styles/ag-grid.css" />
+    <link rel="stylesheet" href="https://unpkg.com/ag-grid-community/dist/styles/ag-theme-alpine.css" />
     <script
       src="https://openlayers.org/en/v4.6.5/build/ol.js"
       integrity="sha256-VC4mGHI/SvHwjGxD7oBob8kzwzbHy1MsgiCcrR5SbHg= sha384-/UhW2uuxuN/GcGRUL3CJA5ftmLinDAWEV5khyWrOKJ04xesUihAW/UNXf4VMvAuS sha512-WZO+8H/x0lzH/hIMaAan179GT2iyGNzbEA9nCGS7ju1jPPkUUr7uTHJGh3kxVG2GhDlxItuH1gbmFzHZiMul1Q=="

src/styles.scss

@@ -10,6 +10,7 @@
 @import 'assets/scss/layout';
 @import 'assets/scss/buttons';
 @import '../node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css';
+@import '~ngx-toastr/toastr';
 
 html {
   height: -webkit-fill-available;
@@ -88,6 +89,42 @@ a {
     margin-bottom: 1rem;
     width: unset;
   }
+  &.news {
+    max-width: 1080px;
+  }
+  &.no-padding {
+    padding: 0;
+  }
+}
+
+// Forms
+.form-group {
+  margin-bottom: 26px;
+  label {
+    color: $grey-2;
+  }
+}
+form p.notRequired {
+  margin-top: 0px;
+  font-style: italic;
+  color: $secondary-color;
+}
+
+/** Inputs **/
+input {
+  margin-top: 4px;
+}
+
+/** Textarea **/
+.textareaBlock {
+  textarea {
+    padding: 13px 8px;
+    background: $grey-6;
+    border: 1px solid $grey-4;
+    border-radius: $input-radius;
+    resize: none;
+    @include cn-regular-16;
+  }
 }
 
 /** Buttons **/
@@ -98,7 +135,6 @@ button {
 }
 
 /** Checkboxes **/
-
 .checkbox {
   list-style-type: none;
   width: 100%;
@@ -278,6 +314,16 @@ button {
   margin: 0 !important;
 }
 
+.backLink {
+  cursor: pointer;
+  color: $grey-2;
+  margin-bottom: 40px;
+  @include cn-bold-16;
+  &:hover {
+    opacity: 0.4;
+  }
+}
+
 .userList {
   max-width: 50%;
 }
@@ -301,3 +347,9 @@ button {
   color: $white;
   box-shadow: 0 2px 1px rgba(0, 0, 0, 0.6);
 }
+
+.hide-on-mobile {
+  @media #{$tablet} {
+    display: none !important;
+  }
+}