Merge branch 'louislam:master' into clear-monitor-data

This commit is contained in:
Ponkhy
2021-08-31 23:22:45 +02:00
committed by GitHub
20 changed files with 1769 additions and 2010 deletions

View File

@@ -5,11 +5,12 @@
<div>
<router-link to="/add" class="btn btn-primary mb-3"><font-awesome-icon icon="plus" /> {{ $t("Add New Monitor") }}</router-link>
</div>
<MonitorList />
<MonitorList scrollbar="true" />
</div>
<div class="col-12 col-md-7 col-xl-8">
<router-view />
<div class="col-12 col-md-7 col-xl-8 mb-3">
<!-- Add :key to disable vue router re-use the same component -->
<router-view :key="$route.fullPath" />
</div>
</div>
</div>
@@ -26,7 +27,6 @@ export default {
data() {
return {}
},
}
</script>

View File

@@ -5,7 +5,7 @@
{{ $t("Quick Stats") }}
</h1>
<div class="shadow-box big-padding text-center">
<div class="shadow-box big-padding text-center mb-4">
<div class="row">
<div class="col">
<h3>{{ $t("Up") }}</h3>
@@ -170,7 +170,6 @@ export default {
.shadow-box {
padding: 20px;
margin-top: 25px;
}
table {

View File

@@ -507,4 +507,5 @@ table {
}
}
}
</style>

View File

@@ -155,6 +155,14 @@
</div>
</div>
<footer>
<div class="container-fluid">
Uptime Kuma -
{{ $t("Version") }}: {{ $root.info.version }} -
<a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a>
</div>
</footer>
<NotificationDialog ref="notificationDialog" />
<Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
@@ -314,4 +322,12 @@ export default {
color: #000;
}
}
footer {
color: #aaa;
font-size: 13px;
margin-top: 20px;
padding-bottom: 30px;
text-align: center;
}
</style>