Add more detail to the email

Rental crawler fix

See merge request saburly/marketalarm/web!80

app/common/enums.js

@@ -104,6 +104,13 @@ const AD_CATEGORY = {
     id: "FLAT",
     title: "Stan",
     hasGardenSize: false,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
@@ -112,6 +119,13 @@ const AD_CATEGORY = {
     id: "HOUSE",
     title: "Kuća",
     hasGardenSize: true,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: false,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: true,
+    hasFloorProp: false,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
@@ -121,6 +135,13 @@ const AD_CATEGORY = {
     id: "OFFICE",
     title: "Kancelarija",
     hasGardenSize: false,
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
@@ -129,6 +150,13 @@ const AD_CATEGORY = {
     id: "LAND",
     title: "Zemljište",
     hasGardenSize: false,
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: false,
+    hasElevatorProp: false,
+    hasNumberOfRoom: false,
+    hasNumberOfFloors: false,
+    hasFloorProp: false,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: LAND_SIZE_SLIDER_OPTIONS
@@ -137,6 +165,13 @@ const AD_CATEGORY = {
     id: "APARTMENT",
     title: "Apartman",
     hasGardenSize: false,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
@@ -145,6 +180,13 @@ const AD_CATEGORY = {
     id: "GARAGE",
     title: "Garaža",
     hasGardenSize: false,
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: false,
+    hasElevatorProp: false,
+    hasNumberOfRoom: false,
+    hasNumberOfFloors: false,
+    hasFloorProp: false,
     priceSliderOptionsSale: GARAGE_PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: GARAGE_PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: GARAGE_SIZE_SLIDER_OPTIONS
@@ -153,6 +195,13 @@ const AD_CATEGORY = {
     id: "COTTAGE",
     title: "Vikendica",
     hasGardenSize: true,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: false,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: true,
+    hasFloorProp: false,
     priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
     priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
@@ -167,7 +216,8 @@ const AD_STATUS = {
   STATUS_DELETED: 4,
   STATUS_URGENT: 5,
   STATUS_DISCOUNTED: 6,
-  STATUS_RENTED: 7
+  STATUS_RENTED: 7,
+  STATUS_VIP: 8
 };
 
 const AD_AGENCY = {
@@ -199,6 +249,10 @@ const EMAIL_FREQUENCY = {
 };
 
 const HEATING_TYPE = {
+  ANY: {
+    id: "ANY",
+    title: "Svi"
+  },
   NO_HEATING: {
     id: "NO_HEATING",
     title: "Nije uvedeno"
@@ -238,6 +292,10 @@ const HEATING_TYPE = {
 };
 
 const ACCESS_ROAD_TYPE = {
+  ANY: {
+    id: "ANY",
+    title: "Svi"
+  },
   ASPHALT: {
     id: "ASPHALT",
     title: "Asfalt"

app/common/filterEnums.js

@@ -0,0 +1,110 @@
+const { AD_CATEGORY, ACCESS_ROAD_TYPE, HEATING_TYPE } = require("./enums");
+
+const ADVANCED_BOOLEAN_FILTERS = [
+  {
+    dbField: "balcony",
+    title: "Balkon",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE
+    ]
+  },
+  {
+    dbField: "elevator",
+    title: "Lift",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.OFFICE
+    ]
+  },
+  {
+    dbField: "newBuilding",
+    title: "Novogradnja",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE
+    ]
+  }
+];
+
+const ADVANCED_SEGMENT_SELECT_FILTERS = [
+  {
+    dbField: "accessRoadType",
+    title: "Pristupni put",
+    values: Object.keys(ACCESS_ROAD_TYPE).map(key => ACCESS_ROAD_TYPE[key]),
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE,
+      AD_CATEGORY.LAND,
+      AD_CATEGORY.GARAGE
+    ]
+  }
+  // {
+  //   dbField: "heatingType",
+  //   title: "Vrsta grijanja",
+  //   values: Object.keys(HEATING_TYPE).map(key => HEATING_TYPE[key]),
+  //   categoriesToShow: [
+  //     AD_CATEGORY.FLAT,
+  //     AD_CATEGORY.HOUSE,
+  //     AD_CATEGORY.APARTMENT,
+  //     AD_CATEGORY.COTTAGE,
+  //     AD_CATEGORY.OFFICE
+  //   ]
+  // }
+];
+
+const ADVANCED_RANGE_FILTERS = [
+  {
+    id: "numberOfFloors",
+    title: "Broj spratova",
+    dbFieldMin: "numberOfFloorsMin",
+    dbFieldMax: "numberOfFloorsMax",
+    validValueMin: -1,
+    validValueMax: 50,
+    categoriesToShow: [AD_CATEGORY.HOUSE, AD_CATEGORY.COTTAGE]
+  },
+  {
+    id: "floor",
+    title: "Sprat",
+    dbFieldMin: "floorMin",
+    dbFieldMax: "floorMax",
+    validValueMin: -10,
+    validValueMax: 50,
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.OFFICE
+    ]
+  },
+  {
+    id: "numberOfRooms",
+    title: "Broj soba",
+    dbFieldMin: "numberOfRoomsMin",
+    dbFieldMax: "numberOfRoomsMax",
+    decimalPlaces: 1,
+    validValueMin: 0,
+    validValueMax: 200,
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE
+    ]
+  }
+];
+
+module.exports = {
+  ADVANCED_BOOLEAN_FILTERS,
+  ADVANCED_SEGMENT_SELECT_FILTERS,
+  ADVANCED_RANGE_FILTERS
+};

app/config/appConfig.js

@@ -32,6 +32,11 @@ const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
 
 const API_MAP_KEY = process.env.API_MAP_KEY || "";
 
+const PROSTOR_LOGIN = {
+  EMAIL: process.env.PROSTOR_LOGIN_EMAIL,
+  PASSWORD: process.env.PROSTOR_LOGIN_PASS
+};
+
 module.exports = {
   APP_PORT,
   APP_URL,
@@ -42,5 +47,6 @@ module.exports = {
   MAX_REAL_ESTATES_IN_EMAIL,
   MAX_REAL_ESTATES_IN_FIRST_EMAIL,
   PRINT_CRAWLER_DEBUG,
-  API_MAP_KEY
+  API_MAP_KEY,
+  PROSTOR_LOGIN
 };

app/controllers/location.js

@@ -4,9 +4,37 @@ const getLocation = async (req, res) => {
   const title = "Odaberite lokaciju";
   const nextStep = req.query.nextStep || "/";
 
+  //Check if location data already exists (active request)
+  //If it does then  get location is called through edit field query
+  //and map should show already selected location not initial map
+  let selectedLatLngBounds = {};
+  let boundsSelected = false;
+
+  const searchRequest = await currentSearchRequest(req);
+
+  if (!searchRequest || !searchRequest.dataValues) {
+    res.render("notFound", { title: " " });
+    return;
+  }
+  const selectedArea = searchRequest.areaToSearch;
+  const sw = selectedArea.coordinates[0][3];
+  const ne = selectedArea.coordinates[0][1];
+
+  if (sw[0] && ne[0]) {
+    selectedLatLngBounds = {
+      swLat: sw[1],
+      swLng: sw[0],
+      neLat: ne[1],
+      neLng: ne[0]
+    };
+    boundsSelected = true;
+  }
+
   res.render("location", {
     nextStep,
-    title
+    title,
+    boundsSelected,
+    selectedLatLngBounds
   });
 };
 

app/controllers/realEstateFilters.js

@@ -1,5 +1,10 @@
 const { currentSearchRequest } = require("../helpers/url");
-const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
+const { AD_CATEGORY, AD_TYPE, ACCESS_ROAD_TYPE } = require("../common/enums");
+const {
+  ADVANCED_BOOLEAN_FILTERS,
+  ADVANCED_SEGMENT_SELECT_FILTERS,
+  ADVANCED_RANGE_FILTERS
+} = require("../common/filterEnums");
 
 const getFilters = async (req, res) => {
   const searchRequest = await currentSearchRequest(req);
@@ -19,7 +24,18 @@ const getFilters = async (req, res) => {
     sizeMin,
     sizeMax,
     gardenSizeMin,
-    gardenSizeMax
+    gardenSizeMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    floorMin,
+    floorMax,
+    includeIncompleteAds,
+    balcony,
+    elevator,
+    newBuilding,
+    accessRoadType
   } = searchRequest;
   const category = AD_CATEGORY[realEstateType] || AD_CATEGORY.FLAT;
 
@@ -41,6 +57,40 @@ const getFilters = async (req, res) => {
     return;
   }
 
+  // TODO: Maybe this is slow, pay attention to this
+  const filterFilters = filterObject => {
+    const filterCategories = filterObject.categoriesToShow;
+    return filterCategories.indexOf(category) !== -1;
+  };
+
+  const advancedBooleanFilterObjects = ADVANCED_BOOLEAN_FILTERS.filter(
+    filterFilters
+  );
+  const advancedSegmentSelectFilterObjects = ADVANCED_SEGMENT_SELECT_FILTERS.filter(
+    filterFilters
+  );
+  const advancedRangeFilterObjects = ADVANCED_RANGE_FILTERS.filter(
+    filterFilters
+  );
+
+  const advancedBooleanFilterValues = {
+    includeIncompleteAds,
+    balcony,
+    elevator,
+    newBuilding
+  };
+  const advancedSegmentSelectFilterValues = {
+    accessRoadType
+  };
+  const advancedRangeFilterValues = {
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    floorMin,
+    floorMax
+  };
+
   if (priceMin || priceMax) {
     priceSliderOptions.start = [priceMin, priceMax];
   }
@@ -58,7 +108,14 @@ const getFilters = async (req, res) => {
     hasGardenSize,
     priceSliderOptions: JSON.stringify(priceSliderOptions),
     sizeSliderOptions: JSON.stringify(sizeSliderOptions),
-    gardenSizeSliderOptions: JSON.stringify(gardenSizeSliderOptions)
+    gardenSizeSliderOptions: JSON.stringify(gardenSizeSliderOptions),
+    advancedBooleanFilterObjects,
+    advancedBooleanFilterValues,
+    advancedSegmentSelectFilterObjects,
+    advancedSegmentSelectFilterValues,
+    advancedRangeFilterObjects,
+    advancedRangeFilterValues,
+    includeIncompleteAds
   });
 };
 
@@ -78,13 +135,91 @@ const postFilters = async (req, res) => {
   const sizeMin = parseInt(req.body.sizeMin) || 0;
   const sizeMax = parseInt(req.body.sizeMax) || 0;
 
-  //TODO: Filter validation
+  const advancedRangeFilters = {};
 
+  ADVANCED_RANGE_FILTERS.forEach(filter => {
+    let parsingFunction = parseInt;
+    if (filter.decimalPlaces) {
+      parsingFunction = parseFloat;
+    }
+
+    advancedRangeFilters[filter.dbFieldMin] = parsingFunction(
+      req.body[filter.dbFieldMin]
+    );
+    advancedRangeFilters[filter.dbFieldMax] = parsingFunction(
+      req.body[filter.dbFieldMax]
+    );
+
+    advancedRangeFilters[filter.dbFieldMin] = isNaN(
+      advancedRangeFilters[filter.dbFieldMin]
+    )
+      ? null
+      : advancedRangeFilters[filter.dbFieldMin];
+    advancedRangeFilters[filter.dbFieldMax] = isNaN(
+      advancedRangeFilters[filter.dbFieldMax]
+    )
+      ? null
+      : advancedRangeFilters[filter.dbFieldMax];
+
+    try {
+      if (filter.decimalPlaces) {
+        advancedRangeFilters[filter.dbFieldMin] = advancedRangeFilters[
+          filter.dbFieldMin
+        ].toFixed(filter.decimalPlaces);
+        advancedRangeFilters[filter.dbFieldMax] = advancedRangeFilters[
+          filter.dbFieldMax
+        ].toFixed(filter.decimalPlaces);
+      }
+    } catch (e) {
+      advancedRangeFilters[filter.dbFieldMin] = null;
+      advancedRangeFilters[filter.dbFieldMax] = null;
+    }
+
+    if (
+      advancedRangeFilters[filter.dbFieldMin] < filter.validValueMin ||
+      advancedRangeFilters[filter.dbFieldMin] > filter.validValueMax
+    ) {
+      advancedRangeFilters[filter.dbFieldMin] = filter.validValueMin;
+    }
+
+    if (
+      advancedRangeFilters[filter.dbFieldMax] < filter.validValueMin ||
+      advancedRangeFilters[filter.dbFieldMax] > filter.validValueMax
+    ) {
+      advancedRangeFilters[filter.dbFieldMax] = filter.validValueMax;
+    }
+  });
+
+  const includeIncompleteAds = req.body.includeIncompleteAds === "on";
+
+  const balcony = req.body.balcony === "on";
+  const elevator = req.body.elevator === "on";
+  const newBuilding = req.body.newBuilding === "on";
+
+  const accessRoadType = req.body.accessRoadType;
+  if (!ACCESS_ROAD_TYPE[accessRoadType]) {
+    res.render("notFound", { title: " Greška !" });
+    return;
+  }
+
+  //TODO: Filter validation
   searchRequest.priceMin = priceMin;
   searchRequest.priceMax = priceMax;
   searchRequest.sizeMin = sizeMin;
   searchRequest.sizeMax = sizeMax;
 
+  for (const filter of Object.keys(advancedRangeFilters)) {
+    searchRequest[filter] = advancedRangeFilters[filter];
+  }
+
+  searchRequest.balcony = balcony;
+  searchRequest.elevator = elevator;
+  searchRequest.newBuilding = newBuilding;
+
+  searchRequest.includeIncompleteAds = includeIncompleteAds;
+
+  searchRequest.accessRoadType = accessRoadType;
+
   if (
     req.body.gardenSizeMin !== undefined &&
     req.body.gardenSizeMax !== undefined
@@ -97,7 +232,6 @@ const postFilters = async (req, res) => {
     searchRequest.gardenSizeMin = gardenSizeMin;
     searchRequest.gardenSizeMax = gardenSizeMax;
   }
-
   await searchRequest.save();
 
   res.redirect(nextStepUrl);

app/controllers/realEstates.js

@@ -2,13 +2,14 @@
 const {
   findRealEstatesForSearchRequest
 } = require("../helpers/db/searchRequestMatch");
+const { AD_STATUS } = require("../common/enums");
 
 const getRealEstates = async (req, res) => {
   const searchRequestId = req.params["searchRequestId"] || "";
   const realEstates = await findRealEstatesForSearchRequest(searchRequestId);
 
   const title = "Nekretnine koje odgovaraju Vašim uslovima pretrage";
-  res.render("realEstates", { realEstates, title });
+  res.render("realEstates", { realEstates, title, AD_STATUS });
 };
 
 module.exports = {

app/controllers/redirect.js

@@ -1,9 +1,11 @@
 const { getRealEstateById } = require("../helpers/db/realEstate");
+const { AD_STATUS } = require("../common/enums");
 
 const getRedirect = async (req, res) => {
   const id = req.params.id || null;
   let error = false;
   let redirectUrl = undefined;
+  let vipAd = undefined;
   if (!id) {
     error = true;
   } else {
@@ -13,6 +15,7 @@ const getRedirect = async (req, res) => {
         error = true;
       } else {
         redirectUrl = realEstate.url;
+        vipAd = realEstate.adStatus === AD_STATUS.STATUS_VIP;
       }
     } catch (e) {
       error = true;
@@ -24,7 +27,7 @@ const getRedirect = async (req, res) => {
     res.render("notFound", { title });
   } else {
     const title = "Preusmjeravanje";
-    res.render("redirect", { title, redirectUrl });
+    res.render("redirect", { title, redirectUrl, vipAd });
   }
 };
 

app/crawler/specificCrawlers/prostor.js

@@ -3,6 +3,7 @@
 const fetch = require("node-fetch");
 const cheerio = require("cheerio");
 const moment = require("moment-timezone");
+const FormData = require("form-data");
 
 const {
   AD_TYPE,
@@ -16,7 +17,8 @@ const {
 
 const {
   PRINT_CRAWLER_DEBUG,
-  DEFAULT_TIMEZONE
+  DEFAULT_TIMEZONE,
+  PROSTOR_LOGIN
 } = require("../../config/appConfig");
 const { PROSTOR_FORCE_CRAWL } = require("../specificConfigs/prostor");
 
@@ -60,13 +62,16 @@ class ProstorCrawler {
 
   async crawl() {
     const crawlAdCategories = this.crawlerAdCategories;
-
+    //We need session cookie to use login privileges
+    const prostorCookie = await this.getCookies();
+    //New tag to check if crawler loged in
+    const login = await this.loginForScraping(PROSTOR_LOGIN, prostorCookie);
     const newRealEstates = [];
-
-    if (crawlAdCategories) {
+    //Crawl only if login was successful
+    if (crawlAdCategories && login) {
       const indexGenerators = [];
       for (const adCategory of crawlAdCategories) {
-        indexGenerators.push(this.categoryIndexer(adCategory));
+        indexGenerators.push(this.categoryIndexer(adCategory, prostorCookie));
       }
 
       let done = false;
@@ -119,13 +124,14 @@ class ProstorCrawler {
     return newRealEstates;
   }
 
-  async *categoryIndexer(adCategory) {
+  async *categoryIndexer(adCategory, prostorCookie) {
     const urlAdTypePart = PROSTOR_ENUMS.PROSTOR_AD_TYPE[this.crawlerAdTypes];
     const urlCategoryPart = PROSTOR_ENUMS.PROSTOR_AD_CATEGORY[adCategory];
     if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
       const urlPageToCrawl = `${this.baseUrl}?remove_sold=0${urlAdTypePart}${urlCategoryPart}`;
       const listOfAllRealEstates = await this.extractRealEstates(
-        urlPageToCrawl
+        urlPageToCrawl,
+        prostorCookie
       );
 
       let elementToStartIndexFrom = 0;
@@ -139,7 +145,8 @@ class ProstorCrawler {
           elementToStartIndexFrom += realEstatesForSinglePage.length;
 
           const singlePageResults = await this.indexSinglePage(
-            realEstatesForSinglePage
+            realEstatesForSinglePage,
+            prostorCookie
           );
 
           const filteredSinglePageResults = singlePageResults.filter(
@@ -163,10 +170,10 @@ class ProstorCrawler {
     }
   }
 
-  async indexSinglePage(realEstatesList) {
+  async indexSinglePage(realEstatesList, prostorCookie) {
     const asyncActions = [];
     for (const realEstate of realEstatesList) {
-      asyncActions.push(this.scrapeAd(realEstate));
+      asyncActions.push(this.scrapeAd(realEstate, prostorCookie));
     }
 
     try {
@@ -180,12 +187,25 @@ class ProstorCrawler {
     }
   }
 
-  async scrapeAd(realEstate) {
+  async scrapeAd(realEstate, prostorCookie) {
     const { lat, lng, property_name, price, size, link, status } = realEstate;
+
+    //Status information is given already in realestate list
+    //For VIP Ads status ='' canot be used, but no VIP ads are crawled
+    //We will make "fake" vip ad for RE that have size=55
+    //It is weird because yesterday it said 'VIP ponuda' ???
+    const adStatus =
+      size === "55"
+        ? ProstorCrawler.getStatusId("VIP ponuda")
+        : ProstorCrawler.getStatusId(status);
+
     const url = `https://prostor.ba${link}`;
+
     // console.log("[PROSTOR] Scraping : ", url);
     try {
-      const adPageSource = await fetch(url);
+      const adPageSource = await fetch(url, {
+        headers: { Cookie: prostorCookie }
+      });
       const body = await adPageSource.text();
       const $ = cheerio.load(body);
 
@@ -330,7 +350,6 @@ class ProstorCrawler {
         furnishingType = FURNISHING_TYPE.NOT_FURNISHED.id;
       }
 
-      const adStatus = ProstorCrawler.getStatusId(status);
       const title = property_name;
       const parsedPrice = parseFloat(price.replace(/\./g, "")) || null;
       const parsedArea = parseFloat(size);
@@ -408,13 +427,15 @@ class ProstorCrawler {
     }
   }
 
-  async extractRealEstates(url) {
+  async extractRealEstates(url, prostorCookie) {
     if (PRINT_CRAWLER_DEBUG) {
       console.log("[PROSTOR] Index page : ", url);
     }
 
     try {
-      const res = await fetch(url);
+      const res = await fetch(url, {
+        headers: { Cookie: prostorCookie }
+      });
       const body = await res.text();
       const $ = cheerio.load(body);
 
@@ -548,6 +569,8 @@ class ProstorCrawler {
         return AD_STATUS.STATUS_SOLD;
       case "Iznajmljeno":
         return AD_STATUS.STATUS_RENTED;
+      case "VIP ponuda":
+        return AD_STATUS.STATUS_VIP;
       default:
         console.log("[PROSTOR] Unknown AD_STATUS : [", statusText, "]");
         return AD_STATUS.STATUS_NORMAL;
@@ -569,6 +592,51 @@ class ProstorCrawler {
     return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
+  async loginForScraping(PROSTOR_LOGIN, prostorCookie) {
+    let formData = new FormData();
+    formData.append("email", PROSTOR_LOGIN.EMAIL);
+    formData.append("password", PROSTOR_LOGIN.PASSWORD);
+
+    return fetch("https://prostor.ba/moj-prostor/prijava", {
+      method: "POST",
+      body: formData,
+      headers: { Cookie: prostorCookie }
+    })
+      .then(page => {
+        return page.text();
+      })
+      .then(resp => {
+        const $ = cheerio.load(resp);
+        if (
+          $("h1")
+            .text()
+            .indexOf("Dobrodošli") !== -1
+        ) {
+          console.log("[PROSTOR]: Crawler loged in!");
+          return true;
+        } else {
+          console.log("[PROSTOR]: Crawler login failed - wrong credentials!");
+          return false;
+        }
+      })
+      .catch(err => {
+        console.log("[PROSTOR]: Crawler login error ", err);
+      });
+  }
+  async getCookies() {
+    const getResponse = await fetch("https://prostor.ba/moj-prostor/prijava", {
+      headers: { Cookie: "" }
+    });
+    const raw = getResponse.headers.raw()["set-cookie"];
+    const cookie = raw
+      .map(datastring => {
+        const data = datastring.split(";");
+        const cookieData = data[0];
+        return cookieData;
+      })
+      .join(";");
+    return cookie;
+  }
 }
 
 module.exports = ProstorCrawler;

app/helpers/db/realEstate.js

@@ -2,7 +2,6 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
-
 const bulkUpsertRealEstates = async realEstateData => {
   try {
     const fieldsToUpdateIfDuplicate = [
@@ -87,7 +86,20 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     sizeMax,
     adType,
     realEstateType,
-    areaToSearch
+    areaToSearch,
+    gardenSizeMin,
+    gardenSizeMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    floorMin,
+    floorMax,
+    includeIncompleteAds,
+    balcony,
+    elevator,
+    newBuilding,
+    accessRoadType
   } = searchRequest;
 
   const longitudeColumn = sequelize.col("locationLong");
@@ -116,12 +128,20 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
 
   const geoSearchQueryPart = sequelize.where(contains, true);
 
+  //General queries contain only attributes that are defined for every searchreq
+
+  //Query for case of complete ads
   const query = {
     adType,
     realEstateType,
     price: {
-      [Op.lte]: priceMax,
-      [Op.gte]: priceMin
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: priceMax,
+          [Op.gte]: priceMin
+        },
+        [Op.is]: null
+      }
     },
     area: {
       [Op.lte]: sizeMax,
@@ -130,10 +150,148 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     [Op.and]: geoSearchQueryPart
   };
 
+  //Query for case of incomplete ads
+  const queryIncludeIncomplete = {
+    adType,
+    realEstateType,
+    price: {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: priceMax,
+          [Op.gte]: priceMin
+        },
+        [Op.is]: null
+      }
+    },
+    area: {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: sizeMax,
+          [Op.gte]: sizeMin
+        },
+        [Op.is]: null
+      }
+    },
+    [Op.and]: geoSearchQueryPart
+  };
+
+  //Every other attribute is checked separately and included in query only if it is defined
+  if (gardenSizeMax && gardenSizeMin) {
+    query.gardenSize = {
+      [Op.lte]: gardenSizeMax,
+      [Op.gte]: gardenSizeMin
+    };
+    queryIncludeIncomplete.gardenSize = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: gardenSizeMax,
+          [Op.gte]: gardenSizeMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (numberOfRoomsMin && numberOfRoomsMax) {
+    query.numberOfRooms = {
+      [Op.lte]: numberOfRoomsMax,
+      [Op.gte]: numberOfRoomsMin
+    };
+    queryIncludeIncomplete.numberOfRooms = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: numberOfRoomsMax,
+          [Op.gte]: numberOfRoomsMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (numberOfFloorsMin && numberOfFloorsMax) {
+    query.numberOfFloors = {
+      [Op.lte]: numberOfFloorsMax,
+      [Op.gte]: numberOfFloorsMin
+    };
+    queryIncludeIncomplete.numberOfFloors = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: numberOfFloorsMax,
+          [Op.gte]: numberOfFloorsMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (floorMin && floorMax) {
+    query.floor = {
+      [Op.lte]: floorMax,
+      [Op.gte]: floorMin
+    };
+    queryIncludeIncomplete.floor = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: floorMax,
+          [Op.gte]: floorMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (balcony) {
+    query.balcony = {
+      [Op.eq]: balcony
+    };
+    queryIncludeIncomplete.balcony = {
+      [Op.or]: {
+        [Op.eq]: balcony,
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (newBuilding) {
+    query.newBuilding = {
+      [Op.eq]: newBuilding
+    };
+    queryIncludeIncomplete.newBuilding = {
+      [Op.or]: {
+        [Op.eq]: newBuilding,
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (elevator) {
+    query.elevator = {
+      [Op.eq]: elevator
+    };
+    queryIncludeIncomplete.elevator = {
+      [Op.or]: {
+        [Op.eq]: elevator,
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (accessRoadType !== "ANY") {
+    query.accessRoadType = {
+      [Op.eq]: accessRoadType
+    };
+    queryIncludeIncomplete.accessRoadType = {
+      [Op.or]: {
+        [Op.eq]: accessRoadType,
+        [Op.is]: null
+      }
+    };
+  }
+
   const order = [["updatedAt", "desc"]];
 
-  return await db.RealEstate.findAll({
-    where: query,
+  return db.RealEstate.findAll({
+    where: includeIncompleteAds ? queryIncludeIncomplete : query,
     limit: maxResults,
     order
   });

app/helpers/db/searchRequest.js

@@ -2,11 +2,13 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
+const { AD_CATEGORY } = require("../../common/enums");
 
 const getSearchRequest = async searchRequestId => {
   try {
     return await db.SearchRequest.findByPk(searchRequestId);
   } catch (error) {
+    console.log("searchrequest.js", error);
     return null;
   }
 };
@@ -22,7 +24,15 @@ const findSearchRequestsForRealEstate = async realEstate => {
     adType,
     realEstateType,
     locationLat,
-    locationLong
+    locationLong,
+    accessRoadType,
+    balcony,
+    newBuilding,
+    elevator,
+    gardenSize,
+    numberOfRooms,
+    numberOfFloors,
+    floor
   } = realEstate;
 
   if (!locationLat || !locationLong) {
@@ -39,12 +49,20 @@ const findSearchRequestsForRealEstate = async realEstate => {
 
   const geoSearchQueryPart = sequelize.where(contains, true);
 
+  //General query contains only attributes that are defined for every RealEstate - not null
   const query = {
     adType,
     realEstateType,
     subscribed: true,
     [Op.and]: geoSearchQueryPart
   };
+  //Needed for defining which attribute should exist or not
+  const realEstateTypeObject = AD_CATEGORY[realEstateType];
+  //Needed to decide on including incomplete RealEstates data
+  let checkForIncompleteWanted = false;
+
+  //Attributes are checked separately and included in query only if defined
+  //Price and area should be defined for every property
 
   if (price) {
     query.priceMin = {
@@ -62,8 +80,96 @@ const findSearchRequestsForRealEstate = async realEstate => {
     query.sizeMax = {
       [Op.gte]: area
     };
+  } else {
+    checkForIncompleteWanted = true;
+  }
+  //Other attributes can be defined or not depending on RealEstate type
+  if (gardenSize) {
+    query.gardenSizeMin = {
+      [Op.lte]: gardenSize
+    };
+    query.gardenSizeMax = {
+      [Op.gte]: gardenSize
+    };
+  } else if (realEstateTypeObject.hasGardenSize) {
+    checkForIncompleteWanted = true;
   }
 
+  if (numberOfRooms) {
+    query.numberOfRoomsMin = {
+      [Op.lte]: numberOfRooms
+    };
+    query.numberOfRoomsMax = {
+      [Op.gte]: numberOfRooms
+    };
+  } else if (realEstateTypeObject.hasNumberOfRoom) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (numberOfFloors) {
+    query.numberOfFloorsMin = {
+      [Op.lte]: numberOfFloors
+    };
+    query.numberOfFloorsMax = {
+      [Op.gte]: numberOfFloors
+    };
+  } else if (realEstateTypeObject.hasNumberOfFloors) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (floor) {
+    query.floorMin = {
+      [Op.lte]: floor
+    };
+    query.floorMax = {
+      [Op.gte]: floor
+    };
+  } else if (realEstateTypeObject.hasFloorProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (accessRoadType) {
+    query.accessRoadType = {
+      [Op.or]: {
+        [Op.eq]: "ANY",
+        [Op.eq]: accessRoadType
+      }
+    };
+  } else if (realEstateTypeObject.hasAccesRoadType) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (balcony) {
+    query.balcony = {
+      [Op.eq]: balcony
+    };
+  } else if (realEstateTypeObject.hasBalconyProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (newBuilding) {
+    query.newBuilding = {
+      [Op.eq]: newBuilding
+    };
+  } else if (realEstateTypeObject.hasNewBuildingProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (elevator) {
+    query.elevator = {
+      [Op.eq]: elevator
+    };
+  } else if (realEstateTypeObject.hasElevatorProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  //If one of the attributes that exists for property type is null
+  //we include in query to check if incomplete real estates are accepted
+  if (checkForIncompleteWanted) {
+    query.includeIncompleteAds = {
+      [Op.eq]: true
+    };
+  }
   return await db.SearchRequest.findAll({ where: query });
 };
 

app/helpers/emailContentGenerator.js

@@ -1,10 +1,11 @@
 "use strict";
 
 const { MAX_REAL_ESTATES_IN_EMAIL, APP_URL } = require("../config/appConfig");
-const { AD_CATEGORY } = require("../common/enums");
+const { AD_CATEGORY, AD_TYPE, EMAIL_FREQUENCY } = require("../common/enums");
 
-const generateEmailFooter = searchRequestId => {
-  return `<div>Ako želite prestati dobijati obavještenja za ovu pretragu, <a href="${APP_URL}/odjava/${searchRequestId}">odjavite ovdje</a></div>
+const generateEmailFooter = (searchRequestId, emailFrequencyTitle) => {
+  return `  <div>Trenutno ste prijavljeni da obavještenja o novim nekretninama primate <strong>${emailFrequencyTitle.toLowerCase()} </strong>.</div>
+    <div>Ako želite prestati dobijati obavještenja za ovu pretragu, <a href="${APP_URL}/odjava/${searchRequestId}">odjavite ovdje</a></div>
      <div>Ako želite pogledati ili promijeniti uslove za ovu pretragu, <a href="${APP_URL}/pregled/${searchRequestId}">pogledajte ovdje</a></div>
      <br/> 
      <strong>Vaš,<br/>Kivi tim</strong>`;
@@ -34,9 +35,13 @@ const generateNotificationEmail = (
 
   const allRealEstatesLink = `${APP_URL}/nekretnine/${searchRequestId}`;
 
+  const emailFrequencyTitle = dailyNotification
+    ? EMAIL_FREQUENCY.DAILY.title
+    : EMAIL_FREQUENCY.ASAP.title;
+
   const realEstateLinks = generateRealEstateLinks(realEstatesToShow);
   const moreRealEstates = `<div>Kompletan spisak nekretnina (${noAllRealEstates}) možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
-  const emailFooter = generateEmailFooter(searchRequestId);
+  const emailFooter = generateEmailFooter(searchRequestId, emailFrequencyTitle);
   const asapMessageBody =
     realEstates.length > 1
       ? "Pronašli smo nekretnine koje odgovaraju Vašoj pretrazi"
@@ -62,6 +67,28 @@ const generateNotificationEmail = (
 
 const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
   const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
+  let adTypeTitle = "";
+  switch (searchRequest.adType) {
+    case AD_TYPE.AD_TYPE_SALE.stringId:
+      adTypeTitle = AD_TYPE.AD_TYPE_SALE.title;
+      break;
+    case AD_TYPE.AD_TYPE_RENT.stringId:
+      adTypeTitle = AD_TYPE.AD_TYPE_RENT.title;
+      break;
+    default:
+      adTypeTitle = "-";
+      break;
+  }
+  let emailFrequencyTitle;
+  switch (searchRequest.emailFrequency) {
+    case EMAIL_FREQUENCY.ASAP.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.ASAP.title;
+      break;
+    case EMAIL_FREQUENCY.DAILY.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.DAILY.title;
+      break;
+  }
+
   const {
     id,
     gardenSizeMin,
@@ -84,13 +111,14 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
     ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
     : ``;
 
-  const emailFooter = generateEmailFooter(id);
+  const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
 
   return `<h3>Zdravo</h3>
   <div>Naručili ste da Vam javimo ako se nekretnina sa navedenim uslovima pojavi u oglasima:</div>
   <br/>
   <div>
     <div><strong>Tip nekretnine: </strong>${realEstateType.title}</div>
+    <div><strong>Vrsta oglasa: </strong>${adTypeTitle}</div>
     <div><strong>Kvadratura nekretnine:</strong> Od ${sizeMin} do ${sizeMax} m2</div>
     ${gardenSize}
     <div><strong>Cijena:</strong> ${priceMin} do ${priceMax} KM</div>

app/migrations/20191118105541-add-additional-fields-to-searchRequests-table.js

@@ -0,0 +1,64 @@
+"use strict";
+const { ACCESS_ROAD_TYPE, HEATING_TYPE } = require("../common/enums");
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.addColumn("SearchRequests", "includeIncompleteAds", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "balcony", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "newBuilding", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "elevator", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfRoomsMin", {
+        type: Sequelize.REAL
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfRoomsMax", {
+        type: Sequelize.REAL
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfFloorsMin", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfFloorsMax", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "floorMin", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "floorMax", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "accessRoadType", {
+        type: Sequelize.TEXT,
+        defaultValue: ACCESS_ROAD_TYPE.ANY.id
+      }),
+      queryInterface.addColumn("SearchRequests", "heatingType", {
+        type: Sequelize.TEXT,
+        defaultValue: HEATING_TYPE.ANY.id
+      })
+    ]);
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.removeColumn("SearchRequests", "includeIncompleteAds"),
+      queryInterface.removeColumn("SearchRequests", "balcony"),
+      queryInterface.removeColumn("SearchRequests", "newBuilding"),
+      queryInterface.removeColumn("SearchRequests", "elevator"),
+      queryInterface.removeColumn("SearchRequests", "numberOfRoomsMin"),
+      queryInterface.removeColumn("SearchRequests", "numberOfRoomsMax"),
+      queryInterface.removeColumn("SearchRequests", "numberOfFloorsMin"),
+      queryInterface.removeColumn("SearchRequests", "numberOfFloorsMax"),
+      queryInterface.removeColumn("SearchRequests", "floorMin"),
+      queryInterface.removeColumn("SearchRequests", "floorMax"),
+      queryInterface.removeColumn("SearchRequests", "accessRoadType"),
+      queryInterface.removeColumn("SearchRequests", "heatingType")
+    ]);
+  }
+};

app/models/searchRequest.js

@@ -69,7 +69,19 @@ module.exports = (sequelize, DataTypes) => {
     },
     deletedEmail: {
       type: DataTypes.TEXT
-    }
+    },
+    includeIncompleteAds: DataTypes.BOOLEAN,
+    balcony: DataTypes.BOOLEAN,
+    elevator: DataTypes.BOOLEAN,
+    newBuilding: DataTypes.BOOLEAN,
+    numberOfRoomsMin: DataTypes.REAL,
+    numberOfRoomsMax: DataTypes.REAL,
+    numberOfFloorsMin: DataTypes.INTEGER,
+    numberOfFloorsMax: DataTypes.INTEGER,
+    floorMin: DataTypes.INTEGER,
+    floorMax: DataTypes.INTEGER,
+    accessRoadType: DataTypes.TEXT,
+    heatingType: DataTypes.TEXT
   });
 
   return SearchRequest;

app/public/main.css

@@ -110,3 +110,51 @@ h3 {
 .collection a.collection-item:not(.active):hover {
   background-color: rgba(2, 173, 186, 0.2);
 }
+
+.tabs .tab a {
+  color: #02adba;
+  -webkit-transition: color 0.28s ease, background-color 0.28s ease;
+  transition: color 0.28s ease, background-color 0.28s ease;
+}
+.tabs .tab a:focus,
+.tabs .tab a:focus.active {
+  background-color: rgba(2, 173, 186, 0.2);
+}
+.tabs .tab a:hover,
+.tabs .tab a.active {
+  color: #02adba;
+}
+.tabs .indicator {
+  background-color: #02adba;
+}
+
+[type="checkbox"].filled-in:checked + span:not(.lever):after {
+  border: 2px solid #02adba;
+  background-color: #02adba;
+}
+[type="checkbox"].filled-in:not(:checked) + span:not(.lever):after {
+  background-color: transparent;
+  border: 2px solid #02adba;
+}
+
+.distinguished {
+  border: 2px solid #02adba;
+  border-radius: 4px;
+  padding: 5px 5px 3px 5px;
+  margin-left: -5px;
+}
+
+.checkbox-label {
+  color: black;
+  font-size: 14px;
+}
+
+.column-label {
+  position: relative;
+  margin-top: 2rem;
+  margin-bottom: 1rem;
+}
+
+.estates-link {
+  color: rgba(0, 0, 0, 0.87);
+}

app/public/segment.css

@@ -25,6 +25,12 @@
   border-right: 1px solid #02adba;
 }
 
+.segmented.small [type="radio"]:not(:checked) + span,
+.segmented.small [type="radio"]:checked + span {
+  padding-left: 7px;
+  padding-right: 7px;
+}
+
 .segmented :last-child .label {
   border-right: none;
 }

app/views/advancedFilters.ejs

@@ -0,0 +1,69 @@
+<br>
+
+<% for (const filter of advancedBooleanFilterObjects){ %>
+  <p>
+    <label class="checkbox-label">
+      <input type="checkbox" class="filled-in" name="<%= filter.dbField %>"
+        <% if (advancedBooleanFilterValues[filter.dbField]) { %>
+          checked
+        <% } %>>
+      <span><%= filter.title %></span>
+    </label>
+  </p>
+<% } %>
+
+<br>
+<% for (const filter of advancedRangeFilterObjects){ %>
+    <div class="row">
+        <p class="column-label col s5 m3 l2">
+            <%= filter.title %>
+        </p>
+        <div class="input-field col s3 m4 l5">
+            <input
+                    id="<%= filter.dbFieldMin %>"
+                    name="<%= filter.dbFieldMin %>"
+                    type="number"
+                    value="<%= advancedRangeFilterValues[filter.dbFieldMin] !== undefined ? advancedRangeFilterValues[filter.dbFieldMin] : ""%>"
+            >
+            <label for="<%= filter.dbFieldMin %>">Od</label>
+        </div>
+        <div class="input-field col s3 m4 l5">
+            <input
+                    id="<%= filter.dbFieldMax %>"
+                    name="<%= filter.dbFieldMax %>"
+                    type="number"
+                    value="<%= advancedRangeFilterValues[filter.dbFieldMax] !== undefined ? advancedRangeFilterValues[filter.dbFieldMax] : ""%>"
+            >
+            <label for="<%= filter.dbFieldMax %>">Do</label>
+        </div>
+    </div>
+<% } %>
+
+<br>
+<% for (const filter of advancedSegmentSelectFilterObjects){ %>
+  <div>
+    <label class="checkbox-label"><%= filter.title %>: </label><br><br>
+    <span class="segmented small">
+      <% for (const segmentObject of filter.values) { %>
+        <label>
+            <input type="radio" name="<%= filter.dbField %>" value="<%= segmentObject.id %>"
+            <% if (advancedSegmentSelectFilterValues[filter.dbField] === segmentObject.id) { %>
+               checked
+            <% } %>>
+            <span class="label"><%= segmentObject.title %></span>
+        </label>
+      <% } %>
+    </span>
+  </div>
+<% } %>
+
+<br>
+<p class="distinguished">
+  <label class="checkbox-label">
+    <input type="checkbox" class="filled-in" name="includeIncompleteAds"
+      <% if (includeIncompleteAds) { %>
+           checked
+      <% } %>>
+    <span>Uključi i oglase bez potpunih informacija</span>
+  </label>
+</p>

app/views/location.ejs

@@ -1,13 +1,17 @@
 <div class="row center-align">
   <h3>
-  Područje na mapi će biti uključeno u pretragu. Namjestite mapu na ulice
-  koje želite da budu vidljive.
+    Područje na mapi će biti uključeno u pretragu. Namjestite mapu na ulice koje
+    želite da budu vidljive.
   </h3>
 </div>
 
 <div class="row center-align">
   <div class="col s12 m12 l12 xl12">
-    <input id="autocompleteInput" placeholder="Unesite grad, naselje ili ulicu..." type="text" />
+    <input
+      id="autocompleteInput"
+      placeholder="Unesite grad, naselje ili ulicu..."
+      type="text"
+    />
   </div>
 </div>
 
@@ -17,12 +21,17 @@
   </div>
 </div>
 
-<br>
+<br />
 
 <form method="POST" id="form-map-output">
   <div class="row center-align">
     <div class="col s6 push-s3">
-      <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">Dalje</a>
+      <a
+        id="submit"
+        href="#"
+        class="welcome-center-button waves-effect waves-light btn"
+        >Dalje</a
+      >
     </div>
   </div>
   <input type="hidden" name="north" id="north" />
@@ -41,15 +50,15 @@
 
   function locateMe() {
     if (navigator.geolocation) {
-
-      function onLocationSuccess (position) {
-        const coordinates = position && position.coords ? position.coords : null;
-        if (coordinates){
+      function onLocationSuccess(position) {
+        const coordinates =
+          position && position.coords ? position.coords : null;
+        if (coordinates) {
           const longitude = coordinates.longitude || null;
           const latitude = coordinates.latitude || null;
 
-          if (longitude && latitude && map){
-            map.setCenter({lat: latitude, lng: longitude});
+          if (longitude && latitude && map) {
+            map.setCenter({ lat: latitude, lng: longitude });
             map.setZoom(16);
           }
         }
@@ -61,20 +70,20 @@
 
   function initMap() {
     const BOSNIA_BOUNDS = {
-      north: 45.70,
+      north: 45.7,
       south: 41.69,
       west: 15.55,
-      east: 20.77,
+      east: 20.77
     };
     const SARAJEVO_COORDINATES = {
       lat: 43.85,
-      lng: 18.41,
+      lng: 18.41
     };
 
-    const mapElement = document.getElementById('map');
+    const mapElement = document.getElementById("map");
     const restrictMapPanningToBosniaOnly = {
       latLngBounds: BOSNIA_BOUNDS,
-      strictBounds: true,
+      strictBounds: true
     };
     const initialMapParams = {
       center: SARAJEVO_COORDINATES,
@@ -87,38 +96,50 @@
     };
     map = new google.maps.Map(mapElement, initialMapParams);
 
-    const inputElement = document.getElementById('autocompleteInput');
-    const restrictAutocompleteResultsToBosniaOnly = {'country': 'ba'};
+    const inputElement = document.getElementById("autocompleteInput");
+    const restrictAutocompleteResultsToBosniaOnly = { country: "ba" };
     const initialAutocompleteParams = {
-      types: ['geocode'],
+      types: ["geocode"],
       componentRestrictions: restrictAutocompleteResultsToBosniaOnly,
-      fields: ['geometry', 'types', 'address_components']
+      fields: ["geometry", "types", "address_components"]
     };
 
-    autocomplete = new google.maps.places.Autocomplete(inputElement, initialAutocompleteParams);
-    autocomplete.bindTo('bounds', map);
-    autocomplete.addListener('place_changed', onPlaceChanged);
+    autocomplete = new google.maps.places.Autocomplete(
+      inputElement,
+      initialAutocompleteParams
+    );
+    autocomplete.bindTo("bounds", map);
+    autocomplete.addListener("place_changed", onPlaceChanged);
     pacSelectFirst(inputElement);
     addLocateMeButton(map);
+
+    //After map initialization we check if area is already selected
+    //If yes we bound map to show already selected area
+    const boundsSelected = <%- boundsSelected %>;
+    const selectedLatLngBounds = <%- JSON.stringify(selectedLatLngBounds) %>;
+
+    if (boundsSelected) {
+      boundMapToSelected(map, selectedLatLngBounds);
+    }
   }
 
   function addLocateMeButton(map) {
-    var parent = document.createElement('div');
+    var parent = document.createElement("div");
     parent.className = "locate-me-container";
 
-    var a = document.createElement('a');
+    var a = document.createElement("a");
     a.id = "locateMe";
     a.className = "btn-floating";
 
-    var i = document.createElement('i');
+    var i = document.createElement("i");
     i.innerText = "gps_fixed";
     i.className = "material-icons right";
 
-    a.appendChild(i)
+    a.appendChild(i);
     a.addEventListener("click", locateMe);
-    parent.appendChild(a)
+    parent.appendChild(a);
 
-    map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(parent)
+    map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(parent);
   }
 
   function onPlaceChanged() {
@@ -133,33 +154,49 @@
   function pacSelectFirst(input) {
     // store the original event binding function
     const _addEventListener = input.addEventListener
-            ? input.addEventListener
-            : input.attachEvent
+      ? input.addEventListener
+      : input.attachEvent;
 
-    function addEventListenerWrapper (type, listener) {
+    function addEventListenerWrapper(type, listener) {
       // Simulate a 'down arrow' keypress on hitting 'return' when no pac suggestion is selected,
       // and then trigger the original listener.
-      if (type == 'keydown') {
-        const originalListener = listener
-        listener = function (event) {
-          const suggestionSelected = $('.pac-item-selected').length > 0
-          if (event.key == 'Enter' && !suggestionSelected) {
-            const simulatedDownArrow = $.Event('keydown', {
+      if (type == "keydown") {
+        const originalListener = listener;
+        listener = function(event) {
+          const suggestionSelected = $(".pac-item-selected").length > 0;
+          if (event.key == "Enter" && !suggestionSelected) {
+            const simulatedDownArrow = $.Event("keydown", {
               keyCode: 40,
               which: 40
-            })
-            originalListener.apply(input, [simulatedDownArrow])
+            });
+            originalListener.apply(input, [simulatedDownArrow]);
           }
 
-          originalListener.apply(input, [event])
-        }
+          originalListener.apply(input, [event]);
+        };
       }
 
-      _addEventListener.apply(input, [type, listener])
+      _addEventListener.apply(input, [type, listener]);
     }
 
-    input.addEventListener = addEventListenerWrapper
-    input.attachEvent = addEventListenerWrapper
+    input.addEventListener = addEventListenerWrapper;
+    input.attachEvent = addEventListenerWrapper;
+  }
+  function boundMapToSelected(map, selectedLatLngBounds) {
+
+    const swBound = new google.maps.LatLng(
+      selectedLatLngBounds.swLat,
+      selectedLatLngBounds.swLng
+    );
+    const neBound = new google.maps.LatLng(
+      selectedLatLngBounds.neLat,
+      selectedLatLngBounds.neLng
+    );
+    let bounds = new google.maps.LatLngBounds();
+    bounds.extend(swBound);
+    bounds.extend(neBound);
+
+    map.fitBounds(bounds);
   }
 
   $(document).ready(function() {
@@ -171,11 +208,16 @@
       $("#east").val(mapBounds.getNorthEast().lng());
       $("#west").val(mapBounds.getSouthWest().lng());
 
-      $("#locationInput").val(document.getElementById('autocompleteInput').value);
+      $("#locationInput").val(
+        document.getElementById("autocompleteInput").value
+      );
 
       $("#form-map-output").submit();
     });
   });
 </script>
-<script src="https://maps.googleapis.com/maps/api/js?key=<%= process.env.API_MAP_KEY %>&language=bs&libraries=places&callback=initMap" async
-  defer></script>
+<script
+  src="https://maps.googleapis.com/maps/api/js?key=<%= process.env.API_MAP_KEY %>&language=bs&libraries=places&callback=initMap"
+  async
+  defer
+></script>

app/views/realEstateFilters.ejs

@@ -1,63 +1,20 @@
+<br>
 <form id="filtersForm" method="POST">
-  <br>
-
-  <div class="row center-align">
-    <h5>Cijena</h5>
-    <br><br>
-    <div class="center-align no-ui-slider" id="priceFilter"></div>
-  </div>
-
-  <br>
   <div class="row">
-    <div class="col s5 m3 l3 push-m1 push-l2">
-      <input class="sliderInputBox" type="number" id="priceMin" name="priceMin">
-
+    <div class="col s12">
+      <ul class="tabs">
+        <li class="tab col s6"><a href="#standardFilters">Filteri</a></li>
+        <li class="tab col s6"><a href="#advancedFilters">Napredni filteri</a></li>
+      </ul>
     </div>
-    <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-      <input class="sliderInputBox" type="number" id="priceMax" name="priceMax">
+    <div id="standardFilters" class="col s12">
+      <%- include("./standardFilters.ejs") %>
+    </div>
+    <div id="advancedFilters" class="col s12">
+      <%- include("./advancedFilters.ejs") %>
     </div>
   </div>
 
-  <br>
-
-  <div class="row center-align">
-    <h5>Površina</h5>
-    <br><br>
-    <div class="center-align no-ui-slider" id="sizeFilter"></div>
-  </div>
-
-  <br>
-  <div class="row">
-    <div class="col s5 m3 l3 push-m1 push-l2">
-      <input class="sliderInputBox" type="number" id="sizeMin" name="sizeMin">
-
-    </div>
-    <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-      <input class="sliderInputBox" type="number" id="sizeMax" name="sizeMax">
-    </div>
-  </div>
-
-  <br>
-
-  <% if(hasGardenSize) { %>
-    <div class="row center-align">
-      <h5>Površina okućnice</h5>
-      <br><br>
-      <div class="center-align no-ui-slider" id="gardenSizeFilter"></div>
-    </div>
-
-    <br>
-    <div class="row">
-      <div class="col s5 m3 l3 push-m1 push-l2">
-        <input class="sliderInputBox" type="number" id="gardenSizeMin" name="gardenSizeMin">
-
-      </div>
-      <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-        <input class="sliderInputBox" type="number" id="gardenSizeMax" name="gardenSizeMax">
-      </div>
-    </div>
-  <% } %>
-
   <div class="row">
     <div class="col s6 push-s3">
       <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">Dalje</a>
@@ -66,125 +23,7 @@
 </form>
 
 <script>
-  $(document).ready(function() {
-    const priceSliderOptions = <%- priceSliderOptions %>;
-    const sizeSliderOptions = <%- sizeSliderOptions %>;
-    const priceStep = priceSliderOptions.step;
-    const sizeStep = sizeSliderOptions.step;
-    delete priceSliderOptions.step;
-    delete sizeSliderOptions.step;
-
-    function updatePriceInputs(values, handle, unencoded) {
-      $("#priceMin").val(Math.round(unencoded[0]/priceStep)*priceStep);
-      $("#priceMax").val(Math.round(unencoded[1]/priceStep)*priceStep);
-    }
-    function updateSizeInputs(values, handle, unencoded) {
-      $("#sizeMin").val(Math.round(unencoded[0]/sizeStep)*sizeStep);
-      $("#sizeMax").val(Math.round(unencoded[1]/sizeStep)*sizeStep);
-    }
-
-    const priceSlider = document.getElementById("priceFilter");
-    const sizeSlider = document.getElementById("sizeFilter");
-
-    const priceSliderObject = noUiSlider.create(priceSlider, priceSliderOptions);
-    const sizeSliderObject = noUiSlider.create(sizeSlider, sizeSliderOptions);
-
-    priceSliderObject.on('slide', updatePriceInputs);
-    sizeSliderObject.on('slide', updateSizeInputs);
-
-    function priceMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = priceSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        priceSliderObject.set([fixedNewValue, null]);
-        $("#priceMin").val(Math.round(priceSliderObject.get()[0]));
-      }
-    }
-    function priceMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        priceSliderObject.set([null, newValue]);
-        $("#priceMax").val(Math.round(priceSliderObject.get()[1]));
-      }
-    }
-    $("#priceMin").val(priceSliderOptions.start[0]);
-    $("#priceMax").val(priceSliderOptions.start[1]);
-    $("#priceMin").change(priceMinChangeHandler);
-    $("#priceMax").change(priceMaxChangeHandler);
-
-    function sizeMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = sizeSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        sizeSliderObject.set([fixedNewValue, null]);
-        $("#sizeMin").val(Math.round(sizeSliderObject.get()[0]));
-      }
-    }
-    function sizeMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        sizeSliderObject.set([null, newValue]);
-        $("#sizeMax").val(Math.round(sizeSliderObject.get()[1]));
-      }
-    }
-    $("#sizeMin").val(sizeSliderOptions.start[0]);
-    $("#sizeMax").val(sizeSliderOptions.start[1]);
-    $("#sizeMin").change(sizeMinChangeHandler);
-    $("#sizeMax").change(sizeMaxChangeHandler);
-
-    <% if(hasGardenSize) { %>
-    const gardenSizeSliderOptions = <%- gardenSizeSliderOptions %>;
-    const gardenSizeStep = gardenSizeSliderOptions.step;
-    delete gardenSizeSliderOptions.step;
-
-    function updateGardenSizeInputs(values, handle, unencoded) {
-      $("#gardenSizeMin").val(Math.round(unencoded[0]/gardenSizeStep)*gardenSizeStep);
-      $("#gardenSizeMax").val(Math.round(unencoded[1]/gardenSizeStep)*gardenSizeStep);
-    }
-
-    const gardenSizeSlider = document.getElementById("gardenSizeFilter");
-    const gardenSizeSliderObject = noUiSlider.create(gardenSizeSlider, gardenSizeSliderOptions);
-    gardenSizeSliderObject.on('slide', updateGardenSizeInputs);
-    function gardenSizeMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = gardenSizeSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        gardenSizeSliderObject.set([fixedNewValue, null]);
-        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
-      }
-    }
-    function gardenSizeMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        gardenSizeSliderObject.set([null, newValue]);
-        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
-      }
-    }
-    $("#gardenSizeMin").val(gardenSizeSliderOptions.start[0]);
-    $("#gardenSizeMax").val(gardenSizeSliderOptions.start[1]);
-    $("#gardenSizeMin").change("step", gardenSizeMinChangeHandler);
-    $("#gardenSizeMax").change("step", gardenSizeMaxChangeHandler);
-    <% } %>
-
-    $("#submit").click(function() {
-      const priceFilterValues = priceSlider.noUiSlider.get();
-      $("#priceFilterMin").val(priceFilterValues[0]);
-      $("#priceFilterMax").val(priceFilterValues[1]);
-
-      const sizeFilterValues = sizeSlider.noUiSlider.get();
-      $("#sizeFilterMin").val(sizeFilterValues[0]);
-      $("#sizeFilterMax").val(sizeFilterValues[1]);
-
-      <% if (hasGardenSize) { %>
-        const gardenSizeFilterValues = gardenSizeSlider.noUiSlider.get();
-        $("#gardenSizeFilterMin").val(gardenSizeFilterValues[0]);
-        $("#gardenSizeFilterMax").val(gardenSizeFilterValues[1]);
-      <% } %>
-
-      $("#filtersForm").submit();
-    });
+  $(document).ready(function(){
+    $('.tabs').tabs();
   });
 </script>

app/views/realEstates.ejs

@@ -1,13 +1,29 @@
 <div class="row center-align">
-    <ul class="collection with-header">
-      <% for(const realEstate of realEstates) { %>
-      <li class="collection-item">
-        <div><%= realEstate.title %>
-          <a href="<%= realEstate.url %>" class="kivi-color secondary-content">
+  <ul class="collection with-header">
+    <% for(const realEstate of realEstates) { %>
+    <li class="collection-item">
+      <% if(realEstate.adStatus === AD_STATUS.STATUS_VIP) {%>
+      <div>
+        <% //This needs to do redirecting instead of direct link to realestate
+        %>
+        <a href="/redirect/<%= realEstate.id %>" class="estates-link">
+          <%= realEstate.title %>
+          <div class="kivi-color secondary-content">
             <i class="material-icons">send</i>
-          </a>
-        </div>
-      </li>
-      <% } %>
-    </ul>
-  </div>
+          </div>
+        </a>
+      </div>
+      <%} else { %>
+      <div>
+        <a href="<%= realEstate.url %>" class="estates-link">
+          <%= realEstate.title %>
+          <div class="kivi-color secondary-content">
+            <i class="material-icons">send</i>
+          </div>
+        </a>
+      </div>
+      <% }%>
+    </li>
+    <% } %>
+  </ul>
+</div>

app/views/redirect.ejs

@@ -1,26 +1,49 @@
-<br><br>
+<br /><br />
 <div class="center">
-    <div class="preloader-wrapper big active center">
-        <div class="kivi-spinner-color spinner-layer spinner-green-only">
-            <div class="circle-clipper left">
-                <div class="circle"></div>
-            </div><div class="gap-patch">
-                <div class="circle"></div>
-            </div><div class="circle-clipper right">
-                <div class="circle"></div>
-            </div>
-        </div>
+  <div class="preloader-wrapper big active center">
+    <div class="kivi-spinner-color spinner-layer spinner-green-only">
+      <div class="circle-clipper left">
+        <div class="circle"></div>
+      </div>
+      <div class="gap-patch">
+        <div class="circle"></div>
+      </div>
+      <div class="circle-clipper right">
+        <div class="circle"></div>
+      </div>
     </div>
+  </div>
 </div>
 
-<br>
+<br />
+<% if(vipAd) { %>
 <div class="center">
-    <h6>
-        <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl">Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a>
-    </h6>
+  <h6>
+    Ovaj oglas zahtijeva da budete član
+    <a href="https://prostor.ba/" rel="noreferrer">Prostor.ba</a>.
+    <br />
+    <br />
+    <a href="https://prostor.ba/moj-prostor/prijava" rel="noreferrer"
+      >Ulogujte se</a
+    >
+    ili napravite
+    <a href="https://prostor.ba/moj-prostor/registracija" rel="noreferrer"
+      >novi račun</a
+    >, a potom otvorite <a href="<%= redirectUrl %>" rel="noreferrer">oglas</a>.
+  </h6>
 </div>
+<% } else { %>
+<div class="center">
+  <h6>
+    <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl"
+      >Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a
+    >
+  </h6>
+</div>
+<% }%>
+
 <script>
-    window.onload = function() {
-        document.getElementById('realEstateUrl').click();
-    }
+  window.onload = function() {
+    document.getElementById("realEstateUrl").click();
+  };
 </script>

app/views/standardFilters.ejs

@@ -0,0 +1,195 @@
+<br />
+
+<div class="row center-align">
+  <h5>Cijena (KM)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="priceFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input class="sliderInputBox" type="number" id="priceMin" name="priceMin" />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input class="sliderInputBox" type="number" id="priceMax" name="priceMax" />
+  </div>
+</div>
+
+<br />
+
+<div class="row center-align">
+  <h5>Površina (m<sup>2</sup>)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="sizeFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input class="sliderInputBox" type="number" id="sizeMin" name="sizeMin" />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input class="sliderInputBox" type="number" id="sizeMax" name="sizeMax" />
+  </div>
+</div>
+
+<br />
+
+<% if(hasGardenSize) { %>
+<div class="row center-align">
+  <h5>Površina okućnice (m<sup>2</sup>)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="gardenSizeFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input
+      class="sliderInputBox"
+      type="number"
+      id="gardenSizeMin"
+      name="gardenSizeMin"
+    />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input
+      class="sliderInputBox"
+      type="number"
+      id="gardenSizeMax"
+      name="gardenSizeMax"
+    />
+  </div>
+</div>
+<% } %>
+
+<script>
+  $(document).ready(function() {
+    const priceSliderOptions = <%- priceSliderOptions %>;
+    const sizeSliderOptions = <%- sizeSliderOptions %>;
+    const priceStep = priceSliderOptions.step;
+    const sizeStep = sizeSliderOptions.step;
+    delete priceSliderOptions.step;
+    delete sizeSliderOptions.step;
+
+    function updatePriceInputs(values, handle, unencoded) {
+      $("#priceMin").val(Math.round(unencoded[0]/priceStep)*priceStep);
+      $("#priceMax").val(Math.round(unencoded[1]/priceStep)*priceStep);
+    }
+    function updateSizeInputs(values, handle, unencoded) {
+      $("#sizeMin").val(Math.round(unencoded[0]/sizeStep)*sizeStep);
+      $("#sizeMax").val(Math.round(unencoded[1]/sizeStep)*sizeStep);
+    }
+
+    const priceSlider = document.getElementById("priceFilter");
+    const sizeSlider = document.getElementById("sizeFilter");
+
+    const priceSliderObject = noUiSlider.create(priceSlider, priceSliderOptions);
+    const sizeSliderObject = noUiSlider.create(sizeSlider, sizeSliderOptions);
+
+    priceSliderObject.on('slide', updatePriceInputs);
+    sizeSliderObject.on('slide', updateSizeInputs);
+
+    function priceMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = priceSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        priceSliderObject.set([fixedNewValue, null]);
+        $("#priceMin").val(Math.round(priceSliderObject.get()[0]));
+      }
+    }
+    function priceMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        priceSliderObject.set([null, newValue]);
+        $("#priceMax").val(Math.round(priceSliderObject.get()[1]));
+      }
+    }
+    $("#priceMin").val(priceSliderOptions.start[0]);
+    $("#priceMax").val(priceSliderOptions.start[1]);
+    $("#priceMin").change(priceMinChangeHandler);
+    $("#priceMax").change(priceMaxChangeHandler);
+
+    function sizeMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = sizeSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        sizeSliderObject.set([fixedNewValue, null]);
+        $("#sizeMin").val(Math.round(sizeSliderObject.get()[0]));
+      }
+    }
+    function sizeMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        sizeSliderObject.set([null, newValue]);
+        $("#sizeMax").val(Math.round(sizeSliderObject.get()[1]));
+      }
+    }
+    $("#sizeMin").val(sizeSliderOptions.start[0]);
+    $("#sizeMax").val(sizeSliderOptions.start[1]);
+    $("#sizeMin").change(sizeMinChangeHandler);
+    $("#sizeMax").change(sizeMaxChangeHandler);
+
+    <% if(hasGardenSize) { %>
+    const gardenSizeSliderOptions = <%- gardenSizeSliderOptions %>;
+    const gardenSizeStep = gardenSizeSliderOptions.step;
+    delete gardenSizeSliderOptions.step;
+
+    function updateGardenSizeInputs(values, handle, unencoded) {
+      $("#gardenSizeMin").val(Math.round(unencoded[0]/gardenSizeStep)*gardenSizeStep);
+      $("#gardenSizeMax").val(Math.round(unencoded[1]/gardenSizeStep)*gardenSizeStep);
+    }
+
+    const gardenSizeSlider = document.getElementById("gardenSizeFilter");
+    const gardenSizeSliderObject = noUiSlider.create(gardenSizeSlider, gardenSizeSliderOptions);
+    gardenSizeSliderObject.on('slide', updateGardenSizeInputs);
+    function gardenSizeMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = gardenSizeSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        gardenSizeSliderObject.set([fixedNewValue, null]);
+        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
+      }
+    }
+    function gardenSizeMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        gardenSizeSliderObject.set([null, newValue]);
+        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
+      }
+    }
+    $("#gardenSizeMin").val(gardenSizeSliderOptions.start[0]);
+    $("#gardenSizeMax").val(gardenSizeSliderOptions.start[1]);
+    $("#gardenSizeMin").change("step", gardenSizeMinChangeHandler);
+    $("#gardenSizeMax").change("step", gardenSizeMaxChangeHandler);
+    <% } %>
+
+    $("#submit").click(function() {
+      const priceFilterValues = priceSlider.noUiSlider.get();
+      $("#priceFilterMin").val(priceFilterValues[0]);
+      $("#priceFilterMax").val(priceFilterValues[1]);
+
+      const sizeFilterValues = sizeSlider.noUiSlider.get();
+      $("#sizeFilterMin").val(sizeFilterValues[0]);
+      $("#sizeFilterMax").val(sizeFilterValues[1]);
+
+      <% if (hasGardenSize) { %>
+        const gardenSizeFilterValues = gardenSizeSlider.noUiSlider.get();
+        $("#gardenSizeFilterMin").val(gardenSizeFilterValues[0]);
+        $("#gardenSizeFilterMax").val(gardenSizeFilterValues[1]);
+      <% } %>
+
+      $("#filtersForm").submit();
+    });
+  });
+</script>

development.env

@@ -51,6 +51,8 @@ PROSTOR_CRAWLER_AD_CATEGORIES=comma separated list of enum names of categories t
 PROSTOR_IGNORED_USERNAMES=!!! This is not used for prostor crawler !!!
 PROSTOR_DELAY_BETWEEN_PAGES=!!! This is not used for prostor crawler !!!
 PROSTOR_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found
+PROSTOR_LOGIN_EMAIL=Email of valid Prostor.ba account for crawling purposes
+PROSTOR_LOGIN_PASS=Password of valid Prostor.ba account for crawling purposes
 #==AKTIDO==
 AKTIDO_MAX_PAGES=Restrict crawler to this number of pages
 AKTIDO_MAX_RESULTS_PER_PAGE=Only this number or less results from one page will be scraped and saved

package-lock.json

@@ -1052,6 +1052,14 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
+    "eslint-plugin-prettier": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz",
+      "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==",
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -1271,6 +1279,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -1333,13 +1346,23 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        }
       }
     },
     "forwarded": {
@@ -3179,6 +3202,19 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "prettier": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -3404,6 +3440,18 @@
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        }
       }
     },
     "require-directory": {

package.json

@@ -35,15 +35,18 @@
     "compression": "^1.7.4",
     "dotenv": "^7.0.0",
     "ejs": "^2.6.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "express": "^4.16.4",
     "express-ejs-layouts": "^2.5.0",
     "express-layout": "^0.1.0",
+    "form-data": "^3.0.0",
     "html-to-text": "^5.1.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.26",
     "node-fetch": "^2.3.0",
     "node-schedule": "^1.3.2",
     "pg": "^7.10.0",
+    "prettier": "^1.19.1",
     "react-step-wizard": "^5.1.0",
     "sequelize": "^5.18.4",
     "sequelize-cli": "^5.5.0"