From 5d7d4896fe5eb15dfca24a174bef0dfec5a0b916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Mon, 18 Jul 2022 17:26:06 +0200
Subject: [PATCH] Filter empty continents directly in GraphQL query

---
 src/app.html                                      | 6 +++---
 src/components/organisms/InteractiveGlobe2.svelte | 2 +-
 src/routes/__layout.svelte                        | 9 ++-------
 3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/app.html b/src/app.html
index c0ee596..f517035 100644
--- a/src/app.html
+++ b/src/app.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8">
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="theme-color" content="#3C0576">
     <meta name="mobile-web-app-capable" content="yes">
@@ -10,11 +10,11 @@
 
     <link rel="icon" type="image/png" sizes="64x64" href="/images/favicon.png">
     <link rel="apple-touch-icon" sizes="180x180" href="/images/siteicon.png">
-	%sveltekit.head%
+    %sveltekit.head%
 </head>
 
 <body>
-	%sveltekit.body%
+    %sveltekit.body%
 
     <script>
         document.body.style.opacity = '0'
diff --git a/src/components/organisms/InteractiveGlobe2.svelte b/src/components/organisms/InteractiveGlobe2.svelte
index 9918f28..7ac1132 100644
--- a/src/components/organisms/InteractiveGlobe2.svelte
+++ b/src/components/organisms/InteractiveGlobe2.svelte
@@ -23,7 +23,7 @@
     $: globeResolution = innerWidth > 1440 && window.devicePixelRatio > 1 ? '4k' : '2k'
 
     const { continents, locations } = getContext('global')
-    const randomContinent: any = getRandomItem(continents.filter((cont: any) => cont.countries))
+    const randomContinent: any = getRandomItem(continents)
     const markers = locations.map(({ name, slug, country, coordinates: { coordinates }}): Marker => ({
         name,
         slug,
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 80458ac..ddf1ffc 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -114,11 +114,10 @@
                     locations { id slug }
                 }
 
-                continents: continent {
+                continents: continent (filter: { countries: { slug: { _neq: "_empty" }}}) {
                     name
                     slug
                     rotation
-                    countries { id slug }
                 }
 
                 settings {
@@ -163,14 +162,10 @@
 
         if (res) {
             const { data } = res
-            const filteredContinents = data.continents.filter((cont: any) => cont.countries.length)
 
             return {
                 props: {
-                    data: {
-                        ...data,
-                        continents: filteredContinents,
-                    },
+                    data,
                     count: {
                         photos: data.countPhotos[0].count.id,
                         locations: data.countLocations[0].count.id,
