From ddc83845f63066c5388e9e5fa97735a5592fcd98 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 9 Jul 2020 03:20:40 -0400
Subject: [PATCH] add device status

---
 src/account/DevicesPage.vue | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/account/DevicesPage.vue b/src/account/DevicesPage.vue
index 3994776..c49e9c6 100644
--- a/src/account/DevicesPage.vue
+++ b/src/account/DevicesPage.vue
@@ -13,7 +13,8 @@
 <!--                    <th nowrap="nowrap">{{messages.label_field_device_enabled}}</th>-->
                     <th>{{messages.label_field_device_vpn_config}}</th>
                     <th nowrap="nowrap">{{messages.label_field_device_certificate}}</th>
-                    <th nowrap="nowrap">{{messages.label_field_security_level}}</th>
+                    <th nowrap="nowrap">{{messages.label_field_device_security_level}}</th>
+                    <th nowrap="nowrap">{{messages.label_field_device_connection}}</th>
 <!--                    <th>{{messages.label_field_device_ctime}}</th>-->
                     <th>{{messages.label_field_device_help}}</th>
                     <th><!-- delete --></th>
@@ -59,7 +60,7 @@
                             {{messages.message_device_vpn_unavailable}}
                         </div>
                     </td>
-                    <td nowrap="nowrap">
+                    <td>
                         <a :href="'/api/auth/cacert?deviceType='+device.deviceType">
                             {{messages.message_download_ca_cert}}
                         </a>
@@ -72,6 +73,38 @@
                             </select>
                         </form>
                     </td>
+                    <td>
+                        <div v-if="device.status.ip">
+                            {{device.status.ip}}
+                            <div v-if="device.status.location">
+                                <hr/>
+                                <span v-if="device.status.location.city && device.status.location.region && device.status.location.country">{{device.status.location.city}}, {{device.status.location.region}}, {{messages['country_'+device.status.location.country]}}</span>
+                                <span v-else-if="device.status.location.region && device.status.location.country">{{device.status.location.region}}, {{messages['country_'+device.status.location.country]}}</span>
+                                <span v-else-if="device.status.location.city && device.status.location.country">{{device.status.location.city}}, {{messages['country_'+device.status.location.country]}}</span>
+                                <span v-else-if="device.status.location.country">{{messages['country_'+device.status.location.country]}}</span>
+                                <span v-else-if="device.status.location.city && device.status.location.region">{{device.status.location.city}}, {{device.status.location.region}}</span>
+                                <span v-else-if="device.status.location.region">{{device.status.location.region}}</span>
+                                <span v-else-if="device.status.location.city">{{device.status.location.city}}</span>
+                            </div>
+                        </div>
+                        <div v-if="device.status.bytesSent || device.status.bytesReceived">
+                            <hr/>
+                            <div v-if="device.status.bytesSent">
+                                {{device.status.bytesSent}}{{device.status.sentUnits}} {{messages.label_field_device_transfer_sent}}
+                            </div>
+                            <div v-if="device.status.bytesReceived">
+                                {{device.status.bytesReceived}}{{device.status.receivedUnits}} {{messages.label_field_device_transfer_received}}
+                            </div>
+                        </div>
+                        <div v-if="device.status.lastHandshakeTime">
+                            <hr/>
+                            {{messages.label_field_device_connection_handshake}}:
+                            <span v-if="device.status.lastHandshakeMinutes && device.status.lastHandshakeSeconds">{{device.status.lastHandshakeMinutes}}{{messages.units_minutes_short}}, {{device.status.lastHandshakeSeconds}}{{messages.units_seconds_short}}</span>
+                            <span v-else-if="device.status.lastHandshakeMinutes">{{device.status.lastHandshakeMinutes}}{{messages.units_minutes_short}}</span>
+                            <span v-else-if="device.status.lastHandshakeSeconds">{{device.status.lastHandshakeSeconds}}{{messages.units_seconds_short}}</span>
+                            {{messages.label_field_device_connection_handshake_ago}}
+                        </div>
+                    </td>
 <!--                    <td nowrap="nowrap">{{messages.label_device_ctime_format.parseDateMessage(device.ctime, messages)}}</td>-->
                     <td>
                         <div v-if="displayDeviceHelp[device.uuid] === true" class="device-help-div">