Merge branch 'laura_and_will'

Conflicts: app/models/spree/variant_decorator.rb db/schema.rb spec/models/spree/product_spec.rb spec/models/spree/variant_spec.rb
2026-02-14 23:47:48 +00:00 · 2014-06-13 12:42:14 +10:00
parent f6690cb8dd 415a4eff0a
commit f7c71568df
54 changed files with 440 additions and 232 deletions
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -8,6 +8,7 @@
 #= require angular-sanitize
 #= require angular-resource
 #= require lodash.underscore.js
+#= require angular-scroll.min.js
 #= require angular-google-maps.min.js
 #= require ../shared/mm-foundation-tpls-0.2.0-SNAPSHOT
 #= require ../shared/bindonce.min.js
--- a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
@@ -1,11 +1,13 @@
-Darkswarm.controller "LoginCtrl", ($scope, $http, AuthenticationService, Redirections) ->
+Darkswarm.controller "LoginCtrl", ($scope, $http, AuthenticationService, Redirections, Loading) ->
  $scope.path = "/login"

  $scope.submit = ->
+    Loading.message = "Hold on a moment, we're logging you in"
    $http.post("/user/spree_user/sign_in", {spree_user: $scope.spree_user}).success (data)->
      if Redirections.after_login
        location.href = location.origin + Redirections.after_login
      else
        location.href = location.origin + location.pathname  # Strips out hash fragments
    .error (data) ->
+      Loading.clear()
      $scope.errors = data.message
--- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, Navigation, $location, $anchorScroll, $templateCache, CurrentHub) ->
+Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, Navigation, $location, $templateCache, CurrentHub) ->
  $scope.toggle = ->
    HashNavigation.toggle $scope.hub.hash

@@ -7,6 +7,3 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, Navigation, $locati
  
  $scope.current = ->
    $scope.hub.id is CurrentHub.id
-
-  if $scope.open()
-    $anchorScroll()
--- a/app/assets/javascripts/darkswarm/controllers/hubs_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/hubs_controller.js.coffee
@@ -1,7 +1,7 @@
-Darkswarm.controller "HubsCtrl", ($scope, Hubs, $anchorScroll, $rootScope, HashNavigation) ->
+Darkswarm.controller "HubsCtrl", ($scope, Hubs, $document, $rootScope, HashNavigation) ->
  $scope.Hubs = Hubs
  $scope.hubs = Hubs.hubs

  $rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) ->
    if HashNavigation.active "hubs"
-      $anchorScroll()
+      $document.scrollTo $("#hubs"), 100, 200
--- a/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee
@@ -1,8 +1,3 @@
 Darkswarm.controller "MapCtrl", ($scope, MapConfiguration, OfnMap)->
  $scope.OfnMap = OfnMap
-  $scope.map = 
-    center: 
-      latitude: -37.4713077
-      longitude: 144.7851531
-    zoom: 12
-    styles: MapConfiguration.options
+  $scope.map = MapConfiguration.options
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -7,6 +7,7 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
  'templates',
  'ngSanitize',
  'google-maps',
+  'duScroll',
  'backstretch']).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
  $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
  $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
--- a/app/assets/javascripts/darkswarm/directives/flash.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/flash.js.coffee
@@ -16,7 +16,7 @@ Darkswarm.directive "ofnFlash", (flash, $timeout, RailsFlashLoader)->
    show = (message, type)=>
      if message
        $scope.flashes.push({message: message, type: typePairings[type]})
-        $timeout($scope.delete, 5000)
+        $timeout($scope.delete, 10000)

    $scope.delete = ->
      $scope.flashes.shift()
--- a/app/assets/javascripts/darkswarm/directives/loading.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/loading.js.coffee
@@ -0,0 +1,10 @@
+Darkswarm.directive "loading", (Loading)->
+  scope: {}
+  restrict: 'E'
+  templateUrl: 'loading.html'
+  controller: ($scope)->
+    $scope.Loading = Loading
+    $scope.show = ->
+      $scope.Loading.message?
+
+  link: ($scope, element, attr)->
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -8,10 +8,9 @@ Darkswarm.directive "ofnModal", ($modal)->
  link: (scope, elem, attrs, ctrl, transclude)->
    scope.title = attrs.title
    contents = null
-    # We're using an isolate scope, which is a child of the original scope
-    # We have to compile the transclude against the original scope, not the isolate
-    transclude scope.$parent, (clone)->
-      contents = clone
-
    elem.on "click", =>
+      # We're using an isolate scope, which is a child of the original scope
+      # We have to compile the transclude against the original scope, not the isolate
+      transclude scope.$parent, (clone)->
+        contents = clone
      scope.modalInstance = $modal.open(controller: ctrl, template: contents, scope: scope.$parent)
--- a/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/render_svg.js.coffee
@@ -0,0 +1,10 @@
+Darkswarm.directive "renderSvg", ()->
+  restrict: 'E'
+  priority: 99
+  template: "<svg-wrapper></svg-wrapper>"
+  link: (scope, elem, attr)->
+    if /.svg/.test attr.path # Only do this if we've got an svg
+      $.ajax
+        url: attr.path
+        success: (html)->
+          elem.html($(html).find("svg"))
--- a/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/scroll_after_load.js.coffee
@@ -0,0 +1,10 @@
+Darkswarm.directive 'scrollAfterLoad', ($timeout, $location, $document)->
+  restrict: "A"
+  link: (scope, element, attr) ->
+    if scope.$last is true
+      $(window).load ->
+        $timeout ->
+          elem = $("##{$location.hash()}")
+          if elem.length > 0
+            $document.scrollTo elem , 100, 200, (x)->
+              x * (2 - x)
--- a/app/assets/javascripts/darkswarm/services/loading.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/loading.js.coffee
@@ -0,0 +1,5 @@
+Darkswarm.factory "Loading", ->
+  new class Loading
+    message: null 
+    clear: =>
+      @message = null
--- a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
@@ -1,5 +1,11 @@
 Darkswarm.factory "MapConfiguration", ->
  new class MapConfiguration
-    # From http://snazzymaps.com/style/15/subtle-grayscale
-    options: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]}]
+    options:
+      center: 
+        latitude: -37.4713077
+        longitude: 144.7851531
+      zoom: 12
+      additional_options: {}
+        #mapTypeId: 'satellite' 
+      styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]}]

--- a/app/assets/javascripts/darkswarm/services/order.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Order', ($resource, order, $http, Navigation, storage, CurrentHub, RailsFlashLoader)->
+Darkswarm.factory 'Order', ($resource, order, $http, Navigation, storage, CurrentHub, RailsFlashLoader, Loading)->
  new class Order
    errors: {}
    secrets: {}
@@ -20,9 +20,11 @@ Darkswarm.factory 'Order', ($resource, order, $http, Navigation, storage, Curren
        defaultValue: true

    submit: ->
+      Loading.message = "Submitting your order: please wait"
      $http.put('/checkout', {order: @preprocess()}).success (data, status)=>
        Navigation.go data.path
      .error (response, status)=>
+        Loading.clear()
        @errors = response.errors
        RailsFlashLoader.loadFlash(response.flash)
        
--- a/app/assets/javascripts/templates/loading.html.haml
+++ b/app/assets/javascripts/templates/loading.html.haml
@@ -0,0 +1,8 @@
+#loading{"ng-show" => "show()"}
+  %modal-backdrop
+  #message
+    %ul.loader
+      %li
+      %li
+      %li 
+    %h1 {{ Loading.message }}