Skip to content

Commit

Permalink
Merge e7f285b into bcc8dd5
Browse files Browse the repository at this point in the history
  • Loading branch information
parkerthegeniuschild committed Aug 30, 2019
2 parents bcc8dd5 + e7f285b commit b9d385c
Show file tree
Hide file tree
Showing 22 changed files with 499 additions and 177 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
{
"presets": ["@babel/preset-env"]
}
}
21 changes: 16 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,28 @@
# Please take note that the dummy values below will not work.
# They are just to show you what yours shoud look like.

DB_URI_DEVELOPMENT="https://devwebsite.com"
NODE_ENV=development

DB_DIALECT=postgres

DB_STRING_DEVELOPMENT=dev://dev:devpasswd:5555/
DB_HOST_DEVELOPMENT=localhost
DB_NAME_DEVELOPMENT=db_dev
DB_USER_DEVELOPMENT=devUser
DB_PASSWORD_DEVELOPMENT=devPassword

DB_URI_STAGING="https://stagingWebsite.com"
DB_STRING_STAGING=staging://staginguser:stagingpasswd:5432/
DB_HOST_STAGING=127.0.0.1
DB_NAME_STAGING=db_staging
DB_USER_STAGING=stagingUser
DB_PASSWORD_STAGING=stagingUser

DB_URI_TEST="https://prodwebsite.com"
DB_USER_TEST=prodUser
DB_PASSWORD_TEST=prodPassword
DB_STRING_PRODUCTION="prod://produser:prodpasswd:3306/"
DB_HOST_PRODUCTION=localhost
DB_NAME_PRODUCTION=db_prod
DB_USER_PRODUCTION=stagingUser
DB_PASSWORD_PRODUCTION=stagingUser


.................
.................
Expand Down
9 changes: 9 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
src/test
.gitignore
HISTORY.txt
README.txt
node_modules/
.env
app.js
.idea/
dist/
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
"mocha": true,
"commonjs": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"allowImportExportEverywhere": true,
"ecmaFeatures": {
"jsx": true
}
},
"parser": "babel-eslint",
"plugins": [
"flowtype"
],
"globals": {
"_": false
},
"rules": {
"one-var": 0,
"camelcase": 0,
Expand Down
2 changes: 1 addition & 1 deletion .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"spec": "src/test"
"spec": "src/test"
}
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "v10.15.3"
- 10.15.3

cache:
directories:
Expand All @@ -16,8 +16,10 @@ services:
before_script:
- psql -c "CREATE DATABASE barefootNomad_test;" -U postgres
- psql -c "ALTER ROLE postgres PASSWORD 'postgres';" -U postgres
- touch src/logs/app.log

script:
- npm run db:migrate
- npm test

after_success:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.10.1
WORKDIR /app
COPY package*.json ./
RUN apk add --update nodejs npm python
RUN apk add --update alpine-sdk nodejs npm python
RUN LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH && export LD_LIBRARY_PATH && npm ci
COPY . .
RUN npm run clean && npm run build
EXPOSE 3000
CMD ["npm", "run", "start:staging"]
CMD ["npm", "run", "start:dev"]
Loading

0 comments on commit b9d385c

Please sign in to comment.