Merge branch 'bootstrap' & modify import function

Author: FLX-0x00

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[package.json]
+indent_size = 2
+
+[bower.json]
+indent_size = 2
+
+[*.{css,scss,sass,less}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -44,3 +44,4 @@ config/secret
 /report-templates/*
 
 **/.envizon_secret.env
+docker/*/envizon_backup

Gemfile

@@ -31,15 +31,13 @@ gem 'jbuilder', '~> 2.5'
 gem 'ruby-nmap', git: 'https://github.com/sophsec/ruby-nmap.git'
 gem 'ipaddress', git: 'https://github.com/ipaddress-gem/ipaddress.git'
 
-# Icon-Pack
-# Use Material Icons directly without gem. Gem maintailer not update the gem frequently
-# gem 'material_icons', git: 'https://github.com/Angelmmiguel/material_icons'
+# psych > 4 needed
+gem 'psych', '~> 4.0', '>= 4.0.1'
 
 # Login
 gem 'devise'
 
 # Form
-gem 'materialize-form'
 gem 'simple_form'
 
 # fix multipart upload not rendering js
@@ -50,7 +48,10 @@ gem 'remotipart'
 gem 'font_awesome5_rails'
 gem 'jquery-datatables-rails'
 gem 'jquery-ui-rails'
-gem 'materialize-sass'
+gem 'toastr_rails'
+
+# bootstrap
+gem 'bootstrap', git:"https://github.com/twbs/bootstrap-rubygem"
 
 # diff
 gem 'diffy'
@@ -68,8 +69,6 @@ gem 'e2mmap'
 gem 'thwait'
 
 # db import/export
-gem 'activerecord-import'
-gem 'yaml_db', git: 'https://github.com/evs-ch/yaml_db.git'
 gem 'mysql2'
 
 # zip

Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/evs-ch/yaml_db.git
-  revision: 8a859574f673fcaacca9dcd859cf8a0c5cc92fa4
-  specs:
-    yaml_db (0.7.1)
-      rails (>= 3.0)
-      rake (>= 0.8.7)
-
 GIT
   remote: https://github.com/evs-ch/yard-restful.git
   revision: 5f797a3dd1b85355e8031d7c246700f30252691e
@@ -27,6 +19,15 @@ GIT
       nokogiri (~> 1.3)
       rprogram (~> 0.3)
 
+GIT
+  remote: https://github.com/twbs/bootstrap-rubygem
+  revision: c702c4dc732f44116e36837baffdf2efef4330f4
+  specs:
+    bootstrap (5.0.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.9.2, < 3)
+      sassc-rails (>= 2.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -62,8 +63,6 @@ GEM
       activemodel (= 5.2.6)
       activesupport (= 5.2.6)
       arel (>= 9.0)
-    activerecord-import (1.0.8)
-      activerecord (>= 3.2)
     activestorage (5.2.6)
       actionpack (= 5.2.6)
       activerecord (= 5.2.6)
@@ -77,15 +76,15 @@ GEM
     ansi (1.5.0)
     arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.2.5.0)
-      execjs (< 2.8.0)
+    autoprefixer-rails (10.2.5.1)
+      execjs (> 0)
     axlsx (1.3.6)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.4.1)
       rubyzip (>= 0.9.5)
     bcrypt (3.1.16)
     bindex (0.8.1)
-    brakeman (5.0.1)
+    brakeman (5.0.4)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (2.18.0)
@@ -107,7 +106,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     crass (1.0.6)
     descendants_tracker (0.0.4)
@@ -122,10 +121,10 @@ GEM
     e2mmap (0.1.0)
     erubi (1.10.0)
     erubis (2.7.0)
-    execjs (2.7.0)
+    execjs (2.8.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.0)
+    ffi (1.15.1)
     font_awesome5_rails (1.4.0)
       railties (>= 4.2)
     git (1.8.1)
@@ -192,20 +191,16 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.9.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.1)
-    materialize-form (1.0.8)
-    materialize-sass (1.0.0)
-      autoprefixer-rails (>= 6.0.3)
     method_source (1.0.0)
     mime-types (2.99.3)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.5.1)
     minitest (5.14.4)
     minitest-rails (5.2.0)
       minitest (~> 5.10)
@@ -220,8 +215,7 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -234,12 +228,13 @@ GEM
     parser (3.0.1.1)
       ast (~> 2.4.1)
     pg (0.21.0)
+    popper_js (2.9.2)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    psych (3.3.1)
+    psych (4.0.1)
     puma (4.3.8)
       nio4r (~> 2.0)
     racc (1.5.2)
@@ -292,7 +287,7 @@ GEM
     rchardet (1.8.0)
     rdoc (6.3.1)
     redcarpet (3.5.1)
-    redis (4.2.5)
+    redis (4.3.1)
     regexp_parser (2.1.1)
     reline (0.2.5)
       io-console (~> 0.5)
@@ -303,16 +298,16 @@ GEM
       railties (>= 5.0)
     rexml (3.2.5)
     rprogram (0.3.2)
-    rubocop (1.14.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-graphviz (1.2.5)
       rexml
@@ -335,11 +330,19 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     semver2 (3.4.2)
-    sexp_processor (4.15.2)
+    sexp_processor (4.15.3)
     sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -363,6 +366,7 @@ GEM
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
+    toastr_rails (2.1.3)
     trestle (0.9.5)
       activemodel (>= 4.2.0)
       kaminari (>= 1.1.0)
@@ -385,7 +389,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -395,11 +399,11 @@ GEM
       rubyzip (>= 1.0.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
-  activerecord-import
   axlsx
+  bootstrap!
   brakeman
   byebug
   capybara (~> 2.13)
@@ -417,15 +421,14 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   listen (>= 3.0.5, < 3.2)
-  materialize-form
-  materialize-sass
   mini_magick
   minitest-rails
   minitest-reporters
   mysql2
   pg (~> 0.18)
   pry
   pry-rails
+  psych (~> 4.0, >= 4.0.1)
   puma (~> 4.3)
   railroady
   rails (~> 5.2.4)
@@ -445,16 +448,16 @@ DEPENDENCIES
   spring
   spring-watcher-listen (~> 2.0.0)
   thwait
+  toastr_rails
   trestle
   trestle-auth
   trestle-search
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console
-  yaml_db!
   yard (>= 0.9.12)
   yard-restful!
   zip-zip
 
 BUNDLED WITH
-   2.1.4
+   2.2.6