c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

fix(web): resolve issues with user usage statistics and refactor (#14374)

Browse source
This commit is contained in:
Michel Heusschen 2024-11-27 14:45:52 +01:00 committed by GitHub
parent b4c96a09fb
commit 3d61548d7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
i18n/en.json
View file

@ -1306,6 +1306,7 @@
"view_all_users": "View all users", "view_all_users": "View all users",
"view_in_timeline": "View in timeline", "view_in_timeline": "View in timeline",
"view_links": "View links", "view_links": "View links",
"view_name": "View",
"view_next_asset": "View next asset", "view_next_asset": "View next asset",
"view_previous_asset": "View previous asset", "view_previous_asset": "View previous asset",
"view_stack": "View Stack", "view_stack": "View Stack",

68
web/src/lib/components/user-settings-page/user-usage-statistic.svelte
View file

@ -1,4 +1,5 @@
<script lang="ts"> <script lang="ts">
import { locale } from '$lib/stores/preferences.store';
import { import {
getAlbumStatistics, getAlbumStatistics,
getAssetStatistics, getAssetStatistics,
@ -53,72 +54,61 @@
}); });
</script> </script>
{#snippet row(viewName: string, imageCount: number, videoCount: number, totalCount: number)} {#snippet row(viewName: string, stats: AssetStatsResponseDto)}
<td class="w-1/4 text-ellipsis px-4 text-sm">{viewName}</td> <tr
<td class="w-1/4 text-ellipsis px-4 text-sm">{imageCount}</td> class="flex h-14 w-full place-items-center text-center dark:text-immich-dark-fg odd:bg-immich-bg even:bg-immich-gray odd:dark:bg-immich-dark-gray/50 even:dark:bg-immich-dark-gray/75"
<td class="flex flex-row flex-wrap justify-center gap-x-2 gap-y-1 w-1/4"> {videoCount}</td> >
<td class="flex flex-row flex-wrap justify-center gap-x-2 gap-y-1 w-1/4"> {totalCount}</td> <td class="w-1/4 px-4 text-sm">{viewName}</td>
<td class="w-1/4 px-4 text-sm">{stats.images.toLocaleString($locale)}</td>
<td class="w-1/4 px-4 text-sm">{stats.videos.toLocaleString($locale)}</td>
<td class="w-1/4 px-4">{stats.total.toLocaleString($locale)}</td>
</tr>
{/snippet} {/snippet}
<section class="my-6"> <section class="my-6">
<p class="text-xs dark:text-white uppercase">{$t('photos_and_videos')}</p> <p class="text-xs dark:text-white uppercase">{$t('photos_and_videos')}</p>
<div class="overflow-x-auto">
<table class="w-full text-left mt-4"> <table class="w-full text-left mt-4">
<thead <thead
class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-immich-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-primary" class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-immich-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-primary"
> >
<tr class="flex w-full place-items-center"> <tr class="flex w-full place-items-center text-sm font-medium text-center">
<th class="w-1/4 text-center text-sm font-medium">{$t('view').toLocaleString()}</th> <th class="w-1/4">{$t('view_name')}</th>
<th class="w-1/4 text-center text-sm font-medium">{$t('photos').toLocaleString()}</th> <th class="w-1/4">{$t('photos')}</th>
<th class="w-1/4 text-center text-sm font-medium">{$t('videos').toLocaleString()}</th> <th class="w-1/4">{$t('videos')}</th>
<th class="w-1/4 text-center text-sm font-medium">{$t('total').toLocaleString()}</th> <th class="w-1/4">{$t('total')}</th>
</tr> </tr>
</thead> </thead>
<tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray"> <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
<tr {@render row($t('timeline'), timelineStats)}
class="flex h-[60px] w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-bg dark:bg-immich-dark-gray/50" {@render row($t('favorites'), favoriteStats)}
> {@render row($t('archive'), archiveStats)}
{@render row($t('timeline'), timelineStats.images, timelineStats.videos, timelineStats.total)} {@render row($t('trash'), trashStats)}
</tr>
<tr
class="flex h-[60px] w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-gray dark:bg-immich-dark-gray/75"
>
{@render row($t('favorites'), favoriteStats.images, favoriteStats.videos, favoriteStats.total)}
</tr>
<tr
class="flex h-[60px] w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-bg dark:bg-immich-dark-gray/50"
>
{@render row($t('archive'), archiveStats.images, archiveStats.videos, archiveStats.total)}
</tr>
<tr
class="flex h-[60px] w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-gray dark:bg-immich-dark-gray/75"
>
{@render row($t('trash'), trashStats.images, trashStats.videos, trashStats.total)}
</tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="mt-6"> <div class="mt-6">
<p class="text-xs dark:text-white uppercase">{$t('albums')}</p> <p class="text-xs dark:text-white uppercase">{$t('albums')}</p>
</div> </div>
<div class="overflow-x-auto">
<table class="w-full text-left mt-4"> <table class="w-full text-left mt-4">
<thead <thead
class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-immich-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-primary" class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-immich-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-primary"
> >
<tr class="flex w-full place-items-center"> <tr class="flex w-full place-items-center text-sm font-medium text-center">
<th class="w-1/2 text-center text-sm font-medium">{$t('owned')}</th> <th class="w-1/2">{$t('owned')}</th>
<th class="w-1/2 text-center text-sm font-medium">{$t('shared')}</th> <th class="w-1/2">{$t('shared')}</th>
</tr> </tr>
</thead> </thead>
<tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray"> <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
<tr <tr
class="flex h-[60px] w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-bg dark:bg-immich-dark-gray/50" class="flex h-14 w-full place-items-center text-center dark:text-immich-dark-fg bg-immich-bg dark:bg-immich-dark-gray/50"
> >
<td class="w-1/2 text-ellipsis px-4 text-sm"> {albumStats.owned.toLocaleString()}</td> <td class="w-1/2 px-4 text-sm">{albumStats.owned.toLocaleString($locale)}</td>
<td class="w-1/2 text-ellipsis px-4 text-sm">{albumStats.shared.toLocaleString()}</td> <td class="w-1/2 px-4 text-sm">{albumStats.shared.toLocaleString($locale)}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</section> </section>