page body fixes

app/assets/javascripts/supplier/app/components/page-body.js.coffee

@@ -1,11 +1,11 @@
 App.PageBodyComponent = Ember.Component.extend
   setTemplate: (->
-    body = @get('templateBody')
+    body = @get('page.body')
     body ||= ""
     try
       template = Ember.HTMLBars.compile(body)
     catch
       template = Ember.HTMLBars.compile(tspan('page.cannot_compile'))
-    @set 'template', Ember.HTMLBars.template(template)
+    @set 'layout', Ember.HTMLBars.template(template)
     @rerender()
-  ).on('init').observes('templateBody')
+  ).on('init').observes('page.body')

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

@@ -14,8 +14,7 @@ App.Router.map ->
     @resource 'list', path: ':list_id'
   @route 'employees'
   @route 'employee', path: '/employees/:employee_id'
-  @resource 'pages', ->
+  @route 'page', path: 'pages/:page_id'
-    @resource 'page', path: ':page_id'
   @route 'orders_display' # chromecast etc
   @route 'menu'
   @route 'settings'

app/assets/javascripts/supplier/app/templates/page.emblem

@@ -1,4 +1,4 @@
 .row: .small-12.columns
   h2.main-section-header=model.title
   /= page-body model.body
-  = page-body templateBody=model.body
+  = page-body page=model

app/serializers/suppliers/page_serializer.rb

@@ -2,5 +2,7 @@ class Suppliers::PageSerializer
   include Qwaiter::SupplierBaseSerializer
   attributes :title, :body, :locale, :position
   attribute(:name) { object.name.to_s.sub /^suppliers-/, '' }
-  attribute(:id) { object.name.to_s.sub /^suppliers-/, '' }
+  def id
+    object.name.to_s.sub /^suppliers-/, ''
+  end
 end

config/deploy.rb

@@ -36,7 +36,7 @@ set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/sys
 
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
-set :default_env, {'DEPLOY' => 'yes', 'RAILS_ENV' => 'production'}
+#set :default_env, {'DEPLOY' => 'yes'}
 
 set :puma_threads,    [4, 16]
 set :puma_workers,    2
@@ -92,10 +92,10 @@ namespace :deploy do
     task :precompile do
       on roles(fetch(:assets_roles)) do
         run_locally do
-          with rails_env: fetch(:rails_env) do
+          with rails_env: fetch(:stage) do
-            execute 'bin/rake assets:precompile'
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile"
-            execute 'bin/rake assets:dedigest'
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest"
-            execute 'bin/rake assets:gzip'
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip"
           end
         end
 

wip.md

@@ -3,11 +3,12 @@ Release
 
 Release todos:
 --------------
-- Make font-awesome icons work
 - Render supplier info pages (page-body)
 - Drag drop on tablet persisting
 - Top menu height for ipad resolution
 - Release android version of MozoUser
+- Home page subscription form
+- Printer paperclip 5 minute setup story
 - Maybe responsive supplier dashboard
 - facebook share picture and js