yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:RiV-chain/RiV-mesh into develop

Browse source
This commit is contained in:
vadym 2022-12-11 14:53:32 +02:00
commit 21e7b03554
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
contrib/ui/mesh-ui/ui/index.html
View file

@ -273,7 +273,6 @@
.column {
max-height: 350px;
display: flex;
flex-direction: column;
justify-content: space-between;
@ -321,11 +320,15 @@
img {
display: block;
}
html, body {
height: 100vh;
}
</style>
</head>
<body onload="onLoad();">
<div style="padding:3px; max-height: 250px;">
<div class="container hero is-fullheight" style="padding:3px;">
<div class="box is-hidden">
<div style="z-index: 9;" class="box stack-top notification is-primary is-hidden" id="notification_window">
<button class="delete" id="info_close"></button>
@ -468,16 +471,22 @@
</div>
<footer class="is-flex-align-items-flex-end" style="margin-top: auto">
<hr style="margin: 0px;background-color: #5d656d;">
<div id="version" class="content has-text-left" style="padding: 10px;padding-left: 50px;">
v123456
</div>
</footer>
</div>
<div style="margin-left: 100px; margin-right: 100px;">
<div class="is-hidden" style="margin-left: 100px; margin-right: 100px;">
<div class="notification is-primary is-hidden" id="notification_info">
<button class="delete" id="info_close1"></button>
<p id="info_text"></p>
</div>
</div>
<div class="is-hidden">
<img id="flag_colombia" alt="colombia"

3
contrib/ui/mesh-ui/webview.go
View file

@ -20,6 +20,8 @@ import (
"github.com/RiV-chain/RiV-mesh/src/admin"
)
var uiVersion = "0.0.1"
func main() {
debug := true
w := webview.New(debug)
@ -194,6 +196,7 @@ func get_self(w webview.WebView) {
go setFieldValue(w, "ipv6", res.IPAddress)
go setFieldValue(w, "pub_key", res.PublicKey)
go setFieldValue(w, "priv_key", res.PrivateKey)
go setFieldValue(w, "version", fmt.Sprintf("v%v/%v", res.BuildVersion, uiVersion))
//found subnet
fmt.Printf("Subnet: %s\n", res.Subnet)
go setFieldValue(w, "subnet", res.Subnet)