From ed198a75d73b7ad091e0e9f35a6848bb05240d24 Mon Sep 17 00:00:00 2001
From: Andrew Wong <andrew.j.wong@outlook.com>
Date: Mon, 28 Sep 2020 17:09:42 +1000
Subject: [PATCH] Check if backend server is ready before displaying content

Updated Sapper to 0.28.9

---

https://github.com/sveltejs/sapper/issues/948
https://github.com/sveltejs/sapper/pull/1498
---
 package-lock.json         | 20 ++++++++++----------
 package.json              |  2 +-
 src/routes/_layout.svelte | 26 +++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index edd4ec8..af9a14a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3590,14 +3590,14 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sapper": {
-      "version": "0.28.2",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.28.2.tgz",
-      "integrity": "sha512-0k967n9EnGxj9t1ezuvEUFiqUI7Mr92grAJXlhRNmEfV7qvJhiTqNmN/N7GvUtz3qk4RF9u2hfQCa48ozx85GA==",
+      "version": "0.28.9",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.28.9.tgz",
+      "integrity": "sha512-ngowemh3h4wCKE+/EYCn0OZWhuavbqYnR9O2ZavFzdlszE5AznDXuQOwEgnX73U8hS4y9kN3kOudErYmKCjdDg==",
       "dev": true,
       "requires": {
         "html-minifier": "^4.0.0",
         "http-link-header": "^1.0.2",
-        "shimport": "^1.0.1",
+        "shimport": "^2.0.4",
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.6",
         "string-hash": "^1.1.3"
@@ -3727,9 +3727,9 @@
       "dev": true
     },
     "shimport": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/shimport/-/shimport-1.0.1.tgz",
-      "integrity": "sha512-Imf4gH+8WQmT1GvxS/x79qpmfnE6m50hyN1ucatX+7oMCgmaF8obZWCPIzSUe6+P+YmXM46lkP2pxiV2/lt9Og==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/shimport/-/shimport-2.0.4.tgz",
+      "integrity": "sha512-5YOyQqYkOFSkPFnpS87De6BYzDiZBc8FS4/aTuGZiST+WmXSwWRoaNRHqyVOeEpSx9wlgYWg9WYfCuzD/11/qA==",
       "dev": true
     },
     "signal-exit": {
@@ -4044,9 +4044,9 @@
       }
     },
     "uglify-js": {
-      "version": "3.10.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz",
-      "integrity": "sha512-GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.0.tgz",
+      "integrity": "sha512-e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ==",
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
diff --git a/package.json b/package.json
index 23ef13a..7865dd6 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-svelte": "^6.0.0",
     "rollup-plugin-terser": "^7.0.0",
-    "sapper": "^0.28.0",
+    "sapper": "^0.28.9",
     "svelte": "^3.17.3",
     "svelte-preprocess": "^4.1.1"
   },
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 9e8220a..6993891 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -1,14 +1,34 @@
+<script context="module">
+  export function preload() {
+    return { ready: global.BACKEND_READY };
+  }
+</script>
+
 <script>
-  // import Nav from "../ui/components/Nav.svelte";
+  import { stores } from "@sapper/app";
+  const { page } = stores();
+  const { error } = $page;
+
   export let segment;
+  export let ready;
+
+  import ErrorLayout from "./_error.svelte";
+
+  // import Nav from "../ui/components/Nav.svelte";
 </script>
 
 <style lang="scss" global>
   @import "../ui/style/index.scss";
 </style>
 
-{#if [undefined, 'invite', 'debug'].includes(segment) }
-  <slot />
+{#if error || !ready || [undefined, 'invite', 'debug'].includes(segment)}
+  {#if !ready}
+    <ErrorLayout
+      status="Not ready"
+      error={{ message: 'Server still loading' }} />
+  {:else}
+    <slot />
+  {/if}
 {:else}
   <!-- <Nav {segment} /> -->
   <slot />