pwb 1.0.0 → 1.1.1

data/app/controllers/pwb/welcome_controller.rb

@@ -11,8 +11,7 @@ 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
 
-      return render "pwb/welcome/index"
-
+      render "pwb/welcome/index"
     end
   end
 end

data/app/helpers/pwb/application_helper.rb

@@ -1,6 +1,43 @@
 module Pwb
   module ApplicationHelper
 
+    def properties_carousel_footer
+      # 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

data/app/helpers/pwb/css_helper.rb

@@ -0,0 +1,9 @@
+module Pwb
+  module CssHelper
+
+    def custom_styles(theme_name)
+      render :partial => "pwb/custom_css/#{theme_name}", :locals => {}, formats: :css
+    end
+
+  end
+end

data/app/models/pwb/cms_page_container.rb

@@ -0,0 +1,9 @@
+module Pwb
+  # https://github.com/zilkey/active_hash
+  class CmsPageContainer < ActiveJSON::Base
+    set_root_path "#{Pwb::Engine.root}/config/cms_page_containers"
+    # set_filename "client_setups"
+    use_multiple_files
+    set_filenames "about-us", "sell", "legal", "about", "landing"
+  end
+end

data/app/models/pwb/content.rb

@@ -6,14 +6,18 @@ module Pwb
     translates :raw, fallbacks_for_empty_translations: true
     globalize_accessors locales: [:en, :ca, :es, :fr, :ar, :de, :ru, :pt]
 
-    def default_photo_url
-      if content_photos.first
-        content_photos.first.image_url
-      else
-        'https://placeholdit.imgix.net/~text?txtsize=38&txt=&w=550&h=300&txttrack=0'
-      end
+    def default_photo
+      content_photos.first
     end
 
+    # def default_photo_url
+    #   if content_photos.first
+    #     content_photos.first.image_url
+    #   else
+    #     'https://placeholdit.imgix.net/~text?txtsize=38&txt=&w=550&h=300&txttrack=0'
+    #   end
+    # end
+
     class << self
       def import(file)
         # byebug

data/app/models/pwb/prop.rb

@@ -116,14 +116,22 @@ module Pwb
       # return merged_extras.sort
     end
 
-    def ordered_photo_url(number)
+    def ordered_photo(number)
       # allows me to pick an individual image according to an order
-      unless prop_photos.length >= number
-        return "https://placeholdit.imgix.net/~text?txtsize=38&txt=&w=550&h=400&txttrack=0"
+      if prop_photos.length >= number
+        prop_photos[number - 1]
       end
-      prop_photos[number - 1].image.url
     end
 
+
+    # def ordered_photo_url(number)
+    #   # allows me to pick an individual image according to an order
+    #   unless prop_photos.length >= number
+    #     return "https://placeholdit.imgix.net/~text?txtsize=38&txt=&w=550&h=400&txttrack=0"
+    #   end
+    #   prop_photos[number - 1].image.url
+    # end
+
     def url_friendly_title
       # used in constructing seo friendly url
       if title && title.length > 2

data/app/models/pwb/section.rb

@@ -9,7 +9,7 @@ module Pwb
     def as_json(options = nil)
       super({only: [
                :link_key, :link_path, :visible, :sort_order, :id,
-               :show_in_top_nav, :show_in_footer, :is_page
+               :show_in_top_nav, :show_in_footer, :is_page, :details
              ],
              methods: [:translation_key, :link_title_es, :page_title_es]
              }.merge(options || {}))

data/app/models/pwb/website.rb

@@ -22,7 +22,10 @@ module Pwb
                "company_display_name", "theme_name",
                "default_area_unit", "default_client_locale",
                "available_currencies", "default_currency",
-               "supported_locales", "social_media"
+               "supported_locales", "social_media",
+               "raw_css", "analytics_id", "analytics_id_type",
+               "sale_price_options_from", "sale_price_options_till",
+               "rent_price_options_from", "rent_price_options_till"
              ],
              methods: ["style_variables"]}.merge(options || {}))
     end
@@ -107,5 +110,15 @@ module Pwb
         # this is same as self[:theme_name] = theme_name_value
       end
     end
+
+    def render_google_analytics
+      return false unless Rails.env == "production"
+      if self.analytics_id.present?
+        return true
+      else
+        return false
+      end
+
+    end
   end
 end

data/app/resources/pwb/api/v1/cms_block_resource.rb

@@ -0,0 +1,11 @@
+module Pwb
+  class Api::V1::CmsBlockResource < JSONAPI::Resource
+    model_name 'Comfy::Cms::Block'
+    # model_hint model: Pwb::Prop, resource: :lite_properties
+
+    attributes :identifier, :content
+
+    # filters :visible
+    # has_many :blocks
+  end
+end

data/app/resources/pwb/api/v1/cms_page_resource.rb

