senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

apply prettier on all files

Browse Source
This commit is contained in:
Bilal Catic
2019-09-05 11:14:54 +02:00
parent 719cf4d8f9
commit 60e618fd22
45 changed files with 1749 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/controllers/gardenSizes.js
View File

@@ -1,32 +1,31 @@
const { currentRERequest } = require('../helpers/url');
const { getRealEstateTypeEnum } = require('../helpers/enums');
const { currentRERequest } = require("../helpers/url");
const { getRealEstateTypeEnum } = require("../helpers/enums");
const getGardenSize = (req,res) => {
const getGardenSize = (req, res) => {
const title = "Koliko okućnice tražite ?";
const title = "Koliko okućnice tražite ?"
const unit = " m2"
const unit = " m2";
const rangeFrom = {
min : 10,
max : 3000,
value : 0,
step : 10
}
min: 10,
max: 3000,
value: 0,
step: 10
};
const rangeTo = {
min : 10,
max : 3000,
value : 100,
step : 10
}
min: 10,
max: 3000,
value: 100,
step: 10
};
res.render('gardenSize', { rangeFrom, rangeTo, unit, title });
res.render("gardenSize", { rangeFrom, rangeTo, unit, title });
};
const postGardenSize = async (req, res) => {
const request = await currentRERequest(req);
const nextStepPage = req.query.nextStep || 'cijena';
const nextStepPage = req.query.nextStep || "cijena";
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
const realEstateType = getRealEstateTypeEnum(request.realEstateType);

4
app/controllers/goAgain.js
View File

@@ -1,6 +1,6 @@
const getGoAgain = async (req,res) => {
const getGoAgain = async (req, res) => {
const title = "Želite li pretražiti još jednu nekretninu ?";
res.render('goAgain', {title});
res.render("goAgain", { title });
};
module.exports = {

22
app/controllers/municipalities.js
View File

@@ -1,20 +1,26 @@
const { currentRERequest } = require('../helpers/url');
const { getMunicipalitiesForRegion, getMunicipalityName } = require('../helpers/codes');
const { currentRERequest } = require("../helpers/url");
const {
getMunicipalitiesForRegion,
getMunicipalityName
} = require("../helpers/codes");
const getMunicipality = async (req, res) => {
const title = "U kojem mjestu tražite nekretninu?"
const title = "U kojem mjestu tražite nekretninu?";
let request = await currentRERequest(req);
const municipalities = getMunicipalitiesForRegion(request.region);
res.render('municipality', { municipalities, title });
res.render("municipality", { municipalities, title });
};
const postMunicipality = async (req, res) => {
const request = await currentRERequest(req);
const nextStepParam = req.query.nextStep ? "?nextStep=" + req.query.nextStep : "";
const nextStepUrl = `/${'naselje'}/${request.uniqueId}/${getMunicipalityName(request.region, req.body.municipality)}${nextStepParam}`;
const nextStepParam = req.query.nextStep
? "?nextStep=" + req.query.nextStep
: "";
const nextStepUrl = `/${"naselje"}/${request.uniqueId}/${getMunicipalityName(
request.region,
req.body.municipality
)}${nextStepParam}`;
request.municipality = req.body.municipality;
await request.save();

54
app/controllers/neighborhoodMap.js
View File

@@ -1,41 +1,37 @@
const { currentRERequest } = require('../helpers/url');
const { currentRERequest } = require("../helpers/url");
const getNeighborhood = async (req, res) => {
const title = "U kojem naselju tražite nekretninu?";
const municipality = req.params.municipality;
const nextStep = req.query.nextStep || "/";
const title = "U kojem naselju tražite nekretninu?"
const municipality = req.params.municipality
const nextStep = req.query.nextStep || '/';
res.render('neighborhoodMap', {
nextStep,
municipality,
title
});
res.render("neighborhoodMap", {
nextStep,
municipality,
title
});
};
const postNeighborhood = async (req, res) => {
let request = await currentRERequest(req);
const northWest = [req.body.west, req.body.north];
const northEast = [req.body.east, req.body.north];
const southEast = [req.body.east, req.body.south];
const southWest = [req.body.west, req.body.south];
let request = await currentRERequest(req);
const northWest = [req.body.west, req.body.north];
const northEast = [req.body.east, req.body.north];
const southEast = [req.body.east, req.body.south];
const southWest = [req.body.west, req.body.south];
request.bounding_box = {
type: 'Polygon', coordinates: [
[northWest, northEast, southEast,
southWest, northWest]
]
};
await request.save();
request.bounding_box = {
type: "Polygon",
coordinates: [[northWest, northEast, southEast, southWest, northWest]]
};
await request.save();
const nextStepPage = req.query.nextStep || 'povrsina';
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
const nextStepPage = req.query.nextStep || "povrsina";
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
res.redirect(nextStepUrl);
res.redirect(nextStepUrl);
};
module.exports = {
getNeighborhood,
postNeighborhood
};
getNeighborhood,
postNeighborhood
};

34
app/controllers/prices.js
View File

@@ -1,32 +1,30 @@
const { currentRERequest } = require('../helpers/url');
const { currentRERequest } = require("../helpers/url");
const getPrice = (req,res) => {
const getPrice = (req, res) => {
const title = "Koja Vam okvirna cijena odgovara ?";
const title = "Koja Vam okvirna cijena odgovara ?"
const unit = " KM"
const unit = " KM";
const rangeFrom = {
min : 1000,
max : 250000,
value : 0,
step : 1000
}
min: 1000,
max: 250000,
value: 0,
step: 1000
};
const rangeTo = {
min : 1000,
max : 250000,
value : 50000,
step : 1000
}
min: 1000,
max: 250000,
value: 50000,
step: 1000
};
res.render('price', {rangeFrom, rangeTo, unit, title });
res.render("price", { rangeFrom, rangeTo, unit, title });
};
const postPrice = async (req, res) => {
const request = await currentRERequest(req);
const nextStepPage = req.query.nextStep || 'pregled';
const nextStepPage = req.query.nextStep || "pregled";
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.priceMin = req.body.from;

84
app/controllers/queryReview.js
View File

@@ -1,10 +1,16 @@
const { currentRERequest } = require('../helpers/url');
const { getRegionName, getMunicipalityName } = require('../helpers/codes');
const { realEstateTypes, sizes, gardenSizes, prices, getEnumTypeTitle, getRealEstateTypeEnum } = require('../helpers/enums');
const { currentRERequest } = require("../helpers/url");
const { getRegionName, getMunicipalityName } = require("../helpers/codes");
const {
realEstateTypes,
sizes,
gardenSizes,
prices,
getEnumTypeTitle,
getRealEstateTypeEnum
} = require("../helpers/enums");
const getQueryReview = async (req,res) => {
const title = "Da li je ovo to što ste tražili ?"
const getQueryReview = async (req, res) => {
const title = "Da li je ovo to što ste tražili ?";
const request = await currentRERequest(req);
const nextStep = req.query.nextStep;
@@ -12,63 +18,73 @@ const getQueryReview = async (req,res) => {
return null;
}
const {
realEstateType,
region,
municipality,
sizeMin,
sizeMax,
gardenSizeMin,
gardenSizeMax,
priceMin,
priceMax } = request.dataValues;
const {
realEstateType,
region,
municipality,
sizeMin,
sizeMax,
gardenSizeMin,
gardenSizeMax,
priceMin,
priceMax
} = request.dataValues;
const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
const enableGardenSizeEdit = realEstateTypeObject
? realEstateTypeObject.hasGardenSize
: false;
const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
const realEstateTypeTitle = realEstateType
? getEnumTypeTitle(realEstateTypes, realEstateType)
: null;
const regionName = region ? getRegionName(region) : null;
const municipalityName = (region && municipality) ? getMunicipalityName(region, municipality) : null;
const municipalityName =
region && municipality ? getMunicipalityName(region, municipality) : null;
const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
const gardenSizeTitle = gardenSizeMin ? gardenSizeMin + "-" + gardenSizeMax + " m2" : null;
const priceTitle = priceMin ? priceMin + "-" + priceMax + " KM" : null;
const gardenSizeTitle = gardenSizeMin
? gardenSizeMin + "-" + gardenSizeMax + " m2"
: null;
const priceTitle = priceMin ? priceMin + "-" + priceMax + " KM" : null;
const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : '';
const uniqueId = request.dataValues.uniqueId
? request.dataValues.uniqueId
: "";
const queryData = [
{
id: 'realEstateType',
id: "realEstateType",
title: realEstateTypeTitle,
url: `/vrstanekretnine/${uniqueId}?nextStep=pregled`,
url: `/vrstanekretnine/${uniqueId}?nextStep=pregled`
},
{
id: 'region',
id: "region",
title: regionName,
url: `/grad/${uniqueId}?nextStep=mjesto`,
url: `/grad/${uniqueId}?nextStep=mjesto`
},
{
id: 'municipality',
id: "municipality",
title: municipalityName,
url: `/mjesto/${uniqueId}?nextStep=pregled`,
url: `/mjesto/${uniqueId}?nextStep=pregled`
},
{
id: 'size',
id: "size",
title: sizeTitle,
url: `/povrsina/${uniqueId}?nextStep=pregled`,
url: `/povrsina/${uniqueId}?nextStep=pregled`
},
{
id: 'gardenSize',
id: "gardenSize",
title: gardenSizeTitle,
url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : '',
url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : ""
},
{
id: 'price',
id: "price",
title: priceTitle,
url: `/cijena/${uniqueId}?nextStep=pregled`
}
];
res.render('queryReview', {
res.render("queryReview", {
nextStep,
queryData,
title

21
app/controllers/querySubmit.js
View File

@@ -1,14 +1,13 @@
const { currentRERequest } = require('../helpers/url');
const { isValidEmail } = require('../helpers/email');
const { sendTemplatedEmail} = require('../helpers/awsEmail');
const { currentRERequest } = require("../helpers/url");
const { isValidEmail } = require("../helpers/email");
const { sendTemplatedEmail } = require("../helpers/awsEmail");
const getQuerySubmit = async (req, res) => {
const title = "Upišite vaš e-mail"
const title = "Upišite vaš e-mail";
const nextStep = req.query.nextStep;
const error = req.query.error;
res.render('querySubmit', {
res.render("querySubmit", {
nextStep,
error,
title
@@ -17,25 +16,23 @@ const getQuerySubmit = async (req, res) => {
const postQuerySubmit = async (req, res) => {
const request = await currentRERequest(req);
const nextStep = req.query.nextStep || '/ponovo';
const nextStep = req.query.nextStep || "/ponovo";
const emailInput = req.body.email;
const emailConfirmInput = req.body.confirm;
let error = "Greška ! Unesite validan email";
if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
error = "Greška ! Unesite validan email";
res.render('querySubmit', {
res.render("querySubmit", {
error
});
return;
}
if (emailInput !== emailConfirmInput) {
error = "Greška ! Unešeni emailovi nisu isti";
res.render('querySubmit', {
res.render("querySubmit", {
error
});
return;
@@ -45,7 +42,7 @@ const postQuerySubmit = async (req, res) => {
request.subscribed = true;
await request.save();
sendTemplatedEmail(req.body.email, request);
res.redirect(nextStep);
res.redirect(nextStep);
};
module.exports = {

37
app/controllers/realEstateTypes.js
View File

@@ -1,42 +1,39 @@
const db = require('../models/index');
const db = require("../models/index");
const { currentRERequest } = require('../helpers/url');
const { realEstateTypes, getRealEstateTypeEnum } = require('../helpers/enums');
const { currentRERequest } = require("../helpers/url");
const { realEstateTypes, getRealEstateTypeEnum } = require("../helpers/enums");
const getRealEstateTypes = (req,res) => {
const title = "Koju nekretninu tražite?"
res.render('realEstateType', { realEstateTypes, title });
const getRealEstateTypes = (req, res) => {
const title = "Koju nekretninu tražite?";
res.render("realEstateType", { realEstateTypes, title });
};
const postRealEstateTypes = async (req, res) => {
const request = await currentRERequest(req);
const nextStepPage = req.query.nextStep || 'grad';
const nextStepPage = req.query.nextStep || "grad";
if (request && request.uniqueId) {
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.realEstateType = req.body.realestatetype;
if (!getRealEstateTypeEnum(request.realEstateType).hasGardenSize){
if (!getRealEstateTypeEnum(request.realEstateType).hasGardenSize) {
request.gardenSize = null;
}
await request.save();
res.redirect(nextStepUrl)
res.redirect(nextStepUrl);
} else {
db.RealEstateRequest.create({
realEstateType: req.body.realestatetype
}).then( (result) => {
const nextStepUrl = `/${nextStepPage}/${result.uniqueId}`;
res.redirect(nextStepUrl);
}).catch( (e) => {
res.send(e);
});
})
.then(result => {
const nextStepUrl = `/${nextStepPage}/${result.uniqueId}`;
res.redirect(nextStepUrl);
})
.catch(e => {
res.send(e);
});
}
};
module.exports = {

28
app/controllers/realEstates.js
View File

@@ -1,18 +1,16 @@
const { allMarketAlertsByRequest } = require("../helpers/db/dbHelper");
const {allMarketAlertsByRequest} = require('../helpers/db/dbHelper');
const getRealEstates = async (req, res) => {
console.log("Enter get realestates");
const request = req.params["request_id"];
console.log(req.params["request_id"]);
const realEstates = await allMarketAlertsByRequest(request);
console.log(realEstates);
const getRealEstates = async (req,res) => {
console.log("Enter get realestates");
const request = req.params['request_id'];
console.log(req.params['request_id']);
const realEstates = await allMarketAlertsByRequest(request);
console.log(realEstates);
const title = "Ovo su nekretnine koje smo pronašli za vas";
res.render("realEstates", { realEstates, title });
};
const title = "Ovo su nekretnine koje smo pronašli za vas"
res.render('realEstates', {realEstates, title } );
};
module.exports = {
getRealEstates
};
module.exports = {
getRealEstates
};

16
app/controllers/regions.js
View File

@@ -1,25 +1,25 @@
const { currentRERequest } = require('../helpers/url');
const { getRegions } = require('../helpers/codes');
const { currentRERequest } = require("../helpers/url");
const { getRegions } = require("../helpers/codes");
const regions = getRegions();
const getRegion = (req,res) => {
const title = "U kojoj regiji tražite nekretninu?"
res.render('region', { regions, title });
const getRegion = (req, res) => {
const title = "U kojoj regiji tražite nekretninu?";
res.render("region", { regions, title });
};
const postRegion = async (req, res) => {
const request = await currentRERequest(req);
const nextStepQueryParam = req.query.nextStep ? '?nextStep=pregled' : '';
const nextStepPage = req.query.nextStep || 'mjesto';
const nextStepQueryParam = req.query.nextStep ? "?nextStep=pregled" : "";
const nextStepPage = req.query.nextStep || "mjesto";
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}${nextStepQueryParam}`;
request.region = req.body.region;
request.municipality = null;
await request.save();
res.redirect(nextStepUrl)
res.redirect(nextStepUrl);
};
module.exports = {

36
app/controllers/sizes.js
View File

@@ -1,25 +1,24 @@
const { currentRERequest } = require('../helpers/url');
const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');
const { currentRERequest } = require("../helpers/url");
const { sizes, getRealEstateTypeEnum } = require("../helpers/enums");
const getSize = (req,res) => {
const title = "Od koliko kvadrata tražite nekretninu ?"
const unit = " m2"
const getSize = (req, res) => {
const title = "Od koliko kvadrata tražite nekretninu ?";
const unit = " m2";
const rangeFrom = {
min : 10,
max : 250,
value : 0,
step : 10
}
min: 10,
max: 250,
value: 0,
step: 10
};
const rangeTo = {
min : 10,
max : 250,
value : 50,
step : 10
}
min: 10,
max: 250,
value: 50,
step: 10
};
res.render('size', { rangeFrom, rangeTo, unit, title });
res.render("size", { rangeFrom, rangeTo, unit, title });
};
const postSize = async (req, res) => {
@@ -27,7 +26,8 @@ const postSize = async (req, res) => {
const realEstateType = getRealEstateTypeEnum(request.realEstateType);
const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena';
const nextStep =
realEstateType && realEstateType.hasGardenSize ? "okucnica" : "cijena";
const nextStepPage = req.query.nextStep || nextStep;
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.sizeMin = req.body.from;

19
app/controllers/unsubscribe.js
View File

@@ -1,17 +1,14 @@
const { currentRERequest } = require('../helpers/url');
const { currentRERequest } = require("../helpers/url");
const getUnsubscribe = async (req, res) => {
const title = "Uspješno ste se odjavili";
const request = await currentRERequest(req);
request.subscribed = false;
await request.save();
const title = "Uspješno ste se odjavili"
const request = await currentRERequest(req);
request.subscribed = false;
await request.save();
res.render('unsubscribe', { nextStep: '/vrstanekretnine', title });
res.render("unsubscribe", { nextStep: "/vrstanekretnine", title });
};
module.exports = {
getUnsubscribe
};
getUnsubscribe
};

6
app/controllers/welcome.js
View File

@@ -1,6 +1,6 @@
const getWelcome = (req,res) => {
const title = "Koju nekretninu tražite?"
res.render('welcome', { nextStep: '/vrstanekretnine', title } );
const getWelcome = (req, res) => {
const title = "Koju nekretninu tražite?";
res.render("welcome", { nextStep: "/vrstanekretnine", title });
};
module.exports = {