Merge branch 'master' into 'add-more-real-estate-filters'

# Conflicts: # app/views/standardFilters.ejs
include new fields for search request
2020-01-10 18:28:03 +00:00 · 2019-12-16 22:22:12 +01:00 · 2019-12-16 22:22:12 +01:00 · 2019-12-16 22:22:12 +01:00 · 2019-12-16 22:22:12 +01:00 · 2019-12-16 22:22:12 +01:00
1 changed files with 16 additions and 95 deletions
--- a/app/common/enums.js
+++ b/app/common/enums.js
@@ -7,42 +7,7 @@ const PRICE_SLIDER_OPTIONS_SALE = {
  step: 1000,
  connect: true
 };
-const FLAT_PRICE_SLIDER_OPTIONS_SALE = {
-  start: [50000, 150000],
-  range: {
-    min: [0],
-    max: [800000]
-  },
-  step: 5000,
-  connect: true
-};
-const HOUSE_PRICE_SLIDER_OPTIONS_SALE = {
-  start: [50000, 150000],
-  range: {
-    min: [0],
-    max: [1500000]
-  },
-  step: 10000,
-  connect: true
-};
-const OFFICE_PRICE_SLIDER_OPTIONS_SALE = {
-  start: [15000, 50000],
-  range: {
-    min: [0],
-    max: [2000000]
-  },
-  step: 2000,
-  connect: true
-};
-const LAND_PRICE_SLIDER_OPTIONS_SALE = {
-  start: [40000, 80000],
-  range: {
-    min: [0],
-    max: [2000000]
-  },
-  step: 10000,
-  connect: true
-};
+
 const PRICE_SLIDER_OPTIONS_RENT = {
  start: [300, 500],
  range: {
@@ -52,62 +17,18 @@ const PRICE_SLIDER_OPTIONS_RENT = {
  step: 50,
  connect: true
 };
-const FLAT_PRICE_SLIDER_OPTIONS_RENT = {
-  start: [300, 600],
-  range: {
-    min: [0],
-    max: [4000]
-  },
-  step: 100,
-  connect: true
-};
-const HOUSE_PRICE_SLIDER_OPTIONS_RENT = {
-  start: [500, 1000],
-  range: {
-    min: [0],
-    max: [10000]
-  },
-  step: 100,
-  connect: true
-};
-const OFFICE_PRICE_SLIDER_OPTIONS_RENT = {
-  start: [200, 1000],
-  range: {
-    min: [0],
-    max: [20000]
-  },
-  step: 100,
-  connect: true
-};
-const LAND_PRICE_SLIDER_OPTIONS_RENT = {
-  start: [500, 1000],
-  range: {
-    min: [0],
-    max: [20000]
-  },
-  step: 100,
-  connect: true
-};
+
 //This will be used for Flats, Apartments, Houses
 const HOME_SIZE_SLIDER_OPTIONS = {
  start: [30, 75],
  range: {
    min: [0],
-    max: [500]
+    max: [400]
  },
  step: 5,
  connect: true
 };

-const OFFICE_SIZE_SLIDER_OPTIONS = {
-  start: [30, 150],
-  range: {
-    min: [0],
-    max: [1200]
-  },
-  step: 10,
-  connect: true
-};
 const GARDEN_SIZE_SLIDER_OPTIONS = {
  start: [100, 1000],
  range: {
@@ -190,8 +111,8 @@ const AD_CATEGORY = {
    hasNumberOfRoom: true,
    hasNumberOfFloors: false,
    hasFloorProp: true,
-    priceSliderOptionsSale: FLAT_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: FLAT_PRICE_SLIDER_OPTIONS_RENT,
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
  },
  HOUSE: {
@@ -205,8 +126,8 @@ const AD_CATEGORY = {
    hasNumberOfRoom: true,
    hasNumberOfFloors: true,
    hasFloorProp: false,
-    priceSliderOptionsSale: HOUSE_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: HOUSE_PRICE_SLIDER_OPTIONS_RENT,
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
    gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
  },
@@ -221,9 +142,9 @@ const AD_CATEGORY = {
    hasNumberOfRoom: true,
    hasNumberOfFloors: false,
    hasFloorProp: true,
-    priceSliderOptionsSale: OFFICE_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: OFFICE_PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: OFFICE_SIZE_SLIDER_OPTIONS
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
+    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
  },
  LAND: {
    id: "LAND",
@@ -236,8 +157,8 @@ const AD_CATEGORY = {
    hasNumberOfRoom: false,
    hasNumberOfFloors: false,
    hasFloorProp: false,
-    priceSliderOptionsSale: LAND_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: LAND_PRICE_SLIDER_OPTIONS_RENT,
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
    sizeSliderOptions: LAND_SIZE_SLIDER_OPTIONS
  },
  APARTMENT: {
@@ -251,8 +172,8 @@ const AD_CATEGORY = {
    hasNumberOfRoom: true,
    hasNumberOfFloors: false,
    hasFloorProp: true,
-    priceSliderOptionsSale: FLAT_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: FLAT_PRICE_SLIDER_OPTIONS_RENT,
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
  },
  GARAGE: {
@@ -281,8 +202,8 @@ const AD_CATEGORY = {
    hasNumberOfRoom: true,
    hasNumberOfFloors: true,
    hasFloorProp: false,
-    priceSliderOptionsSale: HOUSE_PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: HOUSE_PRICE_SLIDER_OPTIONS_RENT,
+    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
    gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
  }
Author	SHA1	Message	Date
Naida Vatric	756a233a49	Merge branch 'master' into 'add-more-real-estate-filters' # Conflicts: # app/views/standardFilters.ejs	2020-01-10 18:28:03 +00:00
Bilal Catic	a7855a3de6	include new fields for search request	2019-12-16 22:22:12 +01:00
Bilal Catic	9e3ca6c621	improve css	2019-12-16 22:22:12 +01:00
Bilal Catic	e60e818952	add new enum value for access road type and heating type; add filter enums	2019-12-16 22:22:12 +01:00
Bilal Catic	e6054824a6	add new fields to the search request table and model	2019-12-16 22:22:12 +01:00
Bilal Catic	cb175595db	specify and use custom css class for checkbox labels	2019-12-16 22:22:12 +01:00
Bilal Catic	3157973552	add more filters to different tab on filters page; update css	2019-12-16 22:22:12 +01:00
Bilal Catic	5ff10fc62d	modify materialize tabs style to match Kivi color scheme	2019-12-16 22:22:12 +01:00
Bilal Catic	5e0de499e8	remove accordion files and import	2019-12-16 22:22:12 +01:00
Bilal Catic	851fef45b0	add accordion for additional filters	2019-12-16 22:22:12 +01:00