pwb 1.1.1 → 1.2.0

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

@@ -25,6 +25,9 @@ $base-border-color:#e0eded;
 @import "default/devise";
 @import "default/language_switcher";
 @import "shared/header_footer";
+@import "shared/social";
+@import "shared/gmap";
+@import "shared/search_box";
 @import "shared/shame";
 
 

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

@@ -19,7 +19,7 @@ $base-border-color:#e0eded;
 
 /* "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
 */
-@import "bootstrap-sprockets";
+/*@import "bootstrap-sprockets";*/
 @import "bootstrap";
 
 @import "bootstrap-select";
@@ -32,13 +32,15 @@ https://github.com/bokmann/font-awesome-rails*/
 @import "default/landing_general";
 @import "default/landing_content_areas";
 @import "default/contact_us";
-@import "default/search";
 @import "default/prop";
 @import "default/devise";
 @import "default/language_switcher";
 @import "default/shame";
 @import "default/carousel";
 @import "shared/header_footer";
+@import "shared/social";
+@import "shared/gmap";
+@import "shared/search_box";
 @import "shared/shame";
 
 /*@import "default/flags";*/

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

@@ -83,7 +83,7 @@ div.figure img {
 
 form.simple_form.form-base div.panel-body {
   padding: 25px;
-  min-height: 301px;
+  /*min-height: 301px;*/
 }
 
 

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

@@ -105,6 +105,26 @@ ul.idiomas .us {
     background-size: cover;
 }
 
+ul.idiomas .vi {
+    background: url('https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/0.8.2/flags/4x3/vn.svg') no-repeat;
+    background-size: cover;
+}
+
+ul.idiomas .tr {
+    background: url('https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/0.8.2/flags/4x3/tr.svg') no-repeat;
+    background-size: cover;
+}
+
+ul.idiomas .hi {
+    background: url('https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/0.8.2/flags/4x3/hi.svg') no-repeat;
+    background-size: cover;
+}
+
+ul.idiomas .it {
+    background: url('https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/0.8.2/flags/4x3/it.svg') no-repeat;
+    background-size: cover;
+}
+
 ul.idiomas li.selected,
 ul.idiomas li:hover {
   background: url("/assets/simple-nav-arrow.png") no-repeat top center;

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

@@ -421,10 +421,6 @@ nav.venta_alquiler a.selected {
   text-transform: uppercase;
 }
 
-#btn_buscar_inmuebles {
-  width: 100%;
-}
-
 .btn-group.bootstrap-select button {
   border: 1px solid #ddd;
 }

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

@@ -158,29 +158,6 @@ header {
   color: #333 !important;
 }
 
-.panel-base {
-  border: 0;
-  background: #3498db;
-}
-
-.panel-base .panel-heading {
-  background: #2a8ed1;
-  padding: 25px 15px;
-  color: #fff;
-  border-bottom: 1px solid #2084c7;
-}
-
-.panel-base .panel-heading.panel-heading-lg {
-  padding: 25px;
-  font-size: 20px;
-  font-weight: 600;
-}
-
-.panel-base .form-base label {
-  color: #fff;
-  margin-bottom: 6px;
-}
-
 .body-wrap {
   position: relative;
   right: 0;
@@ -311,20 +288,6 @@ section.slice {
   font-size: 18px;
 }
 
-.panel {
-  border-radius: 0;
-  background-color: #fff;
-}
-
-.panel .panel-heading {
-  border-radius: 0;
-  padding: 15px;
-}
-
-.panel {
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
 
 @media (min-width: 1200px) {
   .body-wrap.body-boxed {
@@ -404,28 +367,6 @@ a:hover {
   height: 65px;
 }
 
-/*div.figure {
-  display: block;
-  height: 300px;
-  position: relative;
-  width: 100%;
-  max-height: 300px;
-  text-align: center;
-  background: #eee;
-}
-
-div.figure img {
-  display: block;
-  max-width: 100%;
-  height: 100%;
-  max-height: 300px;
-  margin: 0 auto;
-}
-
-form.simple_form.form-base div.panel-body {
-  padding: 25px;
-  min-height: 301px;
-}*/
 
 .ss-cont {
   padding-left: 5px;

data/app/assets/stylesheets/pwb/themes/shared/gmap.scss

@@ -0,0 +1,38 @@
+/*http://en.marnoto.com/2014/09/5-formas-de-personalizar-infowindow.html*/
+.gm-style-iw {
+  /*width: 250px !important;*/
+  /*height: 300px;*/
+  top: 1px !important;
+  /*bottom: 0px !important;*/
+  left: 0px !important;
+  background-color: #fff;
+}
+
+#iw-container {
+  margin-bottom: 0px;
+}
+
+#iw-container .iw-title {
+  font-family: 'Open Sans Condensed', sans-serif;
+  font-size: 22px;
+  font-weight: 400;
+  padding: 10px;
+  background-color: #48b5e9;
+  color: white;
+  margin: 0;
+  border-radius: 2px 2px 0 0;
+}
+
+#iw-container .iw-content {
+  font-size: 13px;
+  line-height: 18px;
+  font-weight: 400;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.iw-subTitle {
+  font-size: 16px;
+  font-weight: 700;
+  padding: 5px;
+}

data/app/assets/stylesheets/pwb/themes/shared/search_box.scss

@@ -0,0 +1,62 @@
+#btn_buscar_inmuebles {
+  width: 100%;
+}
+
+.landing-search-container {
+  #btn_buscar_inmuebles {
+    width: 30%;
+  }
+
+  .panel,
+  .panel-footer {
+    border: 0;
+    border-radius: 0;
+    background-color: transparent;
+  }
+
+  .panel .panel-heading {
+    border-radius: 0;
+    padding: 15px;
+  }
+
+  .panel-footer {
+    text-align: center;
+  }
+
+  .panel {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+
+  .panel-base {
+    border: 0;
+    background: transparent;
+  }
+
+  .panel-base .panel-heading {
+    background: #2a8ed1;
+    padding: 25px 15px;
+    color: #fff;
+    border-bottom: 1px solid #2084c7;
+  }
+
+  .panel-base .panel-heading.panel-heading-lg {
+    padding: 25px;
+    font-size: 20px;
+    font-weight: 600;
+  }
+
+  .panel-base .form-base label {
+    color: #fff;
+    margin-bottom: 6px;
+  }
+
+  .panel-default>.panel-heading h2 {
+    margin: 0;
+    padding: 0;
+    font-size: 16px;
+    font-weight: 500;
+    text-transform: capitalize;
+    color: #333
+  }
+}

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

@@ -1,3 +1,7 @@
+.center {
+  text-align: center;
+}
+
 @media only screen and (min-width: 767px) {
   /*flex display only needed for larger screens*/
   .flex-md {
@@ -26,6 +30,7 @@
 .contact-info-panel-body {
   padding: 0px 15px;
 }
+
 .contact-info h4 {
   margin-bottom: 2px;
 }
@@ -40,4 +45,4 @@
 .contact-info h5 i {
   margin-right: 4px;
   color: #3498db;
-}
+}

data/app/assets/stylesheets/pwb/themes/shared/social.scss

@@ -0,0 +1,84 @@
+.social-icons .fa {
+  font-size: 1.5em;
+}
+/*Change icons circle size and color here*/
+.social-icons .fa {
+  width: 40px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  color: #FFF;
+  color: rgba(255, 255, 255, 0.8);
+  -webkit-transition: all 0.3s ease-in-out;
+  -moz-transition: all 0.3s ease-in-out;
+  -ms-transition: all 0.3s ease-in-out;
+  -o-transition: all 0.3s ease-in-out;
+  transition: all 0.3s ease-in-out;
+  cursor: pointer;
+}
+
+.social-icons.icon-circle .fa{ 
+  border-radius: 50%;
+}
+.social-icons.icon-rounded .fa{
+  border-radius:5px;
+}
+.social-icons.icon-flat .fa{
+  border-radius: 0;
+}
+
+.social-icons .fa:hover, .social-icons .fa:active {
+  color: #FFF;
+  -webkit-box-shadow: 1px 1px 3px #333;
+  -moz-box-shadow: 1px 1px 3px #333;
+  box-shadow: 1px 1px 3px #333; 
+}
+.social-icons.icon-zoom .fa:hover, .social-icons.icon-zoom .fa:active { 
+  -webkit-transform: scale(1.1);
+  -moz-transform: scale(1.1);
+  -ms-transform: scale(1.1);
+  -o-transform: scale(1.1);
+  transform: scale(1.1); 
+}
+.social-icons.icon-rotate .fa:hover, .social-icons.icon-rotate .fa:active { 
+  -webkit-transform: scale(1.1) rotate(360deg);
+  -moz-transform: scale(1.1) rotate(360deg);
+  -ms-transform: scale(1.1) rotate(360deg);
+  -o-transform: scale(1.1) rotate(360deg);
+  transform: scale(1.1) rotate(360deg);
+}
+ 
+.social-icons .fa-adn{background-color:#504e54;} 
+.social-icons .fa-apple{background-color:#aeb5c5;} 
+.social-icons .fa-android{background-color:#A5C63B;}  
+.social-icons .fa-bitbucket,.social-icons .fa-bitbucket-square{background-color:#003366;} 
+.social-icons .fa-bitcoin,.social-icons .fa-btc{background-color:#F7931A;} 
+.social-icons .fa-css3{background-color:#1572B7;} 
+.social-icons .fa-dribbble{background-color:#F46899;}  
+.social-icons .fa-dropbox{background-color:#018BD3;}
+.social-icons .fa-facebook,.social-icons .fa-facebook-square{background-color:#3C599F;}  
+.social-icons .fa-flickr{background-color:#FF0084;}
+.social-icons .fa-foursquare{background-color:#0086BE;}
+.social-icons .fa-github,.social-icons .fa-github-alt,.social-icons .fa-github-square{background-color:#070709;} 
+.social-icons .fa-google-plus,.social-icons .fa-google-plus-square{background-color:#CF3D2E;} 
+.social-icons .fa-html5{background-color:#E54D26;}
+.social-icons .fa-instagram{background-color:#A1755C;}
+.social-icons .fa-linkedin,.social-icons .fa-linkedin-square{background-color:#0085AE;} 
+.social-icons .fa-linux{background-color:#FBC002;color:#333;}
+.social-icons .fa-maxcdn{background-color:#F6AE1C;}
+.social-icons .fa-pagelines{background-color:#241E20;color:#3984EA;}
+.social-icons .fa-pinterest,.social-icons .fa-pinterest-square{background-color:#CC2127;} 
+.social-icons .fa-renren{background-color:#025DAC;}
+.social-icons .fa-skype{background-color:#01AEF2;}
+.social-icons .fa-stack-exchange{background-color:#245590;}
+.social-icons .fa-stack-overflow{background-color:#FF7300;}
+.social-icons .fa-trello{background-color:#265A7F;}
+.social-icons .fa-tumblr,.social-icons .fa-tumblr-square{background-color:#314E6C;} 
+.social-icons .fa-twitter,.social-icons .fa-twitter-square{background-color:#32CCFE;} 
+.social-icons .fa-vimeo-square{background-color:#229ACC;}
+.social-icons .fa-vk{background-color:#375474;}
+.social-icons .fa-weibo{background-color:#D72B2B;}
+.social-icons .fa-windows{background-color:#12B6F3;}
+.social-icons .fa-xing,.social-icons .fa-xing-square{background-color:#00555C;} 
+.social-icons .fa-youtube,.social-icons .fa-youtube-play,.social-icons .fa-youtube-square{background-color:#C52F30;}
+ 

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

@@ -1,7 +1,8 @@
 require_dependency "pwb/application_controller"
 
 module Pwb
-  class ApiPublic::V1::PropsController < JSONAPI::ResourceController
+  class ApiPublic::V1::PropsController < ActionController::Base
+  # class ApiPublic::V1::PropsController < JSONAPI::ResourceController
     # Skipping action below allows me to browse to endpoint
     # without having set mime type
     # skip_before_action :ensure_valid_accept_media_type
@@ -36,5 +37,50 @@ module Pwb
         render text: '', content_type: 'text/plain'
       end
     end
+
+    def bulk_create_with_token
+      propertiesJSON = params["propertiesJSON"]
+      unless propertiesJSON.is_a? Array
+        propertiesJSON = JSON.parse propertiesJSON
+      end
+      new_props = []
+      existing_props = []
+      errors = []
+
+      propertiesJSON.each do |propertyJSON|
+        if Pwb::Prop.where(reference: propertyJSON["reference"]).exists?
+          existing_props.push propertyJSON
+        else
+          begin
+            new_prop = Pwb::Prop.create propertyJSON.except "extras", "property_photos"
+            if propertyJSON["extras"]
+              new_prop.set_extras=propertyJSON["extras"]
+            end
+            if propertyJSON["property_photos"]
+              propertyJSON["property_photos"].each do |property_photo|
+                photo = PropPhoto.create
+                photo.sort_order = property_photo["sort_order"] || nil
+                photo.remote_image_url = property_photo["image"]["url"] || property_photo["url"]
+                photo.save!
+                new_prop.prop_photos.push photo
+              end
+            end
+
+            new_props.push new_prop
+          rescue => err
+            # binding.pry
+            errors.push err.message
+            # logger.error err.message
+          end
+        end
+      end
+
+      return render json: {
+        new_props: new_props,
+        existing_props: existing_props,
+        errors: errors
+      }
+    end
+
   end
 end

data/app/controllers/pwb/props_controller.rb

@@ -9,18 +9,22 @@ module Pwb
       # gon.property_details =@property_details
       @operation_type = "for_rent"
       @operation_type_key = @operation_type.camelize(:lower)
+      @map_markers = []
       if @property_details && @property_details.visible && @property_details.for_rent
+        set_map_marker
         # below lets me know what prices to display
         @show_vacational_rental = @property_details.for_rent_short_term
 
         js property_details: @property_details
         js 'Pwb/Props#show'
-        # page_title gets picked up automatically by meta-tags gem
         @page_title = @property_details.title
         @page_description = @property_details.description
         # @page_keywords    = 'Site, Login, Members'
         return render "/pwb/props/show"
       else
+        @page_title = I18n.t("propertyNotFound")
+        hi_content = Content.where(tag: 'landing-carousel')[0]
+        @header_image = hi_content.present? ? hi_content.default_photo : nil
         return render "not_found"
       end
     end
@@ -31,10 +35,11 @@ module Pwb
       @operation_type = "for_sale"
       @operation_type_key = @operation_type.camelize(:lower)
       @property_details = Prop.find_by_id(params[:id])
+      @map_markers = []
 
       if @property_details && @property_details.visible && @property_details.for_sale
+        set_map_marker
         # gon.property_details =@property_details
-
         js property_details: @property_details
         js 'Pwb/Props#show'
         @page_title = @property_details.title
@@ -42,6 +47,9 @@ module Pwb
         # @page_keywords    = 'Site, Login, Members'
         return render "/pwb/props/show"
       else
+        @page_title = I18n.t("propertyNotFound")
+        hi_content = Content.where(tag: 'landing-carousel')[0]
+        @header_image = hi_content.present? ? hi_content.default_photo : nil
         return render "not_found"
       end
     end
@@ -69,7 +77,7 @@ module Pwb
                                origin_ip: request.ip,
                                user_agent: request.user_agent,
                                delivery_email: @current_agency.email_for_property_contact_form
-        # origin_email: params[:contact][:email]
+                               # origin_email: params[:contact][:email]
       })
 
       unless @enquiry.save && @client.save
@@ -97,5 +105,26 @@ module Pwb
       @error_messages = [I18n.t("contact.error"), e]
       return render "pwb/ajax/request_info_errors", layout: false
     end
+
+    private
+
+    def set_map_marker
+      if @property_details.show_map
+        @map_markers.push(
+          {
+            id: @property_details.id,
+            title: @property_details.title,
+            show_url: @property_details.contextual_show_path(@operation_type),
+            image_url: @property_details.primary_image_url,
+            display_price: @property_details.contextual_price_with_currency(@operation_type),
+            position: {
+              lat: @property_details.latitude,
+              lng: @property_details.longitude
+            }
+          }
+        )
+      end
+    end
+
   end
 end