diff --git a/Dockerfile b/Dockerfile index 0381a0dae7d78aa5c39118fe32349003ee6e70ac..b26576b58e3429c3d0189bd98bc3736f424aace1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /app # Copy the package.json file first in order to cache the modules COPY ./package.json . +COPY ./package-lock.json . COPY ./patch.js . # Install npm dependencies diff --git a/package.json b/package.json index 7ec8e1680137db9b19f0d827a0e6976fa635af5d..ad6f7982844cbed3678be700df197aedc97f8f0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "2.6.2", + "version": "2.6.3", "license": "GNU Affero General Public License v3.0", "scripts": { "ng": "ng", diff --git a/src/app/core/components/main/footer/footer.component.html b/src/app/core/components/main/footer/footer.component.html index 6204fa7d5f01bf8c78660492ba98eed26d6fa9da..53c4f3d5c87723b7164e9c09e84e71bafaceadcc 100644 --- a/src/app/core/components/main/footer/footer.component.html +++ b/src/app/core/components/main/footer/footer.component.html @@ -37,12 +37,12 @@ </div> </div> <div class="links-section"> - <!-- <div> + <div> <a class="accessibility-link" [routerLink]="['/', AppRoutes.accessibility.uri]" i18n="@@footer.accessibility"> Accessibility</a> - </div> --> + </div> <div> - <!-- <span class="bullet">•</span> --> + <span class="bullet">•</span> <a class="site-map-link" [routerLink]="['/', AppRoutes.siteMap.uri]" i18n="@@footer.sitemap">Site Map</a> </div> <div> @@ -82,4 +82,4 @@ </ul> </div> </div> -</footer> \ No newline at end of file +</footer> diff --git a/src/app/editorialisation/components/site-map/site-map.component.html b/src/app/editorialisation/components/site-map/site-map.component.html index 502562a4c6504e1da1c6027625f5a93e8ca1e619..a725a92df6344d513c2f9c2b967e951daa6f9e30 100644 --- a/src/app/editorialisation/components/site-map/site-map.component.html +++ b/src/app/editorialisation/components/site-map/site-map.component.html @@ -17,8 +17,8 @@ <div class="column"> <p class="pages-group-title" i18n="@@sitemap.secondaryPages">Secondary pages</p> <ul class="pages-list"> - <!-- <li><a class="link-1" [routerLink]="['/', AppRoutes.accessibility.uri]" - i18n="@@sitemap.accessibility">Accessibility</a></li> --> + <li><a class="link-1" [routerLink]="['/', AppRoutes.accessibility.uri]" + i18n="@@sitemap.accessibility">Accessibility</a></li> <li><a class="link-1" [routerLink]="['/', AppRoutes.legalNotices.uri]" i18n="@@sitemap.legalNotices">Legal notices</a></li> <li><a class="link-1" [routerLink]="['/', AppRoutes.contact.uri]" i18n="@@sitemap.contact">Contact us</a></li> diff --git a/src/app/editorialisation/editorialisation-routing.module.ts b/src/app/editorialisation/editorialisation-routing.module.ts index 22342436372245ad21875411f48ac8125ab5cbdb..b1480887583532dcb4b84e9f632de4a91e7fa75e 100644 --- a/src/app/editorialisation/editorialisation-routing.module.ts +++ b/src/app/editorialisation/editorialisation-routing.module.ts @@ -39,14 +39,14 @@ export const routes: Routes = [ }, canActivate: [PartnersActivatedGuard], }, - // { - // path: AppRoutes.accessibility.uri, - // component: CMSPageComponent, - // data: { - // title: AppRoutes.accessibility.title, - // uri: AppRoutes.accessibility.uri, - // }, - // }, + { + path: AppRoutes.accessibility.uri, + component: CMSPageComponent, + data: { + title: AppRoutes.accessibility.title, + uri: AppRoutes.accessibility.uri, + }, + }, { path: AppRoutes.siteMap.uri, component: SiteMapComponent, diff --git a/src/app/routes.ts b/src/app/routes.ts index c5430b442de92934bd5425a55456169a606d992a..a1aaa35f429dd226790dfd5586642d9e60495e9b 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -119,13 +119,13 @@ export const AppRoutes = { en: 'Beginners', }, }, - // accessibility: { - // uri: 'accessibilite', - // title: { - // fr: 'Accessibilité', - // en: 'Accessibility', - // }, - // }, + accessibility: { + uri: 'accessibilite', + title: { + fr: 'Accessibilité', + en: 'Accessibility', + }, + }, contact: { uri: 'contact', title: { diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index be02a9883e6ebd9628c56d0d77c964cbb3685041..b3c2ca8a0ef95518e50478beb1cb97a1177da47c 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -32,7 +32,7 @@ export const environment = { // Use variable route names (AppRoutes.credits...) for each static page to attribute the corresponding // cms page in order to make sure that if the name of the route change in the config file (routes.ts), // the cms page will still be served. -// environment.cmsStaticPages[AppRoutes.accessibility.uri] = 'accessibilite'; +environment.cmsStaticPages[AppRoutes.accessibility.uri] = 'accessibilite'; environment.cmsStaticPages[AppRoutes.approach.uri] = 'la-demarche'; environment.cmsStaticPages[AppRoutes.documentation.uri] = 'utiliser-la-plateforme-data-du-grand-lyon'; environment.cmsStaticPages[AppRoutes.legalNotices.uri] = 'mentions-legales'; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1eabaac1bf3f39ff3bb2b85553007165d204ec2e..c2d2262eac1682505b2325e6565cbc6990b662ba 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -33,7 +33,7 @@ export const environment = { // Use variable route names (AppRoutes.credits...) for each static page to attribute the corresponding // cms page in order to make sure that if the name of the route change in the config file (routes.ts), // the cms page will still be served. -// environment.cmsStaticPages[AppRoutes.accessibility.uri] = 'accessibilite'; +environment.cmsStaticPages[AppRoutes.accessibility.uri] = 'accessibilite'; environment.cmsStaticPages[AppRoutes.approach.uri] = 'la-demarche'; environment.cmsStaticPages[AppRoutes.documentation.uri] = 'utiliser-la-plateforme-data-du-grand-lyon'; environment.cmsStaticPages[AppRoutes.legalNotices.uri] = 'mentions-legales';