@@ -0,0 +1,27 @@
+module Pwb
+  class Api::V1::CmsPageResource < JSONAPI::Resource
+    model_name 'Comfy::Cms::Page'
+    # model_hint model: Pwb::Prop, resource: :lite_properties
+
+    attributes :label, :slug, :full_path,
+      :blocks, :tags, :categories,
+      :locale, :content_cache, 
+      # below 2 are not used in admin panel
+      # but need to be populated when creating new page
+      :site_id, :layout
+
+    filters :label, :full_path
+    has_many :cms_blocks
+
+    # TODO - add locale col to Cms::Page
+    def locale
+      # return @model.site.locale
+      return @model.slug
+    end
+
+
+    def self.creatable_fields(context)
+      super - [:locale]
+    end
+  end
+end

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

@@ -5,23 +5,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="index, follow">
     <%# display_meta_tags site: @current_website.tenant_display_name %>
-    <link href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" rel="stylesheet">
     <%= stylesheet_link_tag    "pwb/themes/berlin", media: "all" %>
-    <link rel="stylesheet" media="all" href="/custom_css.css" data-turbolinks-track="true" />
-    <%= javascript_include_tag "pwb/themes/berlin" %>
+    <style>
+      <%= custom_styles "berlin" %>
+    </style>
+    <%= javascript_include_tag "pwb/themes/berlin", async: false %>
     <%= csrf_meta_tags %>
-    <!-- Font awesome -->
-    <!-- <link href="css/font-awesome.css" rel="stylesheet"> -->
-    <link href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" rel="stylesheet">
-    <!-- Google Font -->
-    <link href='https://fonts.googleapis.com/css?family=Vollkorn' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
       <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 -->
@@ -48,6 +44,7 @@
       <%= yield %>
     <% end %>
     <%= render :partial => '/pwb/footer', :locals => {}  %>
+    <%= render :partial => '/pwb/analytics', :locals => {}  %>
     <%= insert_paloma_hook %>
     <!-- jQuery library -->
     <!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -->
@@ -64,5 +61,24 @@
     <!-- <script type="text/javascript" src="js/jquery.fancybox.pack.js"></script> -->
     <!-- Custom js -->
     <!-- <script src="js/custom.js"></script> -->
+    <noscript id="deferred-styles">
+      <link href="https://opensource.keycdn.com/fontawesome/4.7.0/font-awesome.min.css" rel="stylesheet">
+      <!-- Google Font -->
+      <link href='https://fonts.googleapis.com/css?family=Vollkorn' rel='stylesheet' type='text/css'>
+      <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    </noscript>
+    <script>
+      var loadDeferredStyles = function() {
+        var addStylesNode = document.getElementById("deferred-styles");
+        var replacement = document.createElement("div");
+        replacement.innerHTML = addStylesNode.textContent;
+        document.body.appendChild(replacement)
+        addStylesNode.parentElement.removeChild(addStylesNode);
+      };
+      var raf = requestAnimationFrame || mozRequestAnimationFrame ||
+          webkitRequestAnimationFrame || msRequestAnimationFrame;
+      if (raf) raf(function() { window.setTimeout(loadDeferredStyles, 0); });
+      else window.addEventListener('load', loadDeferredStyles);
+    </script>
   </body>
 </html>

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

@@ -1,5 +1,5 @@
   <!-- Start Property header  -->
-<section id="aa-property-header" style="background-image: url(<%= @property_details.ordered_photo_url 1 %>);">
+<section id="aa-property-header" style="<%= bg_image((@property_details.ordered_photo 1), height: 800, crop: "scale", quality: "auto") %>">
   <div class="container">
     <div class="row">
       <div class="col-md-12">
@@ -32,7 +32,7 @@
           <div class="aa-properties-details">
             <div class="aa-properties-details-img">
               <% @property_details.prop_photos.each.with_index do |photo, index| %>
-                <img src="<%= photo.image.url %>" alt="img">
+                <%= opt_image_tag(photo, height: 800, crop: "scale", :quality => "auto", class: "", alt: "img") %>
               <% end %>
             </div>
             <div class="aa-properties-info">
@@ -73,8 +73,8 @@
       </div>
     </div>
   </div>
+  <% if @property_details.show_map %>
+    <div id="inmo-map-canvas" class="map-canvas no-margin"></div>
+  <% end %>
 </section>
-<% if @property_details.show_map %>
-  <div id="inmo-map-canvas" class="map-canvas no-margin"></div>
-<% end %>
 <!-- FOOTER -->

data/app/themes/berlin/views/pwb/search/_search_results.html.erb

@@ -37,7 +37,8 @@
         <article class="aa-properties-item property-item">
           <%= link_to property.contextual_show_path(@operation_type), class: 
           "aa-properties-item-img" do %>
-            <%= image_tag("#{property.ordered_photo_url 1}", class: 'img-responsive') %>
+            <%= opt_image_tag((property.ordered_photo 1), quality: "auto",
+            height: 240, crop: "scale", class: "img-responsive") %>
           <% end %>
           <div class="aa-tag for-sale" style="display: none;">
             <%# t 'propertyForSale' %>

