Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(web): update password-protected share logo size #9567

Merged
merged 1 commit into from
May 28, 2024
Merged

fix(web): update password-protected share logo size #9567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions web/src/lib/components/album-page/album-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk';
import { createAssetInteractionStore } from '../../stores/asset-interaction.store';
import { AssetStore } from '../../stores/assets.store';
import { downloadAlbum } from '../../utils/asset-utils';
import { createAssetInteractionStore } from '$lib/stores/asset-interaction.store';
import { AssetStore } from '$lib/stores/assets.store';
import { downloadAlbum } from '$lib/utils/asset-utils';
import CircleIconButton from '../elements/buttons/circle-icon-button.svelte';
import DownloadAction from '../photos-page/actions/download-action.svelte';
import AssetGrid from '../photos-page/asset-grid.svelte';
import AssetSelectControlBar from '../photos-page/asset-select-control-bar.svelte';
import ControlAppBar from '../shared-components/control-app-bar.svelte';
import ImmichLogo from '../shared-components/immich-logo.svelte';
import ImmichLogoSmallLink from '../shared-components/immich-logo-small-link.svelte';
import ThemeButton from '../shared-components/theme-button.svelte';
import { shortcut } from '$lib/utils/shortcut';
import { mdiFileImagePlusOutline, mdiFolderDownloadOutline } from '@mdi/js';
Expand Down Expand Up @@ -66,9 +66,7 @@
{:else}
<ControlAppBar showBackButton={false}>
<svelte:fragment slot="leading">
<a data-sveltekit-preload-data="hover" class="ml-4" href="/">
<ImmichLogo class="h-[24px] w-[24px] max-w-none md:w-auto md:h-10 md:max-w-full" noText={innerWidth < 768} />
</a>
<ImmichLogoSmallLink width={innerWidth} />
</svelte:fragment>

<svelte:fragment slot="trailing">
Expand Down
6 changes: 2 additions & 4 deletions web/src/lib/components/share-page/individual-shared-viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import AssetSelectControlBar from '../photos-page/asset-select-control-bar.svelte';
import ControlAppBar from '../shared-components/control-app-bar.svelte';
import GalleryViewer from '../shared-components/gallery-viewer/gallery-viewer.svelte';
import ImmichLogo from '../shared-components/immich-logo.svelte';
import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte';
import { NotificationType, notificationController } from '../shared-components/notification/notification';
import type { Viewport } from '$lib/stores/assets.store';

Expand Down Expand Up @@ -85,9 +85,7 @@
{:else}
<ControlAppBar on:close={() => goto(AppRoute.PHOTOS)} backIcon={mdiArrowLeft} showBackButton={false}>
<svelte:fragment slot="leading">
<a data-sveltekit-preload-data="hover" class="ml-4" href="/">
<ImmichLogo class="h-[24px] w-[24px] max-w-none md:w-auto md:h-10 md:max-w-full" noText={innerWidth < 768} />
</a>
<ImmichLogoSmallLink width={innerWidth} />
</svelte:fragment>

<svelte:fragment slot="trailing">
Expand Down
9 changes: 9 additions & 0 deletions web/src/lib/components/shared-components/immich-logo-small-link.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script lang="ts">
import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';

export let width: number;
</script>

<a data-sveltekit-preload-data="hover" class="ml-4" href="/">
<ImmichLogo class="h-[24px] w-[24px] max-w-none md:w-auto md:h-10 md:max-w-full" noText={width < 768} />
</a>
9 changes: 5 additions & 4 deletions web/src/routes/(user)/share/[key]/[[photos=photos]]/[[assetId=id]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Button from '$lib/components/elements/buttons/button.svelte';
import IndividualSharedViewer from '$lib/components/share-page/individual-shared-viewer.svelte';
import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte';
import ThemeButton from '$lib/components/shared-components/theme-button.svelte';
import { user } from '$lib/stores/user.store';
import { handleError } from '$lib/utils/handle-error';
Expand All @@ -16,6 +16,7 @@
let { title, description } = meta;
let isOwned = $user ? $user.id === sharedLink?.userId : false;
let password = '';
let innerWidth: number;

const handlePasswordSubmit = async () => {
try {
Expand All @@ -31,6 +32,8 @@
};
</script>

<svelte:window bind:innerWidth />

<svelte:head>
<title>{title}</title>
<meta name="description" content={description} />
Expand All @@ -39,9 +42,7 @@
<header>
<ControlAppBar showBackButton={false}>
<svelte:fragment slot="leading">
<a data-sveltekit-preload-data="hover" class="ml-4" href="/">
<ImmichLogo class="h-10" />
</a>
<ImmichLogoSmallLink width={innerWidth} />
</svelte:fragment>

<svelte:fragment slot="trailing">
Expand Down
Loading