-
-
-
- {{ date }}
-
-
- mdi-magnify-minus-outline
-
-
- mdi-magnify-plus-outline
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/client/src/components/TaskPanel.vue b/client/src/components/TaskPanel.vue
index 0f9bb85..8210abe 100644
--- a/client/src/components/TaskPanel.vue
+++ b/client/src/components/TaskPanel.vue
@@ -1,91 +1,79 @@
-
-
-
-
-
-
-
-
-
- Cancel
- OK
-
-
-
-
- {{ remainingTasks }} Task(s) to complete
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{ remainingTasks }} Task(s) to complete
+
+
+
+
+
+ {{ date }}
+
\ No newline at end of file
diff --git a/client/src/main.js b/client/src/main.js
index e7a3203..0df1b90 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -2,12 +2,12 @@ import Vue from 'vue'
import App from './App.vue'
import router from './router'
import store from './store'
-import vuetify from './plugins/vuetify'
import { A_AUTH_CHECK } from './store/actions.type'
import ApiService from './common/api.service'
import JwtService from '@/common/jwt.service'
import ErrorFilter from './common/error.filter'
+import './quasar'
Vue.config.productionTip = false
Vue.filter('error', ErrorFilter)
@@ -26,8 +26,19 @@ router.beforeEach((to, from, next) =>
Promise.all([store.dispatch(A_AUTH_CHECK)]).then(next),
)
+Vue.mixin({
+ methods: {
+ dateSpread(startDate) {
+ return Array.from(Array(7).keys()).map(num =>
+ new Date(new Date(startDate).getTime() + num * 86400000)
+ .toISOString()
+ .substring(0, 10),
+ )
+ },
+ },
+})
+
new Vue({
- vuetify,
router,
store,
render: h => h(App),
diff --git a/client/src/plugins/vuetify.js b/client/src/plugins/vuetify.js
deleted file mode 100644
index d4ee51b..0000000
--- a/client/src/plugins/vuetify.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Vue from 'vue'
-import Vuetify from 'vuetify/lib'
-
-Vue.use(Vuetify)
-
-export default new Vuetify({
- theme: {
- themes: {
- light: {
- primary: '#8D9D90',
- secondary: '#424242',
- accent: '#82B1FF',
- error: '#FF5252',
- info: '#2196F3',
- success: '#4CAF50',
- warning: '#FFC107',
- },
- },
- },
- icons: {
- iconfont: 'mdiSvg',
- },
-})
diff --git a/client/src/quasar.js b/client/src/quasar.js
new file mode 100644
index 0000000..572f76f
--- /dev/null
+++ b/client/src/quasar.js
@@ -0,0 +1,21 @@
+import Vue from 'vue'
+
+import './styles/quasar.sass'
+import iconSet from 'quasar/icon-set/material-icons-outlined.js'
+import '@quasar/extras/roboto-font/roboto-font.css'
+import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'
+import { Quasar, Notify } from 'quasar'
+
+Vue.use(Quasar, {
+ config: {},
+ components: {
+ /* not needed if importStrategy is not 'manual' */
+ },
+ directives: {
+ /* not needed if importStrategy is not 'manual' */
+ },
+ plugins: {
+ Notify,
+ },
+ iconSet: iconSet,
+})
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 8b7d77d..c258ef3 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -10,6 +10,11 @@ export default new Router({
name: 'home',
component: () => import('@/views/Home'),
},
+ {
+ path: '/stats',
+ name: 'stats',
+ component: () => import('@/views/Stats'),
+ },
{
path: '/register',
name: 'register',
diff --git a/client/src/store/actions.type b/client/src/store/actions.type
index 0f1fc2f..a4ef91f 100644
--- a/client/src/store/actions.type
+++ b/client/src/store/actions.type
@@ -8,3 +8,6 @@ export const A_TASK_UPDATE = "actionTaskUpdate";
export const A_TASK_DELETE = "actionTaskDelete";
export const A_TASK_TIMER_START = "actionTaskTimerStart";
export const A_TASK_TIMER_STOP = "actionTaskTimerStop";
+export const A_TASK_REORDER = "actionTaskReorder";
+export const A_STATS_RETRIEVE = "actionStatsRetrieve";
+
diff --git a/client/src/store/home.module.js b/client/src/store/home.module.js
index 2a88c79..8978713 100644
--- a/client/src/store/home.module.js
+++ b/client/src/store/home.module.js
@@ -6,6 +6,7 @@ import {
A_TASK_UPDATE,
A_TASK_TIMER_START,
A_TASK_TIMER_STOP,
+ A_TASK_REORDER,
} from './actions.type'
import {
M_ERROR_SET,
@@ -36,6 +37,17 @@ const actions = {
})
})
},
+ [A_TASK_REORDER](context, tasks) {
+ return new Promise(resolve => {
+ ApiService.put(`tasks/reorder`, tasks)
+ .then(({ data }) => {
+ resolve(data)
+ })
+ .catch(({ response }) => {
+ context.commit(M_ERROR_SET, response.data.errors)
+ })
+ })
+ },
[A_TASK_CREATE](context, task) {
return new Promise(resolve => {
ApiService.post('tasks', task)
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 2ddb4ee..aba6aae 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -3,6 +3,9 @@ import Vuex from 'vuex'
import auth from './auth.module'
import home from './home.module'
+import stats from './stats.module'
+
+import { getField, updateField } from 'vuex-map-fields'
Vue.use(Vuex)
@@ -10,5 +13,12 @@ export default new Vuex.Store({
modules: {
auth,
home,
+ stats,
+ },
+ getters: {
+ getField,
+ },
+ mutations: {
+ updateField,
},
})
diff --git a/client/src/store/mutations.type b/client/src/store/mutations.type
index f125531..e3fecda 100644
--- a/client/src/store/mutations.type
+++ b/client/src/store/mutations.type
@@ -7,3 +7,4 @@ export const M_TASK_UPDATE = "mutationTaskUpdate";
export const M_TASK_DELETE = "mutationTaskDelete";
export const M_CONTROL_ZOOM_ENABLE = "mutationControlZoomEnable";
export const M_CONTROL_ZOOM_DISABLE = "mutationControlZoomDisable";
+export const M_STATS_RETRIEVE = "mutationStatsRetrieve";
\ No newline at end of file
diff --git a/client/src/store/stats.module.js b/client/src/store/stats.module.js
new file mode 100644
index 0000000..373f587
--- /dev/null
+++ b/client/src/store/stats.module.js
@@ -0,0 +1,38 @@
+import ApiService from '@/common/api.service'
+import { A_STATS_RETRIEVE } from './actions.type'
+import { M_STATS_RETRIEVE, M_ERROR_SET } from './mutations.type'
+
+const state = {
+ errors: null,
+ stats: {},
+}
+
+const actions = {
+ [A_STATS_RETRIEVE](context) {
+ return new Promise(resolve => {
+ ApiService.get('stats')
+ .then(({ data }) => {
+ context.commit(M_STATS_RETRIEVE, data)
+ resolve(data)
+ })
+ .catch(({ response }) => {
+ context.commit(M_ERROR_SET, response.data.errors)
+ })
+ })
+ },
+}
+
+const mutations = {
+ [M_ERROR_SET](state, error) {
+ state.errors = error
+ },
+ [M_STATS_RETRIEVE](state, stats) {
+ state.stats = stats
+ },
+}
+
+export default {
+ state,
+ actions,
+ mutations,
+}
diff --git a/client/src/styles/quasar.sass b/client/src/styles/quasar.sass
new file mode 100644
index 0000000..f295a6b
--- /dev/null
+++ b/client/src/styles/quasar.sass
@@ -0,0 +1,2 @@
+@import './quasar.variables.sass'
+@import '~quasar-styl'
diff --git a/client/src/styles/quasar.variables.sass b/client/src/styles/quasar.variables.sass
new file mode 100644
index 0000000..954e06f
--- /dev/null
+++ b/client/src/styles/quasar.variables.sass
@@ -0,0 +1,15 @@
+// It's highly recommended to change the default colors
+// to match your app's branding.
+
+$primary : #027BE3
+$secondary : #26A69A
+$accent : #9C27B0
+
+$dark : #1D1D1D
+
+$positive : #21BA45
+$negative : #C10015
+$info : #31CCEC
+$warning : #F2C037
+
+// @import '~quasar-variables-styl'
diff --git a/client/src/views/Home.vue b/client/src/views/Home.vue
index c7f9a90..db4b008 100644
--- a/client/src/views/Home.vue
+++ b/client/src/views/Home.vue
@@ -1,12 +1,6 @@
-
- {{ k }} {{ v }}
-
- Close
-
-
\ No newline at end of file
diff --git a/client/src/views/Login.vue b/client/src/views/Login.vue
index 6cc17b6..3b8f715 100644
--- a/client/src/views/Login.vue
+++ b/client/src/views/Login.vue
@@ -1,59 +1,49 @@
-
-
-
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
-
- Login
-
-
-
-
- If you don't yet have an account, please
- Register
-
-
-
-
-
-
- {{ k }} {{ v }}
-
- Close
-
-
-
Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Login
+
+
+
+
+ If you don't yet have an account, please
+ Register
+
+
-
+
\ No newline at end of file
diff --git a/client/vue.config.js b/client/vue.config.js
index d4d5336..37d58e9 100644
--- a/client/vue.config.js
+++ b/client/vue.config.js
@@ -1,3 +1,10 @@
module.exports = {
- transpileDependencies: ['vuetify'],
+ transpileDependencies: ['quasar'],
+
+ pluginOptions: {
+ quasar: {
+ importStrategy: 'kebab',
+ rtlSupport: false,
+ },
+ },
}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..4c4a78d
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,19 @@
+{
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "sortablejs": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+ "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+ },
+ "vuedraggable": {
+ "version": "2.24.1",
+ "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.1.tgz",
+ "integrity": "sha512-G1fxO1oshx+WLdieSGl6jSJdlHOQFga1FpjuUpgXldbpKNzxpjsGn4xYNnRHVrOAqm8aG5FfpdQlh5LHesxCeA==",
+ "requires": {
+ "sortablejs": "^1.10.1"
+ }
+ }
+ }
+}
diff --git a/server/models/Task.js b/server/models/Task.js
index d8faf3d..692c732 100644
--- a/server/models/Task.js
+++ b/server/models/Task.js
@@ -11,7 +11,9 @@ var TaskSchema = new mongoose.Schema(
date: {
type: String,
default: new Date().toISOString().substring(0, 10),
+ required: [true, "can't be blank"],
},
+ order: { type: mongoose.Schema.Types.Number, default: 0 },
},
{ timestamps: true },
)
diff --git a/server/package-lock.json b/server/package-lock.json
index 9527afa..1c2175b 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1572,10 +1572,9 @@
"dev": true
},
"lodash": {
- "version": "4.17.19",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
- "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
- "dev": true
+ "version": "4.17.20",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
},
"lodash.clonedeep": {
"version": "4.5.0",
@@ -1927,6 +1926,12 @@
"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -2174,6 +2179,12 @@
"safer-buffer": ">= 2.1.2 < 3.0.0"
}
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -2202,6 +2213,12 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -2307,6 +2324,12 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -2346,6 +2369,12 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"tough-cookie": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
@@ -3127,6 +3156,12 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true
},
+ "lodash": {
+ "version": "4.17.19",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+ "dev": true
+ },
"uuid": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
diff --git a/server/package.json b/server/package.json
index a636abe..d650ed3 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,7 +1,7 @@
{
- "name": "conduit-node",
- "version": "1.0.0",
- "description": "conduit on node",
+ "name": "clear-habits-server",
+ "version": "0.3.0",
+ "description": "Clear Habits Server",
"main": "app.js",
"scripts": {
"mongo:start": "docker run --name realworld-mongo -p 27017:27017 mongo & sleep 5",
@@ -25,6 +25,7 @@
"express-jwt": "6.0.0",
"express-session": "1.17.1",
"jsonwebtoken": "8.5.1",
+ "lodash": "^4.17.20",
"method-override": "3.0.0",
"methods": "1.1.2",
"mongoose": "5.10.0",
diff --git a/server/routes/api/index.js b/server/routes/api/index.js
index 95c29a2..4b26b62 100644
--- a/server/routes/api/index.js
+++ b/server/routes/api/index.js
@@ -2,6 +2,7 @@ var router = require('express').Router()
router.use('/', require('./users'))
router.use('/tasks', require('./tasks'))
+router.use('/stats', require('./stats'))
router.use(function (err, req, res, next) {
if (err.name === 'ValidationError') {
diff --git a/server/routes/api/stats.js b/server/routes/api/stats.js
new file mode 100644
index 0000000..b8d13f0
--- /dev/null
+++ b/server/routes/api/stats.js
@@ -0,0 +1,31 @@
+var mongoose = require('mongoose')
+var router = require('express').Router()
+var User = mongoose.model('User')
+var Task = mongoose.model('Task')
+var auth = require('../auth')
+var _ = require('lodash')
+
+// list of all stats
+router.get('/', auth.required, function (req, res, next) {
+ User.findById(req.payload.id)
+ .populate('tasks')
+ .then(function (user) {
+ if (!user) {
+ return res.sendStatus(401)
+ }
+ Task.find({ author: req.payload.id }).exec((err, tasks) => {
+ var tasksCompleted = tasks.filter((task) => task.complete)
+ var aggSumTracked = _(tasks)
+ .groupBy('date')
+ .mapValues((item) => {
+ return _.sumBy(item, 'timerTrackedTime') / 3600
+ })
+ .value()
+ var aggCountComplete = _.countBy(tasksCompleted, 'date')
+ res.json({ aggCountComplete, aggSumTracked })
+ })
+ })
+ .catch(next)
+})
+
+module.exports = router
diff --git a/server/routes/api/tasks.js b/server/routes/api/tasks.js
index c84d6e9..cbf5e79 100644
--- a/server/routes/api/tasks.js
+++ b/server/routes/api/tasks.js
@@ -12,7 +12,6 @@ router.param('task', function (req, res, next, id) {
if (!task) {
return res.sendStatus(404)
}
-
req.task = task
return next()
@@ -35,6 +34,41 @@ router.get('/', auth.required, function (req, res, next) {
.catch(next)
})
+// reorder tasks
+router.put('/reorder', auth.required, function (req, res, next) {
+ var retTasks = []
+ User.findById(req.payload.id)
+ .then(function (user) {
+ if (!user) {
+ return res.sendStatus(401)
+ }
+ var newDate = req.body.newDate
+ var tasks = req.body.tasks
+
+ tasks.forEach((newTask) => {
+ Task.findById(newTask._id)
+ .then(function (task) {
+ if (!task) {
+ return
+ }
+ task.order = newTask.order
+ task.date = newDate
+ task
+ .save()
+ .then(function (task) {
+ retTasks.push(task)
+ if (retTasks.length === tasks.length) {
+ res.json({ tasks: retTasks })
+ }
+ })
+ .catch(next)
+ })
+ .catch(next)
+ })
+ })
+ .catch(next)
+})
+
// create a task
router.post('/', auth.required, function (req, res, next) {
User.findById(req.payload.id)