Merge pull request #11 from GeoChatter/testing_map

Testing map
GeoChatter · Sep 6, 2022 · a32bf3d · a32bf3d
2 parents 33d9e8a + 9d43b10
commit a32bf3d
Show file tree

Hide file tree

Showing 13 changed files with 1,515 additions and 619 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/lib/Drawer.svelte b/src/lib/Drawer.svelte
@@ -121,17 +121,17 @@
 			<MapPicker isDrawer={true} />
 
 			{#if $user}
-				<li class="form-control">
-					<label class="label cursor-pointer">
-						<span class="label-text">enable copy and paste</span>
-						<input
-							type="checkbox"
-							class="toggle"
-							on:click={() => $settings.change('copyAndPaste', !$settings.values.copyAndPaste)}
-							checked={$settings.values.copyAndPaste}
-						/>
-					</label>
-				</li>
+				<!-- <li class="form-control"> -->
+				<!-- 	<label class="label cursor-pointer"> -->
+				<!-- 		<span class="label-text">enable copy and paste</span> -->
+				<!-- 		<input -->
+				<!-- 			type="checkbox" -->
+				<!-- 			class="toggle" -->
+				<!-- 			on:click={() => $settings.change('copyAndPaste', !$settings.values.copyAndPaste)} -->
+				<!-- 			checked={$settings.values.copyAndPaste} -->
+				<!-- 		/> -->
+				<!-- 	</label> -->
+				<!-- </li> -->
 				<li class="form-control">
 					<label class="label cursor-pointer">
 						<span class="label-text">enable temporary guess</span>

diff --git a/src/lib/Leaflet.svelte b/src/lib/Leaflet.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { user } from '$lib/supabase';
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 	import { getCountry } from '$lib/js/helpers/getFeature';
 
 	// import L from 'leaflet';

diff --git a/src/lib/Map.svelte b/src/lib/Map.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { user, auth, supabase } from '$lib/supabase';
 	// @ts-ignore
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 	import { mapType, styles } from '$lib/MapPicker.svelte';
 	import { LogInIcon, EyeOffIcon, ListIcon, FlagIcon, AwardIcon } from 'svelte-feather-icons';
 	import Leaflet from './Leaflet.svelte';

diff --git a/src/lib/MapBox.svelte b/src/lib/MapBox.svelte
@@ -2,7 +2,7 @@
 	import { user } from '$lib/supabase';
 	import settings from '$lib/js/settings';
 	// @ts-ignore
-	import { browser, dev } from '$app/env';
+	import { browser, dev } from '$app/environment';
 	import { mapType } from '$lib/MapPicker.svelte';
 	import { getCountry } from '$lib/js/helpers/getFeature';
 	import {

diff --git a/src/lib/MapPicker.svelte b/src/lib/MapPicker.svelte
@@ -20,7 +20,7 @@
 </script>
 
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 	import { MapIcon } from 'svelte-feather-icons';
 
 	const createMostUsedArray = (): string[] => {

diff --git a/src/lib/Twitch.svelte b/src/lib/Twitch.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
 	import settings from './js/settings';
 </script>
 

diff --git a/src/lib/js/api.ts b/src/lib/js/api.ts
@@ -59,6 +59,7 @@ class Api {
   constructor(bot: string) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
+    console.log(import.meta.VITE_GEOCHATTERURL)
     this.client = new GCSocketClient(import.meta.env.VITE_GEOCHATTERURL as string, bot ?? "", {
       onFailedGuess: (_, text) => {
 

diff --git a/src/lib/js/settings.ts b/src/lib/js/settings.ts
@@ -1,6 +1,6 @@
 import { writable, type Writable } from "svelte/store"
 // @ts-ignore
-import { browser } from "$app/env"
+import { browser } from "$app/environment"
 
 import { z, MapOptions } from "GCSocketClient"
 
@@ -99,9 +99,11 @@ export class Settings {
 
   load() {
     if (browser) {
-      const loadedObj = JSON.parse(localStorage.getItem("settings")) ?? {}
+      const loadedObj = JSON.parse(localStorage.getItem("settings")) ?? {}  
       for (const key of Object.keys(loadedObj)) {
-        this._values[key] = loadedObj[key]
+        if (key !== "copyAndPaste") {
+          this._values[key] = loadedObj[key]
+        }
       }
     }
   }

diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -0,0 +1 @@
+export const prerender = true
diff --git a/src/routes/__layout.svelte → src/routes/+layout.svelte b/src/routes/__layout.svelte → src/routes/+layout.svelte
@@ -1,6 +1,5 @@
 <script>
 	import Drawer from '$lib/Drawer.svelte';
-
 	import '../app.css';
 </script>
 

diff --git a/src/routes/index.svelte → src/routes/+page.svelte b/src/routes/index.svelte → src/routes/+page.svelte
@@ -1,7 +1,9 @@
 <script>
+
+
 	import Map from '$lib/Map.svelte';
 
-	import { browser, dev } from '$app/env';
+	import { browser, dev } from '$app/environment';
 	import { supabase } from '$lib/supabase';
 	import Auth from '$lib/Auth.svelte';
 	import { user } from '$lib/supabase';

diff --git a/svelte.config.js b/svelte.config.js
@@ -8,10 +8,8 @@ const config = {
   preprocess: preprocess(),
   kit: {
 
-    prerender: { enabled: true, default: true },
     paths: {
       base: dev ? '' : process.env.BASE_PATH
-
     },
     adapter: adapter({
       // default options are shown