pwb 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2344b18a108db8c20c5f6b1760e737006abacc2
-  data.tar.gz: 89708feddefa2c2fd85e8de643887c097a3bd1d7
+  metadata.gz: 74537789158bf92aa5c6e723f27e399e0914fd6f
+  data.tar.gz: da4abf4a2065c46b4b0b8209453fe4e0af43159e
 SHA512:
-  metadata.gz: c3839ba5b0c53acba955504b44d4139ad5ef418310ed8bab0f1daf8e335b206d6fa75863df54754c416143a6b9628daef20ca689538a49d392e6b400b183fcb8
-  data.tar.gz: 58590fd4afc2f37f285fa4714d69c82ffbc8ba2e80a818c20e4a46cc4a405c2c728b70c0153c803afb137281e53b748eb3c3e397f8d0aa2f84d7401872b29cdc
+  metadata.gz: 495d749a9c5ed1668f53c1bc343e710148fdd50f93a280bc2e1abf3f928917aca98dc520e96996048ea32c458363c9d8a68bdfbc54d2b98b096de94511ebdfe4
+  data.tar.gz: 3804b2504174c8187340bee22513c104b997eebb47f42244b175cf063d69541ba11d24c33e2f020620a0f5b1d8306f4684a75299bbaecfba5ea1bc7b930162fc

data/README.md

@@ -1,6 +1,6 @@
 # PropertyWebBuilder
 
