Merge branch 'master' into v6.0 96/7896/1 v6.0 v6.0.2 v6.0.2rc1 v6.0.3 v6.0.4 v6.0.4rc1
authorlombardofr <lombardo@everyup.it>
Fri, 30 Aug 2019 18:15:48 +0000 (20:15 +0200)
committerlombardofr <lombardo@everyup.it>
Fri, 30 Aug 2019 18:16:00 +0000 (20:16 +0200)
Change-Id: Ided79529f4125d7de9637f62beceb9eb99749e35
Signed-off-by: lombardofr <lombardo@everyup.it>
55 files changed:
.gitignore
authosm/backend.py
authosm/models.py
authosm/views.py
build-debpkg.sh
descriptorhandler/template/composer.html
descriptorhandler/template/descriptor_view.html
descriptorhandler/template/descriptor_view_base.html
descriptorhandler/views.py
django.ini
docker/Dockerfile
instancehandler/template/instance_list.html
instancehandler/template/instance_operations_list.html
instancehandler/template/instance_topology_view.html
instancehandler/views.py
lib/osm/osmclient/clientv2.py
netslicehandler/template/nst_edit.html
netslicehandler/template/nst_list.html
package-lock.json [new file with mode: 0644]
package.json [new file with mode: 0644]
packagehandler/template/package_list.html
packagehandler/urls.py
packagehandler/views.py
projecthandler/osm_model.py
projecthandler/template/project/osm/osm_project_left_sidebar.html
projecthandler/template/project/project_descriptors.html
projecthandler/template/project/project_details.html
projecthandler/template/project/projectlist.html
projecthandler/urls/project.py
projecthandler/views.py
rolehandler/templates/modal/role_create.html
rolehandler/templates/modal/role_edit.html
rolehandler/templates/role_list.html
rolehandler/urls.py
rolehandler/views.py
sdnctrlhandler/template/sdn_list.html
sf_t3d/settings.py
static/src/rolehandler/role_list.js
static/src/userhandler/user_list.js
supervisor-app.conf
template/base.html
template/head.html
userhandler/templates/modal/user_create.html
userhandler/templates/modal/user_credentials_edit.html [new file with mode: 0644]
userhandler/templates/modal/user_edit.html [deleted file]
userhandler/templates/modal/user_proj_role_edit.html [new file with mode: 0644]
userhandler/templates/user_list.html
userhandler/urls.py
userhandler/views.py
vimhandler/template/config/opennebula.html [new file with mode: 0644]
vimhandler/template/config/opennebula_show.html [new file with mode: 0644]
vimhandler/template/vim_create.html
vimhandler/template/vim_list.html
vimhandler/views.py
wimhandler/template/wim_list.html

index 5e05014..c1d5de2 100644 (file)
@@ -1,3 +1,17 @@
+#   Copyright 2019 EveryUP Srl
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an  BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 ### Python template
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -44,6 +58,9 @@ target/
 #Bower
 static/bower_components
 
+#npm
+static/node_modules
+
 #migrations
 projecthandler/migrations/
 descriptorhandler/migrations/
index b8342eb..f71eddd 100644 (file)
@@ -43,6 +43,7 @@ class OsmBackend(object):
                     user.psw = password
                     user.token = result['data']['id']
                     user.project_id = result['data']['project_id']
+                    user.project_name = result['data']['project_name']
                     user.token_expires = result['data']['expires']
                     user.is_admin = bool(result['data']['admin'])
                     user.save()
index d03e6d2..74c1f1e 100644 (file)
@@ -69,6 +69,7 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
     psw = models.CharField(_('psw'), max_length=36)
     token = models.CharField(_('token'), max_length=255)
     project_id = models.CharField(_('project_id'), max_length=36)
+    project_name = models.CharField(_('project_name'), max_length=36, default='')
     token_expires = models.FloatField(_('token_expires'), max_length=36)
 
     objects = OsmUserManager()
@@ -91,11 +92,11 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
 
     def get_projects(self):
         client = Client()
-        result = client.get_user_info(self.get_token(), self.username)
-        if 'error' in result and result['error'] is True:
+        user_info = client.get_user_info(self.get_token(), self.username)
+        if 'error' in user_info and user_info['error'] is True:
             return []
         else:
-            return result['data']['projects']
+            return user_info['data']['project_role_mappings']
 
     def switch_project(self, project_id):
         client = Client()
@@ -105,6 +106,7 @@ class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
         else:
             self.token = result['data']['id']
             self.project_id = result['data']['project_id']
+            self.project_name = result['data']['project_name']
             self.token_expires = result['data']['expires']
             self.save()
             return True
index f82f4dd..2cfe043 100644 (file)
@@ -26,8 +26,7 @@ def user_login(request):
 
     error_message = ''
     if request.POST:
-        print request.POST.get('username')
-        print request.POST.get('password')
+        
         next_page = request.POST.get('next')
         next_page = urllib.unquote(next_page).decode('iso-8859-2')
         try:
index 607bfe5..46f5aae 100755 (executable)
@@ -16,7 +16,7 @@
 
 
 PKG_DIRECTORIES="authosm descriptorhandler instancehandler lib projecthandler sdnctrlhandler sf_t3d static template userhandler vimhandler packagehandler netslicehandler wimhandler rolehandler"
-PKG_FILES="bower.json django.ini LICENSE manage.py nginx-app.conf README.md requirements.txt supervisor-app.conf .bowerrc entrypoint.sh"
+PKG_FILES="bower.json django.ini LICENSE manage.py nginx-app.conf README.md requirements.txt supervisor-app.conf .bowerrc entrypoint.sh package.json"
 MDG_NAME=lightui
 DEB_INSTALL=debian/osm-${MDG_NAME}.install
 export DEBEMAIL="gerardo.garciadeblas@telefonica.com"
index f0c2e9a..690ce20 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -70,8 +85,8 @@
     {{ block.super }}
 
     <!-- d3.js -->
-    <script src="/static/bower_components/d3/d3.js"></script>
-    <script src="/static/bower_components/moment/moment.js"></script>
+    <script src="/static/node_modules/d3/build/d3.js"></script>
+    <script src="/static/node_modules/moment/moment.js"></script>
 
     <!-- TopologyComposer D3 -->
     <script src="/static/TopologyComposer/js/event.js"></script>
index fec5168..0e1285d 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "descriptor_view_base.html" %}
 
 {% load staticfiles %}
@@ -15,7 +31,12 @@ Edit {{ descriptor_type|upper }} Descriptor
 
 {% block breadcrumb_body %}
 {{ block.super }}
-<li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
+{% if user.is_admin %}
+        <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+{% else%}
+        <li><a href="#">Projects</a></li>
+{% endif %}
+<li><a href="{% url 'projects:open_project' %}">{{project_name}}</a></li>
 <li><a>{{descriptor_id}}</a></li>
 {% endblock %}
 
index 6f7618a..766f7b0 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 
 {% load staticfiles %}
 
 
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css"  />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css"  />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css" >
 
 {% endblock %}
 
        {{ block.super }}
 
 
-    <script src="/static/bower_components/codemirror/lib/codemirror.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/yaml/yaml.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/markdown/markdown.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js" ></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js" ></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/yaml/yaml.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/markdown/markdown.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js" ></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js" ></script>
 
 
     <script>
