chg: [AIL logo UI]

install_virtualenv.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# halt on errors
+set -e
+
+## bash debug mode togle below
+#set -x
+
+if [ -z "$VIRTUAL_ENV" ]; then
+
+    virtualenv -p python3 AILENV
+
+    echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate
+    echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate
+    echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate
+    echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate
+    echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate
+
+    . ./AILENV/bin/activate
+
+fi
+
+pip3 install -U pip
+pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client'
+pip3 install -U -r requirements.txt
+
+# Pyfaup
+pushd faup/src/lib/bindings/python/
+python3 setup.py install
+popd
+
+# Py tlsh
+pushd tlsh/py_ext
+python3 setup.py build
+python3 setup.py install
+
+# Download the necessary NLTK corpora and sentiment vader
+HOME=$(pwd) python3 -m textblob.download_corpora
+python3 -m nltk.downloader vader_lexicon
+python3 -m nltk.downloader punkt
+popd
+
+pushd ${AIL_FLASK}
+./update_thirdparty.sh
+popd

installing_deps.sh

@@ -85,19 +85,9 @@ if [ ! -f configs/core.cfg ]; then
     cp configs/core.cfg.sample configs/core.cfg
 fi
 
-if [ -z "$VIRTUAL_ENV" ]; then
+# create AILENV + intall python packages
+./install_virtualenv.sh
 
-    virtualenv -p python3 AILENV
-
-    echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate
-    echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate
-    echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate
-    echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate
-    echo export AIL_ARDB=$(pwd)/ardb/src/ >> ./AILENV/bin/activate
-
-    . ./AILENV/bin/activate
-
-fi
 
 pushd ${AIL_BIN}helper/gen_cert
 ./gen_root.sh
@@ -109,32 +99,8 @@ popd
 cp ${AIL_BIN}helper/gen_cert/server.crt ${AIL_FLASK}server.crt
 cp ${AIL_BIN}helper/gen_cert/server.key ${AIL_FLASK}server.key
 
-pushd ${AIL_FLASK}
-./update_thirdparty.sh
-popd
-
 mkdir -p $AIL_HOME/PASTES
 
-pip3 install -U pip
-pip3 install 'git+https://github.com/D4-project/BGP-Ranking.git/@7e698f87366e6f99b4d0d11852737db28e3ddc62#egg=pybgpranking&subdirectory=client'
-pip3 install -U -r requirements.txt
-
-# Pyfaup
-pushd faup/src/lib/bindings/python/
-python3 setup.py install
-popd
-
-# Py tlsh
-pushd tlsh/py_ext
-python3 setup.py build
-python3 setup.py install
-
-# Download the necessary NLTK corpora and sentiment vader
-HOME=$(pwd) python3 -m textblob.download_corpora
-python3 -m nltk.downloader vader_lexicon
-python3 -m nltk.downloader punkt
-popd
-
 #Create the file all_module and update the graph in doc
 $AIL_HOME/doc/generate_modules_data_flow_graph.sh
 

var/www/templates/change_password.html

@@ -62,7 +62,7 @@
 
 
 				<form class="form-signin" action="{{ url_for('root.change_password')}}" autocomplete="off" method="post">
-		      <img class="mb-4" src="{{ url_for('static', filename='image/AIL-logo.png')}}" width="300">
+		      <img class="mb-4" src="{{ url_for('static', filename='image/ail-project.png')}}" width="300">
 		      <h1 class="h3 mb-3 text-secondary">Change Password</h1>
 		      <label for="inputPassword1" class="sr-only">Password</label>
 		      <input type="password" id="inputPassword1" name="password1" class="form-control {% if error %}is-invalid{% endif %}" placeholder="Password" autocomplete="new-password" required autofocus>

var/www/templates/login.html

@@ -67,7 +67,7 @@
 
 
 				<form class="form-signin" action="{{ url_for('root.login')}}"  method="post">
-		      <img class="mb-4" src="{{ url_for('static', filename='image/AIL-logo.png')}}" width="300">
+		      <img class="mb-4" src="{{ url_for('static', filename='image/ail-project.png')}}" width="300">
 		      <h1 class="h3 mb-3 text-secondary">Please sign in</h1>
 		      <label for="inputEmail" class="sr-only">Email address</label>
 		      <input type="email" id="inputEmail" name="username" class="form-control" placeholder="Email address" required autofocus>

var/www/templates/nav_bar.html

@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-xl navbar-dark bg-dark">
   <a class="navbar-brand" href="{{ url_for('dashboard.index') }}">
-    <img src="{{ url_for('static', filename='image/ail-icon.png')}}" alt="AIL" style="width:80px;">
+    <img src="{{ url_for('static', filename='image/ail-project-inverted.png')}}" alt="AIL" style="width:80px;">
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>

var/www/templates/navbar.html

@@ -12,7 +12,7 @@
                <!-- /#side-menu -->
            </div>
            <!-- /.sidebar-collapse -->
-        <a  href="{{ url_for('dashboard.index') }}"><img src="{{ url_for('static', filename='image/AIL.png') }}" /></a>
+        <a  href="{{ url_for('dashboard.index') }}"><img src="{{ url_for('static', filename='image/ail-project.png') }}" style="width:200px;"/></a>
        </div>
        <!-- /.navbar-static-side -->
   </div>