Merge pull request #90 from PDXFinder/beta

Beta
PDCMFinder · Sep 20, 2019 · a9e56dd · a9e56dd
2 parents 3dae51b + f610694
commit a9e56dd
Show file tree

Hide file tree

Showing 223 changed files with 15,505 additions and 7,601 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*/target/
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -14,4 +15,4 @@ hs_err_pid*
 *.iml
 
 node_modules
-/admin/src/main/resources/
+/admin/src/main/resources/static
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: java
 sudo: false
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 script: mvn clean package
 

diff --git a/admin/src/main/app-ui/angular.json b/admin/src/main/app-ui/angular.json
@@ -28,23 +28,28 @@
               "src/pdxfinder/pattern-library/bootstrap.min.css",
               "src/pdxfinder/pattern-library/datatables.min.css",
               "src/pdxfinder/pattern-library/style.css",
+              "src/pdxfinder/pattern-library/autocomplete/autocomplete.css",
               "src/pdxfinder/pattern-library/themify/themify-icons.css",
               "src/pdxfinder/pattern-library/themify/ie7/ie7.css",
               "src/pdxfinder/pattern-library/animate.css",
-              "src/pdxfinder/dependencies/chart/export.css"
+              "src/pdxfinder/dependencies/chart/export.css",
+              "src/pdxfinder/pattern-library/alert/sweetalert2.css"
             ],
             "scripts": [
               "src/pdxfinder/dependencies/jquery-2.1.1.js",
               "src/pdxfinder/dependencies/bootstrap.min.js",
+              "src/pdxfinder/dependencies/fab.js",
               "src/pdxfinder/dependencies/datatables.min.js",
               "src/pdxfinder/dependencies/plugins/metisMenu/jquery.metisMenu.js",
               "src/pdxfinder/dependencies/plugins/slimscroll/jquery.slimscroll.min.js",
               "src/pdxfinder/dependencies/pdxAdmin.js",
               "src/pdxfinder/dependencies/chart/amcharts.js",
+              "src/pdxfinder/dependencies/autocomplete/autocomplete.min.js",
               "src/pdxfinder/dependencies/chart/serial.js",
               "src/pdxfinder/dependencies/chart/export.min.js",
               "src/pdxfinder/dependencies/chart/light.js",
-              "src/pdxfinder/dependencies/chart/3dbar.js"
+              "src/pdxfinder/dependencies/chart/3dbar.js",
+              "src/pdxfinder/dependencies/alert/sweetalert2.min.js"
             ]
           },
           "configurations": {