From daf71f27ba1ae0801f0f3235eaa87598f0912a59 Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 2 May 2014 22:06:52 +0100
Subject: [PATCH] chore(bower): move bower_components under the app folder

This will help web servers who are not happy to serve up files outside
the "root" folder of the application.

Closes #183
Closes #182
---
 .bowerrc           | 3 +++
 README.md          | 6 +++++-
 app/index.html     | 4 ++--
 test/karma.conf.js | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 .bowerrc

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 0000000000..8c58c8efc9
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "app/bower_components"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 07f4f5f1e7..8e9b387f9d 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,11 @@ Behind the scenes this will also call `bower install`.  You should find that you
 folders in your project.
 
 * `node_modules` - contains the npm packages for the tools we need
-* `bower_components` - contains the angular framework files
+* `app/bower_components` - contains the angular framework files
+
+*Note that the `bower_components` folder would normally be installed in the root folder but
+angular-seed changes this location through the `.bowerrc` file.  Putting it in the app folder makes
+it easier to serve the files by a webserver.*
 
 ### Run the Application
 
diff --git a/app/index.html b/app/index.html
index ba48f4d6fe..d22be8b305 100644
--- a/app/index.html
+++ b/app/index.html
@@ -31,8 +31,8 @@
   <!-- In production use:
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/x.x.x/angular.min.js"></script>
   -->
-  <script src="../bower_components/angular/angular.js"></script>
-  <script src="../bower_components/angular-route/angular-route.js"></script>
+  <script src="bower_components/angular/angular.js"></script>
+  <script src="bower_components/angular-route/angular-route.js"></script>
   <script src="js/app.js"></script>
   <script src="js/services.js"></script>
   <script src="js/controllers.js"></script>
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 3b77e80188..1aee850a6c 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -4,9 +4,9 @@ module.exports = function(config){
     basePath : '../',
 
     files : [
-      'bower_components/angular/angular.js',
-      'bower_components/angular-route/angular-route.js',
-      'bower_components/angular-mocks/angular-mocks.js',
+      'app/bower_components/angular/angular.js',
+      'app/bower_components/angular-route/angular-route.js',
+      'app/bower_components/angular-mocks/angular-mocks.js',
       'app/js/**/*.js',
       'test/unit/**/*.js'
     ],