From 4e5d14d969cd21557c3aa4b50f53815417e1d2c0 Mon Sep 17 00:00:00 2001 From: konrad Date: Sun, 24 Nov 2019 13:16:24 +0000 Subject: [PATCH] Task Detail View (#37) --- package.json | 3 +- src/components/global/easymde.vue | 92 ++++ src/components/global/user.vue | 48 +++ src/components/tasks/ShowListTasks.vue | 27 +- src/components/tasks/ShowTasks.vue | 18 +- src/components/tasks/TaskDetailView.vue | 381 +++++++++++++++++ src/components/tasks/edit-task.vue | 402 ++---------------- src/components/tasks/gantt-component.vue | 14 +- src/components/tasks/reusable/attachments.vue | 192 +++++++++ .../tasks/reusable/editAssignees.vue | 135 ++++++ src/components/tasks/reusable/editLabels.vue | 155 +++++++ .../tasks/reusable/percentDoneSelect.vue | 49 +++ .../tasks/reusable/priorityLabel.vue | 32 ++ .../tasks/reusable/prioritySelect.vue | 47 ++ .../tasks/reusable/relatedTasks.vue | 192 +++++++++ src/components/tasks/reusable/reminders.vue | 96 +++++ src/components/tasks/reusable/repeatAfter.vue | 61 +++ src/main.js | 16 + src/models/attachment.js | 21 + src/models/file.js | 32 ++ src/models/task.js | 12 +- src/models/taskAssignee.js | 11 + src/router/index.js | 8 +- src/services/abstractService.js | 33 +- src/services/attachment.js | 85 ++++ src/services/label.js | 2 +- src/services/task.js | 8 + src/services/taskAssignee.js | 15 + src/services/taskRelation.js | 2 +- src/styles/_animations.scss | 66 +++ src/styles/_multiselect.scss | 6 + src/styles/attachments.scss | 48 +++ src/styles/reminders.scss | 28 ++ src/styles/task.scss | 185 ++++++++ src/styles/taskRelations.scss | 39 ++ src/styles/tasks.scss | 63 +-- src/styles/theme.scss | 27 +- src/vikunja.scss | 5 + yarn.lock | 75 ++-- 39 files changed, 2228 insertions(+), 503 deletions(-) create mode 100644 src/components/global/easymde.vue create mode 100644 src/components/global/user.vue create mode 100644 src/components/tasks/TaskDetailView.vue create mode 100644 src/components/tasks/reusable/attachments.vue create mode 100644 src/components/tasks/reusable/editAssignees.vue create mode 100644 src/components/tasks/reusable/editLabels.vue create mode 100644 src/components/tasks/reusable/percentDoneSelect.vue create mode 100644 src/components/tasks/reusable/priorityLabel.vue create mode 100644 src/components/tasks/reusable/prioritySelect.vue create mode 100644 src/components/tasks/reusable/relatedTasks.vue create mode 100644 src/components/tasks/reusable/reminders.vue create mode 100644 src/components/tasks/reusable/repeatAfter.vue create mode 100644 src/models/attachment.js create mode 100644 src/models/file.js create mode 100644 src/models/taskAssignee.js create mode 100644 src/services/attachment.js create mode 100644 src/services/taskAssignee.js create mode 100644 src/styles/_animations.scss create mode 100644 src/styles/attachments.scss create mode 100644 src/styles/reminders.scss create mode 100644 src/styles/task.scss create mode 100644 src/styles/taskRelations.scss diff --git a/package.json b/package.json index 15f69e0b8..7de89c09c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "v-tooltip": "^2.0.0-rc.33", "verte": "^0.0.12", "vue": "^2.5.17", - "vue-drag-resize": "^1.3.2" + "vue-drag-resize": "^1.3.2", + "vue-easymde": "^1.0.1" }, "devDependencies": { "@fortawesome/fontawesome-svg-core": "^1", diff --git a/src/components/global/easymde.vue b/src/components/global/easymde.vue new file mode 100644 index 000000000..6af31da79 --- /dev/null +++ b/src/components/global/easymde.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/components/global/user.vue b/src/components/global/user.vue new file mode 100644 index 000000000..53f491340 --- /dev/null +++ b/src/components/global/user.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/tasks/ShowListTasks.vue b/src/components/tasks/ShowListTasks.vue index bdaa6477b..676e8dfe7 100644 --- a/src/components/tasks/ShowListTasks.vue +++ b/src/components/tasks/ShowListTasks.vue @@ -23,7 +23,7 @@
- + + +
@@ -90,7 +80,7 @@ import ListModel from '../../models/list' import EditTask from './edit-task' import TaskModel from '../../models/task' - import priorities from '../../models/priorities' + import PriorityLabel from './reusable/priorityLabel' export default { data() { @@ -102,10 +92,10 @@ isTaskEdit: false, taskEditTask: TaskModel, newTaskText: '', - priorities: {}, } }, components: { + PriorityLabel, EditTask, }, props: { @@ -122,7 +112,6 @@ created() { this.listService = new ListService() this.taskService = new TaskService() - this.priorities = priorities this.taskEditTask = null this.isTaskEdit = false }, diff --git a/src/components/tasks/ShowTasks.vue b/src/components/tasks/ShowTasks.vue index 5e6c6b027..e06e03862 100644 --- a/src/components/tasks/ShowTasks.vue +++ b/src/components/tasks/ShowTasks.vue @@ -22,17 +22,7 @@ {{l.text}} - Due on {{formatUnixDate(l.dueDate)}} - - - - - - - - - - - +
@@ -43,16 +33,18 @@ import router from '../../router' import message from '../../message' import TaskService from '../../services/task' - import priorities from '../../models/priorities' + import PriorityLabel from './reusable/priorityLabel' export default { name: "ShowTasks", + components: { + PriorityLabel + }, data() { return { tasks: [], hasUndoneTasks: false, taskService: TaskService, - priorities: priorities, } }, props: { diff --git a/src/components/tasks/TaskDetailView.vue b/src/components/tasks/TaskDetailView.vue new file mode 100644 index 000000000..c104b13e6 --- /dev/null +++ b/src/components/tasks/TaskDetailView.vue @@ -0,0 +1,381 @@ + + + diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue index 0bbb535df..33a5ed5ec 100644 --- a/src/components/tasks/edit-task.vue +++ b/src/components/tasks/edit-task.vue @@ -17,23 +17,7 @@
Reminder Dates -
- - - - - -
+
@@ -80,58 +64,20 @@
-
-
- -
-
-
- -
-
-
+
-
- -
+
-
- -
+
@@ -163,128 +109,22 @@
- - - Oops! No user found. Consider changing the search query. - -
-
- - - - +
-
- -
-
- - - - -
-
- -
- -
- -
-
- - - No task found. Consider changing the search query. - -
-
-
-
-
- -
-
- -
-
+