.

package.json

@@ -5,12 +5,12 @@
 	"description": "OM-Link Engine",
 	"author": "Open Mind",
 	"scripts": {
-		"Clean": "shx rm -rf tmp node_modules src_minified Site.log cfg/*.old ui/dist/* ui/masterpage.tpl fbtpl",
+		"Clean": "shx --silent rm -rf deploy.tar.gz tmp node_modules src_minified Site.log cfg/*.old ui/masterpage.tpl fbtpl",
 		"Install": "npm install",
 		"Build DEV": "webpack --mode=none --config webpack.config.js --display-error-details",
 		"Build PROD": "webpack --mode=production --config webpack.config.js --display-error-details",
 		"Watch": "webpack --config webpack.config.js --display-error-details --watch",
-		"Deploy": "zip -x ui/css/* ui/js/* -9 -r deploy.zip omlink.sql lib cfg/config.bin cfg/labels.ini index.php bundle.* src_minified ui"
+		"Deploy": "tar -zcvf deploy.tar.gz --exclude masterpage_template.tpl --exclude node_modules assets lib src ui/*.tpl index.php *.sql cfg"
 	},
 	"devDependencies": {
 		"acorn": "^6.1.1",
@@ -26,11 +26,11 @@
 		"terser": "^3.17.0",
 		"url-loader": "^1.1.2",
 		"webpack": "^4.30.0",
-		"webpack-cli": "^3.3.1"
+		"webpack-cli": "^3.3.2"
 	},
 	"dependencies": {
 		"bootstrap": "^4.3.1",
-		"jquery": "^3.4.0",
+		"jquery": "^3.4.1",
 		"popper.js": "^1.15.0"
 	}
 }

src/OpenMind/Admin/build.css.list

@@ -1,17 +0,0 @@
-; DataTables
-ui/assets/plugins/datatables/dataTables.bootstrap4.min.css
-
-; Responsive datatable
-ui/assets/plugins/datatables/responsive.bootstrap4.min.css
-
-; Multi Item Selection
-ui/assets/plugins/datatables/select.bootstrap4.min.css
-
-; Toastr
-ui/assets/plugins/toastr/toastr.min.css
-
-; App CSS
-ui/assets/css/bootstrap.min.css
-ui/assets/css/icons.css
-ui/assets/css/style.css
-ui/assets/build/admin.min.css

src/OpenMind/Admin/build.js

@@ -1,81 +0,0 @@
-const BUILD_PATH = 'ui/assets/build';
-const MAIN_SCSS_PATH = 'ui/assets/css/admin.scss';
-
-const MODULES_PATH = '../../../node_modules';
-const compressor = require(`${MODULES_PATH}/node-minify`);
-const sass = require(`${MODULES_PATH}/node-sass`);
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Functions
- */
-
-/**
- * Convert each line of text file into item array
- *
- * @param listFileName
- * @returns {string[]}
- */
-function LoadListIntoArray(listFileName) {
-	// Split every line into array
-	let listTemp = fs.readFileSync(listFileName).toString().split("\n");
-
-	// Clean array:
-	let listRet = listTemp.filter((x) => {
-		// remove all comments start with ';' and empty lines ('\r')
-		return x.replace(/^;.*/, '').replace('\r', '').length > 0
-	}).map((d) => {
-		return d.replace('\r', '')
-	});
-
-	return listRet;
-}
-
-/**
- * MAIN
- */
-
-if (!fs.existsSync(BUILD_PATH)) {
-	console.log(`Create folder ${BUILD_PATH}`);
-	fs.mkdirSync(BUILD_PATH);
-}
-
-let libList = LoadListIntoArray('build.js.list');
-let cssList = LoadListIntoArray('build.css.list');
-
-/**
- * CSS
- */
-
-// Compile SCSS
-console.log('Compiling SCSS');
-let buffer = sass.renderSync({file: MAIN_SCSS_PATH});
-// Write to file CSS
-fs.writeFileSync(`${BUILD_PATH}/admin.min.css`, buffer.css);
-
-//Concatenate all CSS in one MIN.CSS file
-console.log('Bundle CSS');
-compressor.minify({
-		compressor: 'clean-css',
-		input: cssList,
-		output: `${BUILD_PATH}/bundle.min.css`
-	}
-);
-
-/**
- * JS
- */
-
-// Minify+Concatenate JS files it in one file
-console.log('Bundle JS');
-compressor.minify({
-		compressor: 'terser',
-		input: libList,
-		output: `${BUILD_PATH}/bundle.min.js`
-	}
-);
-
-fs.unlinkSync(`${BUILD_PATH}/admin.min.css`);
-
-console.log('All done.');

src/OpenMind/Admin/build.js.list

@@ -1,29 +0,0 @@
-; Core Libraries
-ui/assets/js/jquery.min.js
-ui/assets/js/popper.min.js
-ui/assets/js/bootstrap.min.js
-ui/assets/js/waves.js
-ui/assets/js/jquery.slimscroll.js
-
-; Required datatable js
-ui/assets/plugins/datatables/jquery.dataTables.min.js
-ui/assets/plugins/datatables/dataTables.bootstrap4.min.js
-
-; Key Tables
-ui/assets/plugins/datatables/dataTables.keyTable.min.js
-
-; Responsive examples
-ui/assets/plugins/datatables/dataTables.responsive.min.js
-ui/assets/plugins/datatables/responsive.bootstrap4.min.js
-
-; Selection table
-ui/assets/plugins/datatables/dataTables.select.min.js
-
-; Toastr
-ui/assets/plugins/toastr/toastr.min.js
-
-; App js
-ui/assets/js/jquery.core.js
-ui/assets/js/jquery.app.js
-ui/assets/js/ModalEslDetails.js
-ui/assets/js/admin.js

