From 4069bc5052b152a22bbc0e30f92ee51aca33226a Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Sun, 5 May 2024 14:00:40 +0000
Subject: [PATCH] feat: Implement lazy loading for images and update
 dependencies

---
 src/lib/components/CreateNewAdventure.svelte | 15 +++------
 src/lib/components/EditModal.svelte          | 15 +++------
 src/lib/index.ts                             | 35 +++++++++++++++++---
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/lib/components/CreateNewAdventure.svelte b/src/lib/components/CreateNewAdventure.svelte
index 7dd1639..1636f26 100644
--- a/src/lib/components/CreateNewAdventure.svelte
+++ b/src/lib/components/CreateNewAdventure.svelte
@@ -15,6 +15,7 @@
   import type { Adventure } from "$lib/utils/types";
   const dispatch = createEventDispatcher();
   import { onMount } from "svelte";
+  import { addActivityType } from "$lib";
   let modal: HTMLDialogElement;
 
   onMount(() => {
@@ -25,7 +26,7 @@
   });
 
   function create() {
-    addActivityType();
+    activitySetup();
     if (newAdventure.name.trim() === "") {
       alert("Name is required");
       return;
@@ -46,15 +47,9 @@
 
   let activityInput: string = "";
 
-  function addActivityType() {
-    if (activityInput.trim() !== "") {
-      const activities = activityInput
-        .split(" ")
-        .filter((activity) => activity.trim() !== "");
-      newAdventure.activityTypes = activities;
-      activityInput = "";
-    }
-    console.log(newAdventure.activityTypes);
+  function activitySetup() {
+    newAdventure = addActivityType(activityInput, newAdventure);
+    activityInput = "";
   }
 </script>
 
diff --git a/src/lib/components/EditModal.svelte b/src/lib/components/EditModal.svelte
index b566521..8935d3a 100644
--- a/src/lib/components/EditModal.svelte
+++ b/src/lib/components/EditModal.svelte
@@ -4,6 +4,7 @@
   import type { Adventure } from "$lib/utils/types";
   const dispatch = createEventDispatcher();
   import { onMount } from "svelte";
+  import { addActivityType } from "$lib";
   let modal: HTMLDialogElement;
 
   console.log(adventureToEdit.id);
@@ -19,7 +20,7 @@
   });
 
   function submit() {
-    addActivityType();
+    activitySetup();
     dispatch("submit", adventureToEdit);
     console.log(adventureToEdit);
   }
@@ -36,15 +37,9 @@
 
   let activityInput: string = "";
 
-  function addActivityType() {
-    if (activityInput.trim() !== "") {
-      const activities = activityInput
-        .split(",")
-        .filter((activity) => activity.trim() !== "");
-      adventureToEdit.activityTypes = activities;
-      activityInput = "";
-    }
-    console.log(adventureToEdit.activityTypes);
+  function activitySetup() {
+    adventureToEdit = addActivityType(activityInput, adventureToEdit);
+    activityInput = "";
   }
 </script>
 
diff --git a/src/lib/index.ts b/src/lib/index.ts
index cc1f350..1d825a7 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,5 +1,6 @@
 import inspirationalQuotes from "./json/quotes.json";
 import countryCodes from "./json/countries.json";
+import type { Adventure } from "./utils/types";
 
 /**
  * Converts a country code to its corresponding country name.
@@ -8,7 +9,8 @@ import countryCodes from "./json/countries.json";
  */
 export function countryCodeToName(countryCode: string): string | null {
   // Look up the country name using the provided country code
-  const countryName = countryCodes[countryCode.toLowerCase() as keyof typeof countryCodes];
+  const countryName =
+    countryCodes[countryCode.toLowerCase() as keyof typeof countryCodes];
   // Return the country name if found, otherwise return null
   return countryName || null;
 }
@@ -19,10 +21,10 @@ export function countryCodeToName(countryCode: string): string | null {
  * @param country - The 2 digit country code representing the desired flag.
  * @returns The URL of the flag image.
  */
-export function getFlag(size:number,country: string) {
+export function getFlag(size: number, country: string) {
   return `https://flagcdn.com/h${size}/${country}.png`;
 }
-    
+
 /**
  * Generates a random string consisting of alphanumeric characters.
  * @returns {string} The randomly generated string.
@@ -48,5 +50,30 @@ export function getRandomQuote() {
   const randomIndex = Math.floor(Math.random() * quotes.length);
   let quoteString = quotes[randomIndex].quote;
   let authorString = quotes[randomIndex].author;
-  return "\"" + quoteString +  "\" - "  + authorString;
+  return '"' + quoteString + '" - ' + authorString;
+}
+
+/**
+ * Adds activity types to the adventure.
+ *
+ * @param activityInput - The input string containing activity types separated by commas.
+ * @param adventureToEdit - The adventure object to which the activity types will be added.
+ * @returns The adventure object with the updated activity types.
+ */
+export function addActivityType(
+  activityInput: string,
+  adventureToEdit: Adventure
+) {
+  if (activityInput.trim() !== "") {
+    const activities = activityInput
+      .split(",")
+      .filter((activity) => activity.trim() !== "");
+    // trims the whitespace from the activities
+    for (let i = 0; i < activities.length; i++) {
+      activities[i] = activities[i].trim();
+    }
+    adventureToEdit.activityTypes = activities;
+    activityInput = "";
+  }
+  return adventureToEdit;
 }