Merge pull request #1488 from open-webui/dev

0.1.118

src/lib/i18n/locales/en-US/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "",
 	"Deleted {tagName}": "",
 	"Description": "",
-	"Desktop Notifications": "",
+	"Notifications": "",
 	"Disabled": "",
 	"Discover a modelfile": "",
 	"Discover a prompt": "",
@@ -120,6 +120,7 @@
 	"Edit Doc": "",
 	"Edit User": "",
 	"Email": "",
+	"Embedding model: {{embedding_model}}": "",
 	"Enable Chat History": "",
 	"Enable New Sign Ups": "",
 	"Enabled": "",
@@ -150,6 +151,7 @@
 	"Failed to read clipboard contents": "",
 	"File Mode": "",
 	"File not found.": "",
+	"Fingerprint spoofing detected: Unable to use initials as avatar. Defaulting to default profile image.": "",
 	"Focus chat input": "",
 	"Format your variables using square brackets like this:": "",
 	"From (Base Model)": "",
@@ -193,8 +195,11 @@
 	"MMMM DD, YYYY": "",
 	"Model '{{modelName}}' has been successfully downloaded.": "",
 	"Model '{{modelTag}}' is already in queue for downloading.": "",
+	"Model {{embedding_model}} update complete!": "",
+	"Model {{embedding_model}} update failed or not required!": "",
 	"Model {{modelId}} not found": "",
 	"Model {{modelName}} already exists.": "",
+	"Model filesystem path detected. Model shortname is required for update, cannot continue.": "",
 	"Model Name": "",
 	"Model not selected": "",
 	"Model Tag Name": "",
@@ -332,7 +337,10 @@
 	"TTS Settings": "",
 	"Type Hugging Face Resolve (Download) URL": "",
 	"Uh-oh! There was an issue connecting to {{provider}}.": "",
+	"Understand that updating or changing your embedding model requires reset of the vector database and re-import of all documents. You have been warned!": "",
 	"Unknown File Type '{{file_type}}', but accepting and treating as plain text": "",
+	"Update": "",
+	"Update embedding model {{embedding_model}}": "",
 	"Update password": "",
 	"Upload a GGUF model": "",
 	"Upload files": "",
@@ -340,6 +348,7 @@
 	"URL Mode": "",
 	"Use '#' in the prompt input to load and select your documents.": "",
 	"Use Gravatar": "",
+	"Use Initials": "",
 	"user": "",
 	"User Permissions": "",
 	"Users": "",

src/lib/i18n/locales/es-ES/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "Se borró {{deleteModelTag}}",
 	"Deleted {tagName}": "Se borró {tagName}",
 	"Description": "Descripción",
-	"Desktop Notifications": "Notificaciones",
+	"Notifications": "Notificaciones",
 	"Disabled": "Desactivado",
 	"Discover a modelfile": "Descubre un modelfile",
 	"Discover a prompt": "Descubre un Prompt",

src/lib/i18n/locales/fa-IR/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} پاک شد",
 	"Deleted {tagName}": "{tagName} حذف شد",
 	"Description": "توضیحات",
-	"Desktop Notifications": "اعلان",
+	"Notifications": "اعلان",
 	"Disabled": "غیرفعال",
 	"Discover a modelfile": "فایل مدل را کشف کنید",
 	"Discover a prompt": "یک اعلان را کشف کنید",

src/lib/i18n/locales/fr-CA/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} supprimé",
 	"Deleted {tagName}": "{tagName} supprimé",
 	"Description": "Description",
-	"Desktop Notifications": "Notifications de bureau",
+	"Notifications": "Notifications de bureau",
 	"Disabled": "Désactivé",
 	"Discover a modelfile": "Découvrir un fichier de modèle",
 	"Discover a prompt": "Découvrir un prompt",

src/lib/i18n/locales/fr-FR/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} supprimé",
 	"Deleted {tagName}": "{tagName} supprimé",
 	"Description": "Description",
-	"Desktop Notifications": "Notifications de bureau",
+	"Notifications": "Notifications de bureau",
 	"Disabled": "Désactivé",
 	"Discover a modelfile": "Découvrir un fichier de modèle",
 	"Discover a prompt": "Découvrir un prompt",

src/lib/i18n/locales/it-IT/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "Eliminato {{deleteModelTag}}",
 	"Deleted {tagName}": "Eliminato {tagName}",
 	"Description": "Descrizione",
-	"Desktop Notifications": "Notifiche desktop",
+	"Notifications": "Notifiche desktop",
 	"Disabled": "Disabilitato",
 	"Discover a modelfile": "Scopri un file modello",
 	"Discover a prompt": "Scopri un prompt",

