Hide hints on start page if a user has tasks (#159)
Format Add migration to Settings Merge branch 'master' into feature/hide-hints Hide hints on start page if a user has tasks Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/159
This commit is contained in:
parent
23e9d2d268
commit
98fb043e15
5 changed files with 50 additions and 18 deletions
|
@ -1,6 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="content has-text-centered">
|
<div class="content has-text-centered">
|
||||||
<h2>Hi {{userInfo.username}}!</h2>
|
<h2>Hi {{userInfo.username}}!</h2>
|
||||||
|
<template v-if="!hasTasks">
|
||||||
<p>Click on a list or namespace on the left to get started.</p>
|
<p>Click on a list or namespace on the left to get started.</p>
|
||||||
<router-link
|
<router-link
|
||||||
class="button is-primary is-right noshadow is-outlined"
|
class="button is-primary is-right noshadow is-outlined"
|
||||||
|
@ -9,6 +10,7 @@
|
||||||
>
|
>
|
||||||
Import your data into Vikunja
|
Import your data into Vikunja
|
||||||
</router-link>
|
</router-link>
|
||||||
|
</template>
|
||||||
<ShowTasks :show-all="true"/>
|
<ShowTasks :show-all="true"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -33,6 +35,7 @@
|
||||||
migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
|
migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
|
||||||
authenticated: state => state.auth.authenticated,
|
authenticated: state => state.auth.authenticated,
|
||||||
userInfo: state => state.auth.info,
|
userInfo: state => state.auth.info,
|
||||||
|
hasTasks: state => state.hasTasks,
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import TaskService from '../../services/task'
|
import TaskService from '../../services/task'
|
||||||
import SingleTaskInList from "./reusable/singleTaskInList";
|
import SingleTaskInList from './reusable/singleTaskInList'
|
||||||
|
import {HAS_TASKS} from '../../store/mutation-types'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ShowTasks',
|
name: 'ShowTasks',
|
||||||
|
@ -76,6 +77,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.$set(this, 'tasks', r.filter(t => !t.done))
|
this.$set(this, 'tasks', r.filter(t => !t.done))
|
||||||
|
this.$store.commit(HAS_TASKS, r.length > 0)
|
||||||
})
|
})
|
||||||
.catch(e => {
|
.catch(e => {
|
||||||
this.error(e, this)
|
this.error(e, this)
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
<div
|
<div
|
||||||
class="loader-container"
|
class="loader-container"
|
||||||
:class="{ 'is-loading': passwordUpdateService.loading || emailUpdateService.loading || totpService.loading }">
|
:class="{ 'is-loading': passwordUpdateService.loading || emailUpdateService.loading || totpService.loading }">
|
||||||
|
<!-- Password update -->
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<header class="card-header">
|
<header class="card-header">
|
||||||
<p class="card-header-title">
|
<p class="card-header-title">
|
||||||
|
@ -58,6 +59,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Update E-Mail -->
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<header class="card-header">
|
<header class="card-header">
|
||||||
<p class="card-header-title">
|
<p class="card-header-title">
|
||||||
|
@ -102,6 +105,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- TOTP -->
|
||||||
<div class="card" v-if="totpEnabled">
|
<div class="card" v-if="totpEnabled">
|
||||||
<header class="card-header">
|
<header class="card-header">
|
||||||
<p class="card-header-title">
|
<p class="card-header-title">
|
||||||
|
@ -166,6 +171,22 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="card" v-if="totpEnabled">
|
||||||
|
<header class="card-header">
|
||||||
|
<p class="card-header-title">
|
||||||
|
Migrate from other services to Vikunja
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
<div class="card-content">
|
||||||
|
<router-link
|
||||||
|
class="button is-primary is-right noshadow is-outlined"
|
||||||
|
:to="{name: 'migrateStart'}"
|
||||||
|
v-if="migratorsEnabled"
|
||||||
|
>
|
||||||
|
Import your data into Vikunja
|
||||||
|
</router-link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -212,7 +233,8 @@
|
||||||
this.totpStatus()
|
this.totpStatus()
|
||||||
},
|
},
|
||||||
computed: mapState({
|
computed: mapState({
|
||||||
totpEnabled: state => state.config.totpEnabled
|
totpEnabled: state => state.config.totpEnabled,
|
||||||
|
migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
|
||||||
}),
|
}),
|
||||||
methods: {
|
methods: {
|
||||||
updatePassword() {
|
updatePassword() {
|
||||||
|
|
|
@ -3,7 +3,7 @@ import Vuex from 'vuex'
|
||||||
|
|
||||||
Vue.use(Vuex)
|
Vue.use(Vuex)
|
||||||
|
|
||||||
import {CURRENT_LIST, ERROR_MESSAGE, IS_FULLPAGE, LOADING, ONLINE} from './mutation-types'
|
import {CURRENT_LIST, ERROR_MESSAGE, HAS_TASKS, IS_FULLPAGE, LOADING, ONLINE} from './mutation-types'
|
||||||
import config from './modules/config'
|
import config from './modules/config'
|
||||||
import auth from './modules/auth'
|
import auth from './modules/auth'
|
||||||
import namespaces from './modules/namespaces'
|
import namespaces from './modules/namespaces'
|
||||||
|
@ -29,6 +29,7 @@ export const store = new Vuex.Store({
|
||||||
// This is used to highlight the current list in menu for all list related views
|
// This is used to highlight the current list in menu for all list related views
|
||||||
currentList: {id: 0},
|
currentList: {id: 0},
|
||||||
background: '',
|
background: '',
|
||||||
|
hasTasks: false,
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
[LOADING](state, loading) {
|
[LOADING](state, loading) {
|
||||||
|
@ -87,5 +88,8 @@ export const store = new Vuex.Store({
|
||||||
|
|
||||||
state.currentList = currentList
|
state.currentList = currentList
|
||||||
},
|
},
|
||||||
|
[HAS_TASKS](state, hasTasks) {
|
||||||
|
state.hasTasks = hasTasks
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
|
@ -3,6 +3,7 @@ export const ERROR_MESSAGE = 'errorMessage'
|
||||||
export const ONLINE = 'online'
|
export const ONLINE = 'online'
|
||||||
export const IS_FULLPAGE = 'isFullpage'
|
export const IS_FULLPAGE = 'isFullpage'
|
||||||
export const CURRENT_LIST = 'currentList'
|
export const CURRENT_LIST = 'currentList'
|
||||||
|
export const HAS_TASKS = 'hasTasks'
|
||||||
|
|
||||||
export const CONFIG = 'config'
|
export const CONFIG = 'config'
|
||||||
export const AUTH = 'auth'
|
export const AUTH = 'auth'
|
||||||
|
|
Loading…
Reference in a new issue