diff --git a/web/src/app.css b/web/src/app.css index 46eb231c9e..e9e960232f 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -48,7 +48,7 @@ html::-webkit-scrollbar-thumb:hover { body { /* min-height: 100vh; */ margin: 0; - background-color: #f6f8fe; + /* background-color: #f6f8fe; */ color: #5f6368; } diff --git a/web/src/lib/components/admin-page/jobs/job-tile.svelte b/web/src/lib/components/admin-page/jobs/job-tile.svelte index 5d09434f86..ff8910f487 100644 --- a/web/src/lib/components/admin-page/jobs/job-tile.svelte +++ b/web/src/lib/components/admin-page/jobs/job-tile.svelte @@ -11,23 +11,25 @@ const dispatch = createEventDispatcher(); -
+
-

{title}

-

{subtitle}

+

{title.toUpperCase()}

+

{subtitle}

- +
- + - + @@ -39,7 +41,7 @@
Status Active Waiting
{jobStatus ? 'Active' : 'Idle'} {activeJobCount}
- - +
+

USER USAGE DETAIL

+
+ @@ -37,8 +45,12 @@ - {#each stats.usageByUser as user} - + {#each stats.usageByUser as user, i} + diff --git a/web/src/lib/components/admin-page/server-stats/stats-card.svelte b/web/src/lib/components/admin-page/server-stats/stats-card.svelte new file mode 100644 index 0000000000..549ad3323c --- /dev/null +++ b/web/src/lib/components/admin-page/server-stats/stats-card.svelte @@ -0,0 +1,33 @@ + + +
+
+ +

{title}

+
+ +
+ {zeros()}{parseInt(value)} + {#if unit} + {unit} + {/if} +
+
diff --git a/web/src/lib/components/admin-page/user-management.svelte b/web/src/lib/components/admin-page/user-management.svelte index 8da3bda4e5..f29ef27023 100644 --- a/web/src/lib/components/admin-page/user-management.svelte +++ b/web/src/lib/components/admin-page/user-management.svelte @@ -8,8 +8,8 @@ const dispatch = createEventDispatcher(); -
User Photos
{getFullName(user.userId)} {user.photos} {user.videos}
- +
+ @@ -20,7 +20,7 @@ {#each allUsers as user, i} diff --git a/web/src/routes/admin/+page.svelte b/web/src/routes/admin/+page.svelte index 1329ba5674..fc0d26b2d2 100644 --- a/web/src/routes/admin/+page.svelte +++ b/web/src/routes/admin/+page.svelte @@ -15,7 +15,7 @@ import type { PageData } from './$types'; import { api, ServerStatsResponseDto, UserResponseDto } from '@api'; import JobsPanel from '$lib/components/admin-page/jobs/jobs-panel.svelte'; - import ServerStats from '$lib/components/admin-page/server-stats.svelte'; + import ServerStatsPanel from '$lib/components/admin-page/server-stats/server-stats-panel.svelte'; let selectedAction: AdminSideBarSelection = AdminSideBarSelection.USER_MANAGEMENT; @@ -33,7 +33,7 @@ }; onMount(() => { - selectedAction = AdminSideBarSelection.USER_MANAGEMENT; + selectedAction = AdminSideBarSelection.JOBS; getServerStats(); }); @@ -146,13 +146,13 @@
-
+

{selectedAction}


-
+
{#if selectedAction === AdminSideBarSelection.USER_MANAGEMENT} {/if} {#if selectedAction === AdminSideBarSelection.STATS && serverStat} - + {/if}
diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs index c93b0949ed..d0d5a63cc7 100644 --- a/web/tailwind.config.cjs +++ b/web/tailwind.config.cjs @@ -4,9 +4,9 @@ module.exports = { extend: { colors: { 'immich-primary': '#4250af', - 'immich-bg': '#f6f8fe', - 'immich-fg': 'black' - + 'immich-bg': 'white', + 'immich-fg': 'black', + 'immich-gray': '#F6F6F4' // 'immich-bg': '#121212', // 'immich-fg': '#D0D0D0', },
Email First name