general layout improvements

This commit is contained in:
vabene1111
2024-12-01 15:35:40 +01:00
parent da4abcfce2
commit ab9f9701d8
11 changed files with 102 additions and 71 deletions

View File

@@ -64,10 +64,10 @@ import {
export interface PatchedUserPreference {
/**
*
* @type {number}
* @type {User}
* @memberof PatchedUserPreference
*/
user?: number;
readonly user?: User;
/**
*
* @type {UserFileView}
@@ -257,7 +257,7 @@ export function PatchedUserPreferenceFromJSONTyped(json: any, ignoreDiscriminato
}
return {
'user': json['user'] == null ? undefined : json['user'],
'user': json['user'] == null ? undefined : UserFromJSON(json['user']),
'image': json['image'] == null ? undefined : UserFileViewFromJSON(json['image']),
'theme': json['theme'] == null ? undefined : ThemeEnumFromJSON(json['theme']),
'navBgColor': json['nav_bg_color'] == null ? undefined : json['nav_bg_color'],
@@ -293,14 +293,13 @@ export function PatchedUserPreferenceToJSON(json: any): PatchedUserPreference {
return PatchedUserPreferenceToJSONTyped(json, false);
}
export function PatchedUserPreferenceToJSONTyped(value?: Omit<PatchedUserPreference, 'food_inherit_default'|'food_children_exist'> | null, ignoreDiscriminator: boolean = false): any {
export function PatchedUserPreferenceToJSONTyped(value?: Omit<PatchedUserPreference, 'user'|'food_inherit_default'|'food_children_exist'> | null, ignoreDiscriminator: boolean = false): any {
if (value == null) {
return value;
}
return {
'user': value['user'],
'image': UserFileViewToJSON(value['image']),
'theme': ThemeEnumToJSON(value['theme']),
'nav_bg_color': value['navBgColor'],

View File

@@ -67,6 +67,12 @@ export interface ServerSettings {
* @memberof ServerSettings
*/
debug: boolean;
/**
*
* @type {string}
* @memberof ServerSettings
*/
version: string;
}
/**
@@ -81,6 +87,7 @@ export function instanceOfServerSettings(value: object): value is ServerSettings
if (!('imprintUrl' in value) || value['imprintUrl'] === undefined) return false;
if (!('hosted' in value) || value['hosted'] === undefined) return false;
if (!('debug' in value) || value['debug'] === undefined) return false;
if (!('version' in value) || value['version'] === undefined) return false;
return true;
}
@@ -102,6 +109,7 @@ export function ServerSettingsFromJSONTyped(json: any, ignoreDiscriminator: bool
'imprintUrl': json['imprint_url'],
'hosted': json['hosted'],
'debug': json['debug'],
'version': json['version'],
};
}
@@ -124,6 +132,7 @@ export function ServerSettingsToJSONTyped(value?: ServerSettings | null, ignoreD
'imprint_url': value['imprintUrl'],
'hosted': value['hosted'],
'debug': value['debug'],
'version': value['version'],
};
}

View File

@@ -64,10 +64,10 @@ import {
export interface UserPreference {
/**
*
* @type {number}
* @type {User}
* @memberof UserPreference
*/
user: number;
readonly user: User;
/**
*
* @type {UserFileView}
@@ -260,7 +260,7 @@ export function UserPreferenceFromJSONTyped(json: any, ignoreDiscriminator: bool
}
return {
'user': json['user'],
'user': UserFromJSON(json['user']),
'image': json['image'] == null ? undefined : UserFileViewFromJSON(json['image']),
'theme': json['theme'] == null ? undefined : ThemeEnumFromJSON(json['theme']),
'navBgColor': json['nav_bg_color'] == null ? undefined : json['nav_bg_color'],
@@ -296,14 +296,13 @@ export function UserPreferenceToJSON(json: any): UserPreference {
return UserPreferenceToJSONTyped(json, false);
}
export function UserPreferenceToJSONTyped(value?: Omit<UserPreference, 'food_inherit_default'|'food_children_exist'> | null, ignoreDiscriminator: boolean = false): any {
export function UserPreferenceToJSONTyped(value?: Omit<UserPreference, 'user'|'food_inherit_default'|'food_children_exist'> | null, ignoreDiscriminator: boolean = false): any {
if (value == null) {
return value;
}
return {
'user': value['user'],
'image': UserFileViewToJSON(value['image']),
'theme': ThemeEnumToJSON(value['theme']),
'nav_bg_color': value['navBgColor'],