Skip to content

Commit

Permalink
Merge e07f871 into ffe84db
Browse files Browse the repository at this point in the history
  • Loading branch information
ngireric123 committed Oct 3, 2019
2 parents ffe84db + e07f871 commit c8121e0
Show file tree
Hide file tree
Showing 19 changed files with 1,353 additions and 678 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"presets":["@babel/preset-env"],
"plugins": ["@babel/plugin-proposal-class-properties"]
}
}
6 changes: 4 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#Server Port
PORT=5000
DB_USERNAME=pgusername
DB_PASSWORD=pgpass
DEVELOPMENT_DB=barefoot_nomad_dev
TEST_DB=barefoot_nomad_test
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"no-console":"warn",
"indent": ["error", 2],
"no-unreachable":"error",
"curly": ["off"],
"arrow-parens": ["error", "as-needed"],
"import/no-dynamic-require":"off",
"no-shadow":"off"
}
}

7 changes: 7 additions & 0 deletions .sequelizerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const path = require('path')
module.exports = {
"config": path.resolve('./src/database', 'config.js'),
"models-path": path.resolve('./src/database/models'),
"seeders-path": path.resolve('./src/database/seeders'),
"migrations-path": path.resolve('./src/database/migrations')
};
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ install: npm install

script: npm test

after_script: npm install coveralls && npm run coveralls
after_script: npm install coveralls && npm run coveralls
services:
- postgresql

before_script:
- npm install -g sequelize-cli
- psql -c 'create database barefoot_nomad_test;' -U postgres
Loading

0 comments on commit c8121e0

Please sign in to comment.