Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-18 04:04:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

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",
"version": "1.18.4",
"version": "1.18.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "uptime-kuma",
"version": "1.18.4",
"version": "1.18.5",
"license": "MIT",
"dependencies": {
"@louislam/sqlite3": "~15.0.6",

2
server/client.js
View File

@ -8,6 +8,7 @@ const server = UptimeKumaServer.getInstance();
const io = server.io;
const { setting } = require("./util-server");
const checkVersion = require("./check-version");
const dayjs = require("dayjs");
/**
* Send list of notification providers to client
@ -124,6 +125,7 @@ async function sendInfo(socket) {
latestVersion: checkVersion.latestVersion,
primaryBaseURL: await setting("primaryBaseURL"),
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 {
padding-left: 20px;
padding-right: 20px;

4
src/pages/EditMaintenance.vue
View File

@ -5,7 +5,7 @@
<form @submit.prevent="submit">
<div class="shadow-box">
<div class="row">
<div class="col-xl-7">
<div class="col-xl-10">
<!-- Title -->
<div class="mb-3">
<label for="name" class="form-label">{{ $t("Title") }}</label>
@ -82,7 +82,7 @@
<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 -->
<div class="my-3">

26
src/pages/ManageMaintenance.vue
View File

@ -35,21 +35,23 @@
<div class="buttons">
<router-link v-if="false" :to="maintenanceURL(item.id)" class="btn btn-light">{{ $t("Details") }}</router-link>
<button v-if="item.active" class="btn btn-normal" @click="pauseDialog">
<font-awesome-icon icon="pause" /> {{ $t("Pause") }}
</button>
<div class="btn-group" role="group">
<button v-if="item.active" class="btn btn-normal" @click="pauseDialog">
<font-awesome-icon icon="pause" /> {{ $t("Pause") }}
</button>
<button v-if="!item.active" class="btn btn-primary" @click="resumeMaintenance">
<font-awesome-icon icon="play" /> {{ $t("Resume") }}
</button>
<button v-if="!item.active" class="btn btn-primary" @click="resumeMaintenance">
<font-awesome-icon icon="play" /> {{ $t("Resume") }}
</button>
<router-link :to="'/maintenance/edit/' + item.id" class="btn btn-normal">
<font-awesome-icon icon="edit" /> {{ $t("Edit") }}
</router-link>
<router-link :to="'/maintenance/edit/' + item.id" class="btn btn-normal">
<font-awesome-icon icon="edit" /> {{ $t("Edit") }}
</router-link>
<button class="btn btn-danger" @click="deleteDialog(item.id)">
<font-awesome-icon icon="trash" /> {{ $t("Delete") }}
</button>
<button class="btn btn-danger" @click="deleteDialog(item.id)">
<font-awesome-icon icon="trash" /> {{ $t("Delete") }}
</button>
</div>
</div>
</div>
</div>

1
src/util.js
View File

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

1
src/util.ts
View File

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