Skip to content

Commit b23683d

Browse files
TerrtiaTerrtia
committed
chg: [thirdparties] remove sb-admin + debug #194 
1 parent dddc691 commit b23683d

File tree

9 files changed

+35
-56
lines changed

9 files changed

+35
-56
lines changed

‎install_virtualenv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# halt on errors
44
set -e
55

6-
## bash debug mode togle below
6+
## bash debug mode toggle below
77
#set -x
88

99
if [ -z "$VIRTUAL_ENV" ]; then

‎var/www/modules/search/templates/search.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<!-- Core CSS -->
1212
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
1313
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
14-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
1514
<link href="{{ url_for('static', filename='css/dygraph_gallery.css') }}" rel="stylesheet" type="text/css" />
1615
<link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
1716
<!-- JS -->
@@ -126,7 +125,7 @@
126125
</div>
127126
<!-- /#page-wrapper -->
128127
</div>
129-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
128+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
130129
</br>
131130
</body>
132131

‎var/www/modules/sentiment/templates/sentiment_analysis_plot_tool.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
<!-- Core CSS -->
1212
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
1313
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
14-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
1514
<link href="{{ url_for('static', filename='css/dataTables.bootstrap.css') }}" rel="stylesheet" type="text/css" />
1615
<link href="{{ url_for('static', filename='css/jquery-ui.min.css') }}" rel="stylesheet" type="text/css" />
1716
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
18-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
17+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
1918
<script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
2019
<script src="{{ url_for('static', filename='js/dataTables.bootstrap.js') }}"></script>
2120
<script src="{{ url_for('static', filename='js/jquery-ui.min.js') }}"></script>

‎var/www/modules/sentiment/templates/sentiment_analysis_trending.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<!-- Core CSS -->
1212
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
1313
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
14-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
1514
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
16-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
15+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
1716
<script src="{{ url_for('static', filename='js/FlexGauge.js') }}"></script>
1817
<script src="{{ url_for('static', filename='js/jquery.sparkline.min.js') }}"></script>
1918
<script src="{{ url_for('static', filename='js/jquery.canvasjs.min.js') }}"></script>

‎var/www/modules/trendingcharts/templates/Trending.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<!-- Core CSS -->
1616
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
1717
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
18-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
1918
<link href="{{ url_for('static', filename='css/dygraph_gallery.css') }}" rel="stylesheet" type="text/css" />
2019
<!-- JS -->
2120
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
@@ -149,7 +148,7 @@ <h1 class="page-header" data-page="page-trendingchart">Trending charts</h1>
149148
</script>
150149

151150
</div>
152-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
151+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
153152
</body>
154153

155154
</html>

‎var/www/modules/trendingmodules/templates/Moduletrending.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<!-- Core CSS -->
1212
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
1313
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
14-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
1514
<link href="{{ url_for('static', filename='css/dygraph_gallery.css') }}" rel="stylesheet" type="text/css" />
1615
<!-- JS -->
1716
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
@@ -68,7 +67,7 @@
6867
</script>
6968

7069
</div>
71-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
70+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
7271
</body>
7372

7473
</html>

‎var/www/templates/base_template.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,11 @@
88
<title>Analysis Information Leak framework Dashboard</title>
99

1010
<!-- Core CSS -->
11-
<link href="{{ url_for('static', filename='css/bootstrap.min.css') }}" rel="stylesheet">
11+
<link href="{{ url_for('static', filename='css/bootstrap4.min.css') }}" rel="stylesheet">
1212
<link href="{{ url_for('static', filename='font-awesome/css/font-awesome.css') }}" rel="stylesheet">
13-
<link href="{{ url_for('static', filename='css/sb-admin-2.css') }}" rel="stylesheet">
14-
<link href="{{ url_for('static', filename='css/dygraph_gallery.css') }}" rel="stylesheet" type="text/css" />
1513
<!-- JS -->
16-
<script type="text/javascript" src="{{ url_for('static', filename='js/dygraph-combined.js') }}"></script>
14+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
1715
<script language="javascript" src="{{ url_for('static', filename='js/jquery.js')}}"></script>
18-
<script src="{{ url_for('static', filename='js/jquery.flot.js') }}"></script>
19-
<script src="{{ url_for('static', filename='js/jquery.flot.pie.js') }}"></script>
20-
<script src="{{ url_for('static', filename='js/jquery.flot.time.js') }}"></script>
2116

2217
</head>
2318
<body>
@@ -42,7 +37,6 @@ <h1 class="page-header" data-page="page-termsfrequency" >MODULENAME</h1>
4237
$("#"+activePage).addClass("active");
4338
});
4439
</script>
45-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
4640
</body>
4741

