From f1180178cefb8caad713c8b1a2e1eaf3edf691ef Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:41:07 +0200
Subject: [PATCH 1/9] change views file pattern to a more flexible one

---
 config/assets/default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/assets/default.js b/config/assets/default.js
index 85917d595d..5ddb74d901 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -34,7 +34,7 @@ module.exports = {
       'modules/*/client/*.js',
       'modules/*/client/**/*.js'
     ],
-    views: ['modules/*/client/views/**/*.html'],
+    views: ['modules/*/client/**/*client.view.html'],
     templates: ['build/templates.js']
   },
   server: {

From 6e0a4743712e49eda4bb74cb23b6ea10cb9233e7 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:42:13 +0200
Subject: [PATCH 2/9] setting globbed html files

---
 config/config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/config.js b/config/config.js
index c129edfa3c..ae77a82d71 100644
--- a/config/config.js
+++ b/config/config.js
@@ -132,6 +132,9 @@ var initGlobalConfigFiles = function (config, assets) {
   // Setting Globbed css files
   config.files.client.css = getGlobbedPaths(assets.client.lib.css, 'public/').concat(getGlobbedPaths(assets.client.css, ['public/']));
 
+  // Setting Globbed html files
+  config.files.client.html = getGlobbedPaths(assets.client.views, 'public/');
+  
   // Setting Globbed test files
   config.files.client.tests = getGlobbedPaths(assets.client.tests);
 };

From 52b02d31564557f47d377e0893d71d31617181fb Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:43:44 +0200
Subject: [PATCH 3/9] adding globbed html files to express app.locals

---
 config/lib/express.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/lib/express.js b/config/lib/express.js
index 59f3cc4c46..99294e106f 100644
--- a/config/lib/express.js
+++ b/config/lib/express.js
@@ -34,6 +34,7 @@ module.exports.initLocalVariables = function (app) {
   app.locals.facebookAppId = config.facebook.clientID;
   app.locals.jsFiles = config.files.client.js;
   app.locals.cssFiles = config.files.client.css;
+  app.locals.htmlFiles = config.files.client.html;
   app.locals.livereload = config.livereload;
   app.locals.logo = config.logo;
   app.locals.favicon = config.favicon;

From fc553366ac21361bd8fd121103b2c40b9368dc68 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:46:22 +0200
Subject: [PATCH 4/9] preparing views to be embedded

---
 .../controllers/core.server.controller.js     | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index 0f216b8063..08926c3d6d 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -1,11 +1,34 @@
 'use strict';
 
+var fs = require('fs'),
+  path = require('path'),
+  async = require('async');
+
+function readViewFromDisk (viewPath, callback) {
+  var splittedPath = viewPath.split('/');
+  var viewName = splittedPath[splittedPath.length-1].split('.')[0];
+  fs.readFile(path.resolve(viewPath), 'utf8', function (err, file) {
+    if(err) {
+      callback(err);
+    } else {
+      callback(null, {
+        name: viewName,
+        file: file
+      });
+    }
+  });
+}
 /**
  * Render the main application page
  */
 exports.renderIndex = function (req, res) {
-  res.render('modules/core/server/views/index', {
-    user: req.user || null
+  async.concat(res.app.locals.htmlFiles, readViewFromDisk, function (err, embeddableViews) {
+    if(err)
+      return res.status(500).send(err);
+    res.locals.htmlFiles = embeddableViews;
+    res.render('modules/core/server/views/index', {
+      user: req.user || null
+    });
   });
 };
 

From edf05fb1024cf1fedb9ab243f78af319da9a183a Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:49:55 +0200
Subject: [PATCH 5/9] embedding views in layout.server.view

---
 modules/core/server/views/layout.server.view.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
index c10f4e62d8..e6d56ee6c8 100644
--- a/modules/core/server/views/layout.server.view.html
+++ b/modules/core/server/views/layout.server.view.html
@@ -43,6 +43,11 @@
     </section>
   </section>
 
+  <!--Embedding views, load in ui-router using their ID instead of the file path. ID = (fileName removing .client.view.html)-->
+  {% for html in htmlFiles %}
+    <script type="text/ng-template" id="{{html.name}}">{{html.file | safe}}</script>
+  {% endfor %}
+
   <!--Embedding The User Object-->
   <script type="text/javascript">
     var user = {{ user | json | safe }};

From 096ed3700d28e6ca9cd4f93cb347b163c341fc82 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 00:52:43 +0200
Subject: [PATCH 6/9] loading views from embedded templates

---
 .../client/config/articles.client.routes.js   |  8 +++----
 .../chat/client/config/chat.client.routes.js  |  2 +-
 .../core/client/config/core.client.routes.js  |  8 +++----
 .../config/users-admin.client.routes.js       |  6 ++---
 .../client/config/users.client.routes.js      | 24 +++++++++----------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/articles/client/config/articles.client.routes.js b/modules/articles/client/config/articles.client.routes.js
index 6938867d90..a1f8e3ad84 100644
--- a/modules/articles/client/config/articles.client.routes.js
+++ b/modules/articles/client/config/articles.client.routes.js
@@ -12,22 +12,22 @@ angular.module('articles').config(['$stateProvider',
       })
       .state('articles.list', {
         url: '',
-        templateUrl: 'modules/articles/client/views/list-articles.client.view.html'
+        templateUrl: 'list-articles'
       })
       .state('articles.create', {
         url: '/create',
-        templateUrl: 'modules/articles/client/views/create-article.client.view.html',
+        templateUrl: 'create-article',
         data: {
           roles: ['user', 'admin']
         }
       })
       .state('articles.view', {
         url: '/:articleId',
-        templateUrl: 'modules/articles/client/views/view-article.client.view.html'
+        templateUrl: 'view-article'
       })
       .state('articles.edit', {
         url: '/:articleId/edit',
-        templateUrl: 'modules/articles/client/views/edit-article.client.view.html',
+        templateUrl: 'edit-article',
         data: {
           roles: ['user', 'admin']
         }
diff --git a/modules/chat/client/config/chat.client.routes.js b/modules/chat/client/config/chat.client.routes.js
index 38649c6802..861ee87249 100644
--- a/modules/chat/client/config/chat.client.routes.js
+++ b/modules/chat/client/config/chat.client.routes.js
@@ -6,7 +6,7 @@ angular.module('chat').config(['$stateProvider',
     $stateProvider
       .state('chat', {
         url: '/chat',
-        templateUrl: 'modules/chat/client/views/chat.client.view.html',
+        templateUrl: 'chat',
         data: {
           roles: ['user', 'admin']
         }
diff --git a/modules/core/client/config/core.client.routes.js b/modules/core/client/config/core.client.routes.js
index cec96327f9..b9cdb82142 100644
--- a/modules/core/client/config/core.client.routes.js
+++ b/modules/core/client/config/core.client.routes.js
@@ -15,25 +15,25 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider',
     $stateProvider
     .state('home', {
       url: '/',
-      templateUrl: 'modules/core/client/views/home.client.view.html'
+      templateUrl: 'home'
     })
     .state('not-found', {
       url: '/not-found',
-      templateUrl: 'modules/core/client/views/404.client.view.html',
+      templateUrl: '404',
       data: {
         ignoreState: true
       }
     })
     .state('bad-request', {
       url: '/bad-request',
-      templateUrl: 'modules/core/client/views/400.client.view.html',
+      templateUrl: '400',
       data: {
         ignoreState: true
       }
     })
     .state('forbidden', {
       url: '/forbidden',
-      templateUrl: 'modules/core/client/views/403.client.view.html',
+      templateUrl: '403',
       data: {
         ignoreState: true
       }
diff --git a/modules/users/client/config/users-admin.client.routes.js b/modules/users/client/config/users-admin.client.routes.js
index 15d15f3fba..6f8c3b03f6 100644
--- a/modules/users/client/config/users-admin.client.routes.js
+++ b/modules/users/client/config/users-admin.client.routes.js
@@ -6,12 +6,12 @@ angular.module('users.admin.routes').config(['$stateProvider',
     $stateProvider
       .state('admin.users', {
         url: '/users',
-        templateUrl: 'modules/users/client/views/admin/list-users.client.view.html',
+        templateUrl: 'list-users',
         controller: 'UserListController'
       })
       .state('admin.user', {
         url: '/users/:userId',
-        templateUrl: 'modules/users/client/views/admin/view-user.client.view.html',
+        templateUrl: 'view-user',
         controller: 'UserController',
         resolve: {
           userResolve: ['$stateParams', 'Admin', function ($stateParams, Admin) {
@@ -23,7 +23,7 @@ angular.module('users.admin.routes').config(['$stateProvider',
       })
       .state('admin.user-edit', {
         url: '/users/:userId/edit',
-        templateUrl: 'modules/users/client/views/admin/edit-user.client.view.html',
+        templateUrl: 'edit-user',
         controller: 'UserController',
         resolve: {
           userResolve: ['$stateParams', 'Admin', function ($stateParams, Admin) {
diff --git a/modules/users/client/config/users.client.routes.js b/modules/users/client/config/users.client.routes.js
index 36ef995c55..7d1049610e 100644
--- a/modules/users/client/config/users.client.routes.js
+++ b/modules/users/client/config/users.client.routes.js
@@ -8,39 +8,39 @@ angular.module('users').config(['$stateProvider',
       .state('settings', {
         abstract: true,
         url: '/settings',
-        templateUrl: 'modules/users/client/views/settings/settings.client.view.html',
+        templateUrl: 'settings',
         data: {
           roles: ['user', 'admin']
         }
       })
       .state('settings.profile', {
         url: '/profile',
-        templateUrl: 'modules/users/client/views/settings/edit-profile.client.view.html'
+        templateUrl: 'edit-profile'
       })
       .state('settings.password', {
         url: '/password',
-        templateUrl: 'modules/users/client/views/settings/change-password.client.view.html'
+        templateUrl: 'change-password'
       })
       .state('settings.accounts', {
         url: '/accounts',
-        templateUrl: 'modules/users/client/views/settings/manage-social-accounts.client.view.html'
+        templateUrl: 'manage-social-accounts'
       })
       .state('settings.picture', {
         url: '/picture',
-        templateUrl: 'modules/users/client/views/settings/change-profile-picture.client.view.html'
+        templateUrl: 'change-profile-picture'
       })
       .state('authentication', {
         abstract: true,
         url: '/authentication',
-        templateUrl: 'modules/users/client/views/authentication/authentication.client.view.html'
+        templateUrl: 'authentication'
       })
       .state('authentication.signup', {
         url: '/signup',
-        templateUrl: 'modules/users/client/views/authentication/signup.client.view.html'
+        templateUrl: 'signup'
       })
       .state('authentication.signin', {
         url: '/signin?err',
-        templateUrl: 'modules/users/client/views/authentication/signin.client.view.html'
+        templateUrl: 'signin'
       })
       .state('password', {
         abstract: true,
@@ -49,7 +49,7 @@ angular.module('users').config(['$stateProvider',
       })
       .state('password.forgot', {
         url: '/forgot',
-        templateUrl: 'modules/users/client/views/password/forgot-password.client.view.html'
+        templateUrl: 'forgot-password'
       })
       .state('password.reset', {
         abstract: true,
@@ -58,15 +58,15 @@ angular.module('users').config(['$stateProvider',
       })
       .state('password.reset.invalid', {
         url: '/invalid',
-        templateUrl: 'modules/users/client/views/password/reset-password-invalid.client.view.html'
+        templateUrl: 'reset-password-invalid'
       })
       .state('password.reset.success', {
         url: '/success',
-        templateUrl: 'modules/users/client/views/password/reset-password-success.client.view.html'
+        templateUrl: 'reset-password-success'
       })
       .state('password.reset.form', {
         url: '/:token',
-        templateUrl: 'modules/users/client/views/password/reset-password.client.view.html'
+        templateUrl: 'reset-password'
       });
   }
 ]);

From 6f5b84527845145282e2dee2a51e66a6afee6ac1 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 12:53:48 +0200
Subject: [PATCH 7/9] tests pass

---
 karma.conf.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 2002bb3f7e..7445f625f3 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -14,14 +14,17 @@ module.exports = function (karmaConfig) {
     frameworks: ['jasmine'],
 
     preprocessors: {
-      'modules/*/client/views/**/*.html': ['ng-html2js']
+      'modules/*/client/**/*client.view.html': ['ng-html2js']
     },
 
     ngHtml2JsPreprocessor: {
       moduleName: 'mean',
 
       cacheIdFromPath: function (filepath) {
-        return filepath;
+        //the returned value must match the IDs used in templateUrl inside the angular app
+        var splittedPath = filepath.split('/');
+        var viewName = splittedPath[splittedPath.length-1].split('.')[0];
+        return viewName;
       },
     },
 

From 147e6725b6cd5e5d2bc6b43b4bba1b71ac25cac8 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 13:15:16 +0200
Subject: [PATCH 8/9] will this make coverage go up? anyway doesn't hurt

---
 .../controllers/core.server.controller.js     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index 08926c3d6d..f3dd4949ac 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -4,24 +4,24 @@ var fs = require('fs'),
   path = require('path'),
   async = require('async');
 
-function readViewFromDisk (viewPath, callback) {
-  var splittedPath = viewPath.split('/');
-  var viewName = splittedPath[splittedPath.length-1].split('.')[0];
-  fs.readFile(path.resolve(viewPath), 'utf8', function (err, file) {
-    if(err) {
-      callback(err);
-    } else {
-      callback(null, {
-        name: viewName,
-        file: file
-      });
-    }
-  });
-}
 /**
  * Render the main application page
  */
 exports.renderIndex = function (req, res) {
+  function readViewFromDisk (viewPath, callback) {
+    var splittedPath = viewPath.split('/');
+    var viewName = splittedPath[splittedPath.length-1].split('.')[0];
+    fs.readFile(path.resolve(viewPath), 'utf8', function (err, file) {
+      if(err) {
+        callback(err);
+      } else {
+        callback(null, {
+          name: viewName,
+          file: file
+        });
+      }
+    });
+  }
   async.concat(res.app.locals.htmlFiles, readViewFromDisk, function (err, embeddableViews) {
     if(err)
       return res.status(500).send(err);

From 41efa9df22da8624943e9dcf5ef0b7029a9172f8 Mon Sep 17 00:00:00 2001
From: Andrea da Fonseca <me@adf.ninja>
Date: Wed, 9 Sep 2015 17:20:08 +0200
Subject: [PATCH 9/9] following some indications from codydaig and mleanos

---
 config/assets/default.js                      |  2 +-
 karma.conf.js                                 |  2 +-
 .../controllers/core.server.controller.js     | 22 ++++++++++---------
 .../core/server/views/layout.server.view.html |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/config/assets/default.js b/config/assets/default.js
index 5ddb74d901..85917d595d 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -34,7 +34,7 @@ module.exports = {
       'modules/*/client/*.js',
       'modules/*/client/**/*.js'
     ],
-    views: ['modules/*/client/**/*client.view.html'],
+    views: ['modules/*/client/views/**/*.html'],
     templates: ['build/templates.js']
   },
   server: {
diff --git a/karma.conf.js b/karma.conf.js
index 7445f625f3..fd485dfee2 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -14,7 +14,7 @@ module.exports = function (karmaConfig) {
     frameworks: ['jasmine'],
 
     preprocessors: {
-      'modules/*/client/**/*client.view.html': ['ng-html2js']
+      'modules/*/client/views/**/*.html': ['ng-html2js']
     },
 
     ngHtml2JsPreprocessor: {
diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index f3dd4949ac..1b5fba7b3d 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -10,25 +10,27 @@ var fs = require('fs'),
 exports.renderIndex = function (req, res) {
   function readViewFromDisk (viewPath, callback) {
     var splittedPath = viewPath.split('/');
-    var viewName = splittedPath[splittedPath.length-1].split('.')[0];
+    var viewId = splittedPath[splittedPath.length-1].split('.')[0];
     fs.readFile(path.resolve(viewPath), 'utf8', function (err, file) {
       if(err) {
         callback(err);
       } else {
         callback(null, {
-          name: viewName,
-          file: file
+          id: viewId,
+          content: file
         });
       }
     });
   }
-  async.concat(res.app.locals.htmlFiles, readViewFromDisk, function (err, embeddableViews) {
-    if(err)
-      return res.status(500).send(err);
-    res.locals.htmlFiles = embeddableViews;
-    res.render('modules/core/server/views/index', {
-      user: req.user || null
-    });
+  async.map(res.app.locals.htmlFiles, readViewFromDisk, function (err, embeddableViews) {
+    if(err) {
+      res.status(500).send(err);
+    } else {
+      res.locals.htmlFiles = embeddableViews;
+      res.render('modules/core/server/views/index', {
+        user: req.user || null
+      });
+    }
   });
 };
 
diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
index e6d56ee6c8..1b1156e32c 100644
--- a/modules/core/server/views/layout.server.view.html
+++ b/modules/core/server/views/layout.server.view.html
@@ -44,8 +44,8 @@
   </section>
 
   <!--Embedding views, load in ui-router using their ID instead of the file path. ID = (fileName removing .client.view.html)-->
-  {% for html in htmlFiles %}
-    <script type="text/ng-template" id="{{html.name}}">{{html.file | safe}}</script>
+  {% for htmlFile in htmlFiles %}
+    <script type="text/ng-template" id="{{htmlFile.id}}">{{htmlFile.content | safe}}</script>
   {% endfor %}
 
   <!--Embedding The User Object-->