Changed loading behaviour

OpenOlitor · Jun 19, 2020 · f4b08c2 · f4b08c2
1 parent df7406b
commit f4b08c2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/environments/config.json b/app/environments/config.json
@@ -3,6 +3,4 @@
   "API_WS_URL": "http://localhost:9003/m1/ws",
   "ENV": "dev",
   "version": "2.5.0",
-  "AIRBREAK_API_KEY": "48f4d0be704fafd7ed7b4fdf2d2119d9",
-  "AIRBREAK_URL": "https://errbit.tegonal.com/"
 }
diff --git a/app/index.html b/app/index.html
@@ -96,14 +96,22 @@
     </ul>
   </div>
 
-  <div class="master-content content" ng-class="{'sidenav-open': tgState}">
+  <div class="master-content content" ng-class="{'sidenav-open': tgState}" ng-if="loaded">
     <!--[if lt IE 9]>
           <p class="browsehappy" translate>Sie nutzen einen <strong>alten</strong> Browser. Bitte <a href="http://browsehappy.com/">installieren</a> Sie einen aktuelle Brwoser. So stellen Sie sicher, dass dies Webseite wie beabsichtigt funktioniert.</p>
       <![endif]-->
     <div ng-view="" ng-cloak class="container-fluid"></div>
   </div>
 
-  <footer>
+  <div class="master-content content" ng-if="!loaded">
+    <div ng-cloak class="container">
+      <div class="jumbotron">
+        <h3 translate>Wir sind gleich bereit...</h3>
+      </div>
+    </div>
+  </div>
+
+  <footer ng-if="loaded">
     <a href="http://www.openolitor.ch" target="_blank">www.openolitor.ch</a> Build: UI #{{buildNr}} WS: #{{serverInfo.buildNr}} Env: {{env}}
     <span ng-class="[{disconnected:!connected, connected:connected}]"><i class="fa fa-wifi" ng-attr-title="{{messagingSocketClosedReason}}"></i></span>
   </footer>

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -205,13 +205,20 @@ angular
     $rootScope.location = $location;
   })
   .service('appConfig', ['$http', function($http) {
-    var configData = {};
+    var loaded = false;
+    var configData = {
+    };
     $http.get('environments/config.json').then(function(payload) {
       configData = payload.data;
+      loaded = true;
+    }, function(error) {
     });
     return {
       get: function() {
         return configData;
+      },
+      isLoaded: function() {
+        return loaded;
       }
     };
   }])