Skip to content

Commit

Permalink
Merge pull request #67 from shri-2015-org/heroku
Browse files Browse the repository at this point in the history
Add npm start for heroku integration
  • Loading branch information
Nitive committed Sep 19, 2015
2 parents fee3e8e + c075bce commit 6130ad5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ _Chat application by ShrimpJS team. Project curated by Yandex developers at [Yan
1. Install nodejs 4.x.
2. Clone this repo and run `npm install`.
3. For development run: `npm run dev`.
4. For production run: `npm run master`.
4. For production run: `npm start`.
5. Head to `http://localhost:3000` and see the awesomeness.

### Contributor workflow
Expand Down Expand Up @@ -82,36 +82,36 @@ We adhere to [AirBnb JavaScript styleguide](https://github.com/airbnb/javascript

```
State {
messages: [
{
id: 1,
senderId: 1,
channelId: 1,
text: 'Hello world!',
timestamp: 'unix timestamp?'
},
],
channels:[
{
id: 123,
name: 'Channel name',
userIds: [1,2]
},
],
users: [
{
id: 1,
nick: '',
name: 'Vasya',
avatar: 'image.jpg',
isOnline: false
},
],
user: [
id: 1,
nick: '',
name: 'Vasya',
avatar: 'image.jpg',
],
messages: [
{
id: 1,
senderId: 1,
channelId: 1,
text: 'Hello world!',
timestamp: 'unix timestamp?'
},
],
channels:[
{
id: 123,
name: 'Channel name',
userIds: [1,2]
},
],
users: [
{
id: 1,
nick: '',
name: 'Vasya',
avatar: 'image.jpg',
isOnline: false
},
],
user: [
id: 1,
nick: '',
name: 'Vasya',
avatar: 'image.jpg',
],
}
```
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dev": "NODE_ENV=development DEBUG=shrimp:front NODE_PATH=./node_modules:./app nodemon --exec babel-node server/server",
"compile": "./node_modules/.bin/babel-node compile.js",
"dev-server": "npm run compile; NODE_ENV=development DEBUG=shrimp:server NODE_PATH=./node_modules:./app nodemon --exec babel-node server/server",
"master": "NODE_ENV=production NODE_PATH=./node_modules:./app babel-node server/server"
"start": "npm run compile; NODE_ENV=production NODE_PATH=./node_modules:./app babel-node server/server"
},
"author": "Samoilow Maxim <nitive@icloud.com>",
"license": "MIT",
Expand Down

0 comments on commit 6130ad5

Please sign in to comment.