From 19106f77c49f65ab53d2019d042455d03f5c9446 Mon Sep 17 00:00:00 2001
From: arnaucode <idoctnef@openmailbox.org>
Date: Wed, 26 Jul 2017 15:08:16 +0200
Subject: [PATCH] implemented network map of users and travels

---
 app.js                     |   3 ++-
 img/asking.png             | Bin 0 -> 564 bytes
 img/offering.png           | Bin 0 -> 806 bytes
 img/package.png            | Bin 0 -> 288 bytes
 index.html                 |   4 ++-
 views/main/main.html       |  14 +++++-----
 views/network/network.html |  12 +++++++++
 views/network/network.js   |  53 +++++++++++++++++++++++++++++++++++++
 8 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 img/asking.png
 create mode 100644 img/offering.png
 create mode 100644 img/package.png
 create mode 100644 views/network/network.html
 create mode 100644 views/network/network.js

diff --git a/app.js b/app.js
index 83612e6..4731241 100644
--- a/app.js
+++ b/app.js
@@ -13,7 +13,8 @@ angular.module('adminApp', [
   'app.login',
   'app.main',
   'app.user',
-  'app.travel'
+  'app.travel',
+  'app.network'
 ]).
 config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) {
   $locationProvider.hashPrefix('!');
diff --git a/img/asking.png b/img/asking.png
new file mode 100644
index 0000000000000000000000000000000000000000..39c48426fabc7e87263b951d554b80a47e51b677
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq0015U001Ni1^@s6p3#bF00004b3#c}2nYxW
zd<bNS0005&Nkl<ZScUDCze^io7{@=Ba#_yhy7XP_bS`#@OS<%?xLhe*rqF*NAQU8m
zCD0%=v~Vb7k_ZI{iC`Nj6^dQzq>C=PB#W8Ma$S<eEblGtQfNHy%=?y<Al!F+-uHbz
z@B6&Zj~OZDFQ%Xe(}1Sn6r6%5s)uUZ`m}$1rgd=4d8fx91Te7dERI{G=sn{}Mh`qQ
zu5-!DudG)#Ir(|VCd0<7`K&ksRsNk|*=|rO?a@_oWsqIlr(RHlC;##FG3%?UP=Jt&
z%`&YkwcUx};An@F;cdHR=g8;t<ZLtMRF9p;IZ^?fm|Vj3@w;Uz2faTQljm=DslE6c
z%HXifs}E;{Bj>`-5m$1N`7!ZM4s}N0yxHZ;JC`{O7M8beKmo*}!{g|=aCqY)Ng7j5
z8N^bRPfOL9wLYiKCcUWHTHujFb}82Js3gH@i;azK&SFZ;E;<MWFPh+M+Kp98d!5)-
zBfCP)Rl#bu%>H48*RfCo+w<A47nM7h`itcy&FzcZiDTwi+p1BRpH+6H2WCKb5Vcu&
zb)Ukx+KG`ys7-_wG0nMnwmuXThQ$Ap#viwN|FXpQ(Kc$jeEe4B=|4PLBh*8JXzv~d
z#I*BCgD0!|05%cPNoWe<hNFt6meuzm)G0Ux>*+UoIF9FC7_&$K0000<MNUMnLSTab
Cb`b3V

literal 0
HcmV?d00001

