@@ -9,6 +9,9 @@ server {

   index /api;

+  location = / {

+    rewrite . /api/root;

+  }

   location / {

     # pass unrecognized urls for index.html

     # angularJS will handle the routing of most of these

@@ -35,14 +35,20 @@ user.get_users(app)

 app.register_blueprint(user.user_blueprint, url_prefix='/user')

 app.register_blueprint(bone.bone_blueprint, url_prefix='/bones')

+@app.route('/root')

+def get_index_page():

+    filebase = 'index'

+    if 'username' not in session:

+        filebase = 'login'

+    filename = os.path.join(config.static_root, '%s.html' % filebase)

+    with open(filename) as f:

+        return f.read()

+

 @app.route('/')

 def index():

-    filename = os.path.join(config.static_root, 'login.html')

-    if 'username' in session: 

-        filename = os.path.join(config.static_root, 'index.html')

+    filename = os.path.join(config.static_root, 'index.html')

     with open(filename) as f:

         dat = f.read()

-        print dat

         return dat

 if __name__ == '__main__':

@@ -148,12 +148,16 @@ def submit_link():

                 db.rollback()

     return json.dumps(result), 200, {'Content-Type':'application/json'}

-@bone_blueprint.route('',defaults={'username':None}, methods=['GET'])

-@bone_blueprint.route('/u/<username>', methods=['GET'])

+@bone_blueprint.route('', methods=['GET'])

 @login_required

+def default_data():

+    result = '', 401, {}

+    if 'username' in session:

+        result = data(current_user.id)

+    return result

+

+@bone_blueprint.route('/u/<username>', methods=['GET'])

 def data(username):

-    if username is None and 'username' in session:

-        username = current_user.id

     sectionTitle = username

     result = {'marrow':[], 'sectionTitle': sectionTitle}

@@ -200,6 +204,7 @@ def subscribe():

 @bone_blueprint.route('/subscriptions', defaults={'before':None, 'count': None})

 @bone_blueprint.route('/subscriptions/<before>', defaults={'count': None})

 @bone_blueprint.route('/subscriptions/count/<int:count>', defaults={'before': None})

+@login_required

 @cross_origin(allow_headers='Content-Type')

 def subscriptions(before, count):

     result = {'marrow':[], 'sectionTitle': 'Subscriptions'}

@@ -8,7 +8,7 @@ from flask.ext.login import LoginManager, UserMixin, login_user, logout_user, lo

 import psycopg2

 login_manager = LoginManager()

-login_manager.login_view = "/login.html"

+# login_manager.login_view = "/login.html"

 from . import database

 user_blueprint = Blueprint('user', __name__)

@@ -331,7 +331,7 @@ main form {

   padding: 10px 0;

 }

 main form input[type="text"] {

-  width: 100%;

+  width: 315px;

 }

 .more-link {

@@ -357,138 +357,28 @@ main form input[type="text"] {

 /* @end */

 /* @group Login Module */

-#login_form .tab {

-  text-align: center;

-  background: white;

-  position:absolute;

-  width: 39vw;

-  height: 39vh;

-  padding: 3vh 3vw;

-  margin-left: 13vw;

-  overflow: hidden;

-  z-index: 0;

-  border: 1px solid black;

-}

-

-.relCont::after {

-  content: " ";

-  clear: both;

-  overflow: hidden;

-}

-

-.relCont {

-  position: relative;

-}

-

-#login_form .tab.front {

-  z-index: 1;

-}

-#login_form .message{

-  /*position: absolute;*/

+#login_form div.message{

+  position: absolute;

+  background: red;

   width: 100%;

-  height: 2em;

   text-align: center;

-  visibility: hidden;

 }

-#login_form div.error {

-  background: red;

-  visibility: visible;

-}

-

-#login_form button {

-  bottom: 2em;

-  min-width: 33%;

-  margin-top: 1.5em;

-  padding: 1em;

-  font-size: 2rem;

-  color: white;

-  background: blue;

-  text-transform: uppercase;

-  background-image: linear-gradient(transparent, #003 90%);

-}

-

-#login_form ul, #login_form li {

-  list-style: none;

-  display: inline-block;

-  color: black;

-}

-

-#login_form ul {

-  z-index: 2;

-  margin-bottom: 0px;

-  width: 33vw;

-}

-

-#login_form #tab-choice {

-  margin-left: 13vw;

-  /*margin-bottom: 2em;*/

-}

-

-#login_form input[type=radio] {

-  display: none;

-}

-

-#login_form input[type=radio] + label {

-  font-size: 1.5rem;

-  cursor: pointer;

-  border: 1px solid black;

-  background: #aaa;

-  padding: 0.25em;

-  padding-bottom: 0em;

-  margin-right: 0.5em;

-  margin-bottom: -3px;

-  z-index: 5;

-}

-

-#login_form input[type=radio]:checked + label {

-  background: white;

-  border-bottom-color: white;

-  z-index: 3

-}

-

-/*

 #login_form {

   position: absolute;

   z-index: 100;

   height: 100%;

   background: white;

 }

-*/

-

 #login_form form {

-  text-align: center;

-}

-

-  

-#login_form div.message{

-}

-

-#login_form form {

-  margin-top: 100px;

-}

-

-#login_form {

-  width: 100%;

-  left: 0;

+  position: absolute;

   top: 0;

-}

-

-#login_form form {

-  margin-top: 20px;

-}

-

-#login_form div.message{

-  margin-top 10px;

-}

-

-form input[type="password"] {

+  left: 0;

   width: 100%;

+  text-align: center;

 }

-

-

 /* @end */

 /* @group Form Validation */

