mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-05-13 02:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): use dateTime format from server

Browse Source
This commit is contained in:
Zack Spear
2023-11-15 13:01:13 -08:00
parent 00182ebb3c
commit 81f7f41b3b
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/components/UserProfile/UptimeExpire.vue
+2
View File
@@ -34,6 +34,8 @@ const countUp = computed<boolean>(() => {
return state.value !== 'TRIAL' && state.value !== 'ENOCONN';
});
console.debug('[useDateTimeHelper] params', dateTimeFormat.value, props.t, false, time.value, countUp.value);
const {
outputDateTimeReadableDiff: readableDiff,
outputDateTimeFormatted: formatted,
web/store/server.ts
+1
View File
@@ -754,6 +754,7 @@ export const useServerStore = defineStore('server', () => {
if (typeof data?.connectPluginInstalled !== 'undefined') { connectPluginInstalled.value = data.connectPluginInstalled; }
if (typeof data?.connectPluginVersion !== 'undefined') { connectPluginVersion.value = data.connectPluginVersion; }
if (typeof data?.csrf !== 'undefined') { csrf.value = data.csrf; }
if (typeof data?.dateTimeFormat !== 'undefined') { dateTimeFormat.value = data.dateTimeFormat; }
if (typeof data?.description !== 'undefined') { description.value = data.description; }
if (typeof data?.deviceCount !== 'undefined') { deviceCount.value = data.deviceCount; }
if (typeof data?.email !== 'undefined') { email.value = data.email; }
web/types/server.ts
+16 -15
View File
@@ -34,6 +34,21 @@ export type ServerOsVersionBranch = 'stable' | 'next' | 'preview' | 'test';
export type ServerconnectPluginInstalled = 'dynamix.unraid.net.plg' | 'dynamix.unraid.net.staging.plg' | 'dynamix.unraid.net.plg_installFailed' | 'dynamix.unraid.net.staging.plg_installFailed' | '';
export type ServerRebootType = 'thirdPartyDriversDownloading' | 'downgrade' | 'update' | '';
export interface DateFormatOption {
format: string;
display: string;
}
export interface TimeFormatOption {
format: string;
display: string;
}
export interface ServerDateTimeFormat {
date: string;
time: string;
}
export interface Server {
apiKey?: string;
apiVersion?: string;
@@ -43,6 +58,7 @@ export interface Server {
connectPluginInstalled?: ServerconnectPluginInstalled;
connectPluginVersion?: string;
csrf?: string;
dateTimeFormat?: ServerDateTimeFormat;
description?: string;
deviceCount?: number;
email?: string;
@@ -150,18 +166,3 @@ export interface ServerStateData {
error?: ServerStateDataError | boolean;
withKey?: boolean; // @todo potentially remove
}
export interface DateFormatOption {
format: string;
display: string;
}
export interface TimeFormatOption {
format: string;
display: string;
}
export interface ServerDateTimeFormat {
date: string;
time: string;
}