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

Merge branch 'double-email' into 'master'

Browse Source 
Double email

See merge request saburly/marketalarm/web!13
This commit was merged in pull request #13.
This commit is contained in:
Bilal Catic
2019-05-30 12:08:25 +00:00
parent 56865b4670 08a94ca4f8
commit d6e999fcf1
9 changed files with 159 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/gardenSizes.js
View File

@@ -3,17 +3,17 @@ const { getRealEstateTypeEnum } = require('../helpers/enums');
const getGardenSize = (req,res) => { const getGardenSize = (req,res) => {
const rangeFrom = { const rangeFrom = {
min : 0, min : 10,
max : 3000, max : 3000,
value : 0, value : 0,
step : 100 step : 10
} }
const rangeTo = { const rangeTo = {
min : 0, min : 10,
max : 3000, max : 3000,
value : 100, value : 100,
step : 100 step : 10
} }
res.render('gardenSize', { rangeFrom, rangeTo }); res.render('gardenSize', { rangeFrom, rangeTo });
}; };
@@ -26,8 +26,8 @@ const postGardenSize = async (req, res) => {
const realEstateType = getRealEstateTypeEnum(request.realEstateType); const realEstateType = getRealEstateTypeEnum(request.realEstateType);
if (realEstateType && realEstateType.hasGardenSize) { if (realEstateType && realEstateType.hasGardenSize) {
request.gardenSize = req.body.from; request.gardenSizeMin = req.body.from;
request.gardenSizeRange = req.body.to; request.gardenSizeMax = req.body.to;
await request.save(); await request.save();
} }

8
app/controllers/prices.js
View File

@@ -2,14 +2,14 @@ const { currentRERequest } = require('../helpers/url');
const getPrice = (req,res) => { const getPrice = (req,res) => {
const rangeFrom = { const rangeFrom = {
min : 0, min : 1000,
max : 250000, max : 250000,
value : 0, value : 0,
step : 1000 step : 1000
} }
const rangeTo = { const rangeTo = {
min : 0, min : 1000,
max : 250000, max : 250000,
value : 50000, value : 50000,
step : 1000 step : 1000
@@ -25,8 +25,8 @@ const postPrice = async (req, res) => {
const nextStepPage = req.query.nextStep || 'pregled'; const nextStepPage = req.query.nextStep || 'pregled';
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`; const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.price = req.body.from; request.priceMin = req.body.from;
request.priceRange = req.body.to; request.priceMax = req.body.to;
await request.save(); await request.save();
res.redirect(nextStepUrl); res.redirect(nextStepUrl);

18
app/controllers/queryReview.js
View File

@@ -14,12 +14,12 @@ const getQueryReview = async (req,res) => {
realEstateType, realEstateType,
region, region,
municipality, municipality,
size, sizeMin,
sizeRange, sizeMax,
gardenSize, gardenSizeMin,
gardenSizeRange, gardenSizeMax,
price, priceMin,
priceRange } = request.dataValues; priceMax } = request.dataValues;
const realEstateTypeObject = getRealEstateTypeEnum(realEstateType); const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false; const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
@@ -27,9 +27,9 @@ const getQueryReview = async (req,res) => {
const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null; const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
const regionName = region ? getRegionName(region) : 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 = size ? size + "-" + sizeRange + " m2" : null; const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
const gardenSizeTitle = gardenSize ? gardenSize + "-" + gardenSizeRange + " m2" : null; const gardenSizeTitle = gardenSizeMin ? gardenSizeMin + "-" + gardenSizeMax + " m2" : null;
const priceTitle = price ? price + "-" + priceRange + " KM" : null; const priceTitle = priceMin ? priceMin + "-" + priceMax + " KM" : null;
const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : ''; const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : '';

30
app/controllers/querySubmit.js
View File

@@ -1,7 +1,7 @@
const { currentRERequest } = require('../helpers/url'); const { currentRERequest } = require('../helpers/url');
const { isValidEmail } = require('../helpers/email'); const { isValidEmail } = require('../helpers/email');
const getQuerySubmit = async (req,res) => { const getQuerySubmit = async (req, res) => {
const nextStep = req.query.nextStep; const nextStep = req.query.nextStep;
const error = req.query.error; const error = req.query.error;
@@ -16,14 +16,30 @@ const postQuerySubmit = async (req, res) => {
const nextStep = req.query.nextStep || '/ponovo'; const nextStep = req.query.nextStep || '/ponovo';
const emailInput = req.body.email; const emailInput = req.body.email;
const emailConfirmInput = req.body.confirm;
let error = "Greška ! Unesite validan email";
if (isValidEmail(emailInput)){ if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
request.email = req.body.email;
await request.save(); error = "Greška ! Unesite validan email";
res.redirect(nextStep); res.render('querySubmit', {
} else { error
res.redirect('?error=1'); });
return;
} }
if (emailInput !== emailConfirmInput) {
error = "Greška ! Unešeni emailovi nisu isti";
res.render('querySubmit', {
error
});
return;
}
request.email = req.body.email;
await request.save();
res.redirect(nextStep);
}; };
module.exports = { module.exports = {

8
app/controllers/sizes.js
View File

@@ -3,14 +3,14 @@ const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');
const getSize = (req,res) => { const getSize = (req,res) => {
const rangeFrom = { const rangeFrom = {
min : 0, min : 10,
max : 250, max : 250,
value : 0, value : 0,
step : 10 step : 10
} }
const rangeTo = { const rangeTo = {
min : 0, min : 10,
max : 250, max : 250,
value : 50, value : 50,
step : 10 step : 10
@@ -27,8 +27,8 @@ const postSize = async (req, res) => {
const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena'; const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena';
const nextStepPage = req.query.nextStep || nextStep; const nextStepPage = req.query.nextStep || nextStep;
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`; const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
request.size = req.body.from; request.sizeMin = req.body.from;
request.sizeRange = req.body.to; request.sizeMax = req.body.to;
await request.save(); await request.save();
res.redirect(nextStepUrl); res.redirect(nextStepUrl);

63
app/migrations/20190530101945-range-fields.js Normal file
View File

@@ -0,0 +1,63 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.sequelize.transaction((t) => {
return Promise.all([
queryInterface.removeColumn('RealEstateRequests', 'sizeRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceRange', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'size', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSize', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'price', { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeMin', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeMax', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'sizeMin', {
type: Sequelize.INTEGER
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'sizeMax', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceMin', {
type: Sequelize.INTEGER,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceMax', {
type: Sequelize.INTEGER
}, { transaction: t })
])
})
},
down: (queryInterface, Sequelize) => {
return queryInterface.sequelize.transaction((t) => {
return Promise.all([
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMax', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'sizeMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'sizeMax', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceMax', {
type: Sequelize.STRING
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSizeRange', {
type: Sequelize.STRING,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'priceRange', {
type: Sequelize.STRING,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'size', {
type: Sequelize.STRING
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'gardenSize', {
type: Sequelize.STRING,
}, { transaction: t }),
queryInterface.addColumn('RealEstateRequests', 'price', {
type: Sequelize.STRING,
}, { transaction: t })
])
})
}
};

12
app/models/realestaterequest.js
View File

@@ -12,12 +12,12 @@ module.exports = (sequelize, DataTypes) => {
email: DataTypes.STRING, email: DataTypes.STRING,
region: DataTypes.STRING, region: DataTypes.STRING,
municipality: DataTypes.STRING, municipality: DataTypes.STRING,
size: DataTypes.STRING, sizeMin: DataTypes.INTEGER,
sizeRange: DataTypes.STRING, sizeMax: DataTypes.INTEGER,
gardenSize: DataTypes.STRING, gardenSizeMin: DataTypes.INTEGER,
gardenSizeRange: DataTypes.STRING, gardenSizeMax: DataTypes.INTEGER,
price: DataTypes.STRING, priceMin: DataTypes.INTEGER,
priceRange: DataTypes.STRING, priceMax: DataTypes.INTEGER,
bounding_box: DataTypes.GEOMETRY('POINT', 4326) bounding_box: DataTypes.GEOMETRY('POINT', 4326)
}, {}); }, {});
RealEstateRequest.associate = function(models) { RealEstateRequest.associate = function(models) {

8
app/views/neighborhoodMap.ejs
View File

@@ -73,10 +73,10 @@
$("#btnsubmit").click(() => { $("#btnsubmit").click(() => {
var bounds = map.getBounds(); var bounds = map.getBounds();
$("#north").val(bounds.na.l); $("#north").val(map.getBounds().getNorthEast().lat());
$("#south").val(bounds.na.j); $("#south").val(map.getBounds().getSouthWest().lat());
$("#east").val(bounds.ia.l); $("#east").val(map.getBounds().getNorthEast().lng());
$("#west").val(bounds.ia.j); $("#west").val(map.getBounds().getSouthWest().lng());
$("#form-map-output").submit(); $("#form-map-output").submit();
}); });

55
app/views/querySubmit.ejs
View File

@@ -9,13 +9,25 @@
<input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" /> <input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" />
</div> </div>
</div> </div>
<% if (error) {%>
<div class="row"> <div class="row">
<div class="col s6 push-s3"> <div class="col s6 push-s3">
<h6 style="color: red">Greška ! Unesite ispravan email</h6> <h6 id="error-lable-email" style="color: red"><%= error %> </h6>
</div>
</div> </div>
<%}%> </div>
<div class="row center-align">
<div class="col s6 push-s3">
<input id="confirm" name="confirm" type="email" placeholder="potvrdite.email@mail.com" required size="250" />
</div>
</div>
<div class="row">
<div class="col s6 push-s3">
<h6 id="error-lable-email-confirm" style="color: red"></h6>
</div>
</div>
<div class="row"> <div class="row">
<div class="col s6 push-s3"> <div class="col s6 push-s3">
<a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn"> <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
@@ -31,13 +43,26 @@
</form> </form>
<script> <script>
$(document).ready( () => { $(document).ready(() => {
$("#submit").click( () => { $("#submit").click(() => {
const emailField = document.getElementById('email'); const emailField = document.getElementById('email');
if (emailField.validity.valid){ const emailConfirmField = document.getElementById('confirm');
$("#form-submitquery").submit(); const errorMessage = "Greška ! Unedite validan email";
} $("#error-lable-email").text("");
}); $("#error-lable-email-confirm").text("");
});
</script>
if (!emailField.validity.valid) {
$("#error-lable-email").text(errorMessage);
return
}
if (!emailConfirmField.validity.valid) {
$("#error-lable-email-confirm").text(errorMessage);
return
}
$("#form-submitquery").submit();
});
});
</script>