diff --git a/Gruntfile.js b/Gruntfile.js index f000096..e7f7890 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,9 +15,10 @@ module.exports = function(grunt) { execute: { target: { options: { - nodeargs: ['--harmony-async-await'] + nodeargs: ['--harmony-async-await'], + args: ['less'] }, - src: ['src/less.js'] + src: ['src/app.js'] } }, watch: { diff --git a/GruntfilePdf.js b/GruntfilePdf.js index 753176a..f7905d1 100644 --- a/GruntfilePdf.js +++ b/GruntfilePdf.js @@ -15,15 +15,17 @@ module.exports = function(grunt) { execute: { less: { options: { - nodeargs: ['--harmony-async-await'] + nodeargs: ['--harmony-async-await'], + args: ['less'] }, - src: ['src/less.js'] + src: ['src/app.js'] }, pdf: { options: { - nodeargs: ['--harmony-async-await'] + nodeargs: ['--harmony-async-await'], + args: ['pdf'] }, - src: ['src/generatePdfs.js'] + src: ['src/app.js'] } } }); diff --git a/package.json b/package.json index 63db45b..a59a63f 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "grunt" ], "scripts": { - "server": "node --harmony-async-await src/app.js", + "server": "node --harmony-async-await src/app.js server", "dev": "concurrently --kill-others \"npm run server\" \"grunt --verbose\"", "pdf": "concurrently \"npm run server\" \"grunt --gruntfile GruntfilePdf.js --verbose\"", "lint": "eslint src/", @@ -69,16 +69,11 @@ "grunt": "^1.0.1", "grunt-babel": "^6.0.0", "grunt-cli": "^1.2.0", - "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-less": "^1.4.0", "grunt-contrib-watch": "^1.0.0", "grunt-execute": "^0.2.2", - "grunt-run": "^0.6.0", "grunt-shell": "^2.1.0", - "jit-grunt": "^0.10.0", "load-grunt-tasks": "^3.5.2", "mocha": "3.2.0", - "nyc": "10.1.2", - "reload": "^1.1.1" + "nyc": "10.1.2" } } diff --git a/pdf/resume-grey-boxes.pdf b/pdf/resume-grey-boxes.pdf index 4f26b5e..9e62885 100755 Binary files a/pdf/resume-grey-boxes.pdf and b/pdf/resume-grey-boxes.pdf differ diff --git a/pdf/resume-left-right.pdf b/pdf/resume-left-right.pdf index 75a3dcd..acdad96 100755 Binary files a/pdf/resume-left-right.pdf and b/pdf/resume-left-right.pdf differ diff --git a/pdf/resume-oblique.pdf b/pdf/resume-oblique.pdf index bfa8c89..e76b533 100755 Binary files a/pdf/resume-oblique.pdf and b/pdf/resume-oblique.pdf differ diff --git a/pdf/resume-side-bar.pdf b/pdf/resume-side-bar.pdf index d57a766..4115d9a 100755 Binary files a/pdf/resume-side-bar.pdf and b/pdf/resume-side-bar.pdf differ diff --git a/pdf/resume-spotify.pdf b/pdf/resume-spotify.pdf index f490ad8..0e99e62 100755 Binary files a/pdf/resume-spotify.pdf and b/pdf/resume-spotify.pdf differ diff --git a/pdf/resume-wanted.pdf b/pdf/resume-wanted.pdf index 93cc99f..0cff4ef 100755 Binary files a/pdf/resume-wanted.pdf and b/pdf/resume-wanted.pdf differ diff --git a/src/app.js b/src/app.js index cd50f5f..b6c014a 100755 --- a/src/app.js +++ b/src/app.js @@ -1,2 +1,17 @@ +const StyleCompiler = require('./StyleCompiler'); +const ResumeToPdf = require('./ResumeToPdf'); const Server = require('./Server'); -Server.run(); + +process.argv.forEach(argument => { + switch (argument) { + case 'less': + StyleCompiler.run(); + break; + case 'pdf': + ResumeToPdf.convert(); + break; + case 'server': + Server.run(); + break; + } +}); diff --git a/src/generatePdfs.js b/src/generatePdfs.js deleted file mode 100755 index 36b0c59..0000000 --- a/src/generatePdfs.js +++ /dev/null @@ -1,2 +0,0 @@ -const ResumeToPdf = require('./ResumeToPdf'); -ResumeToPdf.convert(); diff --git a/src/less.js b/src/less.js deleted file mode 100755 index b2173b0..0000000 --- a/src/less.js +++ /dev/null @@ -1,2 +0,0 @@ -const StyleCompiler = require('./StyleCompiler'); -StyleCompiler.run();