closes #1 - implemented signout post form, closes #2 - form errors no…

…w display above submit button, closes #3 - csrf token is now handled on init and after login

src/Cofoundry.Samples.SPASite/Content/js/core/init.js

@@ -9,12 +9,15 @@
         app.siteView = new app.SiteView();
 
         // Checks if user is logged in and if true sets the user data
+        helper.prefilter(SPACatsState.csrfToken);
+
         if (SPACatsState.isLoggedIn === true) {
-            helper.prefilter(SPACatsState.csrfToken);
             app.User.set({authenticated: true, token: SPACatsState.csrfToken});
             app.User.getFavourites();
         }
 
+        console.log(app.User.get('token'));
+
         $(window).load(function (e) {
             app.Events.trigger('app loaded', e);
         });

src/Cofoundry.Samples.SPASite/Content/js/core/views/components/Menu.view.js

@@ -3,8 +3,7 @@
         el : '.navbar',
         events : {
             'click .logo': 'goHome',
-            'click .navbar__link': 'linkNavigate',
-            'click .logout': 'handleLogout'
+            'click .navbar__link': 'linkNavigate'
         },
         initialize: function() {
             this.$unAuthLinks = this.$el.find('.unauth');
@@ -15,7 +14,7 @@
             app.router.navigate('', {trigger: true});
         },
         linkNavigate: function(e) {
-            if (e.target.pathname === '/signout') return;
+            if (e.target.tagName === 'BUTTON') return;
 
             e.preventDefault();
 

src/Cofoundry.Samples.SPASite/Content/js/core/views/pages/Login.view.js

@@ -1,4 +1,4 @@
-(function (pages, itemViews, models, app, $, _, Backbone) {
+(function (pages, itemViews, models, app, $, _, Backbone, helper) {
     pages.Login = Backbone.View.extend({
         el : 'main',
         template: _.template($('#login').html()),
@@ -42,11 +42,18 @@
             console.log(errors);
 
             _.each(errors, function(error) {
-                var name = error.properties[0].toLowerCase(),
+                if (error.properties.length > 0) {
+                    var name = error.properties[0].toLowerCase(),
                     message = error.message,
                     $input = this.$el.find('input[name="' + name + '"] + .error');
 
-                $input.text(message).removeClass('hidden');
+                    $input.text(message).removeClass('hidden');
+                } else {
+                    var message = error.message,
+                        $formError = this.$el.find('.form-error');
+
+                    $formError.text(message).removeClass('hidden');
+                }
             }, this);
         },
         clearErrors: function() {
@@ -60,7 +67,10 @@
         handleLogin: function(token) {
             this.showLoginMessage();
 
+            helper.prefilter(token);
             app.User.set({authenticated: true, token: token});
+
+            console.log(app.User.get('token'));
         },
         showLoginMessage: function() {
             this.$el.find('.login-form').addClass('hidden');
@@ -74,5 +84,6 @@
     CofoundrySPA.App,
     jQuery,
     _, 
-    Backbone
+    Backbone,
+    Helper
 );

src/Cofoundry.Samples.SPASite/Content/js/core/views/pages/Register.view.js

@@ -1,4 +1,4 @@
-(function (pages, itemViews, models, app, $, _, Backbone) {
+(function (pages, itemViews, models, app, $, _, Backbone, helper) {
     pages.Register = Backbone.View.extend({
         el : 'main',
         template: _.template($('#register').html()),
@@ -60,7 +60,10 @@
         handleRegister: function(token) {
             this.showRegisteredMessage();
 
+            helper.prefilter(token);
             app.User.set({authenticated: true, token: token});
+
+            console.log(app.User.get('token'));
         },
         showRegisteredMessage: function() {
             this.$el.find('.register-form').addClass('hidden');
@@ -74,5 +77,6 @@
     CofoundrySPA.App,
     jQuery,
     _, 
-    Backbone
+    Backbone,
+    Helper
 );

src/Cofoundry.Samples.SPASite/Views/Home/Index.cshtml

@@ -30,7 +30,7 @@
                     <li><a href="/" class="navbar__link">Cats</a></li>
                     <li><a href="/login" class="navbar__link unauth">Login</a></li>
                     <li><a href="/register" class="navbar__link unauth">Register</a></li>
-                    <li><a href="/signout" class="navbar__link logout auth hidden">Logout</a></li>
+                    <li><form action="/sign-out" method="POST"><button class="navbar__link logout auth hidden" type="submit">Logout</button></form></li>
                 </ul>
             </div>
         </div>
@@ -111,6 +111,7 @@
                             <input type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
                             <span class="error hidden"></span>
                         </div>
+                        <span class="error form-error hidden"></span>
                         <button type="submit" class="btn btn-default">Submit</button>
                     </form>
                     <div class="message hidden">
@@ -147,6 +148,7 @@
                             <input type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
                             <span class="error hidden"></span>
                         </div>
+                        <span class="error form-error hidden"></span>
                         <button type="submit" class="btn btn-default">Submit</button>
                     </form>
                     <div class="message hidden">

src/Cofoundry.Samples.SPASite/sass/core/blocks/_navbar.scss

@@ -29,7 +29,9 @@
         padding: 10px 0;
     }   
 
-    a {
+    .navbar__link {
+        background-color: transparent;
+        border: 0;
         color: white;
         display: block;
     }
@@ -47,7 +49,7 @@
             }
         }
 
-        a {
+        .navbar__link {
             padding: 0 15px;
         }
     }