diff --git a/README.md b/README.md index 2d42c37..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,24 +0,0 @@ -# worktime - -## Project setup -``` -npm install -``` - -### Compiles and hot-reloads for development -``` -npm run serve -``` - -### Compiles and minifies for production -``` -npm run build -``` - -### Lints and fixes files -``` -npm run lint -``` - -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/package-lock.json b/package-lock.json index 0c28667..cb02bd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,11 @@ "dependencies": { "core-js": "^3.6.5", "register-service-worker": "^1.7.1", + "reset-css": "^5.0.1", "vue": "^3.0.0", "vue-router": "^4.0.0-0", - "vuex": "^4.0.0-0" + "vuex": "^4.0.0-0", + "vuex-persist": "^3.1.3" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", @@ -12244,6 +12246,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "node_modules/reset-css": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/reset-css/-/reset-css-5.0.1.tgz", + "integrity": "sha512-VyuJdNFfp5x/W6e5wauJM59C02Vs0P22sxzZGhQMPaqu/NGTeFxlBFOOw3eq9vQd19gIDdZp7zi89ylyKOJ33Q==" + }, "node_modules/resolve": { "version": "1.20.0", "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz", @@ -14800,6 +14807,31 @@ "vue": "^3.0.2" } }, + "node_modules/vuex-persist": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vuex-persist/-/vuex-persist-3.1.3.tgz", + "integrity": "sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ==", + "dependencies": { + "deepmerge": "^4.2.2", + "flatted": "^3.0.5" + }, + "peerDependencies": { + "vuex": ">=2.5" + } + }, + "node_modules/vuex-persist/node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/vuex-persist/node_modules/flatted": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" + }, "node_modules/watchpack": { "version": "1.7.5", "resolved": "https://registry.nlark.com/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1621437900992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz", @@ -17767,7 +17799,8 @@ "version": "4.5.13", "resolved": "https://registry.nlark.com/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.13.tgz?cache=0&sync_timestamp=1623216431849&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcli-plugin-vuex%2Fdownload%2F%40vue%2Fcli-plugin-vuex-4.5.13.tgz", "integrity": "sha1-mGRti8HmnPbGpsui/tPqzgNWw2A=", - "dev": true + "dev": true, + "requires": {} }, "@vue/cli-service": { "version": "4.5.13", @@ -18029,7 +18062,8 @@ "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vue%2Fpreload-webpack-plugin%2Fdownload%2F%40vue%2Fpreload-webpack-plugin-1.1.2.tgz", "integrity": "sha1-zrkktOyzucQ4ccekKaAvhCPmIas=", - "dev": true + "dev": true, + "requires": {} }, "@vue/reactivity": { "version": "3.1.5", @@ -18276,7 +18310,8 @@ "version": "5.3.2", "resolved": "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz", "integrity": "sha1-ftW7VZCLOy8bxVxq8WU7rafweTc=", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "7.2.0", @@ -18306,13 +18341,15 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz?cache=0&sync_timestamp=1616886041666&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-errors%2Fdownload%2Fajv-errors-1.0.1.tgz", "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=", - "dev": true + "dev": true, + "requires": {} }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz", "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=", - "dev": true + "dev": true, + "requires": {} }, "alphanum-sort": { "version": "1.0.2", @@ -25219,13 +25256,15 @@ "version": "5.1.0", "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz?cache=0&sync_timestamp=1605801506037&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-5.1.0.tgz", "integrity": "sha1-xr5oWKvQE9do6YNmrkfiXViHsa4=", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-extract-imports": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz?cache=0&sync_timestamp=1602588177787&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-extract-imports%2Fdownload%2Fpostcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha1-zaHwR8CugMl9vijD52pDuIAldB0=", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -26116,6 +26155,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reset-css": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/reset-css/-/reset-css-5.0.1.tgz", + "integrity": "sha512-VyuJdNFfp5x/W6e5wauJM59C02Vs0P22sxzZGhQMPaqu/NGTeFxlBFOOw3eq9vQd19gIDdZp7zi89ylyKOJ33Q==" + }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz", @@ -28271,6 +28315,27 @@ "@vue/devtools-api": "^6.0.0-beta.11" } }, + "vuex-persist": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vuex-persist/-/vuex-persist-3.1.3.tgz", + "integrity": "sha512-QWOpP4SxmJDC5Y1+0+Yl/F4n7z27syd1St/oP+IYCGe0X0GFio0Zan6kngZFufdIhJm+5dFGDo3VG5kdkCGeRQ==", + "requires": { + "deepmerge": "^4.2.2", + "flatted": "^3.0.5" + }, + "dependencies": { + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, + "flatted": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" + } + } + }, "watchpack": { "version": "1.7.5", "resolved": "https://registry.nlark.com/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1621437900992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz", diff --git a/package.json b/package.json index eee4202..3c23f87 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,11 @@ "dependencies": { "core-js": "^3.6.5", "register-service-worker": "^1.7.1", + "reset-css": "^5.0.1", "vue": "^3.0.0", "vue-router": "^4.0.0-0", - "vuex": "^4.0.0-0" + "vuex": "^4.0.0-0", + "vuex-persist": "^3.1.3" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", diff --git a/src/App.vue b/src/App.vue index 3fa872e..0f8fd98 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,30 +1,18 @@ diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/assets/pause.svg b/src/assets/pause.svg new file mode 100644 index 0000000..5bb17c7 --- /dev/null +++ b/src/assets/pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/play.svg b/src/assets/play.svg new file mode 100644 index 0000000..c54977e --- /dev/null +++ b/src/assets/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/trash.svg b/src/assets/trash.svg new file mode 100644 index 0000000..c408094 --- /dev/null +++ b/src/assets/trash.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 087fb2c..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - diff --git a/src/components/TheCategoryBar.vue b/src/components/TheCategoryBar.vue new file mode 100644 index 0000000..95cabd6 --- /dev/null +++ b/src/components/TheCategoryBar.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/main.js b/src/main.js index 1c19fad..8db032b 100644 --- a/src/main.js +++ b/src/main.js @@ -4,4 +4,8 @@ import './registerServiceWorker'; import router from './router'; import store from './store'; -createApp(App).use(store).use(router).mount('#app'); +const app = createApp(App); + +app.use(store); +app.use(router); +app.mount('#app'); diff --git a/src/router/index.js b/src/router/index.js index 8f52523..3094ab3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHashHistory } from 'vue-router'; -import Home from '../views/Home.vue'; +import Home from '../views/Home/Index.vue'; const routes = [ { @@ -7,14 +7,14 @@ 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'), - }, + // { + // 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/_variables.scss b/src/scss/_variables.scss new file mode 100644 index 0000000..76e1a2c --- /dev/null +++ b/src/scss/_variables.scss @@ -0,0 +1,12 @@ +$dark-blue: #05263B; +$misty-blue: #AEB8C4; +$blue-grotto: #163B50; +$slate: #9CA6B8; + +$dark: $blue-grotto; +$darker: $dark-blue; +$light: $slate; +$lighter: $misty-blue; + + +$max-width: 1024px; \ No newline at end of file diff --git a/src/scss/style.scss b/src/scss/style.scss new file mode 100644 index 0000000..f6616cf --- /dev/null +++ b/src/scss/style.scss @@ -0,0 +1,24 @@ +@import 'reset-css'; + +#app { + font-family: Avenir, Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + color: $light; + background: $darker; + + padding-top: 48px; + + input, button { + border: none; + border-radius: 16px; + } + + .category { + border-radius: 16px; + padding: 4px 12px; + cursor: pointer; + color: $darker; + } +} \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index af6cee0..099ba7b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,12 +1,75 @@ import { createStore } from 'vuex'; +import VuexPersistence from 'vuex-persist'; + +const vuexLocal = new VuexPersistence({ + storage: window.localStorage, +}); export default createStore({ state: { + categories: [], + tasks: [], }, mutations: { + addCategory(state, category) { + if (category && !state.categories.includes(category)) { + state.categories = [...state.categories, category]; + } + }, + removeCategory(state, category) { + state.categories = state.categories.filter((element) => element !== category); + }, + + addTask(state, name) { + if (name) { + const task = { + name, + startedAt: undefined, + running: false, + totalTime: 0, + category: undefined, + }; + state.tasks = [...state.tasks, task]; + } + }, + removeTask(state, name) { + state.tasks = state.tasks.filter((task) => task.name !== name); + }, + startTask(state, name) { + state.tasks = state.tasks.map((task) => { + const newTask = task; + if (newTask.name === name) { + newTask.running = true; + newTask.startedAt = Date.now(); + } else if (newTask.running) { + newTask.running = false; + newTask.totalTime += Date.now() - newTask.startedAt; + newTask.startedAt = undefined; + } + return newTask; + }); + }, + stopTask(state, name) { + state.tasks = state.tasks.map((task) => { + const newTask = task; + if (newTask.name === name) { + newTask.running = false; + newTask.totalTime += Date.now() - newTask.startedAt; + newTask.startedAt = undefined; + } + return newTask; + }); + }, + + assignCategory(state, { name, category }) { + state.tasks = state.tasks.map((task) => { + const newTask = task; + if (newTask.name === name) { + newTask.category = category; + } + return newTask; + }); + }, }, - actions: { - }, - modules: { - }, + plugins: [vuexLocal.plugin], }); diff --git a/src/stringToColor.js b/src/stringToColor.js new file mode 100644 index 0000000..2221f05 --- /dev/null +++ b/src/stringToColor.js @@ -0,0 +1,20 @@ +/* eslint-disable */ +export default function stringToColor(str) { + var colors = ['#FF6633', '#FFB399', '#FF33FF', '#FFFF99', '#00B3E6', + '#3366E6', '#99FF99', '#B34D4D', '#80B300', '#E6B3B3', + '#6680B3', '#66991A', '#FF99E6', '#CCFF1A', '#FF1A66', + '#E6331A', '#33FFCC', '#B366CC', '#CC80CC', '#991AFF', + '#E666FF', '#4DB3FF', '#1AB399', '#E666B3', '#CC9999', + '#B3B31A', '#00E680', '#E6FF80', '#1AFF33', '#FF3380', + '#CCCC00', '#66E64D', '#4D80CC', '#E64D66', '#4DB380', + '#FF4D4D', '#99E6E6', '#6666FF']; + + var hash = 0; + if (str.length === 0) return hash; + for (var i = 0; i < str.length; i++) { + hash = str.charCodeAt(i) + ((hash << 5) - hash); + hash = hash & hash; + } + hash = ((hash % colors.length) + colors.length) % colors.length; + return colors[hash]; +} \ No newline at end of file diff --git a/src/views/About.vue b/src/views/About.vue deleted file mode 100644 index 3fa2807..0000000 --- a/src/views/About.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/Home.vue b/src/views/Home.vue deleted file mode 100644 index e91ef23..0000000 --- a/src/views/Home.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/views/Home/CategoryDropdown.vue b/src/views/Home/CategoryDropdown.vue new file mode 100644 index 0000000..2502d2d --- /dev/null +++ b/src/views/Home/CategoryDropdown.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue new file mode 100644 index 0000000..7d58972 --- /dev/null +++ b/src/views/Home/Index.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/views/Home/Task.vue b/src/views/Home/Task.vue new file mode 100644 index 0000000..0b6803d --- /dev/null +++ b/src/views/Home/Task.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/views/Home/TheTaskList.vue b/src/views/Home/TheTaskList.vue new file mode 100644 index 0000000..9a7ff65 --- /dev/null +++ b/src/views/Home/TheTaskList.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..815adda --- /dev/null +++ b/vue.config.js @@ -0,0 +1,11 @@ +module.exports = { + css: { + loaderOptions: { + sass: { + prependData: ` + @import "@/scss/_variables.scss"; + `, + }, + }, + }, +};