Merge branch 'master' into feat/ts-node

Author: Bowden Kelly

.env.example

@@ -3,27 +3,5 @@ MONGOLAB_URI=mongodb://localhost:27017
 
 SESSION_SECRET=ashdfjhasdlkjfhalksdjhflak
 
-MAILGUN_USER=[email protected]
-MAILGUN_PASSWORD=29eldds1uri6
-
-SENDGRID_USER=hslogin
-SENDGRID_PASSWORD=hspassword00
-
 FACEBOOK_ID=754220301289665
-FACEBOOK_SECRET=41860e58c256a3d7ad8267d3c1939a4a
-
-INSTAGRAM_ID=9f5c39ab236a48e0aec354acb77eee9b
-INSTAGRAM_SECRET=5920619aafe842128673e793a1c40028
-
-GITHUB_ID=cb448b1d4f0c743a1e36
-GITHUB_SECRET=815aa4606f476444691c5f1c16b9c70da6714dc6
-
-TWITTER_KEY=6NNBDyJ2TavL407A3lWxPFKBI
-TWITTER_SECRET=ZHaYyK3DQCqv49Z9ofsYdqiUgeoICyh6uoBgFfu7OeYC7wTQKa
-
-GOOGLE_ID=828110519058.apps.googleusercontent.com
-GOOGLE_SECRET=JdZsIaWhUFIchmC1a_IZzOHb
-
-TWILIO_SID=AC6f0edc4c47becc6d0a952536fc9a6025
-TWILIO_TOKEN=a67170ff7afa2df3f4c7d97cd240d0f3
-
+FACEBOOK_SECRET=41860e58c256a3d7ad8267d3c1939a4a

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
     "recommendations": [
         "eg2.tslint",
+        "ms-azuretools.vscode-cosmosdb",
         "streetsidesoftware.code-spell-checker"
     ]
 }

README.md

@@ -23,6 +23,7 @@ mongod
 ```
 - Build and run the project
 ```
+npm run build
 npm start
 ```
 Navigate to `http://localhost:3000`
@@ -73,6 +74,7 @@ The full folder structure of this app is explained below:
 | .env.example             | API keys, tokens, passwords, database URI. Clone this, but don't check it in to public repos. |
 | .travis.yml              | Used to configure Travis CI build                                                             |
 | .copyStaticAssets.ts     | Build script that copies images, fonts, and JS libs to the dist folder                        |
