Skip to content

Commit

Permalink
Merge 738a98e into 6e4074a
Browse files Browse the repository at this point in the history
  • Loading branch information
chingsley committed May 1, 2019
2 parents 6e4074a + 738a98e commit 83026b5
Show file tree
Hide file tree
Showing 26 changed files with 1,085 additions and 415 deletions.
20 changes: 20 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,23 @@ JWT_SECRET=
EMAIL_ADDRESS=
EMAIL_PASSWORD=
HOST_URL=
FACEBOOK_CLIENT_ID=
FACEBOOK_CLIENT_SECRET=
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
TWITTER_CONSUMER_KEY=
TWITTER_CONSUMER_SECRET=
SECRET=
SUPER_ADMIN_EMAIL=
SUPER_ADMIN_PASSWORD=
SUPER_ADMIN_NAME=
SUPER_ADMIN_USERNAME=
SUPER_ADMIN_ROLE=
SUPER_ADMIN_VERIFIED_STATUS=
CLOUD_NAME=
API_KEY=
API_SECRET=
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
},
"rules": {
"one-var": 0,
"no-unused-expressions": 0,
"one-var-declaration-per-line": 0,
"new-cap": 0,
"consistent-return": 0,
Expand Down
3 changes: 3 additions & 0 deletions config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const config = {
host: process.env.DB_HOST,
dialect: 'postgres',
},
localTest: {
use_env_variable: 'DATABASE_URL'
}
};

module.exports = config;
17 changes: 17 additions & 0 deletions config/pusher.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Pusher from 'pusher';

const {
PUSHER_APP_ID,
PUSHER_APP_KEY,
PUSHER_APP_SECRET,
PUSHER_APP_CLUSTER,
} = process.env;

const pusher = new Pusher({
appId: PUSHER_APP_ID,
key: PUSHER_APP_KEY,
secret: PUSHER_APP_SECRET,
cluster: PUSHER_APP_CLUSTER
});

export default pusher;
Loading

0 comments on commit 83026b5

Please sign in to comment.