diff --git a/.idea/dictionaries/gawi.xml b/.idea/dictionaries/gawi.xml new file mode 100644 index 0000000000000000000000000000000000000000..d586f913d6180c60c3f45339746df56adc6e0bd7 --- /dev/null +++ b/.idea/dictionaries/gawi.xml @@ -0,0 +1,7 @@ +<component name="ProjectDictionaryState"> + <dictionary name="gawi"> + <words> + <w>mkdirp</w> + </words> + </dictionary> +</component> \ No newline at end of file diff --git a/frontend-js/package.json b/frontend-js/package.json index 5473b919e34423a1cdd1e00e718bb2aeb4806225..dbf87572a8bb5b7aac10a6b456fcb358ff06198e 100644 --- a/frontend-js/package.json +++ b/frontend-js/package.json @@ -10,7 +10,7 @@ "build-deploy": "npm run build && npm run deploy", "build": "npm run clean && npm run build:css && npm run build:js", "clean": "node scripts/clean.js", - "deploy": "copy /Y \"dist\\*.js*\" \"C:/Program Files/apache-tomcat-7.0.72/webapps/minerva/resources/js\" && copy /Y \"dist\\*.css\" \"C:/Program Files/apache-tomcat-7.0.72/webapps/minerva/resources/css\" ", + "deploy": "node scripts/deploy.js", "lint": "jshint src/.", "test": "istanbul cover node_modules/mocha/bin/_mocha -- --recursive src/test/js" }, diff --git a/frontend-js/scripts/clean.js b/frontend-js/scripts/clean.js index 1822779c31f651f8caa6538c5138f32fd1f666cc..f3199465593e4910c2d356815d780abc87ac1734 100644 --- a/frontend-js/scripts/clean.js +++ b/frontend-js/scripts/clean.js @@ -2,14 +2,6 @@ var del = require('del'); var mkdirp = require('mkdirp'); -var exec = require('child_process').exec; -function puts(error, stdout, stderr) { console.log(stdout) } - - -var os = require('os'); -//control OS -//then run command depengin on the OS - -del(["dist/"]).then(function(){ - return mkdirp("dist"); +del(["dist/"]).then(function () { + return mkdirp("dist"); }); diff --git a/frontend-js/scripts/deploy.js b/frontend-js/scripts/deploy.js new file mode 100644 index 0000000000000000000000000000000000000000..a49284666f2fe2c3775a3fb1d815b64f635a9edc --- /dev/null +++ b/frontend-js/scripts/deploy.js @@ -0,0 +1,6 @@ +var fs = require('fs'); + +var tomcatDirectory = process.env.CATALINA_HOME; +fs.createReadStream('dist/minerva.js').pipe(fs.createWriteStream(tomcatDirectory + '/webapps/minerva/resources/js/minerva.js')); +fs.createReadStream('dist/minerva.css').pipe(fs.createWriteStream(tomcatDirectory + '/webapps/minerva/resources/css/minerva.css')); +