7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-11 20:09:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into import-export

Browse Source
This commit is contained in:
Ponkhy
2021-09-12 18:46:11 +02:00
committed by GitHub
parent 862672731f 2d7767c905
commit d313966d80
26 changed files with 519 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/DashboardHome.vue
View File

@@ -26,7 +26,7 @@
</div>
</div>
<div class="shadow-box table-shadow-box" style="overflow-x: scroll;">
<div class="shadow-box table-shadow-box" style="overflow-x: hidden;">
<table class="table table-borderless table-hover">
<thead>
<tr>
@@ -178,5 +178,10 @@ table {
tr {
transition: all ease-in-out 0.2ms;
}
@media (max-width: 550px) {
table-layout: fixed;
overflow-wrap: break-word;
}
}
</style>

2
src/pages/Details.vue
View File

@@ -55,7 +55,7 @@
</span>
</div>
<div class="col">
<h4>{{ $t("Avg.") }}{{ pingTitle }}</h4>
<h4>{{ $t("Avg.") }} {{ pingTitle }}</h4>
<p>(24{{ $t("-hour") }})</p>
<span class="num"><CountUp :value="avgPing" /></span>
</div>

19
src/pages/Settings.vue
View File

@@ -120,6 +120,14 @@
</form>
</template>
<h2 class="mt-5 mb-2">
{{ $t("Two Factor Authentication") }}
</h2>
<div class="mb-3">
<button class="btn btn-primary me-2" type="button" @click="$refs.TwoFADialog.show()">{{ $t("2FA Settings") }}</button>
</div>
<h2 class="mt-5 mb-2">{{ $t("Import/Export Backup") }}</h2>
<p>
@@ -163,10 +171,10 @@
<h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
<div class="mb-3">
<button v-if="settings.disableAuth" class="btn btn-outline-primary me-1" @click="enableAuth">{{ $t("Enable Auth") }}</button>
<button v-if="! settings.disableAuth" class="btn btn-primary me-1" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
<button v-if="! settings.disableAuth" class="btn btn-danger me-1" @click="$root.logout">{{ $t("Logout") }}</button>
<button class="btn btn-outline-danger me-1" @click="confirmClearStatistics">{{ $t("Clear all statistics") }}</button>
<button v-if="settings.disableAuth" class="btn btn-outline-primary me-1 mb-1" @click="enableAuth">{{ $t("Enable Auth") }}</button>
<button v-if="! settings.disableAuth" class="btn btn-primary me-1 mb-1" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
<button v-if="! settings.disableAuth" class="btn btn-danger me-1 mb-1" @click="$root.logout">{{ $t("Logout") }}</button>
<button class="btn btn-outline-danger me-1 mb-1" @click="confirmClearStatistics">{{ $t("Clear all statistics") }}</button>
</div>
</template>
</div>
@@ -205,6 +213,7 @@
</footer>
<NotificationDialog ref="notificationDialog" />
<TwoFADialog ref="TwoFADialog" />
<Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
<template v-if="$i18n.locale === 'es-ES' ">
@@ -291,6 +300,7 @@ import dayjs from "dayjs";
import utc from "dayjs/plugin/utc"
import timezone from "dayjs/plugin/timezone"
import NotificationDialog from "../components/NotificationDialog.vue";
import TwoFADialog from "../components/TwoFADialog.vue";
dayjs.extend(utc)
dayjs.extend(timezone)
@@ -301,6 +311,7 @@ const toast = useToast()
export default {
components: {
NotificationDialog,
TwoFADialog,
Confirm,
},
data() {

2
src/pages/Setup.vue
View File

@@ -87,7 +87,7 @@ export default {
if (res.ok) {
this.processing = true;
this.$root.login(this.username, this.password, (res) => {
this.$root.login(this.username, this.password, "", (res) => {
this.processing = false;
this.$router.push("/")
})