Merge branch 'master' into schema-view-En-Hua

author: geireann <geireann.lindfield@gmail.com> 2021-08-27 14:19:25 -0400
committer: geireann <geireann.lindfield@gmail.com> 2021-08-27 14:19:25 -0400
commit: be4fd2492ad706f30af28f33133a4df0e8049e12 (patch)
tree: e33b32f54be50122ed16c07d2b6f6b2e79239cb4 /deploy
parent: c5e96c72fcf149b9bcfe5f7f7a9c714de1d5fd9a (diff)
parent: 7c83bc30b3a6ed6061ef68bcef6a0e8941668b3c (diff)
4 files changed, 124 insertions, 16 deletions
diff --git a/deploy/assets/favicon.png b/deploy/assets/favicon.png
new file mode 100644
index 000000000..59595b910
--- /dev/null
+++ b/deploy/assets/favicon.png
diff --git a/deploy/index.html b/deploy/index.html
index dda0c6457..c32aff638 100644
--- a/deploy/index.html
+++ b/deploy/index.html
@@ -1,13 +1,16 @@
 <html style="overflow: hidden;">
 
 <head>
-    <title>Dash Web</title>
-    <link href="https://fonts.googleapis.com/css?family=Fjalla+One|Hind+Siliguri:300" rel="stylesheet">
-    <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500' rel='stylesheet'>
+    <title>Dash</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link
+        href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&family=Lato:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Merriweather:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Roboto:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap"
+        rel="stylesheet">
+    <link rel="shortcut icon" type="image/jpg" href="./assets/favicon.png" />
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
         integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/typescript/3.3.1/typescript.min.js"></script>
-
     <script>
         function getCookie(cname) {
             var name = cname + "=";
@@ -22,23 +25,27 @@
                 }
             }
             return 3000;
-        } 
+        }
     </script>
     <style>
         .dash-loader {
             display: flex;
             align-content: center;
             justify-content: center;
-            background-color: #AEDDF8;
+            background-color: #BDDDF5;
             transition: 3s;
             z-index: 10;
-            width: 100vw;
-            height: 100vh;
+            z-index: 10;
+            width: 100%;
+            height: 100%;
         }
 
         .dash-loader-container {
-            display: grid;
-            grid-auto-rows: auto 30px auto;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            align-content: center;
         }
 
         .dash-progress-bar {
@@ -54,7 +61,7 @@
         .dash-progress {
             width: 0%;
             height: 20px;
-            background-color: #5b9fdd;
+            background-color: #4476F7;
             transition: 0.1s;
         }
 
@@ -65,16 +72,18 @@
             align-items: center;
             justify-content: center;
             border-radius: 100%;
-            background-color: #5B9FDD;
+            background-color: #4476F7;
             justify-self: center;
-            align-self: flex-end;
         }
 
         .dash-loader-text {
             font-size: 15px;
             font-family: "Roboto";
+            font-weight: 400;
             text-align: center;
-            color: #5B9FDD;
+            color: #4476F7;
+            user-select: none;
+            -webkit-user-select: none;
         }
 
         .dash-d-path {
@@ -108,7 +117,7 @@
 </head>
 
 <body style="display:flex" id="dash-body">
-    <div class="dash-loader" id="loader" style="z-index:10; width:100%; height:100%;">
+    <div class="dash-loader" id="loader">
         <div class="dash-loader-container">
             <div class="dash-animation-container">
                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100px"
@@ -127,7 +136,7 @@
                     console.log("Last Load = " + load);
                     let dashmesg = (width, msg) => {
                         if (document.getElementById("dash-progress")) document.getElementById("dash-progress").style.width = width
-                        if (document.getElementById("dash-progress")) document.getElementById("dash-progress").innerHTML = msg
+                        if (document.getElementById("dash-progress")) document.getElementById("dash-loader-text").innerHTML = msg
                     }
                     setTimeout(() => dashmesg("10%", "Loading Dash..."), load / 10);
                     setTimeout(() => dashmesg("33%", "Preparing dashboards..."), load / 3);
diff --git a/deploy/loader.css b/deploy/loader.css
new file mode 100644
index 000000000..4be0cc98c
--- /dev/null
+++ b/deploy/loader.css
@@ -0,0 +1,85 @@
+.dash-loader {
+    display: flex;
+    align-content: center;
+    justify-content: center;
+    background-color: #BDDDF5;
+    transition: 3s;
+    z-index: 10;
+    z-index:10; 
+    width:100%;
+    height:100%;
+}
+
+.dash-loader-container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+}
+
+.dash-progress-bar {
+    width: 200px;
+    height: 5px;
+    align-self: center;
+    margin-top: 20px;
+    background-color: #ececec;
+    border-radius: 5px;
+    overflow: hidden;
+}
+
+.dash-progress {
+    width: 0%;
+    height: 20px;
+    background-color: #4476F7;
+    transition: 0.1s;
+}
+
+.dash-animation-container {
+    width: 10vw;
+    height: 10vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 100%;
+    background-color: #4476F7;
+    justify-self: center;
+}
+
+.dash-loader-text {
+    font-size: 15px;
+    font-family: "Roboto";
+    font-weight: bold;
+    text-align: center;
+    color: #4476F7;
+    user-select: none;
+    -webkit-user-select: none;
+}
+
+.dash-d-path {
+    stroke-dasharray: 1000;
+    stroke-dashoffset: 1000;
+    animation: dash-d-path 3s linear infinite;
+}
+
+@keyframes dash-d-path {
+    0% {
+        stroke-dashoffset: 1000;
+    }
+
+    20% {
+        stroke-dashoffset: 0;
+    }
+
+    70% {
+        stroke-dashoffset: 0;
+    }
+
+    90% {
+        stroke-dashoffset: 1000;
+    }
+
+    100% {
+        stroke-dashoffset: 1000;
+    }
+}
+\ No newline at end of file
diff --git a/deploy/loader.js b/deploy/loader.js
new file mode 100644
index 000000000..0be421e14
--- /dev/null
+++ b/deploy/loader.js
@@ -0,0 +1,14 @@
+function getCookie(cname) {
+    var name = cname + "=";
+    var ca = document.cookie.split(';');
+    for (var i = 0; i < ca.length; i++) {
+        var c = ca[i];
+        while (c.charAt(0) == ' ') {
+            c = c.substring(1);
+        }
+        if (c.indexOf(name) == 0) {
+            return Number(c.substring(name.length, c.length));
+        }
+    }
+    return 3000;
+} 
+\ No newline at end of file
author	geireann <geireann.lindfield@gmail.com>	2021-08-27 14:19:25 -0400
committer	geireann <geireann.lindfield@gmail.com>	2021-08-27 14:19:25 -0400
commit	be4fd2492ad706f30af28f33133a4df0e8049e12 (patch)
tree	e33b32f54be50122ed16c07d2b6f6b2e79239cb4 /deploy
parent	c5e96c72fcf149b9bcfe5f7f7a9c714de1d5fd9a (diff)
parent	7c83bc30b3a6ed6061ef68bcef6a0e8941668b3c (diff)