index 912df09..4e22a5d 100644 (file)
@@ -148,6 +148,7 @@ def updateElement(request, descriptor_type=None, descriptor_id=None, element_typ
 def edit_descriptor(request, descriptor_id=None, descriptor_type=None):
     user = osmutils.get_user(request)
     project_id = user.project_id
+    project_name = user.project_name
     if request.method == 'POST':
         new_data = request.POST.get('text'),
         data_type = request.POST.get('type')
@@ -199,6 +200,7 @@ def edit_descriptor(request, descriptor_id=None, descriptor_type=None):
         # print descriptor
         return render(request, page, {
             'project_id': project_id,
+            'project_name': project_name,
             'descriptor_id': descriptor_id,
             'descriptor_type': descriptor_type,
             'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml,
index 3eb767f..9ee142a 100644 (file)
@@ -1,3 +1,17 @@
+#   Copyright 2019 EveryUP Srl
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an  BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 [uwsgi]
 module          =  sf_t3d.wsgi:application
 master          =  true
@@ -12,6 +26,4 @@ max-requests    =  5000
 # clear environment on exit
 vacuum          =  true
 # optional path to a virtualenv
-#home            =  env
-# background the process
-daemonize       =  django.uwsgi.log
\ No newline at end of file
+#home            =  env
\ No newline at end of file
index 932f31e..d3bec05 100644 (file)
@@ -1,13 +1,27 @@
+# Copyright 2019 EveryUP 
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM ubuntu:16.04
 
 WORKDIR /usr/share/osm-lightui
 COPY . /usr/share/osm-lightui
 
-RUN apt-get update
-RUN apt-get install -y npm git python-pip nginx supervisor libmysqlclient-dev mysql-client
-RUN npm install -g bower
+RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common libmysqlclient-dev mysql-client
 RUN ln -s /usr/bin/nodejs /usr/bin/node
-RUN bower install --allow-root
+RUN npm install
+RUN mv node_modules ./static
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
 
@@ -23,4 +37,4 @@ RUN python manage.py collectstatic --noinput
 
 EXPOSE 80
 
-CMD ["/usr/share/osm-lightui/entrypoint.sh"]
+CMD ["/usr/share/osm-lightui/entrypoint.sh"]
\ No newline at end of file
index 1130e34..d129c80 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
 {% block head_block %}
     {{ block.super }}
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
     <link rel="stylesheet" href="/static/css/lwuitable.css">
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
 {% block resource_block %}
     {{ block.super }}
     <!-- Utility JS -->
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
-    <script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
     <script src="/static/src/instancehandler/instance_list.js"></script>
     <script src="/static/src/instancehandler/instance_create.js"></script>
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
     <script>
         var table;
index 3f54f1f..a9d12cb 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load date_tag %}
 {% block head_block %}
     {{ block.super }}
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
-        <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+        <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
 {% block resource_block %}
     {{ block.super }}
     <!-- Utility JS -->
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
-    <script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
     <script src="/static/src/instancehandler/instance_operations_list.js"></script>
 
     <script>
index 5f52d72..1f41130 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -56,7 +72,7 @@
 {% block resource_block %}
     {{ block.super }}
     <!-- d3.js -->
-    <script src="/static/bower_components/d3/d3.js"></script>
+    <script src="/static/node_modules/d3/build/d3.js"></script>
 
     <!-- TopologyComposer D3 -->
     <script src="/static/TopologyComposer/js/event.js"></script>
index edf0da1..cf88f99 100644 (file)
@@ -167,7 +167,7 @@ def create(request, type=None):
         except Exception as e:
             return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
         result = client.ns_create(user.get_token(), ns_data)
-        print result
+        
         if result['error']:
             return __response_handler(request, result['data'], url=None,
                                   status=result['data']['status'] if 'status' in result['data'] else 500)
index 30cc1f4..6bb8c71 100644 (file)
@@ -252,6 +252,27 @@ class Client(object):
         result['data'] = Util.json_loads_byteified(r.text)
         return result
 
+    def get_projects(self, token, uuids):
+        result = {'error': False, 'data': ''}
+        headers = {"Content-Type": "application/yaml", "accept": "application/json",
+                   'Authorization': 'Bearer {}'.format(token['id'])}
+        
+        projects = []
+        try:
+            for uuid in uuids:
+                _url = "{0}/admin/v1/projects/{1}".format(self._base_path, uuid)
+                r = requests.get(_url, params=None, verify=False, stream=True, headers=headers)
+                if r.status_code not in (200, 201, 202, 204):
+                    raise Exception()
+                projects.append(Util.json_loads_byteified(r.text))
+        except Exception as e:
+            log.exception(e)
+            result['error'] = True
+            result['data'] = str(e)
+            return result
+        result['data'] = projects
+        return result
+
     def project_list(self, token):
         result = {'error': True, 'data': ''}
         headers = {"Content-Type": "application/yaml", "accept": "application/json",
index 3cce0a8..6321834 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
 
 {% block head_block %}
 {{ block.super }}
-<link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-<link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+<link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
 {% endblock %}
 {% block title_header_big %}
 {{ block.super }}
@@ -73,21 +89,21 @@ Network Slices Templates
 
 {% block resource_block %}
 {{ block.super }}
-<script src="/static/bower_components/codemirror/lib/codemirror.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/yaml/yaml.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/markdown/markdown.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js" ></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js" ></script>
+<script src="/static/node_modules/codemirror/lib/codemirror.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/yaml/yaml.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/markdown/markdown.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js" ></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js" ></script>
 <script>
     var csrf_token = '{{csrf_token}}';
     
index a2e4f4a..a7f738c 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
 
 {% block head_block %}
 {{ block.super }}
-<link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-<link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-<link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
-<link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
-<link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+<link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+<link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+<link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+<link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
 {{ block.super }}
@@ -78,22 +94,22 @@ Network Slices Templates
 
 {% block resource_block %}
 {{ block.super }}
-<script src="/static/bower_components/select2/dist/js/select2.js"></script>
-<script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
-<script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
-<script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
-<script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
-<script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
-<script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
-<script src="/static/bower_components/codemirror/addon/search/search.js"></script>
-<script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
-<script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
-<script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
-<script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
-<script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
-<script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
-<script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-<script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+<script src="/static/node_modules/select2/dist/js/select2.js"></script>
+<script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+<script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+<script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+<script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+<script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+<script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+<script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+<script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+<script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+<script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+<script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+<script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+<script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
+<script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+<script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 <script src="/static/src/drop_zone.js"></script>
 <script src="/static/src/netslicehandler/onboard_template.js"></script>
 <script src="/static/src/netslicehandler/templates_list.js"></script>
diff --git a/package-lock.json b/package-lock.json
new file mode 100644 (file)
index 0000000..0394318
--- /dev/null
@@ -0,0 +1,1689 @@
+{
+  "name": "lw-ui",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
+    "acorn": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz",
+      "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw=="
+    },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="
+    },
+    "acorn-node": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz",
+      "integrity": "sha512-XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==",
+      "requires": {
+        "acorn": "^6.1.1",
+        "acorn-dynamic-import": "^4.0.0",
+        "acorn-walk": "^6.1.1",
+        "xtend": "^4.0.1"
+      }
+    },
+    "acorn-walk": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
+    },
+    "admin-lte": {
+      "version": "2.4.12",
+      "resolved": "https://registry.npmjs.org/admin-lte/-/admin-lte-2.4.12.tgz",
+      "integrity": "sha512-QlNyi57SRC6bQrwA95emBGveVd/SLQ7X8x5EffQUr3BNVhVs4XjbPm9drJ4nkow3/khqiEttPSpjNO0r2cfvpw==",
+      "requires": {
+        "bootstrap": "^3.4.0",
+        "bootstrap-colorpicker": "^2.5.3",
+        "bootstrap-datepicker": "^1.8.0",
+        "bootstrap-daterangepicker": "^2.1.25",
+        "bootstrap-slider": "^9.8.0",
+        "bootstrap-timepicker": "^0.5.2",
+        "chart.js": "1.0.*",
+        "ckeditor": "^4.11.2",
+        "datatables.net": "^1.10.19",
+        "datatables.net-bs": "^1.10.19",
+        "fastclick": "^1.0.6",
+        "flot": "^0.8.3",
+        "font-awesome": "^4.7.0",
+        "fullcalendar": "^3.10.0",
+        "inputmask": "^3.3.7",
+        "ion-rangeslider": "^2.3.0",
+        "ionicons": "^3.0.0",
+        "jquery": "^3.2.1",
+        "jquery-knob": "^1.2.11",
+        "jquery-sparkline": "^2.4.0",
+        "jquery-ui": "^1.12.1",
+        "jvectormap": "^1.2.2",
+        "moment": "^2.24.0",
+        "morris.js": "github:morrisjs/morris.js",
+        "pace": "0.0.4",
+        "raphael": "^2.2.7",
+        "select2": "^4.0.3",
+        "slimscroll": "^0.9.1"
+      }
+    },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
+    },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+    },
+    "bootbox": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bootbox/-/bootbox-5.2.0.tgz",
+      "integrity": "sha512-hEevUk73BtSRwQ3gvFm3Rxgd1SqfslKU/RKvd/G9/ykxnKuHf9a1yNEUso2Lwb7PYtm2OBbiLV3V58+Bk1dxsw==",
+      "requires": {
+        "bootstrap": ">=3.0.0",
+        "jquery": ">=1.9.1"
+      }
+    },
+    "bootstrap": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+    },
+    "bootstrap-colorpicker": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz",
+      "integrity": "sha512-xdllX8LSMvKULs3b8JrgRXTvyvjkSMHHHVuHjjN5FNMqr6kRe5NPiMHFmeAFjlgDF73MspikudLuEwR28LbzLw==",
+      "requires": {
+        "jquery": ">=1.10"
+      }
+    },
+    "bootstrap-datepicker": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz",
+      "integrity": "sha512-9rYYbaVOheGYxjOr/+bJCmRPihfy+LkLSg4fIFMT9Od8WwWB/MB50w0JO1eBgKUMbb7PFHQD5uAfI3ArAxZRXA==",
+      "requires": {
+        "jquery": ">=1.7.1 <4.0.0"
+      }
+    },
+    "bootstrap-daterangepicker": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.30.tgz",
+      "integrity": "sha1-+JPb//Wk19+qt1Rg6OppabuJaJo=",
+      "requires": {
+        "jquery": ">=1.10",
+        "moment": "^2.9.0"
+      }
+    },
+    "bootstrap-slider": {
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-9.10.0.tgz",
+      "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
+    },
+    "bootstrap-timepicker": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz",
+      "integrity": "sha1-EO2fKi8LjMrvzeD89qBzi5GaODU="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
+    "browser-pack": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+      "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "combine-source-map": "~0.8.0",
+        "defined": "^1.0.0",
+        "safe-buffer": "^5.1.1",
+        "through2": "^2.0.0",
+        "umd": "^3.0.0"
+      }
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+        }
+      }
+    },
+    "browserify": {
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.3.0.tgz",
+      "integrity": "sha512-BWaaD7alyGZVEBBwSTYx4iJF5DswIGzK17o8ai9w4iKRbYpk3EOiprRHMRRA8DCZFmFeOdx7A385w2XdFvxWmg==",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "assert": "^1.4.0",
+        "browser-pack": "^6.0.1",
+        "browser-resolve": "^1.11.0",
+        "browserify-zlib": "~0.2.0",
+        "buffer": "^5.0.2",
+        "cached-path-relative": "^1.0.0",
+        "concat-stream": "^1.6.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~1.0.0",
+        "crypto-browserify": "^3.0.0",
+        "defined": "^1.0.0",
+        "deps-sort": "^2.0.0",
+        "domain-browser": "^1.2.0",
+        "duplexer2": "~0.1.2",
+        "events": "^2.0.0",
+        "glob": "^7.1.0",
+        "has": "^1.0.0",
+        "htmlescape": "^1.1.0",
+        "https-browserify": "^1.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^7.0.0",
+        "labeled-stream-splicer": "^2.0.0",
+        "mkdirp": "^0.5.0",
+        "module-deps": "^6.0.0",
+        "os-browserify": "~0.3.0",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "~0.11.0",
+        "punycode": "^1.3.2",
+        "querystring-es3": "~0.2.0",
+        "read-only-stream": "^2.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.1.4",
+        "shasum": "^1.0.0",
+        "shell-quote": "^1.6.1",
+        "stream-browserify": "^2.0.0",
+        "stream-http": "^2.0.0",
+        "string_decoder": "^1.1.1",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^2.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "0.0.1",
+        "url": "~0.11.0",
+        "util": "~0.10.1",
+        "vm-browserify": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+      "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+    },
+    "cached-path-relative": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz",
+      "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="
+    },
+    "charm": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/charm/-/charm-0.1.2.tgz",
+      "integrity": "sha1-BsIe7RobBq62dVPNxT4jJ0usIpY="
+    },
+    "chart.js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-1.0.2.tgz",
+      "integrity": "sha1-rVfSIpz9jM9ZVRR+gSG0kR5p3+c="
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "ckeditor": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/ckeditor/-/ckeditor-4.12.1.tgz",
+      "integrity": "sha512-pH2Su4oi0D4iN/3U8nUcwI7/lXHoOJi0aiN8e2zxnm4Ow5kq8eZP2ZGmpYyuqRyKZ2tHaU8+OyYi7laXcjiq9Q=="
+    },
+    "classie": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/classie/-/classie-1.0.0.tgz",
+      "integrity": "sha1-/JsptH5k43SiBi+2JNBaYc1wOrI="
+    },
+    "codemirror": {
+      "version": "5.48.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.0.tgz",
+      "integrity": "sha512-3Ter+tYtRlTNtxtYdYNPxGxBL/b3cMcvPdPm70gvmcOO2Rauv/fUEewWa0tT596Hosv6ea2mtpx28OXBy1mQCg=="
+    },
+    "combine-source-map": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+      "integrity": "sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=",
+      "requires": {
+        "convert-source-map": "~1.1.0",
+        "inline-source-map": "~0.6.0",
+        "lodash.memoize": "~3.0.3",
+        "source-map": "~0.5.3"
+      }
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+    },
+    "components-font-awesome": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-5.4.2.tgz",
+      "integrity": "sha512-uftrn6yK9sQz/oOWotndo/c3h70xBclNCb3P6uOVQPMlc0/MBmnlDh6kKzfX8QM388PAmbEpn7Zrw0SctIOD2Q=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+    },
+    "convert-source-map": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+      "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "d3": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-4.13.0.tgz",
+      "integrity": "sha512-l8c4+0SldjVKLaE2WG++EQlqD7mh/dmQjvi2L2lKPadAVC+TbJC4ci7Uk9bRi+To0+ansgsS0iWfPjD7DBy+FQ==",
+      "requires": {
+        "d3-array": "1.2.1",
+        "d3-axis": "1.0.8",
+        "d3-brush": "1.0.4",
+        "d3-chord": "1.0.4",
+        "d3-collection": "1.0.4",
+        "d3-color": "1.0.3",
+        "d3-dispatch": "1.0.3",
+        "d3-drag": "1.2.1",
+        "d3-dsv": "1.0.8",
+        "d3-ease": "1.0.3",
+        "d3-force": "1.1.0",
+        "d3-format": "1.2.2",
+        "d3-geo": "1.9.1",
+        "d3-hierarchy": "1.1.5",
+        "d3-interpolate": "1.1.6",
+        "d3-path": "1.0.5",
+        "d3-polygon": "1.0.3",
+        "d3-quadtree": "1.0.3",
+        "d3-queue": "3.0.7",
+        "d3-random": "1.1.0",
+        "d3-request": "1.0.6",
+        "d3-scale": "1.0.7",
+        "d3-selection": "1.3.0",
+        "d3-shape": "1.2.0",
+        "d3-time": "1.0.8",
+        "d3-time-format": "2.1.1",
+        "d3-timer": "1.0.7",
+        "d3-transition": "1.1.1",
+        "d3-voronoi": "1.1.2",
+        "d3-zoom": "1.7.1"
+      }
+    },
+    "d3-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.1.tgz",
+      "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw=="
+    },
+    "d3-axis": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.8.tgz",
+      "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo="
+    },
+    "d3-brush": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz",
+      "integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=",
+      "requires": {
+        "d3-dispatch": "1",
+        "d3-drag": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "1",
+        "d3-transition": "1"
+      }
+    },
+    "d3-chord": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz",
+      "integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=",
+      "requires": {
+        "d3-array": "1",
+        "d3-path": "1"
+      }
+    },
+    "d3-collection": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz",
+      "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI="
+    },
+    "d3-color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz",
+      "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
+    },
+    "d3-dispatch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz",
+      "integrity": "sha1-RuFJHqqbWMNY/OW+TovtYm54cfg="
+    },
+    "d3-drag": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
+      "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
+      "requires": {
+        "d3-dispatch": "1",
+        "d3-selection": "1"
+      }
+    },
+    "d3-dsv": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz",
+      "integrity": "sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==",
+      "requires": {
+        "commander": "2",
+        "iconv-lite": "0.4",
+        "rw": "1"
+      }
+    },
+    "d3-ease": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz",
+      "integrity": "sha1-aL+8NJM4o4DETYrMT7wzBKotjA4="
+    },
+    "d3-force": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz",
+      "integrity": "sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==",
+      "requires": {
+        "d3-collection": "1",
+        "d3-dispatch": "1",
+        "d3-quadtree": "1",
+        "d3-timer": "1"
+      }
+    },
+    "d3-format": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.2.tgz",
+      "integrity": "sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw=="
+    },
+    "d3-geo": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz",
+      "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
+      "requires": {
+        "d3-array": "1"
+      }
+    },
+    "d3-hierarchy": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz",
+      "integrity": "sha1-ochFxC+Eoga88cAcAQmOpN2qeiY="
+    },
+    "d3-interpolate": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
+      "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
+      "requires": {
+        "d3-color": "1"
+      }
+    },
+    "d3-path": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz",
+      "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q="
+    },
+    "d3-polygon": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.3.tgz",
+      "integrity": "sha1-FoiOkCZGCTPysXllKtN4Ik04LGI="
+    },
+    "d3-quadtree": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz",
+      "integrity": "sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg="
+    },
+    "d3-queue": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.7.tgz",
+      "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg="
+    },
+    "d3-random": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.0.tgz",
+      "integrity": "sha1-ZkLlBsb6OmSFldKyRpeIqNElKdM="
+    },
+    "d3-request": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz",
+      "integrity": "sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==",
+      "requires": {
+        "d3-collection": "1",
+        "d3-dispatch": "1",
+        "d3-dsv": "1",
+        "xmlhttprequest": "1"
+      }
+    },
+    "d3-scale": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
+      "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
+      "requires": {
+        "d3-array": "^1.2.0",
+        "d3-collection": "1",
+        "d3-color": "1",
+        "d3-format": "1",
+        "d3-interpolate": "1",
+        "d3-time": "1",
+        "d3-time-format": "2"
+      }
+    },
+    "d3-selection": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz",
+      "integrity": "sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA=="
+    },
+    "d3-shape": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
+      "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
+      "requires": {
+        "d3-path": "1"
+      }
+    },
+    "d3-time": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.8.tgz",
+      "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ=="
+    },
+    "d3-time-format": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz",
+      "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==",
+      "requires": {
+        "d3-time": "1"
+      }
+    },
+    "d3-timer": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.7.tgz",
+      "integrity": "sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA=="
+    },
+    "d3-transition": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz",
+      "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
+      "requires": {
+        "d3-color": "1",
+        "d3-dispatch": "1",
+        "d3-ease": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "^1.1.0",
+        "d3-timer": "1"
+      }
+    },
+    "d3-voronoi": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz",
+      "integrity": "sha1-Fodmfo8TotFYyAwUgMWinLDYlzw="
+    },
+    "d3-zoom": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.1.tgz",
+      "integrity": "sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==",
+      "requires": {
+        "d3-dispatch": "1",
+        "d3-drag": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "1",
+        "d3-transition": "1"
+      }
+    },
+    "dash-ast": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
+      "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="
+    },
+    "datatables.net": {
+      "version": "1.10.19",
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.19.tgz",
+      "integrity": "sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==",
+      "requires": {
+        "jquery": ">=1.7"
+      }
+    },
+    "datatables.net-bs": {
+      "version": "1.10.19",
+      "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz",
+      "integrity": "sha512-5gxoI2n+duZP06+4xVC2TtH6zcY369/TRKTZ1DdSgDcDUl4OYQsrXCuaLJmbVzna/5Y5lrMmK7CxgvYgIynICA==",
+      "requires": {
+        "datatables.net": "1.10.19",
+        "jquery": ">=1.7"
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+    },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+    },
+    "deps-sort": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
+      "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "shasum": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detective": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
+      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
+      "requires": {
+        "acorn-node": "^1.6.1",
+        "defined": "^1.0.0",
+        "minimist": "^1.1.1"
+      }
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+    },
+    "domhelper": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/domhelper/-/domhelper-0.9.1.tgz",
+      "integrity": "sha1-JlVOW6wsnpWF3KUAl431Bn1kvQA=",
+      "requires": {
+        "browserify": ">=3.46.0",
+        "classie": ">=0.0.1",
+        "util-extend": "^1.0.1"
+      }
+    },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "elliptic": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
+      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "eve-raphael": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz",
+      "integrity": "sha1-F8dUt5K+7z+maE15z1pHxjxM2jA="
+    },
+    "events": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+      "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "fastclick": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
+    },
+    "flot": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/flot/-/flot-0.8.3.tgz",
+      "integrity": "sha512-xg2otcTJDvS+ERK+my4wxG/ASq90QURXtoM4LhacCq0jQW2jbyjdttbRNqU2cPykrpMvJ6b2uSp6SAgYAzj9tQ=="
+    },
+    "font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fullcalendar": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.10.0.tgz",
+      "integrity": "sha512-0OtsHhmdYhtFmQwXzyo8VqHzYgamg+zVOoytv5N13gI+iF6CGjevpCi/yBaQs0O4wY3OAp8I688IxdNYe0iAvw=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "get-assigned-identifiers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "htmlescape": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+      "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E="
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "inline-source-map": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+      "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
+      "requires": {
+        "source-map": "~0.5.3"
+      }
+    },
+    "inputmask": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/inputmask/-/inputmask-3.3.11.tgz",
+      "integrity": "sha1-FCHJSuKMPc0bTSYze1CLs0mY4tg="
+    },
+    "insert-module-globals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz",
+      "integrity": "sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "acorn-node": "^1.5.2",
+        "combine-source-map": "^0.8.0",
+        "concat-stream": "^1.6.1",
+        "is-buffer": "^1.1.0",
+        "path-is-absolute": "^1.0.1",
+        "process": "~0.11.0",
+        "through2": "^2.0.0",
+        "undeclared-identifiers": "^1.1.2",
+        "xtend": "^4.0.0"
+      }
+    },
+    "ion-rangeslider": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz",
+      "integrity": "sha512-7TtH9/X4Aq/xCzboWxjwlv20gVqR90Ysc3aehMlTuH2/ULaSxpB80hq+yvD1N0FwWbPDtxQpjQrz/iX+LWXKmg==",
+      "requires": {
+        "jquery": ">=1.8"
+      }
+    },
+    "ionicons": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz",
+      "integrity": "sha1-QLja9P16MRUL0AIWD2ZJbiKpjDw="
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "jquery": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+    },
+    "jquery-knob": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/jquery-knob/-/jquery-knob-1.2.11.tgz",
+      "integrity": "sha1-83w528HHpqbBLNsu1Pa/+2g/ENY="
+    },
+    "jquery-sparkline": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jquery-sparkline/-/jquery-sparkline-2.4.0.tgz",
+      "integrity": "sha1-G+i3twTdOFcVJwiu+x1KSzpp+zM="
+    },
+    "jquery-ui": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
+      "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
+    },
+    "json-stable-stringify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+      "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
+    },
+    "jvectormap": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jvectormap/-/jvectormap-1.2.2.tgz",
+      "integrity": "sha1-LkQIskpgRz/xBsHnJD43WuXKhdo=",
+      "requires": {
+        "jquery": ">=1.5"
+      }
+    },
+    "labeled-stream-splicer": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+      "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "stream-splicer": "^2.0.0"
+      }
+    },
+    "lodash.memoize": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+      "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8="
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        }
+      }
+    },
+    "module-deps": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.1.tgz",
+      "integrity": "sha512-UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A==",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "browser-resolve": "^1.7.0",
+        "cached-path-relative": "^1.0.2",
+        "concat-stream": "~1.6.0",
+        "defined": "^1.0.0",
+        "detective": "^5.0.2",
+        "duplexer2": "^0.1.2",
+        "inherits": "^2.0.1",
+        "parents": "^1.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.4.0",
+        "stream-combiner2": "^1.1.1",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
+    "morris.js": {
+      "version": "github:morrisjs/morris.js#14530d0733801d5bef1264cf3d062ecace7e326b",
+      "from": "github:morrisjs/morris.js"
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+    },
+    "pace": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/pace/-/pace-0.0.4.tgz",
+      "integrity": "sha1-1mQF1fW8EtJUQabibIeNvGnnenc=",
+      "requires": {
+        "charm": "~0.1.0"
+      }
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+    },
+    "parents": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
+      "requires": {
+        "path-platform": "~0.11.15"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "path-platform": {
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I="
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "raphael": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.2.8.tgz",
+      "integrity": "sha512-0kWKcGn4lXTw4eUiOhjspYiG+v0m6zSmTmlO62E0hl2CYKUvCuHER9YKqXYvOn2nj24mYp8jzHOLeBuj/Gn28Q==",
+      "requires": {
+        "eve-raphael": "0.5.0"
+      }
+    },
+    "read-only-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+      "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "resolve": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+    },
+    "safe-buffer": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "select2": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.7.tgz",
+      "integrity": "sha512-t46Z2nkEEYnBYdRpLNw5dj9qqO+YTiTlWKnpJ/B5e1Q3hPND00JRgcLJxYRzqpeLZd+ZkszkHEMagLKIfbTjVA=="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shasum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+      "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
+      "requires": {
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
+      }
+    },
+    "shell-quote": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "requires": {
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
+      }
+    },
+    "simple-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
+      "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
+    },
+    "slimscroll": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/slimscroll/-/slimscroll-0.9.1.tgz",
+      "integrity": "sha1-9nXNxgHYCtog8WAE0ifRVv0Rh7I=",
+      "requires": {
+        "browserify": ">=3.46.0",
+        "classie": ">=0.0.1",
+        "domhelper": "~0.9.0",
+        "util-extend": "^1.0.1"
+      }
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
+      "requires": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-splicer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+      "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "string_decoder": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+      "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
+    "subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+      "requires": {
+        "minimist": "^1.1.0"
+      }
+    },
+    "syntax-error": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+      "requires": {
+        "acorn-node": "^1.2.0"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
+      "requires": {
+        "process": "~0.11.0"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+    },
+    "tty-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "umd": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="
+    },
+    "undeclared-identifiers": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
+      "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
+      "requires": {
+        "acorn-node": "^1.3.0",
+        "dash-ast": "^1.0.0",
+        "get-assigned-identifiers": "^1.2.0",
+        "simple-concat": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util-extend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
+      "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
+    },
+    "vm-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644 (file)
index 0000000..856c0c1
--- /dev/null
@@ -0,0 +1,20 @@
+{
+  "name": "lw-ui",
+  "version": "1.0.0",
+  "directories": {
+    "static": "node"
+  },
+  "dependencies": {
+    "admin-lte": "^2.4.12",
+    "bootbox": "^5.2.0",
+    "codemirror": "^5.36.0",
+    "components-font-awesome": "5.4.2",
+    "d3": "^4.13.0",
+    "moment": "^2.22.2"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Francesco Lombardo <franclombardo@gmail.com>"
+}
index 7ffd8d4..cd6f03a 100644 (file)
@@ -1,10 +1,26 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "project_descriptors.html" %}
 {% load staticfiles %}
 
 
 {% block head_block %}
        {{ block.super }}
