From 53585d3ae1baf8f768494bd8f89ce1e72fd172c0 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Sun, 19 May 2019 02:14:20 +0200 Subject: [PATCH] use enums from enum file --- app/controllers/gardenSizes.js | 10 +------- app/controllers/prices.js | 10 +------- app/controllers/realEstateTypes.js | 7 +----- app/controllers/sizes.js | 10 +------- app/helpers/enums.js | 39 ++++++++++++++++++++++++++++++ app/views/gardenSize.ejs | 2 +- app/views/price.ejs | 2 +- app/views/realEstateType.ejs | 2 +- app/views/size.ejs | 2 +- 9 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 app/helpers/enums.js diff --git a/app/controllers/gardenSizes.js b/app/controllers/gardenSizes.js index ef98bfc..a449230 100644 --- a/app/controllers/gardenSizes.js +++ b/app/controllers/gardenSizes.js @@ -1,13 +1,5 @@ const { currentRERequest } = require('../helpers/url'); - -const gardenSizes = [ - { name: "do 100 m2", id: "100m2" }, - { name: "do 500 m2", id: "500m2" }, - { name: "do 1 dunum", id: "1000m2" }, - { name: "do 2 dunuma", id: "2000m2" }, - { name: "do 3 dunuma", id: "3000m2" }, - { name: "preko 3 dunuma", id: "moreThan3000m2" } -]; +const { gardenSizes } = require('../helpers/enums'); const getGardenSize = (req,res) => { const nextStep = req.query.nextStep; diff --git a/app/controllers/prices.js b/app/controllers/prices.js index 640f8f8..1d8fcb9 100644 --- a/app/controllers/prices.js +++ b/app/controllers/prices.js @@ -1,13 +1,5 @@ const { currentRERequest } = require('../helpers/url'); - -const prices = [ - { name: "do 50 000 KM", id: "50kKM" }, - { name: "do 100 000 KM", id: "100kKM" }, - { name: "do 150 000 KM", id: "150kKM" }, - { name: "do 200 000 KM", id: "200kKM" }, - { name: "do 250 000 KM", id: "250kKM" }, - { name: "preko 250 000 KM", id: "moreThan250kKM" } -]; +const { prices } = require('../helpers/enums'); const getPrice = (req,res) => { const nextStep = req.query.nextStep; diff --git a/app/controllers/realEstateTypes.js b/app/controllers/realEstateTypes.js index 125cb5f..2d66170 100644 --- a/app/controllers/realEstateTypes.js +++ b/app/controllers/realEstateTypes.js @@ -1,10 +1,5 @@ const db = require('../models/index'); - -const realEstateTypes = [ - { ime: "Kuća", id: "kuca" }, - { ime: "Stan", id: "stan" }, - { ime: "Vikendica", id: "vikendica" } -]; +const { realEstateTypes } = require('../helpers/enums'); const getRealEstateTypes = (req,res) => { const nextStep = req.query.nextStep; diff --git a/app/controllers/sizes.js b/app/controllers/sizes.js index 66a47bd..d75dac9 100644 --- a/app/controllers/sizes.js +++ b/app/controllers/sizes.js @@ -1,13 +1,5 @@ const { currentRERequest } = require('../helpers/url'); - -const sizes = [ - { name: "do 50 m2", id: "50m2" }, - { name: "do 75 m2", id: "70m2" }, - { name: "do 100 m2", id: "100m2" }, - { name: "do 150 m2", id: "150m2" }, - { name: "do 200 m2", id: "200m2" }, - { name: "preko 200 m2", id: "moreThan200m2" } -]; +const { sizes } = require('../helpers/enums'); const getSize = (req,res) => { const nextStep = req.query.nextStep; diff --git a/app/helpers/enums.js b/app/helpers/enums.js new file mode 100644 index 0000000..b4d5da2 --- /dev/null +++ b/app/helpers/enums.js @@ -0,0 +1,39 @@ +const realEstateTypes = [ + { title: "Kuća", id: "kuca" }, + { title: "Stan", id: "stan" }, + { title: "Vikendica", id: "vikendica" } +]; + +const sizes = [ + { title: "do 50 m2", id: "50m2" }, + { title: "do 75 m2", id: "75m2" }, + { title: "do 100 m2", id: "100m2" }, + { title: "do 150 m2", id: "150m2" }, + { title: "do 200 m2", id: "200m2" }, + { title: "preko 200 m2", id: "moreThan200m2" } +]; + +const gardenSizes = [ + { title: "do 100 m2", id: "100m2" }, + { title: "do 500 m2", id: "500m2" }, + { title: "do 1 dunum", id: "1000m2" }, + { title: "do 2 dunuma", id: "2000m2" }, + { title: "do 3 dunuma", id: "3000m2" }, + { title: "preko 3 dunuma", id: "moreThan3000m2" } +]; + +const prices = [ + { title: "do 50 000 KM", id: "50kKM" }, + { title: "do 100 000 KM", id: "100kKM" }, + { title: "do 150 000 KM", id: "150kKM" }, + { title: "do 200 000 KM", id: "200kKM" }, + { title: "do 250 000 KM", id: "250kKM" }, + { title: "preko 250 000 KM", id: "moreThan250kKM" } +]; + +module.exports = { + realEstateTypes, + sizes, + gardenSizes, + prices +}; diff --git a/app/views/gardenSize.ejs b/app/views/gardenSize.ejs index 7404bd2..1c541cc 100644 --- a/app/views/gardenSize.ejs +++ b/app/views/gardenSize.ejs @@ -8,7 +8,7 @@