From e2ec79dbf09193a90c8b000a6089154abdf200a9 Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Sun, 14 Dec 2025 01:02:31 +0000
Subject: [PATCH] fix: shared link expiration and small styling

---
 ...link-card.svelte => SharedLinkCard.svelte} | 81 ++++++++++---------
 web/src/lib/services/shared-link.service.ts   |  4 +-
 .../shared-links/[[id=id]]/+page.svelte       |  2 +-
 3 files changed, 45 insertions(+), 42 deletions(-)
 rename web/src/lib/components/sharedlinks-page/{shared-link-card.svelte => SharedLinkCard.svelte} (67%)

diff --git a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte b/web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte
similarity index 67%
rename from web/src/lib/components/sharedlinks-page/shared-link-card.svelte
rename to web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte
index 7187dc22ad..30215ab1a2 100644
--- a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
+++ b/web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte
@@ -5,7 +5,8 @@
   import { getSharedLinkActions } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import { SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
-  import { Badge, ContextMenuButton, MenuItemType, Text } from '@immich/ui';
+  import { ContextMenuButton, Icon, MenuItemType, Text } from '@immich/ui';
+  import { mdiDownload, mdiInformationOutline, mdiLink, mdiLock, mdiUpload } from '@mdi/js';
   import { DateTime, type ToRelativeUnit } from 'luxon';
   import { t } from 'svelte-i18n';
 
@@ -44,50 +45,52 @@
   >
     <ShareCover class="transition-all duration-300 hover:shadow-lg" {sharedLink} />
 
-    <div class="flex flex-col gap-2">
-      <Text size="large" color="primary" class="flex place-items-center gap-2 break-all">
-        {#if sharedLink.type === SharedLinkType.Album}
-          {sharedLink.album?.albumName}
-        {:else if sharedLink.type === SharedLinkType.Individual}
-          {$t('individual_share')}
-        {/if}
-      </Text>
-
-      <div class="flex flex-wrap gap-1">
-        {#if isExpired}
-          <Badge size="small" color="danger">{$t('expired')}</Badge>
-        {:else if expiresAt}
-          <Badge size="small" color="secondary">
+    <div class="flex flex-col gap-4 justify-between">
+      <div class="flex flex-col">
+        <Text size="tiny" color={isExpired ? 'danger' : 'muted'} class="font-medium">
+          {#if isExpired}
+            {$t('expired')}
+          {:else if expiresAt}
             {$t('expires_date', { values: { date: getCountDownExpirationDate(expiresAt, now) } })}
-          </Badge>
-        {:else}
-          <Badge size="small" color="secondary">{$t('expires_date', { values: { date: '∞' } })}</Badge>
-        {/if}
+          {:else}
+            {$t('expires_date', { values: { date: '∞' } })}
+          {/if}
+        </Text>
 
-        {#if sharedLink.slug}
-          <Badge size="small" color="secondary">{$t('custom_url')}</Badge>
-        {/if}
+        <Text size="large" color="primary" class="flex place-items-center gap-2 break-all font-medium">
+          {#if sharedLink.type === SharedLinkType.Album}
+            {sharedLink.album?.albumName}
+          {:else if sharedLink.type === SharedLinkType.Individual}
+            {$t('individual_share')}
+          {/if}
+        </Text>
 
-        {#if sharedLink.allowUpload}
-          <Badge size="small" color="secondary">{$t('upload')}</Badge>
-        {/if}
-
-        {#if sharedLink.showMetadata && sharedLink.allowDownload}
-          <Badge size="small" color="secondary">{$t('download')}</Badge>
-        {/if}
-
-        {#if sharedLink.showMetadata}
-          <Badge size="small" color="secondary">{$t('exif')}</Badge>
-        {/if}
-
-        {#if sharedLink.password}
-          <Badge size="small" color="secondary">{$t('password')}</Badge>
+        {#if sharedLink.description}
+          <Text size="small" class="line-clamp-1">{sharedLink.description}</Text>
         {/if}
       </div>
 
-      {#if sharedLink.description}
-        <Text size="small" class="line-clamp-1">{sharedLink.description}</Text>
-      {/if}
+      <div class="flex flex-wrap gap-1">
+        {#if sharedLink.slug}
+          <Icon icon={mdiLink} size="18" title={$t('custom_url')} />
+        {/if}
+
+        {#if sharedLink.allowUpload}
+          <Icon icon={mdiUpload} size="18" title={$t('upload')} />
+        {/if}
+
+        {#if sharedLink.showMetadata && sharedLink.allowDownload}
+          <Icon icon={mdiDownload} size="18" title={$t('download')} />
+        {/if}
+
+        {#if sharedLink.showMetadata}
+          <Icon icon={mdiInformationOutline} size="18" title={$t('exif')} />
+        {/if}
+
+        {#if sharedLink.password}
+          <Icon icon={mdiLock} size="18" title={$t('password')} />
+        {/if}
+      </div>
     </div>
   </svelte:element>
   <div class="flex flex-auto flex-col place-content-center place-items-end text-end ms-4">
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index cbea6ddd9d..82519ad35b 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -17,7 +17,7 @@ import {
   type SharedLinkResponseDto,
 } from '@immich/sdk';
 import { modalManager, toastManager, type ActionItem } from '@immich/ui';
-import { mdiContentCopy, mdiPencilOutline, mdiQrcode, mdiTrashCanOutline } from '@mdi/js';
+import { mdiContentCopy, mdiDeleteOutline, mdiPencilOutline, mdiQrcode } from '@mdi/js';
 import type { MessageFormatter } from 'svelte-i18n';
 
 export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLinkResponseDto) => {
@@ -29,7 +29,7 @@ export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLin
 
   const Delete: ActionItem = {
     title: $t('delete_link'),
-    icon: mdiTrashCanOutline,
+    icon: mdiDeleteOutline,
     color: 'danger',
     onAction: () => handleDeleteSharedLink(sharedLink),
   };
diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
index d8b35204dc..cc9afd4f64 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -3,7 +3,7 @@
   import { page } from '$app/state';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
+  import SharedLinkCard from '$lib/components/sharedlinks-page/SharedLinkCard.svelte';
   import { AppRoute } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
   import SharedLinkUpdateModal from '$lib/modals/SharedLinkUpdateModal.svelte';