Merge pull request #32 from tminaorg/correct-usage-of-uni-load

fix: Correct usage of uni load

.dockerignore

@@ -1,4 +1,4 @@
-fly.toml
-.dockerignore
-.github
-.env*
+**
+!docker/
+!build/
+!package.json

.env.example

@@ -1,3 +1,3 @@
 ORIGIN=http://localhost:5173 # this server
-API_URL=http://localhost:3030 # server reachable
-PUBLIC_API_URL=http://localhost:3030 # client reachable
+PUBLIC_API_URL_SSR=http://localhost:3030 # server reachable
+PUBLIC_API_URL_CSR=http://localhost:3030 # client reachable

fly.toml

@@ -6,8 +6,8 @@ primary_region = "cdg"
 
 [env]
   ORIGIN = "https://brzaguza.rs"
-  API_URL = "http://zadnjica.internal:3030"
-  PUBLIC_API_URL = "https://api.brzaguza.rs"
+  PUBLIC_API_URL_SSR = "http://zadnjica.internal:3030"
+  PUBLIC_API_URL_CSR = "https://api.brzaguza.rs"
 
 [http_service]
   internal_port = 3000

src/routes/search/+page.ts

@@ -1,24 +1,24 @@
 import type { PageLoad } from './$types';
 import { env } from '$env/dynamic/public';
+import { browser } from '$app/environment';
 
-export const load: PageLoad = async ({ data, fetch, url }) => {
-	// this runs on SSR (+page.server.ts)
-	if (data != null) {
-		return {
-			query: data.query,
-			results: data.results
-		};
-	}
-
-	// this runs on CSR
+export const load: PageLoad = async ({ fetch, url }) => {
 	const q = url.searchParams.get('q');
 	if (q === null || q === '') {
 		return {
 			query: '',
 			results: []
 		};
 	}
-	const apiUrl = `${env.PUBLIC_API_URL}/search?${url.searchParams}`;
+
+	let apiUri;
+	if (!browser) {
+		apiUri = env.PUBLIC_API_URL_SSR;
+	} else {
+		apiUri = env.PUBLIC_API_URL_CSR;
+	}
+
+	const apiUrl = `${apiUri}/search?${url.searchParams}`;
 	const response = await fetch(apiUrl);
 	const results = await response.json();