From 8da05a33cb3ee906072ad66876f0330447b8bed8 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Wed, 6 Dec 2023 21:00:13 +0100
Subject: [PATCH] Move Components to new Directory

---
 src/lib/components/consts.ts                               | 2 --
 src/lib/{components => components_custom}/Button.svelte    | 0
 src/lib/{components => components_custom}/DropDown.svelte  | 0
 .../DropDownElement.svelte                                 | 0
 .../LoadingSpinner.svelte                                  | 0
 .../LoadingSpinnerLocal.svelte                             | 0
 src/lib/components_custom/consts.ts                        | 2 ++
 src/routes/+layout.svelte                                  | 2 +-
 src/routes/Settings.svelte                                 | 7 ++-----
 src/routes/admin/+page.server.ts                           | 2 +-
 src/routes/admin/+page.svelte                              | 4 ++--
 src/routes/admin/+page.ts                                  | 2 +-
 src/routes/admin/EmpireDetails.svelte                      | 6 +++---
 src/routes/legacy/graphs/+layout.ts                        | 2 +-
 src/routes/legacy/graphs/GameGroupSelection.svelte         | 4 ++--
 src/routes/legacy/graphs/GameSelection.svelte              | 4 ++--
 src/routes/legacy/graphs/excel-style/+page.svelte          | 2 +-
 src/routes/legacy/legacy-graphs/+page.svelte               | 2 +-
 src/routes/legacy/legacy-graphs/+page.ts                   | 2 +-
 19 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 src/lib/components/consts.ts
 rename src/lib/{components => components_custom}/Button.svelte (100%)
 rename src/lib/{components => components_custom}/DropDown.svelte (100%)
 rename src/lib/{components => components_custom}/DropDownElement.svelte (100%)
 rename src/lib/{components => components_custom}/LoadingSpinner.svelte (100%)
 rename src/lib/{components => components_custom}/LoadingSpinnerLocal.svelte (100%)
 create mode 100644 src/lib/components_custom/consts.ts

diff --git a/src/lib/components/consts.ts b/src/lib/components/consts.ts
deleted file mode 100644
index de9f2a5..0000000
--- a/src/lib/components/consts.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const apiBaseUrl = 'https://wip.chellaris.net/api';
-export const MACHINE_GROUP_ID = 12;
\ No newline at end of file
diff --git a/src/lib/components/Button.svelte b/src/lib/components_custom/Button.svelte
similarity index 100%
rename from src/lib/components/Button.svelte
rename to src/lib/components_custom/Button.svelte
diff --git a/src/lib/components/DropDown.svelte b/src/lib/components_custom/DropDown.svelte
similarity index 100%
rename from src/lib/components/DropDown.svelte
rename to src/lib/components_custom/DropDown.svelte
diff --git a/src/lib/components/DropDownElement.svelte b/src/lib/components_custom/DropDownElement.svelte
similarity index 100%
rename from src/lib/components/DropDownElement.svelte
rename to src/lib/components_custom/DropDownElement.svelte
diff --git a/src/lib/components/LoadingSpinner.svelte b/src/lib/components_custom/LoadingSpinner.svelte
similarity index 100%
rename from src/lib/components/LoadingSpinner.svelte
rename to src/lib/components_custom/LoadingSpinner.svelte
diff --git a/src/lib/components/LoadingSpinnerLocal.svelte b/src/lib/components_custom/LoadingSpinnerLocal.svelte
similarity index 100%
rename from src/lib/components/LoadingSpinnerLocal.svelte
rename to src/lib/components_custom/LoadingSpinnerLocal.svelte
diff --git a/src/lib/components_custom/consts.ts b/src/lib/components_custom/consts.ts
new file mode 100644
index 0000000..ee213af
--- /dev/null
+++ b/src/lib/components_custom/consts.ts
@@ -0,0 +1,2 @@
+export const apiBaseUrl = 'https://www.chellaris.net/api';
+export const MACHINE_GROUP_ID = 12;
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e298d02..6ecd8e0 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -5,7 +5,7 @@
 	import { browser } from '$app/environment';
 	import { writable } from 'svelte/store';
 	import { themes } from '$lib/types/themes'
-	import { apiBaseUrl } from '$lib/components/consts';
+	import { apiBaseUrl } from '$lib/components_custom/consts';
 	import { LeanChellarisDataStore } from '$lib/stores/ChellarisData';
 	import Header from './Header.svelte';
 	import Settings from './Settings.svelte';
diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte
index 2abc279..bce137d 100644
--- a/src/routes/Settings.svelte
+++ b/src/routes/Settings.svelte
@@ -1,12 +1,9 @@
 <script lang="ts">
 	import { browser } from "$app/environment";
-	import Button from "$lib/components/Button.svelte";
+	import Button from "$lib/components_custom/Button.svelte";
 	import AuthTokenStore from "$lib/stores/AuthTokenStore";
-	import { getModalStore } from "@skeletonlabs/skeleton";
 	import { fade, slide } from "svelte/transition";
 
-  const modalStore = getModalStore();
-
   let showAuthSaved = false;
   let showPlaceholder = true;
 
@@ -32,7 +29,7 @@
   const handleSubmit = () => {
     console.log("submitted ", gameGroupSettings);
     document.cookie = "authToken=" + authToken;
-    modalStore.close();
+    // somehow close the modal
   }
 
   let gameGroupSettings: [] = [];
diff --git a/src/routes/admin/+page.server.ts b/src/routes/admin/+page.server.ts
index c2ec326..095d527 100644
--- a/src/routes/admin/+page.server.ts
+++ b/src/routes/admin/+page.server.ts
@@ -1,4 +1,4 @@
-import { apiBaseUrl } from "$lib/components/consts";
+import { apiBaseUrl } from "$lib/components_custom/consts";
 import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies }) {
diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
index 08820c1..b3a0629 100644
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import LoadingSpinnerLocal from '$lib/components/LoadingSpinnerLocal.svelte';
-	import { apiBaseUrl } from '$lib/components/consts';
+	import LoadingSpinnerLocal from '$lib/components_custom/LoadingSpinnerLocal.svelte';
+	import { apiBaseUrl } from '$lib/components_custom/consts';
 	import AuthTokenStore from '$lib/stores/AuthTokenStore';
 	import AdminSelectedEmpireStore from '$lib/stores/admin-page/EmpireStore';
 	import AdminSelectedGameStore from '$lib/stores/admin-page/GameStore';
diff --git a/src/routes/admin/+page.ts b/src/routes/admin/+page.ts
index cfcaf41..7f1afa1 100644
--- a/src/routes/admin/+page.ts
+++ b/src/routes/admin/+page.ts
@@ -1,4 +1,4 @@
-import { apiBaseUrl } from "$lib/components/consts";
+import { apiBaseUrl } from "$lib/components_custom/consts";
 import AdminSelectedEmpireStore from "$lib/stores/admin-page/EmpireStore";
 import AdminSelectedGameStore from "$lib/stores/admin-page/GameStore";
 import type { ChellarisGameInfo } from "$lib/types/chellaris";
diff --git a/src/routes/admin/EmpireDetails.svelte b/src/routes/admin/EmpireDetails.svelte
index 5b78bee..6b68cc8 100644
--- a/src/routes/admin/EmpireDetails.svelte
+++ b/src/routes/admin/EmpireDetails.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import DropDown from '$lib/components/DropDown.svelte';
-	import DropDownElement from '$lib/components/DropDownElement.svelte';
-	import { MACHINE_GROUP_ID, apiBaseUrl } from '$lib/components/consts';
+	import DropDown from '$lib/components_custom/DropDown.svelte';
+	import DropDownElement from '$lib/components_custom/DropDownElement.svelte';
+	import { MACHINE_GROUP_ID, apiBaseUrl } from '$lib/components_custom/consts';
 	import { LeanChellarisDataStore } from '$lib/stores/ChellarisData';
 	import type { ChellarisEmpire, ChellarisGameGroup } from '$lib/types/chellaris';
 	import type { EmpireEthic } from '$lib/types/stellaris';
diff --git a/src/routes/legacy/graphs/+layout.ts b/src/routes/legacy/graphs/+layout.ts
index 9591a8b..c1116df 100644
--- a/src/routes/legacy/graphs/+layout.ts
+++ b/src/routes/legacy/graphs/+layout.ts
@@ -4,7 +4,7 @@ import SelectedGameGroupsStore, { type SelectedChellarisGroups } from "$lib/stor
 import GraphsTabStore from '$lib/stores/GraphsTab';
 import type { LayoutLoad } from "../../../../.svelte-kit/types/src/routes";
 import type { ChellarisInfo } from '$lib/types/chellaris';
-import { apiBaseUrl } from '$lib/components/consts';
+import { apiBaseUrl } from '$lib/components_custom/consts';
 
 export const load: LayoutLoad = async ({ fetch }) => {
   let store: string | null;
diff --git a/src/routes/legacy/graphs/GameGroupSelection.svelte b/src/routes/legacy/graphs/GameGroupSelection.svelte
index 22384c5..1491983 100644
--- a/src/routes/legacy/graphs/GameGroupSelection.svelte
+++ b/src/routes/legacy/graphs/GameGroupSelection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import DropDown from '$lib/components/DropDown.svelte';
-	import DropDownElement from '$lib/components/DropDownElement.svelte';
+	import DropDown from '$lib/components_custom/DropDown.svelte';
+	import DropDownElement from '$lib/components_custom/DropDownElement.svelte';
 	import SelectedGameGroupsStore from '$lib/stores/GameGroupFilter';
 	import SelectedGameStore from '$lib/stores/GameFilter';
 	import ChellarisDataStore from '$lib/stores/ChellarisData';
diff --git a/src/routes/legacy/graphs/GameSelection.svelte b/src/routes/legacy/graphs/GameSelection.svelte
index 11d2017..6d8e5f5 100644
--- a/src/routes/legacy/graphs/GameSelection.svelte
+++ b/src/routes/legacy/graphs/GameSelection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import DropDown from '$lib/components/DropDown.svelte';
-	import DropDownElement from '$lib/components/DropDownElement.svelte';
+	import DropDown from '$lib/components_custom/DropDown.svelte';
+	import DropDownElement from '$lib/components_custom/DropDownElement.svelte';
 	import SelectedGameStore from '$lib/stores/GameFilter';
 	import ChellarisDataStore from '$lib/stores/ChellarisData';
 
diff --git a/src/routes/legacy/graphs/excel-style/+page.svelte b/src/routes/legacy/graphs/excel-style/+page.svelte
index 7236806..b065e61 100644
--- a/src/routes/legacy/graphs/excel-style/+page.svelte
+++ b/src/routes/legacy/graphs/excel-style/+page.svelte
@@ -4,7 +4,7 @@
 	import type { ChellarisGameGroup, ChellarisInfo, ChellarisEmpire, ChellarisGame } from '$lib/types/chellaris';
 	import ChellarisDataStore from '$lib/stores/ChellarisData';
 	import GraphsTabStore from '$lib/stores/GraphsTab';
-	import LoadingSpinner from '$lib/components/LoadingSpinner.svelte';
+	import LoadingSpinner from '$lib/components_custom/LoadingSpinner.svelte';
 
 	$: selectedGame = $ChellarisDataStore.games[$SelectedGameStore];
 	$: selectedGameGroupData = $SelectedGameGroupsStore[$SelectedGameStore];
diff --git a/src/routes/legacy/legacy-graphs/+page.svelte b/src/routes/legacy/legacy-graphs/+page.svelte
index 24a771a..13a7053 100644
--- a/src/routes/legacy/legacy-graphs/+page.svelte
+++ b/src/routes/legacy/legacy-graphs/+page.svelte
@@ -3,7 +3,7 @@
 	import EthicsBar from './EthicsBar.svelte';
 	import PopsPie from './PopsPie.svelte';
 	import EmpireStats from './EmpireStats.svelte';
-	import LoadingSpinner from '$lib/components/LoadingSpinner.svelte';
+	import LoadingSpinner from '$lib/components_custom/LoadingSpinner.svelte';
 	import { navigating } from '$app/stores';
 	import { fade } from 'svelte/transition';
 
diff --git a/src/routes/legacy/legacy-graphs/+page.ts b/src/routes/legacy/legacy-graphs/+page.ts
index df462e4..179df87 100644
--- a/src/routes/legacy/legacy-graphs/+page.ts
+++ b/src/routes/legacy/legacy-graphs/+page.ts
@@ -1,4 +1,4 @@
-import { apiBaseUrl } from "$lib/components/consts";
+import { apiBaseUrl } from "$lib/components_custom/consts";
 import type { PageLoad } from "../../../../.svelte-kit/types/src/routes";
 
 export const  load: PageLoad = async ({ fetch }) => {