Merge pull request #158 from dtom90/develop

AddIntervalDropdown Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "devtrack",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "private": true,
   "description": "An app for productive developers",
   "author": {

src/components/ActivityView.vue

@@ -99,13 +99,12 @@
       class="border"
     >
       <!-- Dropdown to add interval manually -->
-      <DropdownAddInterval
-        v-if="manualInput"
+      <AddIntervalDropdown
         :task-id="taskId"
       />
 
       <!-- Log -->
-      <div :id="manualInput ? 'task-log' : ''">
+      <div id="task-log">
         <Log
           v-for="([day, dayActivity]) in dailyActivity"
           :key="day"
@@ -122,7 +121,7 @@
 <script>
 import Log from './Log'
 import ActivityChart from './ActivityChart'
-import DropdownAddInterval from './DropdownAddInterval'
+import AddIntervalDropdown from './dropdowns/AddIntervalDropdown'
 import { mapState, mapMutations } from 'vuex'
 import time from '../lib/time'
 
@@ -131,7 +130,7 @@ export default {
   
   components: {
     ActivityChart,
-    DropdownAddInterval,
+    AddIntervalDropdown,
     Log
   },
   
@@ -150,10 +149,6 @@ export default {
       type: String,
       default: ''
     },
-    manualInput: {
-      type: Boolean,
-      default: false
-    },
     log: {
       type: Array,
       default: function () {
@@ -225,7 +220,7 @@ export default {
       }
       
       const dailyActivityArray = Object.entries(dailyActivity)
-      dailyActivityArray.sort(([day1, activity1], [day2, activity2]) => this.stringToMs(day2) - this.stringToMs(day1))
+      dailyActivityArray.sort(([day1], [day2]) => this.stringToMs(day2) - this.stringToMs(day1))
       return dailyActivityArray
     },
     
@@ -368,7 +363,6 @@ function weeklyChartData (that) {
   font-weight: 500;
 }
 
-/*noinspection CssUnusedSymbol*/
 #task-log {
   margin-top: -38px;
 }

src/components/SelectedTask.vue

@@ -194,7 +194,6 @@
       :task-id="task.id"
       :element="task.name"
       :log="task.log"
-      :manual-input="!task.completed"
     />
     <br>
   </div>

src/components/DropdownAddInterval.vue → src/components/dropdowns/AddIntervalDropdown.vue

@@ -4,6 +4,7 @@
   >
     <b-dropdown
       ref="dropdown"
+      right
       variant="light"
       toggle-class="text-decoration-none"
       no-caret
@@ -51,12 +52,12 @@
 
 <script>
 import { mapMutations } from 'vuex'
-import time from '../lib/time'
+import time from '../../lib/time'
 import VueCtkDateTimePicker from 'vue-ctk-date-time-picker'
 import 'vue-ctk-date-time-picker/dist/vue-ctk-date-time-picker.css'
 
 export default {
-  name: 'DropdownAddInterval',
+  name: 'AddIntervalDropdown',
   
   components: {
     VueCtkDateTimePicker

tests/unit/AllActivityModal.spec.js

@@ -41,8 +41,7 @@ describe('AllActivityModal', () => {
       element: 'All Activity',
       log,
       id: 'allActivity',
-      taskId: null,
-      manualInput: false
+      taskId: null
     })
 
   })

tests/unit/SelectedTask.spec.js

@@ -56,7 +56,6 @@ describe('SelectedTask', () => {
         log: task.log,
         id: 'taskActivity',
         element: task.name,
-        manualInput: true,
         taskId: task.id
       })
 
@@ -135,7 +134,6 @@ describe('SelectedTask', () => {
         log: task.log,
         id: 'taskActivity',
         element: task.name,
-        manualInput: false,
         taskId: task.id
       })