diff --git a/.github/workflows/blank.yml b/.github/workflows/deploy.yml similarity index 100% rename from .github/workflows/blank.yml rename to .github/workflows/deploy.yml diff --git a/src/assets/reset.svg b/src/assets/reset.svg new file mode 100644 index 0000000..aaa046f --- /dev/null +++ b/src/assets/reset.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/assets/stop.svg b/src/assets/stop.svg new file mode 100644 index 0000000..e00085a --- /dev/null +++ b/src/assets/stop.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/TheCategoryBar.vue b/src/components/TheCategoryBar.vue index 4cc0df7..38298b5 100644 --- a/src/components/TheCategoryBar.vue +++ b/src/components/TheCategoryBar.vue @@ -84,9 +84,7 @@ export default { }, }, computed: { - ...mapState({ - categories: (state) => state.categories, - }), + ...mapState(['categories']), }, }; @@ -104,6 +102,7 @@ export default { align-items: center; padding: 0 64px; box-sizing: border-box; + z-index: 900; .add-category { color: $darker; diff --git a/src/router/index.js b/src/router/index.js index 3094ab3..1ad5e15 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,14 +7,6 @@ const routes = [ name: 'Home', component: Home, }, - // { - // path: '/about', - // name: 'About', - // // route level code-splitting - // // this generates a separate chunk (about.[hash].js) for this route - // // which is lazy-loaded when the route is visited. - // component: () => import(/* webpackChunkName: "about" */ '../views/About.vue'), - // }, ]; const router = createRouter({ diff --git a/src/scss/style.scss b/src/scss/style.scss index 3a79d8a..14517c9 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -17,6 +17,7 @@ border: none; border-radius: 16px; font-size: 16px; + cursor: pointer; &::placeholder { color: $dark; diff --git a/src/store/index.js b/src/store/index.js index a082c5d..47e7c72 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,6 +52,9 @@ export default createStore({ removeTask(state, name) { state.tasks = state.tasks.filter((task) => task.name !== name); }, + removeAllTasks(state) { + state.tasks = []; + }, startTask(state, name) { state.tasks = state.tasks.map((task) => { const newTask = task; diff --git a/src/views/Home/CategoryDropdown.vue b/src/views/Home/CategoryDropdown.vue deleted file mode 100644 index 72c5bf9..0000000 --- a/src/views/Home/CategoryDropdown.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - Assign Category - - {{ category }} - - - - - - - diff --git a/src/views/Home/GlobalTaskControls.vue b/src/views/Home/GlobalTaskControls.vue new file mode 100644 index 0000000..59ba6a7 --- /dev/null +++ b/src/views/Home/GlobalTaskControls.vue @@ -0,0 +1,143 @@ + + + + + Total + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 888a1f1..11ece53 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,6 +1,7 @@ + @@ -9,12 +10,14 @@ import { mapState, mapMutations } from 'vuex'; import TheCategoryBar from '@/components/TheCategoryBar.vue'; +import GlobalTaskControls from './GlobalTaskControls.vue'; import TheTaskList from './TheTaskList.vue'; export default { name: 'Home', components: { TheCategoryBar, + GlobalTaskControls, TheTaskList, }, data() { diff --git a/src/views/Home/RemoveAllModal.vue b/src/views/Home/RemoveAllModal.vue new file mode 100644 index 0000000..8f79b16 --- /dev/null +++ b/src/views/Home/RemoveAllModal.vue @@ -0,0 +1,55 @@ + + + Are you sure you want to delete all of your tasks? + + + + Cancel + + + Delete + + + + + + + + diff --git a/src/views/Home/ResetAllModal.vue b/src/views/Home/ResetAllModal.vue new file mode 100644 index 0000000..ed905f7 --- /dev/null +++ b/src/views/Home/ResetAllModal.vue @@ -0,0 +1,55 @@ + + + Are you sure you want to reset all of your tasks to 0? + + + + Cancel + + + Reset + + + + + + + + diff --git a/src/views/Home/Task.vue b/src/views/Home/Task.vue index cc16cfc..4f2d55e 100644 --- a/src/views/Home/Task.vue +++ b/src/views/Home/Task.vue @@ -1,8 +1,9 @@ - - - {{ formattedTime }} - + + @@ -44,10 +45,12 @@ + +