ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-30 18:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add info.serverTimezoneOffset and improve some styles

Browse source
This commit is contained in:
Louis Lam 2022-10-11 14:52:47 +08:00
parent f6bbd1ca67
commit 2271ac4a5a
7 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "uptime-kuma", "name": "uptime-kuma",
"version": "1.18.4", "version": "1.18.5",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "uptime-kuma", "name": "uptime-kuma",
"version": "1.18.4", "version": "1.18.5",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@louislam/sqlite3": "~15.0.6", "@louislam/sqlite3": "~15.0.6",

2
server/client.js
View file

@ -8,6 +8,7 @@ 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
@ -124,6 +125,7 @@ async function sendInfo(socket) {
latestVersion: checkVersion.latestVersion, latestVersion: checkVersion.latestVersion,
primaryBaseURL: await setting("primaryBaseURL"), primaryBaseURL: await setting("primaryBaseURL"),
serverTimezone: await server.getTimezone(), serverTimezone: await server.getTimezone(),
serverTimezoneOffset: dayjs().format("Z"),
}); });
} }

5
src/assets/app.scss
View file

@ -101,6 +101,11 @@ optgroup {
} }
} }
// Override Bootstrap
.btn-group > .btn:hover {
z-index: initial;
}
.btn { .btn {
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;

4
src/pages/EditMaintenance.vue
View file

@ -5,7 +5,7 @@
<form @submit.prevent="submit"> <form @submit.prevent="submit">
<div class="shadow-box"> <div class="shadow-box">
<div class="row"> <div class="row">
<div class="col-xl-7"> <div class="col-xl-10">
<!-- Title --> <!-- Title -->
<div class="mb-3"> <div class="mb-3">
<label for="name" class="form-label">{{ $t("Title") }}</label> <label for="name" class="form-label">{{ $t("Title") }}</label>
@ -82,7 +82,7 @@
<h2 class="mt-5">{{ $t("Date and Time") }}</h2> <h2 class="mt-5">{{ $t("Date and Time") }}</h2>
<div>⚠️ {{ $t("warningTimezone") }}: {{ $root.info.serverTimezone }}</div> <div>⚠️ {{ $t("warningTimezone") }}: <mark>{{ $root.info.serverTimezone }} ({{ $root.info.serverTimezoneOffset }})</mark></div>
<!-- Strategy --> <!-- Strategy -->
<div class="my-3"> <div class="my-3">

2
src/pages/ManageMaintenance.vue
View file

@ -35,6 +35,7 @@
<div class="buttons"> <div class="buttons">
<router-link v-if="false" :to="maintenanceURL(item.id)" class="btn btn-light">{{ $t("Details") }}</router-link> <router-link v-if="false" :to="maintenanceURL(item.id)" class="btn btn-light">{{ $t("Details") }}</router-link>
<div class="btn-group" role="group">
<button v-if="item.active" class="btn btn-normal" @click="pauseDialog"> <button v-if="item.active" class="btn btn-normal" @click="pauseDialog">
<font-awesome-icon icon="pause" /> {{ $t("Pause") }} <font-awesome-icon icon="pause" /> {{ $t("Pause") }}
</button> </button>
@ -53,6 +54,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="text-center mt-3" style="font-size: 13px;"> <div class="text-center mt-3" style="font-size: 13px;">
<a href="https://github.com/louislam/uptime-kuma/wiki/Maintenance" target="_blank">Learn More</a> <a href="https://github.com/louislam/uptime-kuma/wiki/Maintenance" target="_blank">Learn More</a>

1
src/util.js
View file

@ -363,7 +363,6 @@ function utcToISODateTime(input) {
return dayjs.utc(input).toISOString(); return dayjs.utc(input).toISOString();
} }
exports.utcToISODateTime = utcToISODateTime; exports.utcToISODateTime = utcToISODateTime;
/**
/** /**
* For SQL_DATETIME_FORMAT * For SQL_DATETIME_FORMAT
*/ */

1
src/util.ts
View file

@ -409,7 +409,6 @@ export function utcToISODateTime(input : string) {
return dayjs.utc(input).toISOString(); return dayjs.utc(input).toISOString();
} }
/**
/** /**
* For SQL_DATETIME_FORMAT * For SQL_DATETIME_FORMAT
*/ */