From fa74e5bf7fea2d63a3373630d9f363183eda8879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Sun, 14 Aug 2022 12:12:30 +0200
Subject: [PATCH] Move get asset function into same API file

---
 src/components/atoms/Image.svelte             |  2 +-
 .../[country]/[location]/[photo].svelte       |  3 +-
 src/routes/[country]/[location]/index.svelte  |  3 +-
 src/utils/api.ts                              | 36 ++++++++++++++++++-
 src/utils/helpers.ts                          | 33 -----------------
 5 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 src/utils/helpers.ts

diff --git a/src/components/atoms/Image.svelte b/src/components/atoms/Image.svelte
index 01af85e..10e8a08 100644
--- a/src/components/atoms/Image.svelte
+++ b/src/components/atoms/Image.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getAssetUrlKey } from '$utils/helpers'
+    import { getAssetUrlKey } from '$utils/api'
 
     export let src: string = undefined
     export let id: string = undefined
diff --git a/src/routes/[country]/[location]/[photo].svelte b/src/routes/[country]/[location]/[photo].svelte
index 77f6340..c778efc 100644
--- a/src/routes/[country]/[location]/[photo].svelte
+++ b/src/routes/[country]/[location]/[photo].svelte
@@ -9,8 +9,7 @@
     import { onMount, tick } from 'svelte'
     import { fade, scale } from 'svelte/transition'
     import { quartOut } from 'svelte/easing'
-    import { getAssetUrlKey } from '$utils/helpers'
-    import { fetchAPI } from '$utils/api'
+    import { fetchAPI, getAssetUrlKey } from '$utils/api'
     import { previousPage } from '$utils/stores'
     import { throttle } from '$utils/functions'
     import { swipe } from '$utils/interactions/swipe'
diff --git a/src/routes/[country]/[location]/index.svelte b/src/routes/[country]/[location]/index.svelte
index 44fb1e6..859d3e5 100644
--- a/src/routes/[country]/[location]/index.svelte
+++ b/src/routes/[country]/[location]/index.svelte
@@ -8,9 +8,8 @@
     import { timeline } from 'motion'
     import dayjs from 'dayjs'
     import relativeTime from 'dayjs/plugin/relativeTime.js'
-    import { getAssetUrlKey } from '$utils/helpers'
     import { quartOut } from '$animations/easings'
-    import { fetchAPI } from '$utils/api'
+    import { fetchAPI, getAssetUrlKey } from '$utils/api'
     import { DELAY, DURATION } from '$utils/contants'
     import { photoFields } from '.'
     // Components
diff --git a/src/utils/api.ts b/src/utils/api.ts
index 05a1fc0..7eea861 100644
--- a/src/utils/api.ts
+++ b/src/utils/api.ts
@@ -27,4 +27,38 @@ export const fetchAPI = async (query: string) => {
     } catch (error) {
         console.error(error)
     }
-}
\ No newline at end of file
+}
+
+
+/**
+ * Get a Directus asset URL from parameters
+ */
+export const getAssetUrlKey = (
+    id: string,
+    key: string
+) => {
+    if (!id || !key) return null
+
+    return `${API_URL}/assets/${id}?key=${key}`
+}
+
+
+/**
+ * Get a Directus asset URL from parameters
+ */
+// export const getAssetUrl = (
+//     id: string,
+//     width: number,
+//     height: number,
+//     quality?: number,
+//     fit: string = 'inside',
+//     format?: string
+// ) => {
+//     let args = ''
+
+//     // Add arguments to URL if specified
+//     if (quality) args += `&quality=${quality}`
+//     if (format) args += `&format=${format}`
+
+//     return `${API_URL}/assets/${id}?width=${width}&height=${height}&fit=${fit}${args}`
+// }
\ No newline at end of file
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
deleted file mode 100644
index 667482c..0000000
--- a/src/utils/helpers.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { API_URL } from '$utils/api'
-
-
-/**
- * Get a Directus asset URL from parameters
- */
-export const getAssetUrlKey = (
-    id: string,
-    key: string
-) => {
-    return `${API_URL}/assets/${id}?key=${key}`
-}
-
-
-/**
- * Get a Directus asset URL from parameters
- */
-// export const getAssetUrl = (
-//     id: string,
-//     width: number,
-//     height: number,
-//     quality?: number,
-//     fit: string = 'inside',
-//     format?: string
-// ) => {
-//     let args = ''
-
-//     // Add arguments to URL if specified
-//     if (quality) args += `&quality=${quality}`
-//     if (format) args += `&format=${format}`
-
-//     return `${API_URL}/assets/${id}?width=${width}&height=${height}&fit=${fit}${args}`
-// }
\ No newline at end of file