-[![Build Status](https://api.travis-ci.org/etewiah/property_web_builder.svg?branch=master)](https://api.travis-ci.org/etewiah/property_web_builder)
+[![Backers on Open Collective](https://opencollective.com/property_web_builder/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/property_web_builder/sponsors/badge.svg)](#sponsors)[![Build Status](https://api.travis-ci.org/etewiah/property_web_builder.svg?branch=master)](https://api.travis-ci.org/etewiah/property_web_builder)
 
 This project has been created to address a glaring gap in the rails ecosystem: the lack of an open source project for real estate websites.  
 
@@ -18,7 +18,8 @@ To see the admin panel, login as user admin@example.com with a password of "pwb1
 
 ## Rails Version
 
-PropertyWebBuilder runs with Rails >= 5.0
+PropertyWebBuilder runs with Rails '>= 5.0.0', '< 5.1'
+Support for Rails 5.1.0 will come soon
 
 ## Ruby Version
 
@@ -122,6 +123,19 @@ Thanks to the awesome [Locale](http://www.localeapp.com/) contributing to the tr
 - The maintainer will then pull translations from the Locale project and push to Github.
 
 
+## Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
+<a href="graphs/contributors"><img src="https://opencollective.com/property_web_builder/contributors.svg?width=890" /></a>
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/property_web_builder#backer)]
+
+<a href="https://opencollective.com/property_web_builder#backers" target="_blank"><img src="https://opencollective.com/property_web_builder/backers.svg?width=890"></a>
+
+
 ## Sponsors
 
 PropertyWebBuilder is currently sponsored by Coddde, Ruby On Rails consultants based in Spain and Chile:
@@ -129,7 +143,20 @@ PropertyWebBuilder is currently sponsored by Coddde, Ruby On Rails consultants b
 ![Coddde](http://coddde.com/wp-content/uploads/2017/01/coddde_logo.png)
 </a>
 
-If you wish to sponsor this project please email me directly (opensource at propertywebbuilder.com).
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/property_web_builder#sponsor)]
+
+<a href="https://opencollective.com/property_web_builder/sponsor/0/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/1/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/2/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/3/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/4/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/5/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/6/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/7/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/8/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/property_web_builder/sponsor/9/website" target="_blank"><img src="https://opencollective.com/property_web_builder/sponsor/9/avatar.svg"></a>
+
 
 
 ## License

data/app/assets/javascripts/pwb/{application.js → application.js.erb}

@@ -15,9 +15,26 @@
 // require jquery.turbolinks
 //= require jquery_ujs
 //= require paloma
-//= require_tree ./paloma
-//= require bootstrap-sprockets
+// require_tree ./paloma
+// require bootstrap-sprockets
 //= require bootstrap-select
+//= require lodash-4.16.4
+// lodash used for google maps
+<%
+# ...
+if Rails.env.development?
+  require_asset ("vue-2.4.2")
+else
+  require_asset ("vue-2.4.2.prod")
+end
+
+require_asset ("vue-social-sharing")
+require_asset ("vue-google-maps")
+require_asset ("./shared/select-picker")
+require_asset ("./shared/inmo-map")
+require_asset ("./shared/vue-main")
+%>
+
 
 // $(document).on('page:change', function() {
 // once turbolinks is activated, will have to change to above

data/app/assets/javascripts/pwb/paloma/landing.js

@@ -1,14 +1,14 @@
 var PwbWelcomeController = Paloma.controller('Pwb/Welcome');
 
 PwbWelcomeController.prototype.index = function() {
-  $(".carousel-inner .item").click(function () {
-    var carouselStatus = $('#homepageCarousel').data('status');
-    if (carouselStatus && carouselStatus === "paused") {
-      $('#homepageCarousel').carousel('cycle');
-      $('#homepageCarousel').data('status', "cycling");    
-    } else{
-      $('#homepageCarousel').carousel('pause');
-      $('#homepageCarousel').data('status', "paused");    
-    }
-  });
+  // $(".carousel-inner .item").click(function () {
+  //   var carouselStatus = $('#homepageCarousel').data('status');
+  //   if (carouselStatus && carouselStatus === "paused") {
+  //     $('#homepageCarousel').carousel('cycle');
+  //     $('#homepageCarousel').data('status', "cycling");    
+  //   } else{
+  //     $('#homepageCarousel').carousel('pause');
+  //     $('#homepageCarousel').data('status', "paused");    
+  //   }
+  // });
 };

data/app/assets/javascripts/pwb/paloma/prop.js

@@ -1,27 +1,19 @@
 var PwbPropsController = Paloma.controller('Pwb/Props');
 
 PwbPropsController.prototype.show = function() {
-  // Below for properties slider
-  // don't have something similar for main landing yet
-  $(".carousel-inner .item").click(function() {
-    var carouselStatus = $('#propCarousel').data('status');
-    if (carouselStatus && carouselStatus === "paused") {
-      $('#propCarousel').carousel('cycle');
-      $('#propCarousel').data('status', "cycling");
-    } else {
-      $('#propCarousel').carousel('pause');
-      $('#propCarousel').data('status', "paused");
-    }
-  });
+  // // Below for properties slider
+  // // don't have something similar for main landing yet
+  // $(".carousel-inner .item").click(function() {
+  //   var carouselStatus = $('#propCarousel').data('status');
+  //   if (carouselStatus && carouselStatus === "paused") {
+  //     $('#propCarousel').carousel('cycle');
+  //     $('#propCarousel').data('status', "cycling");
+  //   } else {
+  //     $('#propCarousel').carousel('pause');
+  //     $('#propCarousel').data('status', "paused");
+  //   }
+  // });
+
+  // var currentItemForMap = this.params.property_details;
 
-  var currentItemForMap = this.params.property_details;
-  if (typeof google === "undefined") {
-    var self = this;
-    window.map_callback = function() {
-      INMOAPP.showMap(currentItemForMap);
-    };
-    $.getScript('https://maps.googleapis.com/maps/api/js?key=AIzaSyCPorm8YzIaUGhKfe5cvpgofZ_gdT8hdZw&v=3.exp&sensor=false&callback=map_callback&libraries=places');
-  } else {
-    INMOAPP.showMap(currentItemForMap);
-  }
 };

data/app/assets/javascripts/pwb/paloma/sections.js

@@ -2,20 +2,20 @@ var PwbSectionsController = Paloma.controller('Pwb/Sections');
 
 PwbSectionsController.prototype.contact_us = function() {
 
-  var currentItemForMap = this.params.current_agency_primary_address;
-  // http://stackoverflow.com/questions/2647867/how-to-determine-if-variable-is-undefined-or-null
-  // if (currentItemForMap == null) {
-  if (!this.params.show_contact_map) {
-    return;
-  }
-  if (typeof google === "undefined") {
-    var self = this;
-    window.map_callback = function() {
-      INMOAPP.showMap(currentItemForMap);
-    };
-    $.getScript('https://maps.googleapis.com/maps/api/js?key=AIzaSyCPorm8YzIaUGhKfe5cvpgofZ_gdT8hdZw&v=3.exp&sensor=false&callback=map_callback&libraries=places');
-  } else {
-    INMOAPP.showMap(currentItemForMap);
-  }
+  // var currentItemForMap = this.params.current_agency_primary_address;
+  // // http://stackoverflow.com/questions/2647867/how-to-determine-if-variable-is-undefined-or-null
+  // // if (currentItemForMap == null) {
+  // if (!this.params.show_contact_map) {
+  //   return;
+  // }
+  // if (typeof google === "undefined") {
+  //   var self = this;
+  //   window.map_callback = function() {
+  //     INMOAPP.showMap(currentItemForMap);
+  //   };
+  //   $.getScript('https://maps.googleapis.com/maps/api/js?key=AIzaSyCPorm8YzIaUGhKfe5cvpgofZ_gdT8hdZw&v=3.exp&sensor=false&callback=map_callback&libraries=places');
+  // } else {
+  //   INMOAPP.showMap(currentItemForMap);
+  // }
 };
 

data/app/assets/javascripts/pwb/shared/inmo-map.js

@@ -0,0 +1,121 @@
+Vue.component('inmo-map', {
+  template: '<gmap-map style="min-height: 600px;"' +
+    ':zoom="15" :center="center" ref="mmm">' +
+    '<gmap-info-window ref="infwin" :options="infoOptions" :position="infoWindowPos"' +
+    ':opened="infoWinOpen" @closeclick="infoWinOpen=false">' +
+    '</gmap-info-window>' +
+    '<gmap-marker  v-for="(m,i) in mapkers"  :key="m.id" :position="m.position" ' +
+    '@mouseover="toggleInfoWindow(m,i)" @mouseout="statusText = null"' +
+    ':clickable="true" :draggable="true" @click=""></gmap-marker>' +
+    '</gmap-map>',
+  data: function() {
+    return {
+      newMarkers: [],
+      useNewMarkers: false,
+      infoContent: '',
+      statusText: '',
+      infoWindowPos: {
+        lat: 0,
+        lng: 0
+      },
+      infoWinOpen: false,
+      currentMidx: null,
+      //optional: offset infowindow so it visually sits nicely on top of our marker
+      infoOptions: {
+        content: "hey",
+        pixelOffset: {
+          width: 0,
+          height: -35
+        }
+      }
+    };
+  },
+  // created() {
+  // },
+  mounted: function() {
+    var that = this;
+    this.$refs.mmm.$mapCreated.then(function() {
+      if (that.mapkers.length > 1) {
+        var bounds = new google.maps.LatLngBounds();
+        that.mapkers.forEach(function(mapker){
+          bounds.extend(mapker.position);
+        });
+        // for (let m of that.mapkers) {
+        //   bounds.extend(m.position)
+        // }
+        that.$refs.mmm.$mapObject.fitBounds(bounds);
+        // where markers are too close together, I need below
+        // to ensure they are not too zoomed in
+        that.$refs.mmm.$mapObject.setOptions({ maxZoom: that.$refs.mmm.$mapObject.getZoom() });
+      }
+    })
+  },
+  methods: {
+    resetMarkers: function(newMarkers) {
+      this.newMarkers = newMarkers;
+      this.useNewMarkers = true;
+    },
+    toggleInfoWindow: function(marker, idx) {
+      this.infoWindowPos = marker.position;
+      var display_price_html = "";
+      if (marker.display_price) {
+        display_price_html = '<div class="iw-subTitle">' + marker.display_price + '</div>';
+      }
+      var image_html = "";
+      if (marker.image_url) {
+        image_html = '<img src="' + marker.image_url + '" alt="" width="225">';
+      }
+
+      var infoWindowContent = '<div id="iw-container">' +
+        '<a href="' + marker.show_url + '" class="">' +
+        '<div class="iw-title">' + marker.title + '</div>' +
+        '<div class="iw-content">' +
+        display_price_html +
+        image_html +
+        '</div></a>' +
+        '</div>';
+
+      this.infoOptions.content = infoWindowContent;
+      //check if its the same marker that was selected if yes toggle
+      if (this.currentMidx == idx) {
+        this.infoWinOpen = !this.infoWinOpen;
+      }
+      //if different marker set infowindow to open and reset current marker index
+      else {
+        this.infoWinOpen = true;
+        this.currentMidx = idx;
+      }
+    }
+  },
+  // watch: {
+  //   mapkers(mapkers) {
+  //   }
+  // },
+  computed: {
+    mapkers: function() {
+      if (this.useNewMarkers) {
+        return this.newMarkers;
+      } else {
+        return this.markers;
+      }
+    },
+    center: function() {
+      if (this.markers) {
+        var lat = this.markers[0].position.lat;
+        var lng = this.markers[0].position.lng;
+        return { lat: lat, lng: lng };
+
+        // if (this.mapkers.length < 2) {
+        // } else {
+        //   // const bounds = new google.maps.LatLngBounds()
+        //   // for (let m of mapkers) {
+        //   //   bounds.extend(m.latLng)
+        //   // }
+        //   // this.$refs.map.$mapObject.fitBounds(bounds)
+        // }
+      }
+      // `this` points to the vm instance
+    }
+  },
+  props: ['markers'],
+});

data/app/assets/javascripts/pwb/shared/select-picker.js

@@ -0,0 +1,15 @@
+Vue.component('select-picker', {
+  template: '<select class="" >' +
+    '<option  v-for="option in selectOptions">{{ option }}</option>' +
+    '</select>',
+  mounted: function() {
+    var vm = this;
+    $(this.$el).selectpicker(this.selectPickerTexts);
+    // .trigger('change')
+    // // emit event on change.
+    // .on('change', function() {
+    //   vm.$emit('input', this.value)
+    // });
+  },
+  props: ['selectOptions', 'selectPickerTexts', 'selected'],
+});

data/app/assets/javascripts/pwb/shared/slick-carousel.js

@@ -0,0 +1,10 @@
+Vue.component('slick-carousel', {
+
+  mounted: function() {
+    var vm = this;
+    // debugger;
+    $(this.$el).css('visibility','visible').fadeIn(100);;
+    $(this.$el).slick(this.slickOptions);
+  },
+  props: ['slickOptions'],
+});

data/app/assets/javascripts/pwb/shared/vue-main.js

@@ -0,0 +1,31 @@
+var INMOAPP = INMOAPP || {};
+
+
+window.onload = function() {
+
+  var pwbSS = Vue.component('social-sharing', SocialSharing);
+  // var pwbGM = Vue.component('gmap-map', VueGoogleMaps);
+  Vue.use(VueGoogleMaps, {
+    load: {
+      key: 'AIzaSyCPorm8YzIaUGhKfe5cvpgofZ_gdT8hdZw'
+      // v: '3.26', // Google Maps API version
+      // libraries: 'places',   // If you want to use places input
+    }
+  });
+  var markers = INMOAPP.markers || [];
+  INMOAPP.pwbVue = new Vue({
+    el: '#main-vue',
+    data: {
+      // markers: markers,
+      // selected: 2,
+      // selectoptions: [
+      //   2, 3, 4
+      // ],
+      // options: [
+      //   { id: 1, text: 'Hello' },
+      //   { id: 2, text: 'World' }
+      // ]
+    }
+  });
+
+}

data/app/assets/javascripts/pwb/themes/{berlin.js → berlin.js.erb}

@@ -15,14 +15,35 @@
 //= require jquery_ujs
 //= require paloma
 //= require_tree ../paloma
-//= require bootstrap-sprockets
+// require bootstrap-sprockets
 //= require bootstrap-select
 //= require berlin/slick
 
-// require berlin/nouislider
-// require berlin/jquery.mixitup.js
-// require berlin/jquery.fancybox.pack.js
-//= require berlin/custom
+// below needed for bootstrap-select to work
+//= require berlin/bootstrap
+// require berlin/custom
+
+//= require lodash-4.16.4
+// lodash used for google maps
+<%
+# ...
+if Rails.env.development?
+  require_asset ("vue-2.4.2")
+else
+  require_asset ("vue-2.4.2.prod")
+end
+
+require_asset ("vue-social-sharing")
+require_asset ("vue-google-maps")
+require_asset ("../shared/select-picker")
+require_asset ("../shared/inmo-map")
+require_asset ("../shared/slick-carousel")
+require_asset ("../shared/vue-main")
+
+%>
+
+
+
 
 // $(document).on('page:change', function() {
 // once turbolinks is activated, will have to change to above
@@ -32,6 +53,41 @@ $(document).on('ready', function() {
   Paloma.start();
   // Paloma.executeHook();
   // Paloma.engine.start();
+
+  /* ----------------------------------------------------------- */
+  /*   FIXED NAVBAR 
+  /* ----------------------------------------------------------- */
+    
+
+  jQuery(window).bind('scroll', function() {
+    if (jQuery(window).scrollTop() > 200) {
+      jQuery('.main-navbar').addClass('navbar-fixed-top');
+
+    } else {
+      jQuery('.main-navbar').removeClass('navbar-fixed-top');
+    }
+  });
+
+  /* ----------------------------------------------------------- */
+  /*   SCROLL TOP BUTTON
+  /* ----------------------------------------------------------- */
+
+  //Check to see if the window is top if not then display button
+
+  jQuery(window).scroll(function() {
+    if (jQuery(this).scrollTop() > 900) {
+      jQuery('.scrollToTop').fadeIn();
+    } else {
+      jQuery('.scrollToTop').fadeOut();
+    }
+  });
+
+  //Click event to scroll to top
+
+  jQuery('.scrollToTop').click(function() {
+    jQuery('html, body').animate({ scrollTop: 0 }, 800);
+    return false;
+  });
 });
 
 // global namespace