pwb 1.2.0 → 1.3.0

data/app/controllers/pwb/api/v1/website_controller.rb

@@ -5,21 +5,21 @@ module Pwb
     # protect_from_forgery with: :null_session
 
     def update
-      @website = Website.unique_instance
-      if @website
-        @website.update(website_params)
+      website = Website.unique_instance
+      if website
+        website.update(website_params)
         # http://patshaughnessy.net/2014/6/16/a-rule-of-thumb-for-strong-parameters
         # adding :social_media to the list permitted by strong params does not work so doing below
         # which is  ugly but works
-        @website.social_media = params[:website][:social_media]
-        @website.style_variables = params[:website][:style_variables]
-        @website.sale_price_options_from = params[:website][:sale_price_options_from]
-        @website.sale_price_options_till = params[:website][:sale_price_options_till]
-        @website.rent_price_options_from = params[:website][:rent_price_options_from]
-        @website.rent_price_options_till = params[:website][:rent_price_options_till]
-        @website.save!
+        website.social_media = params[:website][:social_media]
+        website.style_variables = params[:website][:style_variables]
+        website.sale_price_options_from = params[:website][:sale_price_options_from]
+        website.sale_price_options_till = params[:website][:sale_price_options_till]
+        website.rent_price_options_from = params[:website][:rent_price_options_from]
+        website.rent_price_options_till = params[:website][:rent_price_options_till]
+        website.save!
       end
-      render json: @website
+      render json: website
     end
 
     private

data/app/controllers/pwb/application_controller.rb

@@ -2,16 +2,17 @@ module Pwb
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
-    before_action :footer_content, :current_agency_and_website, :sections,
-    :set_locale, :set_theme_path
+    before_action :footer_content, :current_agency_and_website, :nav_links,
+      :set_locale, :set_theme_path
 
     def set_theme_path
       theme_name = Website.unique_instance.theme_name
+      if params[:theme].present?
+        if %w( berlin default ).include? params[:theme]
+          theme_name = params[:theme]
+        end
+      end
       theme_name = theme_name.present? ? theme_name : "default"
-      # || "default"
-      # if Agency.last && Agency.last.theme_name.present?
-      #   theme_name = Agency.last.theme_name
-      # end
       prepend_view_path "#{Pwb::Engine.root}/app/themes/#{theme_name}/views/"
       # below allows themes installed in Rails app consuming Pwb to work
       prepend_view_path "#{Rails.root}/app/themes/#{theme_name}/views/"
@@ -26,12 +27,13 @@ module Pwb
       # if current_user
       #   locale = current_user.default_client_locale
       # end
-      # byebug
       if params[:locale] && (I18n.locale_available? params[:locale])
         # passed in params override user's default
         locale = params[:locale]
       end
       I18n.locale = locale.to_sym
+
+      # Globalize.fallbacks = {:de => [:en],:es => [:en], :ru => [:en]}
     end
 
     # http://www.rubydoc.info/github/plataformatec/devise/master/ActionDispatch/Routing/Mapper#devise_for-instance_method
@@ -44,7 +46,6 @@ module Pwb
 
     def current_agency_and_website
       @current_agency ||= Agency.unique_instance
-      # (Agency.last || Agency.create)
       @current_website = Website.unique_instance
     end
 
@@ -52,9 +53,19 @@ module Pwb
       @footer_content = Content.find_by_key("footerInfo") || OpenStruct.new
     end
 
-    def sections
-      @sections ||= Section.order("sort_order")
-      @show_admin_link = true
+    def nav_links
+      # @sections ||= Section.order("sort_order")
+      if current_user
+        # where user is signed in, special admin link is shown
+        # so no need to render standard one
+        @show_admin_link = false
+      else
+        @show_admin_link = false
+        top_nav_admin_link = Pwb::Link.find_by_slug("top_nav_admin")
+        if top_nav_admin_link && top_nav_admin_link.visible
+          @show_admin_link = true
+        end
+      end
     end
   end
 end

