lots of updates, implementing design, refactoring, bug fixes and more

1 files changed, 4 insertions, 4 deletions

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 406c29e2..167fba93 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,6 +1,5 @@
 <script>
 	import { SvelteToast } from '@zerodevx/svelte-toast';
-	import { toast } from '@zerodevx/svelte-toast';
 	import '../app.css';
 	import { onMount } from 'svelte';
 	import { connect } from '$lib/socket';
@@ -9,18 +8,19 @@
 	import { browser } from '$app/env';
 	import { goto } from '$app/navigation';
 	import { LoadingSplash } from '$comp';
+	import { warning, protectedRoutes } from '$lib/utils';
 
 	browser && ($token ||= $session.token);
-	let protectedRoutes = [/receive/, /customers/, /dashboard/, /settings/, /transactions/];
+
 	let ready = false;
 
 	onMount(() => {
 		if (protectedRoutes.find((p) => $page.url.pathname.match(p))) {
 			if (!$token) {
 				goto('/login');
-				toast.push('Please sign in to continue.');
+				warning('Please sign in to continue.');
 			}
-			user.subscribe((u) => (ready = true));
+			user.subscribe((u) => u?.username && (ready = true));
 		} else {
 			ready = true;
 		}