Move rotas para diretorio routes

Author: raphaellima8

gulpfile.js

@@ -9,7 +9,7 @@ gulp.task('scripts', () => {
   return tsResult.js.pipe(gulp.dest('dist'));
 });
 
-gulp.task('watch', ['scripts', 'cp'], () => {
+gulp.task('watch', ['scripts'], () => {
   gulp.watch('**/*.ts', ['scripts']);
 });
 

server/api/api.js

@@ -1,16 +1,14 @@
 "use strict";
 var express = require('express');
 var logger = require('morgan');
-var routes_1 = require('../modules/User/routes');
-var routes_2 = require('../modules/auth/routes');
 var auth_1 = require('../auth');
+var routes_1 = require('./routes/routes');
 var bodyParser = require('body-parser');
 var Api = (function () {
     function Api() {
         this.express = express();
         this.middleware();
-        this.router = new routes_1["default"]();
-        this.routes();
+        this.router(this.express);
     }
     Api.prototype.middleware = function () {
         this.express.use(logger('dev'));
@@ -19,13 +17,8 @@ var Api = (function () {
         this.auth = auth_1["default"]();
         this.express.use(this.auth.initialize());
     };
-    Api.prototype.routes = function () {
-        this.express.route('/api/users/all').get(this.router.index);
-        this.express.route('/api/users/create').post(this.router.create);
-        this.express.route('/api/users/:id').get(this.router.findOne);
-        this.express.route('/api/users/:id/update').put(this.router.update);
-        this.express.route('/api/users/:id/destroy').delete(this.router.destroy);
-        this.express.use('/token', routes_2["default"](this.auth));
+    Api.prototype.router = function (app) {
+        new routes_1["default"](app);
     };
     return Api;
 }());

server/api/api.ts

@@ -1,23 +1,20 @@
 import * as express from 'express';
 import * as path from 'path';
 import * as logger from 'morgan';
-import UserRoutes from '../modules/User/routes';
-import tokenRoute from '../modules/auth/routes';
 import authConfig from '../auth';
+import Routes from './routes/routes';
 
 const bodyParser = require('body-parser');
 
 class Api {
 
   public express: express.Application;
   public auth;
-  public router: UserRoutes;
-
+  
   constructor(){
     this.express = express();
     this.middleware();
-    this.router = new UserRoutes();
-    this.routes();
+    this.router(this.express);
   }
 
   middleware(): void {
@@ -28,15 +25,9 @@ class Api {
     this.express.use(this.auth.initialize());
   }
 
-  private routes(): void {
-    this.express.route('/api/users/all').get(this.router.index);
-    this.express.route('/api/users/create').post(this.router.create);
-    this.express.route('/api/users/:id').get(this.router.findOne);
-    this.express.route('/api/users/:id/update').put(this.router.update);
-    this.express.route('/api/users/:id/destroy').delete(this.router.destroy);
-    this.express.use('/token', tokenRoute(this.auth));
+  private router(app: express.Application): void {
+    new Routes(app);
   }
-
 }
 
 export default new Api().express;

server/api/routes/routes.js

@@ -0,0 +1,18 @@
+"use strict";
+var routes_1 = require('../../modules/User/routes');
+var Routes = (function () {
+    function Routes(app) {
+        this.router = new routes_1["default"]();
+        this.getRoutes(app);
+    }
+    Routes.prototype.getRoutes = function (app) {
+        app.route('/api/users/all').get(this.router.index);
+        app.route('/api/users/create').post(this.router.create);
+        app.route('/api/users/:id').get(this.router.findOne);
+        app.route('/api/users/:id/update').put(this.router.update);
+        app.route('/api/users/:id/destroy').delete(this.router.destroy);
+    };
+    return Routes;
+}());
+exports.__esModule = true;
+exports["default"] = Routes;

server/api/routes/routes.ts

@@ -0,0 +1,23 @@
+import {Application} from 'express';
+import UserRoutes from '../../modules/User/routes';
+import tokenRoute from '../../modules/auth/routes';
+
+class Routes {
+
+    private router: UserRoutes;
+
+    constructor(app: Application){
+        this.router = new UserRoutes();
+        this.getRoutes(app);
+    }
+
+    getRoutes(app: Application): void {
+        app.route('/api/users/all').get(this.router.index);
+        app.route('/api/users/create').post(this.router.create);
+        app.route('/api/users/:id').get(this.router.findOne);
+        app.route('/api/users/:id/update').put(this.router.update);
+        app.route('/api/users/:id/destroy').delete(this.router.destroy);
+    }
+}
+
+export default Routes;

server/modules/User/test.ts

@@ -1,7 +1,7 @@
 import {app, req, expect, Chai} from '../../config/tests/functional/helpers';
 import * as jwt from 'jwt-simple';
 import * as _ from 'lodash';
-const config = require('../../config/config');
+const config = require('../../config/env/config');
 let id;
 const userDefault = {
     id: 1,