remove public folder and put bower components into bower components

abhisekb · Jun 24, 2014 · c58d2dc · c58d2dc
1 parent cc7f29a
commit c58d2dc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,5 +1,5 @@
 {
-  "directory": "public/lib",
+  "directory": "bower_components",
   "storage": {
           "packages": ".bower-cache",
           "registry": ".bower-registry"

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 .idea/
 nbproject/
 node_modules/
-public/lib
+bower_components
 mean.iml
 test/coverage/
 modules/public/

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,9 +1,9 @@
 'use strict';
 
 var paths = {
-    js: ['*.js', 'public/**/*.js', 'test/**/*.js', '!test/coverage/**', '!public/lib/**', 'packages/**/*.js', '!packages/**/node_modules/**'],
-    html: ['public/**/views/**', 'packages/**/public/**/views/**', 'packages/**/server/views/**'],
-    css: ['public/**/css/*.css', '!public/lib/**', 'packages/**/public/**/css/*.css']
+    js: ['*.js', 'test/**/*.js', '!test/coverage/**', '!bower_components/**', 'packages/**/*.js', '!packages/**/node_modules/**'],
+    html: ['packages/**/public/**/views/**', 'packages/**/server/views/**'],
+    css: ['!bower_components/**', 'packages/**/public/**/css/*.css']
 };
 
 module.exports = function(grunt) {
@@ -16,7 +16,7 @@ module.exports = function(grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         assets: grunt.file.readJSON('config/assets.json'),
-        clean: ['public/build'],
+        clean: ['bower_components/build'],
         watch: {
             js: {
                 files: paths.js,
@@ -71,7 +71,7 @@ module.exports = function(grunt) {
                 script: 'server.js',
                 options: {
                     args: [],
-                    ignore: ['public/**', 'node_modules/**'],
+                    ignore: ['node_modules/**'],
                     ext: 'js,html',
                     nodeArgs: ['--debug'],
                     delayTime: 1,

diff --git a/config/assets.json b/config/assets.json
@@ -1,23 +1,20 @@
 {
     "core": {
         "css": {
-            "public/build/css/dist.min.css": [
-                "public/**/assets/css/*.css"
+            "bower_components/build/css/dist.min.css": [
             ]
         },
         "js": {
-            "public/build/js/dist.min.js": [
-                "public/lib/jquery/dist/jquery.min.js",
-                "public/lib/angular/angular.js",
-                "public/lib/angular-mocks/angular-mocks.js",
-                "public/lib/angular-cookies/angular-cookies.js",
-                "public/lib/angular-resource/angular-resource.js",
-                "public/lib/angular-ui-router/release/angular-ui-router.js",
-                "public/lib/angular-bootstrap/ui-bootstrap.js",
-                "public/lib/angular-bootstrap/ui-bootstrap-tpls.js",
-                "system/init.js",
-                "public/*/*.js",
-                "public/*/{controllers,routes,services}/*.js"
+            "bower_components/build/js/dist.min.js": [
+                "bower_components/jquery/dist/jquery.min.js",
+                "bower_components/angular/angular.js",
+                "bower_components/angular-mocks/angular-mocks.js",
+                "bower_components/angular-cookies/angular-cookies.js",
+                "bower_components/angular-resource/angular-resource.js",
+                "bower_components/angular-ui-router/release/angular-ui-router.js",
+                "bower_components/angular-bootstrap/ui-bootstrap.js",
+                "bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
+                "system/init.js"                
             ]
         }
     }

diff --git a/packages/system/server/views/includes/head.html b/packages/system/server/views/includes/head.html
@@ -21,7 +21,7 @@
         <link rel="stylesheet" href="{{file}}">
     {% endfor %}
 
-    <link rel="stylesheet" href="/public/lib/bootstrap/dist/css/bootstrap.css">
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css">
 
     <link rel="stylesheet" href="/modules/aggregated.css">