4842
</html>

‎var/www/templates/objects/item/show_item_min.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link href="{{ url_for('static', filename='css/dataTables.bootstrap4.min.css') }}" rel="stylesheet">
1212

1313
<script src="{{ url_for('static', filename='js/jquery.js')}}"></script>
14-
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
14+
<script src="{{ url_for('static', filename='js/bootstrap4.min.js') }}"></script>
1515
<script src="{{ url_for('static', filename='js/jquery.dataTables.min.js') }}"></script>
1616
<script src="{{ url_for('static', filename='js/dataTables.bootstrap.min.js') }}"></script>
1717

‎var/www/update_thirdparty.sh

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
11
#!/bin/bash
22

3-
set -e
3+
# set -e
44

55
# submodules
66
git submodule update
77

88
wget -q http://dygraphs.com/dygraph-combined.js -O ./static/js/dygraph-combined.js
99

10-
SBADMIN_VERSION='3.3.7'
1110
BOOTSTRAP_VERSION='4.2.1'
1211
FONT_AWESOME_VERSION='5.7.1'
1312
D3_JS_VERSION='5.5.0'
1413

1514
rm -rf temp
1615
mkdir temp
1716

18-
wget -q https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip -O temp/bootstrap${BOOTSTRAP_VERSION}.zip
19-
wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}.zip
20-
wget -q https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v${SBADMIN_VERSION}.zip -O temp/${SBADMIN_VERSION}-2.zip
21-
wget -q https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip -O temp/FONT_AWESOME_4.7.0.zip
22-
wget -q https://github.com/FortAwesome/Font-Awesome/archive/5.7.1.zip -O temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip
23-
wget -q https://github.com/d3/d3/releases/download/v${D3_JS_VERSION}/d3.zip -O temp/d3_${D3_JS_VERSION}.zip
17+
wget https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip -O temp/bootstrap${BOOTSTRAP_VERSION}.zip
18+
wget https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip -O temp/FONT_AWESOME_4.7.0.zip
19+
wget https://github.com/FortAwesome/Font-Awesome/archive/5.7.1.zip -O temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip
20+
wget https://github.com/d3/d3/releases/download/v${D3_JS_VERSION}/d3.zip -O temp/d3_${D3_JS_VERSION}.zip
2421

2522
# dateRangePicker
26-
wget -q https://github.com/moment/moment/archive/2.24.0.zip -O temp/moment.zip
27-
wget -q https://github.com/longbill/jquery-date-range-picker/archive/v0.20.0.zip -O temp/daterangepicker.zip
23+
wget https://github.com/moment/moment/archive/2.24.0.zip -O temp/moment.zip
24+
wget https://github.com/longbill/jquery-date-range-picker/archive/v0.20.0.zip -O temp/daterangepicker.zip
2825

2926
unzip -qq temp/bootstrap${BOOTSTRAP_VERSION}.zip -d temp/
30-
unzip -qq temp/${SBADMIN_VERSION}.zip -d temp/
31-
unzip -qq temp/${SBADMIN_VERSION}-2.zip -d temp/
3227
unzip -qq temp/FONT_AWESOME_4.7.0.zip -d temp/
3328
unzip -qq temp/FONT_AWESOME_${FONT_AWESOME_VERSION}.zip -d temp/
3429
unzip -qq temp/d3_${D3_JS_VERSION}.zip -d temp/
@@ -41,59 +36,54 @@ mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/js/bootstrap.min.js.map ./static/js/
4136
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/css/bootstrap.min.css ./static/css/bootstrap4.min.css
4237
mv temp/bootstrap-${BOOTSTRAP_VERSION}-dist/css/bootstrap.min.css.map ./static/css/bootstrap4.min.css.map
4338

44-
mv temp/startbootstrap-sb-admin-${SBADMIN_VERSION} temp/sb-admin
45-
mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION} temp/sb-admin-2
4639
mv temp/Font-Awesome-4.7.0 temp/font-awesome
4740

4841
rm -rf ./static/webfonts/
4942
mv temp/Font-Awesome-${FONT_AWESOME_VERSION}/css/all.min.css ./static/css/font-awesome.min.css
5043
mv temp/Font-Awesome-${FONT_AWESOME_VERSION}/webfonts ./static/webfonts
5144

