Refactor for mobile deployment

Gemfile

@@ -74,6 +74,9 @@ gem 'iso_country_codes'
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'
 #
+group :user_app do
+  gem 'pry-rails'
+end
 group :development, :test do
   gem 'rspec-rails'
   gem 'pry-rails'

Procfile

@@ -3,4 +3,4 @@ faye:     thin start -R faye/config.ru -p 9296
 #faye:    rackup faye.ru -s thin -E production
 counters: bin/drb_counter.rb run
 database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output
-server: rails s
+#server: rails s

app/assets/images/user/logo.svg

@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100"
+   height="100"
+   viewBox="0 0 99.999995 99.999995"
+   enable-background="new 0 0 8503.94 8503.94"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="logo.svg"><metadata
+   id="metadata47"><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 /></cc:Work></rdf:RDF></metadata><defs
+   id="defs45">
+	<defs
+   id="defs23">
+		<rect
+   height="62.563999"
+   width="46.786999"
+   y="4220.376"
+   x="4233"
+   id="SVGID_1_" />
+	</defs>
+	<clipPath
+   id="SVGID_2_">
+		<use
+   id="use27"
+   overflow="visible"
+   xlink:href="#SVGID_1_"
+   style="overflow:visible"
+   x="0"
+   y="0"
+   width="8503.9404"
+   height="8503.9404" />
+	</clipPath>
+
+
+
+
+
+
+
+
+<clipPath
+   id="SVGID_2_-0"><use
+     id="use27-0"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3815"><use
+     id="use3817"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3819"><use
+     id="use3821"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3823"><use
+     id="use3825"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3827"><use
+     id="use3829"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3831"><use
+     id="use3833"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3835"><use
+     id="use3837"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="SVGID_2_-0-7"><use
+     id="use27-0-9"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3031"><use
+     id="use3033"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3035"><use
+     id="use3037"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3039"><use
+     id="use3041"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3043"><use
+     id="use3045"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3047"><use
+     id="use3049"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3051"><use
+     id="use3053"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1435"
+   inkscape:window-height="856"
+   id="namedview43"
+   showgrid="false"
+   inkscape:zoom="6.34"
+   inkscape:cx="44.999074"
+   inkscape:cy="38.40409"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+
+
+
+
+
+<rect
+   style="fill:#5f3110;fill-opacity:1;stroke:none"
+   id="rect3809"
+   width="97.882759"
+   height="43.533123"
+   x="2.0504732"
+   y="47.003155"
+   ry="0" /><text
+   font-size="9.4245"
+   id="text5"
+   style="font-size:4.56339216px;fill:#634227;font-family:HelveticaRounded-Bold"
+   x="8.5248251"
+   y="30.760637"
+   inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
+   inkscape:export-xdpi="766.79059"
+   inkscape:export-ydpi="766.79059"><tspan
+     style="font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
+     id="tspan3936">Q</tspan></text>
+
+
+
+
+
+
+
+<text
+   id="text7"
+   x="12.23935"
+   y="30.760637"
+   style="font-size:5.810462px"
+   inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
+   inkscape:export-xdpi="766.79059"
+   inkscape:export-ydpi="766.79059"><tspan
+     x="12.23935"
+     y="30.760637"
+     font-size="9.4245"
+     id="tspan9"
+     style="font-size:4.56339216px;fill:#231f20;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">WAITE</tspan></text>
+
+
+
+
+
+
+
+<text
+   font-size="9.4245"
+   id="text19"
+   style="font-size:4.56339216px;fill:#634227;font-family:HelveticaRounded-Bold"
+   x="26.997444"
+   y="30.760637"
+   inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
+   inkscape:export-xdpi="766.79059"
+   inkscape:export-ydpi="766.79059"><tspan
+     style="font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
+     id="tspan3938">R</tspan></text>
+
+
+
+
+
+
+
+<g
+   id="g3012"
+   inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
+   inkscape:export-xdpi="766.79059"
+   inkscape:export-ydpi="766.79059"
+   transform="matrix(0.48420519,0,0,0.48420519,-3.826694,-4.5856657)"><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path29"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path31"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
+     id="path33"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
+     id="path35"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><circle
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     stroke-miterlimit="10"
+     cx="4250.2969"
+     cy="4230.1689"
+     r="5.5359998"
+     id="circle37"
+     sodipodi:cx="4250.2969"
+     sodipodi:cy="4230.1689"
+     sodipodi:rx="5.5359998"
+     sodipodi:ry="5.5359998"
+     style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
+     d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
+     id="path39"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
+     id="path41"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /></g><g
+   transform="matrix(0.28480773,0,0,0.28480773,-1.8388528,48.736267)"
+   inkscape:export-ydpi="413.97891"
+   inkscape:export-xdpi="413.97891"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png"
+   id="g3013"><path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     id="path3015"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><path
+     style="fill:none;stroke:#634227;stroke-width:1.63800001"
+     inkscape:connector-curvature="0"
+     id="path3017"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><path
+     style="fill:#634227"
+     inkscape:connector-curvature="0"
+     id="path3019"
+     d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><path
+     style="fill:#634227"
+     inkscape:connector-curvature="0"
+     id="path3021"
+     d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><circle
+     d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z"
+     style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
+     sodipodi:ry="5.5359998"
+     sodipodi:rx="5.5359998"
+     sodipodi:cy="4230.1689"
+     sodipodi:cx="4250.2969"
+     id="circle3023"
+     r="5.5359998"
+     cy="4230.1689"
+     cx="4250.2969"
+     stroke-miterlimit="10"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><path
+     style="fill:#231f20"
+     inkscape:connector-curvature="0"
+     id="path3025"
+     d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /><path
+     style="fill:#231f20"
+     inkscape:connector-curvature="0"
+     id="path3027"
+     d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
+     clip-path="url(#SVGID_2_-0)"
+     transform="translate(-4208.3103,-4204.1921)"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-ydpi="112.82128" /></g>
+<text
+   inkscape:export-ydpi="413.97891"
+   inkscape:export-xdpi="413.97891"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png"
+   style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1"
+   y="65.718628"
+   x="20.321514"
+   id="text3033"
+   sodipodi:linespacing="140%"><tspan
+     style="font-size:13.33534336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.57643074px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
+     id="tspan3035"
+     font-size="9.4245"
+     y="65.718628"
+     x="20.321514"
+     dx="0 0">Q<tspan
+   style="fill:#ffffff;fill-opacity:1"
+   id="tspan3800">WAITE</tspan>R</tspan></text>
+
+
+
+
+<text
+   xml:space="preserve"
+   style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+   x="35.962147"
+   y="74.290222"
+   id="text3028"
+   sodipodi:linespacing="125%"><tspan
+     sodipodi:role="line"
+     id="tspan3030"
+     x="35.962147"
+     y="74.290222" /></text>
+
+
+<g
+   id="g3013-3"
+   transform="matrix(0.48200257,0,0,0.48200257,26.923785,-2.880595)"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/screwed-qwaiter/app/assets/images/logo-big.png"
+   inkscape:export-xdpi="449.67291"
+   inkscape:export-ydpi="449.67291"><text
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     style="font-size:11.99999905px"
+     y="72.998604"
+     x="25.180241"
+     id="text7-8"><tspan
+       style="font-size:9px;fill:#231f20;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
+       id="tspan9-0"
+       font-size="9.4245"
+       y="72.998604"
+       x="25.180241">MOZO</tspan></text>
+<text
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     y="72.998604"
+     x="52.053089"
+     style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
+     id="text19-2"
+     font-size="9.4245"><tspan
+       id="tspan3938-4"
+       style="font-size:9px;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">.BAR</tspan></text>
+</g><g
+   id="g3012-8"
+   transform="matrix(0.53641805,0,0,0.53641805,25.074809,-5.264638)"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/screwed-qwaiter/app/assets/images/logo-big.png"
+   inkscape:export-xdpi="449.67291"
+   inkscape:export-ydpi="449.67291"><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path29-3"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path31-9"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
+     id="path33-0"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
+     id="path35-5"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><circle
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     stroke-miterlimit="10"
+     cx="4250.2969"
+     cy="4230.1689"
+     r="5.5359998"
+     id="circle37-2"
+     sodipodi:cx="4250.2969"
+     sodipodi:cy="4230.1689"
+     sodipodi:rx="5.5359998"
+     sodipodi:ry="5.5359998"
+     style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
+     d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
+     id="path39-2"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0-7)"
+     d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
+     id="path41-7"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /></g><g
+   id="g3086"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png"
+   inkscape:export-xdpi="413.97891"
+   inkscape:export-ydpi="413.97891"
+   transform="matrix(0.28480773,0,0,0.28480773,-1.7053156,68.232696)"><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path3088"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
+     id="path3090"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
+     id="path3092"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
+     id="path3094"
+     inkscape:connector-curvature="0"
+     style="fill:#634227" /><circle
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     stroke-miterlimit="10"
+     cx="4250.2969"
+     cy="4230.1689"
+     r="5.5359998"
+     id="circle3096"
+     sodipodi:cx="4250.2969"
+     sodipodi:cy="4230.1689"
+     sodipodi:rx="5.5359998"
+     sodipodi:ry="5.5359998"
+     style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
+     d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
+     id="path3098"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /><path
+     inkscape:export-ydpi="112.82128"
+     inkscape:export-xdpi="112.82128"
+     inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png"
+     transform="translate(-4208.3103,-4204.1921)"
+     clip-path="url(#SVGID_2_-0)"
+     d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
+     id="path3100"
+     inkscape:connector-curvature="0"
+     style="fill:#231f20" /></g><text
+   sodipodi:linespacing="140%"
+   id="text3102"
+   x="20.455051"
+   y="85.215057"
+   style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png"
+   inkscape:export-xdpi="413.97891"
+   inkscape:export-ydpi="413.97891"><tspan
+     x="20.455051"
+     y="85.215057"
+     font-size="9.4245"
+     id="tspan3104"
+     style="font-size:13.33534336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.57643074px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
+     dx="0 0 0 0"><tspan
+   id="tspan3106"
+   style="fill:#ffffff;fill-opacity:1">MOZO</tspan>.BAR</tspan></text>
+</svg>

