From 8f9e3ae46a0f0dbaa2c9e8db2d24962220f4051f Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Mon, 3 Jun 2019 10:34:59 +0200 Subject: [PATCH 1/3] Geocoding restricttions, added values for range finders, added confirmation email, and .env file --- .env | 5 + app/controllers/gardenSizes.js | 5 +- app/controllers/prices.js | 4 +- app/controllers/querySubmit.js | 3 + app/controllers/sizes.js | 4 +- app/controllers/unsubscribe.js | 15 ++ app/helpers/awsEmail.js | 87 +++++++++ app/lib/sendNotification.js | 2 +- .../20190531111232-subscribed-boolean.js | 18 ++ app/models/realestaterequest.js | 3 +- app/views/neighborhoodMap.ejs | 169 +++++++++++------- app/views/partials/range.ejs | 107 +++++------ app/views/unsubscribe.ejs | 14 ++ index.js | 7 +- 14 files changed, 318 insertions(+), 125 deletions(-) create mode 100644 .env create mode 100644 app/controllers/unsubscribe.js create mode 100644 app/helpers/awsEmail.js create mode 100644 app/migrations/20190531111232-subscribed-boolean.js create mode 100644 app/views/unsubscribe.ejs diff --git a/.env b/.env new file mode 100644 index 0000000..05ed185 --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ + AMAZON_ACCES_KEY_ID=AKIA3LOYP3GY5FGF5UMO + AMAZON_SECRET_ACCESS_KEY=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 + AMAZON_REGION=eu-west-1 + APP_URL=http://localhost:3001 + \ No newline at end of file diff --git a/app/controllers/gardenSizes.js b/app/controllers/gardenSizes.js index 23b7be9..5ba8ab5 100644 --- a/app/controllers/gardenSizes.js +++ b/app/controllers/gardenSizes.js @@ -2,6 +2,8 @@ const { currentRERequest } = require('../helpers/url'); const { getRealEstateTypeEnum } = require('../helpers/enums'); const getGardenSize = (req,res) => { + + const unit = " m2" const rangeFrom = { min : 10, max : 3000, @@ -15,7 +17,8 @@ const getGardenSize = (req,res) => { value : 100, step : 10 } - res.render('gardenSize', { rangeFrom, rangeTo }); + + res.render('gardenSize', { rangeFrom, rangeTo, unit }); }; const postGardenSize = async (req, res) => { diff --git a/app/controllers/prices.js b/app/controllers/prices.js index b6a1270..1c027ca 100644 --- a/app/controllers/prices.js +++ b/app/controllers/prices.js @@ -1,6 +1,8 @@ const { currentRERequest } = require('../helpers/url'); const getPrice = (req,res) => { + + const unit = " KM" const rangeFrom = { min : 1000, max : 250000, @@ -16,7 +18,7 @@ const getPrice = (req,res) => { } - res.render('price', {rangeFrom, rangeTo }); + res.render('price', {rangeFrom, rangeTo, unit }); }; const postPrice = async (req, res) => { diff --git a/app/controllers/querySubmit.js b/app/controllers/querySubmit.js index 27d1771..f73fa1f 100644 --- a/app/controllers/querySubmit.js +++ b/app/controllers/querySubmit.js @@ -1,5 +1,6 @@ const { currentRERequest } = require('../helpers/url'); const { isValidEmail } = require('../helpers/email'); +const { sendTemplatedEmail} = require('../helpers/awsEmail'); const getQuerySubmit = async (req, res) => { const nextStep = req.query.nextStep; @@ -38,7 +39,9 @@ const postQuerySubmit = async (req, res) => { } request.email = req.body.email; + request.subscribed = true; await request.save(); + sendTemplatedEmail(req.body.email, request); res.redirect(nextStep); }; diff --git a/app/controllers/sizes.js b/app/controllers/sizes.js index 63325e0..597064d 100644 --- a/app/controllers/sizes.js +++ b/app/controllers/sizes.js @@ -2,6 +2,8 @@ const { currentRERequest } = require('../helpers/url'); const { sizes, getRealEstateTypeEnum } = require('../helpers/enums'); const getSize = (req,res) => { + + const unit = " m2" const rangeFrom = { min : 10, max : 250, @@ -16,7 +18,7 @@ const getSize = (req,res) => { step : 10 } - res.render('size', { rangeFrom, rangeTo }); + res.render('size', { rangeFrom, rangeTo, unit }); }; const postSize = async (req, res) => { diff --git a/app/controllers/unsubscribe.js b/app/controllers/unsubscribe.js new file mode 100644 index 0000000..423f379 --- /dev/null +++ b/app/controllers/unsubscribe.js @@ -0,0 +1,15 @@ + +const { currentRERequest } = require('../helpers/url'); + +const getUnsubscribe = async (req, res) => { + const request = await currentRERequest(req); + request.subscribed = false; + await request.save(); + + res.render('unsubscribe', { nextStep: '/vrstanekretnine' }); +}; + + +module.exports = { + getUnsubscribe +}; \ No newline at end of file diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js new file mode 100644 index 0000000..b664499 --- /dev/null +++ b/app/helpers/awsEmail.js @@ -0,0 +1,87 @@ + +const dotenv = require('dotenv'); +dotenv.config(); +const AWS = require('aws-sdk'); +AWS.config.update({ + region: process.env.AMAZON_REGION, + credentials: + { + accessKeyId: process.env.AMAZON_ACCES_KEY_ID, + secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY + } +}); +const { getRegionName, getMunicipalityName } = require('./codes'); + +const sendTemplatedEmail = async (email, request) => { + + const params = { + Destination: { /* required */ + CcAddresses: [ + ], + ToAddresses: [ + email + ] + }, + Message: { /* required */ + Body: { /* required */ + Html: { + Charset: "UTF-8", + Data: getEmailHTML(request) + }, + Text: { + Charset: "UTF-8", + Data: getEmaiTextVersion(request) + } + }, + Subject: { + Charset: 'UTF-8', + Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}` + } + }, + Source: 'info@saburly.com', /* required */ + ReplyToAddresses: [ + 'info@saburly.com', + ], + }; + + const sendEmailPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendEmail(params).promise(); + await sendEmailPromise; +} + +const getEmailHTML = (realestateRequest) => { + + return `

