fix: closes #1178

ThatConference · Feb 3, 2022 · bad3a20 · bad3a20
1 parent a3ba6f1
commit bad3a20
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/src/_components/activities/ActivityDetails.svelte b/src/_components/activities/ActivityDetails.svelte
@@ -84,9 +84,9 @@
 		(x) => x.value === sessionLocation?.destination
 	)?.label;
 
-	let edit = $page.query.get('edit');
-	let isNew = $page.query.get('isNew');
-	let isUpdated = $page.query.get('isUpdated');
+	let edit = $page.url.searchParams.get('edit');
+	let isNew = $page.url.searchParams.get('isNew');
+	let isUpdated = $page.url.searchParams.get('isUpdated');
 
 	let favoriteDisabled = false;
 
@@ -147,7 +147,7 @@
 				isInWindow = inSession;
 
 				if (!inSession) {
-					const join = $page.query.get('join');
+					const join = $page.url.searchParams.get('join');
 					if (join) isInWindow = true;
 				}
 			}, 1000);

diff --git a/src/_components/activities/Card.svelte b/src/_components/activities/Card.svelte
@@ -104,7 +104,7 @@
 			hasExpired = dayjs().isAfter(currentEndTime);
 
 			if (!inSession) {
-				const join = $page.query.get('join');
+				const join = $page.url.searchParams.get('join');
 				if (join) isInWindow = true;
 			}
 		}, 1000);

diff --git a/src/routes/activities/create/cfp.svelte b/src/routes/activities/create/cfp.svelte
@@ -40,7 +40,8 @@
 	import Create from './index.svelte';
 
 	onMount(() => {
-		if (!$page.query.has('event')) window.history.replaceState(null, null, `?event=${eventId}`);
+		if (!$page.url.searchParams.has('event'))
+			window.history.replaceState(null, null, `?event=${eventId}`);
 	});
 
 	const metaTags = ((title = `THAT Conference Texas and Wisconsin call for speakers.`) => ({

diff --git a/src/routes/login-redirect.svelte b/src/routes/login-redirect.svelte
@@ -1,7 +1,9 @@
 <script>
 	import { page } from '$app/stores';
 
-	const returnTo = $page.query.has('returnTo') ? $page.query.get('returnTo') : '/';
+	const returnTo = $page.url.searchParams.has('returnTo')
+		? $page.url.searchParams.get('returnTo')
+		: '/';
 </script>
 
 <div

diff --git a/src/routes/orders/success/index.svelte b/src/routes/orders/success/index.svelte
@@ -26,10 +26,18 @@
 		target location - [TL=on&TL=at]
 	*/
 
-	const isBulkPurchase = $page.query.has('B') ? Boolean(parseInt($page.query.get('B'))) : false;
-	const isMembership = $page.query.has('M') ? Boolean(parseInt($page.query.get('M'))) : false;
-	const eventLocation = $page.query.has('EL') ? $page.query.get('EL') : undefined;
-	const targetLocations = $page.query.has('TL') ? $page.query.getAll('TL') : [];
+	const isBulkPurchase = $page.url.searchParams.has('B')
+		? Boolean(parseInt($page.url.searchParams.get('B')))
+		: false;
+	const isMembership = $page.url.searchParams.has('M')
+		? Boolean(parseInt($page.url.searchParams.get('M')))
+		: false;
+	const eventLocation = $page.url.searchParams.has('EL')
+		? $page.url.searchParams.get('EL')
+		: undefined;
+	const targetLocations = $page.url.searchParams.has('TL')
+		? $page.url.searchParams.getAll('TL')
+		: [];
 </script>
 
 <Seo title={metaTags.title} tags={metaTags.tags} />

diff --git a/src/routes/promo/index.svelte b/src/routes/promo/index.svelte
@@ -26,7 +26,7 @@
 		})
 	}))();
 
-	const eventId = $page.query.get('eventId');
+	const eventId = $page.url.searchParams.get('eventId');
 	const { send } = getContext('cart');
 
 	let event;