Merge pull request #1 from stowns/master

rename .env -> .env.example and added .env to .gitignore. will force …

Author: kckolz

.env.example

@@ -0,0 +1,21 @@
+JWT_SECRET=qfPFRkqM4ZF92h9NeZtqAArQ
+
+FACEBOOK_CLIENT_ID={your facebook client id}
+FACEBOOK_SECRET={your facebook secret}
+
+GOOGLE_CLIENT_ID={your google client id}
+GOOGLE_SECRET={your google secret}
+
+DB_NAME=seed
+DB_USERNAME=seed
+DB_PASSWORD=password
+
+AWS_REGION={your region}
+AWS_ACCESS_KEY_ID={your access key}
+AWS_SECRET_ACCESS_KEY={your secret key}
+
+LOG_LEVEL=debug
+
+NODE_ENV=development
+
+S3_PROFILE_PIC_URL= {your s3 profile pic url e.g., https://s3.amazonaws.com/yourapp/profileImages}

.gitignore

@@ -11,4 +11,5 @@ assets/
 npm-debug.log
 tests/sqlite.db
 *.log
-*.iml
+*.iml
+.env

README.md

@@ -17,9 +17,8 @@ Integration Testing with [SuperTest](https://github.com/visionmedia/supertest)
 This project uses the [Dotenv](https://www.npmjs.com/package/dotenv) library to load sensitive data such
 as database passwords and client secrets. 
 
-There is a `.env` file included at the root of this project as an example, but
-you should never check this file into your source control. Update the `.env` file with the pertinent information
-for your project and remove it from your source control system.
+There is a `.env.example` file included at the root of this project as an example, rename it to '.env' (.env is not under version control). Update the `.env` file with the pertinent information
+for your project.
 
 ### RabbitMQ
 Install and run [RabbitMQ](https://www.rabbitmq.com/) with the default settings

logger.ts renamed to lib/logger.ts

@@ -1,7 +1,7 @@
 import {MessageManager} from "./MessageManager";
 import {MessageQueueEnum} from "../models/enums/MessageQueueEnum";
 import AWS = require('aws-sdk');
-import {logger} from "../logger";
+import {logger} from "../lib/logger";
 
 export class EmailManager extends MessageManager {
 

managers/EmailManager.ts

@@ -1,5 +1,5 @@
 import {MessageError} from "../errors/MessageError";
-import {logger} from "../logger";
+import {logger} from "../lib/logger";
 
 export abstract class MessageManager {
 

managers/MessageManager.ts

@@ -1,7 +1,7 @@
 import {MessageManager} from "./MessageManager";
 import {MessageQueueEnum} from "../models/enums/MessageQueueEnum";
 import AWS = require('aws-sdk');
-import {logger} from "../logger";
+import {logger} from "../lib/logger";
 
 export class S3Manager extends MessageManager {
 

managers/S3Manager.ts

@@ -4,7 +4,7 @@ import {RoleEnum} from "../models/enums/RoleEnum";
 import {Auth} from "../auth/auth";
 import {AuthError} from "../errors/AuthError";
 import {S3Manager} from "./S3Manager";
-import {logger} from "../logger";
+import {logger} from "../lib/logger";
 
 export class UserManager {
 

managers/UserManager.ts

@@ -11,7 +11,7 @@ import {errorHandler} from "./errors/ErrorHandler";
 import {Roles} from "./auth/roles";
 import {MessageManager} from "./managers/MessageManager";
 import {InternalServerError} from "./errors/InternalServerError";
-import {logger} from "./logger";
+import {logger} from "./lib/logger";
 import morgan = require("morgan");
 
 const amqplib = require('amqplib');