nutomic/joinpeertube
1
1
Fork 1
Code Issues 5 Pull requests Releases Wiki Activity

Fix gitlab page

Browse source
This commit is contained in:
Chocobozzz 2019-09-12 09:20:18 +02:00
parent b9f7a681d3
commit 56d32a6928
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -7,9 +7,10 @@ pages:
script: script:
- yarn install --pure-lockfile - yarn install --pure-lockfile
- npm run build - npm run build
- rm -r public/ && mv dist/ public/
artifacts: artifacts:
paths: paths:
- dist - public
cache: cache:
paths: paths:
- node_modules/ - node_modules/

4
public/index.html
View file

@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title></title> <title></title>
<link rel="shortcut icon" href="/img/icons/favicon.png"> <link rel="shortcut icon" href="<%= BASE_URL %>img/icons/favicon.png">
<link rel="apple-touch-icon" href="/img/icons/apple-touch-icon.png" /> <link rel="apple-touch-icon" href="<%= BASE_URL %>img/icons/apple-touch-icon.png" />
</head> </head>
<body> <body>

2
src/components/Header.vue
View file

@ -111,7 +111,7 @@
methods: { methods: {
getPath (path) { getPath (path) {
return path return process.env.BASE_URL + path
} }
} }
} }

2
src/components/I18n.vue
View file

@ -68,7 +68,7 @@
methods: { methods: {
buildLocaleLink (locale) { buildLocaleLink (locale) {
return window.location.origin + `/${locale}/` return process.env.BASE_URL + `${locale}/`
} }
} }
} }

6
src/main.js
View file

@ -54,6 +54,10 @@ Vue.component('vue-headful', vueHeadful)
Vue.mixin(CommonMixins) Vue.mixin(CommonMixins)
const routes = [ const routes = [
{
path: '',
component: Home
},
{ {
path: '/', path: '/',
component: Home component: Home
@ -73,7 +77,7 @@ for (const locale of allLocales) {
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
base: `${__dirname}${process.env.BASE_URL}`, base: process.env.BASE_URL,
routes routes
}) })

2
src/mixins/Common-Mixins.js
View file

@ -1,7 +1,7 @@
export default { export default {
methods: { methods: {
buildImgUrl: function (imageName) { buildImgUrl: function (imageName) {
return '/img/' + imageName return process.env.BASE_URL + 'img/' + imageName
} }
} }
} }

4
vue.config.js
View file

@ -1,3 +1,5 @@
module.exports = { module.exports = {
// options... publicPath: process.env.GITLAB_CI
? '/joinpeertube/'
: '/'
} }