Compare commits

...

1 Commits

Author SHA1 Message Date
kolaente d92c3ae272
Added somewhat global config 2 years ago
  1. 18
      src/App.vue
  2. 2
      src/components/sharing/linkSharing.vue
  3. 6
      src/main.js

18
src/App.vue

@ -1,5 +1,6 @@
<template>
<div id="app">
<template v-if="appReady">
<nav class="navbar main-theme is-fixed-top" role="navigation" aria-label="main navigation" v-if="user.authenticated && user.infos.type === authTypes.USER">
<div class="navbar-brand">
<router-link :to="{name: 'home'}" class="navbar-item logo">
@ -150,6 +151,7 @@
</div>
</div>
<notifications position="bottom left" />
</template>
</div>
</template>
@ -157,6 +159,7 @@
import auth from './auth'
import message from './message'
import router from './router'
import {HTTP} from './http-common'
import NamespaceService from './services/namespace'
import authTypes from './models/authTypes'
@ -174,6 +177,21 @@
currentDate: new Date(),
userMenuActive: false,
authTypes: authTypes,
config: null,
}
},
beforeCreate() {
HTTP.get('info')
.then(r => {
this.config = r.data
// eslint-disable-next-line
console.log(this.config)
})
},
computed: {
appReady () {
return !!this.config
}
},
beforeMount() {

2
src/components/sharing/linkSharing.vue

@ -188,7 +188,7 @@
copy(text)
},
getShareLink(hash) {
return this.$config.frontend_url + 'share/' + hash + '/auth'
return this.$root.config.frontend_url + 'share/' + hash + '/auth'
},
},
}

6
src/main.js

@ -20,12 +20,6 @@ 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'

Loading…
Cancel
Save