src/OpenMind/Admin/package.json

@@ -3,14 +3,14 @@
 	"version": "1.2.0",
 	"private": true,
 	"description": "OM-Link Admin Module",
-	"author": "Open Mind",
+	"author": "",
 	"scripts": {
-		"Build DEV": "webpack --mode=none --config webpack.config.js --display-error-details"
+		"Build DEV": "webpack --mode=none --config webpack.config.js --display-error-details",
+		"Build PROD": "webpack --mode=production --config webpack.config.js --display-error-details"
 	},
-	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"bootstrap": "^4.2.1",
+		"bootstrap": "4.2.1",
 		"datatables.net": "^1.10.19",
 		"datatables.net-bs4": "^1.10.19",
 		"datatables.net-keytable": "^2.5.0",
@@ -23,7 +23,7 @@
 		"jquery-slimscroll": "^1.3.8",
 		"jszip": "^3.2.1",
 		"node-waves": "^0.7.6",
-		"pdfmake": "^0.1.55",
+		"pdfmake": "^0.1.56",
 		"toastr": "^2.1.4"
 	},
 	"devDependencies": {
@@ -39,6 +39,6 @@
 		"terser": "^3.17.0",
 		"url-loader": "^1.1.2",
 		"webpack": "^4.30.0",
-		"webpack-cli": "^3.3.1"
+		"webpack-cli": "^3.3.2"
 	}
 }

src/OpenMind/Admin/ui/assets/js/admin.js

@@ -6,6 +6,7 @@ let modalEslDetails = new ModalEslDetails();
 // MAIN JS
 document.addEventListener('DOMContentLoaded', function () {
 
+	Waves.attach('.btn', ['waves-effect', 'waves-light']);
 	Waves.init();
 
 	$.fn.dataTable.ext.order['dom-checkbox'] = function (settings, col) {
@@ -72,6 +73,7 @@ function OpenESLDetails(labelID) {
 	modalEslDetails.OpenESLDetails(labelID);
 }
 
+window.$ = window.jQuery = jQuery;
 window.OpenESLDetails = OpenESLDetails;
 window.LoadConfig = LoadConfig;
 window.SaveConfig = SaveConfig;

src/OpenMind/Admin/ui/assets/js/index.js

@@ -6,36 +6,30 @@ import 'bootstrap/dist/css/bootstrap.min.css';
 
 import 'node-waves';
 import 'jquery-slimscroll';
-
 // Required datatable js
 import 'datatables.net';
 import 'datatables.net-bs4/css/dataTables.bootstrap4.min.css';
 import 'datatables.net-bs4/js/dataTables.bootstrap4.min.js';
-
 // Key Tables
 import 'datatables.net-keytable';
 import 'datatables.net-keytable-bs4/css/keyTable.bootstrap4.min.css';
 import 'datatables.net-keytable-bs4/js/keyTable.bootstrap4.min.js';
-
 // Responsive examples
 import 'datatables.net-responsive';
 import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css';
 import 'datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js';
-
 // Selection table
 import "datatables.net-select";
 import 'datatables.net-select-bs4/css/select.bootstrap4.min.css';
 import 'datatables.net-select-bs4/js/select.bootstrap4.min.js';
-
 // Toastr
 import 'toastr/build/toastr.min.css';
-
 // CSS
 import '../css/icons.css';
 import '../css/style.css';
 import '../css/admin.scss';
-
 // App js
 import './jquery.core.js';
 import './jquery.app.js';
 import "./admin.js";
+

src/OpenMind/Admin/ui/labelstatus.tpl

@@ -1,3 +1,13 @@
+<script>
+	function log1(jq) {
+		let a = window.$('#datatable').DataTable().rows({selected: true}).data().toArray();
+
+		a.forEach((a, b, c) => {
+			console.log(a[1]);
+		})
+	}
+</script>
+
 <div class="col-xl-12">
 	<div class="card-box">
 		<div class="dropdown pull-right">
@@ -58,16 +68,6 @@
 	</div>
 </div>
 
-<script>
-	function log1() {
-		let a = $('#datatable').DataTable().rows({selected: true}).data().toArray();
-
-		a.forEach((a, b, c) => {
-			console.log(a[1]);
-		})
-	}
-</script>
-
 {* Modal Status *}
 <div class="modal fade statusmodal" tabindex="-1" role="dialog" aria-labelledby="statusmodal" aria-hidden="true" style="display: none;">
 	<div class="modal-dialog modal-dialog-centered">

src/OpenMind/Admin/webpack.config.js

@@ -19,7 +19,7 @@ module.exports = {
 		new webpack.ProvidePlugin({
 			$: 'jquery',
 			jQuery: 'jquery',
-			"window.jQuery": 'jquery',
+			'window.jQuery': 'jquery',
 			toastr: 'toastr'
 		})
 	],
@@ -52,11 +52,14 @@ module.exports = {
 		],
 	},
 	entry: "./ui/assets/js/index.js",
-	output: {
-		publicPath: '/omlink/assets/admin/',
-		path: path.resolve(__dirname, "../../../assets/admin/"),
-		//publicPath: '/omlink/src/openmind/admin/ui/assets/dist/',
-		//path: path.resolve(__dirname, "ui/assets/dist/"),
-		filename: "bundle.[contenthash].js"
-	},
-};
+	output:
+		{
+			publicPath: '/omlink/assets/admin/',
+			path:
+				path.resolve(__dirname, "../../../assets/admin/"),
+			filename:
+				"bundle.[contenthash].js"
+		}
+	,
+}
+;