pwb 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e4fcfcc8012c05c80fa81d9f68d2bef3b3fa50
-  data.tar.gz: 253df4b1c3e09128c83fc0e8ef72e3afb3560d83
+  metadata.gz: d2344b18a108db8c20c5f6b1760e737006abacc2
+  data.tar.gz: 89708feddefa2c2fd85e8de643887c097a3bd1d7
 SHA512:
-  metadata.gz: 2606164db8b4b4e942f8bfd700123386d4d2d1fdb8607abe431837b9f470d3091b668d34f4e7cf4cc4c63b051a5f008983679b1c68054fcc67342e963f80a5c1
-  data.tar.gz: 1f522383910875f8ef545558c4bc11d7182e9874aabdc3a7e5c4f16f8cfde2af30850b6a19910d71f94bffa2f21d792fe004ca50925942aeefbc156015a7f589
+  metadata.gz: c3839ba5b0c53acba955504b44d4139ad5ef418310ed8bab0f1daf8e335b206d6fa75863df54754c416143a6b9628daef20ca689538a49d392e6b400b183fcb8
+  data.tar.gz: 58590fd4afc2f37f285fa4714d69c82ffbc8ba2e80a818c20e4a46cc4a405c2c728b70c0153c803afb137281e53b748eb3c3e397f8d0aa2f84d7401872b29cdc

data/README.md

