From 72b4c4598f60a9c594f15de9d6387a2c841e1cfb Mon Sep 17 00:00:00 2001
From: Henry Camacho <henry.f.camacho@gmail.com>
Date: Wed, 15 Mar 2017 19:32:05 -0500
Subject: [PATCH] =?UTF-8?q?Admin=20is=20functioning=20=E2=80=94=20Displays?=
 =?UTF-8?q?=20Servers=20that=20are=20connected=20with=20in/out=20bytes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/admin/index.html            | 14 ++------
 html/admin/js/app.js             | 35 +++++++++++++++---
 html/admin/partials/servers.html | 62 +++++++++++++++++++-------------
 3 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/html/admin/index.html b/html/admin/index.html
index df94d1b..1af2fc6 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -24,7 +24,7 @@
         <header class="bs-docs-nav navbar navbar-static-top" id="top">
              <div class="container"> 
                  <div class="navbar-header"> 
-                     <a href="/admin/index.html" class="navbar-brand">RVPN Admin</a> 
+                     <a href="/admin/index.html" target="_parent" class="navbar-brand">RVPN Admin</a> 
                  </div> 
                     <nav class="collapse navbar-collapse" id="bs-navbar"> 
                         <ul class="nav navbar-nav"> 
@@ -42,19 +42,9 @@
                     </nav> 
                 </div> 
         </header>
- 
-        <div class="panel panel-default">
-        <div class="panel-heading"></div>
-            <div class="panel-body">
-                <div class="panel panel-default panel-info">
-                    <!-- Partials here -->
 
-                    <div ng-view></div>
+        <div ng-view> </div>
 
-  
-                </div>
-            </div>
-        </div>
 
         <script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
         <script>window.jQuery || document.write('<script src="admin/js/vendor/jquery-1.12.0.min.js"><\/script>')</script>
diff --git a/html/admin/js/app.js b/html/admin/js/app.js
index dfbcf1b..58eeb3a 100644
--- a/html/admin/js/app.js
+++ b/html/admin/js/app.js
@@ -1,17 +1,44 @@
 console.log("app.sh startup")
 
-
 var app = angular.module("rvpnApp", ["ngRoute"]);
 app.config(function($routeProvider, $locationProvider) {
     $routeProvider
-    .when("/admin/servers", {
+    .when("/admin/index.html", {
         templateUrl : "admin/partials/servers.html"
     })
-    .when("/admin/domains", {
+    .when("/admin/servers/", {
+        templateUrl : "admin/partials/servers.html"
+    })
+    .when("/admin/#domains", {
         templateUrl : "green.htm"
     })
     .when("/blue", {
         templateUrl : "blue.htm"
     });
     $locationProvider.html5Mode(true);
-});
\ No newline at end of file
+});
+
+app.controller('serverController', function ($scope, $http) {
+    $scope.servers = [];
+    var api = '/api/com.daplie.rvpn/servers'
+
+    $http.get(api).then(function(response) {
+        updateView(response.data);
+    });
+
+    updateView = function(data) {
+        console.log(data);
+        if (data.error == 'ok' ){
+            console.log("ok")
+            $scope.servers = data.result.servers;
+            console.log(data.result)
+
+        }
+    };
+
+
+
+
+
+});
+    
\ No newline at end of file
diff --git a/html/admin/partials/servers.html b/html/admin/partials/servers.html
index 5461862..3c323d0 100644
--- a/html/admin/partials/servers.html
+++ b/html/admin/partials/servers.html
@@ -1,29 +1,41 @@
-<div class="panel-heading ">Control Plane</div>
-<div class="panel-body">
-
-    <div class="row"> <!-- Auth -->
-        <div class="col-lg-6">
-            <div class="input-group">
-                <span class="input-group-btn">
-                <button class="btn btn-default" type="button" ng-click="startWebSocket()">Start WebSocket</button>
-                </span>
-                <button class="btn btn-default" type="button" ng-class="conn == false && 'btn-danger' || 'btn-success'">
-                    {[{ conn == false && 'False' || 'True' }]}
-                </button>
+<div class="panel panel-default" data-ng-controller="serverController">
+  <div class="panel-heading">
+      <div class="panel-title">
+          <div class="row">
+            <div class="col-md-6">
+                Servers
             </div>
-        </div>
-    </div>
-
-    <br>
-
-    <div class="row">
-        <div class="col-lg-6">
-            <div class="input-group">
-                <span class="input-group-btn">
-                <button class="btn btn-default" type="button">Auth</button>
-                </span>
-                <input type="text" class="form-control" placeholder="Enter auth data here">
+            <div class="col-md-6">
+                <form class="form-inline pull-right">
+                    <div class="form-group">
+                        <label for="search">Search:</label>
+                        <input type="text" class="form-control" id="search">
+                    </div>
+                </form>
             </div>
-        </div>
+          </div>
     </div>
+  </div>
+  <div class="panel-body">
+    <table class="table table-striped table-bordered">
+        <th width="10%">ID</th>
+        <th width="20%">Name</th>
+        <th>Address</th>
+        <th>Xfer (in/out)</th>
+        <th>Time</th>
+
+        <tr ng-repeat="s in servers | orderBy:'server_id'">
+            <td>{{ s.server_id }}</td>
+            <td>{{ s.server_name }}</td>
+            <td>{{ s.source_address }}</td>
+            <td>{{ s.bytes_in }}/{{ s.bytes_out}}</td>
+            <td>{{ s.duration }}</td>
+        </tr>
+
+    </table>
+
+
+
+
+  </div>
 </div>
\ No newline at end of file