- Renamed 'lib' to 'bower_components' because we need to easily differentiate npm/component/bower packages.

- Started to add CSS back.

.gitignore

@@ -1,5 +1,5 @@
 /node_modules/
-/res/lib/
+/res/bower_components/
 /doc/*.png
 /rethinkdb_data/
 /.env

bower.json

@@ -8,7 +8,8 @@
     "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git",
     "socket.io-client": "~0.9.16",
     "lodash": "~2.4.1",
-    "oboe": "~1.14.0"
+    "oboe": "~1.14.0",
+    "fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git"
   },
   "private": true
 }

component.json

@@ -0,0 +1,20 @@
+{
+  "name": "stf",
+  "repo": "stf/stf",
+  "description": "STF Main Component",
+  "version": "0.0.1",
+  "keywords": [],
+  "dependencies": {},
+  "development": {},
+  "license": "MIT",
+  "main": "res/app/app.js",
+  "scripts": [
+    "res/app/app.js"
+  ],
+  "remotes": [
+    "http://ghe.amb.ca.local"
+  ],
+  "paths": [
+    "res/components"
+  ]
+}

lib/middleware/webpack.js

@@ -14,7 +14,7 @@ var webpackOptions = {
   },
   resolve: {
     modulesDirectories: [
-      pathutil.resource('lib'),
+      pathutil.resource('bower_components'),
         pathutil.resource('app') + '/components',
       'web_modules',
       './../../node_modules'
@@ -34,7 +34,7 @@ var webpackOptions = {
       { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}
     ],
     noParse: [
-      //  pathutil.resource('lib')
+      //  pathutil.resource('bower_components')
     ]
   },
   plugins: [

lib/roles/app.js

@@ -40,7 +40,7 @@ module.exports = function(options) {
 
   app.use(cors())
 
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('app')))
 
   if (!options.disableWatch) {

lib/roles/auth/ldap.js

@@ -28,7 +28,7 @@ module.exports = function(options) {
   app.use(express.urlencoded())
   app.use(express.csrf())
   app.use(validator())
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('auth-ldap')))
 
   app.use(function(req, res, next) {

lib/roles/auth/mock.js

@@ -27,7 +27,7 @@ module.exports = function(options) {
   app.use(express.urlencoded())
   app.use(express.csrf())
   app.use(validator())
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('auth-mock')))
 
   app.use(function(req, res, next) {

res/app/app.js

@@ -1,7 +1,10 @@
 require('angular')
 require('angular-route')
 
-//require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/se7en-font.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/style.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
 
 
 

res/auth-ldap/scripts/main.js

@@ -1,7 +1,7 @@
 require.config({
   paths: {
-    'angular': '../lib/angular/angular'
+    'angular': '../bower_components/angular/angular'
-  , 'angular-route': '../lib/angular-route/angular-route'
+  , 'angular-route': '../bower_components/angular-route/angular-route'
   }
 , shim: {
     'angular': {

res/auth-mock/scripts/main.js

@@ -1,7 +1,7 @@
 require.config({
   paths: {
-    'angular': '../lib/angular/angular'
+    'angular': '../bower_components/angular/angular'
-  , 'angular-route': '../lib/angular-route/angular-route'
+  , 'angular-route': '../bower_components/angular-route/angular-route'
   }
 , shim: {
     'angular': {

webpack.config.js

@@ -8,7 +8,7 @@ module.exports = {
   , filename: 'bundle.js'
   }
 , resolve: {
-    modulesDirectories: ['./res/lib', 'node_modules']
+    modulesDirectories: ['./res/bower_components', 'node_modules']
   }
 , loaders: [
     { test: /\.css$/, loader: 'style!css' }