diff --git a/.gitignore b/.gitignore index 49e4866..df30701 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ db/*.db node_modules/ build/ chromedriver.log +*~ diff --git a/Procfile b/Procfile new file mode 100755 index 0000000..619a5a6 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: node src/api/server.js diff --git a/README.md b/README.md index 01b511d..003a055 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ # Shapesmith.next +you can test it live at [http://glacial-reef-8810.herokuapp.com/](http://glacial-reef-8810.herokuapp.com/) + +this fork has integrate modification for Heroku integretion (developpement profile) + Welcome to Shapesmith.next, the next generation implementation of Shapesmith. You can find the original, stable, version at [http://github.com/bjnortier/shapesmith](http://github.com/bjnortier/shapesmith) diff --git a/config.git b/config.git new file mode 100644 index 0000000..7593c24 --- /dev/null +++ b/config.git @@ -0,0 +1,25 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true +[remote "origin"] + fetch = +refs/heads/*:refs/remotes/origin/* + url = git@github.com:magneval/shapesmith.next.git +[branch "master"] + remote = origin + merge = refs/heads/master +[remote "github"] + url = git@github.com:magneval/shapesmith.next.git + fetch = +refs/heads/*:refs/remotes/github/* +[remote "herokuDev"] + url = git@heroku.com:glacial-reef-8810.git + fetch = +refs/heads/*:refs/remotes/herokuDev/* +[remote "herokuProd"] + url = git@heroku.com:shapesmith.git + fetch = +refs/heads/*:refs/remotes/herokuProd/* + +# git push origin master +# git push herokuDev refs/remotes/origin/master:refs/heads/master + diff --git a/config/development.json b/config/development.json index ec5b564..f718016 100644 --- a/config/development.json +++ b/config/development.json @@ -1,4 +1,4 @@ { - "port": 8000, + "port": 5000, "dbType": "sqlite" -} \ No newline at end of file +} diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 042386c..7c73fa7 --- a/package.json +++ b/package.json @@ -17,9 +17,11 @@ "url": "git://github.com/bjnortier/shapesmith.next.git" }, "contributors": [], - "engines": [ - "node" - ], + "engines": { + "node": "4.8.x", + "npm": "1.2.x" + } +, "scripts": { "test": "grunt test", "start": "nodemon -e js,hbs,json src/api/server.js" diff --git a/src/api/server.js b/src/api/server.js old mode 100644 new mode 100755 index 92e07e4..6701245 --- a/src/api/server.js +++ b/src/api/server.js @@ -2,8 +2,7 @@ var http = require('http'); var app = require('./app'); var nconf = require('nconf'); - -var port = nconf.get('port'); +var port = process.env.PORT || nconf.get('port'); var server = http.createServer(app); server.listen(port, function() { console.info('server started on :' + port + '\n');