-<link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+<link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
 {% endblock %}
 
 {% block title_header_big %}
@@ -22,7 +38,7 @@
 
 {% block breadcrumb_body %}
        {{ block.super }}
-    <li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
+    <li><a href="{% url 'projects:open_project' %}">{{project_name}}</a></li>
     <li><a> {% if package_type  %}
      {{ package_type }}
   {% else%}
@@ -49,7 +65,7 @@
 
 {% block resource_block %}
        {{ block.super }}
-     <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+     <script src="/static/node_modules/select2/dist/js/select2.js"></script>
     <script src="/static/src/instancehandler/instance_create.js"></script>
     <script src="/static/src/packagehandler/packages_list.js"></script>
     <script src="/static/src/drop_zone.js"></script>
index 2a0c513..43366ce 100644 (file)
@@ -16,7 +16,7 @@ from django.conf.urls import url
 from packagehandler import views
 
 urlpatterns = [
-    url(r'(?P<package_type>\w+)/list$', views.show_packages, name='list_packages'),
+    url(r'(?P<package_type>\w+)/list$', views.list_packages, name='list_packages'),
     url(r'(?P<package_type>\w+)/create', views.create_package_empty, name='create_package_empty'),
     url(r'(?P<package_type>\w+)/(?P<package_id>[-\w]+)/delete$', views.delete_package, name='delete_package'),
     url(r'(?P<package_type>\w+)/(?P<package_id>[-\w]+)/clone', views.clone_package, name='clone_package'),
index de90737..89d451d 100644 (file)
@@ -32,9 +32,10 @@ log = logging.getLogger('packagehandler/view.py')
 
 
 @login_required
-def show_packages(request, package_type=None):
+def list_packages(request, package_type=None):
     user = osmutils.get_user(request)
     project_id = user.project_id
+    project_name = user.project_name
     client = Client()
     filter = request.GET.get('type')
     try:
@@ -50,6 +51,7 @@ def show_packages(request, package_type=None):
     return __response_handler(request, {
         'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [],
         'project_id': project_id,
+        'project_name': project_name,
         'project_type': 'osm',
         'package_type': package_type
     }, url)
index 1775797..718c08d 100644 (file)
@@ -56,11 +56,10 @@ class OsmProject(object):
             client = Client()
             if type_descriptor == 'nsd':
                 result = client.nsd_get(descriptor_id)
-                print result
+                
             elif type_descriptor == 'vnfd':
                 result = client.vnfd_get(descriptor_id)
 
-                print result
         except Exception as e:
             log.exception(e)
             result = {}
@@ -175,11 +174,11 @@ class OsmProject(object):
             else:
                 return False
             result = yaml.load(result)
-            print result
+            
         except Exception as e:
             log.exception(e)
             result = False
-        print result
+        
         return result
 
     def get_add_element(self, request):
@@ -215,7 +214,6 @@ class OsmProject(object):
         except Exception as e:
             log.exception(e)
             result = False
-        print result
         return result
 
     @staticmethod
@@ -232,5 +230,4 @@ class OsmProject(object):
         except Exception as e:
             log.exception(e)
             result = False
-        print result
         return result
\ No newline at end of file
index 7259834..a16d86e 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <aside class="main-sidebar">
     <!-- sidebar: style can be found in sidebar.less -->
     <section class="sidebar">
                     <i class="fas fa-users"></i> <span>Users</span>
                 </a>
                 </li>
-                {%comment%}
                 {% url "roles:list"   as  role_list_url %}
                 <li {% if request.get_full_path == role_list_url %} class="active" {% endif %}>
                 <a href='{% url "roles:list"   %}'>
                     <i class="fas fa-user-tag"></i> <span>Roles</span>
                 </a>
                 </li>
-                {%endcomment%}
                 
             {% endif %}
         </ul>
index e427313..0ff48f5 100644 (file)
@@ -1,10 +1,26 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 
 {% load staticfiles %}
 
 {% block head_block %}
        {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
 
 {% endblock %}
 
 {% block breadcrumb_body %}
-       {{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {{ block.super }}
+        {% if user.is_admin %}
+        <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+        {% else%}
+        <li><a href="#">Projects</a></li>
+        {% endif %}
+
+    
+
 {% endblock %}
 
 {% block content_body %}
@@ -46,8 +69,8 @@
 {% block resource_block %}
        {{ block.super }}
 
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
 {% endblock %}
 
index aac2983..57817fb 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 
 {% load staticfiles %}
 
 {% block breadcrumb_body %}
        {{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% if user.is_admin %}
+      <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% else%}
+      <li><a href="#">Projects</a></li>
+      {% endif %}
     <li><a href="{% url 'projects:open_project' %}">{{project_overview.name}}</a></li>
 {% endblock %}
 
index 62282ad..f1aa4f1 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load date_tag %}
@@ -5,7 +21,7 @@
 
 {% block head_block %}
        {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
 
 {% block breadcrumb_body %}
        {{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% if user.is_admin %}
+      <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% else%}
+      <li><a href="#">Projects</a></li>
+      {% endif %}
 {% endblock %}
 
 {% block content_body %}
@@ -63,8 +83,8 @@
 
 {% block resource_block %}
        {{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
     <script>
         var table;
index 1660607..d017922 100644 (file)
@@ -22,9 +22,9 @@ urlpatterns = [
     url(r'^list/', views.user_projects, name='projects_list'),
     url(r'^new/', views.create_new_project, name='new_project'),
     url(r'^descriptors/', include('descriptorhandler.urls', namespace='descriptors'), name='descriptor_base'),
-    url(r'^(?P<project_id>[\w ]+)/delete$', views.delete_project, name='delete_project'),
-    url(r'^(?P<project_id>[\w ]+)/switch', views.switch_project, name='switch_project'),
-    url(r'^(?P<project_id>[\w ]+)/edit', views.edit_project, name='edit_project'),
+    url(r'^(?P<project_id>[-\w]+)/delete$', views.delete_project, name='delete_project'),
+    url(r'^(?P<project_id>[-\w]+)/switch', views.switch_project, name='switch_project'),
+    url(r'^(?P<project_id>[-\w]+)/edit', views.edit_project, name='edit_project'),
 
 
 
index 6a9a98a..f36c7ab 100644 (file)
@@ -75,11 +75,13 @@ def open_project(request):
         vnfd = client.vnfd_list(user.get_token())
         ns = client.ns_list(user.get_token())
         vnf = client.vnf_list(user.get_token())
+
+        proj_data_admin =  prj['data']['_admin'] if prj and prj['data'] and  prj['data']['_admin'] and prj['error'] is False else None
         project_overview = {
             'owner': user.username,
-            'name': project_id,
-            'updated_date': prj['data']['_admin']['modified'] if prj and prj['error'] is False else '-',
-            'created_date': prj['data']['_admin']['created'] if prj and prj['error'] is False else '-',
+            'name': user.project_name,
+            'updated_date': proj_data_admin['modified'] if proj_data_admin else '-',
+            'created_date': proj_data_admin['created'] if proj_data_admin else '-',
 
             'type': 'osm',
             'nsd': len(nsd['data']) if nsd and nsd['error'] is False else 0,
index 58d68ca..bd734ad 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <div class="modal" id="modal_new_role" xmlns="http://www.w3.org/1999/html">
     <div class="modal-dialog">
         <div class="modal-content">
                             <input class="form-control" id="rolename" name="name"
                                    placeholder="Name" required>
                         </div>
+                       
+                    </div>
+                   
+                    <div class="form-group">
+                        <label for="permissions" class="col-sm-3 control-label">Permissions </label>
+                        <div class="col-sm-6">
+                            <textarea class="form-control" id="permissions" name="permissions" placeholder="Yaml permissions"
+                                      rows="10"></textarea>
+                        </div>
                     </div>
-
-            
 
                 </div>
                 <div class="modal-footer">
index 8541177..515073b 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <div class="modal" id="modal_edit_role" xmlns="http://www.w3.org/1999/html">
     <div class="modal-dialog">
         <div class="modal-content">
                 <div class="modal-body" id="modal_edit_role_body">
                     
                     <div class="form-group">
-                        <label for="name" class="col-sm-3 control-label">Name</label>
+                        <label for="rolename" class="col-sm-3 control-label">Name *</label>
+                        <div class="col-sm-6">
+                            <input class="form-control" type="text" id="edit_rolename" name="name"
+                                       placeholder="Name" required>
+                        </div>
+                        
+                    </div>
+                        
+                    <div class="form-group">
+                        <label for="permissions" class="col-sm-3 control-label">Permissions </label>
                         <div class="col-sm-6">
-                           <input class="form-control" id="edit_role_name" name="role" 
-                                   placeholder="Name">
+                            <textarea class="form-control" id="edit_permissions" name="permissions" placeholder="Yaml permissions"
+                                      rows="10"></textarea>
                         </div>
                     </div>
                    
index 5cf49a1..1f7c6ca 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load date_tag %}
@@ -6,8 +22,8 @@
 
 {% block head_block %}
     {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -19,7 +35,7 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    <li><a href="#">roles</a></li>
+    <li><a href="#">Roles</a></li>
 {% endblock %}
 
 {% block content_body %}
 
             <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">roles</h3>
+                    <h3 class="box-title">Roles</h3>
                     <div class="box-tools">
                         <button type="button" class="btn btn-default" data-container="body"
-                                onclick="javascript:openModalCreateRole({'projects_list_url': '{% url "projects:projects_list" %}'})"
+                                onclick="javascript:openModalCreateRole()"
                                 data-toggle="tooltip" data-placement="top" title="New role">
 
                             <i class="fa fa-plus"></i> Create role
@@ -67,9 +83,9 @@
 
 {% block resource_block %}
     {{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
     <script src="/static/src/rolehandler/role_list.js"></script>
     <script>
         var table;
                                 'data-toggle="dropdown" aria-expanded="false">Actions ' +
                                 '<span class="fa fa-caret-down"></span></button> ' +
                                 '<ul class="dropdown-menu">' +
-                                '<li> <a href="#" onclick="javascript:openModalEditRole({role_id:\'' + row['_id'] + '\', rolename:\'' + row['rolename'] + '\'})">' +
+                                '<li> <a href="#" onclick="javascript:openModalEditRole({role_id:\'' + row['_id'] + '\'})">' +
                                 '<i class="fa fa-edit"></i> Edit</a></li>' +
-                                '<li> <a href="#" onclick="javascript:deleteRole(\'' + row['_id'] + '\', \'' + row['rolename'] + '\')"' +
+                                '<li> <a href="#" onclick="javascript:deleteRole(\'' + row['_id'] + '\', \'' + row['name'] + '\')"' +
                                 'style="color:red"><i class="fa fa-trash"></i> Delete</a></li> </ul></div>';
                         },
                         "targets": 4,
                     table.ajax.reload();
                     bootbox.alert({
                         title: "Result",
-                        message: "role successfully modified."
+                        message: "Role successfully modified."
                     });
 
                 }).fail(function (result) {
index c37325d..81578f9 100644 (file)
@@ -20,7 +20,8 @@ from rolehandler import views
 urlpatterns = [
     url(r'^list$', views.role_list, name='list'),
     url(r'^create$', views.create, name='create'),
-    url(r'^(?P<user_id>[0-9a-zA-Z]+)/delete$', views.delete, name='delete'),
-    url(r'^(?P<user_id>[0-9a-zA-Z]+)', views.update, name='update')
+    url(r'^(?P<role_id>[-\w]+)/delete$', views.delete, name='delete'),
+    url(r'^(?P<role_id>[-\w]+)/update$', views.update, name='update'),
+    url(r'^(?P<role_id>[-\w]+)$', views.get, name='get')
 
 ]
index f6a0799..2537175 100644 (file)
@@ -17,6 +17,7 @@
 from django.shortcuts import render, redirect
 from sf_t3d.decorators import login_required
 from django.http import HttpResponse
+import yaml
 import json
 import logging
 import authosm.utils as osmutils
@@ -42,8 +43,20 @@ def create(request):
     user = osmutils.get_user(request)
     client = Client()
     role_data ={
-       'name'
+       'name': request.POST['name'],
     }
+    try:
+        if 'permissions' in request.POST and request.POST.get('permissions') != '':
+            role_permissions = yaml.load(request.POST.get('permissions'))
+
+            if not isinstance(role_permissions, dict):
+                    raise ValueError('Role permissions should be provided in a key-value fashion')
+            for key, value in role_permissions.items():
+                if not isinstance(value, bool):
+                    raise ValueError("Value of '{}' in a role permissionss should be boolean".format(key))
+                role_data[key] = value
+    except Exception as e:
+        return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
     result = client.role_create(user.get_token(), role_data)
     if result['error']:
         return __response_handler(request, result['data'], url=None,
@@ -69,21 +82,50 @@ def delete(request, role_id=None):
 
 @login_required
 def update(request, role_id=None):
+    user = osmutils.get_user(request)
+    client = Client()
+    payload = {
+        'name': request.POST['name'],
+    }
+    try:
+        if 'permissions' in request.POST and request.POST.get('permissions') != '':
+            role_permissions = yaml.load(request.POST.get('permissions'))
+
+            if not isinstance(role_permissions, dict):
+                    raise ValueError('Role permissions should be provided in a key-value fashion')
+            for key, value in role_permissions.items():
+                if not isinstance(value, bool):
+                    raise ValueError('Value in a role permissions should be boolean')
+                payload[key] = value
+    except Exception as e:
+        return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
+    result = client.role_update(user.get_token(), role_id, payload)
+    if result['error']:
+        return __response_handler(request, result['data'], url=None,
+                                  status=result['data']['status'] if 'status' in result['data'] else 500)
+    else:
+        return __response_handler(request, {}, url=None, status=200)
+
+@login_required
+def get(request, role_id=None):
     user = osmutils.get_user(request)
     try:
         client = Client()
-        payload = {}
-        if request.POST.get('name') and request.POST.get('name') is not '':
-            payload["name"] = request.POST.get('name')
-        update_res = client.role_update(user.get_token(), role_id, payload)
+        get_res = client.role_get(user.get_token(), role_id)
     except Exception as e:
         log.exception(e)
-        update_res = {'error': True, 'data': str(e)}
-    if update_res['error']:
-        return __response_handler(request, update_res['data'], url=None,
-                                  status=update_res['data']['status'] if 'status' in update_res['data'] else 500)
+        get_res = {'error': True, 'data': str(e)}
+    if get_res['error']:
+        return __response_handler(request, get_res['data'], url=None,
+                                  status=get_res['data']['status'] if 'status' in get_res['data'] else 500)
     else:
-        return __response_handler(request, {}, url=None, status=200)
+        role = get_res['data']
+        result = {
+            '_id': role['_id'],
+            'name': role['name'],
+            'permissions': { key:value for key, value in role['permissions'].items() if key not in ['_id', 'name', 'root', '_admin'] }
+        }
+        return __response_handler(request, result, url=None, status=200)
 
 
 def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):
index c42f51c..2d74bea 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -5,7 +21,7 @@
 
 {% block head_block %}
     {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
@@ -64,9 +80,9 @@
 {% block resource_block %}
     {{ block.super }}
     <!-- moment JS -->
-    <script src="/static/bower_components/moment/moment.js"></script>
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/moment/moment.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
     <script src="/static/src/sdnctrlhandler/sdn_list.js"></script>
 
      <script>
index 644cba9..0beb212 100644 (file)
@@ -15,6 +15,8 @@
 #
 
 import os
+import sys
+
 from sqlalchemy.engine.url import make_url
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -206,3 +208,28 @@ else:
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
 )
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '[django] %(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        }
+    },
+    'handlers': {
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'stream': sys.stdout,
+            'formatter': 'verbose'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },
+    },
+}
\ No newline at end of file
index fc19f52..5ee1b35 100644 (file)
 
 function openModalCreateRole(args) {
 
-    
-
     $('#modal_new_role').modal('show');
 }
 
 function openModalEditRole(args) {
     var url = '/admin/roles/' + args.role_id;
+    var url_update = '/admin/roles/' + args.role_id+'/update';
+    var dialog = bootbox.dialog({
+        message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+        closeButton: false
+    });
+    $.ajax({
+        url: url,
+        type: 'GET',
+        headers: {
+            "Accept": 'application/json'
+        },
+        contentType: false,
+        processData: false
+    })
+    .done(function (response,textStatus, jqXHR) {
+        dialog.modal('hide');
+        $("#formEditRole").attr("action", url_update);
+        $('#modal_edit_role').modal('show');
+        $('#edit_rolename').val(response['name'])
+        $('#edit_permissions').val(JSON.stringify(response['permissions']))
+        if(response['root'] === true){
+            $("#edit_root").attr("checked", true);
+        }
+        else {
+            $("#edit_root").attr("checked", false);
+        }
+    }).fail(function(result){
+        dialog.modal('hide');
+        var data  = result.responseJSON;
+        var title = "Error " + (data.code ? data.code: 'unknown');
+        var message = data.detail ? data.detail: 'No detail available.';
+        bootbox.alert({
+            title: title,
+            message: message
+        });
+    });
     
-    $("#formEditRole").attr("action", url);
-    
-
-    $('#modal_edit_role').modal('show');
 }
 
 function deleteRole(role_id, name) {
@@ -40,17 +70,31 @@ function deleteRole(role_id, name) {
             });
             $.ajax({
                 url: delete_url,
-                dataType: "json",
-                contentType: "application/json;charset=utf-8",
-                success: function (result) {
-                    //$('#modal_show_vim_body').empty();
-                    dialog.modal('hide');
-                    table.ajax.reload();
+                type: 'GET',
+                headers: {
+                    "Accept": 'application/json'
                 },
-                error: function (result) {
-                    dialog.modal('hide');
-                    bootbox.alert("An error occurred.");
-                }
+                contentType: false,
+                processData: false
+            })
+            .done(function (response,textStatus, jqXHR) {
+                bootbox.alert({
+                    title: "Result",
+                    message: "Role deleted.",
+                    callback: function () {
+                        dialog.modal('hide');
+                        table.ajax.reload();
+                    }
+                });
+            }).fail(function(result){
+                dialog.modal('hide');
+                var data  = result.responseJSON;
+                var title = "Error " + (data.code ? data.code: 'unknown');
+                var message = data.detail ? data.detail: 'No detail available.';
+                bootbox.alert({
+                    title: title,
+                    message: message
+                });
             });
         }
     })
index 9a52249..0000ecc 100644 (file)
@@ -41,7 +41,7 @@ function openModalCreateUser(args) {
     $('#modal_new_user').modal('show');
 }
 
-function openModalEditUser(args) {
+function openModalEditUserCredentials(args) {
     var url = '/admin/users/' + args.user_id;
     var user_projects = args.projects ? args.projects.split(',') : [];
     $("#formEditUser").attr("action", url);
@@ -66,9 +66,81 @@ function openModalEditUser(args) {
     }
 
 
-    $('#modal_edit_user').modal('show');
+    $('#modal_edit_user_credentials').modal('show');
 }
 
+function openModalEditUserRoleMap(user_id) {
+    $("#formEditUserRoleMap").attr("action", '/admin/users/' + user_id);
+    var dialog = bootbox.dialog({
+        message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+        closeButton: false
+    });
+    $.ajax({
+        url: '/admin/users/' + user_id + '/info',
+        dataType: "json",
+        contentType: "application/json;charset=utf-8",
+        success: function (result) {
+            dialog.modal('hide');
+            resetMapGroup(result);
+            $('#modal_edit_user_role_map').modal('show');
+        },
+        error: function (result) {
+            dialog.modal('hide');
+            bootbox.alert("An error occurred.");
+        }
+    });
+    
+}
+
+function resetMapGroup(args){
+    var $formGroup = $('#modal_edit_proj_role_map_body');
+    $formGroup.empty();
+    $formGroup.append('<div class="proj-role-map-group-head">' + 
+       
+        '<button type="button" class="btn btn-success btn-add btn-sm">+</button>'+
+        '</div></br>');
+    if(args['project_role_mappings'] && args['project_role_mappings'].length > 0) {
+        
+        for(i = 0; i < args['project_role_mappings'].length; ++i){
+            var mapping = args['project_role_mappings'][i];
+            
+            $formGroup.append('<div class="proj-role-map-group"> <div class="form-group">' + 
+            '<label  class="col-sm-2">Project* </label><div class="col-sm-3">'+
+            '<input name="map_project_name" value="'+mapping.project_name+'" class="form-control input-sm" required></div>'+
+            '<label class="col-sm-2">Role* </label>'+
+            '<div class="col-sm-3">'+
+            '<input name="map_role_name" value="'+mapping.role_name+'" class="form-control input-sm" required>'+
+            '</div>'+
+            '<button type="button" class="btn btn-danger btn-remove btn-sm">-</button></div></div>');
+        }
+    } 
+    
+        
+    
+    
+}
+
+var addMapGroup = function (event) {
+    event.preventDefault();
+
+    var $formGroup = $('#modal_edit_proj_role_map_body');
+    $formGroup.append('<div class="proj-role-map-group"> <div class="form-group">' + 
+            '<label  class="col-sm-2">Project* </label><div class="col-sm-3">'+
+            '<input name="map_project_name" class="form-control input-sm" required></div>'+
+            '<label class="col-sm-2">Role* </label>'+
+            '<div class="col-sm-3">'+
+            '<input name="map_role_name" class="form-control input-sm" required>'+
+            '</div>'+
+            '<button type="button" class="btn btn-danger btn-remove btn-sm">-</button></div></div>');
+
+};
+
+var removeMapGroup = function (event) {
+    event.preventDefault();
+    var $formGroup = $(this).closest('.proj-role-map-group');
+    $formGroup.remove();
+};
+
 function deleteUser(user_id, name) {
     var delete_url = '/admin/users/' + user_id + '/delete';
     bootbox.confirm("Are you sure want to delete " + name + "?", function (confirm) {
@@ -94,4 +166,67 @@ function deleteUser(user_id, name) {
         }
     })
 
-}
\ No newline at end of file
+}
+
+function validatePswOnCreate() {
+    
+    var confirm_password = document.getElementById("password2");
+    if($("#password").val() == $("#password2").val()){
+        $("#pwmatch").removeClass("glyphicon-remove");
+        $("#pwmatch").addClass("glyphicon-ok");
+        $("#pwmatch").css("color","#00A41E");
+        confirm_password.setCustomValidity("");
+    }else{
+        $("#pwmatch").removeClass("glyphicon-ok");
+        $("#pwmatch").addClass("glyphicon-remove");
+        $("#pwmatch").css("color","#FF0004");
+        confirm_password.setCustomValidity("Passwords Don't Match");
+    }
+}
+
+function validatePswOnEdit() {
+    
+    var confirm_password = document.getElementById("edit_password2");
+    if($("#edit_password").val() == $("#edit_password2").val()){
+        $("#pwmatch_edit").removeClass("glyphicon-remove");
+        $("#pwmatch_edit").addClass("glyphicon-ok");
+        $("#pwmatch_edit").css("color","#00A41E");
+        confirm_password.setCustomValidity("");
+    }else{
+        $("#pwmatch_edit").removeClass("glyphicon-ok");
+        $("#pwmatch_edit").addClass("glyphicon-remove");
+        $("#pwmatch_edit").css("color","#FF0004");
+        confirm_password.setCustomValidity("Passwords Don't Match");
+    }
+}
+
+$(document).ready(function () {
+    $("#formEditUserRoleMap").submit(function (event) {
+        event.preventDefault(); //prevent default action
+        var post_url = $(this).attr("action"); //get form action url
+        var request_method = $(this).attr("method"); //get form GET/POST method
+        var form_data = new FormData(this); //Encode form elements for submission
+        $.ajax({
+            url: post_url,
+            type: request_method,
+            data: form_data,
+            headers: {
+                "Accept": 'application/json'
+            },
+            contentType: false,
+            processData: false
+        }).done(function (response, textStatus, jqXHR) {
+            table.ajax.reload();
+            $('#modal_edit_user_role_map').modal('hide');
+        }).fail(function (result) {
+            var data = result.responseJSON;
+            var title = "Error " + (data.code ? data.code : 'unknown');
+            var message = data.detail ? data.detail : 'No detail available.';
+            bootbox.alert({
+                title: title,
+                message: message
+            });
+        });
+    });
+
+})
\ No newline at end of file
index 1dabdea..02099a7 100644 (file)
@@ -1,6 +1,28 @@
+#   Copyright 2019 EveryUP Srl
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an  BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 [program:app-uwsgi]
-command = /usr/local/bin/uwsgi --ini /usr/share/osm-lightui/django.ini
+command = /usr/local/bin/uwsgi --ini /usr/share/osm-lightui/django.ini --log-master
 environment=DJANGO_ENV="prod"
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stdout_logfile=/dev/stderr
+stdout_logfile_maxbytes=0
 
 [program:nginx-app]
 command = /usr/sbin/nginx
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stdout_logfile=/dev/stderr
+stdout_logfile_maxbytes=0
\ No newline at end of file
index ee790ff..1c68bb1 100644 (file)
@@ -1,4 +1,20 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 {% load staticfiles %}
+{% load get %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -52,7 +68,7 @@
                 <li class="dropdown tasks-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                         <span class="far fa-folder-open"> </span>
-                       <span>{{ user.project_id }}</span>
+                       <span>{{ user.project_name }}</span>
                         <span class="fa fa-caret-down"></span>
                     </a>
                     <ul class="dropdown-menu">
                             <!-- inner menu: contains the actual data -->
                             <ul class="menu">
                                 {% for p in request.session.projects %}
-                                    {% if p == user.project_id %}
+                                    {% if p.project_name == user.project_name %}
                                         <li>
                                             <a href="#">
                                                 <h3>
-                                                    <i class="fa fa-folder-open"></i> <span>{{ p }}</span>
+                                                    <i class="fa fa-folder-open"></i> <span>{{ p.project_name }}</span>
                                                 </h3>
-
                                             </a>
                                         </li>
                                     {% else %}
                                         <li>
-                                            <a href="{% url 'projects:switch_project' project_id=p %}">
+                                            <a href="{% url 'projects:switch_project' project_id=p.project %}">
                                                 <h3>
-                                                    <i class="fa fa-folder"></i> <span>{{ p }}</span>
+                                                    <i class="fa fa-folder"></i> <span>{{ p.project_name }}</span>
                                                 </h3>
                                             </a>
                                         </li>
 <!-- ./wrapper -->
 
 <!-- jQuery 3 -->
-<script src="/static/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/static/node_modules/jquery/dist/jquery.min.js"></script>
 <!-- Bootstrap 3.3.7 -->
-<script src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="/static/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <!-- FastClick -->
-<script src="/static/bower_components/fastclick/lib/fastclick.js"></script>
+<script src="/static/node_modules/fastclick/lib/fastclick.js"></script>
 <!-- AdminLTE App -->
-<script src="/static/bower_components/admin-lte/dist/js/adminlte.min.js"></script>
+<script src="/static/node_modules/admin-lte/dist/js/adminlte.min.js"></script>
 <!-- iCheck -->
-<script src="/static/bower_components/admin-lte/plugins/iCheck/icheck.min.js"></script>
+<script src="/static/node_modules/admin-lte/plugins/iCheck/icheck.min.js"></script>
 <!-- pace -->
-<script src="/static/bower_components/admin-lte/plugins/pace/pace.min.js"></script>
+<script src="/static/node_modules/admin-lte/plugins/pace/pace.min.js"></script>
 <!-- momentjs -->
-<script src="/static/bower_components/moment/moment.js"></script>
+<script src="/static/node_modules/moment/moment.js"></script>
 <!-- bootbox -->
-<script src="/static/bower_components/bootbox.js/bootbox.js"></script>
+<script src="/static/node_modules/bootbox/dist/bootbox.min.js"></script>
 <!-- RDCL3D AdminLTE session storage handler -->
 <script src="/static/src/adminlte_session_storage.js"></script>
 <!-- Utility JS -->
index 3370a43..1595312 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% load staticfiles %}
 {% load i18n %}
 
   <!-- Tell the browser to be responsive to screen width -->
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <!-- Bootstrap 3.3.7 -->
-  <link rel="stylesheet" href="/static/bower_components/bootstrap/dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/static/node_modules/bootstrap/dist/css/bootstrap.min.css">
   <!-- Font Awesome-->
-  <link rel="stylesheet" href="/static/bower_components/font-awesome/css/font-awesome.css">
-  <!--<link rel="stylesheet" href="/static/bower_components/components-font-awesome/css/fontawesome.min.css">-->
-  <link rel="stylesheet" href="/static/bower_components/components-font-awesome/css/fontawesome-all.min.css">
+  <link rel="stylesheet" href="/static/node_modules/font-awesome/css/font-awesome.css">
+  <!--<link rel="stylesheet" href="/static/node_modules/components-font-awesome/css/fontawesome.min.css">-->
+  <link rel="stylesheet" href="/static/node_modules/components-font-awesome/css/fontawesome-all.min.css">
   <!-- Ionicons -->
-  <link rel="stylesheet" href="/static/bower_components/Ionicons/css/ionicons.min.css">
+  <link rel="stylesheet" href="/static/node_modules/ionicons/dist/css/ionicons.min.css">
   <!-- Theme style -->
-  <link rel="stylesheet" href="/static/bower_components/admin-lte/dist/css/AdminLTE.min.css">
+  <link rel="stylesheet" href="/static/node_modules/admin-lte/dist/css/AdminLTE.min.css">
   <!-- AdminLTE Skins. Choose a skin from the css/skins
        folder instead of downloading all of them to reduce the load. -->
-  <link rel="stylesheet" href="/static/bower_components/admin-lte/dist/css/skins/_all-skins.min.css">
+  <link rel="stylesheet" href="/static/node_modules/admin-lte/dist/css/skins/_all-skins.min.css">
 
   <link rel="stylesheet" href="/static/css/rdcl.css">
   <link rel="stylesheet" href="/static/css/lwui.css">
 
-  <link rel="stylesheet" href="/static/bower_components/admin-lte/plugins/pace/pace.min.css">
+  <link rel="stylesheet" href="/static/node_modules/admin-lte/plugins/pace/pace.min.css">
   <link rel="icon" href="/static/assets/img/favicon.ico">
 
 
index 21afce0..5b8d73a 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <div class="modal" id="modal_new_user" xmlns="http://www.w3.org/1999/html">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -11,6 +26,7 @@
                   method="post" enctype="multipart/form-data">
                 {% csrf_token %}
                 <div class="modal-body" id="modal_new_user_body">
+                    
                     <div class="form-group">
                         <label for="username" class="col-sm-3 control-label">Username *</label>
                         <div class="col-sm-6">
                         <label for="password" class="col-sm-3 control-label">Password *</label>
                         <div class="col-sm-6">
                            <input class="form-control" id="password" name="password" type="password"
-                                   placeholder="Password" required>
+                                   placeholder="Password" autocomplete="off" required>
                         </div>
                     </div>
+
                     <div class="form-group">
-                        <label for=projects" class="col-sm-3 control-label">Projects *</label>
-                        <div class="col-sm-6">
-                            <select required id="projects" class="js-example-basic-multiple form-control" name="projects"
-                            multiple="multiple">
-                            </select>
-                        </div>
+                            <label for="password" class="col-sm-3 control-label">Conf. Password *</label>
+                            <div class="col-sm-6">
+                               <input class="form-control" id="password2" name="password2" type="password"
+                                       placeholder="Repeat Password" autocomplete="off" required>
+                                <div class="row">
+                                    <div class="col-sm-12">
+                                       <span id="pwmatch" class="glyphicon glyphicon-remove" style="color:#FF0004;"></span> Passwords Match
+                                    </div>
+                                </div>
+                            </div>
                     </div>
 
 
+
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
diff --git a/userhandler/templates/modal/user_credentials_edit.html b/userhandler/templates/modal/user_credentials_edit.html
new file mode 100644 (file)
index 0000000..b20da19
--- /dev/null
@@ -0,0 +1,88 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<div class="modal" id="modal_edit_user_credentials" xmlns="http://www.w3.org/1999/html">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span></button>
+                <h4 class="modal-title">Edit User Credentials</h4>
+            </div>
+            <form id="formEditUser" action=""
+                  class="form-horizontal"
+                  method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <input type="hidden"  id="projects_old" name="projects_old" value="asdasd">
+                <div class="modal-body" id="modal_edit_user_credentials_body">
+                    {% comment %}<div class="form-group">
+                        <label for="username_edit" class="col-sm-3 control-label">Username *</label>
+                        <div class="col-sm-6">
+                            <input class="form-control" id="username_edit" name="username"
+                                   placeholder="Username" required>
+                        </div>
+                    </div>{% endcomment %}
+                    <div class="form-group">
+                        <label for="password" class="col-sm-3 control-label">New Password</label>
+                        <div class="col-sm-6">
+                           <input class="form-control" id="edit_password" name="password" type="password"
+                                   placeholder="Password">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                            <label for="password" class="col-sm-3 control-label">Conf. Password</label>
+                            <div class="col-sm-6">
+                               <input class="form-control" id="edit_password2" name="password2" type="password"
+                                       placeholder="Repeat Password" autocomplete="off" required>
+                                <div class="row">
+                                    <div class="col-sm-12">
+                                       <span id="pwmatch_edit" class="glyphicon glyphicon-remove" style="color:#FF0004;"></span> Passwords Match
+                                    </div>
+                                </div>
+                            </div>
+                    </div>
+                    {% comment %}
+                    <div class="form-group">
+                        <label for="projects" class="col-sm-3 control-label">Default project *</label>
+                        <div class="col-sm-6">
+                            <select required id="default_project_edit" class="js-example-basic form-control" name="default_project">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="projects" class="col-sm-3 control-label">Projects *</label>
+                        <div class="col-sm-6">
+                            <select required id="projects_edit" class="js-example-basic-multiple form-control" name="projects"
+                            multiple="multiple">
+                            </select>
+                        </div>
+                    </div>
+                    {% endcomment %}
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
+                    <button class="btn btn-primary"
+                            data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> Editing..."
+                            id="create_edit_user">Apply
+                    </button>
+
+                </div>
+            </form>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
diff --git a/userhandler/templates/modal/user_edit.html b/userhandler/templates/modal/user_edit.html
deleted file mode 100644 (file)
index 49eda46..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="modal" id="modal_edit_user" xmlns="http://www.w3.org/1999/html">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span></button>
-                <h4 class="modal-title">Edit User</h4>
-            </div>
-            <form id="formEditUser" action=""
-                  class="form-horizontal"
-                  method="post" enctype="multipart/form-data">
-                {% csrf_token %}
-                <input type="hidden"  id="projects_old" name="projects_old" value="asdasd">
-                <div class="modal-body" id="modal_edit_user_body">
-                    {% comment %}<div class="form-group">
-                        <label for="username_edit" class="col-sm-3 control-label">Username *</label>
-                        <div class="col-sm-6">
-                            <input class="form-control" id="username_edit" name="username"
-                                   placeholder="Username" required>
-                        </div>
-                    </div>{% endcomment %}
-                    <div class="form-group">
-                        <label for="password" class="col-sm-3 control-label">New Password</label>
-                        <div class="col-sm-6">
-                           <input class="form-control" id="edit_password" name="password" type="password"
-                                   placeholder="Password">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="projects" class="col-sm-3 control-label">Default project *</label>
-                        <div class="col-sm-6">
-                            <select required id="default_project_edit" class="js-example-basic form-control" name="default_project">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="projects" class="col-sm-3 control-label">Projects *</label>
-                        <div class="col-sm-6">
-                            <select required id="projects_edit" class="js-example-basic-multiple form-control" name="projects"
-                            multiple="multiple">
-                            </select>
-                        </div>
-                    </div>
-
-
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
-                    <button class="btn btn-primary"
-                            data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> Editing..."
-                            id="create_edit_user">Apply
-                    </button>
-
-                </div>
-            </form>
-        </div>
-        <!-- /.modal-content -->
-    </div>
-    <!-- /.modal-dialog -->
-</div>
diff --git a/userhandler/templates/modal/user_proj_role_edit.html b/userhandler/templates/modal/user_proj_role_edit.html
new file mode 100644 (file)
index 0000000..e1df9d5
--- /dev/null
@@ -0,0 +1,44 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<div class="modal" id="modal_edit_user_role_map" xmlns="http://www.w3.org/1999/html">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span></button>
+                <h4 class="modal-title">Edit Project Role Mapping</h4>
+            </div>
+            <form id="formEditUserRoleMap" action=""
+                  class="form-horizontal"
+                  method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <div class="modal-body" id="modal_edit_proj_role_map_body">
+                       
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">Cancel</button>
+                    <button class="btn btn-primary"
+                            data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i> Editing..."
+                            id="edit_user_map">Apply
+                    </button>
+
+                </div>
+            </form>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
index 99393b5..b287b76 100644 (file)
@@ -1,3 +1,18 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 {% extends "base.html" %}
 {% load get %}
 {% load date_tag %}
@@ -6,8 +21,8 @@
 
 {% block head_block %}
     {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -26,7 +41,9 @@
     {{ block.super }}
     {% include 'modal/user_details.html' %}
     {% include 'modal/user_create.html' %}
-    {% include 'modal/user_edit.html' %}
+    {% include 'modal/user_credentials_edit.html' %}
+    {% include 'modal/user_proj_role_edit.html' %}
+
 
     {% csrf_token %}
     <div class="row">
@@ -50,7 +67,6 @@
                         <thead>
                         <tr>
                             <th>Name</th>
-                            <th>Projects</th>
                             <th>Identifier</th>
                             <th>Modified</th>
                             <th>Created</th>
@@ -69,9 +85,9 @@
 
 {% block resource_block %}
     {{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
     <script src="/static/src/userhandler/user_list.js"></script>
     <script>
         var table;
                     },
                     {
                         "render": function (data, type, row) {
-                            return row['projects'];
-                        },
-                        "targets": 1
-                    },
-                    {
-                        "render": function (data, type, row) {
+                            
                             return row['_id'];
                         },
-                        "targets": 2
+                        "targets": 1
                     },
                     {
                         "render": function (data, type, row) {
                             return moment.unix(row["_admin"]['modified']).format('YYYY-MM-DD hh:mm:ss a');
                         },
-                        "targets": 3
+                        "targets": 2
                     },
                     {
                         "render": function (data, type, row) {
                             return moment.unix(row["_admin"]['created']).format('YYYY-MM-DD hh:mm:ss a');
                         },
-                        "targets": 4
+                        "targets": 3
                     },
                     {
                         "render": function (data, type, row) {
                                 'data-toggle="dropdown" aria-expanded="false">Actions ' +
                                 '<span class="fa fa-caret-down"></span></button> ' +
                                 '<ul class="dropdown-menu">' +
-                                '<li> <a href="#" onclick="javascript:openModalEditUser({user_id:\'' + row['_id'] + '\', usernarme:\'' + row['username'] + '\', projects: \'' + row['projects'] + '\'})">' +
-                                '<i class="fa fa-edit"></i> Edit</a></li>' +
+                                '<li> <a href="#" onclick="javascript:openModalEditUserCredentials({user_id:\'' + row['_id'] + '\', usernarme:\'' + row['username'] + '\'})">' +
+                                '<i class="fa fa-lock"></i>Edit Credentials</a></li>' +
+                                '<li> <a href="#" onclick="javascript:openModalEditUserRoleMap(\''+row['_id']+'\')">' +
+                                '<i class="fa fa-user-tag"></i>Projects-Roles</a></li>' +
                                 '<li> <a href="#" onclick="javascript:deleteUser(\'' + row['_id'] + '\', \'' + row['username'] + '\')"' +
                                 'style="color:red"><i class="fa fa-trash"></i> Delete</a></li> </ul></div>';
                         },
-                        "targets": 5,
+                        "targets": 4,
                         "orderable": false
                     }
                 ]
             });
-
+            /*
             var select2_groups = $('#projects_edit').select2({
                 placeholder: 'Select Projects',
                 width: '100%',
                         };
                     }
                 }
-            });
-
+            });*/
+            /*
             var select2_single = $('#default_project_edit').select2({
                 placeholder: 'Select Default Project',
                 width: '100%',
                         };
                     }
                 }
-            });
+            });*/
 
             setInterval(function () {
                 table.ajax.reload();
                     contentType: false,
                     processData: false
                 }).done(function (response, textStatus, jqXHR) {
-                    $('#modal_edit_user').modal('hide');
+                    $('#modal_edit_user_credentials').modal('hide');
                     table.ajax.reload();
                     bootbox.alert({
                         title: "Result",
                 });
             });
         
+            $("#password2").keyup(validatePswOnCreate);
+            $("#edit_password2").keyup(validatePswOnEdit);
+
+            $(document).on('click', '.proj-role-map-group-head .btn-add', addMapGroup);
+            $(document).on('click', '.proj-role-map-group .btn-remove', removeMapGroup);
         });
     </script>
 
index 4f38be8..25156f0 100644 (file)
@@ -20,6 +20,7 @@ from userhandler import views
 urlpatterns = [
     url(r'^list$', views.user_list, name='list'),
     url(r'^create$', views.create, name='create'),
+    url(r'^(?P<user_id>[-\w]+)/info', views.user_info, name='info'),
     url(r'^(?P<user_id>[-\w]+)$', views.update, name='update'),
     url(r'^(?P<user_id>[-\w]+)/delete$', views.delete, name='delete'),   
 
index 1703233..66fc22a 100644 (file)
@@ -31,19 +31,8 @@ def user_list(request):
     user = osmutils.get_user(request)
     client = Client()
     result = client.user_list(user.get_token())
-    result_projects = client.project_list(user.get_token())
-    p_map = {'admin': 'admin'}
-    for p in result_projects['data']:
-        p_map[p['_id']] = p['name']
-    users = result['data'] if result and result['error'] is False else []
-    for user in users:
-        user_project_ids = user['projects']
-        user_project_names = []
-        for p_id in user_project_ids:
-            if p_id in p_map:
-                user_project_names.append(p_map[p_id])
-        user['projects'] = user_project_names
 
+    users = result['data'] if result and result['error'] is False else []    
     result = {
         'users': result['data'] if result and result['error'] is False else []
     }
@@ -57,9 +46,9 @@ def create(request):
     client = Client()
     user_data ={
         "username": request.POST['username'],
-        "password": request.POST['password'],
-        "projects": request.POST.getlist('projects')
+        "password": request.POST['password']
     }
+    
     result = client.user_create(user.get_token(), user_data)
     if result['error']:
         return __response_handler(request, result['data'], url=None,
@@ -84,32 +73,41 @@ def delete(request, user_id=None):
         return __response_handler(request, {}, url=None, status=200)
 
 @login_required
-def update(request, user_id=None):
+def user_info(request, user_id=None):
     user = osmutils.get_user(request)
     try:
         client = Client()
-        projects_old = request.POST.get('projects_old').split(',')
-        projects_new = request.POST.getlist('projects')
-        default_project = request.POST.get('default_project')
-        projects_new.append(default_project)
-        projects_to_add = list(set(projects_new) - set(projects_old))
-        projects_to_remove = list(set(projects_old) - set(projects_new))
-
-        project_payload = {}
+        
+        info_res = client.get_user_info(user.get_token(), user_id)
+    except Exception as e:
+        log.exception(e)
+        info_res = {'error': True, 'data': str(e)}
+    if info_res['error']:
+        return __response_handler(request, info_res['data'], url=None,
+                                  status=info_res['data']['status'] if 'status' in info_res['data'] else 500)
+    else:
+        return __response_handler(request, info_res['data'], url=None, status=200)
 
-        for p in projects_to_remove:
-            project_payload["$"+str(p)] = None
-        for p in projects_to_add:
-            if p not in projects_old:
-                project_payload["$+"+str(p)] = str(p)
-        project_payload["$" + default_project] = None
-        project_payload["$+[0]"] = default_project
+@login_required
+def update(request, user_id=None):
+    user = osmutils.get_user(request)
+    try:
+        client = Client()
         payload = {}
-        if project_payload:
-            payload["projects"] = project_payload
+
         if request.POST.get('password') and request.POST.get('password') is not '':
             payload["password"] = request.POST.get('password')
 
+        if request.POST.getlist('map_project_name') and request.POST.getlist('map_role_name'):
+            project_param_name = request.POST.getlist('map_project_name')
+            role_param_ip = request.POST.getlist('map_role_name')
+            payload["project_role_mappings"] = []
+            for i, project in enumerate(project_param_name):
+                payload["project_role_mappings"].append({
+                    'project': project,
+                    'role': role_param_ip[i],
+                })
+        
         update_res = client.user_update(user.get_token(), user_id, payload)
     except Exception as e:
         log.exception(e)
@@ -119,7 +117,6 @@ def update(request, user_id=None):
                                   status=update_res['data']['status'] if 'status' in update_res['data'] else 500)
     else:
         return __response_handler(request, {}, url=None, status=200)
-        #return __response_handler(request, {}, 'users:list', to_redirect=True, )
 
 
 def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):
diff --git a/vimhandler/template/config/opennebula.html b/vimhandler/template/config/opennebula.html
new file mode 100644 (file)
index 0000000..da1a836
--- /dev/null
@@ -0,0 +1,49 @@
+<!--
+Copyright 2019 ETSI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<div id="opennebula_config_collapse" class="config-vim row">
+    <div class="col-lg-6">
+        <div class="row ">
+            <div class="form-group">
+                <label for="ov_sdn_ctrl" class="col-sm-4 control-label">SDN Controller</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="ov_sdn_ctrl" name="config_sdn_controller"
+                           placeholder="sdn_controller">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="form-group">
+                <label for="ov_sdn_port_map" class="col-sm-4 control-label">SDN Port Mapping</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="ov_sdn_port_map"
+                           name="config_sdn_port_mapping"
+                           placeholder="sdn_port_mapping">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="form-group">
+                <label for="ov_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="ov_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/vimhandler/template/config/opennebula_show.html b/vimhandler/template/config/opennebula_show.html
new file mode 100644 (file)
index 0000000..81408f9
--- /dev/null
@@ -0,0 +1,40 @@
+<!--
+Copyright 2019 ETSI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<div id="opennebula_config_collapse" class="config-vim row">
+
+    <div class="col-lg-6">
+        <div class="row ">
+
+            <label for="ov_sdn_ctrl" class="col-sm-4 control-label">SDN Controller</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="ov_sdn_ctrl"> {{ datacenter.sdn_ctrl|default:"---" }}</p>
+            </div>
+        </div>
+        <div class="row">
+            <label for="ov_sdn_port_map" class="col-sm-4 control-label">SDN Port Mapping</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="ov_sdn_port_map"> {{ datacenter.sdn_port_map|default:"---" }}</p>
+            </div>
+        </div>
+        <div class="row">
+            <label for="ov_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="ov_vim_network_name"> {{ datacenter.config.vim_network_name|default:"---" }}</p>
+            </div>
+        </div>
+    </div>
+</div>
index f7f91a2..caf32b7 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 ETSI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -59,6 +75,7 @@
                                                 <option value="openstack">Openstack</option>
                                                 <option value="vmware">VMware vCD</option>
                                                 <option value="aws">AWS</option>
+                                                <option value="opennebula">OpenNebula</option>
                                             </select>
                                         </div>
                                     </div>
                                 {% include 'config/openstack.html' %}
                                 {% include 'config/vmware.html' %}
                                 {% include 'config/aws.html' %}
+                                {% include 'config/opennebula.html' %}
 
                                 <div class="row">
                                     <div class="col-lg-6">
index ba38f64..b7bc224 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 ETSI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -5,7 +21,7 @@
 
 {% block head_block %}
     {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -62,8 +78,8 @@
 
 {% block resource_block %}
     {{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
     <script>
     $(document).ready( function () {
         var table = $('#vims_table').DataTable({
index d16fb7e..2a0d07e 100644 (file)
@@ -94,7 +94,6 @@ def show(request, vim_id=None):
     project_id = user.project_id
     client = Client()
     result = client.vim_get(user.get_token(), vim_id)
-    print result
     if isinstance(result, dict) and 'error' in result and result['error']:
         return render(request, 'error.html')
 
index 9a07c0f..a6faf2d 100644 (file)
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 ETSI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load staticfiles %}
@@ -5,7 +21,7 @@
 
 {% block head_block %}
     {{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -66,8 +82,8 @@
 
 {% block resource_block %}
     {{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
     <script>
     $(document).ready( function () {
         var table = $('#wims_table').DataTable({