@@ -574,6 +464,18 @@ main > section {

     text-align: right;

     padding-right: 5px;

   }

+  

+  #login_form {

+    width: 125%;

+    left: -25%;

+    top: 66px;

+  }

+  #login_form div.message{

+    top: -33px;

+  }

+  #login_form form {

+    margin-top: 100px;

+  }

 }

@@ -682,6 +584,19 @@ a.user-settings:hover {

     border-top: 1px solid #ddd;

   }

+  #login_form {

+    width: 100%;

+    left: 0;

+    top: 0;

+  }

+  #login_form form {

+    margin-top: 20px;

+  }

+  #login_form div.message{

+    margin-top 10px;

+  }

+  form input[type="password"] {

+  }

   main::before {

     display: block;

@@ -1,3 +1,4 @@

+window.URL = window.URL || window.webkitURL;

 var marrowApp = angular.module('marrowApp', ['ngRoute', 'marrowApp.services', 'marrowApp.directives', 'marrowApp.utils',

                                              'marrowApp.directives.boneList', 'marrowApp.directives.userBadge',

                                              'angulartics', 'angulartics.google.analytics', 'angulartics.piwik']);

@@ -11,54 +12,75 @@ marrowApp.config(['$routeProvider',

       when('/', {templateUrl: 'partials/default.html', controller: 'MarrowCtrl'}).

       when('/user/:user', {template: '<div ng-include="templateUrl">Loading...</div>', controller: 'UserCtrl'});

   }

-]);

+])

+.factory('authHttpResponseInterceptor',['$q','$location', '$window',function($q,$location,$window){

+    return {

+        response: function(response){

+            if (response.status === 401) {

+                console.log("Response 401");

+            }

+            return response || $q.when(response);

+        },

+        responseError: function(rejection) {

+            if (rejection.status === 401) {

+                console.log("Response Error 401",rejection);

+                $window.location.href = '/login.html#' + encodeURIComponent($location.path());

+            }

+            return $q.reject(rejection);

+        }

+    };

+}])

+.config(['$httpProvider',function($httpProvider) {

+    //Http Intercpetor to check auth failures for xhr requests

+    $httpProvider.interceptors.push('authHttpResponseInterceptor');

+}]);

 marrowApp.config(['$locationProvider', function($locationProvider) { $locationProvider.html5Mode(true); }]);

-marrowApp.controller('LoginCtrl', function ($scope,$http,$route,$location) {

-  $scope.tab = 'login';

-

-  $scope.message = '';

-

-  var check_login = function () {

-    var injector = angular.injector(['ng']);

-    var $http = injector.get('$http');

-    return $http.get("/api/user/check").success(function(is_loggedon) {

-      if (is_loggedon.result === true) {

-        angular.element(document.body).addClass('is-logged-on');

-      }

-    });

-  };

-

-  check_login().success(

-    function(is_loggedon) {

-      if (is_loggedon.result) { $location.url('/');}

-  });

-

-  $scope.newuser = function () {

-    var username = $scope.username;

-    var password = $scope.password;

-    var postObj = {"username":username, "password": password};

-    $http.post("/api/user/add", postObj)

-    .success(function(added_user) {

-      if (added_user.status === true) {$location.url('/');}

-      else {$scope.message = added_user.message;}

-    });

-  };

-

-  $scope.login = function () {

-    var username = $scope.username;

-    var password = $scope.password;

-

-    $http.post("/api/user/login", {"username":username, "password":password})

-    .success(

-      function (login_succeeded) {

-        var el = angular.element(document.querySelector('#login_form'));

-        if (login_succeeded.status === true) {$location.url('/');}

-        else {$scope.message = login_succeeded.message;}

-    });

-  };

-});

+//marrowApp.controller('LoginCtrl', function ($scope,$http,$route,$location) {

+//  $scope.tab = 'login';

+

+//  $scope.message = '';

+

+//  var check_login = function () {

+//    var injector = angular.injector(['ng']);

+//    var $http = injector.get('$http');

+//    return $http.get("/api/user/check").success(function(is_loggedon) {

+//      if (is_loggedon.result === true) {

+//        angular.element(document.body).addClass('is-logged-on');

+//      }

+//    });

+//  };

+

+//  check_login().success(

+//    function(is_loggedon) {

+//      if (is_loggedon.result) { $location.url('/');}

+//  });

+

+//  $scope.newuser = function () {

+//    var username = $scope.username;

+//    var password = $scope.password;

+//    var postObj = {"username":username, "password": password};

+//    $http.post("/api/user/add", postObj)

+//    .success(function(added_user) {

+//      if (added_user.status === true) {$location.url('/');}

+//      else {$scope.message = added_user.message;}

+//    });

+//  };

+

+//  $scope.login = function () {

+//    var username = $scope.username;

+//    var password = $scope.password;

+

+//    $http.post("/api/user/login", {"username":username, "password":password})

+//    .success(

+//      function (login_succeeded) {

+//        var el = angular.element(document.querySelector('#login_form'));

+//        if (login_succeeded.status === true) {$location.url('/');}

+//        else {$scope.message = login_succeeded.message;}

+//    });

+//  };

+//});

 marrowApp.controller('RootCtrl', function ($scope,$http,$location,$route, SubscribedTo, BoneService, UserService) {

   $scope.url = "";

@@ -1,3 +1,4 @@

+window.URL = window.URL || window.webkitURL;

 var loginModule = angular.module('marrowLogin', ['ngResource','ngRoute','angulartics', 'angulartics.google.analytics']);

 loginModule.controller('LoginCtrl', function ($scope,$http,$route,$window) {