From 74ec68343186f330c5c8ae290d266870769a6b92 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 9 Sep 2019 14:58:52 +0200
Subject: [PATCH] Fix deploy

---
 .gitlab-ci.yml    | 32 ++++++++++++++++----------------
 webpack.config.js |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19de501..cc329ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 pages:
   stage: deploy
   script:
-  - npm install
+  - yarn install --pure-lockfile
   - npm run preview
   - mv -f public/$CI_PROJECT_NAME/* public
   artifacts:
@@ -15,21 +15,21 @@ pages:
     paths:
       - node_modules/
 
-production:
-  stage: deploy
-  script:
-  - npm install
-  - npm run prod
-  - cp ./public/fr/index.html ./public/index.html
-  - for f in $(find -type l);do cp --remove-destination $(readlink -f $f) $f;done;
-  - mkdir "${HOME}/.ssh"
-  - chmod 700 "${HOME}/.ssh"
-  - if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
-  - eval `ssh-agent -s`
-  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi
-  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then cd public && echo "put -r ." | sftp ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web; fi
-  only:
-    - master
+#production:
+  #stage: deploy
+  #script:
+  #- npm install
+  #- npm run prod
+  #- cp ./public/fr/index.html ./public/index.html
+  #- for f in $(find -type l);do cp --remove-destination $(readlink -f $f) $f;done;
+  #- mkdir "${HOME}/.ssh"
+  #- chmod 700 "${HOME}/.ssh"
+  #- if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
+  #- eval `ssh-agent -s`
+  #- if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi
+  #- if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then cd public && echo "put -r ." | sftp ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web; fi
+  #only:
+    #- master
 
 # Push new translations strings to https://trad.framasoft.org
 #trads:
diff --git a/webpack.config.js b/webpack.config.js
index bdb34b8..5a89d89 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -136,7 +136,7 @@ if (process.env.NODE_ENV === 'development') {
   const routes = [root];
   const pages = [];
   // Import pages list
-  fs.readdirSync('./app/components/pages').forEach(file => {
+  fs.readdirSync('./app/views').forEach(file => {
     pages.push(file.replace(/(.*)\.vue/, '$1'));
   });
   // Localized routes