فهرست منبع

fix: block users from /workspace and /admin

Timothy J. Baek 9 ماه پیش
والد
کامیت
c6d7f24542
2فایلهای تغییر یافته به همراه135 افزوده شده و 112 حذف شده
  1. 55 43
      src/routes/(app)/admin/+layout.svelte
  2. 80 69
      src/routes/(app)/workspace/+layout.svelte

+ 55 - 43
src/routes/(app)/admin/+layout.svelte

@@ -1,11 +1,21 @@
 <script lang="ts">
 <script lang="ts">
 	import { onMount, getContext } from 'svelte';
 	import { onMount, getContext } from 'svelte';
+	import { goto } from '$app/navigation';
 
 
-	import { WEBUI_NAME, showSidebar } from '$lib/stores';
+	import { WEBUI_NAME, showSidebar, user } from '$lib/stores';
 	import MenuLines from '$lib/components/icons/MenuLines.svelte';
 	import MenuLines from '$lib/components/icons/MenuLines.svelte';
 	import { page } from '$app/stores';
 	import { page } from '$app/stores';
 
 
 	const i18n = getContext('i18n');
 	const i18n = getContext('i18n');
+
+	let loaded = false;
+
+	onMount(async () => {
+		if ($user?.role !== 'admin') {
+			await goto('/');
+		}
+		loaded = true;
+	});
 </script>
 </script>
 
 
 <svelte:head>
 <svelte:head>
@@ -14,49 +24,50 @@
 	</title>
 	</title>
 </svelte:head>
 </svelte:head>
 
 
-<div
-	class=" flex flex-col w-full min-h-screen max-h-screen {$showSidebar
-		? 'md:max-w-[calc(100%-260px)]'
-		: ''}"
->
-	<div class=" px-4 pt-3 mt-0.5 mb-1">
-		<div class=" flex items-center gap-1">
-			<div class="{$showSidebar ? 'md:hidden' : ''} mr-1 self-start flex flex-none items-center">
-				<button
-					id="sidebar-toggle-button"
-					class="cursor-pointer p-1 flex rounded-xl hover:bg-gray-100 dark:hover:bg-gray-850 transition"
-					on:click={() => {
-						showSidebar.set(!$showSidebar);
-					}}
-				>
-					<div class=" m-auto self-center">
-						<MenuLines />
-					</div>
-				</button>
+{#if loaded}
+	<div
+		class=" flex flex-col w-full min-h-screen max-h-screen {$showSidebar
+			? 'md:max-w-[calc(100%-260px)]'
+			: ''}"
+	>
+		<div class=" px-4 pt-3 mt-0.5 mb-1">
+			<div class=" flex items-center gap-1">
+				<div class="{$showSidebar ? 'md:hidden' : ''} mr-1 self-start flex flex-none items-center">
+					<button
+						id="sidebar-toggle-button"
+						class="cursor-pointer p-1 flex rounded-xl hover:bg-gray-100 dark:hover:bg-gray-850 transition"
+						on:click={() => {
+							showSidebar.set(!$showSidebar);
+						}}
+					>
+						<div class=" m-auto self-center">
+							<MenuLines />
+						</div>
+					</button>
+				</div>
+				<div class="flex items-center text-xl font-semibold">{$i18n.t('Admin Panel')}</div>
 			</div>
 			</div>
-			<div class="flex items-center text-xl font-semibold">{$i18n.t('Admin Panel')}</div>
 		</div>
 		</div>
-	</div>
 
 
-	<div class="px-4 my-1">
-		<div
-			class="flex scrollbar-none overflow-x-auto w-fit text-center text-sm font-medium rounded-xl bg-transparent/10 p-1"
-		>
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {['/admin', '/admin/'].includes($page.url.pathname)
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/admin">{$i18n.t('Dashboard')}</a
+		<div class="px-4 my-1">
+			<div
+				class="flex scrollbar-none overflow-x-auto w-fit text-center text-sm font-medium rounded-xl bg-transparent/10 p-1"
 			>
 			>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {['/admin', '/admin/'].includes($page.url.pathname)
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/admin">{$i18n.t('Dashboard')}</a
+				>
 
 
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/admin/settings')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/admin/settings">{$i18n.t('Settings')}</a
-			>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/admin/settings')
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/admin/settings">{$i18n.t('Settings')}</a
+				>
 
 
-			<!-- <a
+				<!-- <a
 				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/documents')
 				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/documents')
 					? 'bg-gray-50 dark:bg-gray-850'
 					? 'bg-gray-50 dark:bg-gray-850'
 					: ''} transition"
 					: ''} transition"
@@ -71,12 +82,13 @@
 					: ''} transition"
 					: ''} transition"
 				href="/workspace/playground">{$i18n.t('Playground')}</a
 				href="/workspace/playground">{$i18n.t('Playground')}</a
 			> -->
 			> -->
+			</div>
 		</div>
 		</div>
-	</div>
 
 
-	<hr class=" my-2 dark:border-gray-850" />
+		<hr class=" my-2 dark:border-gray-850" />
 
 
-	<div class=" py-1 px-5 flex-1 max-h-full overflow-y-auto">
-		<slot />
+		<div class=" py-1 px-5 flex-1 max-h-full overflow-y-auto">
+			<slot />
+		</div>
 	</div>
 	</div>
-</div>
+{/if}

