spec compliance wip

2016-12-10 21:32:29 -06:00
parent c6ab2f4122
commit 7bbd18e75c
11 changed files with 231 additions and 165 deletions
--- a/app/assets/javascripts/app/frontend/controllers/home.js
+++ b/app/assets/javascripts/app/frontend/controllers/home.js
@@ -23,16 +23,16 @@ angular.module('app.frontend')
      $scope.groups = groups;
    }

-    $auth.validateUser()
-      .then(function () {
-        $scope.defaultUser = new User($auth.user);
+    apiController.getCurrentUser(function(response){
+      console.log("get current response", response);
+      if(response && !response.errors) {
+        $scope.defaultUser = new User(response.plain());
        $rootScope.title = "Notes — Neeto";
        onUserSet();
-
-      })
-      .catch(function () {
+      } else {
        $scope.defaultUser = new User(apiController.localUser());
        onUserSet();
+      }
    });

    /*