From 44be6349974c19e0d28d08fe1f78f6a791389b5a Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 7 Jan 2016 18:57:03 -0600
Subject: [PATCH] chore(): update generator directories

---
 tooling/generator.js                           | 6 +++---
 tooling/generators/component/component.tmpl.js | 4 ++--
 tooling/generators/component/index.js          | 2 +-
 tooling/generators/directive/index.js          | 2 +-
 tooling/generators/page/index.js               | 5 ++++-
 tooling/generators/page/page.tmpl.js           | 2 +-
 tooling/generators/pipe/index.js               | 6 +++---
 tooling/generators/provider/index.js           | 2 +-
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tooling/generator.js b/tooling/generator.js
index b47d25656b..932e8401f4 100644
--- a/tooling/generator.js
+++ b/tooling/generator.js
@@ -18,9 +18,9 @@ Generator.prototype.run = function(){
 
 Generator.prototype.makeDirectories = function(){
   if (!this.directory) {
-    throw new Error('Generators must define their directory in their constructor');
+    throw new Error('Generators must define their directory in their constructor.\nEx: \'pages\', \'components\', etc.');
   }
-  shell.mkdir('-p', path.join(this.appDirectory, this.directory, this.name));
+  shell.mkdir('-p', path.join(this.appDirectory, 'app', this.directory, this.fileName));
 }
 
 Generator.prototype.renderTemplates = function renderTemplates() {
@@ -28,7 +28,7 @@ Generator.prototype.renderTemplates = function renderTemplates() {
 
   templates.forEach(function(template) {
     var renderedTemplate = this.renderTemplate(template);
-    var renderedTemplateDest = path.join(this.appDirectory, this.directory, this.name, this.name + template.extension);
+    var renderedTemplateDest = path.join(this.appDirectory, 'app', this.directory, this.fileName, this.fileName + template.extension);
     console.log('√ Create'.blue, path.relative(this.appDirectory, renderedTemplateDest));
     fs.writeFileSync(renderedTemplateDest, renderedTemplate);
   }, this);
diff --git a/tooling/generators/component/component.tmpl.js b/tooling/generators/component/component.tmpl.js
index 5c868e083e..f2edb0aa5c 100644
--- a/tooling/generators/component/component.tmpl.js
+++ b/tooling/generators/component/component.tmpl.js
@@ -9,11 +9,11 @@ import {IONIC_DIRECTIVES} from 'ionic/ionic';
 */
 @Component({
   selector: '<%= fileName %>',
-  templateUrl: '<%= directory %>/<%= fileName %>/<%= fileName %>.html',
+  templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html',
   directives: [IONIC_DIRECTIVES] // makes all Ionic directives available to your component
 })
 export class <%= jsClassName %> {
   constructor() {
-    this.text = 'Hello World, I\'m <%= jsClassName %>';
+    this.text = 'Hello World';
   }
 }
diff --git a/tooling/generators/component/index.js b/tooling/generators/component/index.js
index e06a9203d7..46e9f66f05 100644
--- a/tooling/generators/component/index.js
+++ b/tooling/generators/component/index.js
@@ -5,7 +5,7 @@ module.exports = ComponentGenerator;
 
 function ComponentGenerator(options) {
   Generator.call(this, options);
-  this.directory = path.join('app', 'components');
+  this.directory = 'components';
 }
 
 ComponentGenerator.prototype = Object.create(Generator.prototype);
diff --git a/tooling/generators/directive/index.js b/tooling/generators/directive/index.js
index 4afe13b71f..f97c4bcc75 100644
--- a/tooling/generators/directive/index.js
+++ b/tooling/generators/directive/index.js
@@ -5,7 +5,7 @@ module.exports = DirectiveGenerator;
 
 function DirectiveGenerator(options) {
   Generator.call(this, options);
-  this.directory = path.join('app', 'components');
+  this.directory = 'components';
 }
 
 DirectiveGenerator.prototype = Object.create(Generator.prototype);
diff --git a/tooling/generators/page/index.js b/tooling/generators/page/index.js
index aefacee992..24cb019973 100644
--- a/tooling/generators/page/index.js
+++ b/tooling/generators/page/index.js
@@ -5,7 +5,10 @@ module.exports = PageGenerator;
 
 function PageGenerator(options) {
   Generator.call(this, options);
-  this.directory = path.join('app', 'pages');
+  this.directory = 'pages';
+  this.jsClassName += 'Page';
 }
 
 PageGenerator.prototype = Object.create(Generator.prototype);
+
+
diff --git a/tooling/generators/page/page.tmpl.js b/tooling/generators/page/page.tmpl.js
index 507acf1404..8f453be589 100644
--- a/tooling/generators/page/page.tmpl.js
+++ b/tooling/generators/page/page.tmpl.js
@@ -7,7 +7,7 @@ import {Page, NavController} from 'ionic/ionic';
   Ionic pages and navigation.
 */
 @Page({
-  templateUrl: '<%= directory %>/<%= fileName %>/<%= fileName %>.html',
+  templateUrl: 'build/<%= directory %>/<%= fileName %>/<%= fileName %>.html',
 })
 export class <%= jsClassName %> {
   constructor(nav: NavController) {
diff --git a/tooling/generators/pipe/index.js b/tooling/generators/pipe/index.js
index 7f4765c480..c5c56ccd0b 100644
--- a/tooling/generators/pipe/index.js
+++ b/tooling/generators/pipe/index.js
@@ -8,13 +8,13 @@ module.exports = PipeGenerator;
 
 function PipeGenerator(options) {
   Generator.call(this, options);
-  this.directory = path.join('app', 'pipes');
+  this.directory = 'pipes';
 }
 
 PipeGenerator.prototype = Object.create(Generator.prototype);
 
 PipeGenerator.prototype.makeDirectories = function(){
-  shell.mkdir('-p', path.join(this.appDirectory, this.directory));
+  shell.mkdir('-p', path.join(this.appDirectory, 'app', this.directory));
 }
 
 PipeGenerator.prototype.renderTemplates = function renderTemplates() {
@@ -22,7 +22,7 @@ PipeGenerator.prototype.renderTemplates = function renderTemplates() {
 
   templates.forEach(function(template) {
     var renderedTemplate = this.renderTemplate(template);
-    var renderedTemplateDest = path.join(this.appDirectory, this.directory, this.name + template.extension);
+    var renderedTemplateDest = path.join(this.appDirectory, 'app', this.directory, this.name + template.extension);
     console.log('√ Create'.blue, path.relative(this.appDirectory, renderedTemplateDest));
     fs.writeFileSync(renderedTemplateDest, renderedTemplate);
   }, this);
diff --git a/tooling/generators/provider/index.js b/tooling/generators/provider/index.js
index 119bcbb304..55900578fa 100644
--- a/tooling/generators/provider/index.js
+++ b/tooling/generators/provider/index.js
@@ -5,7 +5,7 @@ module.exports = ProviderGenerator;
 
 function ProviderGenerator(options) {
   Generator.call(this, options);
-  this.directory = path.join('app', 'providers');
+  this.directory = 'providers';
 }
 
 ProviderGenerator.prototype = Object.create(Generator.prototype);