Merge remote-tracking branch 'origin/main' into lighter_buckets_web

web/src/lib/components/admin-page/settings/notification-settings/notification-settings.svelte

@@ -12,7 +12,7 @@
   import { SettingInputFieldType } from '$lib/constants';
   import { user } from '$lib/stores/user.store';
   import { handleError } from '$lib/utils/handle-error';
-  import { sendTestEmail, type SystemConfigDto } from '@immich/sdk';
+  import { sendTestEmailAdmin, type SystemConfigDto } from '@immich/sdk';
   import { Button } from '@immich/ui';
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
@@ -40,7 +40,7 @@
     isSending = true;
 
     try {
-      await sendTestEmail({
+      await sendTestEmailAdmin({
         systemConfigSmtpDto: {
           enabled: config.notifications.smtp.enabled,
           transport: {

web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte

@@ -78,6 +78,8 @@
     };
 
     const dt = luxon.DateTime.fromISO(new Date('2022-02-03T04:56:05.250').toISOString());
+    const albumStartTime = luxon.DateTime.fromISO(new Date('2021-12-31T05:32:41.750').toISOString());
+    const albumEndTime = luxon.DateTime.fromISO(new Date('2023-05-06T09:15:17.100').toISOString());
 
     const dateTokens = [
       ...templateOptions.yearOptions,
@@ -91,6 +93,8 @@
 
     for (const token of dateTokens) {
       substitutions[token] = dt.toFormat(token);
+      substitutions['album-startDate-' + token] = albumStartTime.toFormat(token);
+      substitutions['album-endDate-' + token] = albumEndTime.toFormat(token);
     }
 
     return template(substitutions);

web/src/lib/components/admin-page/settings/storage-template/supported-variables-panel.svelte

@@ -29,6 +29,14 @@
         <li>{`{{assetId}}`} - Asset ID</li>
         <li>{`{{assetIdShort}}`} - Asset ID (last 12 characters)</li>
         <li>{`{{album}}`} - Album Name</li>
+        <li>
+          {`{{album-startDate-x}}`} - Album Start Date and Time (e.g. album-startDate-yy).
+          {$t('admin.storage_template_date_time_sample', { values: { date: '2021-12-31T05:32:41.750' } })}
+        </li>
+        <li>
+          {`{{album-endDate-x}}`} - Album End Date and Time (e.g. album-endDate-MM).
+          {$t('admin.storage_template_date_time_sample', { values: { date: '2023-05-06T09:15:17.100' } })}
+        </li>
       </ul>
     </div>
   </div>

web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte

@@ -6,7 +6,7 @@
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
   import { handleError } from '$lib/utils/handle-error';
-  import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplate } from '@immich/sdk';
+  import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplateAdmin } from '@immich/sdk';
   import { Button } from '@immich/ui';
   import { mdiEyeOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -25,7 +25,7 @@
   const getTemplate = async (name: string, template: string) => {
     try {
       loadingPreview = true;
-      const result = await getNotificationTemplate({ name, templateDto: { template } });
+      const result = await getNotificationTemplateAdmin({ name, templateDto: { template } });
       htmlPreview = result.html;
     } catch (error) {
       handleError(error, 'Could not load template.');

web/src/lib/components/photos-page/memory-lane.svelte

@@ -77,7 +77,7 @@
     <div class="inline-block" use:resizeObserver={({ width }) => (innerWidth = width)}>
       {#each memoryStore.memories as memory (memory.id)}
         <a
-          class="memory-card relative mr-8 last:mr-0 inline-block aspect-[3/4] md:aspect-[4/3] max-md:h-[150px] xl:aspect-video h-[215px] rounded-xl"
+          class="memory-card relative mr-2 md:mr-4 last:mr-0 inline-block aspect-[3/4] md:aspect-[4/3] max-md:h-[150px] xl:aspect-video h-[215px] rounded-xl"
           href="{AppRoute.MEMORY}?{QueryParameter.ID}={memory.assets[0].id}"
         >
           <img

web/src/lib/components/shared-components/control-app-bar.svelte

@@ -77,8 +77,7 @@
       appBarBorder,
       'mx-2 my-2 place-items-center rounded-lg p-2 max-md:p-0 transition-all',
       tailwindClasses,
-      'bg-immich-gray dark:bg-immich-dark-gray',
-      forceDark && 'bg-immich-dark-gray text-white',
+      forceDark ? 'bg-immich-dark-gray text-white' : 'bg-immich-gray dark:bg-immich-dark-gray',
     ]}
   >
     <div class="flex place-items-center sm:gap-6 justify-self-start dark:text-immich-dark-fg">

web/src/lib/components/shared-components/map/map.svelte

@@ -249,7 +249,11 @@
       >
         {#snippet children({ feature }: { feature: Feature<Geometry, GeoJsonProperties> })}
           {#if useLocationPin}
-            <Icon path={mdiMapMarker} size="50px" class="dark:text-immich-dark-primary text-immich-primary" />
+            <Icon
+              path={mdiMapMarker}
+              size="50px"
+              class="dark:text-immich-dark-primary text-immich-primary -translate-y-[50%]"
+            />
           {:else}
             <img
               src={getAssetThumbnailUrl(feature.properties?.id)}