diff --git a/src/data/index.ts b/src/data/index.ts index bd19731..54092b2 100644 --- a/src/data/index.ts +++ b/src/data/index.ts @@ -1,26 +1,6 @@ import type { iSVG } from '@/types/svg'; import { svgs } from './svgs'; -import { getBaseUrl } from '@/utils/getBaseUrl'; export const svgsData = svgs.map((svg: iSVG, index: number) => { return { id: index, ...svg }; -}); - -export const fullRouteSvgsData: iSVG[] = svgsData.map((svg) => { - const url = getBaseUrl(); - if (typeof svg.route === 'object' && svg.route !== null) { - return { - ...svg, - route: { - light: `${url}${svg.route.light}`, - dark: `${url}${svg.route.dark}` - } - }; - } else if (typeof svg.route === 'string') { - return { - ...svg, - route: `${url}${svg.route}` - }; - } - return svg; -}); +}); \ No newline at end of file diff --git a/src/routes/api/svgs/+server.ts b/src/routes/api/svgs/+server.ts index ebea0be..39420c1 100644 --- a/src/routes/api/svgs/+server.ts +++ b/src/routes/api/svgs/+server.ts @@ -1,12 +1,33 @@ import type { RequestEvent } from './$types'; +import type { iSVG } from '@/types/svg'; import { error, json } from '@sveltejs/kit'; // Data: -import { fullRouteSvgsData } from '@/data'; +import { svgsData } from '@/data'; export const GET = ({ url }: RequestEvent) => { const getParams = url.searchParams.get('limit'); + const fullUrl = url.origin ?? 'svgl.vercel.app'; + + // Add full route to svgs: + const fullRouteSvgsData: iSVG[] = svgsData.map((svg) => { + if (typeof svg.route === 'object' && svg.route !== null) { + return { + ...svg, + route: { + light: `${fullUrl}${svg.route.light}`, + dark: `${fullUrl}${svg.route.dark}` + } + }; + } else if (typeof svg.route === 'string') { + return { + ...svg, + route: `${fullUrl}${svg.route}` + }; + } + return svg; + }); // Status 200 | If no limit is provided, return all svgs: if (!getParams) { diff --git a/src/utils/getBaseUrl.ts b/src/utils/getBaseUrl.ts deleted file mode 100644 index ee8759a..0000000 --- a/src/utils/getBaseUrl.ts +++ /dev/null @@ -1,7 +0,0 @@ -export function getBaseUrl() { - if (import.meta.env.MODE === 'development') { - return ''; - } else { - return import.meta.env.PUBLIC_SVGL_BASE_URL; - } -}