Fixed module generation and scripts import

Author: fnqista

angular-app-base.js

@@ -56,6 +56,10 @@ var Generator = module.exports = function AngularAppBase(args, options) {
     this.appPath = angularUtils.replaceBackSlashesWithSlashes(path.join(this.srcPath, this.modulesPath, this.appName));
     this.bowerDependenciesLocation = angularUtils.replaceBackSlashesWithSlashes(path.join(this.srcPath, this.scriptsPath));
     this.appScriptsTestPath = angularUtils.replaceBackSlashesWithSlashes(path.join(this.testPath, this.modulesPath, this.appName, this.scriptsTestPath));
+    this.env.options.appName = this.appName;
+    this.modules = this.modulesConfig.modules || {};
+    this.modules[this.appName] = this.appPath;
+    this.modulesAsJSON = JSON.stringify(this.modules);
   }
 
   if (this.env.options.appName) {

app/index.js

@@ -109,13 +109,11 @@ Generator.prototype.requireAppName = function askForAppName() {
       } else {
         this.appName = props.appName;
         this.resolveModule(this.appName);
-        this.env.options.appName = this.appName;
-        this.modules = this.modulesConfig.modules || {};
-        this.modules[this.appName] = this.appPath;
-        this.modulesAsJSON = JSON.stringify(this.modules);
         cb();
       }
     }.bind(this));
+  } else {
+    this.resolveModule(this.appName);
   }
 };
 

route/index.js

@@ -24,11 +24,12 @@ Generator.prototype.rewriteAppJs = function () {
   var config = {
     file: path.join(
       this.appName,
-      'scripts/app.' + (coffee ? 'coffee' : 'js')
+      this.scriptsPath,
+      'app.' + (coffee ? 'coffee' : 'js')
     ),
     needle: '.otherwise',
     splicable: [
-      "  templateUrl: 'views/" + this.name.toLowerCase() + ".html'" + (coffee ? "" : "," ),
+      "  templateUrl: '" + this.viewsPath + "/" + this.name.toLowerCase() + ".html'" + (coffee ? "" : "," ),
       "  controller: '" + this.classedName + "Ctrl'"
     ]
   };