Merge pull request #63 from PnEcrins/feat/display

rename obs -> evenements + make offline page accessible when not connected
PnEcrins · Jul 31, 2024 · c2a6a99 · c2a6a99
2 parents 278cee6 + 3bcbcb7
commit c2a6a99
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/front-end/src/app/app.component.ts b/front-end/src/app/app.component.ts
@@ -112,8 +112,8 @@ export class AppComponent {
     },
     {
       id: 2,
-      text: 'Interface de synthèse',
-      routerLink: 'interface-de-synthese',
+      text: 'Consulter les évènements',
+      routerLink: 'evenements',
       authenficated: null,
       click: () => null,
       observationsPending: false,
@@ -130,14 +130,14 @@ export class AppComponent {
       id: 4,
       text: 'Fonds de carte hors ligne',
       routerLink: 'fonds-de-carte-hors-ligne',
-      authenficated: true,
+      authenficated: null,
       click: () => null,
       observationsPending: false,
     },
     {
       id: 5,
       text: 'À propos',
-      routerLink: 'en-savoir-plus',
+      routerLink: 'a-propos',
       authenficated: null,
       click: () => null,
       observationsPending: false,

diff --git a/front-end/src/app/app.routes.ts b/front-end/src/app/app.routes.ts
@@ -37,21 +37,21 @@ export const routes: Routes = [
     canActivate: [authGuard],
   },
   {
-    path: 'detail-d-une-observation/:observation',
-    title: "Détail d'une observation • Regard d'altitude",
+    path: 'evenement/:observation',
+    title: "Détail d'un évènement • Regard d'altitude",
     component: ObservationDetailComponent,
     data: {
-      title: "Détail d'une observation",
+      title: "Détail d'un évènement",
       backButton: true,
       accountButton: false,
     },
   },
   {
-    path: 'interface-de-synthese',
-    title: "Interface de synthèse • Regard d'altitude",
+    path: 'evenements',
+    title: "Les évènements • Regard d'altitude",
     component: SynthesisInterfaceComponent,
     data: {
-      title: 'Interface de synthèse',
+      title: 'Les évènements',
       backButton: true,
       accountButton: false,
     },
@@ -117,14 +117,13 @@ export const routes: Routes = [
       backButton: true,
       accountButton: false,
     },
-    canActivate: [authGuard],
   },
   {
-    path: 'en-savoir-plus',
-    title: 'En savoir plus',
+    path: 'a-propos',
+    title: 'À propos',
     component: LearnMoreComponent,
     data: {
-      title: 'En savoir plus',
+      title: 'À propos',
       backButton: true,
       accountButton: false,
     },

diff --git a/front-end/src/app/pages/home/home.component.html b/front-end/src/app/pages/home/home.component.html
@@ -14,7 +14,7 @@ <h1 id="text-banner">Un collectif pour voir changer la montagne</h1>
         de changement climatique. Notamment en permettant un inventaire
         collaboratif des évènements en montagne.
       </p>
-      <button class="text-align" routerLink="/en-savoir-plus" mat-flat-button color="primary">
+      <button class="text-align" routerLink="/a-propos" mat-flat-button color="primary">
         À propos
       </button>
     </div>
@@ -44,7 +44,7 @@ <h1 id="text-banner">Un collectif pour voir changer la montagne</h1>
         Un collectif pour voir changer la montagne
       </div>
     </section> -->
-    <a routerLink="/interface-de-synthese" >
+    <a routerLink="/evenements" >
       <mat-card class="col-6 hover mb-3">
         <img id="map-img"/>
         <button

diff --git a/front-end/src/app/pages/my-observations/my-observations.component.html b/front-end/src/app/pages/my-observations/my-observations.component.html
@@ -54,7 +54,7 @@
             mat-icon-button
             class="mt-16"
             [routerLink]="[
-              '/detail-d-une-observation',
+              '/evenement',
               slugify(
                 observation.id!.concat(
                   observation.properties.name

diff --git a/front-end/src/app/pages/synthesis-interface/synthesis-interface.component.html b/front-end/src/app/pages/synthesis-interface/synthesis-interface.component.html
@@ -28,7 +28,7 @@
   >
     <mat-expansion-panel-header>
       <mat-panel-title>
-        {{ currentObservationsFeatureCollection.features.length }} observations
+        {{ currentObservationsFeatureCollection.features.length }} évènements
       </mat-panel-title>
     </mat-expansion-panel-header>
     <mat-list class="mat-expansion-panel-body-visible">
@@ -59,7 +59,7 @@
               mat-icon-button
               class="mt-16"
               [routerLink]="[
-                '/detail-d-une-observation',
+                '/evenement',
                 slugify(
                   observation.id!.concat(
                     observation.properties.name

diff --git a/front-end/src/app/pages/synthesis-interface/synthesis-interface.component.ts b/front-end/src/app/pages/synthesis-interface/synthesis-interface.component.ts
@@ -222,7 +222,7 @@ export class SynthesisInterfaceComponent {
       const slug = slugify(
         `${geoJsonPoint.id}-${geoJsonPoint.properties.name}`,
       );
-      this.router.navigate(['/detail-d-une-observation', slug]);
+      this.router.navigate(['/evenement', slug]);
     };
     observationPopup.appendChild(observationButton);
     if (layer) {