app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee

@@ -1,6 +1,6 @@
 Ember.Handlebars.helper 'image_tag', (path, options={})->
   alt = options.hash.alt || ''
-  image_path = if path.substring(0,4) == 'http' then path else "/assets/#{path}"
+  image_path = if path.substring(0,4) == 'http' then path else "#{$assets_path}#{path}"
   extra_attributes = ''
   extra_attributes += " width=\"#{options.hash.width}\"" if options.hash.width
   extra_attributes += " height=\"#{options.hash.height}\"" if options.hash.height

app/assets/javascripts/supplier/app/application.js.coffee

@@ -5,4 +5,5 @@
 #= require shared-ember-helpers/all
 #= require ./app
 #= require_tree .
+@$assets_path = '/assets/';
 @EmberENV = {FEATURES: {'query-params-new': true}}

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

@@ -4,7 +4,7 @@ header.top-menu
   .menu-content
     section.main-buttons
       link-to 'index'
-        = image_tag 'icons/logo-small.png'
+        = image_tag 'user/logo-small.png'
       if list.id
         App.MenuItemView route="active_list"
         App.MenuItemView route='table' route_param=list.table.id

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

@@ -1,6 +1,6 @@
 .home-panel
-  .home-header= image_tag 'logo.png' width=100 height=115 alt="Logo"
+  .home-header= image_tag 'user/logo.png' width=100 height=115 alt="Logo"
   .home-center
