diff --git a/package.json b/package.json index 15f69e0b80..7de89c09ca 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 0000000000..6af31da791 --- /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 0000000000..53f4913403 --- /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 bdaa6477bc..676e8dfe71 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 5e6c6b027c..e06e038626 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 0000000000..c104b13e63 --- /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 0bbb535dfd..33a5ed5ec4 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. - -
-
-
-
-
- -
-
- -
-
+