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

Fix minor bugs #9

Merged
bilal.catic merged 4 commits from fix-minor-bugs into master 2019-05-24 15:54:41 +02:00
Conversation 9 Commits 4 Files Changed 14 +121 -90
14 changed files with 121 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/gardenSizes.js
View File

@@ -1,5 +1,5 @@
const { currentRERequest } = require('../helpers/url');
const { gardenSizes } = require('../helpers/enums');
const { gardenSizes, getRealEstateTypeEnum } = require('../helpers/enums');
const getGardenSize = (req,res) => {
res.render('gardenSize', { gardenSizes });
@@ -11,8 +11,11 @@ const postGardenSize = async (req, res) => {
const nextStepPage = req.query.nextStep || 'cijena';
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.gardenSize = req.body.gardensize;
await request.save();
const realEstateType = getRealEstateTypeEnum(request.realEstateType);
if (realEstateType && realEstateType.hasGardenSize) {
request.gardenSize = req.body.gardensize;
await request.save();
}
res.redirect(nextStepUrl);
};

7
app/controllers/queryReview.js
View File

@@ -1,6 +1,6 @@
const { currentRERequest } = require('../helpers/url');
const { getRegionName, getMunicipalityName } = require('../helpers/codes');
const { realEstateTypes, sizes, gardenSizes, prices, getEnumTypeTitle } = require('../helpers/enums');
const { realEstateTypes, sizes, gardenSizes, prices, getEnumTypeTitle, getRealEstateTypeEnum } = require('../helpers/enums');
const getQueryReview = async (req,res) => {
const request = await currentRERequest(req);
@@ -12,6 +12,9 @@ const getQueryReview = async (req,res) => {
const { realEstateType, region, municipality, size, gardenSize, price } = request.dataValues;
const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
const regionName = region ? getRegionName(region) : null;
const municipalityName = (region && municipality) ? getMunicipalityName(region, municipality) : null;
@@ -45,7 +48,7 @@ const getQueryReview = async (req,res) => {
{
id: 'gardenSize',
title: gardenSizeTitle,
url: `/okucnica/${uniqueId}?nextStep=pregled`,
url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : '',
},
{
id: 'price',

19
app/controllers/querySubmit.js
View File

@@ -1,20 +1,29 @@
const { currentRERequest } = require('../helpers/url');
const { isValidEmail } = require('../helpers/email');
const getQuerySubmit = async (req,res) => {
const nextStep = req.query.nextStep;
const error = req.query.error;
res.render('querySubmit', {
nextStep
nextStep,
error
});
};
const postQuerySubmit = async (req, res) => {
const request = await currentRERequest(req);
const nextStep = req.query.nextStep || '/ponovo';
//TODO: validate email
request.email = req.body.email;
await request.save();
res.redirect(nextStep);
const emailInput = req.body.email;
if (isValidEmail(emailInput)){
request.email = req.body.email;
await request.save();
res.redirect(nextStep);
} else {
res.redirect('?error=1');
}
};
module.exports = {

5
app/controllers/realEstateTypes.js
View File

@@ -1,7 +1,7 @@
const db = require('../models/index');
const { currentRERequest } = require('../helpers/url');
const { realEstateTypes } = require('../helpers/enums');
const { realEstateTypes, getRealEstateTypeEnum } = require('../helpers/enums');
const getRealEstateTypes = (req,res) => {
@@ -16,6 +16,9 @@ const postRealEstateTypes = async (req, res) => {
if (request && request.uniqueId) {
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.realEstateType = req.body.realestatetype;
if (!getRealEstateTypeEnum(request.realEstateType).hasGardenSize){
request.gardenSize = null;
}
await request.save();
res.redirect(nextStepUrl)

7
app/controllers/sizes.js
View File

@@ -1,5 +1,5 @@
const { currentRERequest } = require('../helpers/url');
const { sizes } = require('../helpers/enums');
const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');
const getSize = (req,res) => {
res.render('size', { sizes });
@@ -8,7 +8,10 @@ const getSize = (req,res) => {
const postSize = async (req, res) => {
const request = await currentRERequest(req);
const nextStepPage = req.query.nextStep || 'okucnica';
const realEstateType = getRealEstateTypeEnum(request.realEstateType);
const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena';
const nextStepPage = req.query.nextStep || nextStep;
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.size = req.body.size;

9
app/helpers/email.js Normal file
View File

@@ -0,0 +1,9 @@
const isValidEmail = (email) => {
const simpleEmailRegex = /^.+@.+\..+$/;
return (email && email.length < 250 && simpleEmailRegex.test(email));
};
module.exports = {
isValidEmail
};

17
app/helpers/enums.js
View File

@@ -1,7 +1,7 @@
const realEstateTypes = [
{ title: "Kuća", id: "kuca" },
{ title: "Stan", id: "stan" },
{ title: "Vikendica", id: "vikendica" }
{ title: "Kuća", id: "kuca", hasGardenSize: true },
{ title: "Stan", id: "stan", hasGardenSize: false },
{ title: "Vikendica", id: "vikendica", hasGardenSize: true }
];
const sizes = [
@@ -31,8 +31,16 @@ const prices = [
{ title: "preko 250 000 KM", id: "moreThan250kKM" }
];
const getEnumObject = (enumType, enumId) => {
return enumType.find(enumValue => enumValue.id === enumId);
};
const getRealEstateTypeEnum = (enumId) => {
return getEnumObject(realEstateTypes, enumId) || null;
}
const getEnumTypeTitle = (enumType, enumId) => {
const enumObject = enumType.find(enumValue => enumValue.id === enumId);
const enumObject = getEnumObject(enumType, enumId);
if (!enumObject){
return null;
}
@@ -44,5 +52,6 @@ module.exports = {
sizes,
gardenSizes,
prices,
getRealEstateTypeEnum,
getEnumTypeTitle,
};

15
app/views/gardenSize.ejs
View File

@@ -8,8 +8,8 @@
<ul class="collection with-header">
<% for(const gardenSize of gardenSizes) { %>
<li class="collection-item" >
<div id="<%= gardenSize.id %>" ><%= gardenSize.title %>
<a href="#!" class="secondary-content">
<div id="<%= gardenSize.id %>" onclick="saveAndSubmit(this.id)"><%= gardenSize.title %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,12 +21,9 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#gardensize").val(clickedId);
$("#form-gardensize").submit();
});
});
function saveAndSubmit(id) {
$("#gardensize").val(id);
$("#form-gardensize").submit();
}
</script>

15
app/views/municipality.ejs
View File

@@ -7,9 +7,9 @@
<div class="row center-align">
<ul class="collection with-header">
<% for(const municipality of municipalities) { %>
<li class="collection-item" >
<div id="<%= municipality.id %>" ><%= municipality.name %>
<a href="#!" class="secondary-content">
<li class="collection-item">
<div id="<%= municipality.id %>" onclick="saveAndSubmit(this.id)"><%= municipality.name %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,11 +21,8 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#municipality").val(clickedId);
function saveAndSubmit(id) {
$("#municipality").val(id);
$("#form-municipality").submit();
});
});
}
</script>

15
app/views/price.ejs
View File

@@ -8,8 +8,8 @@
<ul class="collection with-header">
<% for(const price of prices) { %>
<li class="collection-item" >
<div id="<%= price.id %>" ><%= price.title %>
<a href="#!" class="secondary-content">
<div id="<%= price.id %>" onclick="saveAndSubmit(this.id)"><%= price.title %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,12 +21,9 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#price").val(clickedId);
$("#form-price").submit();
});
});
function saveAndSubmit(id) {
$("#price").val(id);
$("#form-price").submit();
}
</script>

40
app/views/querySubmit.ejs
View File

@@ -4,29 +4,39 @@
</div>
<form method="POST" id="form-submitquery">
<div class="row center-align">
<div class="col s6 push-s3">
<input id="email" name="email" type="email" placeholder="vas.email@mail.com"/>
<div class="row center-align">
<div class="col s6 push-s3">
<input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" />
</div>
</div>
</div>
<div class="row">
<div class="col s6 push-s3">
<a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
Javi mi
</a>
<% if (error) {%>
<div class="row">
<div class="col s6 push-s3">
<h6 style="color: red">Greška ! Unesite ispravan email</h6>
</div>
</div>
<%}%>
<div class="row">
<div class="col s6 push-s3">
<a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
Javi mi
</a>
</div>
</div>
</div>
<div class="row">
<div class="col s6 push-s3">
<p>* U svakom trenutku možete prekinuti slanje objava kroz link u e-mailu</p>
<div class="row">
<div class="col s6 push-s3">
<p>* U svakom trenutku možete prekinuti slanje objava kroz link u e-mailu</p>
</div>
</div>
</div>
</form>
<script>
$(document).ready( () => {
$("#submit").click( () => {
$("#form-submitquery").submit();
const emailField = document.getElementById('email');
if (emailField.validity.valid){
$("#form-submitquery").submit();
}
});
});
</script>

19
app/views/realEstateType.ejs
View File

@@ -6,10 +6,10 @@
<form method="POST" id="form-real-estate-type">
<div class="row center-align">
<ul class="collection with-header">
<% for(const realEstatetype of realEstateTypes) { %>
<li class="collection-item" >
<div id="<%= realEstatetype.id %>" ><%= realEstatetype.title %>
<a href="#!" class="secondary-content">
<% for(const realEstateType of realEstateTypes) { %>
<li class="collection-item">
<div id="<%= realEstateType.id %>" onclick="saveAndSubmit(this.id)"><%= realEstateType.title %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,13 +21,10 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#realestatetype").val(clickedId);
$("#form-real-estate-type").submit();
});
});
function saveAndSubmit(id) {
$("#realestatetype").val(id);
$("#form-real-estate-type").submit();
}
</script>

17
app/views/region.ejs
View File

@@ -7,9 +7,9 @@
<div class="row center-align">
<ul class="collection with-header">
<% for(const region of regions) { %>
<li class="collection-item" >
<div id="<%= region.id %>" ><%= region.name %>
<a href="#!" class="secondary-content">
<li class="collection-item">
<div id="<%= region.id %>" onclick="saveAndSubmit(this.id)"><%= region.name %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,12 +21,9 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#region").val(clickedId);
$("#form-region").submit();
});
});
function saveAndSubmit(id) {
$("#region").val(id);
$("#form-region").submit();
}
</script>

17
app/views/size.ejs
View File

@@ -7,9 +7,9 @@
<div class="row center-align">
<ul class="collection with-header">
<% for(const size of sizes) { %>
<li class="collection-item" >
<div id="<%= size.id %>" ><%= size.title %>
<a href="#!" class="secondary-content">
<li class="collection-item">
<div id="<%= size.id %>" onclick="saveAndSubmit(this.id)"><%= size.title %>
<a href="#" class="secondary-content">
<i class="material-icons">send</i>
</a>
</div>
@@ -21,12 +21,9 @@
</form>
<script>
$(document).ready( () => {
$(".collection-item").click( (e) => {
const clickedId = $(e.target).attr("id");
$("#size").val(clickedId);
$("#form-size").submit();
});
});
function saveAndSubmit(id) {
$("#size").val(id);
$("#form-size").submit();
}
</script>