diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index a84b6fcc5b..29e1dd032a 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -127,12 +127,6 @@ export class MiMeta { }) public iconUrl: string | null; - @Column('varchar', { - length: 1024, - nullable: true, - }) - public sidebarLogoUrl: string | null; - @Column('varchar', { length: 1024, nullable: true, @@ -145,6 +139,12 @@ export class MiMeta { }) public app512IconUrl: string | null; + @Column('varchar', { + length: 1024, + nullable: true, + }) + public sidebarLogoUrl: string | null; + @Column('varchar', { length: 1024, nullable: true, diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index ed90d3fdde..5a69fbf679 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -102,10 +102,6 @@ export const meta = { type: 'string', optional: false, nullable: true, }, - sidebarLogoUrl: { - type: 'string', - optional: false, nullable: true, - }, app192IconUrl: { type: 'string', optional: false, nullable: true, @@ -114,6 +110,10 @@ export const meta = { type: 'string', optional: false, nullable: true, }, + sidebarLogoUrl: { + type: 'string', + optional: false, nullable: true, + }, enableEmail: { type: 'boolean', optional: false, nullable: false, @@ -584,9 +584,9 @@ export default class extends Endpoint { // eslint- notFoundImageUrl: instance.notFoundImageUrl, infoImageUrl: instance.infoImageUrl, iconUrl: instance.iconUrl, - sidebarLogoUrl: instance.sidebarLogoUrl, app192IconUrl: instance.app192IconUrl, app512IconUrl: instance.app512IconUrl, + sidebarLogoUrl: instance.sidebarLogoUrl, backgroundImageUrl: instance.backgroundImageUrl, logoImageUrl: instance.logoImageUrl, defaultLightTheme: instance.defaultLightTheme, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index b8b2416b14..c56dd053d3 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -53,9 +53,9 @@ export const paramDef = { infoImageUrl: { type: 'string', nullable: true }, notFoundImageUrl: { type: 'string', nullable: true }, iconUrl: { type: 'string', nullable: true }, - sidebarLogoUrl: { type: 'string', nullable: true }, app192IconUrl: { type: 'string', nullable: true }, app512IconUrl: { type: 'string', nullable: true }, + sidebarLogoUrl: { type: 'string', nullable: true }, backgroundImageUrl: { type: 'string', nullable: true }, logoImageUrl: { type: 'string', nullable: true }, name: { type: 'string', nullable: true }, @@ -243,10 +243,6 @@ export default class extends Endpoint { // eslint- set.iconUrl = ps.iconUrl; } - if (ps.sidebarLogoUrl !== undefined) { - set.sidebarLogoUrl = ps.sidebarLogoUrl; - } - if (ps.app192IconUrl !== undefined) { set.app192IconUrl = ps.app192IconUrl; } @@ -255,6 +251,10 @@ export default class extends Endpoint { // eslint- set.app512IconUrl = ps.app512IconUrl; } + if (ps.sidebarLogoUrl !== undefined) { + set.sidebarLogoUrl = ps.sidebarLogoUrl; + } + if (ps.serverErrorImageUrl !== undefined) { set.serverErrorImageUrl = ps.serverErrorImageUrl; } diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue index 6564a362c2..8525df5e53 100644 --- a/packages/frontend/src/pages/admin/branding.vue +++ b/packages/frontend/src/pages/admin/branding.vue @@ -15,15 +15,6 @@ SPDX-License-Identifier: AGPL-3.0-only - - - - - - @@ -46,6 +37,15 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + +