version 2019.07.1

remove full screen page when connection to socket stops, instead it will retry to connect
lamarios · Jul 21, 2019 · ed8d71c · ed8d71c
1 parent ed986f7
commit ed8d71c
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 60 deletions.
diff --git a/models/pom.xml b/models/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.ftpix.homedash</groupId>
         <artifactId>homedash</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>models</artifactId>

diff --git a/notifications/pom.xml b/notifications/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>homedash</artifactId>
         <groupId>com.ftpix.homedash</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/couchpotato/pom.xml b/plugins/couchpotato/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>couchpotato</artifactId>

diff --git a/plugins/docker/pom.xml b/plugins/docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>docker</artifactId>

diff --git a/plugins/dockercompose/pom.xml b/plugins/dockercompose/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/dynamicdns/pom.xml b/plugins/dynamicdns/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>dynamicdns</artifactId>

diff --git a/plugins/googlepubliccalendar/pom.xml b/plugins/googlepubliccalendar/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>googlepubliccalendar</artifactId>
     <name>googlepubliccalendar</name>

diff --git a/plugins/harddisk/pom.xml b/plugins/harddisk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>harddisk</artifactId>

diff --git a/plugins/kvm/pom.xml b/plugins/kvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/logreader/pom.xml b/plugins/logreader/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.ftpix.homedash.plugins</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/mma/pom.xml b/plugins/mma/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>mma</artifactId>
     <name>mma</name>

diff --git a/plugins/networkmonitor/pom.xml b/plugins/networkmonitor/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>networkmonitor</artifactId>

diff --git a/plugins/pihole/pom.xml b/plugins/pihole/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>pihole</artifactId>
     <name>pihole</name>

diff --git a/plugins/plex/pom.xml b/plugins/plex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>plex</artifactId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>homedash</artifactId>
         <groupId>com.ftpix.homedash</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugins/portmapper/pom.xml b/plugins/portmapper/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>portmapper</artifactId>
     <name>portmapper</name>

diff --git a/plugins/sonarrtv/pom.xml b/plugins/sonarrtv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>sonarrtv</artifactId>

diff --git a/plugins/spotify/pom.xml b/plugins/spotify/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>spotify</artifactId>

diff --git a/plugins/systeminfo/pom.xml b/plugins/systeminfo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
     <artifactId>systeminfo</artifactId>

diff --git a/plugins/transmission/pom.xml b/plugins/transmission/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>transmission</artifactId>
     <name>transmission</name>

diff --git a/plugins/unifi/pom.xml b/plugins/unifi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2019.01.3</version>     </parent>
+        <version>2019.07.1</version>     </parent>
 
     <artifactId>unifi</artifactId>
     <name>unifi</name>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ftpix.homedash</groupId>
     <artifactId>homedash</artifactId>
-    <version>2019.01.3</version>
+    <version>2019.07.1</version>
     <name>Archetype - homedash</name>
     <url>http://maven.apache.org</url>
     <packaging>pom</packaging>

diff --git a/updater/pom.xml b/updater/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>homedash</artifactId>
         <groupId>com.ftpix.homedash</groupId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/web/pom.xml b/web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ftpix.homedash</groupId>
         <artifactId>homedash</artifactId>
-        <version>2019.01.3</version>
+        <version>2019.07.1</version>
     </parent>
 
 
@@ -199,7 +199,7 @@
         <dependency>
             <groupId>com.ftpix.homedash</groupId>
             <artifactId>models</artifactId>
-            <version>2019.01.3</version>
+            <version>2019.07.1</version>
         </dependency>
 
         <dependency>
@@ -373,7 +373,7 @@
                 <version>1.1.1</version>
                 <configuration>
                     <description>
-                        fix issue #7 where the UI wouldn't load on windows JAR distribution
+                        remove full screen overlay when connection to server is lost. Instead will try to reconnect.
                     </description>
                     <releaseName>${version}</releaseName>
                     <tag>${version}</tag>
@@ -450,7 +450,9 @@
                             <arguments>
                                 <argument>build</argument>
                                 <argument>-t</argument>