5245
rm -rf ./static/js/plugins
53-
mv temp/sb-admin/js/* ./static/js/
5446

5547
rm -rf ./static/fonts/ ./static/font-awesome/
56-
mv temp/sb-admin/fonts/ ./static/
5748
mv temp/font-awesome/ ./static/
5849

5950
rm -rf ./static/css/plugins/
60-
mv temp/sb-admin/css/* ./static/css/
61-
mv temp/sb-admin-2/dist/css/* ./static/css/
6251
mv temp/jquery-date-range-picker-0.20.0/dist/daterangepicker.min.css ./static/css/
6352

6453
mv temp/d3.min.js ./static/js/
6554
mv temp/moment-2.24.0/min/moment.min.js ./static/js/
6655
mv temp/jquery-date-range-picker-0.20.0/dist/jquery.daterangepicker.min.js ./static/js/
6756

6857
JQVERSION="3.4.1"
69-
wget -q http://code.jquery.com/jquery-${JQVERSION}.js -O ./static/js/jquery.js
58+
wget http://code.jquery.com/jquery-${JQVERSION}.js -O ./static/js/jquery.js
7059

7160
#Ressources for dataTable
72-
wget -q https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js
73-
wget -q https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css
74-
wget -q https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js
61+
wget https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js -O ./static/js/jquery.dataTables.min.js
62+
wget https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.css -O ./static/css/dataTables.bootstrap.css
63+
wget https://cdn.datatables.net/plug-ins/1.10.20/integration/bootstrap/3/dataTables.bootstrap.js -O ./static/js/dataTables.bootstrap.js
7564

76-
wget -q https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css
77-
wget -q https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js
65+
wget https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.min.css -O ./static/css/dataTables.bootstrap.min.css
66+
wget https://cdn.datatables.net/1.10.20/js/dataTables.bootstrap4.min.js -O ./static/js/dataTables.bootstrap.min.js
7867

7968
#Ressources for bootstrap popover
8069
POPPER_VERSION="1.16.1"
81-
wget -q https://github.com/FezVrasta/popper.js/archive/v${POPPER_VERSION}.zip -O temp/popper.zip
70+
wget https://github.com/FezVrasta/popper.js/archive/v${POPPER_VERSION}.zip -O temp/popper.zip
8271
unzip -qq temp/popper.zip -d temp/
8372
mv temp/floating-ui-${POPPER_VERSION}/dist/umd/popper.min.js ./static/js/
8473
mv temp/floating-ui-${POPPER_VERSION}/dist/umd/popper.min.js.map ./static/js/
8574

8675
#Ressource for graph
87-
wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.js -O ./static/js/jquery.flot.js
88-
wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.pie.js -O ./static/js/jquery.flot.pie.js
89-
wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.time.js -O ./static/js/jquery.flot.time.js
90-
wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.stack.js -O ./static/js/jquery.flot.stack.js
76+
# DASHBOARD # TODO REFACTOR DASHBOARD GRAPHS
77+
wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.js -O ./static/js/jquery.flot.js
78+
wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.pie.js -O ./static/js/jquery.flot.pie.js
79+
wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.time.js -O ./static/js/jquery.flot.time.js
80+
wget https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb6109df5c1e8003/jquery.flot.stack.js -O ./static/js/jquery.flot.stack.js
9181

9282
#Ressources for sparkline and canvasJS and slider
93-
wget -q http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js
94-
wget -q https://canvasjs.com/assets/script/canvasjs.min.js -O ./static/js/jquery.canvasjs.min.js
83+
#wget http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js
84+
#wget https://canvasjs.com/assets/script/canvasjs.min.js -O ./static/js/jquery.canvasjs.min.js
9585

96-
wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip -O temp/jquery-ui.zip
86+
wget https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip -O temp/jquery-ui.zip
9787
unzip -qq temp/jquery-ui.zip -d temp/
9888
mv temp/jquery-ui-1.12.1/jquery-ui.min.js ./static/js/jquery-ui.min.js
9989
mv temp/jquery-ui-1.12.1/jquery-ui.min.css ./static/css/jquery-ui.min.css
@@ -126,11 +116,11 @@ then
126116
fi
127117

128118
#Update MISP Taxonomies and Galaxies
129-
pip3 install git+https://github.com/MISP/PyTaxonomies --upgrade
130-
pip3 install git+https://github.com/MISP/PyMISPGalaxies --upgrade
119+
pip3 install git+https://github.com/MISP/PyTaxonomies --upgrade # TODO move to requirement
120+
pip3 install git+https://github.com/MISP/PyMISPGalaxies --upgrade # TODO move to requirement
131121

132122
#Update PyMISP
133-
pip3 install git+https://github.com/MISP/PyMISP --upgrade
123+
pip3 install pymisp --upgrade
134124

135125
#Update the Hive
136-
pip3 install thehive4py --upgrade
126+
pip3 install thehive4py --upgrade # TODO move to requirement

0 commit comments

Comments
 (0)