+ 80 - 69
src/routes/(app)/workspace/+layout.svelte

@@ -1,15 +1,20 @@
 <script lang="ts">
 <script lang="ts">
 	import { onMount, getContext } from 'svelte';
 	import { onMount, getContext } from 'svelte';
+	import { WEBUI_NAME, showSidebar, functions, user } from '$lib/stores';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
 
 
-	import { WEBUI_NAME, showSidebar, functions } from '$lib/stores';
 	import MenuLines from '$lib/components/icons/MenuLines.svelte';
 	import MenuLines from '$lib/components/icons/MenuLines.svelte';
-	import { page } from '$app/stores';
-	import { getFunctions } from '$lib/apis/functions';
 
 
 	const i18n = getContext('i18n');
 	const i18n = getContext('i18n');
 
 
+	let loaded = false;
+
 	onMount(async () => {
 	onMount(async () => {
-		// functions.set(await getFunctions(localStorage.token));
+		if ($user?.role !== 'admin') {
+			await goto('/');
+		}
+		loaded = true;
 	});
 	});
 </script>
 </script>
 
 
@@ -19,80 +24,86 @@
 	</title>
 	</title>
 </svelte:head>
 </svelte:head>
 
 
-<div
-	class=" flex flex-col w-full min-h-screen max-h-screen {$showSidebar
-		? 'md:max-w-[calc(100%-260px)]'
-		: ''}"
->
-	<div class=" px-4 pt-3 mt-0.5 mb-1">
-		<div class=" flex items-center gap-1">
-			<div class="{$showSidebar ? 'md:hidden' : ''} mr-1 self-start flex flex-none items-center">
-				<button
-					id="sidebar-toggle-button"
-					class="cursor-pointer p-1 flex rounded-xl hover:bg-gray-100 dark:hover:bg-gray-850 transition"
-					on:click={() => {
-						showSidebar.set(!$showSidebar);
-					}}
-				>
-					<div class=" m-auto self-center">
-						<MenuLines />
-					</div>
-				</button>
+{#if loaded}
+	<div
+		class=" flex flex-col w-full min-h-screen max-h-screen {$showSidebar
+			? 'md:max-w-[calc(100%-260px)]'
+			: ''}"
+	>
+		<div class=" px-4 pt-3 mt-0.5 mb-1">
+			<div class=" flex items-center gap-1">
+				<div class="{$showSidebar ? 'md:hidden' : ''} mr-1 self-start flex flex-none items-center">
+					<button
+						id="sidebar-toggle-button"
+						class="cursor-pointer p-1 flex rounded-xl hover:bg-gray-100 dark:hover:bg-gray-850 transition"
+						on:click={() => {
+							showSidebar.set(!$showSidebar);
+						}}
+					>
+						<div class=" m-auto self-center">
+							<MenuLines />
+						</div>
+					</button>
+				</div>
+				<div class="flex items-center text-xl font-semibold">{$i18n.t('Workspace')}</div>
 			</div>
 			</div>
-			<div class="flex items-center text-xl font-semibold">{$i18n.t('Workspace')}</div>
 		</div>
 		</div>
-	</div>
 
 
-	<div class="px-4 my-1">
-		<div
-			class="flex scrollbar-none overflow-x-auto w-fit text-center text-sm font-medium rounded-xl bg-transparent/10 p-1"
-		>
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/models')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/workspace/models">{$i18n.t('Models')}</a
+		<div class="px-4 my-1">
+			<div
+				class="flex scrollbar-none overflow-x-auto w-fit text-center text-sm font-medium rounded-xl bg-transparent/10 p-1"
 			>
 			>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/models')
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/workspace/models">{$i18n.t('Models')}</a
+				>
 
 
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/prompts')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/workspace/prompts">{$i18n.t('Prompts')}</a
-			>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/prompts')
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/workspace/prompts">{$i18n.t('Prompts')}</a
+				>
 
 
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/documents')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/workspace/documents"
-			>
-				{$i18n.t('Documents')}
-			</a>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes(
+						'/workspace/documents'
+					)
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/workspace/documents"
+				>
+					{$i18n.t('Documents')}
+				</a>
 
 
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/tools')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/workspace/tools"
-			>
-				{$i18n.t('Tools')}
-			</a>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/tools')
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/workspace/tools"
+				>
+					{$i18n.t('Tools')}
+				</a>
 
 
-			<a
-				class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/functions')
-					? 'bg-gray-50 dark:bg-gray-850'
-					: ''} transition"
-				href="/workspace/functions"
-			>
-				{$i18n.t('Functions')}
-			</a>
+				<a
+					class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes(
+						'/workspace/functions'
+					)
+						? 'bg-gray-50 dark:bg-gray-850'
+						: ''} transition"
+					href="/workspace/functions"
+				>
+					{$i18n.t('Functions')}
+				</a>
+			</div>
 		</div>
 		</div>
-	</div>
 
 
-	<hr class=" my-2 dark:border-gray-850" />
+		<hr class=" my-2 dark:border-gray-850" />
 
 
-	<div class=" py-1 px-5 flex-1 max-h-full overflow-y-auto">
-		<slot />
+		<div class=" py-1 px-5 flex-1 max-h-full overflow-y-auto">
+			<slot />
+		</div>
 	</div>
 	</div>
-</div>
+{/if}