From 9912a0a3d09d7c0bdf83803b9bb7fd52815284f4 Mon Sep 17 00:00:00 2001
From: Mohamed Bassem <me@mbassem.com>
Date: Mon, 4 Aug 2025 03:21:48 +0000
Subject: fix: Merge the quota columns in the user lists

---
 apps/web/components/admin/UserList.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'apps/web/components/admin/UserList.tsx')

diff --git a/apps/web/components/admin/UserList.tsx b/apps/web/components/admin/UserList.tsx
index 3313fe60..a63738e5 100644
--- a/apps/web/components/admin/UserList.tsx
+++ b/apps/web/components/admin/UserList.tsx
@@ -75,8 +75,6 @@ export default function UsersSection() {
               <TableHead>{t("common.name")}</TableHead>
               <TableHead>{t("common.email")}</TableHead>
               <TableHead>{t("admin.users_list.num_bookmarks")}</TableHead>
-              <TableHead>{t("common.quota")}</TableHead>
-              <TableHead>Storage Quota</TableHead>
               <TableHead>{t("admin.users_list.asset_sizes")}</TableHead>
               <TableHead>{t("common.role")}</TableHead>
               <TableHead>{t("admin.users_list.local_user")}</TableHead>
@@ -88,19 +86,15 @@ export default function UsersSection() {
                   <TableCell className="py-1">{u.name}</TableCell>
                   <TableCell className="py-1">{u.email}</TableCell>
                   <TableCell className="py-1">
-                    {userStats[u.id].numBookmarks}
-                  </TableCell>
-                  <TableCell className="py-1">
+                    {userStats[u.id].numBookmarks} /{" "}
                     {u.bookmarkQuota ?? t("admin.users_list.unlimited")}
                   </TableCell>
                   <TableCell className="py-1">
+                    {toHumanReadableSize(userStats[u.id].assetSizes)} /{" "}
                     {u.storageQuota
                       ? toHumanReadableSize(u.storageQuota)
                       : t("admin.users_list.unlimited")}
                   </TableCell>
-                  <TableCell className="py-1">
-                    {toHumanReadableSize(userStats[u.id].assetSizes)}
-                  </TableCell>
                   <TableCell className="py-1">
                     {u.role && t(`common.roles.${u.role}`)}
                   </TableCell>
-- 
cgit v1.2.3-70-g09d2

