Merge pull request #52 from ligangty/main

Organize the folder structure

src/main/webui/assets.js

@@ -20,7 +20,7 @@ const CSS = [
   'node_modules/ng-dialog/css/ngDialog-theme-default.css',
   'node_modules/bootstrap/dist/css/bootstrap.min.css',
   'node_modules/bootstrap/dist/css/bootstrap-theme.min.css',  
-  {"from":"app/css/", "to":"css/"}
+  {"from":"src/app/css/", "to":"css/"}
 ];
 const JS = [
   'node_modules/angular/angular.min.js',
@@ -30,19 +30,15 @@ const JS = [
   'node_modules/ng-dialog/js/ngDialog.min.js',
   'node_modules/jquery/dist/jquery.min.js',
   'node_modules/bootstrap/dist/js/bootstrap.min.js',  
-  {"from":"app/js/", "to":"js/"}
+  {"from":"src/app/js/", "to":"js/"}
 ];
 const IMG=[  
-  {"from":"app/img/", "to":"img/"}
+  {"from":"src/app/img/", "to":"img/"}
 ];
-// const SWAGGER=[
-//   'node_modules/swagger-ui-dist/',
-//   {"from":"app/rest-api.html", "to":"rest-api.html"}
-// ];
 const OTHER=[
-  {"from":"app/index.html", "to":"index.html"},
-  {"from":"app/partials/", "to":"partials/"},
-  {"from":"app/keycloak.json", "to":"keycloak.json"}
+  {"from":"src/app/index.html", "to":"index.html"},
+  {"from":"src/app/partials/", "to":"partials/"},
+  {"from":"src/app/keycloak.json", "to":"keycloak.json"}
 ]
 
 module.exports = [...JS, ...CSS, ...IMG, ...OTHER];

src/main/webui/package.json

@@ -46,10 +46,7 @@
     "webpack": "node node_modules/webpack/bin/webpack.js --openssl-legacy-provider",
     "compile": "NODE_ENV=production webpack --config ./webpack.config.js --progress && webpack --config ./webpack-content-browse.prod.config.js --progress",
     "clean": "rm -rf ./dist",
-    "build": "npm run-script clean && npm run-script compile && cp ./content-browse/src/main/html/* ./dist/content-browse/ && rm ./dist/indy.bundle.js",
-    "start": "http-server ./dist -a localhost -p 8000",
-    "update-webdriver": "webdriver-manager update",
-    "preprotractor": "npm run update-webdriver",
-    "protractor": "protractor test/protractor-conf.js"
+    "build": "npm run-script clean && npm run-script compile && cp ./src/content-browse/html/* ./dist/content-browse/ && rm ./dist/indy.bundle.js",
+    "start": "http-server ./dist -a localhost -p 8000"
   }
 }

src/main/webui/webpack-content-browse.dev.config.js

@@ -17,7 +17,7 @@ const path = require('path')
 const webpack = require('webpack')
 
 module.exports = {
-  entry: './content-browse/src/main/js/index.js',
+  entry: './src/content-browse/index.js',
   output: {
     path: path.resolve(__dirname, 'dist/content-browse'),
     filename: 'app_bundle.js'

src/main/webui/webpack-content-browse.prod.config.js

@@ -18,7 +18,7 @@ const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = {
-  entry: './content-browse/src/main/js/index.js',
+  entry: './src/content-browse/index.js',
   output: {
     path: path.resolve(__dirname, './dist/content-browse'),
     filename: 'app_bundle.js'

src/main/webui/webpack.config.js

@@ -21,7 +21,7 @@ const Assets = require('./assets');
 module.exports = 
 {
     "mode": "production",
-    "entry": "./app/index.js",
+    "entry": "./src/app/index.js",
     "output": {
         "path": path.resolve(__dirname, 'dist'),
         "filename": "indy.bundle.js"