-    a{ action "scanQr" } href="#"= image_tag 'scan-logo.png' width=148 height=177 alt="Scan"
+    a{ action "scanQr" } href="#"= image_tag 'user/scan-logo.png' width=148 height=177 alt="Scan"
   .home-footer
     .home-footer-content

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

@@ -3,6 +3,6 @@ $qbrown: #853d15
 $qbrown-active: lighten($qbrown, 20%)
 $green: #7BB459 //Heineken
 //$wood: image-url('textures/wood001-vertical.jpg')
-$wood: image-url('textures/theme1.jpg')
+$wood: image-url('theme1/wall-bg.jpg')
 $background-brown: #57351f
 $active-link-color: #ff0

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

@@ -1,5 +1,5 @@
 #ember-app-container
-  background-image: image-url('textures/theme1.jpg')
+  background-image: image-url('theme1/wall-bg.jpg')
   background-repeat: repeat
 main.main-section
   +panel($bg:rgba(200,200,200,0.8))

app/controllers/application_controller.rb

@@ -14,6 +14,12 @@ class ApplicationController < ActionController::Base
 
 private
 
+  def allow_all_origins
+    headers['Access-Control-Allow-Origin'] = '*'
+    headers['Access-Control-Request-Method'] = '*'
+    headers['Access-Control-Allow-Headers'] = '*'
+  end
+
   def authorize_cmtool
     redirect_to '/', alert: t('general.unauthorized') unless current_user.present? && current_user.admin?
   end

app/controllers/user_controller.rb

@@ -1,16 +1,10 @@
 class UserController < Users::ApplicationController
-  before_filter :allow_mobile
+  before_action :allow_all_origins
   layout 'user/foundation'
   #layout 'phone'
 
   alias :list :active_list
 
-  def allow_mobile
-    headers['Access-Control-Allow-Origin'] = '*'
-    headers['Access-Control-Request-Method'] = '*'
-    headers['Access-Control-Allow-Headers'] = '*'
-  end
-
   def index
     handle_message_params
   end

