cjones/immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(web,server): external domain setting (#6146)

Browse Source 
* feat: external domain setting

* chore: open api

* mobile: handle serverconfig-externalDomain

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
Jason Rasmussen
2024-01-03 21:54:48 -05:00
committed by GitHub
parent 1e503c3212
commit 317adc5c28
35 changed files with 433 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/routes/(user)/sharing/sharedlinks/+page.svelte
+3 -2
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
import { api, copyToClipboard, SharedLinkResponseDto } from '@api';
import { api, copyToClipboard, makeSharedLinkUrl, SharedLinkResponseDto } from '@api';
import { goto } from '$app/navigation';
import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
import {
@@ -13,6 +13,7 @@
import { handleError } from '$lib/utils/handle-error';
import { AppRoute } from '$lib/constants';
import { mdiArrowLeft } from '@mdi/js';
import { serverConfig } from '$lib/stores/server-config.store';
let sharedLinks: SharedLinkResponseDto[] = [];
let editSharedLink: SharedLinkResponseDto | null = null;
@@ -49,7 +50,7 @@
};
const handleCopyLink = async (key: string) => {
await copyToClipboard(`${window.location.origin}/share/${key}`);
await copyToClipboard(makeSharedLinkUrl($serverConfig.externalDomain, key));
};
</script>
web/src/routes/admin/system-settings/+page.svelte
+5
View File
@@ -9,6 +9,7 @@
import SettingAccordion from '$lib/components/admin-page/settings/setting-accordion.svelte';
import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';
import ThumbnailSettings from '$lib/components/admin-page/settings/thumbnail/thumbnail-settings.svelte';
import ServerSettings from '$lib/components/admin-page/settings/server/server-settings.svelte';
import TrashSettings from '$lib/components/admin-page/settings/trash-settings/trash-settings.svelte';
import ThemeSettings from '$lib/components/admin-page/settings/theme/theme-settings.svelte';
import LinkButton from '$lib/components/elements/buttons/link-button.svelte';
@@ -95,6 +96,10 @@
<PasswordLoginSettings disabled={$featureFlags.configFile} passwordLoginConfig={configs.passwordLogin} />
</SettingAccordion>
<SettingAccordion title="Server Settings" subtitle="Manage server settings">
<ServerSettings disabled={$featureFlags.configFile} serverConfig={configs.server} />
</SettingAccordion>
<SettingAccordion
title="Storage Template"
subtitle="Manage the folder structure and file name of the upload asset"