0ct0pu5/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: move the logic to the server

Browse source
This commit is contained in:
martabal 2023-08-15 21:56:05 +02:00
parent 0e4b00d07a
commit 4b1e1f6e83
No known key found for this signature in database
GPG key ID: C00196E3148A52BD
2 changed files with 69 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/src/routes/admin/system-settings/+page.server.ts
View file

@ -1,8 +1,9 @@
import { AppRoute } from '$lib/constants';
import { redirect } from '@sveltejs/kit';
import type { PageServerLoad } from './$types';
import type { SystemConfigDto, SystemConfigTemplateStorageOptionDto } from '@api';
export const load: PageServerLoad = async ({ parent }) => {
export const load: PageServerLoad = async ({ parent, locals }) => {
const { user } = await parent();
if (!user) {
@ -11,8 +12,17 @@ export const load: PageServerLoad = async ({ parent }) => {
throw redirect(302, AppRoute.PHOTOS);
}
const config: SystemConfigDto = await locals.api.systemConfigApi.getConfig().then((res) => res.data);
const defaultConfig: SystemConfigDto = await locals.api.systemConfigApi.getDefaults().then((res) => res.data);
const templateOptions: SystemConfigTemplateStorageOptionDto = await locals.api.systemConfigApi
.getStorageTemplateOptions()
.then((res) => res.data);
return {
user,
config,
defaultConfig,
templateOptions,
meta: {
title: 'System Settings',
},

138
web/src/routes/admin/system-settings/+page.svelte
View file

@ -7,93 +7,71 @@
import PasswordLoginSettings from '$lib/components/admin-page/settings/password-login/password-login-settings.svelte';
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 LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
import { SystemConfigDto, SystemConfigTemplateStorageOptionDto, api } from '@api';
import type { SystemConfigDto, SystemConfigTemplateStorageOptionDto } from '@api';
import type { PageData } from './$types';
export let data: PageData;
let config: SystemConfigDto;
let currentConfig: SystemConfigDto;
let defaultConfig: SystemConfigDto;
let templateOptions: SystemConfigTemplateStorageOptionDto;
const getConfig = async () => {
[config, defaultConfig, templateOptions] = await Promise.all([
api.systemConfigApi.getConfig().then((res) => res.data),
api.systemConfigApi.getDefaults().then((res) => res.data),
api.systemConfigApi.getStorageTemplateOptions().then((res) => res.data),
]);
// deep copy
currentConfig = JSON.parse(JSON.stringify(config));
};
let config: SystemConfigDto = data.config;
let currentConfig: SystemConfigDto = JSON.parse(JSON.stringify(config));
let defaultConfig: SystemConfigDto = data.defaultConfig;
let templateOptions: SystemConfigTemplateStorageOptionDto = data.templateOptions;
</script>
<section class="">
{#await getConfig()}
<div class="flex items-center justify-center">
<LoadingSpinner />
</div>
{:then}
<SettingAccordion title="Thumbnail Settings" subtitle="Manage the resolution of thumbnail sizes">
<ThumbnailSettings
savedConfig={currentConfig.thumbnail}
bind:config={currentConfig}
thumbnailConfig={config.thumbnail}
thumbnailDefault={defaultConfig.thumbnail}
/>
</SettingAccordion>
<SettingAccordion title="Thumbnail Settings" subtitle="Manage the resolution of thumbnail sizes">
<ThumbnailSettings
savedConfig={currentConfig.thumbnail}
bind:config={currentConfig}
thumbnailConfig={config.thumbnail}
thumbnailDefault={defaultConfig.thumbnail}
/>
</SettingAccordion>
<SettingAccordion
title="FFmpeg Settings"
subtitle="Manage the resolution and encoding information of the video files"
>
<FFmpegSettings
savedConfig={currentConfig.ffmpeg}
bind:config={currentConfig}
ffmpegConfig={config.ffmpeg}
ffmpegDefault={defaultConfig.ffmpeg}
/>
</SettingAccordion>
<SettingAccordion title="FFmpeg Settings" subtitle="Manage the resolution and encoding information of the video files">
<FFmpegSettings
savedConfig={currentConfig.ffmpeg}
bind:config={currentConfig}
ffmpegConfig={config.ffmpeg}
ffmpegDefault={defaultConfig.ffmpeg}
/>
</SettingAccordion>
<SettingAccordion
title="Job Settings"
subtitle="Manage job concurrency"
isOpen={$page.url.searchParams.get('open') === 'job-settings'}
>
<JobSettings savedConfig={currentConfig.job} bind:config jobConfig={config.job} jobDefault={defaultConfig.job} />
</SettingAccordion>
<SettingAccordion
title="Job Settings"
subtitle="Manage job concurrency"
isOpen={$page.url.searchParams.get('open') === 'job-settings'}
>
<JobSettings savedConfig={currentConfig.job} bind:config jobConfig={config.job} jobDefault={defaultConfig.job} />
</SettingAccordion>
<SettingAccordion title="Password Authentication" subtitle="Manage login with password settings">
<PasswordLoginSettings
savedConfig={currentConfig.passwordLogin}
bind:config={currentConfig}
passwordLoginConfig={config.passwordLogin}
passwordLoginDefault={defaultConfig.passwordLogin}
/>
</SettingAccordion>
<SettingAccordion title="Password Authentication" subtitle="Manage login with password settings">
<PasswordLoginSettings
savedConfig={currentConfig.passwordLogin}
bind:config={currentConfig}
passwordLoginConfig={config.passwordLogin}
passwordLoginDefault={defaultConfig.passwordLogin}
/>
</SettingAccordion>
<SettingAccordion title="OAuth Authentication" subtitle="Manage the login with OAuth settings">
<OAuthSettings
savedConfig={currentConfig.oauth}
bind:config={currentConfig}
oauthConfig={config.oauth}
oauthDefault={defaultConfig.oauth}
/>
</SettingAccordion>
<SettingAccordion title="OAuth Authentication" subtitle="Manage the login with OAuth settings">
<OAuthSettings
savedConfig={currentConfig.oauth}
bind:config={currentConfig}
oauthConfig={config.oauth}
oauthDefault={defaultConfig.oauth}
/>
</SettingAccordion>
<SettingAccordion
title="Storage Template"
subtitle="Manage the folder structure and file name of the upload asset"
isOpen={$page.url.searchParams.get('open') === 'storage-template'}
>
<StorageTemplateSettings
savedConfig={currentConfig.storageTemplate}
bind:config={currentConfig}
storageConfig={config.storageTemplate}
user={data.user}
storageDefault={defaultConfig.storageTemplate}
{templateOptions}
/>
</SettingAccordion>
{/await}
</section>
<SettingAccordion
title="Storage Template"
subtitle="Manage the folder structure and file name of the upload asset"
isOpen={$page.url.searchParams.get('open') === 'storage-template'}
>
<StorageTemplateSettings
savedConfig={currentConfig.storageTemplate}
bind:config={currentConfig}
storageConfig={config.storageTemplate}
user={data.user}
storageDefault={defaultConfig.storageTemplate}
{templateOptions}
/>
</SettingAccordion>