app/controllers/users/application_controller.rb

@@ -1,5 +1,6 @@
 module Users
   class ApplicationController < ::ApplicationController
+    before_action :allow_all_origins
     before_action :user_authentication, :unless => ->(c){ %w(obtain_token).include?(c.action_name) || c.request.format.symbol == :html } # , except: [:obtain_token, :index]
 
     private

app/controllers/users/lists_controller.rb

@@ -3,9 +3,9 @@ module Users
 
     def index
       #lists = current_user.lists.include_relation(:supplier, :table)
-      lists = List.for_user(current_user, page: params[:page], per_page: params[:per_page].presence || 25).include_relation(:supplier, :table)
+      lists = List.for_user(current_user, page: params[:page], per_page: params[:per_page].presence || 25)
       #lists.include_relation(:supplier)
-      lists.include_relation(:users, :orders)
+      lists.include_relation(:users, :orders, :supplier, :table)
       render json: lists, each_serializer: UserListSerializer, meta: {total_pages: lists.total_pages, page: lists.current_page} #, root: :lists
     end
 

app/views/layouts/phone.html.slim

@@ -17,14 +17,14 @@ html lang="en"
         var QMobile, Qwaiter, Quser;
         var data_host = 'http://data.mozo.bar';
         var event_host = '#{Qwaiter.event_host}';
-        var $asset_path = '##assets_path##';
+        var $asset_paths = '##assets_path##';
         var Qstorage = localStorage;
     - else
       javascript:
         var QMobile, Qwaiter, Quser;
         var data_host = 'http://data.mozo.bar';
         var event_host = '#{Qwaiter.event_host}';
