user upgrades

Gemfile

@@ -35,7 +35,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
   gem 'emblem-rails'
 
-  gem 'foundation-rails'
+  gem 'foundation-rails', github: 'bterkuile/foundation-rails'
   #gem 'mustache' #, :require => 'mustache/railtie'
 end
 

Gemfile.lock

@@ -26,6 +26,14 @@ GIT
     devise_simply_stored (0.3.0)
       devise
 
+GIT
+  remote: git://github.com/bterkuile/foundation-rails.git
+  revision: a2e857867e93a3e3bc74b4a61fe72349a86158e9
+  specs:
+    foundation-rails (5.4.3.1)
+      railties (>= 3.1.0)
+      sass (>= 3.2.0)
+
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
   revision: 354fde89a88c1384ccc9d82989e3f05ac6977bd1
@@ -199,9 +207,6 @@ GEM
       websocket-driver (>= 0.3.1)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    foundation-rails (5.4.3.1)
-      railties (>= 3.1.0)
-      sass (>= 3.2.0)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -436,7 +441,7 @@ DEPENDENCIES
   factory_girl_rails
   faye
   font-awesome-rails
-  foundation-rails
+  foundation-rails!
   fuubar
   iso_country_codes
   jquery-rails

app/assets/javascripts/user/app/router.js.coffee

@@ -15,3 +15,4 @@ App.Router.map ->
   @route 'settings'
   @route 'product_orders'
   @route 'error'
+  @route 'scanning'

app/assets/javascripts/user/app/routes/application_route.js.coffee.erb

@@ -101,34 +101,35 @@ App.ApplicationRoute = Ember.Route.extend
 <% if Rails.env.user_app? %>
       ar = @
       scanner = cordova.require("cordova/plugin/BarcodeScanner")
-      scanner.scan (result)->
+      @transitionTo('scanning').then ->
-        if result.cancelled
+        scanner.scan (result)->
-          ar.transitionTo('index')
+          if result.cancelled
-          $log
+            ar.transitionTo('index')
-            action: 'qrscan'
-            result: 'cancel'
-        else
-          table_id_index = result.text.indexOf('s?t=');
-          if table_id_index > -1
-            table_id = result.text.substr(table_id_index + 4);
-            # ar.transitionTo 'table', table_id
-            # ar.actions.selectQr.call(ar, table: {_id: table_id})
-            ar.send('selectQr', _id: table_id)
-          else
-            ar.transitionTo('index').then (route)->
-              route.get('controller.controllers.application').set 'notice',  "we got a barcode: '#{result.text}' but cannot extract a table id"
             $log
               action: 'qrscan'
-              error: 'cannot extract table id'
+              result: 'cancel'
-              info: result.text
+          else
+            table_id_index = result.text.indexOf('s?t=');
+            if table_id_index > -1
+              table_id = result.text.substr(table_id_index + 4);
+              # ar.transitionTo 'table', table_id
+              # ar.actions.selectQr.call(ar, table: {_id: table_id})
+              ar.send('selectQr', _id: table_id)
+            else
+              ar.transitionTo('index').then (route)->
+                route.get('controller.controllers.application').set 'notice',  "we got a barcode: '#{result.text}' but cannot extract a table id"
+              $log
+                action: 'qrscan'
+                error: 'cannot extract table id'
+                info: result.text
 
-      , (error)->
+        , (error)->
-        $log
+          $log
-          action: 'qrscan'
+            action: 'qrscan'
-          error: 'scan failed'
+            error: 'scan failed'
-          info: error
+            info: error
-        ar.transitionTo('index').then (route)->
+          ar.transitionTo('index').then (route)->
-          route.get('controller.controllers.application').set 'notice',  "scanning failed: #{error}"
+            route.get('controller.controllers.application').set 'notice',  "scanning failed: #{error}"
 <% else %>
       @transitionTo 'select_qrcode'
 <% end %>

app/assets/javascripts/user/app/templates/scanning.emblem

@@ -0,0 +1,3 @@
+.page-scanning
+  .scanning-qr-image: span
+  .scanning-laser

app/assets/stylesheets/supplier/foundation1/_foundation_and_overrides.css.sass

@@ -1257,4 +1257,3 @@ $button-edit-color: #ffa
 $button-destroy-color: #faa
 $button-submit-color: $primary-color
 $button-cancel-color: $secondary-color
-

app/assets/stylesheets/user/foundation/application.css.sass

@@ -1,11 +1,11 @@
 @import constants
+@import bourbon
 @import ./qconstants
 @import ./foundation_and_overrides
 @import font-awesome
 @import ./structure
 @import ./components/*
-@import ./qmodal
+@import ./pages/*
 @import ./display_fields
 @import ./qproduct_orders
-@import ./qindex
 @import ./qlists

app/assets/stylesheets/user/foundation/components/_menu_main.css.sass

@@ -20,6 +20,8 @@ header.top-menu
   .top-menu-logo
     @media #{$small-only}
       display: none
+    img
+      margin-top: -6px
   .menu-content
     background-color: white
     background-repeat: repeat-x

app/assets/stylesheets/user/foundation/components/_modal.css.sass

@@ -1,8 +1,10 @@
 .modal
-  margin: 10px auto
+  margin: auto
+  margin-top: 90px
   width: 300px
   background-color: #fff
   padding: 1em
+  z-index: 9085
 
 .overlay
   height: 100%
@@ -11,6 +13,7 @@
   top: 0
   left: 0
   background-color: rgba(0, 0, 0, 0.2)
+  z-index: 9084
 
 .flush--top
   margin-top: 0

app/assets/stylesheets/user/foundation/pages/_scanning.css.sass

@@ -0,0 +1,27 @@
+$scanning-code-width: 200px
+$scanning-code-height: $scanning-code-width/0.785
+.page-scanning
+  width: $scanning-code-width
+  margin-left: auto
+  margin-right: auto
+  position: relative
+  margin-top: 30px
+  .scanning-qr-image
+    position: absolute
+    font-size: $scanning-code-height
+    span
+      @extend .fa
+      @extend .fa-qrcode
+  .scanning-laser
+    position: absolute
+    height: $scanning-code-height
+    border-right: 2px solid #f00
+    +animation(scanning 1s infinite)
+    +animation-direction(alternate)
+    +animation-timing-function(linear)
+
++keyframes(scanning)
+  from
+    left: 0
+  to
+    left: $scanning-code-width