pwb 1.1.1 → 1.2.0

data/app/controllers/pwb/search_controller.rb

@@ -12,6 +12,7 @@ module Pwb
       # .order('price_sale_current_cents ASC')
       # @properties = Prop.where(nil) # creates an anonymous scope
       apply_search_filter filtering_params(params)
+      set_map_markers
       render "/pwb/search/search_ajax.js.erb", layout: false
       #  view rendered will use js to inject results...
     end
@@ -23,6 +24,7 @@ module Pwb
       @properties = Prop.visible.for_rent
 
       apply_search_filter filtering_params(params)
+      set_map_markers
       render "/pwb/search/search_ajax.js.erb", layout: false
       #  view rendered will use js to inject results...
     end
@@ -46,8 +48,9 @@ module Pwb
       # ..
 
       set_common_search_inputs
-
+      set_select_picker_texts
       apply_search_filter filtering_params(params)
+      set_map_markers
 
       # below allows setting in form of any input values that might have been passed by param
       @search_defaults = params[:search].present? ? params[:search] : {}
@@ -77,9 +80,9 @@ module Pwb
       #                         150 250 500 1,000 1,500 2,000 2,500 3,000 4,000 5,000 10,000)
 
       set_common_search_inputs
-
+      set_select_picker_texts
       apply_search_filter filtering_params(params)
-
+      set_map_markers
       @search_defaults = params[:search].present? ? params[:search] : {}
 
       js 'Main/Search#sort' # trigger client-side paloma script
@@ -88,6 +91,27 @@ module Pwb
 
     private
 
+    def set_map_markers
+      @map_markers = []
+      @properties.each do |property|
+        if property.show_map
+          @map_markers.push(
+            {
+              id: property.id,
+              title: property.title,
+              show_url: property.contextual_show_path(@operation_type),
+              image_url: property.primary_image_url,
+              display_price: property.contextual_price_with_currency(@operation_type),
+              position: {
+                lat: property.latitude,
+                lng: property.longitude
+              }
+            }
+          )
+        end
+      end
+    end
+
     # A list of the param names that can be used for filtering the Product list
     def filtering_params(params)
       unless params[:search]
@@ -105,6 +129,14 @@ module Pwb
                             :for_rent_price_till, :property_type, :property_state, :count_bathrooms, :count_bedrooms)
     end
 
+    def set_select_picker_texts
+      @select_picker_texts = {
+        noneSelectedText: I18n.t("selectpicker.noneSelectedText"),
+        noneResultsText: I18n.t("selectpicker.noneResultsText"),
+        countSelectedText: I18n.t("selectpicker.countSelectedText")
+      }.to_json
+    end
+
     def set_common_search_inputs
       # for these 2 below, I'm checking in form if count is > 1
       # assumption is that there will be at least one Zone with blank values

data/app/controllers/pwb/sections_controller.rb

@@ -42,14 +42,31 @@ module Pwb
     end
 
     def contact_us
-      # below for google map rendering via paloma:
-      js current_agency_primary_address: @current_agency.primary_address
-      js show_contact_map: @current_agency.show_contact_map
+      # 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")
 
+      @map_markers = []
+      if @current_agency.show_contact_map
+        @map_markers.push(
+          {
+            id: @current_agency.id,
+            title: @current_agency.display_name,
+            show_url: "#",
+            image_url: @current_website.logo_url,
+            # display_price: @current_agency.contextual_price_with_currency(@operation_type),
+            position: {
+              lat: @current_agency.primary_address.latitude,
+              lng: @current_agency.primary_address.longitude
+            }
+          }
+        )
+      end
+
       render "/pwb/sections/contact_us"
     end
 
@@ -75,9 +92,9 @@ module Pwb
           origin_ip: request.ip,
           user_agent: request.user_agent,
           delivery_email: @current_agency.email_for_general_contact_form
-        # origin_email: params[:contact][:email]
-      }
-)
+          # origin_email: params[:contact][:email]
+        }
+      )
       unless @enquiry.save && @client.save
         @error_messages += @client.errors.full_messages
         @error_messages += @enquiry.errors.full_messages
@@ -110,7 +127,7 @@ module Pwb
     private
 
     def header_image
-      # used by berlin theme
+      # 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
     end

data/app/controllers/pwb/welcome_controller.rb

@@ -11,6 +11,8 @@ module Pwb
       @properties_for_sale = Prop.for_sale.visible.order('highlighted DESC').limit 9
       @properties_for_rent = Prop.for_rent.visible.order('highlighted DESC').limit 9
 
+      @search_defaults = params[:search].present? ? params[:search] : {}
+
       render "pwb/welcome/index"
     end
   end

data/app/helpers/pwb/application_helper.rb

@@ -2,46 +2,26 @@ module Pwb
   module ApplicationHelper
 
     def properties_carousel_footer
-      # TODO - diplay array of thumbnails below main 
+      # TODO - diplay array of thumbnails below main
       # properties carousel is images count > ...
       # <a href="#" class="theater" rel="group" hidefocus="true">
       # <%= opt_image_tag((@property_details.ordered_photo 3), :quality => "auto", class: "", alt: "") %>
       # </a>
     end
 