src/lib/i18n/locales/ja-JP/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} を削除しました",
 	"Deleted {tagName}": "{tagName} を削除しました",
 	"Description": "説明",
-	"Desktop Notifications": "デスクトップ通知",
+	"Notifications": "デスクトップ通知",
 	"Disabled": "無効",
 	"Discover a modelfile": "モデルファイルを見つける",
 	"Discover a prompt": "プロンプトを見つける",

src/lib/i18n/locales/ko-KR/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} 삭제됨",
 	"Deleted {tagName}": "{tagName} 삭제됨",
 	"Description": "설명",
-	"Desktop Notifications": "알림",
+	"Notifications": "알림",
 	"Disabled": "비활성화",
 	"Discover a modelfile": "모델파일 검색",
 	"Discover a prompt": "프롬프트 검색",

src/lib/i18n/locales/languages.json

@@ -15,6 +15,10 @@
 		"code": "de-DE",
 		"title": "Deutsch"
 	},
+	{
+		"code": "en-GB",
+		"title": "English (GB)"
+	},
 	{
 		"code": "es-ES",
 		"title": "Spanish"

src/lib/i18n/locales/nl-NL/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} is verwijderd",
 	"Deleted {tagName}": "{tagName} is verwijderd",
 	"Description": "Beschrijving",
-	"Desktop Notifications": "Desktop Notificaties",
+	"Notifications": "Desktop Notificaties",
 	"Disabled": "Uitgeschakeld",
 	"Discover a modelfile": "Ontdek een modelfile",
 	"Discover a prompt": "Ontdek een prompt",

src/lib/i18n/locales/pt-BR/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} excluído",
 	"Deleted {tagName}": "{tagName} excluído",
 	"Description": "Descrição",
-	"Desktop Notifications": "Notificações da Área de Trabalho",
+	"Notifications": "Notificações da Área de Trabalho",
 	"Disabled": "Desativado",
 	"Discover a modelfile": "Descobrir um arquivo de modelo",
 	"Discover a prompt": "Descobrir um prompt",

src/lib/i18n/locales/pt-PT/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} excluído",
 	"Deleted {tagName}": "{tagName} excluído",
 	"Description": "Descrição",
-	"Desktop Notifications": "Notificações da Área de Trabalho",
+	"Notifications": "Notificações da Área de Trabalho",
 	"Disabled": "Desativado",
 	"Discover a modelfile": "Descobrir um arquivo de modelo",
 	"Discover a prompt": "Descobrir um prompt",

src/lib/i18n/locales/ru-RU/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "Удалено {{deleteModelTag}}",
 	"Deleted {tagName}": "Удалено {tagName}",
 	"Description": "Описание",
-	"Desktop Notifications": "Уведомления на рабочем столе",
+	"Notifications": "Уведомления на рабочем столе",
 	"Disabled": "Отключено",
 	"Discover a modelfile": "Найти файл модели",
 	"Discover a prompt": "Найти промт",

src/lib/i18n/locales/tr-TR/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "{{deleteModelTag}} silindi",
 	"Deleted {tagName}": "{tagName} silindi",
 	"Description": "Açıklama",
-	"Desktop Notifications": "Masaüstü Bildirimleri",
+	"Notifications": "Bildirimler",
 	"Disabled": "Devre Dışı",
 	"Discover a modelfile": "Bir model dosyası keşfedin",
 	"Discover a prompt": "Bir prompt keşfedin",

src/lib/i18n/locales/uk-UA/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "Видалено {{deleteModelTag}}",
 	"Deleted {tagName}": "Видалено {tagName}",
 	"Description": "Опис",
-	"Desktop Notifications": "Сповіщення",
+	"Notifications": "Сповіщення",
 	"Disabled": "Вимкнено",
 	"Discover a modelfile": "Знайти файл моделі",
 	"Discover a prompt": "Знайти промт",

src/lib/i18n/locales/vi-VN/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "Đã xóa {{deleteModelTag}}",
 	"Deleted {tagName}": "Đã xóa {tagName}",
 	"Description": "Mô tả",
-	"Desktop Notifications": "Thông báo trên máy tính (Notification)",
+	"Notifications": "Thông báo trên máy tính (Notification)",
 	"Disabled": "Đã vô hiệu hóa",
 	"Discover a modelfile": "Khám phá thêm các mô hình mới",
 	"Discover a prompt": "Khám phá thêm prompt mới",

src/lib/i18n/locales/zh-CN/translation.json

