bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working app now yeah

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-26 18:31:11 +02:00
parent 8604636bc8
commit 3b410bd493
13 changed files with 472 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/images/icons/order-check.png → app/assets/images/supplier/order-check.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

app/assets/images/icons/order-check.svg → app/assets/images/supplier/order-check.svg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

app/assets/images/icons/order-doublecheck.png → app/assets/images/supplier/order-doublecheck.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 499 B

After

Width:  |  Height:  |  Size: 499 B

app/assets/images/user/order-check.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 346 B

app/assets/images/user/order-check.svg
+449
View File
@@ -0,0 +1,449 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="128"
height="128"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="order-check.svg">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient3953">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3955" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3957" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3927">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3929" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3931" />
</linearGradient>
<linearGradient
id="linearGradient3871">
<stop
style="stop-color:#424242;stop-opacity:1;"
offset="0"
id="stop3873" />
<stop
id="stop3879"
offset="0.39583334"
style="stop-color:#767676;stop-opacity:1;" />
<stop
style="stop-color:#d5ffd5;stop-opacity:1"
offset="1"
id="stop3875" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3877"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3895"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.1"
id="feGaussianBlur3897" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3924"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3933"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3947"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3951"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3959"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3973"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.44890625"
id="feGaussianBlur3975" />
</filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3982"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3984"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3986"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3789"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3791"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3793"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3800"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3802"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3804"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3815"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3817"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3819"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3823"
gradientUnits="userSpaceOnUse"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3831"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3833"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3835"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3839"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3857"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3859"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3861"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3872"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3927"
id="linearGradient3874"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="47.125"
y2="79.831711" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3953"
id="linearGradient3876"
gradientUnits="userSpaceOnUse"
x1="47.125"
y1="4.515625"
x2="60.753372"
y2="59.765625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3871"
id="linearGradient3880"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
x1="8"
y1="73.737183"
x2="86.24353"
y2="2.4637082" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.6911765"
inkscape:cx="12.503135"
inkscape:cy="73.526645"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1436"
inkscape:window-height="856"
inkscape:window-x="4"
inkscape:window-y="0"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2994"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-924.36217)">
<g
id="g3883"
transform="translate(-0.85266458,-1.9184948)"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/user/order-check.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473"
style="fill:#000000;fill-opacity:1">
<path
transform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
style="opacity:0.65158373999999997;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
d="m 20,42.362183 10,10 30,-30 10,10 -40,40 -20,-20 z"
id="path3881"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path2996"
d="M 23.490157,949.67748 33.981399,960.16872 65.455125,928.695 75.946367,939.18624 33.981399,981.15121 12.998915,960.16872 z"
style="fill:#000000;fill-opacity:1;stroke:none" />
</g>
<path
sodipodi:type="inkscape:offset"
inkscape:radius="-0.79549515"
inkscape:original="M 60 22.375 L 30.25 52.125 C 31.759428 51.832546 33.268641 51.520491 34.78125 51.25 C 38.131586 50.650878 42.292564 50.001114 45.65625 49.5625 C 48.40866 49.203595 50.940177 48.935357 53.59375 48.78125 L 70 32.375 L 60 22.375 z M 20 42.375 L 10 52.375 L 14.03125 56.40625 C 19.237958 54.881463 24.442107 53.235169 29.78125 52.21875 C 29.80132 52.21495 29.82368 52.22255 29.84375 52.21875 L 20 42.375 z "
style="fill:url(#linearGradient3859);fill-opacity:1;stroke:url(#linearGradient3861);stroke-width:0.26578051;filter:url(#filter3973)"
id="path3949"
d="M 60,23.5 32.65625,50.84375 c 0.663739,-0.129711 1.331286,-0.255418 2,-0.375 3.364578,-0.601669 7.526087,-1.246737 10.90625,-1.6875 2.645343,-0.344944 5.103246,-0.59175 7.65625,-0.75 L 68.875,32.375 60,23.5 z m -40,20 -8.875,8.875 3.15625,3.15625 C 18.877656,54.179274 23.499328,52.749738 28.25,51.75 L 20,43.5 z" />
<use
x="0"
y="0"
xlink:href="#g3883"
id="use3887"
transform="translate(20.677116,67.573668)"
width="128"
height="128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/order-doublecheck.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<use
x="0"
y="0"
xlink:href="#g3883"
id="use3893"
transform="translate(-10.231975,67.573668)"
width="128"
height="128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/order-doublecheck.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

app/assets/images/user/order-doublecheck.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
-2
View File
@@ -43,5 +43,3 @@ App.IndexController = Ember.ObjectController.extend
order.set 'state', 'cancelled'
showList: (id)->
@transitionToRoute 'list', id
showListInfo: (view, link)->
debugger
app/assets/javascripts/user/app/application.js.coffee
+15
View File
@@ -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 "<div>Qs #{param}: #{Qstorage.getItem(param)}</div>"
for param in globalDebugParams
div = footer.append "<div>#{param}: #{eval(param)}</div>"
, 4000
###
app/assets/stylesheets/supplier/foundation1/_qicons.css.sass
+2 -2
View File
@@ -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
app/assets/stylesheets/supplier/foundation1/_qlists.css.sass
+2 -2
View File
@@ -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
app/assets/stylesheets/user/foundation/_qlists.css.sass
+2 -4
View File
@@ -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