From cc785c4d73a7b6a1dbaeb359b077836faf19f294 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Sun, 4 Oct 2015 15:00:47 +0200
Subject: [PATCH] page body fixes

---
 .../supplier/app/components/page-body.js.coffee        |  6 +++---
 app/assets/javascripts/supplier/app/router.js.coffee   |  3 +--
 .../javascripts/supplier/app/templates/page.emblem     |  2 +-
 app/serializers/suppliers/page_serializer.rb           |  4 +++-
 config/deploy.rb                                       | 10 +++++-----
 wip.md                                                 |  3 ++-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/supplier/app/components/page-body.js.coffee b/app/assets/javascripts/supplier/app/components/page-body.js.coffee
index c3f0f7b8..b545e743 100644
--- a/app/assets/javascripts/supplier/app/components/page-body.js.coffee
+++ b/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')
diff --git a/app/assets/javascripts/supplier/app/router.js.coffee b/app/assets/javascripts/supplier/app/router.js.coffee
index 9edd09ea..3b97eff8 100644
--- a/app/assets/javascripts/supplier/app/router.js.coffee
+++ b/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', ->
-    @resource 'page', path: ':page_id'
+  @route 'page', path: 'pages/:page_id'
   @route 'orders_display' # chromecast etc
   @route 'menu'
   @route 'settings'
diff --git a/app/assets/javascripts/supplier/app/templates/page.emblem b/app/assets/javascripts/supplier/app/templates/page.emblem
index 32cbf786..c67b656b 100644
--- a/app/assets/javascripts/supplier/app/templates/page.emblem
+++ b/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
diff --git a/app/serializers/suppliers/page_serializer.rb b/app/serializers/suppliers/page_serializer.rb
index 56585d09..b2d03f5e 100644
--- a/app/serializers/suppliers/page_serializer.rb
+++ b/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
diff --git a/config/deploy.rb b/config/deploy.rb
index 772bc978..16837f9f 100644
--- a/config/deploy.rb
+++ b/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
-            execute 'bin/rake assets:precompile'
-            execute 'bin/rake assets:dedigest'
-            execute 'bin/rake assets:gzip'
+          with rails_env: fetch(:stage) do
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:precompile"
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:dedigest"
+            execute "RAILS_ENV=#{fetch(:stage)} DEPLOY=yes bin/rake assets:gzip"
           end
         end
 
diff --git a/wip.md b/wip.md
index 272d6c73..25ef3a5a 100644
--- a/wip.md
+++ b/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