Skip to content

GitLab

Unverified Commit 3b3d0cce authored by Jannik S's avatar Jannik S Committed by GitHub
Browse files

Merge branch 'dev' into dockerfile-optimisation

parents 073f06d4 72110c29
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 156 deletions
src/routes/(app)/+page.svelte
View file @ 3b3d0cce
...@@ -847,6 +847,7 @@ ...@@ -847,6 +847,7 @@
bind:selectedModels bind:selectedModels
bind:showModelSelector bind:showModelSelector
shareEnabled={messages.length > 0} shareEnabled={messages.length > 0}
{chat}
{initNewChat} {initNewChat}
{tags} {tags}
{addTag} {addTag}
......
src/routes/(app)/admin/+page.svelte
View file @ 3b3d0cce
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
import dayjs from 'dayjs';
import { toast } from 'svelte-sonner'; import { toast } from 'svelte-sonner';
import { updateUserRole, getUsers, deleteUserById } from '$lib/apis/users'; import { updateUserRole, getUsers, deleteUserById } from '$lib/apis/users';
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
let loaded = false; let loaded = false;
let users = []; let users = [];
let search = '';
let selectedUser = null; let selectedUser = null;
let showSettingsModal = false; let showSettingsModal = false;
...@@ -80,157 +83,193 @@ ...@@ -80,157 +83,193 @@
<SettingsModal bind:show={showSettingsModal} /> <SettingsModal bind:show={showSettingsModal} />
<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white font-mona"> <div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
{#if loaded} {#if loaded}
<div class=" flex flex-col justify-between w-full overflow-y-auto"> <div class=" flex flex-col justify-between w-full overflow-y-auto">
<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10"> <div class=" mx-auto w-full">
<div class="w-full"> <div class="w-full">
<div class=" flex flex-col justify-center"> <div class=" flex flex-col justify-center">
<div class=" flex justify-between items-center"> <div class=" px-5 pt-3">
<div class="flex items-center text-2xl font-semibold"> <div class=" flex justify-between items-center">
{$i18n.t('All Users')} <div class="flex items-center text-2xl font-semibold font-mona">Dashboard</div>
<div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" /> <div>
<span class="text-lg font-medium text-gray-500 dark:text-gray-300" <button
>{users.length}</span class="flex items-center space-x-1 px-3 py-1.5 rounded-xl bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 transition"
> type="button"
</div> on:click={() => {
<div> showSettingsModal = !showSettingsModal;
<button }}
class="flex items-center space-x-1 px-3 py-1.5 rounded-xl bg-gray-50 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 transition"
type="button"
on:click={() => {
showSettingsModal = !showSettingsModal;
}}
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 16 16"
fill="currentColor"
class="w-4 h-4"
> >
<path <svg
fill-rule="evenodd" xmlns="http://www.w3.org/2000/svg"
d="M6.955 1.45A.5.5 0 0 1 7.452 1h1.096a.5.5 0 0 1 .497.45l.17 1.699c.484.12.94.312 1.356.562l1.321-1.081a.5.5 0 0 1 .67.033l.774.775a.5.5 0 0 1 .034.67l-1.08 1.32c.25.417.44.873.561 1.357l1.699.17a.5.5 0 0 1 .45.497v1.096a.5.5 0 0 1-.45.497l-1.699.17c-.12.484-.312.94-.562 1.356l1.082 1.322a.5.5 0 0 1-.034.67l-.774.774a.5.5 0 0 1-.67.033l-1.322-1.08c-.416.25-.872.44-1.356.561l-.17 1.699a.5.5 0 0 1-.497.45H7.452a.5.5 0 0 1-.497-.45l-.17-1.699a4.973 4.973 0 0 1-1.356-.562L4.108 13.37a.5.5 0 0 1-.67-.033l-.774-.775a.5.5 0 0 1-.034-.67l1.08-1.32a4.971 4.971 0 0 1-.561-1.357l-1.699-.17A.5.5 0 0 1 1 8.548V7.452a.5.5 0 0 1 .45-.497l1.699-.17c.12-.484.312-.94.562-1.356L2.629 4.107a.5.5 0 0 1 .034-.67l.774-.774a.5.5 0 0 1 .67-.033L5.43 3.71a4.97 4.97 0 0 1 1.356-.561l.17-1.699ZM6 8c0 .538.212 1.026.558 1.385l.057.057a2 2 0 0 0 2.828-2.828l-.058-.056A2 2 0 0 0 6 8Z" viewBox="0 0 16 16"
clip-rule="evenodd" fill="currentColor"
/> class="w-4 h-4"
</svg> >
<path
<div class=" text-xs">{$i18n.t('Admin Settings')}</div> fill-rule="evenodd"
</button> d="M6.955 1.45A.5.5 0 0 1 7.452 1h1.096a.5.5 0 0 1 .497.45l.17 1.699c.484.12.94.312 1.356.562l1.321-1.081a.5.5 0 0 1 .67.033l.774.775a.5.5 0 0 1 .034.67l-1.08 1.32c.25.417.44.873.561 1.357l1.699.17a.5.5 0 0 1 .45.497v1.096a.5.5 0 0 1-.45.497l-1.699.17c-.12.484-.312.94-.562 1.356l1.082 1.322a.5.5 0 0 1-.034.67l-.774.774a.5.5 0 0 1-.67.033l-1.322-1.08c-.416.25-.872.44-1.356.561l-.17 1.699a.5.5 0 0 1-.497.45H7.452a.5.5 0 0 1-.497-.45l-.17-1.699a4.973 4.973 0 0 1-1.356-.562L4.108 13.37a.5.5 0 0 1-.67-.033l-.774-.775a.5.5 0 0 1-.034-.67l1.08-1.32a4.971 4.971 0 0 1-.561-1.357l-1.699-.17A.5.5 0 0 1 1 8.548V7.452a.5.5 0 0 1 .45-.497l1.699-.17c.12-.484.312-.94.562-1.356L2.629 4.107a.5.5 0 0 1 .034-.67l.774-.774a.5.5 0 0 1 .67-.033L5.43 3.71a4.97 4.97 0 0 1 1.356-.561l.17-1.699ZM6 8c0 .538.212 1.026.558 1.385l.057.057a2 2 0 0 0 2.828-2.828l-.058-.056A2 2 0 0 0 6 8Z"
clip-rule="evenodd"
/>
</svg>
<div class=" text-xs">{$i18n.t('Admin Settings')}</div>
</button>
</div>
</div> </div>
</div> </div>
<div class=" text-gray-500 text-xs mt-1">
ⓘ {$i18n.t("Click on the user role button to change a user's role.")} <div class="px-5 flex text-sm gap-2.5">
<div class="py-3 border-b font-medium text-gray-100 cursor-pointer">Overview</div>
<!-- <div class="py-3 text-gray-300 cursor-pointer">Users</div> -->
</div> </div>
<hr class=" my-3 dark:border-gray-600" /> <hr class=" mb-3 dark:border-gray-800" />
<div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap"> <div class="px-5">
<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 table-auto"> <div class="mt-0.5 mb-3 flex justify-between">
<thead <div class="flex text-lg font-medium px-0.5">
class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400" {$i18n.t('All Users')}
> <div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" />
<tr> <span class="text-lg font-medium text-gray-500 dark:text-gray-300"
<th scope="col" class="px-3 py-2"> {$i18n.t('Role')} </th> >{users.length}</span
<th scope="col" class="px-3 py-2"> {$i18n.t('Name')} </th> >
<th scope="col" class="px-3 py-2"> {$i18n.t('Email')} </th> </div>
<th scope="col" class="px-3 py-2"> {$i18n.t('Action')} </th>
</tr> <div class="">
</thead> <input
<tbody> class=" w-60 rounded-lg py-1.5 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none"
{#each users as user} placeholder={$i18n.t('Search')}
<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700 text-xs"> bind:value={search}
<td class="px-3 py-2 min-w-[7rem] w-28"> />
<button </div>
class=" flex items-center gap-2 text-xs px-3 py-0.5 rounded-lg {user.role === </div>
'admin' &&
'text-sky-600 dark:text-sky-200 bg-sky-200/30'} {user.role === 'user' && <div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap">
'text-green-600 dark:text-green-200 bg-green-200/30'} {user.role === <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 table-auto">
'pending' && 'text-gray-600 dark:text-gray-200 bg-gray-200/30'}" <thead
on:click={() => { class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-850 dark:text-gray-400"
if (user.role === 'user') { >
updateRoleHandler(user.id, 'admin'); <tr>
} else if (user.role === 'pending') { <th scope="col" class="px-3 py-2"> {$i18n.t('Role')} </th>
updateRoleHandler(user.id, 'user'); <th scope="col" class="px-3 py-2"> {$i18n.t('Name')} </th>
} else { <th scope="col" class="px-3 py-2"> {$i18n.t('Email')} </th>
updateRoleHandler(user.id, 'pending'); <th scope="col" class="px-3 py-2"> {$i18n.t('Created at')} </th>
} <th scope="col" class="px-3 py-2 text-right" />
}} </tr>
> </thead>
<div <tbody>
class="w-1 h-1 rounded-full {user.role === 'admin' && {#each users.filter((user) => {
'bg-sky-600 dark:bg-sky-300'} {user.role === 'user' && if (search === '') {
'bg-green-600 dark:bg-green-300'} {user.role === 'pending' && return true;
'bg-gray-600 dark:bg-gray-300'}" } else {
/> let name = user.name.toLowerCase();
{$i18n.t(user.role)}</button const query = search.toLowerCase();
> return name.includes(query);
</td> }
<td class="px-3 py-2 font-medium text-gray-900 dark:text-white w-max"> }) as user}
<div class="flex flex-row w-max"> <tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700 text-xs">
<img <td class="px-3 py-2 min-w-[7rem] w-28">
class=" rounded-full w-6 h-6 object-cover mr-2.5"
src={user.profile_image_url}
alt="user"
/>
<div class=" font-medium self-center">{user.name}</div>
</div>
</td>
<td class=" px-3 py-2"> {user.email} </td>
<td class="px-3 py-2">
<div class="flex justify-start w-full">
<button <button
class="self-center w-fit text-sm px-2 py-2 hover:bg-black/5 dark:hover:bg-white/5 rounded-xl" class=" flex items-center gap-2 text-xs px-3 py-0.5 rounded-lg {user.role ===
on:click={async () => { 'admin' &&
showEditUserModal = !showEditUserModal; 'text-sky-600 dark:text-sky-200 bg-sky-200/30'} {user.role ===
selectedUser = user; 'user' &&
'text-green-600 dark:text-green-200 bg-green-200/30'} {user.role ===
'pending' && 'text-gray-600 dark:text-gray-200 bg-gray-200/30'}"
on:click={() => {
if (user.role === 'user') {
updateRoleHandler(user.id, 'admin');
} else if (user.role === 'pending') {
updateRoleHandler(user.id, 'user');
} else {
updateRoleHandler(user.id, 'pending');
}
}} }}
> >
<svg <div
xmlns="http://www.w3.org/2000/svg" class="w-1 h-1 rounded-full {user.role === 'admin' &&
fill="none" 'bg-sky-600 dark:bg-sky-300'} {user.role === 'user' &&
viewBox="0 0 24 24" 'bg-green-600 dark:bg-green-300'} {user.role === 'pending' &&
stroke-width="1.5" 'bg-gray-600 dark:bg-gray-300'}"
stroke="currentColor" />
class="w-4 h-4" {$i18n.t(user.role)}</button
>
</td>
<td class="px-3 py-2 font-medium text-gray-900 dark:text-white w-max">
<div class="flex flex-row w-max">
<img
class=" rounded-full w-6 h-6 object-cover mr-2.5"
src={user.profile_image_url}
alt="user"
/>
<div class=" font-medium self-center">{user.name}</div>
</div>
</td>
<td class=" px-3 py-2"> {user.email} </td>
<td class=" px-3 py-2">
{dayjs(user.timestamp * 1000).format($i18n.t('MMMM DD, YYYY'))}
</td>
<td class="px-3 py-2 text-right">
<div class="flex justify-end w-full">
<button
class="self-center w-fit text-sm px-2 py-2 hover:bg-black/5 dark:hover:bg-white/5 rounded-xl"
on:click={async () => {
showEditUserModal = !showEditUserModal;
selectedUser = user;
}}
> >
<path <svg
stroke-linecap="round" xmlns="http://www.w3.org/2000/svg"
stroke-linejoin="round" fill="none"
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125" viewBox="0 0 24 24"
/> stroke-width="1.5"
</svg> stroke="currentColor"
</button> class="w-4 h-4"
>
<path
stroke-linecap="round"
stroke-linejoin="round"
d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"
/>
</svg>
</button>
<button <button
class="self-center w-fit text-sm px-2 py-2 hover:bg-black/5 dark:hover:bg-white/5 rounded-xl" class="self-center w-fit text-sm px-2 py-2 hover:bg-black/5 dark:hover:bg-white/5 rounded-xl"
on:click={async () => { on:click={async () => {
deleteUserHandler(user.id); deleteUserHandler(user.id);
}} }}
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
class="w-4 h-4"
> >
<path <svg
stroke-linecap="round" xmlns="http://www.w3.org/2000/svg"
stroke-linejoin="round" fill="none"
d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" viewBox="0 0 24 24"
/> stroke-width="1.5"
</svg> stroke="currentColor"
</button> class="w-4 h-4"
</div> >
</td> <path
</tr> stroke-linecap="round"
{/each} stroke-linejoin="round"
</tbody> d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"
</table> />
</svg>
</button>
</div>
</td>
</tr>
{/each}
</tbody>
</table>
</div>
<div class=" text-gray-500 text-xs mt-2 text-right">
ⓘ {$i18n.t("Click on the user role button to change a user's role.")}
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/routes/(app)/c/[id]/+page.svelte
View file @ 3b3d0cce
...@@ -865,6 +865,7 @@ ...@@ -865,6 +865,7 @@
<div class="min-h-screen max-h-screen w-full flex flex-col"> <div class="min-h-screen max-h-screen w-full flex flex-col">
<Navbar <Navbar
{title} {title}
{chat}
bind:selectedModels bind:selectedModels
bind:showModelSelector bind:showModelSelector
shareEnabled={messages.length > 0} shareEnabled={messages.length > 0}
......
src/routes/auth/+page.svelte
View file @ 3b3d0cce
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
import { WEBUI_NAME, config, user } from '$lib/stores'; import { WEBUI_NAME, config, user } from '$lib/stores';
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
import { toast } from 'svelte-sonner'; import { toast } from 'svelte-sonner';
import { generateInitialsImage, canvasPixelTest } from '$lib/utils';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
...@@ -36,10 +37,12 @@ ...@@ -36,10 +37,12 @@
}; };
const signUpHandler = async () => { const signUpHandler = async () => {
const sessionUser = await userSignUp(name, email, password).catch((error) => { const sessionUser = await userSignUp(name, email, password, generateInitialsImage(name)).catch(
toast.error(error); (error) => {
return null; toast.error(error);
}); return null;
}
);
await setSessionUser(sessionUser); await setSessionUser(sessionUser);
}; };
......
static/manifest.json deleted 100644 → 0
View file @ 073f06d4
{
"name": "Open WebUI",
"short_name": "Open WebUI",
"start_url": "/",
"display": "standalone",
"background_color": "#343541",
"theme_color": "#343541",
"orientation": "portrait-primary",
"icons": [
{
"src": "/favicon.png",
"type": "image/png",
"sizes": "844x884"
}
]
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment