From aeb419691820e95c78c7f090046faf4c4f2b398d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Tue, 14 Apr 2020 22:23:01 +0200
Subject: [PATCH] Fix some stuff

- Error page now displaying (+ removed globe, more space between content and footer)
- Manipulate data if existing
---
 src/routes/_error.svelte      | 14 ++++++++------
 src/routes/_layout.svelte     | 26 +++++++++++++++-----------
 src/style/pages/_page.scss    |  4 ++++
 src/style/tools/_helpers.scss |  1 +
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/routes/_error.svelte b/src/routes/_error.svelte
index 209a5c3..8a84ed0 100644
--- a/src/routes/_error.svelte
+++ b/src/routes/_error.svelte
@@ -1,19 +1,23 @@
 <script>
-    import { site } from 'utils/store'
+    import { onMount } from 'svelte'
+    import { site, pageReady } from 'utils/store'
     // Components
     import IconArrow from 'atoms/IconArrow'
     import TitleSite from 'atoms/TitleSite'
     import Button from 'atoms/Button'
-    import InteractiveGlobe from 'molecules/InteractiveGlobe'
     import Footer from 'organisms/Footer'
 
     // Props
     export let status
     export let error
+
+    onMount(() => {
+        pageReady.set(true)
+    })
 </script>
 
 <svelte:head>
-    <title>{$site.seo_name} - {error.message}</title>
+    <title>Houses Of - {error.message}</title>
 </svelte:head>
 
 {#if process.env.NODE_ENV === 'development' && error.stack}
@@ -35,10 +39,8 @@
 
         <div class="page__description style-description">
             <p>Oh no… Looks like something wrong just happened. Like a nasty error {status}.</p>
-            <Button href="/" class="button" text="Go back to the homepage" on:click={() => window.location.href = '/'} />
+            <Button href="/" class="button" text="Go back to homepage" />
         </div>
-
-        <InteractiveGlobe type="part" />
     </div>
 
     <Footer />
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 7588ab5..a083a8e 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -83,20 +83,24 @@
     /*
     ** Manipulate data
     */
-    // Replace each countrie's continent by the database
-    $countries.forEach(count => count.continent = $continents.find(cont => cont.id === count.continent.id))
+   if ($countries) {
+        // Replace each countrie's continent by the database
+        $countries.forEach(count => count.continent = $continents.find(cont => cont.id === count.continent.id))
 
-    // Push each country to its continent
-    $countries.forEach(country => {
-        const continent = $continents.find(cont => cont.id === country.continent.id)
-        continent.countries = []
-        if (!continent.countries.includes(country)) {
-            continent.countries.push(country)
-        }
-    })
+        // Push each country to its continent
+        $countries.forEach(country => {
+            const continent = $continents.find(cont => cont.id === country.continent.id)
+            continent.countries = []
+            if (!continent.countries.includes(country)) {
+                continent.countries.push(country)
+            }
+        })
+    }
 
     // Replace each location's country by the database
-    $locations.forEach(loc => loc.country = $countries.find(cont => cont.id === loc.country.id))
+    if ($locations) {
+        $locations.forEach(loc => loc.country = $countries.find(cont => cont.id === loc.country.id))
+    }
 
 
     onMount(async () => {
diff --git a/src/style/pages/_page.scss b/src/style/pages/_page.scss
index bbc828d..f831f53 100644
--- a/src/style/pages/_page.scss
+++ b/src/style/pages/_page.scss
@@ -1,5 +1,9 @@
 .page {
     overflow-x: hidden;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
 
     // Page part
     &__part {
diff --git a/src/style/tools/_helpers.scss b/src/style/tools/_helpers.scss
index 4ef3273..d4c7714 100644
--- a/src/style/tools/_helpers.scss
+++ b/src/style/tools/_helpers.scss
@@ -22,6 +22,7 @@
 ========================================================================== */
 // Wrap (global)
 .wrap {
+    width: 100%;
     max-width: 1648px;
     margin: 0 auto;
     padding: 0 16px;