Skip to content

Commit c2a6a99

Browse files
authored
Merge pull request #63 from PnEcrins/feat/display
rename obs -> evenements + make offline page accessible when not connected
2 parents 278cee6 + 3bcbcb7 commit c2a6a99

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

front-end/src/app/app.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ export class AppComponent {
112112
},
113113
{
114114
id: 2,
115-
text: 'Interface de synthèse',
116-
routerLink: 'interface-de-synthese',
115+
text: 'Consulter les évènements',
116+
routerLink: 'evenements',
117117
authenficated: null,
118118
click: () => null,
119119
observationsPending: false,
@@ -130,14 +130,14 @@ export class AppComponent {
130130
id: 4,
131131
text: 'Fonds de carte hors ligne',
132132
routerLink: 'fonds-de-carte-hors-ligne',
133-
authenficated: true,
133+
authenficated: null,
134134
click: () => null,
135135
observationsPending: false,
136136
},
137137
{
138138
id: 5,
139139
text: 'À propos',
140-
routerLink: 'en-savoir-plus',
140+
routerLink: 'a-propos',
141141
authenficated: null,
142142
click: () => null,
143143
observationsPending: false,

front-end/src/app/app.routes.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ export const routes: Routes = [
3737
canActivate: [authGuard],
3838
},
3939
{
40-
path: 'detail-d-une-observation/:observation',
41-
title: "Détail d'une observation • Regard d'altitude",
40+
path: 'evenement/:observation',
41+
title: "Détail d'un évènement • Regard d'altitude",
4242
component: ObservationDetailComponent,
4343
data: {
44-
title: "Détail d'une observation",
44+
title: "Détail d'un évènement",
4545
backButton: true,
4646
accountButton: false,
4747
},
4848
},
4949
{
50-
path: 'interface-de-synthese',
51-
title: "Interface de synthèse • Regard d'altitude",
50+
path: 'evenements',
51+
title: "Les évènements • Regard d'altitude",
5252
component: SynthesisInterfaceComponent,
5353
data: {
54-
title: 'Interface de synthèse',
54+
title: 'Les évènements',
5555
backButton: true,
5656
accountButton: false,
5757
},
@@ -117,14 +117,13 @@ export const routes: Routes = [
117117
backButton: true,
118118
accountButton: false,
119119
},
120-
canActivate: [authGuard],
121120
},
122121
{
123-
path: 'en-savoir-plus',
124-
title: 'En savoir plus',
122+
path: 'a-propos',
123+
title: 'À propos',
125124
component: LearnMoreComponent,
126125
data: {
127-
title: 'En savoir plus',
126+
title: 'À propos',
128127
backButton: true,
129128
accountButton: false,
130129
},

front-end/src/app/pages/home/home.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1 id="text-banner">Un collectif pour voir changer la montagne</h1>
1414
de changement climatique. Notamment en permettant un inventaire
1515
collaboratif des évènements en montagne.
1616
</p>
17-
<button class="text-align" routerLink="/en-savoir-plus" mat-flat-button color="primary">
17+
<button class="text-align" routerLink="/a-propos" mat-flat-button color="primary">
1818
À propos
1919
</button>
2020
</div>
@@ -44,7 +44,7 @@ <h1 id="text-banner">Un collectif pour voir changer la montagne</h1>
4444
Un collectif pour voir changer la montagne
4545
</div>
4646
</section> -->
47-
<a routerLink="/interface-de-synthese" >
47+
<a routerLink="/evenements" >
4848
<mat-card class="col-6 hover mb-3">
4949
<img id="map-img"/>
5050
<button

front-end/src/app/pages/my-observations/my-observations.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
mat-icon-button
5555
class="mt-16"
5656
[routerLink]="[
57-
'/detail-d-une-observation',
57+
'/evenement',
5858
slugify(
5959
observation.id!.concat(
6060
observation.properties.name

front-end/src/app/pages/synthesis-interface/synthesis-interface.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
>
2929
<mat-expansion-panel-header>
3030
<mat-panel-title>
31-
{{ currentObservationsFeatureCollection.features.length }} observations
31+
{{ currentObservationsFeatureCollection.features.length }} évènements
3232
</mat-panel-title>
3333
</mat-expansion-panel-header>
3434
<mat-list class="mat-expansion-panel-body-visible">
@@ -59,7 +59,7 @@
5959
mat-icon-button
6060
class="mt-16"
6161
[routerLink]="[
62-
'/detail-d-une-observation',
62+
'/evenement',
6363
slugify(
6464
observation.id!.concat(
6565
observation.properties.name

front-end/src/app/pages/synthesis-interface/synthesis-interface.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export class SynthesisInterfaceComponent {
222222
const slug = slugify(
223223
`${geoJsonPoint.id}-${geoJsonPoint.properties.name}`,
224224
);
225-
this.router.navigate(['/detail-d-une-observation', slug]);
225+
this.router.navigate(['/evenement', slug]);
226226
};
227227
observationPopup.appendChild(observationButton);
228228
if (layer) {

0 commit comments

Comments
 (0)