From a90d63f594e733bf902a3b9b2e520dd0933dc954 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Fri, 26 Jul 2013 22:02:08 -0700
Subject: [PATCH 01/19] adding restler dependency to package.json

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4ad104..b6f0954 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
     "dependencies": {
         "express": "3.3.4",
         "ejs": "~0.8.4",
-        "jade": "*"
+        "jade": "*",
+        "restler": "*"
     },
     "scripts": {
         "test": "grunt test",

From c41717dd95d50ae5ab7a13e77bfb72a814290223 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Sat, 27 Jul 2013 15:32:55 -0700
Subject: [PATCH 02/19] githubCfg file, response in JSON, jshint edits..

---
 app/scripts/controllers/main.js | 14 +++---
 bower.json                      |  3 +-
 github.conf.json                |  5 ++
 server.js                       | 88 +++++++++++++++++----------------
 4 files changed, 60 insertions(+), 50 deletions(-)
 create mode 100644 github.conf.json

diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index 3376807..f5c3656 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -2,12 +2,12 @@
 
 angular.module('sbjsApp')
     .controller('MainCtrl', function ($scope, utils) {
-        console.log("MainCtrl.location: ", location);
-        console.log("MainCtrl.location.search: ", location.search);
-        var queryParams = location.search
+        console.log('MainCtrl.location: ', location);
+        console.log('MainCtrl.location.search: ', location.search);
+        var queryParams = location.search;
         var params = utils.getParamsFromString(location.search);
-        console.log("MainCtrl.params.code: ", params);
-        console.log("MainCtrl.params.code: ", params.code);
+        console.log('MainCtrl.params.code: ', params);
+        console.log('MainCtrl.params.code: ', params.code);
 
         if(params.code){
 
@@ -20,8 +20,8 @@ angular.module('sbjsApp')
         ];
     })
     .controller('AuthCtrl', function ($scope) {
-        console.log("AuthCtrl.location: ", location);
-        console.log("AuthCtrl.location.search: ", location.search);
+        console.log('AuthCtrl.location: ', location);
+        console.log('AuthCtrl.location.search: ', location.search);
 
         // http://localhost/?code=537fb3f6697752be4951
         $scope.awesomeThings = [
diff --git a/bower.json b/bower.json
index 829c3c2..86293ec 100644
--- a/bower.json
+++ b/bower.json
@@ -9,7 +9,8 @@
     "es5-shim": "~2.0.8",
     "angular-resource": "~1.0.7",
     "angular-cookies": "~1.0.7",
-    "angular-sanitize": "~1.0.7"
+    "angular-sanitize": "~1.0.7",
+    "angular-bootstrap": "*"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.7",
diff --git a/github.conf.json b/github.conf.json
new file mode 100644
index 0000000..5d4a98d
--- /dev/null
+++ b/github.conf.json
@@ -0,0 +1,5 @@
+{
+  "client_id": "f9aa961f63df8c7b766a",
+  "redirect_uri":"",
+  "client_secret": "CUT_AND_PASTE YOUR CLIENT SECRET HERE. ACTUALLY USE THE BUILD SCRIPTS DONT CHECK THIS IN!"
+}
diff --git a/server.js b/server.js
index 40a630f..ee025dd 100644
--- a/server.js
+++ b/server.js
@@ -1,14 +1,16 @@
 
+'use strict';
 /**
  * Module dependencies.
  */
 
-var express = require('express')
-  , routes = require('./routes')
-  , user = require('./routes/user')
-  , http = require('http')
-  , path = require('path')
-  , rest = require('restler');
+var express = require('express'),
+    routes = require('./routes'),
+    user = require('./routes/user'),
+    http = require('http'),
+    path = require('path'),
+    rest = require('restler'),
+    githubCfg = require('./github.conf.json');
 
 var app = express();
 
@@ -28,19 +30,18 @@ app.use(app.router);
 
 
 // development only
-if ('development' == app.get('env')) {
-    console.log("\n**** RUNNING IN DEVELOPMENT ENV ****\n")
-    app.use(express.errorHandler());
-    app.set('views', __dirname + '/app');
-    app.use(express.static(path.join(__dirname, 'app')));
-}
-else {
-    console.log("ENV: ", app.get('env'))
-    console.log("\n**** RUNNING IN PRODUCTION ENV ****\n")
-    console.log("\n**** WHICH MEANS OUT OF DIST DIRECTORY! ****\n")
-    app.use(express.errorHandler());
-    app.set('views', __dirname + '/dist');
-    app.use(express.static(path.join(__dirname, 'dist')));
+if ('development' === app.get('env')) {
+  console.log('\n**** RUNNING IN DEVELOPMENT ENV ****\n');
+  app.use(express.errorHandler());
+  app.set('views', __dirname + '/app');
+  app.use(express.static(path.join(__dirname, 'app')));
+}else{
+  console.log('ENV: ', app.get('env'));
+  console.log('\n**** RUNNING IN PRODUCTION ENV ****\n');
+  console.log('\n**** WHICH MEANS OUT OF DIST DIRECTORY! ****\n');
+  app.use(express.errorHandler());
+  app.set('views', __dirname + '/dist');
+  app.use(express.static(path.join(__dirname, 'dist')));
 }
 
 // If you want to use node and express, here are some examples
@@ -53,29 +54,32 @@ else {
 // we could configure this to run in dev vs production. But make sure the default is for
 // production, as that is what azure will use to run the app
 app.get('/', function(request, response) {
-    var code= request.query.code;
-
-    if(code){
-        console.log("CODE: ", code);
-
-        var data = {
-            client_id: 'f9aa961f63df8c7b766a',
-            //redirect_uri: '',
-            client_secret: 'CUT_AND_PASTE YOUR CLIENT SECRET HERE. ACTUALLY USE THE BUILD SCRIPTS DONT CHECK THIS IN!',
-            code: code
-        };
-        rest.post('https://github.com/login/oauth/access_token', data)
-            .on('complete', function(data, response){
-                console.log("DONE:", data)
-            if (response.statusCode == 200){
-                console.log(data); // prints HTML
-                console.log("access_token", data.access_token); // prints HTML
-
-            }
-        });
-    }
-
-    response.render('index.html')
+  var code = request.query.code;
+
+  if(code){
+    console.log('CODE: ', code);
+
+    var options = {
+      'data':{
+        'client_id': githubCfg.client_id,
+        'client_secret': githubCfg.client_secret,
+        'code': code
+      },
+      'headers':{
+        'Accept': 'application/json'
+      }
+    };
+
+    rest.post('https://github.com/login/oauth/access_token', options)
+    .on('complete', function(data, response){
+      console.log('DONE:', data);
+      if (response.statusCode == 200){
+        console.log(data); // prints HTML
+        console.log('access_token', data.access_token); // prints HTML
+      }
+    });
+  }
+  response.render('index.html');
 });
 
 

From 9e13c4f1b48aef155f5a3d4251de9239d0e64361 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Sun, 28 Jul 2013 02:34:12 -0700
Subject: [PATCH 03/19] Github Profile working prototype + JsHint reformatting

---
 README.md                          |  2 +-
 app/index.html                     |  1 +
 app/scripts/app.js                 |  3 ++-
 app/scripts/controllers/main.js    | 41 +++++++++---------------------
 app/scripts/controllers/profile.js | 24 +++++++++++++++++
 app/scripts/lib/utils.js           | 35 ++++++++++++-------------
 app/styles/main.css                | 10 ++++++++
 app/views/main.html                |  5 ++--
 app/views/profile.html             | 20 +++++++++++++++
 karma.conf.js                      |  1 +
 server.js                          | 20 +++++++--------
 test/spec/controllers/main.js      |  3 ---
 test/spec/controllers/profile.js   | 19 ++++++++++++++
 13 files changed, 120 insertions(+), 64 deletions(-)
 create mode 100644 app/scripts/controllers/profile.js
 create mode 100644 app/views/profile.html
 create mode 100644 test/spec/controllers/profile.js

diff --git a/README.md b/README.md
index 0575946..0f7ae2e 100644
--- a/README.md
+++ b/README.md
@@ -44,4 +44,4 @@ Now, issuing a `git remove -v` you should see:
 
 ## Voilà!
 
-You should now be able to run `grunt server`
+You should now be able to run `grunt server` or `node --debug server.js` if you want node.js with express.
diff --git a/app/index.html b/app/index.html
index 76f44b8..133ec0a 100644
--- a/app/index.html
+++ b/app/index.html
@@ -64,6 +64,7 @@
 <script src="scripts/app.js"></script>
 <script src="scripts/lib/utils.js"></script>
 <script src="scripts/controllers/main.js"></script>
+<script src="scripts/controllers/profile.js"></script>
 
 <!-- endbuild -->
 </body>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index a7affc8..3a61446 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -1,10 +1,11 @@
 'use strict';
 
-angular.module('sbjsApp', [])
+angular.module('sbjsApp', ['ngCookies'])
   .config(function ($routeProvider) {
     $routeProvider
       .when('/', {templateUrl: 'views/main.html',controller: 'MainCtrl'})
       .when('/auth', {templateUrl: 'views/auth.html',controller: 'AuthCtrl'})
+      .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .otherwise({
         redirectTo: '/'
       });
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index f5c3656..300a3ad 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -1,32 +1,15 @@
 'use strict';
 
 angular.module('sbjsApp')
-    .controller('MainCtrl', function ($scope, utils) {
-        console.log('MainCtrl.location: ', location);
-        console.log('MainCtrl.location.search: ', location.search);
-        var queryParams = location.search;
-        var params = utils.getParamsFromString(location.search);
-        console.log('MainCtrl.params.code: ', params);
-        console.log('MainCtrl.params.code: ', params.code);
-
-        if(params.code){
-
-        }
-        // http://localhost/?code=537fb3f6697752be4951
-        $scope.awesomeThings = [
-            'HTML5 Boilerplate',
-            'AngularJS',
-            'Karma'
-        ];
-    })
-    .controller('AuthCtrl', function ($scope) {
-        console.log('AuthCtrl.location: ', location);
-        console.log('AuthCtrl.location.search: ', location.search);
-
-        // http://localhost/?code=537fb3f6697752be4951
-        $scope.awesomeThings = [
-            'HTML5 Boilerplate',
-            'AngularJS',
-            'Karma'
-        ];
-    });
+.controller('MainCtrl', function ($scope, utils) {
+  var options = ['client_id=f9aa961f63df8c7b766a','scope=user,user:email,public_repo'];
+  $scope.githubLoginUrl = 'https://github.com/login/oauth/authorize?'+options.join('&');
+
+  //debug
+  console.log('MainCtrl.location: ', location);
+  console.log('MainCtrl.location.search: ', location.search);
+  // var queryParams = location.search;
+  var params = utils.getParamsFromString(location.search);
+  console.log('MainCtrl.params.code: ', params);
+  console.log('MainCtrl.params.code: ', params.code);
+});
diff --git a/app/scripts/controllers/profile.js b/app/scripts/controllers/profile.js
new file mode 100644
index 0000000..1e9146b
--- /dev/null
+++ b/app/scripts/controllers/profile.js
@@ -0,0 +1,24 @@
+'use strict';
+
+angular.module('sbjsApp')
+.controller('ProfileCtrl', function ($scope, $http, $location, $cookies) {
+
+  //TODO: refactor getToken out of here. or find a more elegant way
+  $scope.getToken = function(){
+    if ($location.search().access_token){
+      $cookies.token = $location.search().access_token;
+      $location.search('access_token', null);
+    }
+    // if we dont have a token, redirect to home to authenticate
+    if(!$cookies.token) { $location.path( '/' ); }
+    return $cookies.token;
+  };
+
+  var token = $scope.getToken();
+  $http.get('https://api.github.com/user?access_token='+token).then(function(res){
+    $scope.user = res.data;
+    $scope.user.avatar_url += '&s=420';
+    console.log($scope.user);
+  });
+
+});
diff --git a/app/scripts/lib/utils.js b/app/scripts/lib/utils.js
index b9b4677..8909f50 100644
--- a/app/scripts/lib/utils.js
+++ b/app/scripts/lib/utils.js
@@ -1,23 +1,24 @@
 'use strict';
 
 angular.module('sbjsApp')
-    .service('utils', function(){
-        this.getParamsFromString = function (paramString) {
-            // From: http://stackoverflow.com/a/2880929/39758
-            if(paramString.charAt(0) == '?'){
-                paramString = paramString.substring(1);
-            }
-            var match,
-                pl     = /\+/g,  // Regex for replacing addition symbol with a space
-                search = /([^&=]+)=?([^&]*)/g,
-                decode = function (s) { return decodeURIComponent(s.replace(pl, " ")); },
-                query  = paramString,//.substring(1),
-                urlParams = {};
+.service('utils', function(){
+  this.getParamsFromString = function (paramString) {
+  // From: http://stackoverflow.com/a/2880929/39758
+    if(paramString.charAt(0) === '?'){
+      paramString = paramString.substring(1);
+    }
+    var match,
+    pl     = /\+/g,  // Regex for replacing addition symbol with a space
+    search = /([^&=]+)=?([^&]*)/g,
+    decode = function (s) { return decodeURIComponent(s.replace(pl, ' ')); },
+    query  = paramString,//.substring(1),
+    urlParams = {};
 
-            while (match = search.exec(query))
-                urlParams[decode(match[1])] = decode(match[2]);
-            return urlParams;
-        };
-    });
+    while ((match = search.exec(query))){
+      urlParams[decode(match[1])] = decode(match[2]);
+    }
+    return urlParams;
+  };
+});
 
 
diff --git a/app/styles/main.css b/app/styles/main.css
index c754fdd..4e94f3a 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -19,4 +19,14 @@ body {
     font-size: 60px;
     line-height: 1;
     letter-spacing: -1px;
+    margin: 10px auto;
 }
+
+.profile {
+    width: 430px;
+}
+
+.profile table tr th{
+    text-align: left;
+    width:  150px;
+}
\ No newline at end of file
diff --git a/app/views/main.html b/app/views/main.html
index 6268c86..c8b6c67 100644
--- a/app/views/main.html
+++ b/app/views/main.html
@@ -1,5 +1,4 @@
 <div class="hero-unit">
-    <h1>Welcome to SBJS</h1>
-    <h2><a href="https://github.com/login/oauth/authorize?client_id=f9aa961f63df8c7b766a&scope=user,user:email,public_repo&redirect_uri=http://localhost:9000">Login to Github </a></h2>
-    <h2><a href="/?code=537fb3f6697752be4951">Pretend Token</a></h2>
+  <h1>Welcome to SBJS</h1>
+  <a href="{{githubLoginUrl}}" class="btn btn-primary btn-large btn-block">Login to Github</a>
 </div>
diff --git a/app/views/profile.html b/app/views/profile.html
new file mode 100644
index 0000000..ed040f5
--- /dev/null
+++ b/app/views/profile.html
@@ -0,0 +1,20 @@
+<div class="hero-unit profile">
+  <img class="thumbnail" src="{{user.avatar_url}}">
+  <h1>{{user.login}}</h1>
+  <div class="well">
+    <table>
+      <tr>
+        <th>Name:</th>
+        <td>{{user.name}}</td>
+      </tr>
+      <tr>
+        <th>Public Repos:</th>
+        <td>{{user.public_repos}}</td>
+      </tr>
+      <tr>
+        <th>Location:</th>
+        <td>{{user.location}}</td>
+      </tr>
+    </table>
+  </div>
+</div>
diff --git a/karma.conf.js b/karma.conf.js
index 2d6194b..e16108c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -9,6 +9,7 @@ files = [
   JASMINE_ADAPTER,
   'app/bower_components/angular/angular.js',
   'app/bower_components/angular-mocks/angular-mocks.js',
+  'app/bower_components/angular-cookies/angular-cookies.js',
   'app/scripts/*.js',
   'app/scripts/**/*.js',
   'test/mock/**/*.js',
diff --git a/server.js b/server.js
index ee025dd..6ec4547 100644
--- a/server.js
+++ b/server.js
@@ -26,6 +26,8 @@ app.use(express.favicon());
 app.use(express.logger('dev'));
 app.use(express.bodyParser());
 app.use(express.methodOverride());
+app.use(express.cookieParser());
+app.use(express.session({secret: 'sbjsSecretHash'}));
 app.use(app.router);
 
 
@@ -54,11 +56,10 @@ if ('development' === app.get('env')) {
 // we could configure this to run in dev vs production. But make sure the default is for
 // production, as that is what azure will use to run the app
 app.get('/', function(request, response) {
-  var code = request.query.code;
 
+  var code = request.query.code;
+  //TODO: refactor?
   if(code){
-    console.log('CODE: ', code);
-
     var options = {
       'data':{
         'client_id': githubCfg.client_id,
@@ -71,18 +72,17 @@ app.get('/', function(request, response) {
     };
 
     rest.post('https://github.com/login/oauth/access_token', options)
-    .on('complete', function(data, response){
-      console.log('DONE:', data);
-      if (response.statusCode == 200){
-        console.log(data); // prints HTML
-        console.log('access_token', data.access_token); // prints HTML
+    .on('complete', function(data, resp){
+      if (resp.statusCode == 200){
+        request.session.access_token = data.access_token;
+        response.redirect('/#/profile?access_token='+data.access_token);
       }
     });
+  }else{
+    response.render('index.html');
   }
-  response.render('index.html');
 });
 
-
 var port = process.env.PORT || 9000;
 // var port = app.get('port')
 
diff --git a/test/spec/controllers/main.js b/test/spec/controllers/main.js
index 6129950..3e53161 100644
--- a/test/spec/controllers/main.js
+++ b/test/spec/controllers/main.js
@@ -16,7 +16,4 @@ describe('Controller: MainCtrl', function () {
     });
   }));
 
-  it('should attach a list of awesomeThings to the scope', function () {
-    expect(scope.awesomeThings.length).toBe(3);
-  });
 });
diff --git a/test/spec/controllers/profile.js b/test/spec/controllers/profile.js
new file mode 100644
index 0000000..db71718
--- /dev/null
+++ b/test/spec/controllers/profile.js
@@ -0,0 +1,19 @@
+'use strict';
+
+describe('Controller: ProfileCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('sbjsApp'));
+
+  var ProfileCtrl,
+    scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    ProfileCtrl = $controller('ProfileCtrl', {
+      $scope: scope
+    });
+  }));
+
+});

From 3a80a1ef6902a50ad0c5f66e88024638d1efeb32 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Sun, 28 Jul 2013 13:28:54 -0700
Subject: [PATCH 04/19] Nav test

---
 app/index.html     | 16 +++++++++++++++-
 app/scripts/app.js |  2 +-
 bower.json         |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/index.html b/app/index.html
index 133ec0a..d55b072 100644
--- a/app/index.html
+++ b/app/index.html
@@ -32,6 +32,18 @@
 <script src="bower_components/json3/lib/json3.min.js"></script>
 <![endif]-->
 
+<!-- Top Navigation -->
+<div class="navbar" bs-navbar>
+  <div class="navbar-inner">
+    <a class="brand" href="#/">SBJS.org</a>
+    <ul class="nav">
+      <!-- You can use regular expressions. -->
+      <li data-match-route="/profile"><a href="#/profile">Profile</a></li>
+      <li data-match-route="/members"><a href="#/members">Members</a></li>
+    </ul>
+  </div>
+</div>
+
 <!-- Add your site or application content here -->
 <div class="container" ng-view=""></div>
 
@@ -57,7 +69,9 @@
 <script src="bower_components/angular-resource/angular-resource.js"></script>
 <script src="bower_components/angular-cookies/angular-cookies.js"></script>
 <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
-<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+<!-- <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script> -->
+<script src="bower_components/angular-strap/dist/angular-strap.js"></script>
+<script src="bower_components/jquery/jquery.js"></script>
 <!-- endbuild -->
 
 <!-- build:js({.tmp,app}) scripts/scripts.js -->
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 3a61446..5531bfd 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('sbjsApp', ['ngCookies'])
+angular.module('sbjsApp', ['ngCookies','$strap.directives'])
   .config(function ($routeProvider) {
     $routeProvider
       .when('/', {templateUrl: 'views/main.html',controller: 'MainCtrl'})
diff --git a/bower.json b/bower.json
index 86293ec..86f87a8 100644
--- a/bower.json
+++ b/bower.json
@@ -10,7 +10,9 @@
     "angular-resource": "~1.0.7",
     "angular-cookies": "~1.0.7",
     "angular-sanitize": "~1.0.7",
-    "angular-bootstrap": "*"
+    "angular-bootstrap": "*",
+    "angular-strap": "*"
+
   },
   "devDependencies": {
     "angular-mocks": "~1.0.7",

From a433240dd3be0604d90fd864c2620a8185a484d4 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Sun, 28 Jul 2013 17:02:49 -0700
Subject: [PATCH 05/19] Members page + refactor getToken

---
 app/index.html                     |  4 ++++
 app/scripts/app.js                 |  1 +
 app/scripts/controllers/members.js | 10 ++++++++++
 app/scripts/controllers/profile.js | 15 ++-------------
 app/scripts/lib/utils.js           | 14 +++++++++++++-
 app/styles/main.css                | 19 ++++++++++++++++++-
 app/views/members.html             |  9 +++++++++
 app/views/profile.html             |  8 ++++----
 bower.json                         |  3 ++-
 test/spec/controllers/members.js   | 22 ++++++++++++++++++++++
 10 files changed, 85 insertions(+), 20 deletions(-)
 create mode 100644 app/scripts/controllers/members.js
 create mode 100644 app/views/members.html
 create mode 100644 test/spec/controllers/members.js

diff --git a/app/index.html b/app/index.html
index d55b072..ee17329 100644
--- a/app/index.html
+++ b/app/index.html
@@ -38,6 +38,8 @@
     <a class="brand" href="#/">SBJS.org</a>
     <ul class="nav">
       <!-- You can use regular expressions. -->
+      <!-- don't panic if this looks sorta broken -->
+      <!-- Issue filed on GH @ https://github.com/mgcrea/angular-strap/issues/208 -->
       <li data-match-route="/profile"><a href="#/profile">Profile</a></li>
       <li data-match-route="/members"><a href="#/members">Members</a></li>
     </ul>
@@ -72,6 +74,7 @@
 <!-- <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script> -->
 <script src="bower_components/angular-strap/dist/angular-strap.js"></script>
 <script src="bower_components/jquery/jquery.js"></script>
+<script src="bower_components/underscore/underscore.js"></script>
 <!-- endbuild -->
 
 <!-- build:js({.tmp,app}) scripts/scripts.js -->
@@ -79,6 +82,7 @@
 <script src="scripts/lib/utils.js"></script>
 <script src="scripts/controllers/main.js"></script>
 <script src="scripts/controllers/profile.js"></script>
+<script src="scripts/controllers/members.js"></script>
 
 <!-- endbuild -->
 </body>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 5531bfd..c951344 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -6,6 +6,7 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
       .when('/', {templateUrl: 'views/main.html',controller: 'MainCtrl'})
       .when('/auth', {templateUrl: 'views/auth.html',controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
+      .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
       .otherwise({
         redirectTo: '/'
       });
diff --git a/app/scripts/controllers/members.js b/app/scripts/controllers/members.js
new file mode 100644
index 0000000..9a5dcf9
--- /dev/null
+++ b/app/scripts/controllers/members.js
@@ -0,0 +1,10 @@
+'use strict';
+
+angular.module('sbjsApp')
+.controller('MembersCtrl', function ($scope, $http, utils) {
+  var token = utils.getToken();
+  $http.get('https://api.github.com/repos/sbjs/sbjs.org/forks?access_token='+token).then(function(res){
+    $scope.members = _.pluck(res.data, 'owner');
+  });
+
+});
diff --git a/app/scripts/controllers/profile.js b/app/scripts/controllers/profile.js
index 1e9146b..5b3b8f2 100644
--- a/app/scripts/controllers/profile.js
+++ b/app/scripts/controllers/profile.js
@@ -1,20 +1,9 @@
 'use strict';
 
 angular.module('sbjsApp')
-.controller('ProfileCtrl', function ($scope, $http, $location, $cookies) {
+.controller('ProfileCtrl', function ($scope, $http, utils) {
 
-  //TODO: refactor getToken out of here. or find a more elegant way
-  $scope.getToken = function(){
-    if ($location.search().access_token){
-      $cookies.token = $location.search().access_token;
-      $location.search('access_token', null);
-    }
-    // if we dont have a token, redirect to home to authenticate
-    if(!$cookies.token) { $location.path( '/' ); }
-    return $cookies.token;
-  };
-
-  var token = $scope.getToken();
+  var token = utils.getToken();
   $http.get('https://api.github.com/user?access_token='+token).then(function(res){
     $scope.user = res.data;
     $scope.user.avatar_url += '&s=420';
diff --git a/app/scripts/lib/utils.js b/app/scripts/lib/utils.js
index 8909f50..fdf2af8 100644
--- a/app/scripts/lib/utils.js
+++ b/app/scripts/lib/utils.js
@@ -1,7 +1,19 @@
 'use strict';
 
 angular.module('sbjsApp')
-.service('utils', function(){
+.service('utils', function($cookies, $location){
+
+  // Still trying to find a good way of handling tokens
+  this.getToken = function(){
+    if ($location.search().access_token){
+      $cookies.token = $location.search().access_token;
+      $location.search('access_token', null);
+    }
+    // if we dont have a token, redirect to home to authenticate
+    if(!$cookies.token) { $location.path( '/' ); }
+    return $cookies.token;
+  };
+
   this.getParamsFromString = function (paramString) {
   // From: http://stackoverflow.com/a/2880929/39758
     if(paramString.charAt(0) === '?'){
diff --git a/app/styles/main.css b/app/styles/main.css
index 4e94f3a..a9ca81f 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -29,4 +29,21 @@ body {
 .profile table tr th{
     text-align: left;
     width:  150px;
-}
\ No newline at end of file
+}
+
+.members {
+    width: 400px;
+}
+
+.members li {
+    list-style: none;
+}
+
+.members li img.thumbnail {
+    width:80px;
+    display: inline-block;
+}
+
+.members li h2 {
+    display: inline-block;
+}
diff --git a/app/views/members.html b/app/views/members.html
new file mode 100644
index 0000000..1198c40
--- /dev/null
+++ b/app/views/members.html
@@ -0,0 +1,9 @@
+<div class="hero-unit members">
+  <h1>Members</h1>
+  <ul class="well">
+    <li ng-repeat="member in members">
+      <img class="thumbnail" src="{{member.avatar_url}}">
+      <h2>{{member.login}}</h2>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/profile.html b/app/views/profile.html
index ed040f5..cf9057c 100644
--- a/app/views/profile.html
+++ b/app/views/profile.html
@@ -7,14 +7,14 @@ <h1>{{user.login}}</h1>
         <th>Name:</th>
         <td>{{user.name}}</td>
       </tr>
-      <tr>
-        <th>Public Repos:</th>
-        <td>{{user.public_repos}}</td>
-      </tr>
       <tr>
         <th>Location:</th>
         <td>{{user.location}}</td>
       </tr>
+      <tr>
+        <th>Public Repos:</th>
+        <td>{{user.public_repos}}</td>
+      </tr>
     </table>
   </div>
 </div>
diff --git a/bower.json b/bower.json
index 86f87a8..f7167e9 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,8 @@
     "angular-cookies": "~1.0.7",
     "angular-sanitize": "~1.0.7",
     "angular-bootstrap": "*",
-    "angular-strap": "*"
+    "angular-strap": "*",
+    "underscore": "*"
 
   },
   "devDependencies": {
diff --git a/test/spec/controllers/members.js b/test/spec/controllers/members.js
new file mode 100644
index 0000000..f4b3d00
--- /dev/null
+++ b/test/spec/controllers/members.js
@@ -0,0 +1,22 @@
+'use strict';
+
+describe('Controller: MembersCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('sbjsApp'));
+
+  var MembersCtrl,
+    scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    MembersCtrl = $controller('MembersCtrl', {
+      $scope: scope
+    });
+  }));
+
+  it('should attach a list of awesomeThings to the scope', function () {
+    expect(scope.awesomeThings.length).toBe(3);
+  });
+});

From d0ea972a814baa918b485a42ffe97441063e4366 Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Sun, 28 Jul 2013 23:31:23 -0700
Subject: [PATCH 06/19] specs and other checks in code

---
 app/index.html                     | 2 +-
 app/scripts/app.js                 | 4 ++--
 app/scripts/controllers/members.js | 2 +-
 app/scripts/lib/utils.js           | 5 +++--
 karma.conf.js                      | 1 +
 server.js                          | 2 +-
 test/spec/controllers/main.js      | 6 ++++++
 test/spec/controllers/members.js   | 4 ----
 test/spec/controllers/profile.js   | 6 ++----
 test/spec/lib/utils.js             | 4 ++++
 10 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 test/spec/lib/utils.js

diff --git a/app/index.html b/app/index.html
index ee17329..b674e16 100644
--- a/app/index.html
+++ b/app/index.html
@@ -33,7 +33,7 @@
 <![endif]-->
 
 <!-- Top Navigation -->
-<div class="navbar" bs-navbar>
+<div class="navbar" xbs-navbar>
   <div class="navbar-inner">
     <a class="brand" href="#/">SBJS.org</a>
     <ul class="nav">
diff --git a/app/scripts/app.js b/app/scripts/app.js
index c951344..83caef4 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -3,8 +3,8 @@
 angular.module('sbjsApp', ['ngCookies','$strap.directives'])
   .config(function ($routeProvider) {
     $routeProvider
-      .when('/', {templateUrl: 'views/main.html',controller: 'MainCtrl'})
-      .when('/auth', {templateUrl: 'views/auth.html',controller: 'AuthCtrl'})
+      .when('/', {templateUrl: 'views/main.html', controller: 'MainCtrl'})
+      .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
       .otherwise({
diff --git a/app/scripts/controllers/members.js b/app/scripts/controllers/members.js
index 9a5dcf9..0557916 100644
--- a/app/scripts/controllers/members.js
+++ b/app/scripts/controllers/members.js
@@ -3,7 +3,7 @@
 angular.module('sbjsApp')
 .controller('MembersCtrl', function ($scope, $http, utils) {
   var token = utils.getToken();
-  $http.get('https://api.github.com/repos/sbjs/sbjs.org/forks?access_token='+token).then(function(res){
+  $http.get('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+token).then(function(res){
     $scope.members = _.pluck(res.data, 'owner');
   });
 
diff --git a/app/scripts/lib/utils.js b/app/scripts/lib/utils.js
index fdf2af8..e4f97b3 100644
--- a/app/scripts/lib/utils.js
+++ b/app/scripts/lib/utils.js
@@ -5,9 +5,10 @@ angular.module('sbjsApp')
 
   // Still trying to find a good way of handling tokens
   this.getToken = function(){
-    if ($location.search().access_token){
+    var access_token = $location.search().access_token;
+    if (access_token && access_token !== "undefined"){
       $cookies.token = $location.search().access_token;
-      $location.search('access_token', null);
+      $location.search('access_token', null);        
     }
     // if we dont have a token, redirect to home to authenticate
     if(!$cookies.token) { $location.path( '/' ); }
diff --git a/karma.conf.js b/karma.conf.js
index e16108c..9632aed 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -10,6 +10,7 @@ files = [
   'app/bower_components/angular/angular.js',
   'app/bower_components/angular-mocks/angular-mocks.js',
   'app/bower_components/angular-cookies/angular-cookies.js',
+  'app/bower_components/angular-strap/dist/angular-strap.js',
   'app/scripts/*.js',
   'app/scripts/**/*.js',
   'test/mock/**/*.js',
diff --git a/server.js b/server.js
index 6ec4547..7b25f29 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,7 @@ var express = require('express'),
     http = require('http'),
     path = require('path'),
     rest = require('restler'),
-    githubCfg = require('./github.conf.json');
+    githubCfg = require('../github.conf.json');
 
 var app = express();
 
diff --git a/test/spec/controllers/main.js b/test/spec/controllers/main.js
index 3e53161..84a46ab 100644
--- a/test/spec/controllers/main.js
+++ b/test/spec/controllers/main.js
@@ -16,4 +16,10 @@ describe('Controller: MainCtrl', function () {
     });
   }));
 
+  it("defines the githubLoginUrl", function() {
+    expect(scope.githubLoginUrl).toEqual("https://github.com/login/oauth/authorize?client_id=f9aa961f63df8c7b766a&scope=user,user:email,public_repo");
+  });  
+
+  
+
 });
diff --git a/test/spec/controllers/members.js b/test/spec/controllers/members.js
index f4b3d00..5b9ba6e 100644
--- a/test/spec/controllers/members.js
+++ b/test/spec/controllers/members.js
@@ -15,8 +15,4 @@ describe('Controller: MembersCtrl', function () {
       $scope: scope
     });
   }));
-
-  it('should attach a list of awesomeThings to the scope', function () {
-    expect(scope.awesomeThings.length).toBe(3);
-  });
 });
diff --git a/test/spec/controllers/profile.js b/test/spec/controllers/profile.js
index db71718..3a015a0 100644
--- a/test/spec/controllers/profile.js
+++ b/test/spec/controllers/profile.js
@@ -2,9 +2,7 @@
 
 describe('Controller: ProfileCtrl', function () {
 
-  // load the controller's module
-  beforeEach(module('sbjsApp'));
-
+  
   var ProfileCtrl,
     scope;
 
@@ -14,6 +12,6 @@ describe('Controller: ProfileCtrl', function () {
     ProfileCtrl = $controller('ProfileCtrl', {
       $scope: scope
     });
-  }));
+  })); 
 
 });
diff --git a/test/spec/lib/utils.js b/test/spec/lib/utils.js
new file mode 100644
index 0000000..2c8c53f
--- /dev/null
+++ b/test/spec/lib/utils.js
@@ -0,0 +1,4 @@
+describe("#utils", function() {
+	
+});
+

From 35e9731386847aa4617c5f9ec15453890a9a5b79 Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Sun, 28 Jul 2013 23:43:26 -0700
Subject: [PATCH 07/19] remove xnav-bar to nav-bar

---
 app/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/index.html b/app/index.html
index b674e16..ee17329 100644
--- a/app/index.html
+++ b/app/index.html
@@ -33,7 +33,7 @@
 <![endif]-->
 
 <!-- Top Navigation -->
-<div class="navbar" xbs-navbar>
+<div class="navbar" bs-navbar>
   <div class="navbar-inner">
     <a class="brand" href="#/">SBJS.org</a>
     <ul class="nav">

From 475a1418d01f1576502751a9075fb47fe526680a Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Sun, 28 Jul 2013 23:49:49 -0700
Subject: [PATCH 08/19] do not go into dir above for github config stuff

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 7b25f29..6ec4547 100644
--- a/server.js
+++ b/server.js
@@ -10,7 +10,7 @@ var express = require('express'),
     http = require('http'),
     path = require('path'),
     rest = require('restler'),
-    githubCfg = require('../github.conf.json');
+    githubCfg = require('./github.conf.json');
 
 var app = express();
 

From 1c7c0effcfba90ce05a41b3d51972bbc1640613c Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Sun, 28 Jul 2013 23:55:33 -0700
Subject: [PATCH 09/19] jshint fixes

---
 app/scripts/app.js               | 4 +---
 app/scripts/lib/utils.js         | 2 +-
 test/spec/controllers/main.js    | 8 +++-----
 test/spec/controllers/profile.js | 3 +--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/scripts/app.js b/app/scripts/app.js
index 83caef4..af1703c 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -7,7 +7,5 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
       .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
-      .otherwise({
-        redirectTo: '/'
-      });
+      .otherwise({redirectTo: '/'});
   });
diff --git a/app/scripts/lib/utils.js b/app/scripts/lib/utils.js
index e4f97b3..12427cd 100644
--- a/app/scripts/lib/utils.js
+++ b/app/scripts/lib/utils.js
@@ -8,7 +8,7 @@ angular.module('sbjsApp')
     var access_token = $location.search().access_token;
     if (access_token && access_token !== "undefined"){
       $cookies.token = $location.search().access_token;
-      $location.search('access_token', null);        
+      $location.search('access_token', null);
     }
     // if we dont have a token, redirect to home to authenticate
     if(!$cookies.token) { $location.path( '/' ); }
diff --git a/test/spec/controllers/main.js b/test/spec/controllers/main.js
index 84a46ab..b39c073 100644
--- a/test/spec/controllers/main.js
+++ b/test/spec/controllers/main.js
@@ -16,10 +16,8 @@ describe('Controller: MainCtrl', function () {
     });
   }));
 
-  it("defines the githubLoginUrl", function() {
-    expect(scope.githubLoginUrl).toEqual("https://github.com/login/oauth/authorize?client_id=f9aa961f63df8c7b766a&scope=user,user:email,public_repo");
-  });  
-
-  
+  it('defines the githubLoginUrl', function() {
+    expect(scope.githubLoginUrl).toEqual('https://github.com/login/oauth/authorize?client_id=f9aa961f63df8c7b766a&scope=user,user:email,public_repo');
+  });
 
 });
diff --git a/test/spec/controllers/profile.js b/test/spec/controllers/profile.js
index 3a015a0..04b1d98 100644
--- a/test/spec/controllers/profile.js
+++ b/test/spec/controllers/profile.js
@@ -2,7 +2,6 @@
 
 describe('Controller: ProfileCtrl', function () {
 
-  
   var ProfileCtrl,
     scope;
 
@@ -12,6 +11,6 @@ describe('Controller: ProfileCtrl', function () {
     ProfileCtrl = $controller('ProfileCtrl', {
       $scope: scope
     });
-  })); 
+  }));
 
 });

From 1c34a8f2e4c20265824fa734dbd24a3acc20eaf7 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Mon, 29 Jul 2013 01:04:14 -0700
Subject: [PATCH 10/19] refactor auth as a service.

---
 app/index.html                     |  3 ++-
 app/scripts/app.js                 | 36 ++++++++++++++++++++++++++++--
 app/scripts/controllers/members.js |  5 ++---
 app/scripts/controllers/profile.js |  5 ++---
 app/scripts/lib/utils.js           | 12 ----------
 app/scripts/services/auth.js       | 17 ++++++++++++++
 test/spec/services/auth.js         | 18 +++++++++++++++
 7 files changed, 75 insertions(+), 21 deletions(-)
 create mode 100644 app/scripts/services/auth.js
 create mode 100644 test/spec/services/auth.js

diff --git a/app/index.html b/app/index.html
index ee17329..496d496 100644
--- a/app/index.html
+++ b/app/index.html
@@ -33,7 +33,7 @@
 <![endif]-->
 
 <!-- Top Navigation -->
-<div class="navbar" bs-navbar>
+<div class="navbar" xbs-navbar>
   <div class="navbar-inner">
     <a class="brand" href="#/">SBJS.org</a>
     <ul class="nav">
@@ -83,6 +83,7 @@
 <script src="scripts/controllers/main.js"></script>
 <script src="scripts/controllers/profile.js"></script>
 <script src="scripts/controllers/members.js"></script>
+<script src="scripts/services/auth.js"></script>
 
 <!-- endbuild -->
 </body>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index af1703c..f27e605 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -1,11 +1,43 @@
 'use strict';
 
 angular.module('sbjsApp', ['ngCookies','$strap.directives'])
-  .config(function ($routeProvider) {
+  .config(function ($routeProvider, $httpProvider) {
     $routeProvider
       .when('/', {templateUrl: 'views/main.html', controller: 'MainCtrl'})
       .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
       .otherwise({redirectTo: '/'});
-  });
+
+    //Interceptor is used in case the token becomes invalid while the session is active.
+    var interceptor = ['$location', '$q', function($location, $q) {
+      function success(response) {
+        return response;
+      }
+
+      function error(response) {
+        if(response.status === 401) {
+          $location.path('/login');
+          return $q.reject(response);
+        }
+        else {
+          return $q.reject(response);
+        }
+      }
+
+      return function(promise) {
+        return promise.then(success, error);
+      };
+    }];
+
+    $httpProvider.responseInterceptors.push(interceptor);
+  })
+  .run(['$rootScope', '$location', 'auth', function ($rootScope, $location, auth) {
+    $rootScope.$on('$routeChangeStart', function (event, next, current) {
+      //this is called every time a route changed
+      if (!auth.getToken()) {
+        //redirect to login if we can't get a valid token
+        $location.path('/');
+      }
+    });
+  }]);
diff --git a/app/scripts/controllers/members.js b/app/scripts/controllers/members.js
index 0557916..4c11c2c 100644
--- a/app/scripts/controllers/members.js
+++ b/app/scripts/controllers/members.js
@@ -1,9 +1,8 @@
 'use strict';
 
 angular.module('sbjsApp')
-.controller('MembersCtrl', function ($scope, $http, utils) {
-  var token = utils.getToken();
-  $http.get('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+token).then(function(res){
+.controller('MembersCtrl', function ($scope, $http, $cookies) {
+  $http.get('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token).then(function(res){
     $scope.members = _.pluck(res.data, 'owner');
   });
 
diff --git a/app/scripts/controllers/profile.js b/app/scripts/controllers/profile.js
index 5b3b8f2..7f6c10c 100644
--- a/app/scripts/controllers/profile.js
+++ b/app/scripts/controllers/profile.js
@@ -1,10 +1,9 @@
 'use strict';
 
 angular.module('sbjsApp')
-.controller('ProfileCtrl', function ($scope, $http, utils) {
+.controller('ProfileCtrl', function ($scope, $http, $cookies) {
 
-  var token = utils.getToken();
-  $http.get('https://api.github.com/user?access_token='+token).then(function(res){
+  $http.get('https://api.github.com/user?access_token='+$cookies.token).then(function(res){
     $scope.user = res.data;
     $scope.user.avatar_url += '&s=420';
     console.log($scope.user);
diff --git a/app/scripts/lib/utils.js b/app/scripts/lib/utils.js
index 12427cd..d29c56b 100644
--- a/app/scripts/lib/utils.js
+++ b/app/scripts/lib/utils.js
@@ -3,18 +3,6 @@
 angular.module('sbjsApp')
 .service('utils', function($cookies, $location){
 
-  // Still trying to find a good way of handling tokens
-  this.getToken = function(){
-    var access_token = $location.search().access_token;
-    if (access_token && access_token !== "undefined"){
-      $cookies.token = $location.search().access_token;
-      $location.search('access_token', null);
-    }
-    // if we dont have a token, redirect to home to authenticate
-    if(!$cookies.token) { $location.path( '/' ); }
-    return $cookies.token;
-  };
-
   this.getParamsFromString = function (paramString) {
   // From: http://stackoverflow.com/a/2880929/39758
     if(paramString.charAt(0) === '?'){
diff --git a/app/scripts/services/auth.js b/app/scripts/services/auth.js
new file mode 100644
index 0000000..7141d5b
--- /dev/null
+++ b/app/scripts/services/auth.js
@@ -0,0 +1,17 @@
+'use strict';
+
+angular.module('sbjsApp')
+.service('auth', function auth($cookies, $location) {
+
+  this.getToken = function(){
+    var access_token = $location.search().access_token;
+    if (access_token && access_token !== "undefined"){
+      $cookies.token = $location.search().access_token;
+      $location.search('access_token', null);
+    }
+    // if we dont have a token, redirect to home to authenticate
+    if(!$cookies.token) { $location.path( '/' ); }
+    return $cookies.token;
+  };
+
+});
diff --git a/test/spec/services/auth.js b/test/spec/services/auth.js
new file mode 100644
index 0000000..345dcd9
--- /dev/null
+++ b/test/spec/services/auth.js
@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: auth', function () {
+
+  // load the service's module
+  beforeEach(module('sbjsApp'));
+
+  // instantiate service
+  var auth;
+  beforeEach(inject(function (_auth_) {
+    auth = _auth_;
+  }));
+
+  it('should do something', function () {
+    expect(!!auth).toBe(true);
+  });
+
+});

From b8a563dc22a07b36c1444c2d225da3d2d4bc1086 Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Mon, 29 Jul 2013 01:12:38 -0700
Subject: [PATCH 11/19] register page with auto-fork power

---
 app/index.html                          |  3 +++
 app/scripts/app.js                      |  4 ++++
 app/scripts/controllers/registration.js | 12 ++++++++++++
 app/views/members.html                  |  8 ++++++--
 app/views/registration.html             |  7 +++++++
 test/spec/controllers/registration.js   | 22 ++++++++++++++++++++++
 6 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 app/scripts/controllers/registration.js
 create mode 100644 app/views/registration.html
 create mode 100644 test/spec/controllers/registration.js

diff --git a/app/index.html b/app/index.html
index ee17329..fe9c9de 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,6 +42,8 @@
       <!-- Issue filed on GH @ https://github.com/mgcrea/angular-strap/issues/208 -->
       <li data-match-route="/profile"><a href="#/profile">Profile</a></li>
       <li data-match-route="/members"><a href="#/members">Members</a></li>
+      <li data-match-route="/members"><a href="#/registration">Become a Member</a></li>
+
     </ul>
   </div>
 </div>
@@ -84,6 +86,7 @@
 <script src="scripts/controllers/profile.js"></script>
 <script src="scripts/controllers/members.js"></script>
 
+<script src="scripts/controllers/registration.js"></script>
 <!-- endbuild -->
 </body>
 </html>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 83caef4..2311dc4 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -7,6 +7,10 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
       .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
+      .when('/registration', {
+        templateUrl: 'views/registration.html',
+        controller: 'RegistrationCtrl'
+      })
       .otherwise({
         redirectTo: '/'
       });
diff --git a/app/scripts/controllers/registration.js b/app/scripts/controllers/registration.js
new file mode 100644
index 0000000..fe05162
--- /dev/null
+++ b/app/scripts/controllers/registration.js
@@ -0,0 +1,12 @@
+'use strict';
+
+angular.module('sbjsApp')
+  .controller('RegistrationCtrl', function ($scope, $http, $cookies) {
+    $scope.forkMembersRepo = function(){
+    	// code to POST fork sbjs members repo
+    	console.log("Fork that pork!");
+    	$http.post('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token, {}).then(function(res){
+    		console.log("success!");
+    	});
+    };
+  });
diff --git a/app/views/members.html b/app/views/members.html
index 1198c40..9cb730f 100644
--- a/app/views/members.html
+++ b/app/views/members.html
@@ -2,8 +2,12 @@
   <h1>Members</h1>
   <ul class="well">
     <li ng-repeat="member in members">
-      <img class="thumbnail" src="{{member.avatar_url}}">
-      <h2>{{member.login}}</h2>
+      <a href="{{ member.url }}">
+      	<img class="thumbnail" src="{{member.avatar_url}}">
+      </a>
+      <a href="{{ member.url }}">
+	    <h2>{{member.login}}</h2>
+      </a>
     </li>
   </ul>
 </div>
diff --git a/app/views/registration.html b/app/views/registration.html
new file mode 100644
index 0000000..8925786
--- /dev/null
+++ b/app/views/registration.html
@@ -0,0 +1,7 @@
+<h1>Become a Member</h1>
+
+<p>It's simple. Fork the sbjs.profiles repo. This will add you to our <a href="#/members">Members</a> page.</p>
+
+<div ng-controller="RegistrationCtrl">
+  <button class="btn btn-medium btn-primary" ng-click="forkMembersRepo()">Fork SBJS.profiles</button>
+</div>
\ No newline at end of file
diff --git a/test/spec/controllers/registration.js b/test/spec/controllers/registration.js
new file mode 100644
index 0000000..a69155f
--- /dev/null
+++ b/test/spec/controllers/registration.js
@@ -0,0 +1,22 @@
+'use strict';
+
+describe('Controller: RegistrationCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('sbjsApp'));
+
+  var RegistrationCtrl,
+    scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    RegistrationCtrl = $controller('RegistrationCtrl', {
+      $scope: scope
+    });
+  }));
+
+  it('should attach a list of awesomeThings to the scope', function () {
+    expect(scope.awesomeThings.length).toBe(3);
+  });
+});

From 13c28987ba42ede25c90a8677d64822e237a8dce Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Mon, 29 Jul 2013 01:44:02 -0700
Subject: [PATCH 12/19] nav 'become a member' route fix

---
 app/index.html                          |  2 +-
 app/scripts/app.js                      |  9 ++-------
 app/scripts/controllers/registration.js | 18 +++++++++---------
 app/styles/main.css                     | 22 +++++++++-------------
 app/views/members.html                  |  4 +---
 app/views/registration.html             |  2 +-
 test/spec/controllers/registration.js   |  5 +----
 7 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/app/index.html b/app/index.html
index fe9c9de..187dc16 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,7 +42,7 @@
       <!-- Issue filed on GH @ https://github.com/mgcrea/angular-strap/issues/208 -->
       <li data-match-route="/profile"><a href="#/profile">Profile</a></li>
       <li data-match-route="/members"><a href="#/members">Members</a></li>
-      <li data-match-route="/members"><a href="#/registration">Become a Member</a></li>
+      <li data-match-route="/registration"><a href="#/registration">Become a Member</a></li>
 
     </ul>
   </div>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 2311dc4..b97eecc 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -7,11 +7,6 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
       .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
-      .when('/registration', {
-        templateUrl: 'views/registration.html',
-        controller: 'RegistrationCtrl'
-      })
-      .otherwise({
-        redirectTo: '/'
-      });
+      .when('/registration', {templateUrl: 'views/registration.html', controller: 'RegistrationCtrl'})
+      .otherwise({redirectTo: '/'});
   });
diff --git a/app/scripts/controllers/registration.js b/app/scripts/controllers/registration.js
index fe05162..f927735 100644
--- a/app/scripts/controllers/registration.js
+++ b/app/scripts/controllers/registration.js
@@ -1,12 +1,12 @@
 'use strict';
 
 angular.module('sbjsApp')
-  .controller('RegistrationCtrl', function ($scope, $http, $cookies) {
-    $scope.forkMembersRepo = function(){
-    	// code to POST fork sbjs members repo
-    	console.log("Fork that pork!");
-    	$http.post('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token, {}).then(function(res){
-    		console.log("success!");
-    	});
-    };
-  });
+.controller('RegistrationCtrl', function ($scope, $http, $cookies) {
+  $scope.forkMembersRepo = function(){
+    // code to POST fork sbjs members repo
+    console.log('Fork that pork!');
+    $http.post('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token, {}).then(function(res){
+      console.log('success!');
+    });
+  };
+});
diff --git a/app/styles/main.css b/app/styles/main.css
index a9ca81f..673e99f 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -22,28 +22,24 @@ body {
     margin: 10px auto;
 }
 
-.profile {
-    width: 430px;
-}
+.profile { width: 430px; }
 
 .profile table tr th{
     text-align: left;
     width:  150px;
 }
 
-.members {
-    width: 400px;
-}
-
-.members li {
-    list-style: none;
-}
+.members { width: 400px; }
 
-.members li img.thumbnail {
-    width:80px;
+.members ul { margin: 0; }
+.members li { list-style: none; }
+.members a { text-decoration: none; }
+.members li .thumbnail {
+    width: 80px;
     display: inline-block;
 }
 
-.members li h2 {
+.members h2 {
     display: inline-block;
+    margin: 10px 0 10px 10px;
 }
diff --git a/app/views/members.html b/app/views/members.html
index 9cb730f..0968a79 100644
--- a/app/views/members.html
+++ b/app/views/members.html
@@ -4,9 +4,7 @@ <h1>Members</h1>
     <li ng-repeat="member in members">
       <a href="{{ member.url }}">
       	<img class="thumbnail" src="{{member.avatar_url}}">
-      </a>
-      <a href="{{ member.url }}">
-	    <h2>{{member.login}}</h2>
+  	    <h2>{{member.login}}</h2>
       </a>
     </li>
   </ul>
diff --git a/app/views/registration.html b/app/views/registration.html
index 8925786..baab7d5 100644
--- a/app/views/registration.html
+++ b/app/views/registration.html
@@ -4,4 +4,4 @@ <h1>Become a Member</h1>
 
 <div ng-controller="RegistrationCtrl">
   <button class="btn btn-medium btn-primary" ng-click="forkMembersRepo()">Fork SBJS.profiles</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/test/spec/controllers/registration.js b/test/spec/controllers/registration.js
index a69155f..07addda 100644
--- a/test/spec/controllers/registration.js
+++ b/test/spec/controllers/registration.js
@@ -15,8 +15,5 @@ describe('Controller: RegistrationCtrl', function () {
       $scope: scope
     });
   }));
-
-  it('should attach a list of awesomeThings to the scope', function () {
-    expect(scope.awesomeThings.length).toBe(3);
-  });
+  
 });

From 3240fd376354644fb3a3d1d3ac4d35c164fe7b07 Mon Sep 17 00:00:00 2001
From: Jim McGaw <jim@rightscale.com>
Date: Mon, 29 Jul 2013 15:48:44 -0700
Subject: [PATCH 13/19] specs for become a member page

---
 app/scripts/controllers/registration.js |  4 ++--
 test/spec/controllers/registration.js   | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/scripts/controllers/registration.js b/app/scripts/controllers/registration.js
index f927735..ed13e54 100644
--- a/app/scripts/controllers/registration.js
+++ b/app/scripts/controllers/registration.js
@@ -4,8 +4,8 @@ angular.module('sbjsApp')
 .controller('RegistrationCtrl', function ($scope, $http, $cookies) {
   $scope.forkMembersRepo = function(){
     // code to POST fork sbjs members repo
-    console.log('Fork that pork!');
-    $http.post('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token, {}).then(function(res){
+    var url = 'https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token;
+    $http.post(url, {}).then(function(res){
       console.log('success!');
     });
   };
diff --git a/test/spec/controllers/registration.js b/test/spec/controllers/registration.js
index 07addda..3b57aea 100644
--- a/test/spec/controllers/registration.js
+++ b/test/spec/controllers/registration.js
@@ -6,14 +6,32 @@ describe('Controller: RegistrationCtrl', function () {
   beforeEach(module('sbjsApp'));
 
   var RegistrationCtrl,
-    scope;
+    scope, cookies, http;
 
   // Initialize the controller and a mock scope
-  beforeEach(inject(function ($controller, $rootScope) {
+  beforeEach(inject(function ($controller, $rootScope, $cookies, $http) {
     scope = $rootScope.$new();
+    http = $http;
+    cookies = $cookies;
     RegistrationCtrl = $controller('RegistrationCtrl', {
-      $scope: scope
+      $scope: scope,
+      $http: http,
+      $cookies: cookies
     });
   }));
+
+  it("is defined", function() {
+    cookies.token = "123456654321";
+    var thenSpy = jasmine.createSpy("then");
+    spyOn(http, "post").andReturn({
+      then : thenSpy
+    });
+    var url = 'https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+cookies.token;
+
+    scope.forkMembersRepo();
+
+    expect(http.post).toHaveBeenCalledWith(url, {});
+    expect(thenSpy).toHaveBeenCalled();
+  });
   
 });

From b6c39818fffeedaca4a67c201222f50e335bf9e6 Mon Sep 17 00:00:00 2001
From: Jim McGaw <jim@rightscale.com>
Date: Mon, 29 Jul 2013 15:56:40 -0700
Subject: [PATCH 14/19] give spec meaningful name

---
 test/spec/controllers/registration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/spec/controllers/registration.js b/test/spec/controllers/registration.js
index 3b57aea..cb4197f 100644
--- a/test/spec/controllers/registration.js
+++ b/test/spec/controllers/registration.js
@@ -20,7 +20,7 @@ describe('Controller: RegistrationCtrl', function () {
     });
   }));
 
-  it("is defined", function() {
+  it("posts to github fork repo link", function() {
     cookies.token = "123456654321";
     var thenSpy = jasmine.createSpy("then");
     spyOn(http, "post").andReturn({

From 3442abdaa4e422f6f17200d057cce272f07feea4 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Mon, 29 Jul 2013 17:30:10 -0700
Subject: [PATCH 15/19] update redirect url

---
 app/scripts/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/scripts/app.js b/app/scripts/app.js
index 2786fe1..a59452e 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -18,7 +18,7 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
 
       function error(response) {
         if(response.status === 401) {
-          $location.path('/login');
+          $location.path('/');
           return $q.reject(response);
         }
         else {

From d2bf4f77e658d9590b4cafeb434d36285a708c42 Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Mon, 29 Jul 2013 18:51:07 -0700
Subject: [PATCH 16/19] members.js specs; add underscore to karma.conf

---
 app/scripts/controllers/members.js | 14 +++++++--
 karma.conf.js                      |  1 +
 test/spec/controllers/members.js   | 48 +++++++++++++++++++++++++++---
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/app/scripts/controllers/members.js b/app/scripts/controllers/members.js
index 4c11c2c..a9dae2d 100644
--- a/app/scripts/controllers/members.js
+++ b/app/scripts/controllers/members.js
@@ -2,8 +2,16 @@
 
 angular.module('sbjsApp')
 .controller('MembersCtrl', function ($scope, $http, $cookies) {
-  $http.get('https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token='+$cookies.token).then(function(res){
-    $scope.members = _.pluck(res.data, 'owner');
-  });
+	
+	$scope.parseMembers = function(result){
+		$scope.members = _.pluck(result.data, 'owner');
+	};
+
+	$scope.fetchMembers = function(){
+		var url = 'https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token=' + $cookies.token;
+	  $http.get(url).then($scope.parseMembers);
+	}
+
+	$scope.fetchMembers();
 
 });
diff --git a/karma.conf.js b/karma.conf.js
index 9632aed..5796820 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -11,6 +11,7 @@ files = [
   'app/bower_components/angular-mocks/angular-mocks.js',
   'app/bower_components/angular-cookies/angular-cookies.js',
   'app/bower_components/angular-strap/dist/angular-strap.js',
+  'app/bower_components/underscore/underscore.js',
   'app/scripts/*.js',
   'app/scripts/**/*.js',
   'test/mock/**/*.js',
diff --git a/test/spec/controllers/members.js b/test/spec/controllers/members.js
index 5b9ba6e..32c9465 100644
--- a/test/spec/controllers/members.js
+++ b/test/spec/controllers/members.js
@@ -5,14 +5,54 @@ describe('Controller: MembersCtrl', function () {
   // load the controller's module
   beforeEach(module('sbjsApp'));
 
-  var MembersCtrl,
-    scope;
+  var MembersCtrl, getSpy,
+    scope, http, cookies;
 
   // Initialize the controller and a mock scope
-  beforeEach(inject(function ($controller, $rootScope) {
+  beforeEach(inject(function ($controller, $rootScope, $http, $cookies) {
+    cookies = $cookies;
+    http = $http;
     scope = $rootScope.$new();
+
+    // stubbing here so constructor does not trigger HTTP GET request
+    getSpy = spyOn(http, "get");
+    getSpy.andReturn({ then: jasmine.createSpy("then") });
+
     MembersCtrl = $controller('MembersCtrl', {
-      $scope: scope
+      $scope: scope,
+      $http: http,
+      $cookies : cookies
     });
+
   }));
+
+  describe("#parseMembers", function() {
+    it("parses owner objects out of result data", function() {
+      expect(scope.members).not.toBeDefined();
+      var result = {
+        data : [
+          { owner : "Jim" },
+          { owner : "Remy" }
+        ]
+      };
+      scope.parseMembers(result);
+      expect(scope.members).toEqual(["Jim", "Remy"]);
+    });
+  });
+
+  describe("#fetchMembers", function() {
+    it("fetches members from github URL", function() {
+      cookies.token = "1j2j3j475hf7";
+      var thenSpy = jasmine.createSpy("then");
+      getSpy.andReturn({
+        then: thenSpy
+      });
+      var url = 'https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token=' + cookies.token;
+
+      scope.fetchMembers();
+
+      expect(http.get).toHaveBeenCalledWith(url);
+      expect(thenSpy).toHaveBeenCalledWith(scope.parseMembers);
+    });
+  });
 });

From 11f0ca8bb43431a6ca424b1191d99a494f06680d Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Mon, 29 Jul 2013 19:45:50 -0700
Subject: [PATCH 17/19] profile.js specs

---
 app/scripts/controllers/profile.js | 16 ++++++---
 test/spec/controllers/profile.js   | 52 +++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/app/scripts/controllers/profile.js b/app/scripts/controllers/profile.js
index 7f6c10c..2f3d890 100644
--- a/app/scripts/controllers/profile.js
+++ b/app/scripts/controllers/profile.js
@@ -3,10 +3,16 @@
 angular.module('sbjsApp')
 .controller('ProfileCtrl', function ($scope, $http, $cookies) {
 
-  $http.get('https://api.github.com/user?access_token='+$cookies.token).then(function(res){
-    $scope.user = res.data;
-    $scope.user.avatar_url += '&s=420';
-    console.log($scope.user);
-  });
+	$scope.parseUser = function(result) {
+		$scope.user = result.data;
+		$scope.user.avatar_url += "&s=420";
+	};
+
+	$scope.fetchUserProfile = function() {
+		var url = 'https://api.github.com/user?access_token=' + $cookies.token;
+		$http.get(url).then($scope.parseUser);
+	};
+
+	$scope.fetchUserProfile();
 
 });
diff --git a/test/spec/controllers/profile.js b/test/spec/controllers/profile.js
index 04b1d98..0328e45 100644
--- a/test/spec/controllers/profile.js
+++ b/test/spec/controllers/profile.js
@@ -2,15 +2,59 @@
 
 describe('Controller: ProfileCtrl', function () {
 
-  var ProfileCtrl,
-    scope;
+	beforeEach(module('sbjsApp'));
+
+  var ProfileCtrl, getSpy,
+    scope, http, cookies;
 
   // Initialize the controller and a mock scope
-  beforeEach(inject(function ($controller, $rootScope) {
+  beforeEach(inject(function ($controller, $rootScope, $http, $cookies) {
     scope = $rootScope.$new();
+    http = $http;
+    cookies = $cookies;
+
+    getSpy = spyOn(http, "get");
+    getSpy.andReturn({ then : jasmine.createSpy("then") });
+
     ProfileCtrl = $controller('ProfileCtrl', {
-      $scope: scope
+      $scope: scope,
+      $http : http,
+      $cookies : cookies
     });
   }));
 
+  describe("#parseUser", function() {
+  	it("parses the user data from results", function() {
+  		expect(scope.user).not.toBeDefined();
+
+  		var result = {
+  			data : {
+  				"name" : "myName",
+  				"avatar_url" : "http://www.avatar_url.com/?arg1=456"
+  			}
+  		};
+
+  		scope.parseUser(result);
+
+  		result.data.avatar_url += "&s=420";
+  		expect(scope.user).toEqual(result.data);
+  	});
+  });
+
+  describe("#fetchUserProfile", function() {
+  	it("fetches user profile data from git URL", function() {
+  		cookies.token = "f7djv6d5susnrn4nw";
+  		var thenSpy = jasmine.createSpy("then");
+  		getSpy.andReturn({
+  			"then" : thenSpy
+  		});
+  		var url = 'https://api.github.com/user?access_token=' + cookies.token;
+
+  		scope.fetchUserProfile();
+
+  		expect(http.get).toHaveBeenCalledWith(url);
+  		expect(thenSpy).toHaveBeenCalledWith(scope.parseUser);
+  	});
+  });
+
 });

From 1bc41054d14bcdc09ccd9de7718da4ca80931a09 Mon Sep 17 00:00:00 2001
From: remyyounes <ryounes@gmail.com>
Date: Wed, 31 Jul 2013 18:01:51 -0700
Subject: [PATCH 18/19] FIYAH

---
 app/index.html                  |  6 +++++-
 app/scripts/app.js              |  6 +++++-
 app/scripts/controllers/fire.js | 25 +++++++++++++++++++++++++
 app/views/fire.html             |  8 ++++++++
 bower.json                      |  4 ++--
 test/spec/controllers/fire.js   | 22 ++++++++++++++++++++++
 6 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 app/scripts/controllers/fire.js
 create mode 100644 app/views/fire.html
 create mode 100644 test/spec/controllers/fire.js

diff --git a/app/index.html b/app/index.html
index 1f5d1df..98fffcb 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,8 +42,8 @@
       <!-- Issue filed on GH @ https://github.com/mgcrea/angular-strap/issues/208 -->
       <li data-match-route="/profile"><a href="#/profile">Profile</a></li>
       <li data-match-route="/members"><a href="#/members">Members</a></li>
+      <li data-match-route="/fire"><a href="#/fire">Fire</a></li>
       <li data-match-route="/registration"><a href="#/registration">Become a Member</a></li>
-
     </ul>
   </div>
 </div>
@@ -77,6 +77,9 @@
 <script src="bower_components/angular-strap/dist/angular-strap.js"></script>
 <script src="bower_components/jquery/jquery.js"></script>
 <script src="bower_components/underscore/underscore.js"></script>
+<script src="https://cdn.firebase.com/v0/firebase.js"></script>
+<script src="bower_components/angular-fire/angularFire.js"></script>
+
 <!-- endbuild -->
 
 <!-- build:js({.tmp,app}) scripts/scripts.js -->
@@ -88,6 +91,7 @@
 <script src="scripts/services/auth.js"></script>
 
 <script src="scripts/controllers/registration.js"></script>
+<script src="scripts/controllers/fire.js"></script>
 <!-- endbuild -->
 </body>
 </html>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index a59452e..60d8971 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('sbjsApp', ['ngCookies','$strap.directives'])
+angular.module('sbjsApp', ['ngCookies','$strap.directives','firebase'])
   .config(function ($routeProvider, $httpProvider) {
     $routeProvider
       .when('/', {templateUrl: 'views/main.html', controller: 'MainCtrl'})
@@ -8,6 +8,10 @@ angular.module('sbjsApp', ['ngCookies','$strap.directives'])
       .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
       .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
       .when('/registration', {templateUrl: 'views/registration.html', controller: 'RegistrationCtrl'})
+      .when('/fire', {
+        templateUrl: 'views/fire.html',
+        controller: 'FireCtrl'
+      })
       .otherwise({redirectTo: '/'});
 
     //Interceptor is used in case the token becomes invalid while the session is active.
diff --git a/app/scripts/controllers/fire.js b/app/scripts/controllers/fire.js
new file mode 100644
index 0000000..0d3a882
--- /dev/null
+++ b/app/scripts/controllers/fire.js
@@ -0,0 +1,25 @@
+'use strict';
+
+angular.module('sbjsApp')
+  .controller('FireCtrl', function ($scope, angularFire) {
+
+    $scope.notes = [];
+    var url = 'https://sbjs.firebaseio.com/notes';
+    var promise = angularFire(url, $scope, 'notes', [])
+    .then( function(todos){
+      startWatch($scope);
+    });
+  }
+);
+
+
+function startWatch($scope) {
+  $scope.addNote = function(){
+    var note = {
+      'githubUserId': 'HardCoded',
+      'message': $scope.newMessage
+    };
+    $scope.notes.push(note);
+    $scope.newMessage = '';
+  };
+}
diff --git a/app/views/fire.html b/app/views/fire.html
new file mode 100644
index 0000000..566cd24
--- /dev/null
+++ b/app/views/fire.html
@@ -0,0 +1,8 @@
+<div class="notes">
+  <div class="note well" ng-repeat="note in notes">
+    <h2>{{note.githubUserId}}</h2>
+    <div>{{note.message}}</div>
+  </div>
+  <textarea ng-model="newMessage"></textarea>
+  <button ng-click="addNote()">Add Note</button>
+</div>
diff --git a/bower.json b/bower.json
index f7167e9..cde0172 100644
--- a/bower.json
+++ b/bower.json
@@ -12,8 +12,8 @@
     "angular-sanitize": "~1.0.7",
     "angular-bootstrap": "*",
     "angular-strap": "*",
-    "underscore": "*"
-
+    "underscore": "*",
+    "angular-fire":"*"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.7",
diff --git a/test/spec/controllers/fire.js b/test/spec/controllers/fire.js
new file mode 100644
index 0000000..4e81bd3
--- /dev/null
+++ b/test/spec/controllers/fire.js
@@ -0,0 +1,22 @@
+'use strict';
+
+describe('Controller: FireCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('sbjsApp'));
+
+  var FireCtrl,
+    scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    FireCtrl = $controller('FireCtrl', {
+      $scope: scope
+    });
+  }));
+
+  it('should attach a list of awesomeThings to the scope', function () {
+    expect(scope.awesomeThings.length).toBe(3);
+  });
+});

From d02e1d7f0089dcd8b4e63a6f3c9485b4923b73e1 Mon Sep 17 00:00:00 2001
From: Jim McGaw <smoochy@Jim-McGaws-MacBook-Pro.local>
Date: Wed, 31 Jul 2013 22:40:10 -0700
Subject: [PATCH 19/19] specs not passing, but refactor of profile / members
 fetch into auth module, pass into controllers

---
 app/scripts/app.js                 | 15 ++++++-------
 app/scripts/controllers/members.js | 16 +++-----------
 app/scripts/controllers/profile.js | 19 ++++-------------
 app/scripts/services/auth.js       | 27 ++++++++++++++++++++++--
 app/views/members.html             |  6 +++---
 app/views/profile.html             | 10 ++++-----
 karma.conf.js                      |  1 +
 package.json                       |  3 ++-
 test/spec/controllers/fire.js      |  3 ---
 test/spec/controllers/members.js   | 14 +++++-------
 test/spec/controllers/profile.js   | 34 ------------------------------
 test/spec/services/auth.js         | 34 ++++++++++++++++++++++++++++++
 12 files changed, 88 insertions(+), 94 deletions(-)

diff --git a/app/scripts/app.js b/app/scripts/app.js
index 60d8971..be6924a 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -3,15 +3,12 @@
 angular.module('sbjsApp', ['ngCookies','$strap.directives','firebase'])
   .config(function ($routeProvider, $httpProvider) {
     $routeProvider
-      .when('/', {templateUrl: 'views/main.html', controller: 'MainCtrl'})
-      .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl'})
-      .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl'})
-      .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl'})
-      .when('/registration', {templateUrl: 'views/registration.html', controller: 'RegistrationCtrl'})
-      .when('/fire', {
-        templateUrl: 'views/fire.html',
-        controller: 'FireCtrl'
-      })
+      .when('/', {templateUrl: 'views/main.html', controller: 'MainCtrl' })
+      .when('/auth', {templateUrl: 'views/auth.html', controller: 'AuthCtrl' })
+      .when('/profile', {templateUrl: 'views/profile.html', controller: 'ProfileCtrl' })
+      .when('/members', {templateUrl: 'views/members.html', controller: 'MembersCtrl' })
+      .when('/registration', {templateUrl: 'views/registration.html', controller: 'RegistrationCtrl' })
+      .when('/fire', { templateUrl: 'views/fire.html', controller: 'FireCtrl' })
       .otherwise({redirectTo: '/'});
 
     //Interceptor is used in case the token becomes invalid while the session is active.
diff --git a/app/scripts/controllers/members.js b/app/scripts/controllers/members.js
index a9dae2d..b2ea374 100644
--- a/app/scripts/controllers/members.js
+++ b/app/scripts/controllers/members.js
@@ -1,17 +1,7 @@
 'use strict';
 
 angular.module('sbjsApp')
-.controller('MembersCtrl', function ($scope, $http, $cookies) {
-	
-	$scope.parseMembers = function(result){
-		$scope.members = _.pluck(result.data, 'owner');
-	};
-
-	$scope.fetchMembers = function(){
-		var url = 'https://api.github.com/repos/sbjs/sbjs.profiles/forks?access_token=' + $cookies.token;
-	  $http.get(url).then($scope.parseMembers);
+	.controller('MembersCtrl', function($scope, auth){
+		$scope.members = auth.fetchMembers();
 	}
-
-	$scope.fetchMembers();
-
-});
+);
diff --git a/app/scripts/controllers/profile.js b/app/scripts/controllers/profile.js
index 2f3d890..869567d 100644
--- a/app/scripts/controllers/profile.js
+++ b/app/scripts/controllers/profile.js
@@ -1,18 +1,7 @@
 'use strict';
 
 angular.module('sbjsApp')
-.controller('ProfileCtrl', function ($scope, $http, $cookies) {
-
-	$scope.parseUser = function(result) {
-		$scope.user = result.data;
-		$scope.user.avatar_url += "&s=420";
-	};
-
-	$scope.fetchUserProfile = function() {
-		var url = 'https://api.github.com/user?access_token=' + $cookies.token;
-		$http.get(url).then($scope.parseUser);
-	};
-
-	$scope.fetchUserProfile();
-
-});
+	.controller('ProfileCtrl', function($scope, auth){
+		$scope.profile = auth.fetchUserProfile();
+	}
+);
diff --git a/app/scripts/services/auth.js b/app/scripts/services/auth.js
index 7141d5b..aa82d9b 100644
--- a/app/scripts/services/auth.js
+++ b/app/scripts/services/auth.js
@@ -1,7 +1,8 @@
 'use strict';
 
 angular.module('sbjsApp')
-.service('auth', function auth($cookies, $location) {
+.service('auth', function auth($cookies, $http, $location) {
+  this.GITHUB_BASE_URL = "https://api.github.com";
 
   this.getToken = function(){
     var access_token = $location.search().access_token;
@@ -10,8 +11,30 @@ angular.module('sbjsApp')
       $location.search('access_token', null);
     }
     // if we dont have a token, redirect to home to authenticate
-    if(!$cookies.token) { $location.path( '/' ); }
+    if(!$cookies.token) {
+      $location.path( '/' );
+    }
     return $cookies.token;
   };
 
+  this.parseUser = function(result){
+    var user = result.data;
+    user.avatar_url += "&s=420";
+    return user;
+  };
+
+  this.fetchUserProfile = function(){
+    var url = this.GITHUB_BASE_URL + '/user?access_token=' + this.getToken();
+    return $http.get(url).then(this.parseUser);
+  };  
+
+  this.parseMembers = function(result){
+    return _.pluck(result.data, 'owner');
+  };
+
+  this.fetchMembers = function(){
+    var url = this.GITHUB_BASE_URL + '/repos/sbjs/sbjs.profiles/forks?access_token=' + this.getToken();
+    return $http.get(url).then(this.parseMembers);
+  }
+
 });
diff --git a/app/views/members.html b/app/views/members.html
index 0968a79..82b3b0a 100644
--- a/app/views/members.html
+++ b/app/views/members.html
@@ -2,9 +2,9 @@
   <h1>Members</h1>
   <ul class="well">
     <li ng-repeat="member in members">
-      <a href="{{ member.url }}">
-      	<img class="thumbnail" src="{{member.avatar_url}}">
-  	    <h2>{{member.login}}</h2>
+      <a href="{{ member.html_url }}" target="_blank">
+      	<img class="thumbnail" src="{{ member.avatar_url }}">
+  	    <h2>{{ member.login }}</h2>
       </a>
     </li>
   </ul>
diff --git a/app/views/profile.html b/app/views/profile.html
index cf9057c..41c1fc0 100644
--- a/app/views/profile.html
+++ b/app/views/profile.html
@@ -1,19 +1,19 @@
 <div class="hero-unit profile">
-  <img class="thumbnail" src="{{user.avatar_url}}">
-  <h1>{{user.login}}</h1>
+  <img class="thumbnail" src="{{profile.avatar_url}}">
+  <h1>{{profile.login}}</h1>
   <div class="well">
     <table>
       <tr>
         <th>Name:</th>
-        <td>{{user.name}}</td>
+        <td>{{profile.name}}</td>
       </tr>
       <tr>
         <th>Location:</th>
-        <td>{{user.location}}</td>
+        <td>{{profile.location}}</td>
       </tr>
       <tr>
         <th>Public Repos:</th>
-        <td>{{user.public_repos}}</td>
+        <td>{{profile.public_repos}}</td>
       </tr>
     </table>
   </div>
diff --git a/karma.conf.js b/karma.conf.js
index 5796820..758499a 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -12,6 +12,7 @@ files = [
   'app/bower_components/angular-cookies/angular-cookies.js',
   'app/bower_components/angular-strap/dist/angular-strap.js',
   'app/bower_components/underscore/underscore.js',
+  'app/bower_components/angular-fire/angularFire.js',
   'app/scripts/*.js',
   'app/scripts/**/*.js',
   'test/mock/**/*.js',
diff --git a/package.json b/package.json
index b6f0954..12360f0 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
         "express": "3.3.4",
         "ejs": "~0.8.4",
         "jade": "*",
-        "restler": "*"
+        "restler": "*",
+        "firebase" : "0.6.1"
     },
     "scripts": {
         "test": "grunt test",
diff --git a/test/spec/controllers/fire.js b/test/spec/controllers/fire.js
index 4e81bd3..6fbcae1 100644
--- a/test/spec/controllers/fire.js
+++ b/test/spec/controllers/fire.js
@@ -16,7 +16,4 @@ describe('Controller: FireCtrl', function () {
     });
   }));
 
-  it('should attach a list of awesomeThings to the scope', function () {
-    expect(scope.awesomeThings.length).toBe(3);
-  });
 });
diff --git a/test/spec/controllers/members.js b/test/spec/controllers/members.js
index 32c9465..b11947e 100644
--- a/test/spec/controllers/members.js
+++ b/test/spec/controllers/members.js
@@ -10,22 +10,18 @@ describe('Controller: MembersCtrl', function () {
 
   // Initialize the controller and a mock scope
   beforeEach(inject(function ($controller, $rootScope, $http, $cookies) {
-    cookies = $cookies;
-    http = $http;
     scope = $rootScope.$new();
 
-    // stubbing here so constructor does not trigger HTTP GET request
-    getSpy = spyOn(http, "get");
-    getSpy.andReturn({ then: jasmine.createSpy("then") });
-
     MembersCtrl = $controller('MembersCtrl', {
-      $scope: scope,
-      $http: http,
-      $cookies : cookies
+      $scope: scope
     });
 
   }));
 
+  it("has members defined", function() {
+    expect(scope.members).toBeDefined();
+  });
+
   describe("#parseMembers", function() {
     it("parses owner objects out of result data", function() {
       expect(scope.members).not.toBeDefined();
diff --git a/test/spec/controllers/profile.js b/test/spec/controllers/profile.js
index 0328e45..3aeb7e1 100644
--- a/test/spec/controllers/profile.js
+++ b/test/spec/controllers/profile.js
@@ -23,38 +23,4 @@ describe('Controller: ProfileCtrl', function () {
     });
   }));
 
-  describe("#parseUser", function() {
-  	it("parses the user data from results", function() {
-  		expect(scope.user).not.toBeDefined();
-
-  		var result = {
-  			data : {
-  				"name" : "myName",
-  				"avatar_url" : "http://www.avatar_url.com/?arg1=456"
-  			}
-  		};
-
-  		scope.parseUser(result);
-
-  		result.data.avatar_url += "&s=420";
-  		expect(scope.user).toEqual(result.data);
-  	});
-  });
-
-  describe("#fetchUserProfile", function() {
-  	it("fetches user profile data from git URL", function() {
-  		cookies.token = "f7djv6d5susnrn4nw";
-  		var thenSpy = jasmine.createSpy("then");
-  		getSpy.andReturn({
-  			"then" : thenSpy
-  		});
-  		var url = 'https://api.github.com/user?access_token=' + cookies.token;
-
-  		scope.fetchUserProfile();
-
-  		expect(http.get).toHaveBeenCalledWith(url);
-  		expect(thenSpy).toHaveBeenCalledWith(scope.parseUser);
-  	});
-  });
-
 });
diff --git a/test/spec/services/auth.js b/test/spec/services/auth.js
index 345dcd9..1da692e 100644
--- a/test/spec/services/auth.js
+++ b/test/spec/services/auth.js
@@ -15,4 +15,38 @@ describe('Service: auth', function () {
     expect(!!auth).toBe(true);
   });
 
+  describe("#parseUser", function() {
+    it("parses the user data from results", function() {
+      expect(scope.user).not.toBeDefined();
+
+      var result = {
+        data : {
+          "name" : "myName",
+          "avatar_url" : "http://www.avatar_url.com/?arg1=456"
+        }
+      };
+
+      scope.parseUser(result);
+
+      result.data.avatar_url += "&s=420";
+      expect(scope.user).toEqual(result.data);
+    });
+  });
+
+  describe("#fetchUserProfile", function() {
+    it("fetches user profile data from git URL", function() {
+      cookies.token = "f7djv6d5susnrn4nw";
+      var thenSpy = jasmine.createSpy("then");
+      getSpy.andReturn({
+        "then" : thenSpy
+      });
+      var url = 'https://api.github.com/user?access_token=' + cookies.token;
+
+      scope.fetchUserProfile();
+
+      expect(http.get).toHaveBeenCalledWith(url);
+      expect(thenSpy).toHaveBeenCalledWith(scope.parseUser);
+    });
+  });
+
 });