mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-04 22:16:08 +00:00
Starting to rework checkout Login links
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
window.MenuCtrl = Darkswarm.controller "MenuCtrl", ($scope, Navigation) ->
|
||||
window.AuthenticationActionsCtrl = Darkswarm.controller "AuthenticationActionsCtrl", ($scope, Navigation) ->
|
||||
|
||||
$scope.toggleLogin = ->
|
||||
Navigation.navigate "/login"
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user