bug fixes, style improvements½

- fixed http error range check - numerous style tweaks, better default behaviour
shukriadams · Aug 6, 2019 · 5a64b38 · 5a64b38
1 parent 772345a
commit 5a64b38
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 13 deletions.
diff --git a/src/lib/daemon.js b/src/lib/daemon.js
@@ -82,8 +82,6 @@ class CronProcess
     async work(){
         try {
 
-            this.errorMessage = null;
-            this.isPassing = true;
             this.lastRun = new Date();
 
             if (this.config.test){
@@ -99,6 +97,8 @@ class CronProcess
             } else {
                 // do a simple http get
                 await httpHelper.downloadString(this.config.url);
+                this.isPassing = true;
+                this.errorMessage = null;
             }
 
 

diff --git a/src/lib/httpHelper.js b/src/lib/httpHelper.js
@@ -10,8 +10,8 @@ module.exports = {
                 function(error, response) {
                     if (error)
                         return reject(error);
-
-                    if (code && code < 200 && code >= 300) // allow all code 2**
+                    
+                    if (code && (code < 200 || code >= 300)) // allow all code 2**
                         return reject(`Error : server responded with code ${code}.`);
 
                     resolve(response);

diff --git a/src/public/css/iframe.css b/src/public/css/iframe.css
@@ -8,6 +8,7 @@ body {
     padding: 0;
     margin: 0;
     overflow: hidden;
+    background-color: #A82800;
 }
 
 iframe {

diff --git a/src/public/css/style.css b/src/public/css/style.css
@@ -146,7 +146,7 @@ footer {
     display: inline;
 }
 
-.table-cellValue {
+.table-cell {
     padding: 8px /* universal Unit */;
     word-break: break-all;
     word-wrap: break-word;
@@ -176,6 +176,23 @@ footer {
     font-weight: bold;
 }
 
+.nextCheck {
+    position: absolute;
+    bottom: 0;
+    text-align: center;
+    width: 100%;
+}
+
+.errorMessage {
+    margin-bottom: 20px;
+}
+
+.table-cell--content{  
+    height: 118px;
+    max-height: 118px;
+    overflow: hidden;
+}
+
 @media all and (min-width: 501px) {
 
 }

diff --git a/src/public/js/base.js b/src/public/js/base.js
@@ -1,6 +1,7 @@
 var clientRefreshInterval = document.querySelector('body').getAttribute('data-clientRefreshInterval');
 var updateInSeconds = document.querySelector('.layout-updateTime');
 var renderTime = null; //new Date(document.querySelector('.renderTime').getAttribute('data-value'));
+var dateFields = document.querySelectorAll('[data-formatDate]');
 
 var nowHolder = document.querySelector('.now');
 var now = new Date();
@@ -10,6 +11,14 @@ if (clientRefreshInterval)
     clientRefreshInterval = parseInt(clientRefreshInterval);
 
 
+for (var i = 0 ; i < dateFields.length ; i ++)
+{
+    let dateField = dateFields[i];
+    let date = new Date(dateField.getAttribute('data-formatDate'));
+    let formatted = date.toLocaleTimeString();
+    dateField.innerHTML = formatted;
+}
+
 function showTimes(){
     let agos = document.querySelectorAll('.date-ago');
 

diff --git a/src/public/js/iframe.js b/src/public/js/iframe.js
@@ -8,7 +8,15 @@
 
     function update(){
         inactiveFrame.contentWindow.location = '/status'
+
+        var timeOut = setTimeout(function(){
+            activeFrame.classList.remove('iframe--show');
+            inactiveFrame.classList.remove('iframe--show');
+
+        }, 10000)
+
         inactiveFrame.onload = function(){
+            clearTimeout(timeOut);
             setTimeout(function(){
                 inactiveFrame.classList.add('iframe--show');
                 activeFrame.classList.remove('iframe--show');

diff --git a/src/views/pages/status.hbs b/src/views/pages/status.hbs
@@ -1,23 +1,26 @@
 {{#extend "layout"}}
     {{#content "body"}}
-        <div class="table">
+        <div>
             {{#if jobs.length}}
                 {{#each jobs}}
                     <div class="table-row job {{#if isPassing}}job--passing{{/if}}">
 
                         <div class="table-cell table-cell--header">
-                            <div class="table-cellValue name">
+                            <div class="name">
                                 {{config.name}} 
                             </div>
                         </div>
 
+                        <div class="table-cell table-cell--content">
+                            {{#if isPassing}}
+                                <img class="icon-passing" src="/icons/passing.svg" alt="Passing" />
+                            {{else}}
+                                    {{ago statusDate}} - {{errorMessage}}
+                            {{/if}}
+                        </div>
                         <div class="table-cell">
-                            <div class="table-cellValue">
-                                {{#if isPassing}}
-                                    <img class="icon-passing" src="/icons/passing.svg" alt="Passing" />
-                                {{else}}
-                                    {{errorMessage}} ({{ago statusDate}})
-                                {{/if}}
+                            <div class="nextCheck">
+                                Next check : <span data-formatDate="{{nextRun}}"></span>
                             </div>
                         </div>
                     </div>