self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-25 10:43:13 +02:00
Code Issues Releases Activity

refactor(server, web): standardize theme api response (#4664)

Browse Source 
* web: standardize theme api response

* revert makefile change that i didn't mean to commit
This commit is contained in:
Wingy 2023-10-26 19:32:33 -07:00 committed by GitHub
parent 7ff68223ab
commit a08a687951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/api/open-api/api.ts generated
View File

@ -2966,10 +2966,10 @@ export interface ServerStatsResponseDto {
export interface ServerThemeDto { export interface ServerThemeDto {
/** /**
* *
* @type {SystemConfigThemeDto} * @type {string}
* @memberof ServerThemeDto * @memberof ServerThemeDto
*/ */
'theme': SystemConfigThemeDto; 'customCss': string;
} }
/** /**
* *

BIN
mobile/openapi/doc/ServerThemeDto.md generated
View File

Binary file not shown.

BIN
mobile/openapi/lib/model/server_theme_dto.dart generated
View File

Binary file not shown.

BIN
mobile/openapi/test/server_theme_dto_test.dart generated
View File

Binary file not shown.

6
server/immich-openapi-specs.json
View File

@ -7836,12 +7836,12 @@
}, },
"ServerThemeDto": { "ServerThemeDto": {
"properties": { "properties": {
"theme": { "customCss": {
"$ref": "#/components/schemas/SystemConfigThemeDto" "type": "string"
} }
}, },
"required": [ "required": [
"theme" "customCss"
], ],
"type": "object" "type": "object"
}, },

4
server/src/domain/server-info/server-info.dto.ts
View File

@ -80,9 +80,7 @@ export class ServerMediaTypesResponseDto {
sidecar!: string[]; sidecar!: string[];
} }
export class ServerThemeDto { export class ServerThemeDto extends SystemConfigThemeDto {}
theme!: SystemConfigThemeDto;
}
export class ServerConfigDto { export class ServerConfigDto {
oauthButtonText!: string; oauthButtonText!: string;

2
server/src/domain/server-info/server-info.service.ts
View File

@ -72,7 +72,7 @@ export class ServerInfoService {
async getTheme() { async getTheme() {
const { theme } = await this.configCore.getConfig(); const { theme } = await this.configCore.getConfig();
return { theme }; return theme;
} }
async getConfig(): Promise<ServerConfigDto> { async getConfig(): Promise<ServerConfigDto> {

4
server/test/e2e/server-info.e2e-spec.ts
View File

@ -161,9 +161,7 @@ describe(`${ServerInfoController.name} (e2e)`, () => {
const { status, body } = await request(server).get('/server-info/theme'); const { status, body } = await request(server).get('/server-info/theme');
expect(status).toBe(200); expect(status).toBe(200);
expect(body).toEqual({ expect(body).toEqual({
theme: { customCss: '',
customCss: '',
},
}); });
}); });
}); });

4
web/src/api/open-api/api.ts generated
View File

@ -2966,10 +2966,10 @@ export interface ServerStatsResponseDto {
export interface ServerThemeDto { export interface ServerThemeDto {
/** /**
* *
* @type {SystemConfigThemeDto} * @type {string}
* @memberof ServerThemeDto * @memberof ServerThemeDto
*/ */
'theme': SystemConfigThemeDto; 'customCss': string;
} }
/** /**
* *

4
web/src/routes/custom.css/+server.ts
View File

@ -1,9 +1,7 @@
import { RequestHandler, text } from '@sveltejs/kit'; import { RequestHandler, text } from '@sveltejs/kit';
export const GET = (async ({ locals: { api } }) => { export const GET = (async ({ locals: { api } }) => {
const { const {
data: { data: { customCss },
theme: { customCss },
},
} = await api.serverInfoApi.getTheme(); } = await api.serverInfoApi.getTheme();
return text(customCss, { return text(customCss, {
headers: { headers: {