diff --git a/back/lib/admin/peer/list b/back/lib/admin/peer/list index 32e27db..510ef5d 100755 --- a/back/lib/admin/peer/list +++ b/back/lib/admin/peer/list @@ -33,7 +33,7 @@ ip="${1}" qs="$(<<<"${2}" tr '&' '\n' | sed 's/?//')" un="$(<<<"${qs}" grep -oP 'un=(.*)' | sed 's/^un=//' | xargs)" -printf '%s requested peer listing...\n' "${ip}" >>"${LOGFILE}" +printf 'Admin %s requested peer listing...\n' "${ip}" >>"${LOGFILE}" # Create token if needed token="$(grep "${ip}" "${TOKENS_FILE}" | cut -f2)" diff --git a/front/admin.html b/front/admin.html index d73d79f..4d66a5d 100644 --- a/front/admin.html +++ b/front/admin.html @@ -17,15 +17,17 @@ - +
diff --git a/front/admin.js b/front/admin.js index 791261c..605a94e 100644 --- a/front/admin.js +++ b/front/admin.js @@ -8,17 +8,23 @@ function Peer(data) { this.isDeleting = ko.observable(false) this.deleteText = ko.computed(() => this.isDeleting()?'Deleting...':'Delete') } +function User(data) { + this.name = data.name + this.number = data.number +} function PeerList() { let self = this self.peers = ko.observableArray([]) - self.newPeerName = ko.observable('') + self.newPeerHostname = ko.observable('') + self.newPeerUser = ko.observable('') self.newConfigText = ko.observable('') self.isAdding = ko.observable(false) self.addText = ko.computed(() => self.isAdding()?'Adding...':'Add') + self.users = ko.observableArray({}) // Initial loading - self.getUser = async () => { + self.getUsers = async () => { let res; try { res = await fetch(`${API_URL}/peer/`) } catch (err) { @@ -41,7 +47,13 @@ function PeerList() { (a,b) => a.ipv4.split('.')[2] - b.ipv4.split('.')[2]) .map( (i)=>new Peer(i)) ) - self.token = user.token + self.users( + user.peers.map( (u)=>new User({ + name: u.domain.split('.')[1], + number: u.ipv4.split('.')[2], + }) ) + ) + self.token(user.token) } } @@ -108,7 +120,7 @@ function PeerList() { } } - self.getUser() + self.getUsers() } ko.applyBindings(new PeerList())