Skip to content

High performance self-hosted photo and video management solution.

chore: improve onboarding, app download links styling (#23134)

Alex76f503602672
diff --git a/i18n/en.json b/i18n/en.json
index 8669a048b8..02e573de69 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -474,6 +474,7 @@
"app_bar_signout_dialog_title": "Sign out",
"app_download_links": "App Download Links",
"app_settings": "App Settings",
+ "app_stores": "App Stores",
"app_update_available": "App update is available",
"appears_in": "Appears in",
"apply_count": "Apply ({count, number})",
@@ -745,6 +746,7 @@
"create": "Create",
"create_album": "Create album",
"create_album_page_untitled": "Untitled",
+ "create_api_key": "Create API key",
"create_library": "Create Library",
"create_link": "Create link",
"create_link_to_share": "Create link to share",
@@ -1351,7 +1353,7 @@
"minutes": "Minutes",
"missing": "Missing",
"mobile_app": "Mobile App",
- "mobile_app_download_onboarding_note": "You can access these options again from the Utilities page.",
+ "mobile_app_download_onboarding_note": "Download the companion mobile app using the following options",
"model": "Model",
"month": "Month",
"monthly_title_text_date_format": "MMMM y",
@@ -1433,7 +1435,7 @@
"notifications_setting_description": "Manage notifications",
"oauth": "OAuth",
"obtainium_configurator": "Obtainium Configurator",
- "obtainium_configurator_instructions": "Please create an API key and select a variant to create your Obtainium configuration link.",
+ "obtainium_configurator_instructions": "Use Obtainium to install and update the Android app directly from Immich GitHub's release. Create an API key and select a variant to create your Obtainium configuration link",
"official_immich_resources": "Official Immich Resources",
"offline": "Offline",
"offset": "Offset",
diff --git a/web/src/lib/components/layouts/AdminPageLayout.svelte b/web/src/lib/components/layouts/AdminPageLayout.svelte
index 5a580dbde8..a74a6aee35 100644
--- a/web/src/lib/components/layouts/AdminPageLayout.svelte
+++ b/web/src/lib/components/layouts/AdminPageLayout.svelte
@@ -20,7 +20,7 @@
<AppShellHeader>
<NavigationBar showUploadButton={false} noBorder />
</AppShellHeader>
- <AppShellSidebar bind:open={sidebarStore.isOpen}>
+ <AppShellSidebar bind:open={sidebarStore.isOpen} class="border-none shadow-none">
<AdminSidebar />
</AppShellSidebar>
diff --git a/web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte b/web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte
index 4c46ad76d1..27e24d17e1 100644
--- a/web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte
@@ -6,22 +6,26 @@
import { t } from 'svelte-i18n';
</script>
-<HStack wrap>
+<p>{$t('mobile_app_download_onboarding_note')}</p>
+
+<HStack>
<Button
- size="large"
+ size="medium"
shape="semi-round"
- onclick={() => modalManager.show(ObtainiumConfigModal, {})}
- leadingIcon={mdiLinkEdit}
+ fullWidth
+ onclick={() => modalManager.show(AppDownloadModal, {})}
+ leadingIcon={mdiCellphoneArrowDownVariant}
>
- {$t('obtainium_configurator')}
+ {$t('app_stores')}
</Button>
+
<Button
- size="large"
+ size="medium"
shape="semi-round"
- onclick={() => modalManager.show(AppDownloadModal, {})}
- leadingIcon={mdiCellphoneArrowDownVariant}
+ fullWidth
+ onclick={() => modalManager.show(ObtainiumConfigModal, {})}
+ leadingIcon={mdiLinkEdit}
>
- {$t('app_download_links')}
+ {$t('obtainium_configurator')}
</Button>
</HStack>
-<p>{$t('mobile_app_download_onboarding_note')}</p>
diff --git a/web/src/lib/modals/AppDownloadModal.svelte b/web/src/lib/modals/AppDownloadModal.svelte
index 0f7dcf1b4c..7804394d74 100644
--- a/web/src/lib/modals/AppDownloadModal.svelte
+++ b/web/src/lib/modals/AppDownloadModal.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { appStoreBadge, fdroidBadge, Modal, ModalBody, playStoreBadge } from '@immich/ui';
+ import { appStoreBadge, fdroidBadge, Modal, ModalBody, playStoreBadge, Text } from '@immich/ui';
import { t } from 'svelte-i18n';
interface Props {
onClose: () => void;
@@ -9,35 +9,29 @@
<Modal title={$t('app_download_links')} size="large" {onClose}>
<ModalBody>
- <div class="flex flex-col sm:grid sm:grid-cols-2 gap-5 text-immich-primary dark:text-immich-dark-primary">
- <div>
- <label class="font-medium text-immich-primary dark:text-immich-dark-primary text-sm" for="fdroid-link">
- F-Droid
- </label>
- <a href="https://f-droid.org/packages/app.alextran.immich/" target="_blank" id="fdroid-link">
- <img class="pt-2 pr-10" alt="Get it on F-Droid" src={fdroidBadge} />
- </a>
- </div>
-
- <div>
- <label class="font-medium text-immich-primary dark:text-immich-dark-primary text-sm" for="play-store-link">
- Google Play
- </label>
+ <div class="sm:grid sm:grid-cols-2 gap-5">
+ <div class="flex flex-col place-items-start">
+ <Text>Google Play</Text>
<a
href="https://play.google.com/store/apps/details?id=app.alextran.immich"
target="_blank"
id="play-store-link"
>
- <img alt="Get it on Google Play" src={playStoreBadge} />
+ <img class="w-[200px] mt-2" alt="Get it on Google Play" src={playStoreBadge} />
</a>
</div>
- <div>
- <label class="font-medium text-immich-primary dark:text-immich-dark-primary text-sm" for="app-store-link">
- App Store
- </label>
+ <div class="flex flex-col place-items-start">
+ <Text>App Store</Text>
<a href="https://apps.apple.com/us/app/immich/id1613945652" target="_blank" id="app-store-link">
- <img class="pt-2 pr-5" alt="Download on the App Store" src={appStoreBadge} width="90%" />
+ <img class="w-[200px] mt-2" alt="Download on the App Store" src={appStoreBadge} />
+ </a>
+ </div>
+
+ <div class="flex flex-col place-items-start">
+ <Text>F-Droid</Text>
+ <a href="https://f-droid.org/packages/app.alextran.immich/" target="_blank" id="fdroid-link">
+ <img class="w-[200px] mt-2" alt="Get it on F-Droid" src={fdroidBadge} />
</a>
</div>
</div>
diff --git a/web/src/lib/modals/ObtainiumConfigModal.svelte b/web/src/lib/modals/ObtainiumConfigModal.svelte
index d7132f2f85..d8cb4aabe2 100644
--- a/web/src/lib/modals/ObtainiumConfigModal.svelte
+++ b/web/src/lib/modals/ObtainiumConfigModal.svelte
@@ -4,7 +4,7 @@
import { SettingInputFieldType } from '$lib/constants';
import { handleError } from '$lib/utils/handle-error';
import { createApiKey, Permission } from '@immich/sdk';
- import { Button, Modal, ModalBody, obtainiumBadge } from '@immich/ui';
+ import { Button, Modal, ModalBody, obtainiumBadge, Text } from '@immich/ui';
import { t } from 'svelte-i18n';
let inputUrl = $state(location.origin);
let inputApiKey = $state('');
@@ -31,64 +31,53 @@
let { onClose }: Props = $props();
</script>
-<Modal title={$t('obtainium_configurator')} size="large" {onClose}>
+<Modal title={$t('obtainium_configurator')} size="medium" {onClose}>
<ModalBody>
- <div class="flex flex-col sm:grid sm:grid-cols-2 gap-5 text-immich-primary dark:text-immich-dark-primary">
- <div>
- <label
- class="font-medium text-immich-primary dark:text-immich-dark-primary text-sm"
- for="obtainium-configurator"
- >
- Obtainium
- </label>
- <div id="obtainium-configurator">
- <form>
- <div class="mt-2">
- <SettingInputField inputType={SettingInputFieldType.TEXT} label={$t('url')} bind:value={inputUrl} />
- </div>
- <div class="mt-2">
- <SettingInputField
- inputType={SettingInputFieldType.TEXT}
- label={$t('api_key')}
- bind:value={inputApiKey}
- />
- </div>
- <div class="">
- <Button shape="round" size="small" onclick={() => handleCreate()}>{$t('new_api_key')}</Button>
- </div>
- <div class="mt-2">
- <SettingSelect
- label={$t('app_architecture_variant')}
- bind:value={archVariant}
- options={[
- { value: 'arm64-v8a-release', text: 'arm64-v8a' },
- { value: 'armeabi-v7a-release', text: 'armeabi-v7a' },
- { value: 'release', text: 'universal' },
- { value: 'x86_64-release', text: 'x86_64' },
- ]}
- />
- </div>
- </form>
+ <div>
+ <Text color="muted" size="small">
+ {$t('obtainium_configurator_instructions')}
+ </Text>
+ <form class="mt-4">
+ <div class="mt-2">
+ <SettingInputField inputType={SettingInputFieldType.TEXT} label={$t('url')} bind:value={inputUrl} />
</div>
- </div>
- <div class="content-center">
- {#if inputUrl && inputApiKey && archVariant}
- <a
- href={obtainiumLink}
- class="underline text-sm immich-form-label"
- target="_blank"
- rel="noreferrer"
- id="obtainium-link"
- >
- <img class="pt-2 pr-5" alt="Get it on Obtainium" src={obtainiumBadge} />
- </a>
- {:else}
- <p class="immich-form-label pb-2 text-sm" id="obtainium-link">
- {$t('obtainium_configurator_instructions')}
- </p>
- {/if}
- </div>
+ <div class="mt-2 flex gap-2 place-items-center place-content-center">
+ <SettingInputField inputType={SettingInputFieldType.TEXT} label={$t('api_key')} bind:value={inputApiKey} />
+
+ <div class="translate-y-[3px]">
+ <Button size="small" onclick={() => handleCreate()}>{$t('create_api_key')}</Button>
+ </div>
+ </div>
+
+ <SettingSelect
+ label={$t('app_architecture_variant')}
+ bind:value={archVariant}
+ options={[
+ { value: 'arm64-v8a-release', text: 'arm64-v8a' },
+ { value: 'armeabi-v7a-release', text: 'armeabi-v7a' },
+ { value: 'release', text: 'universal' },
+ { value: 'x86_64-release', text: 'x86_64' },
+ ]}
+ />
+ </form>
+
+ {#if inputUrl && inputApiKey && archVariant}
+ <div class="content-center">
+ <hr />
+ <div class="flex place-items-center place-content-center">
+ <a
+ href={obtainiumLink}
+ class="underline text-sm immich-form-label"
+ target="_blank"
+ rel="noreferrer"
+ id="obtainium-link"
+ >
+ <img class="pt-2 pr-5 h-[80px]" alt="Get it on Obtainium" src={obtainiumBadge} />
+ </a>
+ </div>
+ </div>
+ {/if}
</div>
</ModalBody>
</Modal>
diff --git a/web/src/routes/auth/onboarding/+page.svelte b/web/src/routes/auth/onboarding/+page.svelte
index c046c5fadf..9b33351d0f 100644
--- a/web/src/routes/auth/onboarding/+page.svelte
+++ b/web/src/routes/auth/onboarding/+page.svelte
@@ -90,7 +90,7 @@
component: OnboardingMobileApp,
role: OnboardingRole.USER,
title: $t('mobile_app'),
- icon: mdiCellphoneArrowDownVariant, // or you can use mdiCellphone
+ icon: mdiCellphoneArrowDownVariant,
},
]);
@@ -167,7 +167,7 @@
style="width: {(onboardingProgress / onboardingStepCount) * 100}%"
></div>
</div>
- <div class="py-8 flex place-content-center place-items-center m-auto">
+ <div class="py-8 flex place-content-center place-items-center m-auto w-[min(100%,_800px)]">
<OnboardingCard
title={onboardingSteps[index].title}
icon={onboardingSteps[index].icon}