FIX bug
This commit is contained in:
unpregnant
parent
9f79e988de
commit
a47f66cfb9
155
package.json
155
package.json
@ -1,79 +1,80 @@
|
||||
{
|
||||
"name": "best-resume-ever",
|
||||
"version": "1.0.0",
|
||||
"description": "Collection of multiple resumes build with LESS and Mustache Templates.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/salomonelli/best-resume-ever"
|
||||
},
|
||||
"author": "salomonelli",
|
||||
"homepage": "https://github.com/salomonelli/best-resume-ever",
|
||||
"keywords": [
|
||||
"resume",
|
||||
"template",
|
||||
"mustache",
|
||||
"less",
|
||||
"cv",
|
||||
"curriculum",
|
||||
"vitae",
|
||||
"electron",
|
||||
"grunt"
|
||||
],
|
||||
"scripts": {
|
||||
"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/",
|
||||
"test": "nyc mocha --harmony-async-await \"test/*.js\"",
|
||||
"istanbul": "istanbul cover node_modules/.bin/_mocha -- -- -u exports test/**/* --harmony-async-await"
|
||||
},
|
||||
"dependencies": {
|
||||
"@typopro/web-montserrat": "3.4.9",
|
||||
"babel-cli": "6.22.2",
|
||||
"babel-core": "6.22.1",
|
||||
"babel-preset-es2015": "6.22.0",
|
||||
"buffer-to-string": "0.1.0",
|
||||
"clean-css": "4.0.4",
|
||||
"electroshot": "1.2.0",
|
||||
"express": "4.14.1",
|
||||
"font-awesome": "4.7.0",
|
||||
"fs": "0.0.1-security",
|
||||
"hogan-express": "0.5.2",
|
||||
"html-pdf": "2.1.0",
|
||||
"html-to-pdf": "0.1.11",
|
||||
"http": "0.0.0",
|
||||
"jquery": "3.1.1",
|
||||
"less": "2.7.2",
|
||||
"less-plugin-clean-css": "1.5.1",
|
||||
"local-web-server": "1.2.6",
|
||||
"markdown-to-html": "0.0.13",
|
||||
"material-design-icons": "3.0.1",
|
||||
"mustache": "2.3.0",
|
||||
"mustache-express": "1.2.4",
|
||||
"normalize.css": "5.0.0",
|
||||
"npm-font-open-sans-condensed": "1.0.3",
|
||||
"open-sans-fontface": "1.4.0",
|
||||
"path": "0.12.7",
|
||||
"phantomjs-prebuilt": "2.1.14",
|
||||
"raleway-webfont": "3.0.1",
|
||||
"request": "2.79.0",
|
||||
"request-promise": "4.1.1",
|
||||
"roboto-fontface": "0.7.0",
|
||||
"showdown": "1.6.3",
|
||||
"typeface-chivo": "0.0.22",
|
||||
"write": "0.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "^3.3.0",
|
||||
"eslint": "3.15.0",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-contrib-watch": "^1.0.0",
|
||||
"grunt-execute": "^0.2.2",
|
||||
"grunt-shell": "^2.1.0",
|
||||
"load-grunt-tasks": "^3.5.2",
|
||||
"mocha": "3.2.0",
|
||||
"nyc": "10.1.2"
|
||||
}
|
||||
"name": "best-resume-ever",
|
||||
"version": "1.0.0",
|
||||
"description": "Collection of multiple resumes build with LESS and Mustache Templates.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/salomonelli/best-resume-ever"
|
||||
},
|
||||
"author": "salomonelli",
|
||||
"homepage": "https://github.com/salomonelli/best-resume-ever",
|
||||
"keywords": [
|
||||
"resume",
|
||||
"template",
|
||||
"mustache",
|
||||
"less",
|
||||
"cv",
|
||||
"curriculum",
|
||||
"vitae",
|
||||
"electron",
|
||||
"grunt"
|
||||
],
|
||||
"scripts": {
|
||||
"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/",
|
||||
"test": "nyc mocha --harmony-async-await \"test/*.js\"",
|
||||
"istanbul": "istanbul cover node_modules/.bin/_mocha -- -- -u exports test/**/* --harmony-async-await"
|
||||
},
|
||||
"dependencies": {
|
||||
"@typopro/web-montserrat": "3.4.9",
|
||||
"babel-cli": "6.22.2",
|
||||
"babel-core": "6.22.1",
|
||||
"babel-preset-es2015": "6.22.0",
|
||||
"buffer-to-string": "0.1.0",
|
||||
"clean-css": "4.0.4",
|
||||
"electroshot": "1.2.0",
|
||||
"express": "4.14.1",
|
||||
"font-awesome": "4.7.0",
|
||||
"fs": "0.0.1-security",
|
||||
"hogan-express": "0.5.2",
|
||||
"html-pdf": "2.1.0",
|
||||
"html-to-pdf": "0.1.11",
|
||||
"http": "0.0.0",
|
||||
"jquery": "3.1.1",
|
||||
"less": "2.7.2",
|
||||
"less-plugin-clean-css": "1.5.1",
|
||||
"local-web-server": "1.2.6",
|
||||
"markdown-to-html": "0.0.13",
|
||||
"material-design-icons": "3.0.1",
|
||||
"mustache": "2.3.0",
|
||||
"mustache-express": "1.2.4",
|
||||
"normalize.css": "5.0.0",
|
||||
"npm-font-open-sans-condensed": "1.0.3",
|
||||
"open-sans-fontface": "1.4.0",
|
||||
"path": "0.12.7",
|
||||
"phantomjs-prebuilt": "2.1.14",
|
||||
"raleway-webfont": "3.0.1",
|
||||
"request": "2.79.0",
|
||||
"request-promise": "4.1.1",
|
||||
"roboto-fontface": "0.7.0",
|
||||
"showdown": "1.6.3",
|
||||
"typeface-chivo": "0.0.22",
|
||||
"write": "0.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "^3.3.0",
|
||||
"eslint": "3.15.0",
|
||||
"grunt": "^1.0.1",
|
||||
"grunt-babel": "^6.0.0",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-contrib-watch": "^1.0.0",
|
||||
"grunt-execute": "^0.2.2",
|
||||
"grunt-shell": "^2.1.0",
|
||||
"load-grunt-tasks": "^3.5.2",
|
||||
"mocha": "3.2.0",
|
||||
"nyc": "10.1.2",
|
||||
"reload": "^1.1.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ const person = require('../person.js');
|
||||
const http = require('http');
|
||||
const reload = require('reload');
|
||||
|
||||
let app, resumes, expressServer;
|
||||
let app, resumes;
|
||||
const Server = {
|
||||
/**
|
||||
* sets configurations of express app
|
||||
@ -24,19 +24,16 @@ const Server = {
|
||||
* starts up express app
|
||||
*/
|
||||
start: function() {
|
||||
expressServer = app.listen(Config.port, '0.0.0.0', () => console.log('Listening on localhost:' + Config.port + '!'));
|
||||
app.listen(Config.port, '0.0.0.0', () => console.log('Listening on localhost:' + Config.port + '!'));
|
||||
},
|
||||
/**
|
||||
* kills express app
|
||||
*/
|
||||
kill: function() {
|
||||
/*
|
||||
request.get('http://localhost:' + Config.port + '/kill')
|
||||
.catch(error => {
|
||||
if (error) return false;
|
||||
});
|
||||
*/
|
||||
if (expressServer) expressServer.close();
|
||||
},
|
||||
/**
|
||||
* sets route of express app
|
||||
@ -71,7 +68,7 @@ const Server = {
|
||||
setRoutesForResumes: function() {
|
||||
const directories = Util.getDirectories();
|
||||
for (let resume of directories) {
|
||||
this.setRoute('/' + resume, resume + '/index');
|
||||
Server.setRoute('/' + resume, resume + '/index');
|
||||
}
|
||||
},
|
||||
autoReload: function() {
|
||||
@ -84,17 +81,14 @@ const Server = {
|
||||
*/
|
||||
run: async function() {
|
||||
resumes = Util.getResumesFromDirectories();
|
||||
this.setup();
|
||||
this.setRoute('/', 'views/index');
|
||||
this.setRoutesForResumes();
|
||||
this.setKillRoute();
|
||||
this.kill();
|
||||
Server.setup();
|
||||
Server.setRoute('/', 'views/index');
|
||||
Server.setRoutesForResumes();
|
||||
Server.setKillRoute();
|
||||
Server.kill();
|
||||
await Util.setTimeout(500);
|
||||
this.autoReload();
|
||||
this.start();
|
||||
Server.autoReload();
|
||||
Server.start();
|
||||
}
|
||||
};
|
||||
|
||||
Server.run();
|
||||
|
||||
module.exports = Server;
|
||||
|
||||
0
test/node/Config.js
Normal file → Executable file
0
test/node/Config.js
Normal file → Executable file
Loading…
x
Reference in New Issue
Block a user