From 5132f0e87c4dbda56df7c3cc9f9f0235bc539037 Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Mon, 25 May 2015 02:55:00 -0700
Subject: [PATCH] clean up user service binding!

---
 config.js                 |  4 ++--
 home.html                 | 34 ++++++++++++++---------------
 scripts/RootController.js | 10 ++++++---
 scripts/UserService.js    | 54 ++++++++++++++++-------------------------------
 4 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/config.js b/config.js
index 5e83e05..0de7b49 100644
--- a/config.js
+++ b/config.js
@@ -125,11 +125,11 @@ angular.module('flashy', [
                 else return console.log('we are going to login anyway');
             }
             if (UserService.isLoggedIn()) return console.log('no login required; going straight to ' + toState.name);
-
-            if (!UserService.isUserResolved()) return console.log('user not yet resolved; hold off');
             $rootScope.returnToState = toState;
             $rootScope.returnToStateParams = toStateParams;
             console.log('going to ' + toState.name + ' after login');
+            event.preventDefault();
+            $state.go('login');
 
         });
         $rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error) {
diff --git a/home.html b/home.html
index f7b88a1..4a2f5e3 100644
--- a/home.html
+++ b/home.html
@@ -16,9 +16,9 @@
 <header>
   <nav>
     <div class="nav-wrapper">
-      <a href="#" data-activates="mobile-demo" class="left button-collapse hide-on-med-and-up"><i
+      <a ng-show="user" href="#" data-activates="mobile-demo" class="left button-collapse hide-on-med-and-up"><i
               class="mdi-navigation-menu"></i></a>
-      <ul ng-show="currentSection.id && isLoggedIn" class="left hide-on-small-and-down">
+      <ul ng-show="currentSection.id && UserService.isLoggedIn()" class="left hide-on-small-and-down">
         <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
                                        data-position="bottom"
                                        data-delay="50" data-tooltip="Feed"><i
@@ -34,10 +34,10 @@
       </ul>
       <a href="#" class="brand-logo center">Flashy</a>
 
-      <ul ng-show="isLoggedIn" id="nav-mobile" class="right hide-on-small-and-down">
+      <ul ng-show="UserService.isLoggedIn()" id="nav-mobile" class="right hide-on-small-and-down">
         <!-- User's classes dropdown -->
         <ul id="dropdown1" class="dropdown-content">
-          <li ui-sref-active="active" ng-repeat="section in sections">
+          <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
             <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
           </li>
           <li class="divider"></li>
@@ -50,20 +50,18 @@
       </ul>
 
       <!-- Slide-in side-nav for small screens -->
-      <ul class="side-nav" id="mobile-demo">
-        <ul ng-show="currentSection.id && isLoggedIn">
-          <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
-                  ><i
-                  class="mdi-action-view-module left"></i>Feed</a></li>
-          <li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped"
-                  ><i
-                  class="mdi-action-view-carousel left"></i>Deck</a></li>
-          <li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped"
-                  ><i
-                  class="mdi-action-view-list left"></i>Card List</a>
-          </li>
-          <hr>
-        </ul>
+      <ul ng-show="currentSection.id && UserService.isLoggedIn()" class="side-nav" id="mobile-demo">
+        <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
+                ><i
+                class="mdi-action-view-module left"></i>Feed</a></li>
+        <li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped"
+                ><i
+                class="mdi-action-view-carousel left"></i>Deck</a></li>
+        <li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped"
+                ><i
+                class="mdi-action-view-list left"></i>Card List</a>
+        </li>
+        <hr>
 
         <!-- Collapsible menu for all the User's classes -->
         <ul class="collapsible" data-collapsible="accordion">
diff --git a/scripts/RootController.js b/scripts/RootController.js
index 5a3bd22..98b1ab4 100644
--- a/scripts/RootController.js
+++ b/scripts/RootController.js
@@ -3,12 +3,16 @@ angular.module('flashy.RootController', ['ui.router', 'ngResource']).
     controller('RootController', function($rootScope, $resource, $scope, $state, UserService) {
         $rootScope.SectionResource = $resource('/api/sections/:sectionId/');
         window.rootscope = $rootScope;
-        $rootScope.isLoggedIn = false;
+        window.userservice = UserService;
         $rootScope.currentSection = {};
+        $scope.UserService = UserService;
         UserService.getUserData().then(function(data) {
-            console.log(data);
-            $rootScope.user = data;
+            $scope.user = data;
         });
+        //UserService.getUserData().then(function(data) {
+        //    console.log(data);
+        //    $rootScope.user = data;
+        //});
         $('.button-collapse').sideNav({
                 menuWidth: 240, // Default is 240
                 edge: 'left', // Choose the horizontal origin
diff --git a/scripts/UserService.js b/scripts/UserService.js
index 1432873..f730f2e 100644
--- a/scripts/UserService.js
+++ b/scripts/UserService.js
@@ -1,48 +1,30 @@
 angular.module('flashy.UserService', ['ui.router']).
     service('UserService', function($rootScope, $http, $q) {
-        var _user = undefined;
-        $rootScope.sections = [];
-        this.getUserData = function(refresh) {
-            var deferred = $q.defer();
-            if (angular.isDefined(_user)) {
-                console.log('user is already defined: ' + _user);
-                if (!_user) {
-                    console.log('rejecting deferred');
-                    deferred.reject(_user);
-                } else {
-                    $rootScope.isLoggedIn = true;
-                    $rootScope.sections = _user.sections;
-                    deferred.resolve(_user);
-                }
-                return deferred.promise;
-            }
-            $http.get('/api/me/').success(function(data) {
-                console.log('user is logged in!');
-                _user = data;
-                $rootScope.isLoggedIn = true;
-                $rootScope.sections = _user.sections;
-                deferred.resolve(data);
-            }).error(function(data) {
-                console.log(data);
-                console.log('not logged in yet: ' + data.detail);
-                deferred.reject('error getting own data');
-                _user = false;
-            });
-            return deferred.promise;
+        var deferred = $q.defer();
+
+        $http.get('/api/me/').success(function(data) {
+            console.log('user is logged in!');
+            _user = data;
+            deferred.resolve(data);
+        }).error(function(data) {
+            console.log(data);
+            console.log('not logged in yet: ' + data.detail);
+            deferred.resolve({});
+        });
+
+        var _user = deferred.promise;
+
+        this.getUserData = function() {
+            return _user;
         };
         this.setUserData = function(data) {
             _user = data;
         };
-        this.isUserResolved = function() {
-            return angular.isDefined(_user);
-        };
         this.logout = function() {
-            $rootScope.isLoggedIn = false;
-            _user = undefined;
+            _user = {};
         };
         this.isLoggedIn = function() {
-            rv = this.isUserResolved() && _user;
-            console.log('is user logged in? ' + rv);
+            rv = angular.isDefined(_user.email);
             return rv;
         };
     });
-- 
1.9.1