Zdravo, + Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima.

+

Ovo je tražena nekretnina:

+
+
Tip nekretnine: ${realestateRequest.realEstateType}
+
Područje ${getRegionName(realestateRequest.region)}
+
Mjesto ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)}
+
Kvadratura nekretnine Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2
+
Kvadratura okućnice Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2
+
Cijena ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM
+
+
Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${realestateRequest.uniqueId}
+
Ako želiš promijeniti uslove pretrage klikni ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId}
+

Tvoj, +Javimi tim. +

` + +} + +const getEmaiTextVersion = (realestateRequest) => { + const text = "Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: " + + realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality) + + "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX + + "\n Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax + + "\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax + + "\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" + process.env.APP_URL + "/odjava/" + realestateRequest.uniqueId + + "\n Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId + + "\n Tvoj,\n Javimi tim" + + return text; +} + +module.exports = { + sendTemplatedEmail +}; diff --git a/app/lib/sendNotification.js b/app/lib/sendNotification.js index aeb5c58..fe84d31 100644 --- a/app/lib/sendNotification.js +++ b/app/lib/sendNotification.js @@ -1,7 +1,7 @@ const scrapTheItems = require("./scrapTheItems"); const convertToDate = require("./convertToDate"); const AWS = require('aws-sdk'); -AWS.config.update({region: 'eu-central-1'}); +// AWS.config.update({region: 'eu-central-1'}); async function sendNotification(marketAlert) { diff --git a/app/migrations/20190531111232-subscribed-boolean.js b/app/migrations/20190531111232-subscribed-boolean.js new file mode 100644 index 0000000..2143f1c --- /dev/null +++ b/app/migrations/20190531111232-subscribed-boolean.js @@ -0,0 +1,18 @@ +'use strict'; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.addColumn( + 'RealEstateRequests', + 'subscribed', + Sequelize.BOOLEAN + ); + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.removeColumn( + 'RealEstateRequests', + 'subscribed' + ); + } +}; diff --git a/app/models/realestaterequest.js b/app/models/realestaterequest.js index 9147209..e618d8d 100644 --- a/app/models/realestaterequest.js +++ b/app/models/realestaterequest.js @@ -18,7 +18,8 @@ module.exports = (sequelize, DataTypes) => { gardenSizeMax: DataTypes.INTEGER, priceMin: DataTypes.INTEGER, priceMax: DataTypes.INTEGER, - bounding_box: DataTypes.GEOMETRY('POINT', 4326) + bounding_box: DataTypes.GEOMETRY('POINT', 4326), + subscribed: DataTypes.BOOLEAN }, {}); RealEstateRequest.associate = function(models) { // associations can be defined here diff --git a/app/views/neighborhoodMap.ejs b/app/views/neighborhoodMap.ejs index 86a0cab..ce9d642 100644 --- a/app/views/neighborhoodMap.ejs +++ b/app/views/neighborhoodMap.ejs @@ -2,89 +2,124 @@

U kojem naselju tražite nekretninu?

-
+
-
-
-
- - Dalje - -
+ +
+
+ + Dalje +
- - - - - - - + + defaultAddress.value = municipality; + geocodeAddress(geocoder, map, true); + + $(document).ready(() => { + $("#btnsubmit").click(() => { + var bounds = map.getBounds(); + + $("#north").val(map.getBounds().getNorthEast().lat()); + $("#south").val(map.getBounds().getSouthWest().lat()); + $("#east").val(map.getBounds().getNorthEast().lng()); + $("#west").val(map.getBounds().getSouthWest().lng()); + + $("#form-map-output").submit(); + }); + }); + + + } + +
\ No newline at end of file diff --git a/app/views/partials/range.ejs b/app/views/partials/range.ejs index 00bb27a..0fd6930 100644 --- a/app/views/partials/range.ejs +++ b/app/views/partials/range.ejs @@ -1,56 +1,61 @@
-
-
-
Od
-
-

- -

-
-
Do
-
-

- -

+
+
+
Od
-
- - Dalje - +
+
<%= rangeFrom.value %> <%= unit %>
- - - - \ No newline at end of file + + $("#to").change(function () { + $('#to-value').text($("#to").val() + "<%= unit %>" ); + }); + + + $("#btnsubmit").click(() => { + var from = $("#from").val(); + var to = $("#to").val(); + + $("#foo").on("click", function () { + alert($(this).text()); + }); + + if (parseInt(from, 10) >= parseInt(to, 10)) { + alert("\"Od\" vrijednost ne smije biti veca od \"Do\" vrijednosti ") + return; + } + + $("#form-range").submit(); + }); + }); + \ No newline at end of file diff --git a/app/views/unsubscribe.ejs b/app/views/unsubscribe.ejs new file mode 100644 index 0000000..f976698 --- /dev/null +++ b/app/views/unsubscribe.ejs @@ -0,0 +1,14 @@ + +
+ +
+
+
Uspješno ste se odjavili
+
+
+
+ + Nova pretraga + +
+
diff --git a/index.js b/index.js index eed925f..cd479d0 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ const welcome = require('./app/controllers/welcome').getWelcome; -const { getRealEstateTypes, postRealEstateTypes} = require('./app/controllers/realEstateTypes'); +const { getRealEstateTypes, postRealEstateTypes } = require('./app/controllers/realEstateTypes'); const { getRegion, postRegion } = require('./app/controllers/regions'); const { getMunicipality, postMunicipality } = require('./app/controllers/municipalities'); const { getSize, postSize } = require('./app/controllers/sizes'); @@ -9,6 +9,7 @@ const { getQueryReview, postQueryReview } = require('./app/controllers/queryRevi const { getQuerySubmit, postQuerySubmit } = require('./app/controllers/querySubmit'); const { getGoAgain } = require('./app/controllers/goAgain'); const { getNeighborhood, postNeighborhood } = require('./app/controllers/neighborhoodMap'); +const { getUnsubscribe } = require('./app/controllers/unsubscribe'); let express = require("express"); const path = require("path"); @@ -106,7 +107,7 @@ app.post("/api/payforalert", (req, res) => { } }; - tco.checkout.authorize(params, function(error, data) { + tco.checkout.authorize(params, function (error, data) { if (error) { res.send(error.message); } else { @@ -146,6 +147,8 @@ app.post('/pregled/:request_id', postQueryReview); app.get('/posalji/:request_id', getQuerySubmit); app.post('/posalji/:request_id', postQuerySubmit); +app.get('/odjava/:request_id', getUnsubscribe); + app.get('/ponovo', getGoAgain); app.use('/assets', express.static('./app/public')); From 506ac67956cf8c7d2e19d7587608984bf1f78507 Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Tue, 11 Jun 2019 10:26:48 +0200 Subject: [PATCH 2/3] Fixed garden size email issues --- .env | 1 + .gitignore | 1 + app/helpers/awsEmail.js | 29 +++++++++++++++++++---------- development.env | 5 +++++ 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 development.env diff --git a/.env b/.env index 05ed185..23ac77e 100644 --- a/.env +++ b/.env @@ -2,4 +2,5 @@ AMAZON_SECRET_ACCESS_KEY=HIFVed2iqt3PRCsvrO9Evqxr/7/u+UmY8WrTItq3 AMAZON_REGION=eu-west-1 APP_URL=http://localhost:3001 + SOURCE_EMAIL=info@saburly.com \ No newline at end of file diff --git a/.gitignore b/.gitignore index c2658d7..713d500 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules/ +.env diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js index b664499..f0f01e6 100644 --- a/app/helpers/awsEmail.js +++ b/app/helpers/awsEmail.js @@ -1,6 +1,8 @@ const dotenv = require('dotenv'); dotenv.config(); +const { getRealEstateTypeEnum } = require('./enums'); +const { getRegionName, getMunicipalityName } = require('./codes'); const AWS = require('aws-sdk'); AWS.config.update({ region: process.env.AMAZON_REGION, @@ -10,7 +12,6 @@ AWS.config.update({ secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY } }); -const { getRegionName, getMunicipalityName } = require('./codes'); const sendTemplatedEmail = async (email, request) => { @@ -38,9 +39,9 @@ const sendTemplatedEmail = async (email, request) => { Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}` } }, - Source: 'info@saburly.com', /* required */ + Source: process.env.SOURCE_EMAIL, /* required */ ReplyToAddresses: [ - 'info@saburly.com', + process.env.SOURCE_EMAIL, ], }; @@ -49,17 +50,22 @@ const sendTemplatedEmail = async (email, request) => { } const getEmailHTML = (realestateRequest) => { + const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType); + const gardenSize = realEstateType.hasGardenSize ? `
Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2
` : `` return `

Zdravo, Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima.

Ovo je tražena nekretnina:

-
Tip nekretnine: ${realestateRequest.realEstateType}
-
Područje ${getRegionName(realestateRequest.region)}
-
Mjesto ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)}
-
Kvadratura nekretnine Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2
-
Kvadratura okućnice Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2
-
Cijena ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM
+
Tip nekretnine: ${realEstateType.title}
+
Područje: ${getRegionName(realestateRequest.region)}
+
Mjesto: ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)}
+
Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2
+ ${gardenSize} +
Cijena: ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM
+
+
+
Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${realestateRequest.uniqueId}
Ako želiš promijeniti uslove pretrage klikni ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId}
@@ -70,10 +76,13 @@ Javimi tim. } const getEmaiTextVersion = (realestateRequest) => { + const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType); + const gardenSize = realEstateType.hasGardenSize ? "Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax : "" + const text = "Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: " + realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality) + "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX + - "\n Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax + + + gardenSize "\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax + "\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" + process.env.APP_URL + "/odjava/" + realestateRequest.uniqueId + "\n Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId + diff --git a/development.env b/development.env new file mode 100644 index 0000000..3980ba3 --- /dev/null +++ b/development.env @@ -0,0 +1,5 @@ + AMAZON_ACCES_KEY_ID=(your-key-here) + AMAZON_SECRET_ACCESS_KEY=(your-key-here) + AMAZON_REGION=eu-west-1 + APP_URL=http://localhost:3001 + SOURCE_EMAIL=info@saburly.com \ No newline at end of file From caa1871939e47e72a0d3cedfd940c81d658bfe3e Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Tue, 11 Jun 2019 10:34:48 +0200 Subject: [PATCH 3/3] deleted env file --- .env | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 23ac77e..0000000 --- a/.env +++ /dev/null @@ -1,6 +0,0 @@ - AMAZON_ACCES_KEY_ID=AKIA3LOYP3GY5FGF5UMO - AMAZON_SECRET_ACCESS_KEY=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 - AMAZON_REGION=eu-west-1 - APP_URL=http://localhost:3001 - SOURCE_EMAIL=info@saburly.com - \ No newline at end of file