Show "Loading..." while waiting for account login page to show up

4 years ago · bf0a4ad716
parent 9a86653fda
commit bf0a4ad716
4 changed files with 35 additions and 9 deletions
--- a/www/assets/iframeloading.html
+++ b/www/assets/iframeloading.html
@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!--
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+<html>
+    <head>
+        <title>Loading</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <style>
+            *,html,body {
+                background-color: #fff;
+                font-family: Roboto, Ubuntu, sans-serif;
+                text-align: center;
+            }
+            div {
+                margin-top: 1rem;
+            }
+        </style>
+    </head>
+    <body>
+        <div>Loading...</div>
+
+        <script src="../settings.js"></script>
+        <script>
+            window.location.href = SETTINGS.loginurl;
+        </script>
+    </body>
+</html>
--- a/www/assets/js/login.js
+++ b/www/assets/js/login.js
@ -1,4 +1,4 @@
-/* 
+/*
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
--- a/www/pages/login.html
+++ b/www/pages/login.html
@ -17,8 +17,8 @@
    </div>

    <div class="page-content" style="overflow-y: hidden;"> <!-- overflow-y:hidden removes an annoying pointless scrollbar that wiggles a few pixels up and down -->
-        <iframe src="{{loginurl}}" id="loginframe" style="border: 0; width: 100%; height: calc(100vh - var(--f7-navbar-height));"></iframe>
+        <iframe src="assets/iframeloading.html" id="loginframe" style="border: 0; width: 100%; height: calc(100vh - var(--f7-navbar-height));"></iframe>
    </div>
-    
+
    <script src="assets/js/login.js"></script>
 </div>
--- a/www/routes.js
+++ b/www/routes.js
@ -214,12 +214,7 @@ var routes = [
    {
        path: '/login',
        templateUrl: './pages/login.html',
-        name: 'login',
-        options: {
-            context: {
-                loginurl: SETTINGS.loginurl
-            }
-        }
+        name: 'login'
    },
    {
        path: '/toolbox',