Merge pull request #168 from dtom90/develop

Adds StandupModal checkboxes for completed tasks
dtom90 · Mar 26, 2021 · 2d8dfb5 · 2d8dfb5
2 parents 33071cb + 9e940a8
commit 2d8dfb5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "devtrack",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "private": true,
   "description": "An app for productive developers",
   "author": {
@@ -70,7 +70,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^24.8.0",
     "dotenv": "^8.2.0",
-    "electron": "^8.4.0",
+    "electron": "^9.4.0",
     "electron-builder": "^22.7.0",
     "electron-notarize": "^1.0.0",
     "eslint": "^7.4.0",

diff --git a/src/components/Checkbox.vue b/src/components/Checkbox.vue
@@ -2,9 +2,10 @@
   <div class="checkbox-container">
     <input
       :checked="checked"
-      class="task-checkbox"
+      :class="'task-checkbox' + (disabled ? '' : ' enabled-checkbox')"
       type="checkbox"
       :title="'Mark task ' + (checked ? 'in' : '') + 'complete'"
+      :disabled="disabled"
       @change="completeTask({id: taskId})"
     >
     <span class="check-custom" />
@@ -22,6 +23,10 @@ export default {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     taskId: {
       type: Number,
       default: null
@@ -70,7 +75,7 @@ $checkbox-size: 2.2rem;
 }
 
 /* Styles for the hover state of the custom checkbox */
-.task-checkbox:hover ~ .check-custom {
+.enabled-checkbox:hover ~ .check-custom {
   border-color: #b0d5ff;
   box-shadow: 0 0 0 2px rgba(23, 133, 255, 0.25);
 }

diff --git a/src/components/modals/StandupModal.vue b/src/components/modals/StandupModal.vue
@@ -13,7 +13,13 @@
         v-for="task of lastDaysActivity"
         :key="task[0]"
       >
-        <td>{{ task[0] }}</td>
+        <td class="d-flex align-items-center">
+          <Checkbox
+            :checked="completedTasks.filter(completedTask => completedTask.name === task[0]).length > 0"
+            :disabled="true"
+          />
+          <span>{{ task[0] }}</span>
+        </td>
         <td>{{ displayDuration(task[1]) }}</td>
       </tr>
     </table>
@@ -23,15 +29,17 @@
 <script>
 import { mapGetters } from 'vuex'
 import time, { dayjs } from '../../lib/time'
+import Checkbox from '@/components/Checkbox'
 
 export default {
   name: 'StandupModal',
-  
+  components: { Checkbox },
   mixins: [time],
   
   computed: {
     ...mapGetters([
-      'allActivity'
+      'allActivity',
+      'completedTasks'
     ]),
     
     lastDay () {

diff --git a/tests/unit/SelectedTask.spec.js b/tests/unit/SelectedTask.spec.js
@@ -38,6 +38,7 @@ describe('SelectedTask', () => {
       const checkbox = wrapper.findComponent(Checkbox)
       expect(checkbox.props()).toEqual({
         checked: false,
+        disabled: false,
         taskId: task.id
       })
 
@@ -122,6 +123,7 @@ describe('SelectedTask', () => {
       const checkbox = wrapper.findComponent(Checkbox)
       expect(checkbox.props()).toEqual({
         checked: true,
+        disabled: false,
         taskId: task.id
       })
 

diff --git a/tests/unit/Task.spec.js b/tests/unit/Task.spec.js
@@ -44,6 +44,7 @@ describe('Task', () => {
     const checkbox = wrapper.findComponent(Checkbox)
     expect(checkbox.props()).toEqual({
       checked: false,
+      disabled: false,
       taskId: task.id
     })
 
@@ -60,6 +61,7 @@ describe('Task', () => {
     const checkbox = completedWrapper.findComponent(Checkbox)
     expect(checkbox.props()).toEqual({
       checked: true,
+      disabled: false,
       taskId: task.id
     })
 

diff --git a/yarn.lock b/yarn.lock
@@ -3586,10 +3586,10 @@ bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.1.1:
   version "5.1.2"
@@ -3705,7 +3705,7 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -5725,10 +5725,10 @@ electron-updater@^4.3.5:
     lodash.isequal "^4.5.0"
     semver "^7.3.2"
 
-electron@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.4.0.tgz#30692166dc8b2a511b3c01c70960d467efe2b8e6"
-  integrity sha512-SpgyccM5rjDJSGcpQjiviUBT44fZlSyhcjy8RpKSnAad+co4xY1vYj6T25U1CfSk0PH/dhvcp63P2sdXHCwq/Q==
+electron@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-9.4.0.tgz#c3c607e3598226ddbaaff8babcdffa8bb2210936"
+  integrity sha512-hOC4q0jkb+UDYZRy8vrZ1IANnq+jznZnbkD62OEo06nU+hIbp2IrwDRBNuSLmQ3cwZMVir0WSIA1qEVK0PkzGA==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -5740,17 +5740,17 @@ elegant-spinner@^1.0.1:
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
 elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
 emittery@^0.4.1:
   version "0.4.1"
@@ -7176,7 +7176,7 @@ highlight.js@^9.6.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
   integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -9293,7 +9293,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=