-                                <argument>${docker.image.name}</argument>
+                                <argument>${docker.image.name}:latest</argument>
+                                <argument>-t</argument>
+                                <argument>${docker.image.name}:${version}</argument>
                                 <argument>.</argument>
                             </arguments>
                         </configuration>

diff --git a/web/src/main/java/assets/js/websocket.js b/web/src/main/java/assets/js/websocket.js
@@ -2,21 +2,21 @@
  * This file will handle all the websocket related stuff
  */
 var ws;
+var singleModuleSize = null;
 
 $(document).ready(function () {
-    $('#overlay .reload-page').click(function () {
-        location.reload();
-    });
 });
 
 
 function initWebsocket() {
+    singleModuleSize = null;
     var protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://';
     ws = new WebSocket(protocol + window.location.host + '/ws');
     try {
         ws.onmessage = onMessage;
 
         ws.onopen = function (e) {
+            $('#reconnecting-bar').removeClass('showing');
             for (i = 0; i < MODULES.length; i++) {
                 if (MODULES[i] != null && MODULES[i].onConnect != undefined) {
                     MODULES[i].onConnect();
@@ -39,6 +39,8 @@ function initWebsocket() {
 
 
 function initSingleModuleWebSocket(size) {
+    singleModuleSize = size;
+
     var protocol = (location.protocol === 'https:') ? 'wss://' : 'ws://';
     ws = new WebSocket(protocol + window.location.host + '/ws-' + size);
     try {
@@ -49,6 +51,7 @@ function initSingleModuleWebSocket(size) {
         }
 
         ws.onopen = function (e) {
+            $('#reconnecting-bar').removeClass('showing');
             MODULE.onConnect();
             MODULE.documentReady(size);
             sendMessage(MODULE.moduleId, "setModule", "");
@@ -152,8 +155,17 @@ var notificationTimeout;
  Display the overlay when the connection is off
  */
 function showOfflineOverlay() {
-    $('#overlay').addClass('showing');
+    console.log('reconnecting to socket');
+    $('#reconnecting-bar').addClass('showing');
+    setTimeout(function () {
+        if (singleModuleSize !== null) {
+            initSingleModuleWebSocket(singleModuleSize);
+        } else {
+            initWebsocket();
+        }
+    }, 1000);
 }
+
 /**
  * Show a success notification
  * @param message

diff --git a/web/src/main/java/assets/less/main.less b/web/src/main/java/assets/less/main.less
@@ -115,44 +115,37 @@ body {
   }
 }
 
-#overlay {
+#reconnecting-bar {
   position: fixed;
-  background-color: white;
+  background-color: @accentColor;
+  color: white;
   z-index: 9001;
-  top: 0;
   left: 0;
   right: 0;
-  bottom: 0;
+  bottom: -60px;
+  height:50px;
+
+  display:flex;
+  align-items: center;
 
   -webkit-transition: all @transition-speed !important;
   transition: all @transition-speed !important;
+  font-size: 20px;
 
-  @angle: -90deg;
-  -webkit-transform: rotateX(@angle); /* Safari */
-  transform: rotateX(@angle);
-
-  transform-origin: center top;
-
-  padding-top: 50px;
-  p {
-    text-align: center;
-
+  .message{
+    flex-grow: 1;
+    margin: 0;
   }
 
-  .smiley {
-    color: @accentColor;
-    font-size: 150px;
+  .icon{
+    margin: 0;
+    padding: 20px;
   }
 
-  .message {
-    font-size: 35px;
-  }
 }
 
-#overlay.showing {
-  @angle: 0deg;
-  -webkit-transform: rotateX(@angle); /* Safari */
-  transform: rotateX(@angle);
+#reconnecting-bar.showing {
+  bottom: 0px;
 }
 
 //

diff --git a/web/src/main/resources/templates/layout.jade b/web/src/main/resources/templates/layout.jade
@@ -28,11 +28,10 @@ html(lang="en")
             .icon
             .message
 
-        #overlay
-            p.smiley :(
-            p.message Can't connect to the server
-            p
-                button.reload-page.btn.btn-primary Reload
+        #reconnecting-bar
+            p.icon
+                i.fa.fa-refresh.fa-spin
+            p.message Can't connect to the server, retrying
 
         #pages
             div.icons