@@ -100,7 +100,7 @@
 	"Deleted {{deleteModelTag}}": "已删除{{deleteModelTag}}",
 	"Deleted {tagName}": "已删除{tagName}",
 	"Description": "描述",
-	"Desktop Notifications": "桌面通知",
+	"Notifications": "桌面通知",
 	"Disabled": "禁用",
 	"Discover a modelfile": "探索模型文件",
 	"Discover a prompt": "探索提示词",

src/lib/i18n/locales/zh-TW/translation.json

@@ -101,7 +101,7 @@
 	"Deleted {{deleteModelTag}}": "已刪除 {{deleteModelTag}}",
 	"Deleted {tagName}": "已刪除 {tagName}",
 	"Description": "描述",
-	"Desktop Notifications": "桌面通知",
+	"Notifications": "桌面通知",
 	"Disabled": "已停用",
 	"Discover a modelfile": "發現新 Modelfile",
 	"Discover a prompt": "發現新提示詞",

src/lib/utils/index.ts

@@ -111,6 +111,82 @@ export const getGravatarURL = (email) => {
 	return `https://www.gravatar.com/avatar/${hash}`;
 };
 
+export const canvasPixelTest = () => {
+	// Test a 1x1 pixel to potentially identify browser/plugin fingerprint blocking or spoofing
+	// Inspiration: https://github.com/kkapsner/CanvasBlocker/blob/master/test/detectionTest.js
+	const canvas = document.createElement('canvas');
+	const ctx = canvas.getContext('2d');
+	canvas.height = 1;
+	canvas.width = 1;
+	const imageData = new ImageData(canvas.width, canvas.height);
+	const pixelValues = imageData.data;
+
+	// Generate RGB test data
+	for (let i = 0; i < imageData.data.length; i += 1) {
+		if (i % 4 !== 3) {
+			pixelValues[i] = Math.floor(256 * Math.random());
+		} else {
+			pixelValues[i] = 255;
+		}
+	}
+
+	ctx.putImageData(imageData, 0, 0);
+	const p = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
+
+	// Read RGB data and fail if unmatched
+	for (let i = 0; i < p.length; i += 1) {
+		if (p[i] !== pixelValues[i]) {
+			console.log(
+				'canvasPixelTest: Wrong canvas pixel RGB value detected:',
+				p[i],
+				'at:',
+				i,
+				'expected:',
+				pixelValues[i]
+			);
+			console.log('canvasPixelTest: Canvas blocking or spoofing is likely');
+			return false;
+		}
+	}
+
+	return true;
+};
+
+export const generateInitialsImage = (name) => {
+	const canvas = document.createElement('canvas');
+	const ctx = canvas.getContext('2d');
+	canvas.width = 100;
+	canvas.height = 100;
+
+	if (!canvasPixelTest()) {
+		console.log(
+			'generateInitialsImage: failed pixel test, fingerprint evasion is likely. Using default image.'
+		);
+		return '/user.png';
+	}
+
+	ctx.fillStyle = '#F39C12';
+	ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+	ctx.fillStyle = '#FFFFFF';
+	ctx.font = '40px Helvetica';
+	ctx.textAlign = 'center';
+	ctx.textBaseline = 'middle';
+
+	const sanitizedName = name.trim();
+	const initials =
+		sanitizedName.length > 0
+			? sanitizedName[0] +
+			  (sanitizedName.split(' ').length > 1
+					? sanitizedName[sanitizedName.lastIndexOf(' ') + 1]
+					: '')
+			: '';
+
+	ctx.fillText(initials.toUpperCase(), canvas.width / 2, canvas.height / 2);
+
+	return canvas.toDataURL();
+};
+
 export const copyToClipboard = (text) => {
 	if (!navigator.clipboard) {
 		const textArea = document.createElement('textarea');

src/routes/(app)/admin/+page.svelte

@@ -4,6 +4,8 @@
 	import { goto } from '$app/navigation';
 	import { onMount, getContext } from 'svelte';
 
+	import dayjs from 'dayjs';
+
 	import { toast } from 'svelte-sonner';
 
 	import { updateUserRole, getUsers, deleteUserById } from '$lib/apis/users';
@@ -16,6 +18,7 @@
 	let loaded = false;
 	let users = [];
 
+	let search = '';
 	let selectedUser = null;
 
 	let showSettingsModal = false;
@@ -80,157 +83,193 @@
 
 <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}
 		<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=" flex flex-col justify-center">
-						<div class=" flex justify-between items-center">
-							<div class="flex items-center text-2xl font-semibold">
-								{$i18n.t('All Users')}
-								<div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" />
-								<span class="text-lg font-medium text-gray-500 dark:text-gray-300"
-									>{users.length}</span
-								>
-							</div>
-							<div>
-								<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"
+						<div class=" px-5 pt-3">
+							<div class=" flex justify-between items-center">
+								<div class="flex items-center text-2xl font-semibold">Dashboard</div>
+								<div>
+									<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;
+										}}
 									>
