diff --git a/.env.development b/.env.development index ae05dac8..fa77b9d6 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,3 @@ -VUE_APP_API_ROOT='https://staging.aides-territoires.beta.gouv.fr' +VUE_APP_API_ROOT='https://staging.aides-territoires.incubateur.net' +# Put the same URL in the vue.config.js>devServer>proxy parameter VUE_APP_MTFP_PARAM='505-mtfp' diff --git a/package.json b/package.json index 8afbeac6..767c226c 100644 --- a/package.json +++ b/package.json @@ -18,14 +18,16 @@ "axios": "^0.26.0", "express": "^4.17.1", "js-cookie": "^3.0.1", - "vue": "^3.2.31", + "vue": "2.6.14", "vue-atinternet-smarttag": "^0.0.2", "vue-matomo": "^4.1.0", "vue-meta": "^2.4.0", - "vue-router": "^4.0.13", - "vuex": "^4.0.2" + "vue-router": "3.0.1", + "vuex": "3.0.1" }, "devDependencies": { + "@babel/core": "^7.17.5", + "@babel/eslint-parser": "^7.17.0", "@vue/cli-plugin-babel": "^5.0.1", "@vue/cli-plugin-eslint": "^5.0.1", "@vue/cli-service": "^5.0.1", @@ -49,7 +51,7 @@ ], "rules": {}, "parserOptions": { - "parser": "babel-eslint" + "parser": "@babel/eslint-parser" } }, "postcss": { diff --git a/src/components/Breadcrumbs.vue b/src/components/BreadcrumbsBlock.vue similarity index 97% rename from src/components/Breadcrumbs.vue rename to src/components/BreadcrumbsBlock.vue index 265467d6..4db3d77f 100644 --- a/src/components/Breadcrumbs.vue +++ b/src/components/BreadcrumbsBlock.vue @@ -15,7 +15,7 @@ diff --git a/src/components/Header.vue b/src/components/HeaderBlock.vue similarity index 99% rename from src/components/Header.vue rename to src/components/HeaderBlock.vue index 759211e7..0b969170 100644 --- a/src/components/Header.vue +++ b/src/components/HeaderBlock.vue @@ -72,7 +72,7 @@ diff --git a/src/router.js b/src/router.js index f4533b04..50b6118b 100644 --- a/src/router.js +++ b/src/router.js @@ -1,8 +1,8 @@ import Vue from 'vue' import Router from 'vue-router' -import Home from '@/views/Home.vue' +import HomePage from '@/views/HomePage.vue' import AidDetail from '@/views/AidDetail.vue' -import Video from '@/views/Video.vue' +import VideoPage from '@/views/VideoPage.vue' import FondsCollectivites from '@/views/FondsCollectivites.vue' Vue.use(Router) @@ -13,7 +13,7 @@ export default new Router({ { path: '/', name: 'home', - component: Home, + component: HomePage, meta: { breadcrumbs: [ { name: 'Accueil', url: 'https://www.transformation.gouv.fr' }, @@ -24,7 +24,7 @@ export default new Router({ { path: '/le-mot-d-amelie-de-montchalin', name: 'video', - component: Video, + component: VideoPage, meta: { breadcrumbs: [ { name: 'Accueil', url: 'https://www.transformation.gouv.fr' }, diff --git a/src/views/AidDetail.vue b/src/views/AidDetail.vue index 7d77e71b..9159ac6c 100644 --- a/src/views/AidDetail.vue +++ b/src/views/AidDetail.vue @@ -1,13 +1,13 @@ - + - + Retour @@ -31,7 +31,8 @@ Exemples de projets attendus - À titre d’exemple, les thématiques suivantes pourront être explorées : + À titre d’exemple, les thématiques suivantes pourront être explorées : + @@ -54,22 +55,21 @@ - +