From a4cba99de6b931f4ade25d1d4d8bfc7bfa7ac23e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 8 Apr 2014 14:34:50 +1000
Subject: [PATCH] Starting to rework checkout Login links

---
 ...thentication_actions_controller.js.coffee} |  2 +-
 .../controllers/checkout_controller.js.coffee |  2 +-
 app/views/shared/_menu.html.haml              |  2 +-
 .../shop/checkout/_authentication.html.haml   | 19 +++++++++++--------
 .../checkout_controller_spec.js.coffee        |  7 +++++--
 5 files changed, 19 insertions(+), 13 deletions(-)
 rename app/assets/javascripts/darkswarm/controllers/{menu_controller.js.coffee => authentication_actions_controller.js.coffee} (69%)

diff --git a/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication_actions_controller.js.coffee
similarity index 69%
rename from app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee
rename to app/assets/javascripts/darkswarm/controllers/authentication_actions_controller.js.coffee
index 889c8fa8f4..77fd2c2464 100644
--- a/app/assets/javascripts/darkswarm/controllers/menu_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication_actions_controller.js.coffee
@@ -1,4 +1,4 @@
-window.MenuCtrl = Darkswarm.controller "MenuCtrl", ($scope, Navigation) ->
+window.AuthenticationActionsCtrl = Darkswarm.controller "AuthenticationActionsCtrl", ($scope, Navigation) ->
 
   $scope.toggleLogin = ->
     Navigation.navigate "/login"
diff --git a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
index 538255f74c..cd95a7faa3 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
@@ -2,7 +2,7 @@ Darkswarm.controller "CheckoutCtrl", ($scope, $rootScope, Order, storage) ->
   $scope.order = $scope.Order = Order
 
   # Binding accordion panel states to local storage
-  storage.bind $scope, "user"
+  storage.bind $scope, "user", { defaultValue: true }
   storage.bind $scope, "details"
   storage.bind $scope, "billing"
   storage.bind $scope, "shipping"
diff --git a/app/views/shared/_menu.html.haml b/app/views/shared/_menu.html.haml
index 3ece58cf4d..f5aee8cc17 100644
--- a/app/views/shared/_menu.html.haml
+++ b/app/views/shared/_menu.html.haml
@@ -1,6 +1,6 @@
 %nav.top-bar
   %section.top-bar-section
-    %ul.left{"ng-controller" => "MenuCtrl"}
+    %ul.left{"ng-controller" => "AuthenticationActionsCtrl"}
       %li
         %a.icon{"ng-click" => "toggle()"}
           %i.fi-list
diff --git a/app/views/shop/checkout/_authentication.html.haml b/app/views/shop/checkout/_authentication.html.haml
index 20a160aaed..282a713015 100644
--- a/app/views/shop/checkout/_authentication.html.haml
+++ b/app/views/shop/checkout/_authentication.html.haml
@@ -1,9 +1,12 @@
 %fieldset
-  %accordion-group{heading: "User"}
-    .row
-      %section#checkout_login
-        .large-6.columns
-          = render partial: "shop/checkout/login"
-      %section#checkout_signup
-        .large-6.columns
-          = render partial: "shop/checkout/signup"
+  %accordion-group{heading: "User", "is-open" => "user"}
+    .row{"ng-controller" => "AuthenticationActionsCtrl"}
+      .large-12.columns
+        %button{"ng-click" => "toggle('/login')"} Login
+        %button{"ng-click" => "toggle('/signup')"} Signup
+      -#%section#checkout_login
+        -#.large-6.columns
+          -#= render partial: "shop/checkout/login"
+      -#%section#checkout_signup
+        -#.large-6.columns
+          -#= render partial: "shop/checkout/signup"
diff --git a/spec/javascripts/unit/darkswarm/controllers/checkout_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/checkout_controller_spec.js.coffee
index 08358a4368..9730989427 100644
--- a/spec/javascripts/unit/darkswarm/controllers/checkout_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/checkout_controller_spec.js.coffee
@@ -6,6 +6,9 @@ describe "CheckoutCtrl", ->
   beforeEach ->
     module("Darkswarm")
     order = {} 
-    inject ($controller) ->
-      scope = {}
+    inject ($controller, $rootScope) ->
+      scope = $rootScope.$new() 
       ctrl = $controller 'CheckoutCtrl', {$scope: scope, Order: order}
+
+  it "defaults the user accordion to visible", ->
+    expect(scope.user).toEqual true