From b485ee35d5fbc20360258c1ee5711696bb0d5605 Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Mon, 25 May 2015 04:41:33 -0700
Subject: [PATCH] more tweaks

---
 home.html                  |  8 +++---
 scripts/LoginController.js |  2 +-
 scripts/UserService.js     |  5 ++--
 templates/addclass.html    | 70 ++++++++++++++++++++++------------------------
 templates/login.html       |  2 +-
 5 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/home.html b/home.html
index 476bc8b..a40a5e1 100644
--- a/home.html
+++ b/home.html
@@ -16,7 +16,7 @@
 <header>
   <nav>
     <div class="nav-wrapper">
-      <a ng-show="user" href="#" data-activates="mobile-demo" class="left button-collapse hide-on-med-and-up"><i
+      <a ng-show="UserService.isLoggedIn()" 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 && UserService.isLoggedIn()" class="left hide-on-small-and-down">
         <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"
@@ -50,8 +50,8 @@
       </ul>
 
       <!-- Slide-in side-nav for small screens -->
-      <ul class="side-nav" id="mobile-demo">
-        <span ng-show="currentSection.id && UserService.isLoggedIn()">
+      <ul ng-show="UserService.isLoggedIn()" class="side-nav" id="mobile-demo">
+        <span ng-show="currentSection.id">
           <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>
@@ -74,7 +74,7 @@
           </li>
           <div class="collapsible-body" style="display: block">
             <ul>
-              <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>
               <hr>
diff --git a/scripts/LoginController.js b/scripts/LoginController.js
index f0a2404..2f83dcc 100644
--- a/scripts/LoginController.js
+++ b/scripts/LoginController.js
@@ -13,7 +13,7 @@ angular.module('flashy.LoginController', ['ui.router']).
                     'password': password
                 })).
                     success(function(data) {
-                        UserService.setUserData(data);
+                        UserService.login(data);
                         if (angular.isDefined($scope.returnToState))
                             $state.go($scope.returnToState.name, $scope.returnToStateParams);
                         else $state.go('addclass');
diff --git a/scripts/UserService.js b/scripts/UserService.js
index 586fb81..3a4fd85 100644
--- a/scripts/UserService.js
+++ b/scripts/UserService.js
@@ -9,7 +9,8 @@ angular.module('flashy.UserService', ['ui.router']).
         }).error(function(data) {
             console.log(data);
             console.log('not logged in yet: ' + data.detail);
-            deferred.resolve({email: false});
+            _user = {email:false};
+            deferred.resolve(_user);
         });
 
         this.isResolved = function() {
@@ -19,7 +20,7 @@ angular.module('flashy.UserService', ['ui.router']).
             if (this.isResolved()) return _user;
             else return deferred.promise;
         };
-        this.setUserData = function(data) {
+        this.login = function(data) {
             _user = data;
             deferred.resolve(data);
         };
diff --git a/templates/addclass.html b/templates/addclass.html
index 320b91b..5743cbb 100644
--- a/templates/addclass.html
+++ b/templates/addclass.html
@@ -1,41 +1,39 @@
-<div class="">
-  <div class="row" style="margin-top:64px;">
-    <div class="offset-m2 col m8">
-      <h2 class="header">Add a class</h2>
-      <md-content layout-padding="" layout="column" style="overflow:hidden">
+<div class="" style="margin-top:32px;">
+  <div class="row" style="max-width:800px; width:90%; min-width:512px; margin: 0 auto">
+    <h2 class="header">Add a class</h2>
+    <md-content layout-padding="" layout="column" style="overflow:hidden">
 
-        <form ng-submit="$event.preventDefault()">
-          <div layout="row">
-            <md-autocomplete flex=""
-                             md-autofocus="true"
-                             md-selected-item="selectedItem"
-                             md-search-text="searchText"
-                             md-items="item in trySearch(searchText)"
-                             md-item-text="item.short_name"
-                             md-selected-item-change="selectObject(event)"
-                             md-autoselect="true"
-                    >
-              <md-item-template>
-                <div layout="row">
-                  <div>{{item.short_name}}: {{item.course_title}}
-                    ({{item.instructor}})
-                  </div>
-                  <div style="margin-left:auto;text-align:right;padding-left:30px">
-                    {{item.lecture_times}}
-                  </div>
+      <form ng-submit="$event.preventDefault()">
+        <div layout="row">
+          <md-autocomplete flex=""
+                           md-autofocus="true"
+                           md-selected-item="selectedItem"
+                           md-search-text="searchText"
+                           md-items="item in trySearch(searchText)"
+                           md-item-text="item.short_name"
+                           md-selected-item-change="selectObject(event)"
+                           md-autoselect="true"
+                  >
+            <md-item-template>
+              <div layout="row">
+                <div>{{item.short_name}}: {{item.course_title}}
+                  ({{item.instructor}})
                 </div>
-              </md-item-template>
-              <md-not-found>
-                No classes match "{{searchText}}".
-              </md-not-found>
-            </md-autocomplete>
-            <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
-              <i class="mdi-content-add right"></i>
-            </button>
-          </div>
+                <div style="margin-left:auto;text-align:right;padding-left:30px">
+                  {{item.lecture_times}}
+                </div>
+              </div>
+            </md-item-template>
+            <md-not-found>
+              No classes match "{{searchText}}".
+            </md-not-found>
+          </md-autocomplete>
+          <button class="btn waves-effect waves-light" type="submit" name="add" ng-click="submit()">Add
+            <i class="mdi-content-add right"></i>
+          </button>
+        </div>
 
-        </form>
-      </md-content>
-    </div>
+      </form>
+    </md-content>
   </div>
 </div>
diff --git a/templates/login.html b/templates/login.html
index 0a2154e..7dcfecd 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,5 +1,5 @@
 <div class="" style="margin-top:32px;">
-  <div class="row" style="max-width:500px; width:50%;margin: 0 auto">
+  <div class="row" style="max-width:512px; width:50%; min-width:256px; margin: 0 auto">
     <ul class="tabs">
       <li class="tab col s6"><a href="#register-tab">Sign Up</a></li>
       <li class="tab col s6"><a class="active" href="#login-tab">Login</a></li>
-- 
1.9.1