Moved app to src

ajhool · Mar 30, 2017 · 2c2ac50 · 2c2ac50
1 parent a5f817e
commit 2c2ac50
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -4,14 +4,35 @@
   "description": "Boilerplate project for a restful node backend server powered by ES6 and Express",
   "main": "index.js",
   "scripts": {
-    "build": "npm run clean && babel app -d build",
+    "dev": "nodemon -w src --exec \"babel-node src --presets es2015,stage-0\"",
+    "build": "babel src -s -D -d dist --presets es2015,stage-0",
     "clean": "rm -rf build && mkdir build",
-    "start": "nodemon",
+    "start": "node dist/index.js",
     "test": "NODE_ENV=test mocha --recursive --reporter spec --compilers js:babel-register tests",
     "lint": "eslint app",
     "test:watch": "nodemon --exec 'npm run test' tests",
     "coverage": "NODE_ENV=test babel-node ./node_modules/.bin/isparta cover _mocha -- --recursive --reporter spec --compilers js:babel-register tests",
-    "validate": "npm run test && npm outdated --depth 0"
+    "validate": "npm run test && npm outdated --depth 0",
+    "prepareDeploy": "npm run -s build"
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "parserOptions": {
+      "ecmaVersion": 7,
+      "sourceType": "module"
+    },
+    "env": {
+      "node": true
+    },
+    "rules": {
+      "no-console": 0,
+      "no-unused-vars": 1
+    }
+  },
+  "babel": {
+    "presets": [
+      "flow"
+    ]
   },
   "engines": {
     "node": ">= 6",
@@ -65,6 +86,7 @@
     "faker": "^3.1.0",
     "isparta": "^4.0.0",
     "mocha": "^3.1.2",
+    "flow-bin": "^0.42.0",
     "nodemon": "^1.11.0"
   }
 }
diff --git a/app/config/constants.js → src/config/constants.js b/app/config/constants.js → src/config/constants.js
diff --git a/app/controllers/base.controller.js → src/controllers/base.controller.js b/app/controllers/base.controller.js → src/controllers/base.controller.js
diff --git a/app/controllers/meta.controller.js → src/controllers/meta.controller.js b/app/controllers/meta.controller.js → src/controllers/meta.controller.js
diff --git a/app/controllers/posts.controller.js → src/controllers/posts.controller.js b/app/controllers/posts.controller.js → src/controllers/posts.controller.js
diff --git a/app/database.js → src/database.js b/app/database.js → src/database.js
@@ -10,4 +10,4 @@ mongoose.Promise = global.Promise
 mongoose.connect(Constants.mongo.uri)
 mongoose.connection.on('error', (err) => {
   throw err
-});
+})
diff --git a/app/index.js → src/index.js b/app/index.js → src/index.js
diff --git a/app/lib/util.js → src/lib/util.js b/app/lib/util.js → src/lib/util.js
diff --git a/app/middleware/access-control.js → src/middleware/access-control.js b/app/middleware/access-control.js → src/middleware/access-control.js
diff --git a/app/middleware/authenticate.js → src/middleware/authenticate.js b/app/middleware/authenticate.js → src/middleware/authenticate.js
diff --git a/app/middleware/error-handler.js → src/middleware/error-handler.js b/app/middleware/error-handler.js → src/middleware/error-handler.js
@@ -1,4 +1,5 @@
 /* @flow */
+
 import Constants from '../config/constants'
 
 export default function errorHandler(err, req, res, next) {

diff --git a/app/models/post.js → src/models/post.js b/app/models/post.js → src/models/post.js
@@ -17,7 +17,7 @@ const PostSchema = new Schema({
    //_user: { type: Schema.Types.ObjectId, ref: 'User' },
 }, {
   timestamps: true,
-});
+})
 
 const PostModel = mongoose.model('Post', PostSchema)
 

diff --git a/app/routes.js → src/routes.js b/app/routes.js → src/routes.js
diff --git a/app/server.js → src/server.js b/app/server.js → src/server.js
diff --git a/tests/factories/post.factory.js b/tests/factories/post.factory.js
@@ -1,16 +1,18 @@
-import faker from 'faker';
+/* @flow */
+
+import faker from 'faker'
 
 class PostFactory {
-  generateList(count, attrs = {}) {
-    let list = []
+  generateList(count : number, attrs : Object = {}) {
+    let list : Array<Object> = []
     while(count) {
       list.push(this.generate(attrs));
       count--;
     }
     return list;
   }
 
-  generate(attrs) {
+  generate(attrs : Object) {
     return Object.assign({}, {
       text: faker.lorem.sentence()
     }, attrs);

diff --git a/tests/routes/posts/post.create.spec.js b/tests/routes/posts/post.create.spec.js
@@ -1,25 +1,27 @@
-import { expect } from 'chai';
-import server from '../../utils/server.mock';
-import User from '../../../app/models/user';
-import Post from '../../../app/models/post';
-import UserFactory from '../../factories/user.factory';
-import PostFactory from '../../factories/post.factory';
+/* @flow */
 
-const ENDPOINT = '/posts';
-let testUser;
-let testPost;
+import { expect } from 'chai'
+import server from '../../utils/server.mock'
+import Post from '../../../app/models/post'
+import PostFactory from '../../factories/post.factory'
+
+const ENDPOINT : string = '/posts'
+let testUser
+let testPost
 
 describe(`POST ${ENDPOINT}`, () => {
+  /*
   before(() => (
     User.remove({})
     .then(() => Post.remove({}))
     .then(() => User.create(UserFactory.generate()))
     .then(u => testUser = u)
-  ));
+  ))
+  */
 
   beforeEach(() => {
-    testPost = PostFactory.generate();
-  });
+    testPost = PostFactory.generate()
+  })
 
   describe('#201', () => {
     it('should create a post', (done) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ const PostSchema = new Schema({ @@
        //_user: { type: Schema.Types.ObjectId, ref: 'User' },
     }, {
       timestamps: true,
-    });
+    })
     const PostModel = mongoose.model('Post', PostSchema)
@@ Expand Down @@