ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-01-31 08:46:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add UTC in the serverTimezone dropdown

Browse source
This commit is contained in:
Louis Lam 2022-10-12 22:13:07 +08:00
parent 2faf866e9e
commit edacff123b
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/client.js
View file

@ -8,7 +8,6 @@ const server = UptimeKumaServer.getInstance();
const io = server.io; const io = server.io;
const { setting } = require("./util-server"); const { setting } = require("./util-server");
const checkVersion = require("./check-version"); const checkVersion = require("./check-version");
const dayjs = require("dayjs");
/** /**
* Send list of notification providers to client * Send list of notification providers to client

5
server/model/maintenance.js
View file

@ -1,6 +1,5 @@
const { BeanModel } = require("redbean-node/dist/bean-model"); const { BeanModel } = require("redbean-node/dist/bean-model");
const { parseTimeObject, parseTimeFromTimeObject, utcToLocal, localToUTC, log } = require("../../src/util"); const { parseTimeObject, parseTimeFromTimeObject, utcToLocal, localToUTC, log } = require("../../src/util");
const { isArray } = require("chart.js/helpers");
const { timeObjectToUTC, timeObjectToLocal } = require("../util-server"); const { timeObjectToUTC, timeObjectToLocal } = require("../util-server");
const { R } = require("redbean-node"); const { R } = require("redbean-node");
const dayjs = require("dayjs"); const dayjs = require("dayjs");
@ -48,11 +47,11 @@ class Maintenance extends BeanModel {
obj.timeslotList.push(await timeslot.toPublicJSON()); obj.timeslotList.push(await timeslot.toPublicJSON());
} }
if (!isArray(obj.weekdays)) { if (!Array.isArray(obj.weekdays)) {
obj.weekdays = []; obj.weekdays = [];
} }
if (!isArray(obj.daysOfMonth)) { if (!Array.isArray(obj.daysOfMonth)) {
obj.daysOfMonth = []; obj.daysOfMonth = [];
} }

1
src/components/settings/General.vue
View file

@ -26,6 +26,7 @@
{{ $t("Server Timezone") }} {{ $t("Server Timezone") }}
</label> </label>
<select id="timezone" v-model="settings.serverTimezone" class="form-select"> <select id="timezone" v-model="settings.serverTimezone" class="form-select">
<option value="UTC">UTC</option>
<option <option
v-for="(timezone, index) in timezoneList" v-for="(timezone, index) in timezoneList"
:key="index" :key="index"

1
src/util.ts
View file

@ -9,7 +9,6 @@
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
import * as timezone from "dayjs/plugin/timezone"; import * as timezone from "dayjs/plugin/timezone";
import * as utc from "dayjs/plugin/utc"; import * as utc from "dayjs/plugin/utc";
import {R} from "redbean-node";
export const isDev = process.env.NODE_ENV === "development"; export const isDev = process.env.NODE_ENV === "development";
export const appName = "Uptime Kuma"; export const appName = "Uptime Kuma";