diff --git a/.DS_Store b/.DS_Store index 1835837..19adfae 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/hold-package.json b/hold-package.json deleted file mode 100644 index ad411a9..0000000 --- a/hold-package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "url-shortener", - "version": "1.6.3", - "description": "", - "main": "index.js", - "scripts": { - "test": "mocha", - "start": "node server.js" - }, - "engines": { - "node": "6.7.0", - "npm": "3.10.3" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Maumasi/maumasi-url-shortener.git" - }, - "author": "'Liu Maumasi'", - "license": "ISC", - "bugs": { - "url": "https://github.com/Maumasi/maumasi-url-shortener/issues" - }, - "homepage": "https://github.com/Maumasi/maumasi-url-shortener#readme", - "dependencies": { - "body-parser": "^1.15.2", - "cli-color": "^1.1.0", - "dotenv": "^2.0.0", - "express": "^4.14.0", - "express-session": "^1.14.1", - "mysql": "^2.11.1", - "request": "^2.75.0", - "sequelize": "^3.24.3", - "log-me": "^1.0.12" - }, - "devDependencies": { - "chai": "^3.5.0", - "eslint": "^2.11.1", - "eslint-config-airbnb": "^9.0.1", - "eslint-plugin-import": "^1.8.1", - "eslint-plugin-jsx-a11y": "1.3.0", - "eslint-plugin-react": "^5.1.1", - "gulp": "^3.9.1", - "gulp-git": "^1.11.3", - "gulp-git-streamed": "^1.8.0", - "gulp-gitignore": "^0.1.0", - "gulp-replace": "^0.5.4", - "log-me": "^1.0.12", - "mocha": "^3.1.0", - "nock": "^8.0.0", - "supertest": "^2.0.0", - "yargs": "^6.2.0" - } -} diff --git a/package.json b/package.json index cc780e7..e7a8ff5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "url-shortener", - "version": "1.6.5", + "version": "1.6.3", "description": "", "main": "index.js", "scripts": { diff --git a/server.js b/server.js index d0abfe3..ae52161 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,7 @@ const express = require('express'); const sessions = require('express-session'); const routes = require('./src/routes/'); const log = require('log-me').print; -require('dotenv').config(); +// require('dotenv').config(); const app = express(); const PORT = process.env.PORT || 3000; diff --git a/src/models/db.js b/src/models/db.js index c9ca9e7..89c16f7 100644 --- a/src/models/db.js +++ b/src/models/db.js @@ -1,6 +1,6 @@ const Sequelize = require('sequelize'); -require('dotenv').config(); +// require('dotenv').config(); // connect to the db const sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PW, {