Fix cron and make top header float

AlexanderC · Feb 22, 2018 · 49ed9b1 · 49ed9b1
1 parent da572d7
commit 49ed9b1
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "titime",
   "productName": "TiTime - Keeping the time for you",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Tool for Instant Time Tracking",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/cron.js b/src/cron.js
@@ -18,22 +18,36 @@ export default class Cron {
     return this.jobs[name] || null;
   }
 
-  add(name, cron, job, start = false) {
+  add(name, cronTime, job, start = false) {
     if (this.exists(name)) {
       throw new Error(`Cron job "${name}" already exists`);
     }
 
-    Logger.debug(`Add cron job "${name}" with pattern "${cron}"`);
+    Logger.debug(`Add cron job "${name}" with pattern "${cronTime}"`);
 
-    const instance = new CronJob({
-      cronTime: cron,
-      onTick() {
-        Logger.info(`Run "${name}" cron job`);
+    let running = false;
 
-        return job();
-      },
-      start,
-    });
+    const onTick = () => {
+      if (running) {
+        return Promise.resolve();
+      }
+
+      Logger.info(`Run "${name}" cron job`);
+
+      return job()
+        .then((result) => {
+          running = false;
+
+          return Promise.resolve(result);
+        })
+        .catch((error) => {
+          running = false;
+
+          return Promise.reject(error);
+        });
+    };
+
+    const instance = new CronJob({ cronTime, onTick, start });
 
     this.jobs[name] = instance;
 

diff --git a/src/view/index.html b/src/view/index.html
@@ -21,22 +21,55 @@
       .md-content.new-project {
         margin: 30px;
       }
+
+      .md-app-toolbar {
+        position: absolute;
+        top: 0;
+        z-index: 9999;
+      }
+
+      .md-app-scroller {
+        margin-top: 50px;
+      }
     </style>
   </head>
   <body>
     <app></app>
   </body>
 
   <script>
-  import Vue from 'vue';
-  import VueMaterial from 'vue-material';
-  import VueElectron from 'vue-electron';
-  import App from './component/app';
+    import Vue from 'vue';
+    import VueMaterial from 'vue-material';
+    import VueElectron from 'vue-electron';
+    import App from './component/app';
+
+    // Load global components
+    Vue.use(VueMaterial)
+    Vue.use(VueElectron);
+
+    new Vue(App).$mount('app');
+
+    let prevOffset = 0;
+    let offset = 0;
+    let navbar = null;
+
+    setInterval(() => {
+      if (!navbar) {
+        navbar = document.querySelector('.md-app-toolbar');
+      }
+
+      if (prevOffset !== offset) {
+        navbar.style.display = 'none';
+      } else {
+        navbar.style.top = `${ offset }px`;
+        navbar.style.display = 'initial';
+      }
 
-  // Load global components
-  Vue.use(VueMaterial)
-  Vue.use(VueElectron);
+      prevOffset = offset;
+    }, 40);
 
-  new Vue(App).$mount('app');
+    window.onscroll = () => {
+      offset = window.pageYOffset;
+    };
   </script>
 </html>