Move all separate folders to lib

This allows changing '../../..' imports to '$lib/'
Radiokot · Dec 2, 2023 · a77332e · a77332e
1 parent 56d51f8
commit a77332e
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 12 deletions.
diff --git a/src/components/AppHeader.svelte → src/lib/components/AppHeader.svelte b/src/components/AppHeader.svelte → src/lib/components/AppHeader.svelte
@@ -1,5 +1,5 @@
 <script>
-    import tunnelStatus from "../stores/tunnel-status";
+    import tunnelStatus from "$lib/stores/tunnel-status";
 
     $: isTunnelStatusLoading = $tunnelStatus == null;
     $: tunnelStatusString = $tunnelStatus?.isUnreachable()

diff --git a/src/components/TunnelRoute.svelte → src/lib/components/TunnelRoute.svelte b/src/components/TunnelRoute.svelte → src/lib/components/TunnelRoute.svelte
diff --git a/src/model/TunnelRoute.ts → src/lib/model/TunnelRoute.ts b/src/model/TunnelRoute.ts → src/lib/model/TunnelRoute.ts
diff --git a/src/model/TunnelSettings.ts → src/lib/model/TunnelSettings.ts b/src/model/TunnelSettings.ts → src/lib/model/TunnelSettings.ts
diff --git a/src/model/TunnelStatus.ts → src/lib/model/TunnelStatus.ts b/src/model/TunnelStatus.ts → src/lib/model/TunnelStatus.ts
@@ -1,4 +1,4 @@
-import type TunnelRoute from './TunnelRoute'
+import type TunnelRoute from '$lib/model/TunnelRoute'
 
 export default class TunnelStatus {
     status: string

diff --git a/src/stores/tunnel-status.ts → src/lib/stores/tunnel-status.ts b/src/stores/tunnel-status.ts → src/lib/stores/tunnel-status.ts
@@ -1,7 +1,7 @@
 import { readable } from "svelte/store";
 import { browser } from '$app/environment';
 
-import TunnelStatus from "../model/TunnelStatus";
+import TunnelStatus from "$lib/model/TunnelStatus";
 
 export let setTunnelStatusRestarting: (() => void) | null = null
 

diff --git a/src/lib/bootstrap-grid.min.css → ...b/vendor/bootstrap/bootstrap-grid.min.css b/src/lib/bootstrap-grid.min.css → ...b/vendor/bootstrap/bootstrap-grid.min.css
diff --git a/src/lib/bootstrap-grid.min.css.map → ...ndor/bootstrap/bootstrap-grid.min.css.map b/src/lib/bootstrap-grid.min.css.map → ...ndor/bootstrap/bootstrap-grid.min.css.map
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-    import "$lib/bootstrap-grid.min.css";
+    import "$lib/vendor/bootstrap/bootstrap-grid.min.css";
 </script>
 
 <div id="content" class="mx-auto px-2 pt-2 pt-md-4 pb-4">

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import AppHeader from "../components/AppHeader.svelte";
-    import TunnelRoute from "../components/TunnelRoute.svelte";
-    import tunnelStatus from "../stores/tunnel-status";
+    import AppHeader from "$lib/components/AppHeader.svelte";
+    import TunnelRoute from "$lib/components/TunnelRoute.svelte";
+    import tunnelStatus from "$lib/stores/tunnel-status";
     import { PUBLIC_GUIDE_URL } from "$env/static/public";
 
     $: isTunnelHealthy = $tunnelStatus?.isOk() == true;

diff --git a/src/routes/api/settings/+server.ts b/src/routes/api/settings/+server.ts
@@ -4,7 +4,7 @@ import {
     promises as fsPromises
 } from 'fs';
 
-import TunnelSettings from '../../../model/TunnelSettings';
+import TunnelSettings from '$lib/model/TunnelSettings';
 import { env } from '$env/dynamic/private';
 
 const TOKEN_FILE_ENCODING = 'utf8'

diff --git a/src/routes/api/status/+server.ts b/src/routes/api/status/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
-import TunnelStatus from '../../../model/TunnelStatus';
-import TunnelRoute from '../../../model/TunnelRoute';
+import TunnelStatus from '$lib/model/TunnelStatus';
+import TunnelRoute from '$lib/model/TunnelRoute';
 
 import { env } from '$env/dynamic/private';
 

diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { PUBLIC_GUIDE_URL } from "$env/static/public";
-    import TunnelSettings from "../../model/TunnelSettings";
-    import { setTunnelStatusRestarting } from "../../stores/tunnel-status";
+    import TunnelSettings from "$lib/model/TunnelSettings";
+    import { setTunnelStatusRestarting } from "$lib/stores/tunnel-status";
 
     const tokenRegex = /[A-Za-z0-9+/]+={0,2}$/g;