From 469074d75b14a27187051d47941ba63cd2235d81 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Thu, 29 Dec 2022 23:39:56 +0100
Subject: [PATCH] Consistent build api url & updated base to /api/v1

---
 src/lib/utils/requestSessionCookie.ts | 8 ++------
 src/routes/Footer.svelte              | 7 ++-----
 src/routes/login/+page.svelte         | 7 ++-----
 src/routes/sitemap.xml/+server.ts     | 2 +-
 src/routes/styles.css                 | 2 --
 src/routes/warehouse/+page.server.ts  | 2 +-
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/lib/utils/requestSessionCookie.ts b/src/lib/utils/requestSessionCookie.ts
index a7b6181..7802b63 100644
--- a/src/lib/utils/requestSessionCookie.ts
+++ b/src/lib/utils/requestSessionCookie.ts
@@ -1,11 +1,7 @@
-import { dev } from '$app/environment';
+import { buildApiUrl } from './apiUrl';
 
 export default async function requestSessionCookie() {
-  let url = '/api';
-  if (dev) {
-    url = 'http://localhost:30010'.concat(url);
-  }
-
+  const url = buildApiUrl('/api/v1');
   await fetch(url);
   return true;
 }
diff --git a/src/routes/Footer.svelte b/src/routes/Footer.svelte
index f467ed2..1b3290f 100644
--- a/src/routes/Footer.svelte
+++ b/src/routes/Footer.svelte
@@ -1,14 +1,11 @@
 <script lang="ts">
   import LinkArrow from '$lib/components/LinkArrow.svelte';
+  import { buildApiUrl } from '$lib/utils/apiUrl';
 
   export let isAdmin = false;
 
   function logout() {
-    let url = '/api/logout';
-    if (window?.location?.href.includes('localhost')) {
-      url = 'http://localhost:30010'.concat(url);
-    }
-
+    const url = buildApiUrl('/api/v1/logout');
     fetch(url, { method: 'POST' }).then((resp) => {
       resp.status === 200 && window.location.reload();
     });
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 2012ebb..6d51046 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import Button from '$lib/components/Button.svelte';
   import Input from '$lib/components/Input.svelte';
+  import { buildApiUrl } from '$lib/utils/apiUrl';
 
   let username: string;
   let password: string;
@@ -20,11 +21,7 @@
       }
     };
 
-    let url = '/api/login';
-    if (window?.location?.href.includes('localhost')) {
-      url = 'http://localhost:30010'.concat(url);
-    }
-
+    const url = buildApiUrl('/api/v1/login');
     fetch(url, options)
       .then((resp) => {
         const { status } = resp;
diff --git a/src/routes/sitemap.xml/+server.ts b/src/routes/sitemap.xml/+server.ts
index 83ab058..9134ddd 100644
--- a/src/routes/sitemap.xml/+server.ts
+++ b/src/routes/sitemap.xml/+server.ts
@@ -52,7 +52,7 @@ function sitemapPages(): string {
 }
 
 async function sitemapShopPages(): Promise<string> {
-  const res = await fetch('/api/products');
+  const res = await fetch('/api/v1/products');
   const productResponse: IProductsDTO = await res.json();
 
   return productResponse?.products
diff --git a/src/routes/styles.css b/src/routes/styles.css
index f95624d..ab2be52 100644
--- a/src/routes/styles.css
+++ b/src/routes/styles.css
@@ -35,9 +35,7 @@ a {
   text-decoration: none;
 
   -webkit-transition: -webkit-transform 0.15s linear;
-  transition: -webkit-transform 0.15s linear;
   transition: transform 0.15s linear;
-  transition: transform 0.15s linear, -webkit-transform 0.15s linear;
   -webkit-transform-origin: 50% 80%;
   transform-origin: 50% 80%;
 }
diff --git a/src/routes/warehouse/+page.server.ts b/src/routes/warehouse/+page.server.ts
index 212859f..9284239 100644
--- a/src/routes/warehouse/+page.server.ts
+++ b/src/routes/warehouse/+page.server.ts
@@ -1,7 +1,7 @@
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ fetch }) => {
-  const res = await fetch('/api/warehouse');
+  const res = await fetch('/api/v1/warehouse');
   const warehouse = await res.json();
 
   return {