Merge pull request #122 from betagouv/upgrade-all-packages

Upgrade all packages
betagouv · Mar 1, 2022 · 906bfbd · 906bfbd
2 parents 0165686 + 08f5399
commit 906bfbd
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 191 deletions.
diff --git 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
@@ -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 → src/components/BreadcrumbsBlock.vue b/src/components/Breadcrumbs.vue → src/components/BreadcrumbsBlock.vue
@@ -15,7 +15,7 @@
 
 <script>
 export default {
-  name: "Breadcrumbs",
+  name: "BreadcrumbsBlock",
   data() {
     return {
       breadcrumbs: [],

diff --git a/src/components/Footer.vue → src/components/FooterBlock.vue b/src/components/Footer.vue → src/components/FooterBlock.vue
@@ -82,7 +82,7 @@
 
 <script>
     export default {
-        name: "Footer",
+        name: "FooterBlock",
     }
 </script>
 

diff --git a/src/components/Header.vue → src/components/HeaderBlock.vue b/src/components/Header.vue → src/components/HeaderBlock.vue
@@ -72,7 +72,7 @@
 
 <script>
     export default {
-        name: "Header",
+        name: "HeaderBlock",
     }
 </script>
 

diff --git 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
@@ -1,13 +1,13 @@
 <template>
     <div class="aides">
 
-        <Header></Header>
+        <HeaderBlock></HeaderBlock>
 
         <main class="rf-container" id="main">
 
             <div class="rf-grid-row rf-grid-row--center">
                 <div class="rf-col-md-8" v-if="aide">
-                    <Breadcrumbs :dynamic_page_title="title"></Breadcrumbs>
+                    <BreadcrumbsBlock :dynamic_page_title="title"></BreadcrumbsBlock>
 
                         <div class="aides-intro">
                             <a href="/" class="rf-link rf-fi-arrow-left-line rf-link--icon-left rf-mb-2w">Retour</a>
@@ -31,7 +31,8 @@
                         <div class="rf-margin-top-8N">
                             <h2>Exemples de projets attendus</h2>
                             <div>
-                                <div v-html="aide.project_examples" class="rf-text">À titre d’exemple, les thématiques suivantes pourront être explorées :</div>
+                                <div class="rf-text">À titre d’exemple, les thématiques suivantes pourront être explorées :</div>
+                                <div v-html="aide.project_examples" class="rf-text"></div>
                             </div>
                         </div>
 
@@ -54,22 +55,21 @@
         <div class="rf-grid-col rf-grid-col--center infoPlan">
             <infoPlan></infoPlan>
         </div>    
-        <Footer></Footer>
+        <FooterBlock></FooterBlock>
     </div>
 </template>
 
 <script>
     import aidService from '../services/aidService'
-    import Breadcrumbs from "@/components/Breadcrumbs";
-    import Footer from "@/components/Footer";
-    import Header from "@/components/Header";
-    import infoPlanEtat from "@/components/planDeRelanceEtat";
+    import BreadcrumbsBlock from "@/components/BreadcrumbsBlock";
+    import FooterBlock from "@/components/FooterBlock";
+    import HeaderBlock from "@/components/HeaderBlock";
     import infoPlan from "@/components/planDeRelance";
 
     export default {
-        name: "Aides",
+        name: "AidDetail",
 
-        components: { Header, Breadcrumbs, Footer, infoPlanEtat, infoPlan },
+        components: { HeaderBlock, BreadcrumbsBlock, FooterBlock, infoPlan },
 
         data() {
             return {

diff --git a/src/views/FondsCollectivites.vue b/src/views/FondsCollectivites.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="france_relance">
-    <Header></Header>
+    <HeaderBlock></HeaderBlock>
     <main class="rf-container"  id="main">
       <div class="rf-grid-row rf-grid-row--center rf-mb-4w">
         <div class="rf-col-md-10">
-          <Breadcrumbs></Breadcrumbs>
+          <BreadcrumbsBlock></BreadcrumbsBlock>
             <div class="aides-title">
               <img src="@/assets/FranceRelance.png" alt="France Relance">
               <h1 class="">Fonds "transformation numérique des collectivités territoriales"</h1>
@@ -39,20 +39,20 @@
     <div class="rf-grid-col rf-grid-col--center infoPlan">
       <infoPlan></infoPlan>
     </div>  
-    <Footer></Footer>
+    <FooterBlock></FooterBlock>
   </div>
 </template>
 
 <script>
-    import Header from "@/components/Header";
-    import Breadcrumbs from "@/components/Breadcrumbs";
-    import Footer from "@/components/Footer";
+    import HeaderBlock from "@/components/HeaderBlock";
+    import BreadcrumbsBlock from "@/components/BreadcrumbsBlock";
+    import FooterBlock from "@/components/FooterBlock";
     import infoPlan from "@/components/planDeRelance";
 
     export default {
          name: "FondsCollectivites",
 
-      components: { Header, Breadcrumbs, Footer, infoPlan},
+      components: { HeaderBlock, BreadcrumbsBlock, FooterBlock, infoPlan},
 
       data() {
           return {

diff --git a/src/views/Home.vue → src/views/HomePage.vue b/src/views/Home.vue → src/views/HomePage.vue
@@ -2,14 +2,14 @@
 
   <div class="france_relance">
 
-    <Header></Header>
+    <HeaderBlock></HeaderBlock>
 
     <main class="rf-container" id="main">
 
 
       <div class="rf-grid-row rf-grid-row--center">
         <div class="rf-col-md-10">
-          <Breadcrumbs></Breadcrumbs>
+          <BreadcrumbsBlock></BreadcrumbsBlock>
 
           <IntroSection class="rf-mb-4w"></IntroSection>
 
@@ -62,26 +62,26 @@
       <infoPlanEtat></infoPlanEtat>
       <infoPlan></infoPlan>
     </div>  
-    <Footer></Footer>
+    <FooterBlock></FooterBlock>
 
   </div>
 </template>
 
 <script>
-  import Header from "@/components/Header";
-  import Breadcrumbs from "@/components/Breadcrumbs";
+  import HeaderBlock from "@/components/HeaderBlock";
+  import BreadcrumbsBlock from "@/components/BreadcrumbsBlock";
   import IntroSection from "@/components/IntroSection";
   import TopSelection from "@/components/TopSelection";
   import ResultSection from "@/components/ResultSection";
-  import Footer from "@/components/Footer";
+  import FooterBlock from "@/components/FooterBlock";
   import aidService from '../services/aidService';
   import infoPlanEtat from "@/components/planDeRelanceEtat";
   import infoPlan from "@/components/planDeRelance";
 
   export default {
       name: "FranceRelance",
 
-      components: { Header, Breadcrumbs, IntroSection, TopSelection, ResultSection, Footer, infoPlanEtat, infoPlan },
+      components: { HeaderBlock, BreadcrumbsBlock, IntroSection, TopSelection, ResultSection, FooterBlock, infoPlanEtat, infoPlan },
 
       data() {
         return {

diff --git a/src/views/Video.vue → src/views/VideoPage.vue b/src/views/Video.vue → src/views/VideoPage.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="france_relance">
-    <Header></Header>
+    <HeaderBlock></HeaderBlock>
     <main class="rf-container" id="main">
       <div class="rf-grid-row rf-grid-row--center rf-mb-4w">
         <div class="rf-col-md-10">
-          <Breadcrumbs></Breadcrumbs>
+          <BreadcrumbsBlock></BreadcrumbsBlock>
             <div class="aides-title">
               <img src="@/assets/FranceRelance.png" alt="France Relance">
               <h1 class="">Le mot d’Amélie de Montchalin</h1>
@@ -33,21 +33,21 @@
       <infoPlanEtat></infoPlanEtat>
       <infoPlan></infoPlan>
     </div>  
-    <Footer></Footer>
+    <FooterBlock></FooterBlock>
   </div>
 </template>
 
 <script>
-    import Header from "@/components/Header";
-    import Breadcrumbs from "@/components/Breadcrumbs";
-    import Footer from "@/components/Footer";
+    import HeaderBlock from "@/components/HeaderBlock";
+    import BreadcrumbsBlock from "@/components/BreadcrumbsBlock";
+    import FooterBlock from "@/components/FooterBlock";
     import infoPlanEtat from "@/components/planDeRelanceEtat";
     import infoPlan from "@/components/planDeRelance";
 
     export default {
-         name: "Video",
+         name: "VideoPage",
 
-      components: { Header, Breadcrumbs, Footer, infoPlan, infoPlanEtat},
+      components: { HeaderBlock, BreadcrumbsBlock, FooterBlock, infoPlan, infoPlanEtat},
 
       data() {
           return {

diff --git a/vue.config.js b/vue.config.js
@@ -1,4 +1,7 @@
 module.exports = {
   outputDir: 'dist',
   assetsDir: 'static',
+  devServer: {
+    proxy: 'https://staging.aides-territoires.incubateur.net',
+  }
 }