From aa662b8a0d42ad7c8e4525e015fd343b7c6446ee Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 25 Dec 2018 22:57:22 +0100 Subject: [PATCH 1/4] Added taskoverview component --- public/images/cool.svg | 188 +++++++++++++++++++++++++++++ src/components/Home.vue | 67 +--------- src/components/lists/ShowTasks.vue | 108 +++++++++++++++++ src/main.js | 5 + 4 files changed, 307 insertions(+), 61 deletions(-) create mode 100644 public/images/cool.svg create mode 100644 src/components/lists/ShowTasks.vue diff --git a/public/images/cool.svg b/public/images/cool.svg new file mode 100644 index 000000000..859852978 --- /dev/null +++ b/public/images/cool.svg @@ -0,0 +1,188 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/components/Home.vue b/src/components/Home.vue index 32c65f444..2cc26e02a 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -2,35 +2,17 @@

Hi {{user.infos.username}}!

Click on a list or namespace on the left to get started.

-

Loading tasks...

-

Current tasks

-
-
- -
-
+ +
- - \ No newline at end of file diff --git a/src/components/lists/ShowTasks.vue b/src/components/lists/ShowTasks.vue new file mode 100644 index 000000000..77b2ec2c3 --- /dev/null +++ b/src/components/lists/ShowTasks.vue @@ -0,0 +1,108 @@ + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 2017e9ab3..c90a96f94 100644 --- a/src/main.js +++ b/src/main.js @@ -7,6 +7,11 @@ import auth from './auth' import Modal from './components/modal/Modal' Vue.component('modal', Modal) +// Register the task overview component +import TaskOverview from './components/lists/ShowTasks' +Vue.component('TaskOverview', TaskOverview) + +// Add CSS import './vikunja.scss' Vue.config.productionTip = false -- 2.45.1 From 2f4e8078d12aacc06ed66b94c962332f735915b7 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 25 Dec 2018 23:30:12 +0100 Subject: [PATCH 2/4] Added views to get tasks for next moth and next week --- src/App.vue | 17 ++++++++++ src/components/Home.vue | 4 --- src/components/lists/ShowTasks.vue | 24 +++++++------ src/components/lists/ShowTasksInRange.vue | 41 +++++++++++++++++++++++ src/router/index.js | 6 ++++ 5 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 src/components/lists/ShowTasksInRange.vue diff --git a/src/App.vue b/src/App.vue index 78588047a..fa842854b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -35,6 +35,22 @@ Overview +
  • + + + + + Next Month + +
  • +
  • + + + + + Next Week + +
  • @@ -115,6 +131,7 @@ namespaces: [], mobileMenuActive: false, fullpage: false, + currentDate: new Date(), } }, beforeMount() { diff --git a/src/components/Home.vue b/src/components/Home.vue index 2cc26e02a..7a77deb13 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -2,10 +2,6 @@

    Hi {{user.infos.username}}!

    Click on a list or namespace on the left to get started.

    -
    diff --git a/src/components/lists/ShowTasks.vue b/src/components/lists/ShowTasks.vue index 77b2ec2c3..5ecfc8a2e 100644 --- a/src/components/lists/ShowTasks.vue +++ b/src/components/lists/ShowTasks.vue @@ -1,11 +1,9 @@