Skip to content
This repository was archived by the owner on Dec 11, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ db/*.db
node_modules/
build/
chromedriver.log
*~
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node src/api/server.js
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
25 changes: 25 additions & 0 deletions config.git
Original file line number Diff line number Diff line change
@@ -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

4 changes: 2 additions & 2 deletions config/development.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"port": 8000,
"port": 5000,
"dbType": "sqlite"
}
}
8 changes: 5 additions & 3 deletions package.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions src/api/server.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down