-    def bg_image(photo, options = {})
-      unless photo && photo.image.present?
-        return ""
-      end
-      if Rails.application.config.use_cloudinary
-        image_url = cl_image_path photo.image, options
-      else
-        image_url = image_path photo.image.url
-      end
-      #style="background-image:linear-gradient( rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.1) ),url(<%= carousel_item.default_photo %>);"
-      if options[:gradient]
-        "background-image: linear-gradient(#{options[:gradient]}), url(#{image_url});".html_safe
-      else
-        "background-image: url(#{image_url});".html_safe
-      end
-    end
-
-    def opt_image_tag(photo, options = {})
-      unless photo && photo.image.present?
-        return nil
-      end
-      if Rails.application.config.use_cloudinary
-        cl_image_tag photo.image, options
-      else
-        image_tag photo.image.url, options
-      end
-    end
-
-
     def page_title(title_val)
       content_for :page_title, title_val.to_s
     end
 
+    # def meta_tags(tags_array = [])
+    #   tags_string = ""
+    #   tags_array.each do |tag|
+    #     tags_string += "<meta property='#{tag[:property]}' content='#{tag[:content]}' />"
+    #   end
+    #   content_for :page_head, tags_string
+    #   # <meta property="og:image" content="http://examples.opengraphprotocol.us/media/images/75.png">
+    # end
+
     def area_unit(property)
       area_unit = "m<sup>2</sup>"
       if property.area_unit && (property.area_unit == "sqft")
@@ -52,7 +32,12 @@ module Pwb
 
     def localized_link_to(locale_with_var = nil, options = nil, html_options = nil)
       link_class =  locale_with_var["variant"]
-      link = "<a class='#{link_class}' href='/#{options["locale"]}'></a>"
+      href = "/#{options["locale"]}"
+      begin
+        href = url_for(options)
+      rescue ActionController::UrlGenerationError
+      end
+      link = "<a class='#{link_class}' href='#{href}'></a>"
       return link.html_safe
 
       # if params["controller"] && params["controller"].include?("devise/")

data/app/helpers/pwb/images_helper.rb

@@ -0,0 +1,43 @@
+module Pwb
+  module ImagesHelper
+
+    def bg_image(photo, options = {})
+      image_url = get_opt_image_url photo, options
+      #style="background-image:linear-gradient( rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.1) ),url(<%= carousel_item.default_photo %>);"
+      if options[:gradient]
+        "background-image: linear-gradient(#{options[:gradient]}), url(#{image_url});".html_safe
+      else
+        "background-image: url(#{image_url});".html_safe
+      end
+    end
+
+    def opt_image_tag(photo, options = {})
+      unless photo && photo.image.present?
+        return nil
+      end
+      if Rails.application.config.use_cloudinary
+        cl_image_tag photo.image, options
+      else
+        image_tag photo.image.url, options
+      end
+    end
+
+    def opt_image_url(photo, options = {})
+      get_opt_image_url photo, options
+    end
+
+    private
+
+    def get_opt_image_url(photo, options)
+      unless photo && photo.image.present?
+        return ""
+      end
+      if Rails.application.config.use_cloudinary
+        image_url = cl_image_path photo.image, options
+      else
+        image_url = image_url photo.image.url
+      end
+    end
+
+  end
+end

data/app/models/pwb/agency.rb

@@ -6,8 +6,8 @@ module Pwb
 
     # belongs_to_active_hash :theme, foreign_key: "theme_name", class_name: "Pwb::Theme", shortcuts: [:friendly_name], primary_key: "name"
 
-    belongs_to :primary_address, class_name: "Address", foreign_key: 'primary_address_id'
-    belongs_to :secondary_address, class_name: "Address", foreign_key: 'secondary_address_id'
+    belongs_to :primary_address, optional: true, class_name: "Address", foreign_key: 'primary_address_id'
+    belongs_to :secondary_address, optional: true, class_name: "Address", foreign_key: 'secondary_address_id'
 
     def self.unique_instance
       # there will be only one row, and its ID must be '1'

data/app/models/pwb/content.rb

@@ -1,10 +1,11 @@
 module Pwb
   class Content < ApplicationRecord
     has_many :content_photos, dependent: :destroy
-    belongs_to :section, foreign_key: "section_key", primary_key: "link_path"
+    belongs_to :section, optional: true, foreign_key: "section_key", primary_key: "link_path"
 
     translates :raw, fallbacks_for_empty_translations: true
-    globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
+    globalize_accessors locales: I18n.available_locales
+    # globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
 
     def default_photo
       content_photos.first

data/app/models/pwb/content_photo.rb

@@ -1,7 +1,7 @@
 module Pwb
   class ContentPhoto < ApplicationRecord
     mount_uploader :image, ContentPhotoUploader
-    belongs_to :content
+    belongs_to :content, optional: true
 
     # validates_processing_of :image
     # validate :image_size_validation

data/app/models/pwb/feature.rb

