From 3b410bd493fdd2328ae175a968bf5ca7fe57ef30 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 26 Aug 2014 18:31:11 +0200 Subject: [PATCH] Working app now yeah --- .../{icons => supplier}/order-check.png | Bin .../{icons => supplier}/order-check.svg | 0 .../{icons => supplier}/order-doublecheck.png | Bin app/assets/images/user/order-check.png | Bin 0 -> 346 bytes app/assets/images/user/order-check.svg | 449 ++++++++++++++++++ app/assets/images/user/order-doublecheck.png | Bin 0 -> 499 bytes .../controllers/index_controller.js.coffee | 2 - .../user/app/application.js.coffee | 15 + .../supplier/foundation1/_qicons.css.sass | 4 +- .../supplier/foundation1/_qlists.css.sass | 4 +- .../user/foundation/_qlists.css.sass | 6 +- config/deploy.rb | 2 +- .../{qwaiter_settings.rb => mozo_settings.rb} | 2 +- 13 files changed, 472 insertions(+), 12 deletions(-) rename app/assets/images/{icons => supplier}/order-check.png (100%) rename app/assets/images/{icons => supplier}/order-check.svg (100%) rename app/assets/images/{icons => supplier}/order-doublecheck.png (100%) create mode 100644 app/assets/images/user/order-check.png create mode 100644 app/assets/images/user/order-check.svg create mode 100644 app/assets/images/user/order-doublecheck.png rename config/initializers/{qwaiter_settings.rb => mozo_settings.rb} (77%) diff --git a/app/assets/images/icons/order-check.png b/app/assets/images/supplier/order-check.png similarity index 100% rename from app/assets/images/icons/order-check.png rename to app/assets/images/supplier/order-check.png diff --git a/app/assets/images/icons/order-check.svg b/app/assets/images/supplier/order-check.svg similarity index 100% rename from app/assets/images/icons/order-check.svg rename to app/assets/images/supplier/order-check.svg diff --git a/app/assets/images/icons/order-doublecheck.png b/app/assets/images/supplier/order-doublecheck.png similarity index 100% rename from app/assets/images/icons/order-doublecheck.png rename to app/assets/images/supplier/order-doublecheck.png diff --git a/app/assets/images/user/order-check.png b/app/assets/images/user/order-check.png new file mode 100644 index 0000000000000000000000000000000000000000..a4ff69da371064ee813a89534721669b1cf8e3cb GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^!ayv*!3HG19C1kkQY^(zo*^7SP{WbZ0pxQQctjR6 zFfd;NVMbHq6*qx`k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+>BuUH5cx z46*2)d*w9mAp@RwV%a zU0;;6ebK5dkxEJq;i39JH?L3?Vbp%0qm=p4DO9>uGl6$Sr}czYS;l7=pB6GtT6W_?4Wr64m_n6QA_e+@McHsD}8m6QN0$fi& z&tl+rzjT%P?4I)MBa9!4RHiS?OkKQ2X!U`p6IXr3XE07)AXpT$h?mXz-a^v{!V=~` n@2KQwR(5*$uf6Ym;ulk<^!MzIyP~%Py~yC{>gTe~DWM4f + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/app/assets/images/user/order-doublecheck.png b/app/assets/images/user/order-doublecheck.png new file mode 100644 index 0000000000000000000000000000000000000000..63f6f766a0b5e1ad922c07fb085edf21410093a0 GIT binary patch literal 499 zcmV!`w8zSi|#xu`T9H;sLZj21W zcnXh9AJ8PvlRi+ZJxq=QI)~K)Xb02DGl!#s=f%)(hO<~HgzRD_c^+3l3&k_T^>#Zl z(3e8UFI-KYM-|Xwe_nojj`0R#Y3>X@7ee-MEqNZ`Z^84jv+(r5v+Pip6X;VRB=8eg zFk1n=%0X>EPvWrfz-9&1YP$kjYImjsOT>Hlb3%B2olAOM1LbFSzp~P{G4JC00MOe( zpwex8SO6a4R;pjbdI9wABv7%>{NFFXaXYJD#zr6L{V{2sdX3-}QcM>S7A{sDA`pVa0+K+pgH002ovPDHLkV1f@A&F%mI literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee index 787ad5fb..bd238201 100644 --- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee @@ -43,5 +43,3 @@ App.IndexController = Ember.ObjectController.extend order.set 'state', 'cancelled' showList: (id)-> @transitionToRoute 'list', id - showListInfo: (view, link)-> - debugger diff --git a/app/assets/javascripts/user/app/application.js.coffee b/app/assets/javascripts/user/app/application.js.coffee index 60a9ee2b..d3059d46 100644 --- a/app/assets/javascripts/user/app/application.js.coffee +++ b/app/assets/javascripts/user/app/application.js.coffee @@ -8,3 +8,18 @@ #= require_directory ./modules #= require_tree . @EmberENV = {FEATURES: {'query-params-new': true}} + +### Debug in app +storageDebugParams = ['user_id', 'auth_token'] +globalDebugParams = ['$data_host', '$event_host'] +setInterval -> + $('.home-footer').each (iel, footer)-> + $(@).css('font-size', '8px').html('') + + footer = $(footer) + for param in storageDebugParams + div = footer.append "
Qs #{param}: #{Qstorage.getItem(param)}
" + for param in globalDebugParams + div = footer.append "
#{param}: #{eval(param)}
" +, 4000 +### diff --git a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass index 161cb4d5..8ee22e9a 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass @@ -19,9 +19,9 @@ span.icon background-repeat: no-repeat background-position: center center .mark-order-active .button-icon - background-image: image-url('icons/order-check.png') + background-image: image-url('supplier/order-check.png') .mark-order-delivered .button-icon - background-image: image-url('icons/order-doublecheck.png') + background-image: image-url('supplier/order-doublecheck.png') //.fa-shifted-stack @extend .fa-stack diff --git a/app/assets/stylesheets/supplier/foundation1/_qlists.css.sass b/app/assets/stylesheets/supplier/foundation1/_qlists.css.sass index 5f3e98d6..1a1612c4 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qlists.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qlists.css.sass @@ -20,9 +20,9 @@ td.boolean padding: $padding border-bottom: 1px solid #eee &.active - background-image: image-url('icons/order-check.png') + background-image: image-url('supplier/order-check.png') &.delivered - background-image: image-url('icons/order-doublecheck.png') + background-image: image-url('supplier/order-doublecheck.png') .created_at float: right padding-right: 20px diff --git a/app/assets/stylesheets/user/foundation/_qlists.css.sass b/app/assets/stylesheets/user/foundation/_qlists.css.sass index b42adb43..80e43de0 100644 --- a/app/assets/stylesheets/user/foundation/_qlists.css.sass +++ b/app/assets/stylesheets/user/foundation/_qlists.css.sass @@ -24,9 +24,9 @@ padding: $padding border-bottom: 1px solid #eee &.active - background-image: image-url('icons/order-check.png') + background-image: image-url('user/order-check.png') &.delivered - background-image: image-url('icons/order-doublecheck.png') + background-image: image-url('user/order-doublecheck.png') .created_at float: right padding-right: 20px @@ -36,5 +36,3 @@ padding: $padding border-top: 2px solid #444 font-weight: bold - - diff --git a/config/deploy.rb b/config/deploy.rb index 0f730d09..acb6967f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -31,7 +31,7 @@ set :deploy_to, '/var/www/mozo.bar' # set :linked_files, %w{config/database.yml} # Default value for linked_dirs is [] -# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} +set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} # Default value for default_env is {} # set :default_env, { path: "/opt/ruby/bin:$PATH" } diff --git a/config/initializers/qwaiter_settings.rb b/config/initializers/mozo_settings.rb similarity index 77% rename from config/initializers/qwaiter_settings.rb rename to config/initializers/mozo_settings.rb index 787c2faf..246e6b44 100644 --- a/config/initializers/qwaiter_settings.rb +++ b/config/initializers/mozo_settings.rb @@ -1,4 +1,4 @@ -Qwaiter.event_host = "http://#{Rails.env.production? ? 'events.mozo.bar' : 'localhost'}:9296/faye" +Qwaiter.event_host = "http://#{Rails.env.development? ? 'localhost' : 'events.mozo.bar'}:9296/faye" Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new # use the connection from couchbase-structures/documents