data/app/themes/berlin/views/pwb/search/buy.html.erb

@@ -12,7 +12,7 @@
     }
   );
 <% end %>
-<section id="top-container" style="background-image: url(<%= @header_image_url %>);">
+<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
   <div class="container">
     <div class="row">
       <div class="col-md-12">

data/app/themes/berlin/views/pwb/search/rent.html.erb

@@ -12,7 +12,8 @@
     }
   );
 <% end %>
-<section id="top-container" style="background-image: url(<%= @header_image_url %>);">
+<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
+
   <div class="container">
     <div class="row">
       <div class="col-md-12">

data/app/themes/berlin/views/pwb/sections/about_us.html.erb

@@ -1,4 +1,5 @@
-<section id="top-container" style="background-image: url(<%= @header_image_url %>);">
+<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
+
   <div class="container">
     <div class="row">
       <div class="col-md-12">
@@ -30,7 +31,7 @@
         <div class="aa-main-area">
           <div class="row">
             <div class="col-md-6">
-              <img src="<%= @content.default_photo_url%>" alt="" class="img-responsive about-us-img">
+              <%= opt_image_tag(@content.default_photo, :quality => "auto", height: 600, crop: "scale", class: "img-responsive about-us-img") %>
             </div>
             <div class="col-md-6">
               <div class="section-title-wr mt-40">

data/app/themes/berlin/views/pwb/sections/cms.html.erb

@@ -0,0 +1,34 @@
+<% page_title @current_agency.company_name  %>
+<!-- MAIN CONTENT -->
+<div class="pg-opt">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-6">
+        <h2>
+          <%= I18n.t(@title_key) %>
+        </h2>
+      </div>
+      <div class="col-md-6" style="">
+        <ol class="breadcrumb">
+          <li><a href="/">
+              <%= I18n.t("webContentSections.home") %>
+            </a></li>
+          <li class="active">
+            <%= I18n.t(@title_key) %>
+          </li>
+        </ol>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%# render '/pwb/welcome/content_area_cols' %>
+
+
+<% @cms_pages.each do |cms_page| %>
+  <%== cms_page.content_cache %>  
+<% end %>
+
+
+
+<!-- FOOTER -->

data/app/themes/berlin/views/pwb/sections/contact_us.html.erb

@@ -1,4 +1,5 @@
-<section id="top-container" style="background-image: url(<%= @header_image_url %>);">
+<section id="top-container" style="<%= bg_image @header_image, height: 800, crop: "scale", quality: "auto" %>">
+
   <div class="container">
     <div class="row">
       <div class="col-md-12">

data/app/themes/berlin/views/pwb/welcome/_about_us_to_del.html.erb

@@ -0,0 +1,35 @@
+<!-- <section id="aa-about-us">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        <div class="aa-about-us-area">
+          <div class="row">
+            <div class="col-md-5">
+              <div class="aa-about-us-left">
+                <img src="img/about-us.png" alt="image">
+              </div>
+            </div>
+            <div class="col-md-7">
+              <div class="aa-about-us-right">
+                <div class="aa-title">
+                  <h2>About Us</h2>
+                  <span></span>
+                </div>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Repellat ab dignissimos vitae maxime adipisci blanditiis rerum quae quos! Id at rerum maxime modi fugit vero corrupti, ad atque sit laborum ipsum sunt blanditiis suscipit odio, aut nostrum assumenda nobis rem a maiores temporibus non commodi laboriosam, doloremque expedita! Corporis, provident?</p>
+                <ul>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse, blanditiis.</li>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</li>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quia.</li>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse, blanditiis.</li>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</li>
+                  <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quia.</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
+ -->

data/app/themes/berlin/views/pwb/welcome/_landing_carousel.html.erb

@@ -6,7 +6,7 @@
       <% @carousel_items.each.with_index do |carousel_item, index| %>
         <!-- Top slider single slide -->
         <div class="aa-top-slider-single">
-          <img src="<%= carousel_item.default_photo_url %>" alt="img">
+          <%= opt_image_tag((carousel_item.default_photo), :quality => "auto", height: 800, crop: "scale", class: "") %>
           <!-- Top slider content -->
           <% if carousel_item.raw  %>
             <div class="aa-top-slider-content" style="">

data/app/themes/berlin/views/pwb/welcome/_latest_properties.html.erb

@@ -3,7 +3,8 @@
     <article class="aa-properties-item">
       <%= link_to property.contextual_show_path(rent_or_sale), class: 
           "aa-properties-item-img" do %>
-        <%= image_tag("#{property.ordered_photo_url 1}", class: 'img-responsive') %>
+        <%= opt_image_tag((property.ordered_photo 1), quality: "auto",
+        height: 240, crop: "fit", class: "img-responsive") %>
       <% end %>
       <div class="aa-tag for-sale">
         <%= t title_key %>