data/app/controllers/pwb/{sections_controller.rb → contact_us_controller.rb}

@@ -1,55 +1,33 @@
 require_dependency 'pwb/application_controller'
 
 module Pwb
-  class SectionsController < ApplicationController
-    before_action :header_image
-
-    def generic_page
-      page_slug = params[:page_slug]
-      section = Pwb::Section.find_by_link_path page_slug
-      @title_key = section.link_key
-      @page_title = I18n.t(section.link_key)
-      if section && section.contents.first
-        @content = section.contents.first
-      else
-        @content = OpenStruct.new
-      end
-      render "/pwb/sections/static"
-    end
-
-    def about_us
-      @content = Content.find_by_key("aboutUs")
-      @page_title = I18n.t("aboutUs")
-      @page_description = @content.present? ? @content.raw : ""
-      # @page_keywords    = 'Site, Login, Members'
-      # @about_us_image_url = Content.get_photo_url_by_key("aboutUs")
-      # @about_us_image_url = Content.find_by_key("aboutUs").content_photos.first.image_url || "http://moodleboard.com/images/prv/estate/estate-slider-bg-1.jpg"
-      render "/pwb/sections/about_us"
-    end
+  class ContactUsController < ApplicationController
+    before_action :header_image_url
 
-    def privacy_policy
-      @title_key = "privacyPolicy"
-      @page_title = I18n.t("privacyPolicy")
-      @content = Content.find_by_key("privacyPolicy") || OpenStruct.new
-      render "/pwb/sections/static"
-    end
-
-    def legal
-      @title_key = "legalAdvice"
-      @page_title = I18n.t("legalAdvice")
-      @content = Content.find_by_key("legalAdvice") || OpenStruct.new
-      render "/pwb/sections/static"
-    end
 
-    def contact_us
+    def index
       # below was for google map rendering via paloma:
       # js current_agency_primary_address: @current_agency.primary_address
       # js show_contact_map: @current_agency.show_contact_map
       # could explicitly set function for Paloma to use like so:
       # js "Pwb/Sections#contact_us"
       # @enquiry = Message.new
-      @page_title = I18n.t("contactUs")
 
