diff --git a/.gitignore b/.gitignore index cb7f590..db044d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ node_modules dist coverage cypress/screenshots -secrets/prod debug.log diff --git a/README.md b/README.md index 9f71722..a3b7e9c 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,9 @@ npm run ftest-ui ### Prod Environment -1. Set `secrets/prod/mongDBUrl` file with your DB url +1. Set `MONGODB_URL` environment variable in your node environment with your DB url. + +In Heroku, that can be done using `Config Vars`. 2. Install dependencies diff --git a/package.json b/package.json index c7e0043..92a5dea 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "cooking-with-amateurs", - "version": "1.1.4", + "version": "1.1.5", "description": "Portfolio Web App about Cooking Recipes", "main": "src/index.js", "scripts": { "dev-front": "webpack-dev-server --config webpack/webpack.dev.js", - "dev-back": "set NODE_ENV=development&& nodemon server/main.js", + "dev-back": "NODE_ENV=development MONGODB_URL=mongodb://localhost/Tododb nodemon server/main.js", "utest": "jest src && jest cypress/utils", "utest-cover": "jest src --coverage && jest cypress/utils --coverage", "ftest": "cypress run", diff --git a/secrets/dev/mongoDBUrl b/secrets/dev/mongoDBUrl deleted file mode 100644 index 9f8f9b2..0000000 --- a/secrets/dev/mongoDBUrl +++ /dev/null @@ -1 +0,0 @@ -mongodb://localhost/Tododb diff --git a/server/main.js b/server/main.js index ab6944c..3961e4c 100644 --- a/server/main.js +++ b/server/main.js @@ -5,7 +5,7 @@ const PORT = process.env.PORT || 5000; const PRODUCTION_ENV = 'production'; const isProdEnv = process.env.NODE_ENV === PRODUCTION_ENV; -mongoDB.init(isProdEnv); +mongoDB.init(process.env.MONGODB_URL); app.init(PORT, isProdEnv); console.log(`RESTful API server started on: ${PORT}`); diff --git a/server/mongoDB.js b/server/mongoDB.js index b2822f3..ffae29f 100644 --- a/server/mongoDB.js +++ b/server/mongoDB.js @@ -1,12 +1,8 @@ -const fs = require('fs'); const mongoose = require('mongoose'); const recipeModel = require('./api/models/recipe-model'); -exports.init = isProdEnv => { - const SECRETS_PATH = `secrets/${isProdEnv ? 'prod' : 'dev'}/mongoDBUrl`; - const mongoDBUrl = fs.readFileSync(SECRETS_PATH, 'utf-8'); - +exports.init = mongoDBUrl => { mongoose.Promise = global.Promise; mongoose.connect(mongoDBUrl, () => {