diff --git a/img/offering.png b/img/offering.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a60d08d4dc5af978562cb82d2fe2c7ee754f1c0
GIT binary patch
literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq001cf001Kh1^@s63Hu|E00004b3#c}2nYxW
zd<bNS0008rNkl<ZScUDEA#fT&6o$WaI$%J7ISeQis8dHpP)7wsq&2}bG1L%5sfh}R
zG^RBPhL|L#F{L7)P(+kdC@?uiOfW<da~LWb3WPh@3(O?U<ahgKAAGa#-?#7927|$X
z7p^zY4IrXd$Ytpja#?z7XLGMv;z!|(TBF0g-G6d;@XK*_vniqhr>)dAu@+>|E@em_
zHt5@ho03HQ=#*T<E1V%#?%NXCr2qnSsC>;+>xpLwLAFa5+&q=ZOnr^BdRKV6fG4{&
zw9eStg?d!xTf}XHs!MtMJ^9usqE~f{m=_Uu&Ogasi>f}hc7%zC?EnIJQ4+z4NWWF1
zZHQ&hg*4h#uEzsGm7rZlz$+_A<AJ*d+MQVLT*ywXIni#UXc+N(IgyC$8V}r1Yl``D
z4&?2WA7xpx+&xpy0MYPdNU!RMRD3pMPoMImYO@iK<R%n-nlDY7xk0;pNUl(!CFq$&
z<&b1Pr1we3e5SX33bI??Wh1XGsd3wp1Lfe7<Jh$0C(CVIb6yw+lu*=7;_E>iOXUfo
z#5akrhw%Il_R$LGT$_~tQ8T|oAC}mmu>b3rgzw)nThH+^Q(<8TNL!r#%rb1XM!Q5N
zc}SxVbad0-x4bwmHHGRMt=*9nTmD4}A(T!r{uVd`anezjbpk6gPg+9WS5K(kj@G^U
z2^UM4GFm4mG{+_&qg|m;n?0Rc4;X!o{6>OmT*1?8QM=OZ54vW$xnL*OKv6?@dOF%w
zYp&1dOhFyA%I{^MO{%Y>RrLA$9`vZ(PFzdvH8$mNi8XToj5?p+WoSH(`@e8mO5&SJ
z5R=i&5!<Pl*hc2)Pmzeli@VCV+oJ4F_d+j^)9t}@6tyVxQ09=%AW4%3D{m=Jn<a+|
zB=}(RAb8Xyp&67GC+SAsFS4ilaRE3alys5riG>h>0NcePpA_k#A|67U2b}K7Gfz_R
kyZd>y$`|KlX(b^40>NzS5|~dP(EtDd07*qoM6N<$f?axa`Tzg`

literal 0
HcmV?d00001

diff --git a/img/package.png b/img/package.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb078affe91276e7507370d77bf1ecc4212568e
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^N<gf_!3HGX$i27^q*#ibJVQ8upoSx*1IWMb>Eaj?
z(VG0{|NsB>ZH^2x*lsZz7`zfF0pSBpr)m#uP|#{gJf$mjd)2hV8`2_~nwcgEWOe+h
zIaV;|T3-SX>?ob{@TPyrLPufK#e9zJEBF$pCv6B>+`Kkx8c)!h6;3_POV=eH6j@X#
zc5G6qq{N1$f>G&-I+5bLo!K}NI;D~t44f~VG35z8wnt;p{PWukTb8U(uJCT_bhdT5
zXSBw<JSD>2wVh{{fMh9$l>{<A!nd$go7ekwPh+CM)(dQfS9k=#@+N$Y4EtP-jGLS~
ROo3ix@O1TaS?83{1OS2ZXMg|z

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index b5a9bb8..fbbfb92 100644
--- a/index.html
+++ b/index.html
@@ -55,18 +55,20 @@
     <script src="bower_components/ui-leaflet/dist/ui-leaflet.js"></script>
     <link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css" />
 
+    <!-- visjs -->
     <script type="text/javascript" src="bower_components/vis/dist/vis.min.js"></script>
     <link href="bower_components/vis/dist/vis.min.css" rel="stylesheet" type="text/css" />
     <link href="bower_components/vis/dist/vis-network.min.css" rel="stylesheet" type="text/css" />
 
 
-    <!-- your app's js -->
+    <!-- app's js -->
     <script src="app.js"></script>
     <script src="views/navbar.js"></script>
     <script src="views/login/login.js"></script>
     <script src="views/main/main.js"></script>
     <script src="views/user/user.js"></script>
     <script src="views/travel/travel.js"></script>
+    <script src="views/network/network.js"></script>
 </body>
 
 </html>
diff --git a/views/main/main.html b/views/main/main.html
index 763aafd..8ff289a 100644
--- a/views/main/main.html
+++ b/views/main/main.html
@@ -5,7 +5,7 @@
                 <div class="panel-heading c_deepPurple300">
                     <h3 class="panel-title">All users</h3>
                 </div>
-                <div class="panel-body">
+                <div class="panel-body" style="max-height: 500px;overflow-y: scroll;">
                     <div class="list-group">
                         <a ng-repeat="user in users" ng-href="#!/user/{{user._id}}" class="list-group-item">
                             <div class="row-picture">
@@ -21,17 +21,15 @@
                             <div class="list-group-separator"></div>
                         </a>
                     </div>
-                    <br>
-                    <div class="btn btn-raised c_deepPurple300">See all</div>
                 </div>
             </div>
         </div>
-        <div class="col-sm-5">
+        <div class="col-sm-6">
             <div class="panel">
                 <div class="panel-heading c_deepPurple300">
                     <h3 class="panel-title">All travels</h3>
                 </div>
-                <div class="panel-body">
+                <div class="panel-body" style="max-height: 500px;overflow-y: scroll;">
                     <table class="table table-striped table-hover ">
                         <thead>
                             <tr>
@@ -65,13 +63,15 @@
                 </div>
             </div>
         </div>
-        <div class="col-sm-3">
+        <div class="col-sm-2">
             <div class="panel">
                 <div class="panel-heading c_deepPurple300">
                     <h3 class="panel-title">Actions</h3>
                 </div>
                 <div class="panel-body">
-                    Panel content
+                    <div class="btn btn-block btn-sm c_green300">Create user</div>
+                    <div class="btn btn-block btn-sm c_blue300">Create travel</div>
+                    <a href="#!/network" class="btn btn-block btn-sm c_deepPurple300">View network</a>
                 </div>
             </div>
         </div>
diff --git a/views/network/network.html b/views/network/network.html
new file mode 100644
index 0000000..83afe6c
--- /dev/null
+++ b/views/network/network.html
@@ -0,0 +1,12 @@
+<div class="container">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="panel-heading c_deepPurple300">
+                <h3 class="panel-title">Network</h3>
+            </div>
+            <div class="panel-body">
+                <div id="mynetwork" style="height:500px;"></div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/views/network/network.js b/views/network/network.js
new file mode 100644
index 0000000..00a1756
--- /dev/null
+++ b/views/network/network.js
@@ -0,0 +1,53 @@
+'use strict';
+
+angular.module('app.network', ['ngRoute'])
+
+    .config(['$routeProvider', function($routeProvider) {
+        $routeProvider.when('/network', {
+            templateUrl: 'views/network/network.html',
+            controller: 'NetworkCtrl'
+        });
+    }])
+
+    .controller('NetworkCtrl', function($scope, $http, $routeParams) {
+        $scope.data = [];
+        $scope.nodes = [];
+        $scope.edges = [];
+        var nodes, edges, container;
+        var options = {
+            layout: {
+                improvedLayout: false
+            }
+            /*,
+                physics:{
+                    //stabilization: false,
+                   // enabled: false
+                }*/
+        };
+
+
+        $scope.showMap = function() {
+            var nodes = $scope.nodes;
+            var edges = $scope.edges;
+
+            var container = document.getElementById('mynetwork');
+            var data = {
+                nodes: nodes,
+                edges: edges
+            };
+            var network = new vis.Network(container, data, options);
+        };
+
+        $http.get(urlapi + 'admin/network')
+            .then(function(data, status, headers, config) {
+                console.log('data success');
+                console.log(data);
+
+                $scope.nodes = data.data.nodes;
+                $scope.edges = data.data.edges;
+                $scope.showMap();
+            }, function(data, status, headers, config) {
+                console.log('data error');
+            });
+
+    });