From 11e43843a8570f1fd31dd77225f90817a9a16ebe Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@omg.lol>
Date: Wed, 19 Apr 2023 21:15:01 +0100
Subject: [PATCH] Updates how data fetching and caching is done

---
 src/routes/+page.server.ts |  6 ++++--
 src/routes/+page.svelte    | 25 ++-----------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 49cea17..00f1e63 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,3 +1,5 @@
+import { templates } from '$src/store';
+import { templatesUrl } from '$src/constants';
 
 const makeCategories = (templates) => {
   // Get categories from templates
@@ -20,8 +22,8 @@ const makeCategories = (templates) => {
 
 
 export const load = async () => {
-  const url = 'https://raw.githubusercontent.com/Lissy93/portainer-templates/main/templates.json';
-  const data = await fetch(url).then((res) => res.json());
+  const data = await fetch(templatesUrl).then((res) => res.json());
+  templates.set(data.templates);
   
   return {
     templates: data.templates,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 99235f9..d5e1301 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -6,6 +6,7 @@
   import Templates from '$lib/TemplateList.svelte';
   import NoResults from '$lib/NoResults.svelte';
   import Footer from '$lib/Footer.svelte';
+  import type { Template } from '$src/Types';
 
   export let data;
 
@@ -13,7 +14,7 @@
 
   let selectedCategories: string[] = [];
   
-  $: filteredTemplates = data.templates.filter((template: any) => {
+  $: filteredTemplates = data.templates.filter((template: Template) => {
     const compareStr = (str1: string, str2: string) =>
       (str1 || '').toLowerCase().includes(str2.toLowerCase());
 
@@ -77,25 +78,3 @@
 
 <!-- Footer showing license and source code links -->
 <Footer />
-
-<style lang="scss">
-  @import url('https://fonts.googleapis.com/css2?family=Kanit:wght@200;400;800&display=swap');
-  :global(body) {
-    --background: #101828;
-    --foreground: #ffffff;
-    --accent: #0ba5ec;
-    --card: #1d2939;
-    --shadow: 1px 1px 3px 3px #0B9AEC8F;
-    --gradient: linear-gradient(to right,#0B9AEC 0%,#6EDFDE 100%);
-    --max-width: 1800px;
-    margin: 0;
-    font-family: 'Kanit', sans-serif;
-    color: var(--foreground);
-    background: var(--background);
-  }
-  :global(::selection) {
-    background: var(--card);
-    color: var(--accent);
-  }
-
-</style>
\ No newline at end of file