Merge branch 'master' into feature/link-share

This commit is contained in:
kolaente 2019-09-09 19:33:38 +02:00
commit cfb1bc8fa7
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 23 additions and 2 deletions

16
src/config.js Normal file
View File

@ -0,0 +1,16 @@
import {HTTP} from './http-common'
export default {
config: null,
getConfig() {
return this.config
},
initConfig() {
return HTTP.get('info')
.then(r => {
this.config = r.data
})
}
}

View File

@ -20,6 +20,12 @@ Vue.config.productionTip = false
import Notifications from 'vue-notification'
Vue.use(Notifications)
import config from './config'
config.initConfig()
.then(() => {
Vue.prototype.$config = config.getConfig()
})
// Icons
import { library } from '@fortawesome/fontawesome-svg-core'
import { faSignOutAlt } from '@fortawesome/free-solid-svg-icons'
@ -90,11 +96,10 @@ Vue.directive('focus', {
}
})
// Check the user's auth status when the app starts
auth.checkAuth()
new Vue({
router,
render: h => h(App)
render: h => h(App)
}).$mount('#app')