kamp/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2024-11-22 07:10:09 +01:00
Code

Added peer's endpoint IP back

Browse Source
This commit is contained in:
Donald Zou 2024-10-05 15:03:27 +08:00
parent 27c67ec202
commit e344f28265
7 changed files with 79 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dashboard.py
View File

@ -1192,6 +1192,7 @@ class DashboardConfig:
keys = sqlSelect("SELECT * FROM DashboardAPIKeys WHERE ExpiredAt IS NULL OR ExpiredAt > datetime('now', 'localtime') ORDER BY CreatedAt DESC").fetchall()
fKeys = []
for k in keys:
fKeys.append(DashboardAPIKey(*k))
return fKeys

50
src/static/app/dist/assets/index.js vendored
View File

File diff suppressed because one or more lines are too long

23
src/static/app/src/components/configurationComponents/peer.vue
View File

@ -65,19 +65,24 @@ export default {
<h6>
{{Peer.name ? Peer.name : 'Untitled Peer'}}
</h6>
<div class="mb-2">
<div class="mb-1">
<small class="text-muted">
<LocaleText t="Public Key"></LocaleText>
Public Key
</small>
<small class="d-block">
<samp>{{Peer.id}}</samp>
</small>
</div>
<div>
<small class="text-muted">
<LocaleText t="Allowed IPs"></LocaleText>
</small>
<small class="d-block">
<samp>{{Peer.allowed_ip}}</samp>
</small>
<p class="mb-0"><samp>{{Peer.id}}</samp></p>
</div>
<div class="d-flex align-items-end">
<div>
<small class="text-muted">
<LocaleText t="Allowed IPs"></LocaleText>
</small>
<p class="mb-0"><samp>{{Peer.allowed_ip}}</samp></p>
</div>
<div class="ms-auto px-2 rounded-3 subMenuBtn"
:class="{active: this.subMenuOpened}"
>

19
src/static/app/src/components/configurationComponents/peerSearch.vue
View File

@ -117,6 +117,11 @@ export default {
<i class="bi bi-filter-circle me-2"></i>
<LocaleText t="Display"></LocaleText>
</button>
<button class="btn text-secondary-emphasis bg-secondary-subtle rounded-3 border-1 border-secondary-subtle shadow-sm"
@click="this.$emit('editConfiguration')"
type="button" aria-expanded="false">
<i class="bi bi-gear-fill"></i>
</button>
<button class="btn text-secondary-emphasis bg-secondary-subtle rounded-3 border-1 border-secondary-subtle shadow-sm"
@click="this.showMoreSettings = true"
type="button" aria-expanded="false">
@ -174,21 +179,11 @@ export default {
<div class="container-md d-flex h-100 w-100">
<div class="m-auto modal-dialog-centered dashboardModal">
<div class="card rounded-3 shadow w-100">
<div class="card-header bg-transparent d-flex align-items-center gap-2 border-0 p-4 pb-2">
<h4 class="mb-0 fw-normal">
<LocaleText t="Configuration Settings"></LocaleText>
</h4>
<div class="card-header bg-transparent d-flex align-items-center gap-2 border-0 p-4 pb-0">
<button type="button" class="btn-close ms-auto" @click="this.showMoreSettings = false"></button>
</div>
<div class="card-body px-4 pb-4 d-flex gap-3 flex-column">
<div class="card-body px-4 pb-4 d-flex gap-3 flex-column pt-0">
<div>
<div class="list-group">
<a class="list-group-item list-group-item-action d-flex" role="button"
@click="this.$emit('editConfiguration')">
<LocaleText t="Configuration Settings"></LocaleText>
</a>
</div>
<hr>
<p class="text-muted fw-bold mb-2"><small>
<LocaleText t="Peer Jobs"></LocaleText>
</small></p>

13
src/static/app/src/components/configurationComponents/peerSettingsDropdown.vue
View File

@ -86,7 +86,20 @@ export default {
<template>
<ul class="dropdown-menu mt-2 shadow-lg d-block rounded-3" style="max-width: 200px">
<template v-if="!this.Peer.restricted">
<template v-if="this.Peer.status === 'running'">
<li style="font-size: 0.8rem; padding-left: var(--bs-dropdown-item-padding-x); padding-right: var(--bs-dropdown-item-padding-x);">
<span class="text-body d-flex">
<i class="bi bi-box-arrow-in-right"></i>
<span class="ms-auto">
{{this.Peer.endpoint}}
</span>
</span>
</li>
<li><hr class="dropdown-divider"></li>
</template>
<template v-if="!this.Peer.private_key">
<li>
<small class="w-100 dropdown-item text-muted"

7
src/static/app/src/main.js
View File

@ -14,7 +14,12 @@ import {DashboardConfigurationStore} from "@/stores/DashboardConfigurationStore.
import {fetchGet} from "@/utilities/fetch.js";
let Locale;
await fetch("/api/locale").then(res => res.json()).then(res => Locale = res.data)
await fetch("/api/locale")
.then(res => res.json())
.then(res => Locale = res.data)
.catch(() => {
Locale = null
})
const app = createApp(App)

13
src/static/css/dashboard.css
View File

@ -1265,4 +1265,17 @@ pre.index-alert {
opacity: 0;
width: 100%;
}
}
@media screen and (max-width: 576px) {
.dashboardModal{
width: 100% !important;
}
.dashboardModal > .card{
margin: 0.5rem !important;
}
}
samp{
word-wrap: anywhere;
}