-        var $asset_path = '/assets/';
+        var $assets_path = '/assets/';
         var Qstorage = localStorage;
         #{user_dynamic_data_host}
         QMobile || (QMobile = {

app/views/layouts/user/foundation.html.slim

@@ -7,14 +7,13 @@ html lang="en"
     title= application_title
     = javascript_include_tag "vendor/modernizr"
     = stylesheet_link_tag "user/foundation/application"
-    / = javascript_include_tag 'http://connect.facebook.net/en_US/all.js'
     = javascript_include_tag "user/flat/application"
     - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
       javascript:
         var QMobile, Qwaiter, Quser;
         var $data_host = 'http://data.mozo.bar';
         var $event_host = '#{Qwaiter.event_host}';
-        var $asset_path = '##assets_path##';
+        var $assets_path = './assets/';
         var Qstorage = window.localStorage;
         Qstorage.setItem('root_url', '##root_url##');
         var $platform = '##platform##';
@@ -24,7 +23,7 @@ html lang="en"
       javascript:
         var QMobile, Qwaiter, Quser;
         var $event_host = '#{Qwaiter.event_host}';
-        var $asset_path = '/assets/';
+        var $assets_path = '/assets/';
         var Qstorage = window.localStorage;
         #{user_dynamic_data_host};
         #{user_dynamic_root_url};

app/views/user/index.html.slim

@@ -1,7 +1,7 @@
 .home-panel
   .home-header = image_tag 'logo.png'
   .home-center
-    a href="#" onClick="QMobile.scanQr()" = image_tag 'scan-logo.png'
+    a href="#" onClick="QMobile.scanQr()" = image_tag 'user/scan-logo.png'
   .home-footer
     .home-footer-content
       = link_to content_tag(:span, 'P'), user_list_products_path, class: ['home-link', 'home-menu-link']

bin/user_asset_corrections

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+require 'active_support/all'
+require 'uglifier'
+
+def replace_files(files, &block)
+  Array.wrap(files).each do |file|
+    file_path = File.join('public/assets', file)
+    contents = File.read(file_path)
+    block.call(contents)
+    File.open(file_path, 'w+'){|f| f.puts contents}
+  end
+end
+
+def gsub_file(file, find, replace)
+  replace_files file do |contents|
+    contents.gsub! find, replace
+  end
+end
+
+def compress_js(*files)
+  replace_files files do |contents|
+    contents.replace Uglifier.compile(contents, screw_ie8: true)
+  end
+end
+
+def gsub_all_scripts(find, replace)
+  extensions = %w[js]
+  Dir.glob(File.join('public/assets/**', "*.{#{extensions.join(',')}}")).each do |asset_path|
+  end
+end
+
+gsub_file 'user/foundation/application.css', /url\(("?)\/assets/, 'url(\1../..'
+gsub_all_scripts 'src="/assets', 'src="./assets'
+
+# compress_js 'user/flat/application.js', 'user/app/application.js'

config/application.rb

@@ -15,8 +15,8 @@ require File.expand_path('./../../lib/couchbase-setting', __FILE__)
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(assets: %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test user_app)))
-  Bundler.require(:assets) if ENV['QWAITER_MOBILE_EXPORT']=='yes' || ENV['DEPLOY']=='yes'
+  Bundler.require(:assets) if ENV['DEPLOY']=='yes'
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end

config/couchbase.yml

@@ -13,3 +13,7 @@ test:
 production:
   <<: *defaults
   bucket: qwaiter
+
+user_app:
+  <<: *defaults
+  bucket: qwaiter_development

config/couchdb.yml

@@ -7,3 +7,6 @@ test:
 production:
   validation_framework: :active_model #optional
   database: qwaiter
+user_app:
+  validation_framework: :active_model #optional
+  database: qwaiter_development

config/environments/production.rb

@@ -20,15 +20,16 @@ Qwaiter::Application.configure do
   config.static_cache_control = 'public, max-age=3600'
 
   # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # config.assets.compress = true #DEPRICATED
+  config.assets.js_compressor = :uglifier
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
 
   config.ember.variant = :production if defined?(Ember::Rails)
 
   # Generate digests for assets URLs
-  config.assets.digest = false
+  config.assets.digest = true
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
 
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH

config/environments/user_app.rb

@@ -0,0 +1,90 @@
+Qwaiter::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  config.action_controller.action_on_unpermitted_parameters = :log
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Compress JavaScripts and CSS
+  # config.assets.js_compressor = :uglifier # compress manual, since the rails 4 asset pipeline is non configurable
+
+  config.ember.variant = :production if defined?(Ember::Rails)
+
+  # Generate digests for assets URLs
+  config.assets.compile = true
+  config.assets.digest = false
+
+  # Defaults to nil and saved in location specified by config.assets.prefix
+  # config.assets.manifest = YOUR_PATH
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
+  # Disable delivery errors, bad email addresses will be ignored
+  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = {
+    host: 'www.mozo.bar'
+  }
+  config.action_mailer.smtp_settings = {
+    address: "smtp.gmail.com",
+    port: 587,
+    domain: "atool.nl",
+    authentication: :plain,
+    user_name: "bterkuile@companytools.nl",
+    password: "BjTKct22",
+    enable_starttls_auto: true
+  }
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #
+  #  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stder
+end

make_mobile

@@ -1,15 +1,33 @@
 #!/usr/bin/env bash
-rm -rf public/assets;
+ANDROID_ROOT="$HOME/Documents/workspace/mozo/www/assets"
-QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production bundle exec rake assets:precompile;
+spring stop
+rm -rf $ANDROID_ROOT
+mkdir $ANDROID_ROOT
+rm -rf public/assets
+QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app bundle exec rake assets:precompile
+find public/assets -name "*.gz" -exec rm -f {} \;
 ./bin/dedigest_assets
-rm -rf public/assets/cmtool;
+
-rm -rf public/assets/jquery-ui;
+# correct stuff
-rm -rf public/assets/admin;
+./bin/user_asset_corrections
-rm -rf public/assets/waiter;
+
-rm -rf public/assets/obtain_token;
+# now move stuff to a cleaned up cordova location
-rm -rf public/assets/qr_sheet;
+cp -r public/assets/user $ANDROID_ROOT/user
-rm -rf public/assets/supplier;
+cp -r public/assets/theme1 $ANDROID_ROOT/theme1
-rm -rf public/assets/site;
+cp -r public/assets/vendor $ANDROID_ROOT/vendor
-rm -rf public/assets/cartoon;
+find $ANDROID_ROOT/theme1 -name "*.css" -exec rm -f {} \;
-rm -rf public/assets/frames;
+find $ANDROID_ROOT/theme1 -name "*.js" -exec rm -f {} \;
-QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb;
+find public/assets -iname "font*" -depth 1 -exec cp {} $ANDROID_ROOT \;
+
+# rm -rf public/assets/cmtool;
+# rm -rf public/assets/jquery-ui;
+# rm -rf public/assets/admin;
+# rm -rf public/assets/waiter;
+# rm -rf public/assets/obtain_token;
+# rm -rf public/assets/qr_sheet;
+# rm -rf public/assets/supplier;
+# rm -rf public/assets/site;
+# rm -rf public/assets/cartoon;
+# rm -rf public/assets/frames;
+# QWAITER_MOBILE_EXPORT=yes RAILS_ENV=user_app TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb;
+rm -rf public/assets