diff --git a/cmd/wg-portal/assets/tpl/admin_index.gohtml b/cmd/wg-portal/assets/tpl/admin_index.gohtml index 383d682..fe99d77 100644 --- a/cmd/wg-portal/assets/tpl/admin_index.gohtml +++ b/cmd/wg-portal/assets/tpl/admin_index.gohtml @@ -171,26 +171,26 @@ - {{range $i, $p :=$.PagedInterfacePeers}} - {{$peerUser:= $p.Email}} - + {{range $i, $p := $.PagedInterfacePeers}} + {{$peerUser := $p.UserIdentifier}} + - + - + {{$p.Identifier}} {{$p.PublicKey}} - {{if eq $.Device.Type "server"}} - {{$p.Email}} + {{if eq $p.Interface.Type "server"}} + {{$p.UserIdentifier}} {{end}} - {{if eq $.Device.Type "server"}} - {{$p.IPsStr}} + {{if eq $p.Interface.Type "server"}} + {{$p.Interface.AddressStr.Value}} {{end}} - {{if eq $.Device.Type "client"}} - {{$p.Endpoint}} + {{if eq $p.Interface.Type "client"}} + {{$p.Endpoint.Value}} {{end}} - {{$p.LastHandshake}} + never {/{$p.LastHandshake}} {{if eq $.Session.IsAdmin true}} @@ -199,60 +199,60 @@ -
+
-
-
+
+

User details

{{if not $peerUser}}

No user information available...

{{else}}
    -
  • Firstname: {{$peerUser.Firstname}}
    • -
  • Lastname: {{$peerUser.Lastname}}
    • -
  • Phone: {{$peerUser.Phone}}
    • -
  • Mail: {{$peerUser.Email}}
    • +
  • Firstname: {/{$peerUser.Firstname}}
    • +
  • Lastname: {/{$peerUser.Lastname}}
    • +
  • Phone: {/{$peerUser.Phone}}
    • +
  • Mail: {/{$peerUser.Email}}
{{end}}

Connection / Traffic

- {{if not $p.Peer}} + {{if not $.Peer}}

No Traffic data available...

{{else}} -

{{if $p.DeactivatedAt}}-{{else}} {{$p.Peer.Endpoint}}{{end}}

-

{{if $p.DeactivatedAt}}-{{else}} {{formatBytes $p.Peer.ReceiveBytes}} / {{formatBytes $p.Peer.TransmitBytes}}{{end}}

+

{{if $p.DisabledAt}}-{{else}} {{$p.Peer.Endpoint}}{{end}}

+

{{if $p.DisabledAt}}-{{else}} {{formatBytes $p.Peer.ReceiveBytes}} / {{formatBytes $p.Peer.TransmitBytes}}{{end}}

{{end}}
- {{if eq $.Device.Type "server"}} -
- 
{{$p.Config}}
+ {{if eq $p.Interface.Type "server"}} +
+ 
{/{$p.Config}}
{{end}} -
+
- {{if eq $.Device.Type "server"}} + {{if eq $p.Interface.Type "server"}} {{end}}
- {{if eq $.Device.Type "server"}} + {{if eq $p.Interface.Type "server"}}
Download Email @@ -267,6 +267,31 @@

Currently listed peers: {{len $.PagedInterfacePeers}}

+
+
    +
  • + « +
    • +
  • + 1 +
    • +
  • + 2 +
    • +
  • + 3 +
    • +
  • + 4 +
    • +
  • + 5 +
    • +
  • + » +
    • +
+
{{template "prt_footer.gohtml" .}} diff --git a/cmd/wg-portal/ui/pages_admin.go b/cmd/wg-portal/ui/pages_admin.go index 2ede0a4..b8e4182 100644 --- a/cmd/wg-portal/ui/pages_admin.go +++ b/cmd/wg-portal/ui/pages_admin.go @@ -51,10 +51,50 @@ PeerDefPreDown: "", PeerDefPostDown: "", }, - "InterfacePeers": []persistence.PeerConfig{}, - "PagedInterfacePeers": []persistence.PeerConfig{}, - "InterfaceNames": map[string]string{"wgX": "wgX descr"}, - "TotalPeers": 12, + "InterfacePeers": []persistence.PeerConfig{}, + "PagedInterfacePeers": []persistence.PeerConfig{ + { + Endpoint: persistence.StringConfigOption{ + Value: "vpn.test.net", + Overridable: false, + }, + AllowedIPsStr: persistence.StringConfigOption{ + Value: "10.0.0.0/8,192.168.1.0/24", + Overridable: false, + }, + KeyPair: persistence.KeyPair{ + PrivateKey: "privkey", + PublicKey: "pubkey", + }, + PresharedKey: "psk", + PersistentKeepalive: persistence.IntConfigOption{ + Value: 16, + Overridable: true, + }, + DisplayName: "Display Name", + Identifier: "abc123", + UserIdentifier: "nouser", + Interface: &persistence.PeerInterfaceConfig{ + Identifier: "wg0", + Type: persistence.InterfaceTypeServer, + PublicKey: "srvpub", + AddressStr: persistence.StringConfigOption{ + Value: "10.0.0.1/32,192.168.1.1/32", + }, + DnsStr: persistence.StringConfigOption{}, + DnsSearchStr: persistence.StringConfigOption{}, + Mtu: persistence.IntConfigOption{}, + FirewallMark: persistence.Int32ConfigOption{}, + RoutingTable: persistence.StringConfigOption{}, + PreUp: persistence.StringConfigOption{}, + PostUp: persistence.StringConfigOption{}, + PreDown: persistence.StringConfigOption{}, + PostDown: persistence.StringConfigOption{}, + }, + }, + }, + "InterfaceNames": map[string]string{"wgX": "wgX descr"}, + "TotalPeers": 12, }) } }