@@ -1,8 +1,8 @@
 module Pwb
   class Feature < ApplicationRecord
-    belongs_to :property
+    belongs_to :property, optional: true
 
-    belongs_to :feature_field_key, class_name: :FieldKey, foreign_key: :feature_key, inverse_of: :features
+    belongs_to :feature_field_key, optional: true, class_name: :FieldKey, foreign_key: :feature_key, inverse_of: :features
     # above allows:
     # Property.first.features.count and
     # FieldKey.last.properties_count but most importantly

data/app/models/pwb/message.rb

@@ -1,5 +1,5 @@
 module Pwb
   class Message < ApplicationRecord
-    belongs_to :client
+    belongs_to :client, optional: true
   end
 end

data/app/models/pwb/prop.rb

@@ -1,7 +1,8 @@
 module Pwb
   class Prop < ApplicationRecord
     translates :title, :description
-    globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
+    globalize_accessors locales: I18n.available_locales
+    # globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
 
     # Use EUR as model level currency
     # register_currency :eur
@@ -124,6 +125,14 @@ module Pwb
     end
 
 
+    def primary_image_url
+      if prop_photos.length > 0
+        ordered_photo(1).image.url
+      else
+        ""
+      end
+    end
+
     # def ordered_photo_url(number)
     #   # allows me to pick an individual image according to an order
     #   unless prop_photos.length >= number

data/app/models/pwb/prop_photo.rb

@@ -1,6 +1,6 @@
 module Pwb
   class PropPhoto < ApplicationRecord
     mount_uploader :image, PropPhotoUploader
-    belongs_to :prop
+    belongs_to :prop, optional: true
   end
 end

data/app/models/pwb/section.rb

@@ -2,7 +2,8 @@ module Pwb
   class Section < ApplicationRecord
     translates :page_title, fallbacks_for_empty_translations: true
     translates :link_title, fallbacks_for_empty_translations: true
-    globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
+    globalize_accessors locales: I18n.available_locales
+    # [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
 
     has_many :contents, foreign_key: "section_key", primary_key: "link_path"
 

data/app/models/pwb/website.rb

@@ -1,7 +1,7 @@
 module Pwb
   class Website < ApplicationRecord
     extend ActiveHash::Associations::ActiveRecordExtensions
-    belongs_to_active_hash :theme, foreign_key: "theme_name", class_name: "Pwb::Theme", shortcuts: [:friendly_name], primary_key: "name"
+    belongs_to_active_hash :theme, optional: true, foreign_key: "theme_name", class_name: "Pwb::Theme", shortcuts: [:friendly_name], primary_key: "name"
 
     def self.unique_instance
       # there will be only one row, and its ID must be '1'

data/app/themes/berlin/views/layouts/pwb/application.html.erb

@@ -4,6 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="index, follow">
+    <title><%= yield(:page_title) %></title>
+    <%= yield(:page_head) %>
+
     <%# display_meta_tags site: @current_website.tenant_display_name %>
     <%= stylesheet_link_tag    "pwb/themes/berlin", media: "all" %>
     <style>
@@ -17,13 +20,12 @@
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <title><%= yield(:page_title) %></title>
   </head>
   <body class="tnt-body <%= @current_website.body_style %>">
     <!-- Pre Loader -->
-    <div id="aa-preloader-area">
+<!--     <div id="aa-preloader-area">
       <div class="pulse"></div>
-    </div>
+    </div> -->
     <!-- SCROLL TOP BUTTON -->
     <a class="scrollToTop" href="#"><i class="fa fa-angle-double-up"></i></a>
     <!-- END SCROLL TOP BUTTON -->
@@ -41,7 +43,9 @@
         </div>
       </section>
     <% else %>
-      <%= yield %>
+      <div id="main-vue">
+        <%= yield %>        
+      </div>
     <% end %>
     <%= render :partial => '/pwb/footer', :locals => {}  %>
     <%= render :partial => '/pwb/analytics', :locals => {}  %>
@@ -80,5 +84,6 @@
       if (raf) raf(function() { window.setTimeout(loadDeferredStyles, 0); });
       else window.addEventListener('load', loadDeferredStyles);
     </script>
+    <%= yield(:page_script) %>
   </body>
 </html>

data/app/themes/berlin/views/pwb/props/not_found.html.erb

@@ -0,0 +1,37 @@
+<% page_title @page_title  %>
+<!-- Start Property header  -->
+<section id="aa-property-header" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        <div class="aa-property-header-inner">
+          <h2>
+            <%= I18n.t("property.details") %>
+          </h2>
+          <ol class="breadcrumb">
+            <li>
+              <%= link_to pwb.root_path(locale: locale), class: "" do %>
+                <%= I18n.t("webContentSections.home") %>
+              <% end %>
+            </li>
+            <li class="active"><%= t "propertyNotFound" %>
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
+<!-- End Property header  -->
+<!-- Start Properties  -->
+<section id="aa-properties">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-9" style="min-height:300px;">
+        <h2>
+          <%= t "propertyNotFound" %>
+        </h2>
+      </div>
+    </div>
+  </div>
+</section>