forked from vikunja/frontend
Fix nesting to show warning if list not set.
Cleanup comments Cleanup user settings Move default list id to computed
This commit is contained in:
parent
657f572471
commit
f39a4d76da
|
@ -1,32 +1,34 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="field is-grouped" v-if="validListIdAvailable">
|
<div class="field is-grouped" >
|
||||||
<p
|
<div v-if="validListIdAvailable">
|
||||||
:class="{ 'is-loading': taskService.loading }"
|
<p
|
||||||
class="control has-icons-left is-expanded"
|
:class="{ 'is-loading': taskService.loading }"
|
||||||
>
|
class="control has-icons-left is-expanded"
|
||||||
<input
|
|
||||||
:class="{ disabled: taskService.loading }"
|
|
||||||
@keyup.enter="addTask()"
|
|
||||||
class="input"
|
|
||||||
placeholder="Add a new task..."
|
|
||||||
type="text"
|
|
||||||
v-focus
|
|
||||||
v-model="newTaskText"
|
|
||||||
ref="newTaskInput"
|
|
||||||
/>
|
|
||||||
<span class="icon is-small is-left">
|
|
||||||
<icon icon="tasks" />
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p class="control">
|
|
||||||
<x-button
|
|
||||||
:disabled="newTaskText.length === 0"
|
|
||||||
@click="addTask()"
|
|
||||||
icon="plus"
|
|
||||||
>
|
>
|
||||||
Add
|
<input
|
||||||
</x-button>
|
:class="{ disabled: taskService.loading }"
|
||||||
</p>
|
@keyup.enter="addTask()"
|
||||||
|
class="input"
|
||||||
|
placeholder="Add a new task..."
|
||||||
|
type="text"
|
||||||
|
v-focus
|
||||||
|
v-model="newTaskText"
|
||||||
|
ref="newTaskInput"
|
||||||
|
/>
|
||||||
|
<span class="icon is-small is-left">
|
||||||
|
<icon icon="tasks" />
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
<p class="control">
|
||||||
|
<x-button
|
||||||
|
:disabled="newTaskText.length === 0"
|
||||||
|
@click="addTask()"
|
||||||
|
icon="plus"
|
||||||
|
>
|
||||||
|
Add
|
||||||
|
</x-button>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
<p class="help is-warning" v-if="!validListIdAvailable">
|
<p class="help is-warning" v-if="!validListIdAvailable">
|
||||||
No default list set. Please go to settings and specify default list.
|
No default list set. Please go to settings and specify default list.
|
||||||
</p>
|
</p>
|
||||||
|
@ -38,7 +40,6 @@ import LabelTask from '../../models/labelTask'
|
||||||
import LabelModel from '../../models/label'
|
import LabelModel from '../../models/label'
|
||||||
|
|
||||||
import { HAS_TASKS } from '@/store/mutation-types'
|
import { HAS_TASKS } from '@/store/mutation-types'
|
||||||
// import Nothing from "@/components/misc/nothing";
|
|
||||||
|
|
||||||
import ListService from '../../services/list'
|
import ListService from '../../services/list'
|
||||||
import TaskService from '../../services/task'
|
import TaskService from '../../services/task'
|
||||||
|
@ -59,7 +60,6 @@ export default {
|
||||||
validListIdAvailable: false,
|
validListIdAvailable: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {},
|
|
||||||
props: {
|
props: {
|
||||||
listId: {
|
listId: {
|
||||||
type: Number,
|
type: Number,
|
||||||
|
|
|
@ -88,6 +88,9 @@ export default {
|
||||||
}
|
}
|
||||||
return 'Shared Lists'
|
return 'Shared Lists'
|
||||||
},
|
},
|
||||||
|
handleInput (e) {
|
||||||
|
this.$emit('input', this.content)
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -9,7 +9,7 @@ export default class UserSettingsModel extends AbstractModel {
|
||||||
discoverableByName: false,
|
discoverableByName: false,
|
||||||
discoverableByEmail: false,
|
discoverableByEmail: false,
|
||||||
overdueTasksRemindersEnabled: true,
|
overdueTasksRemindersEnabled: true,
|
||||||
defaultListId: 1,
|
defaultListId: undefined,
|
||||||
weekStart: 0,
|
weekStart: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,13 +49,9 @@ export default {
|
||||||
loading: false,
|
loading: false,
|
||||||
currentDate: new Date(),
|
currentDate: new Date(),
|
||||||
tasks: [],
|
tasks: [],
|
||||||
defaultListId: undefined,
|
|
||||||
showTasksKey: 0,
|
showTasksKey: 0,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
//TODO: Load the value from user settings. Until then it will not render the add task component.
|
|
||||||
},
|
|
||||||
computed: mapState({
|
computed: mapState({
|
||||||
migratorsEnabled: state =>
|
migratorsEnabled: state =>
|
||||||
state.config.availableMigrators !== null &&
|
state.config.availableMigrators !== null &&
|
||||||
|
@ -63,6 +59,7 @@ export default {
|
||||||
authenticated: state => state.auth.authenticated,
|
authenticated: state => state.auth.authenticated,
|
||||||
userInfo: state => state.auth.info,
|
userInfo: state => state.auth.info,
|
||||||
hasTasks: state => state.hasTasks,
|
hasTasks: state => state.hasTasks,
|
||||||
|
defaultListId: state => state.auth.defaultListId,
|
||||||
defaultNamespaceId: state => {
|
defaultNamespaceId: state => {
|
||||||
if (state.namespaces.namespaces.length === 0) {
|
if (state.namespaces.namespaces.length === 0) {
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in New Issue