@@ -32,7 +32,7 @@ Install into an existing Rails project by adding these lines in your application
 ```ruby
 gem 'pwb', git: 'https://github.com/etewiah/property_web_builder', branch: 'master'
 gem 'globalize', git: 'https://github.com/globalize/globalize'
-
+gem 'paloma', github: 'fredngo/paloma'
 ```
 
 Also, be sure to use Postgres as your database (by having the "pg" gem and Postgres installed locally 

data/app/assets/javascripts/comfy/admin/cms/custom.js.coffee

@@ -0,0 +1 @@
+# Custom JS for the admin area

data/app/assets/stylesheets/comfy/admin/cms/custom.sass

@@ -0,0 +1 @@
+// custom CSS for admin area

data/app/assets/stylesheets/pwb/themes/berlin/inmo.scss

@@ -1,5 +1,10 @@
-/*main content section*/
+.map-canvas {
+  /*when map is displayed, we don't want 
+  padding between it and footer*/
+  margin-bottom: -100px;
+}
 
+/*main content section*/
 #aa-main .aa-main-area {
   display: inline;
   float: left;

data/app/assets/stylesheets/pwb/themes/berlin/main.scss

@@ -234,7 +234,8 @@ img {
 
 #aa-menu-area {
   left: 0;
-  padding-top: 20px;
+  /*Ed - reduced below from 20px*/
+  padding-top: 2px;
   position: absolute;
   right: 0;
   top: 35px;
@@ -268,8 +269,9 @@ img {
 }
 
 #aa-menu-area .main-navbar .navbar-header .aa-logo-img img {
-  width: 100%;
+  /*width: 100%;*/
   height: 100%;
+  object-fit: cover;
 }
 
 #aa-menu-area .main-navbar .navbar-nav li a {
@@ -306,7 +308,7 @@ img {
 
 #aa-menu-area .navbar-fixed-top {
   background-color: #FFF;
-  padding: 15px 0;
+  /*padding: 15px 0;*/
   -webkit-transition: all 0.5s;
   -moz-transition: all 0.5s;
   -ms-transition: all 0.5s;
@@ -546,6 +548,7 @@ img {
 #aa-slider .aa-slider-area .aa-top-slider .aa-top-slider-single img {
   width: 100%;
   height: 700px;
+  object-fit: cover;
 }
 
 #aa-slider .aa-slider-area .aa-top-slider .aa-top-slider-single .aa-top-slider-content {
@@ -832,7 +835,7 @@ img {
 .aa-properties-item {
   display: inline;
   float: left;
-/*  margin-top: 30px;
+  /*  margin-top: 30px;
 */
   margin-bottom: 30px;
   width: 100%;
@@ -855,6 +858,7 @@ img {
 .aa-properties-item .aa-properties-item-img img {
   width: 100%;
   height: 239px;
+  object-fit: cover;
 }
 
 .aa-properties-item .aa-tag {
@@ -1384,6 +1388,7 @@ img {
 .aa-properties-details .aa-properties-details-img img {
   height: 500px;
   width: 100%;
+  object-fit: cover;
 }
 
 .aa-properties-details .aa-properties-details-img .slick-prev,
@@ -1426,6 +1431,7 @@ img {
   margin-bottom: 10px;
 }
 
+
 /*
 -tick before each extra
 .aa-properties-details .aa-properties-info ul li:before {
@@ -1496,13 +1502,12 @@ img {
 }
 
 
-
 /*==================
  FOOTER SECTION
 ====================*/
 
 #aa-footer {
-/*  background-color: #444;
+  /*  background-color: #444;
 */
   display: inline;
   float: left;
@@ -1523,7 +1528,7 @@ img {
 }
 
 #aa-footer .aa-footer-area .aa-footer-left p {
-/*  color: #fff;
+  /*  color: #fff;
 */
   margin-bottom: 0;
   padding-bottom: 10px;
@@ -1626,8 +1631,6 @@ img {
     /*Ed - for mobile show full length photos */
     height: 100%;
   }
-
-
   #aa-menu-area .main-navbar .navbar-nav li a {
     padding-left: 8px;
     padding-right: 8px;
@@ -1932,8 +1935,6 @@ img {
   #aa-properties .aa-properties-content .aa-properties-content-body .aa-list-view li .aa-properties-item .aa-properties-item-img {
     width: 100%;
   }
-
-
   #aa-properties .aa-properties-content .aa-properties-content-body .aa-list-view li .aa-properties-item .aa-properties-item-content {
     border-top: medium none;
     width: 100%;

data/app/assets/stylesheets/pwb/themes/default/shame.scss

@@ -25,7 +25,7 @@ ul {
   list-style: none;
 }
 
-.static-content-panel {
+.static-content-panel, .comfy-content-panel {
   min-height: 600px;
 }
 

data/app/controllers/pwb/admin_panel_controller.rb

@@ -4,8 +4,8 @@ module Pwb
   class AdminPanelController < ActionController::Base
     layout 'pwb/admin_panel'
     def show
-      unless current_user && current_user.admin 
-        render 'pwb/errors/admin_required', :layout => "layouts/pwb/devise"
+      unless current_user && current_user.admin
+        render 'pwb/errors/admin_required', layout: "layouts/pwb/devise"
       end
     end
   end

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

@@ -0,0 +1,102 @@
+module Pwb
+  # http://localhost:3000/api/v1/cms-pages.json
+  class Api::V1::CmsPagesController < JSONAPI::ResourceController
+    # skip_before_action :verify_content_type_header
+    # Skipping action below allows me to browse to endpoint
+    # without having set mime type
+    skip_before_action :ensure_valid_accept_media_type
+    # skip_before_action :verify_accept_header
+
+    def set_photo
+      # This only creates a content photo
+      # - does not associate it with a cms page yet
+      photo = ContentPhoto.create
+      # TODO: - figure out how to remove orphaned photos
+      if params[:file]
+        photo.image = params[:file]
+      end
+      photo.save!
+      photo.reload
+      render json: photo.to_json
+    end
+
+    def meta
+      @admin_setup = Pwb::CmsPageContainer.where(name: params[:page_name]).first || {}
+      render json: @admin_setup.as_json["attributes"]
+    end
+
+    def create
+      new_page = Comfy::Cms::Page.new(cms_page_create_params["attributes"].except("blocks"))
+      cms_page_create_params[:attributes][:blocks].each do |block_params|
+        new_block = Comfy::Cms::Block.new block_params
+        new_block.identifier = "idd"
+        new_block.save!
+        new_page.blocks << new_block
+      end
+
+      new_page.site_id = 1
+      new_page.layout_id = 1
+      # new_page.slug = "en"
+      byebug
+      new_page.label = "lbl"
+
+      new_page.save!
+
+      serialized_page = JSONAPI::ResourceSerializer.new(Pwb::Api::V1::CmsPageResource).serialize_to_hash(Pwb::Api::V1::CmsPageResource.new(new_page, nil))
+      # updated_caches.push {}
+      # serialized_page[:data]["attributes"]["updated-caches"] = updated_caches
+      render json: serialized_page
+
+    end
+
+    def update
+      updated_caches = []
+      refresh_all_locales = false
+      cms_page_update_params[:attributes][:blocks].each do |block_params|
+        block = Comfy::Cms::Block.find block_params[:id]
+        if block_params[:is_image]
+          # for images I want to update all language variants of the block
+          cross_locale_blocks = Comfy::Cms::Block.where(identifier: block_params[:identifier])
+          cross_locale_blocks.each do |cross_locale_block|
+            cross_locale_block.update block_params.slice :content
+          end
+          refresh_all_locales = true
+        else
+          block.update block_params.slice :content
+        end
+        # blocks.push block
+      end
+
+      if refresh_all_locales
+        pages = Comfy::Cms::Page.where(label: cms_page_update_params[:attributes][:label])
+        pages.each do |page|
+          page.clear_content_cache
+          updated_caches.push({
+                                page_id: page.id,
+                                page_content_cache: page.content_cache
+          })
+        end
+      else
+        page = Comfy::Cms::Page.find cms_page_update_params[:id]
+        page.clear_content_cache
+        # need to call content_cache again for refresh
+        page.content_cache
+      end
+
+      # below ensures valid json_api response is sent:
+      page = Comfy::Cms::Page.find cms_page_update_params[:id]
+      serialized_page = JSONAPI::ResourceSerializer.new(Pwb::Api::V1::CmsPageResource).serialize_to_hash(Pwb::Api::V1::CmsPageResource.new(page, nil))
+      updated_caches.push {}
+      serialized_page[:data]["attributes"]["updated-caches"] = updated_caches
+      # [{id: 22, cc: "dddd"}]
+      render json: serialized_page
+    end
+
+    def cms_page_create_params
+      params.require(:data).permit(attributes: [:slug, :site_id, :label, blocks: [:content, :identifier, :info, :is_image]])
+    end
+    def cms_page_update_params
+      params.require(:data).permit(:id, attributes: [:label, blocks: [:content, :id, :identifier, :info, :is_image]])
+    end
+  end
+end

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

@@ -13,6 +13,10 @@ module Pwb
         # 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!
       end
       render json: @website
@@ -25,6 +29,9 @@ module Pwb
         :company_name, :display_name, :default_area_unit,
         :phone_number_primary, :phone_number_other,
         :theme_name, :default_currency, :default_client_locale,
+        :raw_css, :analytics_id_type, :analytics_id,
+        :sale_price_options_from, :sale_price_options_till,
+        :rent_price_options_from, :rent_price_options_till,
       supported_locales: []
 )
     end

data/app/controllers/pwb/api_public/v1/props_controller.rb

@@ -12,8 +12,8 @@ module Pwb
     # verify_content_type_header
     # verify_accept_header
 
-    before_filter :cors_preflight_check
-    after_filter :cors_set_access_control_headers
+    before_action :cors_preflight_check
+    after_action :cors_set_access_control_headers
 
     # For all responses in this controller, return the CORS access control headers.
 

data/app/controllers/pwb/application_api_controller.rb

@@ -1,6 +1,5 @@
 module Pwb
   class ApplicationApiController < ActionController::Base
-
     protect_from_forgery with: :exception, prepend: true
     # include ActionController::HttpAuthentication::Token::ControllerMethods
 
@@ -8,7 +7,6 @@ module Pwb
     # , :authenticate_user_from_token!, :set_locale
     after_action :set_csrf_token
 
-
     def self.default_url_options
       { locale: I18n.locale }
     end
@@ -18,12 +16,11 @@ module Pwb
     def check_user
       unless current_user && current_user.admin
         # unless request.subdomain.present? && (request.subdomain.downcase == current_user.tenants.first.subdomain.downcase)
-        return render_json_error "unauthorised_user"
+        render_json_error "unauthorised_user"
       end
-
     end
 
-    def render_json_error(message, opts={})
+    def render_json_error(message, opts = {})
       render json: message, status: opts[:status] || 422
     end
 
@@ -34,11 +31,10 @@ module Pwb
     def set_csrf_token
       # http://rajatsingla.in/ruby/2016/08/06/how-to-add-csrf-in-ember-app.html
       if request.xhr?
-        response.headers['X-CSRF-Token'] = "#{form_authenticity_token}"
+        response.headers['X-CSRF-Token'] = form_authenticity_token.to_s
         response.headers['X-CSRF-Param'] = "authenticity_token"
       end
       # works in conjunction with updating the headers via client app
     end
-
   end
 end

data/app/controllers/pwb/application_controller.rb

@@ -2,13 +2,13 @@ module Pwb
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
-    before_action :footer_content, :current_agency_and_website, :sections, 
+    before_action :footer_content, :current_agency_and_website, :sections,
     :set_locale, :set_theme_path
 
     def set_theme_path
       theme_name = Website.unique_instance.theme_name
       theme_name = theme_name.present? ? theme_name : "default"
-       # || "default"
+      # || "default"
       # if Agency.last && Agency.last.theme_name.present?
       #   theme_name = Agency.last.theme_name
       # end
@@ -56,6 +56,5 @@ module Pwb
       @sections ||= Section.order("sort_order")
       @show_admin_link = true
     end
-
   end
 end

data/app/controllers/pwb/comfy_controller.rb

@@ -0,0 +1,106 @@
+require_dependency 'pwb/application_controller'
+
+module Pwb
+  # based on
+  # comfortable-mexican-sofa/app/controllers/comfy/cms/content_controller.rb
+  class ComfyController < ApplicationController
+    # Comfy::Cms::BaseController
+
+    # Authentication module must have `authenticate` method
+    include ComfortableMexicanSofa.config.public_auth.to_s.constantize
+
+    # Authorization module must have `authorize` method
+    include ComfortableMexicanSofa.config.public_authorization.to_s.constantize
+
+    before_action :load_cms_site
+    # before_action :load_fixtures
+    # before_action :load_cms_page
+    #   :authenticate,
+    #   :authorize,
+    #   :only => :show
+
+    rescue_from ActiveRecord::RecordNotFound, with: :page_not_found
+
+    def show
+      @cms_pages = []
+
+      begin
+        cms_page_container = Pwb::CmsPageContainer.find(params[:page_slug])
+        @title_key = cms_page_container.pageTitleKey
+        cms_page_container.cmsPartsList.each do |cms_part|
+          @cms_page = Comfy::Cms::Page.where({label: cms_part["label"], slug: I18n.locale}).first
+          # @cms_site.pages.published.find_by_full_path!("/about-us/services")
+          @cms_pages.push @cms_page if @cms_page
+        end
+      rescue ActiveHash::RecordNotFound
+      end
+
+      @content_area_cols = Content.where(tag: 'content-area-cols').order('sort_order')
+
+      render "/pwb/sections/cms"
+
+      # cms_page_path =  "/#{params[:page_slug]}-page"
+      # https://github.com/comfy/comfortable-mexican-sofa/wiki/View-rendering
+      # below makes use of Comfy view rendering:
+
+      # return render :cms_page => cms_page_path, :layout => "pwb/application", :cms_blocks => {
+      #   :jumbotron => 'Content About Events'
+      #   # :column_b => { :template => '/events/index' },
+      #   # :column_c => { :partial  => '/events/calendar' }
+      # }
+      # return render @cms_page.content_cache
+      # , layout: "application"
+    end
+
+    def render_sitemap
+      render
+    end
+
+    protected
+
+    def load_cms_site
+      # TODO: - load diff sites depending on locale//
+      @cms_site = ::Comfy::Cms::Site.find_by_locale :es
+      # (::Comfy::Cms::Site.find_by_locale I18n.locale) || (::Comfy::Cms::Site.find_by_locale :en)
+    end
+
+    # def render_page(status = 200)
+    #   # below will ren
+    #   if @cms_layout = @cms_page.layout
+    #     # app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
+    #     app_layout = "application"
+    #     render  :inline       => @cms_page.content_cache,
+    #       :layout       => app_layout,
+    #       :status       => status,
+    #       :content_type => mime_type
+    #   else
+    #     render :plain => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
+    #   end
+    # end
+
+    # it's possible to control mimetype of a page by creating a `mime_type` field
+    def mime_type
+      mime_block = @cms_page.blocks.find_by_identifier(:mime_type)
+      mime_block && mime_block.content || 'text/html'
+    end
+
+    def load_fixtures
+      return unless ComfortableMexicanSofa.config.enable_fixtures
+      ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
+    end
+
+    def load_cms_page(_page_key)
+      @cms_page = @cms_site.pages.published.find_by_full_path!("/[:cms_path]")
+    end
+
+    def page_not_found
+      @cms_page = @cms_site.pages.published.find_by_full_path!('/404')
+
+      respond_to do |format|
+        format.html { render_page(404) }
+      end
+    rescue ActiveRecord::RecordNotFound
+      raise ActionController::RoutingError, "Page Not Found at: \"#{params[:cms_path]}\""
+    end
+  end
+end