Fix gitlab page

2019-09-12 09:20:18 +02:00 · 2019-09-12 09:20:18 +02:00 · 56d32a6928
commit 56d32a6928
parent b9f7a681d3
7 changed files with 15 additions and 8 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,9 +7,10 @@ pages:
  script:
  - yarn install --pure-lockfile
  - npm run build
+  - rm -r public/ && mv dist/ public/
  artifacts:
    paths:
-    - dist
+    - public
  cache:
    paths:
      - node_modules/
--- a/public/index.html
+++ b/public/index.html
@ -5,8 +5,8 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title></title>

-    <link rel="shortcut icon" href="/img/icons/favicon.png">
-    <link rel="apple-touch-icon" href="/img/icons/apple-touch-icon.png" />
+    <link rel="shortcut icon" href="<%= BASE_URL %>img/icons/favicon.png">
+    <link rel="apple-touch-icon" href="<%= BASE_URL %>img/icons/apple-touch-icon.png" />
  </head>

  <body>
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@ -111,7 +111,7 @@

    methods: {
      getPath (path) {
-        return path
+        return process.env.BASE_URL + path
      }
    }
  }
--- a/src/components/I18n.vue
+++ b/src/components/I18n.vue
@ -68,7 +68,7 @@

    methods: {
      buildLocaleLink (locale) {
-        return window.location.origin + `/${locale}/`
+        return process.env.BASE_URL + `${locale}/`
      }
    }
  }
--- a/src/main.js
+++ b/src/main.js
@ -54,6 +54,10 @@ Vue.component('vue-headful', vueHeadful)
 Vue.mixin(CommonMixins)

 const routes = [
+  {
+    path: '',
+    component: Home
+  },
  {
    path: '/',
    component: Home
@ -73,7 +77,7 @@ for (const locale of allLocales) {

 const router = new VueRouter({
  mode: 'history',
-  base: `${__dirname}${process.env.BASE_URL}`,
+  base: process.env.BASE_URL,
  routes
 })

--- a/src/mixins/Common-Mixins.js
+++ b/src/mixins/Common-Mixins.js
@ -1,7 +1,7 @@
 export default {
  methods: {
    buildImgUrl: function (imageName) {
-      return '/img/' + imageName
+      return process.env.BASE_URL + 'img/' + imageName
    }
  }
 }
--- a/vue.config.js
+++ b/vue.config.js
@ -1,3 +1,5 @@
 module.exports = {
-  // options...
+  publicPath: process.env.GITLAB_CI
+    ? '/joinpeertube/'
+    : '/'
 }