From 8a660a58ae72b5e8198f6e6adec17560ae52fe03 Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Thu, 22 Feb 2024 23:57:15 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=96=20Moves=20location=20to=20utilitie?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/App.svelte                                           | 2 +-
 app/src/components/Views/Model.svelte                        | 2 +-
 app/src/components/Views/Stream.svelte                       | 2 +-
 app/src/lib/utilities/index.ts                               | 3 ++-
 app/src/lib/{location.ts => utilities/location-utilities.ts} | 4 +---
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename app/src/lib/{location.ts => utilities/location-utilities.ts} (66%)

diff --git a/app/src/App.svelte b/app/src/App.svelte
index d2a57d4..4d7d945 100644
--- a/app/src/App.svelte
+++ b/app/src/App.svelte
@@ -5,10 +5,10 @@
 	import { connect } from '$lib/socket';
 	import Controller from './routes/Controller.svelte';
     import FileService from '$lib/services/file-service';
-	import { socketLocation } from '$lib/location';
     import Settings from './routes/Settings.svelte';
 	import { jointNames, model } from '$lib/store';
 	import { loadModelAsync } from '$lib/utilities';
+	import { socketLocation } from '$lib/utilities';
 	import type { Result } from '$lib/utilities/result';
 
 	export let url = window.location.pathname 
diff --git a/app/src/components/Views/Model.svelte b/app/src/components/Views/Model.svelte
index 9a018da..930e88e 100644
--- a/app/src/components/Views/Model.svelte
+++ b/app/src/components/Views/Model.svelte
@@ -6,7 +6,7 @@ import { lerp } from '$lib/utilities';
 import uzip from 'uzip';
 import { model, outControllerData } from '$lib/store';
 import { ForwardKinematics } from '$lib/kinematic';
-import location from '$lib/location';
+import { location } from '$lib/utilities';
 import FileService from '$lib/services/file-service';
 import SceneBuilder from '$lib/sceneBuilder';
 
diff --git a/app/src/components/Views/Stream.svelte b/app/src/components/Views/Stream.svelte
index 5da0b82..760e754 100644
--- a/app/src/components/Views/Stream.svelte
+++ b/app/src/components/Views/Stream.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
-	import location from '$lib/location';
+	import { location } from '$lib/utilities';
 
 	let videoStream = `//${location}/api/stream`;
 
diff --git a/app/src/lib/utilities/index.ts b/app/src/lib/utilities/index.ts
index 76ebe42..1fad676 100644
--- a/app/src/lib/utilities/index.ts
+++ b/app/src/lib/utilities/index.ts
@@ -3,4 +3,5 @@ export * from './string-utilities'
 export * from './svelte-utilities'
 export * from './math-utilities'
 export * from './buffer-utilities'
-export * from './model-utilities'
\ No newline at end of file
+export * from './model-utilities'
+export * from './location-utilities'
\ No newline at end of file
diff --git a/app/src/lib/location.ts b/app/src/lib/utilities/location-utilities.ts
similarity index 66%
rename from app/src/lib/location.ts
rename to app/src/lib/utilities/location-utilities.ts
index 6c00c47..8de566b 100644
--- a/app/src/lib/location.ts
+++ b/app/src/lib/utilities/location-utilities.ts
@@ -1,8 +1,6 @@
 const forWeb = import.meta.env.MODE === "WEB"
 const mock = import.meta.env.MODE === "MOCK"
 
-const location = mock ? `${window.location.hostname}:2096` : "leika.local"
+export const location = mock ? `${window.location.hostname}:2096` : "leika.local"
 
 export const socketLocation = forWeb ? `wss://${window.location.hostname}:2096` : `ws://${location}` 
-
-export default location;
\ No newline at end of file