forked from vikunja/frontend
Compare commits
1 Commits
master
...
feature/gl
Author | SHA1 | Date | |
---|---|---|---|
d92c3ae272 |
18
src/App.vue
18
src/App.vue
|
@ -1,5 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<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">
|
<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">
|
<div class="navbar-brand">
|
||||||
<router-link :to="{name: 'home'}" class="navbar-item logo">
|
<router-link :to="{name: 'home'}" class="navbar-item logo">
|
||||||
|
@ -150,6 +151,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<notifications position="bottom left" />
|
<notifications position="bottom left" />
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -157,6 +159,7 @@
|
||||||
import auth from './auth'
|
import auth from './auth'
|
||||||
import message from './message'
|
import message from './message'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
|
import {HTTP} from './http-common'
|
||||||
|
|
||||||
import NamespaceService from './services/namespace'
|
import NamespaceService from './services/namespace'
|
||||||
import authTypes from './models/authTypes'
|
import authTypes from './models/authTypes'
|
||||||
|
@ -174,6 +177,21 @@
|
||||||
currentDate: new Date(),
|
currentDate: new Date(),
|
||||||
userMenuActive: false,
|
userMenuActive: false,
|
||||||
authTypes: authTypes,
|
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() {
|
beforeMount() {
|
||||||
|
|
|
@ -188,7 +188,7 @@
|
||||||
copy(text)
|
copy(text)
|
||||||
},
|
},
|
||||||
getShareLink(hash) {
|
getShareLink(hash) {
|
||||||
return this.$config.frontend_url + 'share/' + hash + '/auth'
|
return this.$root.config.frontend_url + 'share/' + hash + '/auth'
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,12 +20,6 @@ Vue.config.productionTip = false
|
||||||
import Notifications from 'vue-notification'
|
import Notifications from 'vue-notification'
|
||||||
Vue.use(Notifications)
|
Vue.use(Notifications)
|
||||||
|
|
||||||
import config from './config'
|
|
||||||
config.initConfig()
|
|
||||||
.then(() => {
|
|
||||||
Vue.prototype.$config = config.getConfig()
|
|
||||||
})
|
|
||||||
|
|
||||||
// Icons
|
// Icons
|
||||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||||
import { faSignOutAlt } from '@fortawesome/free-solid-svg-icons'
|
import { faSignOutAlt } from '@fortawesome/free-solid-svg-icons'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user