Move src/routes.js to src/api/index.js

diegohaz · Oct 27, 2016 · a8de026 · a8de026
1 parent 04dacbc
commit a8de026
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/generators/api/index.js b/generators/api/index.js
@@ -159,7 +159,7 @@ module.exports = yeoman.Base.extend({
 
   writing: function () {
     var props = this.props;
-    var routesFile = path.join(props.srcDir, 'routes.js');
+    var routesFile = path.join(props.dir, 'index.js');
     var copyTpl = this.fs.copyTpl.bind(this.fs);
     var tPath = this.templatePath.bind(this);
     var dPath = this.destinationPath.bind(this);
@@ -183,9 +183,7 @@ module.exports = yeoman.Base.extend({
         return statement.type === 'ImportDeclaration';
       });
       var actualImportCode = recast.print(body[lastImportIndex]).code;
-      var importString = [
-        'import ', props.camel, ' from \'./', props.apiDir, '/', props.kebab, '\''
-      ].join('');
+      var importString = ['import ', props.camel, ' from \'./', props.kebab, '\''].join('');
       body.splice(lastImportIndex, 1, importString);
       body.splice(lastImportIndex, 0, actualImportCode);
 

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -109,6 +109,7 @@ module.exports = yeoman.Base.extend({
     copyTpl(tPath('src'), dPath(props.srcDir), props);
     copyTpl(tPath('test'), dPath('test'), props);
     copyTpl(tPath('services/response'), dPath(props.srcDir + '/services/response'), props);
+    copyTpl(tPath('api/index.js'), dPath(props.srcDir + '/' + props.apiDir + '/index.js'), props);
 
     if (props.generateAuthApi) {
       copyTpl(tPath('services/passport'), dPath(props.srcDir + '/services/passport'), props);

diff --git a/generators/app/templates/src/routes.js → generators/app/templates/api/index.js b/generators/app/templates/src/routes.js → generators/app/templates/api/index.js
@@ -1,10 +1,10 @@
 import { Router } from 'express'
 <%_ if (generateAuthApi) { _%>
-import user from './<%= apiDir %>/user'
-import auth from './<%= apiDir %>/auth'
+import user from './user'
+import auth from './auth'
 <%_ } _%>
 <%_ if (typeof passwordReset !== 'undefined' && passwordReset) { _%>
-import passwordReset from './<%= apiDir %>/password-reset'
+import passwordReset from './password-reset'
 <%_ } _%>
 
 const router = new Router()

diff --git a/generators/app/templates/src/app.js b/generators/app/templates/src/app.js
@@ -2,9 +2,9 @@ import http from 'http'
 import { env, mongo, port, ip } from './config'
 import mongoose from './config/mongoose'
 import express from './config/express'
-import routes from './routes'
+import api from './api'
 
-const app = express(routes)
+const app = express(api)
 const server = http.createServer(app)
 
 mongoose.connect(mongo.uri)