+
+      @content_to_show = []
+      @page = Pwb::Page.find_by_slug "contact-us"
+      @page_title = @current_agency.company_name
+
+      if @page.present?
+        if @page.page_title.present?
+          @page_title = @page.page_title + ' - ' + @current_agency.company_name.to_s                  
+        end
+        @page.ordered_visible_page_contents.each do |page_content|
+          @content_to_show.push page_content.get_html_or_page_part_key
+        end
+      end
+
+      # @page_title = I18n.t("contactUs")
       @map_markers = []
       if @current_agency.show_contact_map
         @map_markers.push(
@@ -124,12 +102,13 @@ module Pwb
       return render "pwb/ajax/contact_us_errors", layout: false
     end
 
-    private
 
-    def header_image
-      # used by berlin theme and meta tags
-      hi_content = Content.where(tag: 'landing-carousel')[0]
-      @header_image = hi_content.present? ? hi_content.default_photo : nil
+    private
+    def header_image_url
+      # lc_content = Content.where(tag: 'landing-carousel')[0]
+      lc_photo = ContentPhoto.find_by_block_key "landing_img"
+      # used by berlin theme
+      @header_image_url = lc_photo.present? ? lc_photo.optimized_image_url : nil
     end
 
   end

data/app/controllers/pwb/css_controller.rb

@@ -1,10 +1,13 @@
 module Pwb
   class CssController < ActionController::Base
     # renders a stylesheet with client configured variables
+    # - spt 2017 - currently only used by devise layout
+    # other layout directly render partial via helper method
     def custom_css
+      @bg_style_vars = []
+      @text_color_style_vars = []
       @current_website = Website.unique_instance
-      theme_name = @current_website.theme_name.present? ? @current_website.theme_name : "default"
-      # @carousel_items = Content.where(tag: "landing-carousel").includes(:content_photos, :translations)
+      theme_name = params[:theme_name] || default
       render "pwb/custom_css/#{theme_name}", formats: :css
     end
   end

data/app/controllers/pwb/pages_controller.rb

@@ -0,0 +1,36 @@
+require_dependency 'pwb/application_controller'
+
+module Pwb
+  class PagesController < ApplicationController
+    before_action :header_image_url
+
+    def show_page
+      default_page_slug = "home"
+      page_slug = params[:page_slug] || default_page_slug
+      @page = Pwb::Page.find_by_slug page_slug
+      if @page.blank?
+        @page = Pwb::Page.find_by_slug default_page_slug
+      end
+      @content_to_show = []
+
+      # @page.ordered_visible_contents.each do |page_content|
+      # above does not get ordered correctly
+      if @page.present?
+        @page.ordered_visible_page_contents.each do |page_content|
+          @content_to_show.push page_content.content.raw
+        end
+      end
+
+      render "/pwb/pages/show"
+    end
+
+    private
+
+    def header_image_url
+      # lc_content = Content.where(tag: 'landing-carousel')[0]
+      lc_photo = ContentPhoto.find_by_block_key "landing_img"
+      # used by berlin theme
+      @header_image_url = lc_photo.present? ? lc_photo.optimized_image_url : nil
+    end
+  end
+end

data/app/controllers/pwb/search_controller.rb

@@ -2,7 +2,7 @@ require_dependency 'pwb/application_controller'
 
 module Pwb
   class SearchController < ApplicationController
-    before_action :header_image
+    before_action :header_image_url
 
     def search_ajax_for_sale
       @operation_type = "for_sale"
@@ -31,7 +31,18 @@ module Pwb
 
     # ordering of results happens client-side with paloma search.js
     def buy
-      @page_title = I18n.t("searchForProperties")
+      @page = Pwb::Page.find_by_slug "buy"
+      @page_title = @current_agency.company_name
+      # @content_to_show = []
+      if @page.present?
+        @page_title = @page.page_title + ' - ' + @current_agency.company_name        
+        # TODO - allow addition of custom content
+        # @page.ordered_visible_page_contents.each do |page_content|
+        #   @content_to_show.push page_content.content.raw
+        # end
+      end
+
+      # @page_title = I18n.t("searchForProperties")
       # in erb template for this action, I have js that will render search_results template
       # for properties - like search_ajax action does
       @operation_type = "for_sale"
@@ -65,7 +76,17 @@ module Pwb
 
     # TODO: - avoid duplication b/n rent and buy
     def rent
-      @page_title = I18n.t("searchForProperties")
+      @page = Pwb::Page.find_by_slug "rent"
+      @page_title = @current_agency.company_name
+      # @content_to_show = []
+      if @page.present?
+        @page_title = @page.page_title + ' - ' + @current_agency.company_name        
+        # TODO - allow addition of custom content
+        # @page.ordered_visible_page_contents.each do |page_content|
+        #   @content_to_show.push page_content.content.raw
+        # end
+      end
+      # @page_title = I18n.t("searchForProperties")
       # in erb template for this action, I have js that will render search_results template
       # for properties - like search_ajax action does
       @operation_type = "for_rent"
@@ -212,16 +233,17 @@ module Pwb
     # end
 
     private
-    # def header_image_url
+    def header_image_url
+      # lc_content = Content.where(tag: 'landing-carousel')[0]
+      lc_photo = ContentPhoto.find_by_block_key "landing_img"
+      # used by berlin theme
+      @header_image_url = lc_photo.present? ? lc_photo.optimized_image_url : nil
+    end
+
+    # def header_image
     #   # used by berlin theme
     #   hi_content = Content.where(tag: 'landing-carousel')[0]
-    #   @header_image_url = hi_content.present? ? hi_content.default_photo_url : ""
+    #   @header_image = hi_content.present? ? hi_content.default_photo : nil
     # end
-
-    def header_image
-      # used by berlin theme
-      hi_content = Content.where(tag: 'landing-carousel')[0]
-      @header_image = hi_content.present? ? hi_content.default_photo : nil
-    end
   end
 end

data/app/controllers/pwb/squares_controller.rb

@@ -0,0 +1,48 @@
+require_dependency "pwb/application_controller"
+
+module Pwb
+  class SquaresController < ActionController::Base
+    layout 'pwb/squares'
+
+    def show_prop
+      fb_instance_id = Rails.application.secrets.fb_instance_id
+      base_uri = "https://#{fb_instance_id}.firebaseio.com/"
+      firebase = Firebase::Client.new(base_uri)
+      @client_key = params["client_id"]
+      @prop_key = params["prop_id"]
+      response = firebase.get("props/" + @client_key + "/" + @prop_key )
+
+      @prop = response.body
+      # byebug
+      # push("todos", { :name => 'Pick the milk', :priority => 1 })
+      # response.success? # => true
+      # response.code # => 200
+      # response.body # => { 'name' => "-INOQPH-aV_psbk3ZXEX" }
+      # response.raw_body # => '{"name":"-INOQPH-aV_psbk3ZXEX"}'
+
+      render 'pwb/squares/show_prop'
+    end
+
+    def show_client
+      fb_instance_id = Rails.application.secrets.fb_instance_id
+      base_uri = "https://#{fb_instance_id}.firebaseio.com/"
+      firebase = Firebase::Client.new(base_uri)
+      @client_key = params["client_id"]
+      response = firebase.get("props/" + @client_key )
+
+      @props_hash = response.body
+      # byebug
+      # push("todos", { :name => 'Pick the milk', :priority => 1 })
+      # response.success? # => true
+      # response.code # => 200
+      # response.body # => { 'name' => "-INOQPH-aV_psbk3ZXEX" }
+      # response.raw_body # => '{"name":"-INOQPH-aV_psbk3ZXEX"}'
+
+      render 'pwb/squares/show_client'
+    end
+
+    private
+
+
+  end
+end

data/app/controllers/pwb/welcome_controller.rb

@@ -2,12 +2,28 @@ require_dependency 'pwb/application_controller'
 
 module Pwb
   class WelcomeController < ApplicationController
+    before_action :header_image_url
+
     def index
-      @carousel_items = Content.where(tag: 'landing-carousel')
-      @carousel_speed = 3000
-      # .includes(:content_photos, :translations)
-      @content_area_cols = Content.where(tag: 'content-area-cols').order('sort_order')
-      # @about_us = Content.find_by_key('aboutUs')
+      @page = Pwb::Page.find_by_slug "home"
+      @page_title = @current_agency.company_name
+      # visible_page_fragment_names = @page.present? ? @page.details["visiblePageParts"] : []
+      @content_to_show = []
+
+      # @page.ordered_visible_contents.each do |page_content|
+      # above does not get ordered correctly
+      if @page.present?
+        if @page.page_title.present?
+          @page_title = @page.page_title + ' - ' + @current_agency.company_name.to_s                  
+        end
+        @page.ordered_visible_page_contents.each do |page_content|
+          @content_to_show.push page_content.content.raw
+        end
+      end
+      # @carousel_items = Content.where(tag: 'landing-carousel')
+      # @carousel_speed = 3000
+      # @content_area_cols = Content.where(tag: 'content-area-cols').order('sort_order')
+
       @properties_for_sale = Prop.for_sale.visible.order('highlighted DESC').limit 9
       @properties_for_rent = Prop.for_rent.visible.order('highlighted DESC').limit 9
 
@@ -15,5 +31,14 @@ module Pwb
 
       render "pwb/welcome/index"
     end
+
+    private
+    def header_image_url
+      # lc_content = Content.where(tag: 'landing-carousel')[0]
+      lc_photo = ContentPhoto.find_by_block_key "landing_img"
+      # used by berlin theme
+      @header_image_url = lc_photo.present? ? lc_photo.optimized_image_url : nil
+    end
+
   end
 end

data/app/helpers/pwb/application_helper.rb

@@ -56,57 +56,58 @@ module Pwb
       end
     end
 
-    def top_nav_link(section_info)
-      unless section_info.show_in_top_nav
-        return
-      end
-      begin
-        if section_info.is_page
-          target_path = self.pwb.send("generic_page_path", section_info[:link_path], {locale: locale})
-        else
-
-          # link_path should be valid - below checks that
-          target_path = self.pwb.send(section_info[:link_path], {locale: locale})
-          # below works in most routes but had to change to above to support devise routes
-          # target_path = send(section_info[:link_path], {locale: locale})
-        end
-      rescue NoMethodError
-        # target_path = '/'
-        # rescue Exception => e
-      end
-      # only show top_nav_link where link_path is valid
-      if target_path
-        style_class = 'selected active' if current_page?( target_path )
-        html = <<-HTML
-        <li class="#{style_class}">
-        #{link_to I18n.t('navbar.'+section_info[:link_key]), target_path}
-        </li>
-        HTML
-
-        html.html_safe
-      end
-    end
+    # below replaced with methods in navigation_helper file (spt 2017)
+    # def top_nav_link(section_info)
+    #   unless section_info.show_in_top_nav
+    #     return
+    #   end
+    #   begin
+    #     if section_info.is_page
+    #       target_path = self.pwb.send("generic_page_path", section_info[:link_path], {locale: locale})
+    #     else
+
+    #       # link_path should be valid - below checks that
+    #       target_path = self.pwb.send(section_info[:link_path], {locale: locale})
+    #       # below works in most routes but had to change to above to support devise routes
+    #       # target_path = send(section_info[:link_path], {locale: locale})
+    #     end
+    #   rescue NoMethodError
+    #     # target_path = '/'
+    #     # rescue Exception => e
+    #   end
+    #   # only show top_nav_link where link_path is valid
+    #   if target_path
+    #     style_class = 'selected active' if current_page?( target_path )
+    #     html = <<-HTML
+    #     <li class="#{style_class}">
+    #     #{link_to I18n.t('navbar.'+section_info[:link_key]), target_path}
+    #     </li>
+    #     HTML
+
+    #     html.html_safe
+    #   end
+    # end
 
-    def footer_link(section_info)
-      unless section_info.show_in_footer
-        return
-      end
-      begin
-        if section_info.is_page
-          target_path = self.pwb.send("generic_page_path", section_info[:link_path], {locale: locale})
-        else
-          target_path = self.pwb.send(section_info[:link_path], {locale: locale})
-        end
-      rescue NoMethodError
-      end
+    # def footer_link(section_info, class_name="")
+    #   unless section_info.show_in_footer
+    #     return
+    #   end
+    #   begin
+    #     if section_info.is_page
+    #       target_path = self.pwb.send("generic_page_path", section_info[:link_path], {locale: locale})
+    #     else
+    #       target_path = self.pwb.send(section_info[:link_path], {locale: locale})
+    #     end
+    #   rescue NoMethodError
+    #   end
 
-      if target_path
-        html = <<-HTML
-        #{ link_to I18n.t('navbar.'+section_info[:link_key]), target_path}.
-        HTML
-        html.html_safe
-      end
-    end
+    #   if target_path
+    #     html = <<-HTML
+    #     #{ link_to I18n.t('navbar.'+section_info[:link_key]), target_path, class: class_name}.
+    #     HTML
+    #     html.html_safe
+    #   end
+    # end
 
     # http://railscasts.com/episodes/75-complex-forms-part-3
     def simple_inmo_input(f, field_key, placeholder_key, input_type, required)