-										<path
-											fill-rule="evenodd"
-											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>
+										<svg
+											xmlns="http://www.w3.org/2000/svg"
+											viewBox="0 0 16 16"
+											fill="currentColor"
+											class="w-4 h-4"
+										>
+											<path
+												fill-rule="evenodd"
+												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 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>
 
-						<hr class=" my-3 dark:border-gray-600" />
-
-						<div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap">
-							<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 table-auto">
-								<thead
-									class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"
-								>
-									<tr>
-										<th scope="col" class="px-3 py-2"> {$i18n.t('Role')} </th>
-										<th scope="col" class="px-3 py-2"> {$i18n.t('Name')} </th>
-										<th scope="col" class="px-3 py-2"> {$i18n.t('Email')} </th>
-										<th scope="col" class="px-3 py-2"> {$i18n.t('Action')} </th>
-									</tr>
-								</thead>
-								<tbody>
-									{#each users as user}
-										<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700 text-xs">
-											<td class="px-3 py-2 min-w-[7rem] w-28">
-												<button
-													class=" flex items-center gap-2 text-xs px-3 py-0.5 rounded-lg {user.role ===
-														'admin' &&
-														'text-sky-600 dark:text-sky-200 bg-sky-200/30'} {user.role === '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');
-														}
-													}}
-												>
-													<div
-														class="w-1 h-1 rounded-full {user.role === 'admin' &&
-															'bg-sky-600 dark:bg-sky-300'} {user.role === 'user' &&
-															'bg-green-600 dark:bg-green-300'} {user.role === 'pending' &&
-															'bg-gray-600 dark:bg-gray-300'}"
-													/>
-													{$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">
-												<div class="flex justify-start w-full">
+						<hr class=" mb-3 dark:border-gray-800" />
+
+						<div class="px-5">
+							<div class="mt-0.5 mb-3 flex justify-between">
+								<div class="flex text-lg font-medium px-0.5">
+									{$i18n.t('All Users')}
+									<div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" />
+									<span class="text-lg font-medium text-gray-500 dark:text-gray-300"
+										>{users.length}</span
+									>
+								</div>
+
+								<div class="">
+									<input
+										class=" w-60 rounded-lg py-1.5 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none"
+										placeholder={$i18n.t('Search')}
+										bind:value={search}
+									/>
+								</div>
+							</div>
+
+							<div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap">
+								<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 table-auto">
+									<thead
+										class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-850 dark:text-gray-400"
+									>
+										<tr>
+											<th scope="col" class="px-3 py-2"> {$i18n.t('Role')} </th>
+											<th scope="col" class="px-3 py-2"> {$i18n.t('Name')} </th>
+											<th scope="col" class="px-3 py-2"> {$i18n.t('Email')} </th>
+											<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>
+									<tbody>
+										{#each users.filter((user) => {
+											if (search === '') {
+												return true;
+											} else {
+												let name = user.name.toLowerCase();
+												const query = search.toLowerCase();
+												return name.includes(query);
+											}
+										}) as user}
+											<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700 text-xs">
+												<td class="px-3 py-2 min-w-[7rem] w-28">
 													<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;
+														class=" flex items-center gap-2 text-xs px-3 py-0.5 rounded-lg {user.role ===
+															'admin' &&
+															'text-sky-600 dark:text-sky-200 bg-sky-200/30'} {user.role ===
+															'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
-															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"
+														<div
+															class="w-1 h-1 rounded-full {user.role === 'admin' &&
+																'bg-sky-600 dark:bg-sky-300'} {user.role === 'user' &&
+																'bg-green-600 dark:bg-green-300'} {user.role === 'pending' &&
+																'bg-gray-600 dark:bg-gray-300'}"
+														/>
+														{$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
-																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>
+															<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
+																	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
-														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 () => {
-															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"
+														<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 () => {
+																deleteUserHandler(user.id);
+															}}
 														>
-															<path
-																stroke-linecap="round"
-																stroke-linejoin="round"
-																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"
-															/>
-														</svg>
-													</button>
-												</div>
-											</td>
-										</tr>
-									{/each}
-								</tbody>
-							</table>
+															<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
+																	stroke-linecap="round"
+																	stroke-linejoin="round"
+																	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"
+																/>
+															</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>