Merge branch 'release/0.2.0'

Author: ventrec

app/index.html

@@ -52,12 +52,12 @@ <h2 class="subtitle">
         </p>
 
         <div class="box" v-if="orderedTasks.length">
-            <task v-for="task in orderedTasks" :task-id="task.id" :key="task.id"></task>
+            <task v-for="task in orderedTasks"
+                  :task-id="task.id"
+                  :key="task.id"
+                  @timerStarted="handleTimerStarted"
+                  @timerStopped="handleTimerStopped"></task>
         </div>
-
-        <!--<div class="box">-->
-            <!--<task v-for="task in orderedTasks" :task-id="task.id" :key="task.id"></task>-->
-        <!--</div>-->
     </div>
 </div>
 

app/js/app.js

@@ -1,5 +1,7 @@
 const Vue = require('vue/dist/vue');
 const _ = require('lodash');
+const moment = require('moment');
+const {powerSaveBlocker} = require('electron');
 
 Vue.filter('pad', require('./filters/pad'));
 Vue.filter('seconds', require('./filters/seconds'));
@@ -15,7 +17,7 @@ new Vue({
 
   computed: {
     orderedTasks() {
-      return _.orderBy(this.tasks, 'id', 'desc');
+      return _.orderBy(this.tasks, ['completed', 'timer.active'], ['asc', 'desc']);
     }
   },
 
@@ -44,6 +46,7 @@ new Vue({
         id: (this.tasks.length + 1),
         name: this.taskName,
         completed: false,
+        created_at: moment().format(this.dateFormat),
 
         timer: {
           seconds: 0,
@@ -53,6 +56,29 @@ new Vue({
       });
 
       this.taskName = '';
-    }
+    },
+
+    /**
+     * Enable power save blocker if it is not already enabled
+     */
+    handleTimerStarted() {
+      if (this.powerSaveBlockerId === null) {
+        this.powerSaveBlockerId = powerSaveBlocker.start('prevent-app-suspension');
+      }
+    },
+
+    handleTimerStopped() {
+      // Do we have any running tasks?
+      let activeTasks = this.tasks.filter(function (task) {
+        return task.timer.active === true;
+      });
+
+      // If we do not have any active tasks, enable power save
+      if (activeTasks.length === 0) {
+        powerSaveBlocker.stop(this.powerSaveBlockerId);
+
+        this.powerSaveBlockerId = null;
+      }
+    },
   }
 });

app/js/components/task/task.html

@@ -1,4 +1,4 @@
-<div class="notification" :class="{ 'is-success' : task.completed }">
+<div class="notification" :class="{ 'is-success' : task.completed, 'is-info' : task.timer.active }">
     <div class="columns is-mobile is-gapless">
         <div class="column is-half">
             <span>
@@ -9,12 +9,6 @@
             {{ task.timer.seconds | hours | pad }} :
             {{ task.timer.seconds | minutes | pad }} :
             {{ task.timer.seconds | seconds | pad }}
-
-
-
-            <!--<span v-show="task.timer.seconds >= 3600">{{ task.timer.seconds | hours | pad }}h</span>-->
-            <!--<span v-show="task.timer.seconds >= 60">{{ task.timer.seconds | minutes | pad }}m</span>-->
-            <!--<span>{{ task.timer.seconds | seconds | pad }}s</span>-->
         </div>
         <div class="column">
             <a @click="startTimer()" v-show="!task.timer.active && !task.completed">

app/js/components/task/task.js

@@ -47,12 +47,18 @@ module.exports = {
       this.task.timer.instance = window.setInterval(() => {
         this.task.timer.seconds += 1;
       }, 1000);
+
+      // Tell our parent that we started a timer in order to block power save
+      this.$emit('timerStarted');
     },
 
     stopTimer() {
       this.task.timer.active = false;
 
       window.clearInterval(this.task.timer.instance);
+
+      // Tell our parent that we stopped a timer in order to check if we can disable power save blocker
+      this.$emit('timerStopped');
     },
 
     completeTask() {

app/js/store.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'Simple CSV reader',
+  title: 'Task Timer',
 
   // Used for creating tasks
   taskName: '',
@@ -8,6 +8,11 @@ module.exports = {
     path: null
   },
 
+  dateFormat: 'YYYY-MM-DD HH:mm:ss',
+
+  // Id used for the power save blocker feature of electron
+  powerSaveBlockerId: null,
+
   tasks: [
     // {
     //   id: 1,

main.js

@@ -17,9 +17,7 @@ app.on('ready', createWindow);
 app.on('window-all-closed', function () {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
+  app.quit();
 });
 
 app.on('activate', function () {

package.json

@@ -1,12 +1,13 @@
 {
   "name": "task-timer-electron",
-  "version": "0.1.0",
+  "productName": "Task Timer",
+  "version": "0.2.0",
   "description": "A simple app that keeps track of the time used on different tasks",
   "license": "MIT",
   "main": "main.js",
   "scripts": {
     "start": "electron .",
-    "package": "node_modules/.bin/electron-packager . Task Timer --out=dist/osx --platform=darwin --arch=x64 --overwrite --icon=clipboard.icns"
+    "package-mac": "node_modules/.bin/electron-packager . 'Task Timer' --out=dist/osx --platform=darwin --arch=x64 --overwrite --icon=clipboard.icns --prune=true"
   },
   "author": {
     "name": "Runar Jørgensen",
@@ -18,6 +19,7 @@
     "electron": "^1.4.1",
     "electron-packager": "^8.2.0",
     "lodash": "^4.16.6",
+    "moment": "^2.17.1",
     "vue": "^2.0.3"
   }
 }