+| jest.config.js           | Used to configure Jest                                                                        |
 | package.json             | File that contains npm dependencies as well as [build scripts](#what-if-a-library-isnt-on-definitelytyped)                          |
 | tsconfig.json            | Config settings for compiling server code written in TypeScript                               |
 | tsconfig.tests.json      | Config settings for compiling tests written in TypeScript                                     |
@@ -317,24 +319,26 @@ npm install -D jest ts-jest
 `jest` is the testing framework itself, and `ts-jest` is just a simple function to make running TypeScript tests a little easier.
 
 ### Configure Jest
-Jest's configuration lives in `package.json`, so let's open it up and add the following code:
-```json
-"jest": {
-    "globals": {
-      "__TS_CONFIG__": "tsconfig.json"
-    },
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "transform": {
-      "^.+\\.(ts)$": "./node_modules/ts-jest/preprocessor.js"
-    },
-    "testMatch": [
-      "**/test/**/*.test.(ts|js)"
-    ],
-    "testEnvironment": "node"
-  },
+Jest's configuration lives in `jest.config.js`, so let's open it up and add the following code:
+```js
+module.exports = {
+	globals: {
+		'ts-jest': {
+			tsConfigFile: 'tsconfig.json'
+		}
+	},
+	moduleFileExtensions: [
+		'ts',
+		'js'
+	],
+	transform: {
+		'^.+\\.(ts|tsx)$': './node_modules/ts-jest/preprocessor.js'
+	},
+	testMatch: [
+		'**/test/**/*.test.(ts|js)'
+	],
+	testEnvironment: 'node'
+};
 ```
 Basically we are telling Jest that we want it to consume all files that match the pattern `"**/test/**/*.test.(ts|js)"` (all `.test.ts`/`.test.js` files in the `test` folder), but we want to preprocess the `.ts` files first. 
 This preprocess step is very flexible, but in our case, we just want to compile our TypeScript to JavaScript using our `tsconfig.json`.

jest.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+	globals: {
+		'ts-jest': {
+			tsConfigFile: 'tsconfig.json'
+		}
+	},
+	moduleFileExtensions: [
+		'ts',
+		'js'
+	],
+	transform: {
+		'^.+\\.(ts|tsx)$': './node_modules/ts-jest/preprocessor.js'
+	},
+	testMatch: [
+		'**/test/**/*.test.(ts|js)'
+	],
+	testEnvironment: 'node'
+};

package-lock.json

@@ -9,10 +9,11 @@
   "author": "Bowden Kelly",
   "license": "MIT",
   "scripts": {
-    "start": "npm run build && npm run watch",
+    "start": "npm run serve",
     "build": "npm run build-sass && npm run build-ts && npm run tslint && npm run copy-static-assets",
-    "serve": "nodemon dist/server.js",
-    "watch": "concurrently -k -p \"[{name}]\" -n \"Sass,TypeScript,Node\" -c \"yellow.bold,cyan.bold,green.bold\" \"npm run watch-sass\" \"npm run watch-ts\" \"npm run serve\"",
+    "serve": "node dist/server.js",
+    "watch-node": "nodemon dist/server.js",
+    "watch": "concurrently -k -p \"[{name}]\" -n \"Sass,TypeScript,Node\" -c \"yellow.bold,cyan.bold,green.bold\" \"npm run watch-sass\" \"npm run watch-ts\" \"npm run watch-node\"",
     "test": "jest --forceExit",
     "build-ts": "tsc",
     "watch-ts": "tsc -w",
@@ -24,27 +25,10 @@
     "serve-debug": "nodemon --inspect dist/server.js",
     "watch-debug": "concurrently -k -p \"[{name}]\" -n \"Sass,TypeScript,Node\" -c \"yellow.bold,cyan.bold,green.bold\" \"npm run watch-sass\" \"npm run watch-ts\" \"npm run serve-debug\""
   },
-  "jest": {
-    "globals": {
-      "ts-jest": {
-        "tsConfigFile": "tsconfig.json"
-      }
-    },
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "transform": {
-      "^.+\\.(ts|tsx)$": "./node_modules/ts-jest/preprocessor.js"
-    },
-    "testMatch": [
-      "**/test/**/*.test.(ts|js)"
-    ],
-    "testEnvironment": "node"
-  },
   "dependencies": {
     "async": "^2.5.0",
     "bcrypt-nodejs": "^0.0.3",
+    "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
     "compression": "^1.7.1",
     "connect-mongo": "^1.3.2",
@@ -57,7 +41,7 @@
     "fbgraph": "^1.4.1",
     "lodash": "^4.17.4",
     "lusca": "^1.5.2",
-    "mongoose": "^4.12.4",
+    "mongoose": "^4.13.7",
     "morgan": "^1.9.0",
     "nodemailer": "^2.7.2",
     "passport": "^0.4.0",
@@ -69,6 +53,7 @@
   "devDependencies": {
     "@types/async": "^2.0.40",
     "@types/bcrypt-nodejs": "0.0.30",
+    "@types/bluebird": "^3.5.18",
     "@types/body-parser": "^1.16.2",
     "@types/compression": "0.0.33",
     "@types/connect-mongo": "0.0.34",

package.json

@@ -1,6 +1,3 @@
-/**
- * Module dependencies.
- */
 import * as express from "express";
 import * as compression from "compression";  // compresses requests
 import * as session from "express-session";
@@ -13,50 +10,38 @@ import * as flash from "express-flash";
 import * as path from "path";
 import * as mongoose from "mongoose";
 import * as passport from "passport";
-import expressValidator = require("express-validator");
+import * as expressValidator from "express-validator";
+import * as bluebird from "bluebird";
 
 const MongoStore = mongo(session);
 
-/**
- * Load environment variables from .env file, where API keys and passwords are configured.
- */
+// Load environment variables from .env file, where API keys and passwords are configured
 dotenv.config({ path: ".env.example" });
 
-
-/**
- * Controllers (route handlers).
- */
+// Controllers (route handlers)
 import * as homeController from "./controllers/home";
 import * as userController from "./controllers/user";
 import * as apiController from "./controllers/api";
 import * as contactController from "./controllers/contact";
 
-/**
- * API keys and Passport configuration.
- */
+
+// API keys and Passport configuration
 import * as passportConfig from "./config/passport";
 
-/**
- * Create Express server.
- */
+// Create Express server
 const app = express();
 
-/**
- * Connect to MongoDB.
- */
-// mongoose.Promise = global.Promise;
-mongoose.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI);
-
-mongoose.connection.on("error", () => {
-  console.log("MongoDB connection error. Please make sure MongoDB is running.");
-  process.exit();
+// Connect to MongoDB
+const mongoUrl = process.env.MONGOLAB_URI;
+(<any>mongoose).Promise = bluebird;
+mongoose.connect(mongoUrl, {useMongoClient: true}).then(
+  () => { /** ready to use. The `mongoose.connect()` promise resolves to undefined. */ },
+).catch(err => {
+  console.log("MongoDB connection error. Please make sure MongoDB is running. " + err);
+  // process.exit();
 });
 
-
-
-/**
- * Express configuration.
- */
+// Express configuration
 app.set("port", process.env.PORT || 3000);
 app.set("views", path.join(__dirname, "../views"));
 app.set("view engine", "pug");
@@ -70,7 +55,7 @@ app.use(session({
   saveUninitialized: true,
   secret: process.env.SESSION_SECRET,
   store: new MongoStore({
-    url: process.env.MONGODB_URI || process.env.MONGOLAB_URI,
+    url: mongoUrl,
     autoReconnect: true
   })
 }));
@@ -86,13 +71,13 @@ app.use((req, res, next) => {
 app.use((req, res, next) => {
   // After successful login, redirect back to the intended page
   if (!req.user &&
-      req.path !== "/login" &&
-      req.path !== "/signup" &&
-      !req.path.match(/^\/auth/) &&
-      !req.path.match(/\./)) {
+    req.path !== "/login" &&
+    req.path !== "/signup" &&
+    !req.path.match(/^\/auth/) &&
+    !req.path.match(/\./)) {
     req.session.returnTo = req.path;
   } else if (req.user &&
-      req.path == "/account") {
+    req.path == "/account") {
     req.session.returnTo = req.path;
   }
   next();

src/app.ts

@@ -1,5 +1,5 @@
 footer
   .container.text-center
-    p.pull-left © 2016 Company, Inc. All Rights Reserved
+    p.pull-left © 2018 Company, Inc. All Rights Reserved
     iframe.pull-right(src="https://ghbtns.com/github-btn.html?user=Microsoft&repo=TypeScript-Node-Starter&type=star&count=true" frameborder="0" scrolling="0" width="90px" height="20px" style="margin-top:15px")