Fixed margin for navbar

Show only 10 realestates in notificatio email
Merge branch 'marketalerts-page' into 'master'
2019-07-29 14:39:31 +02:00 · 2019-07-29 13:04:25 +02:00 · 2019-07-15 09:48:08 +00:00 · 2019-07-15 11:47:41 +02:00 · 2019-07-15 11:40:28 +02:00 · 2019-07-12 18:00:02 +02:00
45 changed files with 1131 additions and 436 deletions
--- a/README.md
+++ b/README.md
@@ -34,3 +34,10 @@ this will create and run postgres image and then execute migrations

 5. Run app  
 `npm start` or `npm run start-mon` to run app with automatic restart on code change
+
+
+### AWS SES
+
+    - AWS SES credentials are handled with env vratiables
+    - Notification emails are sent in batches of 50, by using SES templates
+    - Make sure that you are using different templates for different envirorments
--- a/app/controllers/gardenSizes.js
+++ b/app/controllers/gardenSizes.js
@@ -3,6 +3,8 @@ const { getRealEstateTypeEnum } = require('../helpers/enums');

 const getGardenSize = (req,res) => {

+  const title = "Koliko okućnice tražite ?"
+
  const unit = " m2"
  const rangeFrom = {
    min : 10,
@@ -18,7 +20,7 @@ const getGardenSize = (req,res) => {
    step : 10
  }

-  res.render('gardenSize', { rangeFrom, rangeTo, unit });
+  res.render('gardenSize', { rangeFrom, rangeTo, unit, title });
 };

 const postGardenSize = async (req, res) => {
--- a/app/controllers/goAgain.js
+++ b/app/controllers/goAgain.js
@@ -1,5 +1,6 @@
 const getGoAgain = async (req,res) => {
-  res.render('goAgain');
+  const title = "Želite li pretražiti još jednu nekretninu ?";
+  res.render('goAgain', {title});
 };

 module.exports = {
--- a/app/controllers/municipalities.js
+++ b/app/controllers/municipalities.js
@@ -2,10 +2,12 @@ const { currentRERequest } = require('../helpers/url');
 const { getMunicipalitiesForRegion, getMunicipalityName } = require('../helpers/codes');

 const getMunicipality = async (req, res) => {
+
+  const title = "U kojem mjestu tražite nekretninu?"
  let request = await currentRERequest(req);
  const municipalities = getMunicipalitiesForRegion(request.region);

-  res.render('municipality', { municipalities });
+  res.render('municipality', { municipalities, title });
 };

 const postMunicipality = async (req, res) => {
--- a/app/controllers/neighborhoodMap.js
+++ b/app/controllers/neighborhoodMap.js
@@ -1,11 +1,15 @@
 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 || '/';
+
    res.render('neighborhoodMap', {
        nextStep,
-        municipality
+        municipality,
+        title
    });

 };
--- a/app/controllers/prices.js
+++ b/app/controllers/prices.js
@@ -2,6 +2,8 @@ const { currentRERequest } = require('../helpers/url');

 const getPrice = (req,res) => {

+  const title = "Koja Vam okvirna cijena odgovara ?"
+
  const unit = " KM"
  const rangeFrom = {
    min : 1000,
@@ -18,7 +20,7 @@ const getPrice = (req,res) => {
  }


-  res.render('price', {rangeFrom, rangeTo, unit  });
+  res.render('price', {rangeFrom, rangeTo, unit, title  });
 };

 const postPrice = async (req, res) => {
--- a/app/controllers/queryReview.js
+++ b/app/controllers/queryReview.js
@@ -3,6 +3,8 @@ 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 request = await currentRERequest(req);
  const nextStep = req.query.nextStep;

@@ -69,6 +71,7 @@ const getQueryReview = async (req,res) => {
  res.render('queryReview', {
    nextStep,
    queryData,
+    title
  });
 };

--- a/app/controllers/querySubmit.js
+++ b/app/controllers/querySubmit.js
@@ -3,12 +3,15 @@ const { isValidEmail } = require('../helpers/email');
 const { sendTemplatedEmail} = require('../helpers/awsEmail');

 const getQuerySubmit = async (req, res) => {
+
+  const title = "Upišite vaš e-mail"
  const nextStep = req.query.nextStep;
  const error = req.query.error;

  res.render('querySubmit', {
    nextStep,
-    error
+    error,
+    title
  });
 };

--- a/app/controllers/realEstateTypes.js
+++ b/app/controllers/realEstateTypes.js
@@ -5,7 +5,8 @@ const { realEstateTypes, getRealEstateTypeEnum } = require('../helpers/enums');


 const getRealEstateTypes = (req,res) => {
-  res.render('realEstateType', { realEstateTypes });
+  const title = "Koju nekretninu tražite?"
+  res.render('realEstateType', { realEstateTypes, title });
 };

 const postRealEstateTypes = async (req, res) => {
--- a/app/controllers/realEstates.js
+++ b/app/controllers/realEstates.js
@@ -0,0 +1,18 @@
+
+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 title = "Ovo su nekretnine koje smo pronašli za vas"
+    res.render('realEstates', {realEstates, title } );
+  };
+  
+  module.exports = {
+    getRealEstates
+  };
+  
--- a/app/controllers/regions.js
+++ b/app/controllers/regions.js
@@ -4,7 +4,8 @@ const { getRegions } = require('../helpers/codes');
 const regions = getRegions();

 const getRegion = (req,res) => {
-  res.render('region', { regions });
+  const title = "U kojoj regiji tražite nekretninu?"
+  res.render('region', { regions, title });
 };

 const postRegion = async (req, res) => {
--- a/app/controllers/sizes.js
+++ b/app/controllers/sizes.js
@@ -3,6 +3,7 @@ const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');

 const getSize = (req,res) => {

+  const title = "Od koliko kvadrata tražite nekretninu ?"
  const unit = " m2"
  const rangeFrom = {
    min : 10,
@@ -18,7 +19,7 @@ const getSize = (req,res) => {
    step : 10
  }

-  res.render('size', { rangeFrom, rangeTo, unit });
+  res.render('size', { rangeFrom, rangeTo, unit, title });
 };

 const postSize = async (req, res) => {
--- a/app/controllers/unsubscribe.js
+++ b/app/controllers/unsubscribe.js
@@ -2,11 +2,13 @@
 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();

-    res.render('unsubscribe', { nextStep: '/vrstanekretnine' });
+    res.render('unsubscribe', { nextStep: '/vrstanekretnine', title });
 };


--- a/app/controllers/welcome.js
+++ b/app/controllers/welcome.js
@@ -1,5 +1,6 @@
 const getWelcome = (req,res) => {
-  res.render('welcome', { nextStep: '/vrstanekretnine' } );
+  const title = ""
+  res.render('welcome', { nextStep: '/vrstanekretnine', title } );
 };

 module.exports = {
--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -1,9 +1,12 @@

-const dotenv = require('dotenv');
-dotenv.config();
+const dotenv = require('dotenv').config();
 const { getRealEstateTypeEnum } = require('./enums');
 const { getRegionName, getMunicipalityName } = require('./codes');
-const AWS = require('aws-sdk');
+const { allRERequestByUiid } = require('./db/dbHelper');
+var AWS = require('aws-sdk');
+const TEMPLATE_NAME = process.env.AMAZON_NOTIFICATION_EMAIL_TEMPLATE;
+const NUMBER_OF_RESULTS_TO_SHOW=10;
+
 AWS.config.update({
  region: process.env.AMAZON_REGION,
  credentials:
@@ -27,16 +30,16 @@ const sendTemplatedEmail = async (email, request) => {
      Body: { /* required */
        Html: {
          Charset: "UTF-8",
-          Data: getEmailHTML(request)
+          Data: getGreetingsEmailHTML(request)
        },
        Text: {
          Charset: "UTF-8",
-          Data: getEmaiTextVersion(request)
+          Data: getGreetingsEmaiTextVersion(request)
        }
      },
      Subject: {
        Charset: 'UTF-8',
-        Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}`
+        Data: `Javimi Potvrda: ${getSubject(request.realEstateType, request.region, request.municipality)}`
      }
    },
    Source: process.env.SOURCE_EMAIL, /* required */
@@ -49,7 +52,7 @@ const sendTemplatedEmail = async (email, request) => {
  await sendEmailPromise;
 }

-const getEmailHTML = (realestateRequest) => {
+const getGreetingsEmailHTML = (realestateRequest) => {
  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
  const gardenSize = realEstateType.hasGardenSize ? `<div><strong>Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2  </strong></div>` : ``

@@ -75,15 +78,15 @@ Javimi tim.

 }

-const getEmaiTextVersion = (realestateRequest) => {
+const getGreetingsEmaiTextVersion = (realestateRequest) => {
  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
-  const gardenSize = realEstateType.hasGardenSize ? "Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax  : ""
+  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 +
    + gardenSize
-    "\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax +
+  "\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"
@@ -91,6 +94,160 @@ const getEmaiTextVersion = (realestateRequest) => {
  return text;
 }

+const sendBulkEmail = async (marketAlerts) => {
+
+  try {
+
+    destinations = []
+    groupedRERequests = [];
+
+    const RERequestUuidsMaped = marketAlerts.map(marketAlert => marketAlert.request);
+    const RERequestUuidsArray = Array.from(new Set(RERequestUuidsMaped));
+
+    const RERequestUuids = RERequestUuidsArray.map(marketAlert => {
+      return { uniqueId: marketAlert }
+    });
+
+    const RERequests = await allRERequestByUiid(RERequestUuids);
+    const requestDataValues = [];
+
+    RERequests.forEach(RERequest => {
+      var formatedRequest = {};
+      formatedRequest[RERequest.uniqueId] =
+        requestDataValues[RERequest.uniqueId] = {
+          realEstateType: RERequest.realEstateType,
+          region: RERequest.region,
+          municipality: RERequest.municipality,
+          requestUrl :  `${process.env.APP_URL}/nekretnine/${RERequest.uniqueId}`
+        };
+    });
+
+    marketAlerts.forEach(marketAlert => {
+
+      const requestObject = {
+        email: marketAlert.email,
+        realEstateType: requestDataValues[marketAlert.request].realEstateType,
+        municipality: requestDataValues[marketAlert.request].municipality,
+        region: requestDataValues[marketAlert.request].region,
+        requestUrl: requestDataValues[marketAlert.request].requestUrl
+        
+      }
+
+      if (!groupedRERequests[marketAlert.request]) {
+        groupedRERequests[marketAlert.request] = {
+          requestObject: requestObject,
+          marketAlertArray: []
+        };
+      }
+
+      groupedRERequests[marketAlert.request].marketAlertArray.push({
+        url: marketAlert.url,
+        title: marketAlert.title,
+      });
+    });
+    for (request in groupedRERequests) {
+
+      const marketAlert = groupedRERequests[request];
+      let extractedData = toAWSArray(marketAlert.marketAlertArray);
+      const realEstateType = getRealEstateTypeEnum(marketAlert.requestObject.realEstateType).title;
+      const region = getRegionName(marketAlert.requestObject.region);
+      const municipality = getMunicipalityName(marketAlert.requestObject.region, marketAlert.requestObject.municipality);
+      const requestUrl = marketAlert.requestObject.requestUrl
+
+      let repData = `{ "marketAlertUrl":[${extractedData}], "realestateType":"${realEstateType}", "region":"${region}", "municipality":"${municipality}", "requestUrl":"${requestUrl}" }`
+
+      destinations.push({
+        Destination: {
+          ToAddresses: [
+            marketAlert.requestObject.email
+          ]
+        },
+        ReplacementTemplateData: repData
+      })
+
+    }
+    console.log("AWS EMAIL : Bulk email replacement data:");
+    console.log(destinations);
+
+    var params = {
+      Destinations:
+        destinations,
+      Source: process.env.SOURCE_EMAIL, /* required */
+      Template: TEMPLATE_NAME, /* required */
+      DefaultTemplateData: '{ \"REPLACEMENT_TAG_NAME\":\"REPLACEMENT_VALUE\" }',
+      ReplyToAddresses: [
+        process.env.SOURCE_EMAIL,
+      ]
+    };
+
+    // Create the promise and SES service object
+    const sendPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendBulkTemplatedEmail(params).promise();
+    const awsResult = await sendPromise;
+    console.log("AWS SES bulk email response");
+    console.log(awsResult);
+
+
+  } catch (e) {
+    console.log("Could not send bulk email", e)
+  }
+}
+
+const toAWSArray = (urlArray) => {
+
+  let arrayString = ""
+  i = 0
+  urlArray.forEach(element => {
+    const formatetdTitle = element.title.replace(/"/g, "");
+    arrayString =  i <= NUMBER_OF_RESULTS_TO_SHOW  ? arrayString +  `{"url":"${element.url.trim()}" , "title":"${formatetdTitle}"},` : arrayString;
+    console.log(i);
+    console.log(arrayString);
+    i++
+  });
+  return arrayString.slice(0, -1);
+
+}
+
+const getNotificationEmailHtml = () => {
+  return `<h2> Zdravo, 
+  Pronašli smo nekretninu koju ste tražili. </h2>
+  <h3> Ovo su tražene nekretnine:  </h3> 
+  <div>
+  <div>{{#each marketAlertUrl}}<li><a href="{{url}}">{{title}}</a></li><br />{{/each}}<div/> 
+  <div/>
+  <div>Kompletan spisak nekretnina možete pegledati ovdije: <a href="{{requestUrl}}">Nekretnine</a> <div>
+  </div>`
+}
+
+const getNotificationEmailText = () => {
+  return ` Zdravo, 
+  Pronašli smo nekretninu koju ste tražili.  Ovo su tražene nekretnine: {{#each marketAlertUrl}} {{url}} {{title}} {{/each}} , Kompletan spisan nekretnina mozete pegledati ovdije: {{requestUrl}}`
+}
+
+const createMarketAlertEmailTemplate = async () => {
+  const marketAlertTemplate = {
+    Template: {
+      TemplateName: TEMPLATE_NAME,
+      SubjectPart: "Javi mi obavijest: {{realestateType}}, {{region}}, {{municipality}}",
+      TextPart: getNotificationEmailText(),
+      HtmlPart: getNotificationEmailHtml()
+    }
+  }
+
+  try {
+    const templatePromise = new AWS.SES({ apiVersion: '2010-12-01' }).updateTemplate(marketAlertTemplate).promise();
+    await templatePromise
+
+  } catch (e) {
+    console.log("Could not create MarketAlertEmailTemplate", e);
+  }
+}
+
+const getSubject = (realEstateType, region, municipality) => {
+  return `${getRealEstateTypeEnum(realEstateType).title} ${getRegionName(region)}, ${getMunicipalityName(region, municipality)}`
+}
+
 module.exports = {
-  sendTemplatedEmail
+  sendTemplatedEmail,
+  sendBulkEmail,
+  createMarketAlertEmailTemplate
 };
--- a/app/helpers/crawlers/olxClawler.js
+++ b/app/helpers/crawlers/olxClawler.js
@@ -7,205 +7,60 @@ const Promise = require("bluebird");

 module.exports = class OlxCrawler {
    //TODO figure best way to handle paging
-    constructor(fromPage = 0, toPage = 10, maxResults = 1000) {
-        this.fromPage = fromPage;
-        this.toPage = toPage;
-        this.maxResults = maxResults;
+    constructor(hrefs = []) {
+        this.hrefs = hrefs;
    }

-    async indexSingle(url, email) {
-        try {
-            const res = await fetch(url);
-            const body = await res.text();
-            const $ = cheerio.load(body);
+    async indexPages(urls) {
+        const indexers = [];

-            //TODO figure out what to do with username
-            const username = $('#lg > div.desno2.profil > div:nth-child(2) > div.vrsta1.vrsta_desno > a > div.username > span').text();
+        urls.forEach(url => {
+            indexers.push(new Indexer(url));
+        });

-            // if (IGNORED_USERNAMES.includes((username || '').toLowerCase())) {
-            //     return null;
-            // }
-
-            //TODO remove properties that are not needed, and add some if they are missing
-            const title = $('#naslovartikla').text();
-            const realEstateType = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(3) > div > span:nth-child(3) > a > span').text();
-
-            const price = $('#pc > p:nth-child(2)').text();
-            const size = $('#dodatnapolja1 > div:nth-child(1) > div.df2').text();
-            const rooms = $('#dodatnapolja1 > div:nth-child(2) > div.df2').text();
-            const address = $('#dodatnapolja1 > div:nth-child(5) > div.df2').text();
-            const gardenSize = $('#dodatnapolja1 > div:nth-child(6) > div.df2').text();
-            const location = $('#artikal_glavni_div > div.artikal_lijevo > div.op.pop.mobile-lokacija').attr('data-content');
-
-            const adType = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(15) > div:nth-child(2) > div.df2').text();
-            const time = $('time').attr('datetime');
-            const olxId = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(15) > div:nth-child(4) > div.df2').text();
-
-            const descriptions = $('.artikal_detaljniopis_tekst');
-            // const floor = $('#dodatnapolja1').find(':contains(Sprat)').last().nextAll().text();
-            const latLngRe = /LatLng\(([0-9]+\.[0-9]+)\,\s+([0-9]+\.[0-9]+)\)/g;
-            const imgRe = /href":("[^"]*")/g;
-            const matches = latLngRe.exec(body);
-            let lng = '',
-                lat = '';
-
-
-            const parseRooms = (rooms) => parseInt([...rooms].filter(c => !isNaN(c)).filter(c => c.trim()).join())
-            const parsePrice = (price) => parseFloat(price.replace(".", ""))
-
-
-            // TODO we dont save images ??
-
-            // const images = [];
-            // const imgMatches = body.match(imgRe);
-
-            // for (let i = 0; imgMatches && i < imgMatches.length; i++) {
-            //     let img = imgMatches[i].replace("href\":", "")
-            //     img = img.replace("\"", "");
-            //     img = img.replace("\"", "");
-            //     images.push(img);
-            // }
-
-            // const uploadPromises = images.map(img => {
-            //     const imgFixed = eval(`'${img}'`);
-            //     return cloudinary.uploader.upload(eval(`'${img}'`));
-            // });
-
-            // const uploadResults = await Promise.all(uploadPromises);
-            // const cloudinaryImages = uploadResults.map(ur => ur.url);
-
-            if (matches && matches.length >= 3) {
-                lat = matches[1];
-                lng = matches[2];
-            }
-
-            const parsedPrice = parsePrice(price);
-
-            const locationArray = location.split(",");
-            const region = locationArray[0];
-            const municipality = locationArray[1];
-
-            const data = {
-                realEstateType: this.getCategoryId(realEstateType),
-                email : email,
-                olxId: olxId,
-                // category: category,
-                url,
-                title,
-                price: isNaN(parsedPrice) ? 0 : parsedPrice,
-                size: parseFloat(size),
-                gardenSize: isNaN(parseFloat(gardenSize)) ?  0 : parseFloat(gardenSize),
-                address,
-                region,
-                municipality,
-                // adType: AD_TYPE_SALE,
-                time,
-                shortDescription: descriptions.first().text(),
-                longDescription: descriptions.last().text(),
-                lat,
-                lng,
-                loc: [parseFloat(lat), parseFloat(lng)],
-                // images: cloudinaryImages
-            };
-
-            return data;
-        } catch (e) {
-            console.error('Exception caught: ' + e.message);
-        }
-
-        return null;
-    }
-
-    async indexPage(olxUrl, maxResults = 1000) {
-        try {
-            //TODO fix paging
-            // console.log('Starting to index page: ' + pageNr);
-            // const url = `http://www.olx.ba/pretraga?vrsta=samoprodaja&sort_order=desc&kategorija=23&sort_po=datum&kanton=9&stranica=${pageNr}`;
-
-            const res = await fetch(olxUrl.url);
-            const body = await res.text();
-            const $ = cheerio.load(body);
-            const hrefs = [];
-            const results = [];
-
-            $('#rezultatipretrage').find('.listitem').each((i, elem) => {
-                const href = $(elem).find('a').first().attr('href');
-                hrefs.push(href);
-            });
-
-            let actualNoOfResults = (hrefs.length <= maxResults) ? hrefs.length : maxResults;
-
-            for (let i = 0; i < hrefs.length; i++) {
-                console.log(`indexing: ${hrefs[i]}`);
-
-                const singleData = await this.indexSingle(hrefs[i], olxUrl.email);
-
-                if (singleData) {
-                    results.push(singleData);
-                }
-            }
-
-            return results;
-        } catch (e) {
-            console.error('Exception caught:' + e);
-        }
-    }
-
-    getCategoryId (category) {
-
-        switch(category) {
-            case 'Stanovi':
-              return 'stan';
-
-            case 'Vikendice':
-              return 'vikendica'
-
-            case 'Kuće':
-                return 'kuca';
-
-            default:
-             return '';
-          }
-      }
-
-    async indexPages(urls, start, end, maxResults = 1000) {
-        //TODO fix paging
-        // let results = {};
-        // for (let i = start; i <= end; i++) {
-        //     let result = await this.indexPage(i, maxResults);
-        //     Object.assign(results, result)
-        // }
-        // return results;
-
-        let results = [];
-        for (let url of urls) {
-            let result = await this.indexPage(url, maxResults);
-            results.push(result);
-        }
-        return results;
+        return Promise.map(indexers, function (indexer) {
+            return indexer.indexWithPagination();
+        }).then(async (results) => {
+            return results
+        })
    }

    async crawl() {
+        console.log("OLX CRAWLER: start crawl");

        const filteredResults = [];
-        const realestateRequests = await allRERequest()
+        const realestateRequests = await allRERequest();
+        console.log("OLX CRAWLER: found " + realestateRequests.length + "subscribed RealEstateRequests");
        const urls = this.createRequestUrls(realestateRequests);
        let results = await this.indexPages(urls, this.fromPage, this.toPage, this.maxResults);
+        console.log("Final crawler results");
+        const flatResults = results.flat();
+        console.log(flatResults);
+        if (flatResults) {
+            console.log(flatResults.length);

-        for (const result of results) {
-            for (const finalResult of result) {
-                if (finalResult.lat !== undefined && finalResult.lat !== null && finalResult.lat !== "") {
-                    const pointInsideBoundingBox = await findPointInsideBoundingBox([finalResult.lng, finalResult.lat]);
+            for (const finalResult of flatResults) {

-                    if (pointInsideBoundingBox[0].length !== 0) {
-                        filteredResults.push(finalResult);
+                if (null !== finalResult) {
+                    if (finalResult.lat !== undefined && finalResult.lat !== null && finalResult.lat !== "") {
+                        const pointInsideBoundingBox = await findPointInsideBoundingBox([finalResult.lng, finalResult.lat], finalResult.email, finalResult.uuid);
+
+
+                        if (pointInsideBoundingBox[0].length !== 0) {
+                            finalResult.hasLocation = true
+                            filteredResults.push(finalResult);
+                        } else {
+                            finalResult.hasLocation = false
+                            filteredResults.push(finalResult);
+                        }
                    }
                }
            }
-        }

-        console.log(filteredResults);
-        return filteredResults;
+            console.log("OLX CRAWLER: number of olx crawler results, after geo location filtering: " + filteredResults.length);
+            return filteredResults;
+        }
+        return []
    }

    createRequestUrls(realestateRequests) {
@@ -221,8 +76,10 @@ module.exports = class OlxCrawler {
            const priceMax = "do=" + request.priceMax;

            const olxUrl = {
-                url: `https://www.olx.ba/pretraga?${realsestateType}&id=2&stanje=0&vrstapregleda=tabela&sort_order=desc&${region}&${municipality}&${priceMin}&${priceMax}&vrsta=samoprodaja&${sizeMin}&${sizeMax}`,
-                email: request.email
+                url: `https://www.olx.ba/pretraga?${realsestateType}&id=2&stanje=0&vrstapregleda=tabela&sort_order=desc&${region}&${municipality}&${priceMin}&${priceMax}&vrsta=samoprodaja&${sizeMin}&${sizeMax}&stranica=`,
+                email: request.email,
+                uuid: request.uniqueId,
+                hrefs: this.hrefs
            }
            console.log(olxUrl.url);
            urls.push(olxUrl);
@@ -232,3 +89,287 @@ module.exports = class OlxCrawler {
    }
 };

+
+class Indexer {
+
+    /**
+     * 
+     * @param {String|Array} olxUrl single or array of objects containing url email and uuid 
+     * @param {Array} hrefResutls array contaning urls from crawler results
+     */
+
+    constructor(olxUrl, hrefResutls) {
+        this.olxUrl = olxUrl;
+        this.hrefResutls = hrefResutls;
+    }
+
+    async indexWithPagination(pageNumber = 1) {
+
+        console.log("This is olxUrl:" + this.olxUrl.url);
+        const pageNr = this.olxUrl.url.match(/\d+$/);
+        const indexers = this.prepareIndexers(pageNumber ? [pageNumber] : pageNr);
+
+        try {
+
+            return Promise.map(indexers.indexers, function (indexer) {
+                return indexer.indexPage(pageNumber);
+            }).then(async (results) => {
+                let hasResults = false;
+
+                results.forEach(result => {
+                    if (!hasResults) {
+                        console.log("No results detected")
+                        hasResults = result.hasResults
+                    }
+                });
+
+                if (!hasResults) {
+                    console.log("HAS NO MORE RESULTS, stop the paging, there are some results and they should contain only HREFS");
+                    console.log(results.length);
+                    const singlePageIndexers = this.prepareHrefIndexers(results);
+                    if (singlePageIndexers.length === 0) {
+                        console.log("THERE IS NOT EVEN SINGLE RESULT");
+                        return []
+                    }
+
+                    return Promise.map(singlePageIndexers, function (indexer) {
+                        return indexer.indexSingle();
+                    }).then(async (results) => {
+                        console.log("SinglePageMethod in HAS NO RESULTS, MarketAralms");
+                        console.log(results.length);
+                        return results;
+                    });
+
+                } else {
+                    console.log("HAS MORE RESULTS, should only contain HREFS");
+                    console.log(results.length);
+                    const newResults = await this.indexWithPagination(results[0].pageNumber + 5);
+                    const singlePageIndexers = this.prepareHrefIndexers(results);
+
+                    const newerResults = await Promise.map(singlePageIndexers, function (indexer) {
+                        return indexer.indexSingle();
+                    }).then(async (results) => {
+                        console.log("SinglePageMethod HAS RESULTS, should contain MarketAlerts only");
+                        console.log(results.length);
+                        return results;
+                    });
+
+                    Array.prototype.push.apply(newResults, newerResults);
+                    return newResults;
+
+                }
+            });
+        } catch (e) {
+            console.error("Error has accured", e);
+        }
+
+    }
+
+    prepareIndexers(pageNr) {
+
+        console.log("Entering prepareIndexers : page nr - " + pageNr);
+        const indexers = [];
+        let lastPageNumber;
+        if (pageNr) {
+            for (let index = Number(pageNr[0]); index <= Number(pageNr[0]) + 5; index++) {
+                lastPageNumber = index;
+                const newOlxUrl = {
+                    url: this.olxUrl.url.replace(/\d+$/, "") + index,
+                    email: this.olxUrl.email,
+                    uuid: this.olxUrl.uuid,
+                    hrefs: this.olxUrl.hrefs
+                }
+                indexers.push(new Indexer(newOlxUrl));
+
+            }
+        } else {
+            for (let index = 1; index <= 5; index++) {
+                lastPageNumber = index;
+                const newOlxUrl = {
+                    url: this.olxUrl.url + index,
+                    email: this.olxUrl.email,
+                    uuid: this.olxUrl.uuid,
+                    hrefs: this.olxUrl.hrefs
+                }
+                indexers.push(new Indexer(newOlxUrl));
+            }
+        }
+        return {
+            indexers: indexers,
+            lastPageNumber: lastPageNumber
+        };
+    }
+
+    prepareHrefIndexers(results) {
+        const indexers = []
+
+        if (!Array.isArray(results)) {
+            results.hrefs.forEach(href => {
+                const newOlxUrl = {
+                    url: href,
+                    email: results.olxUrl.email,
+                    uuid: results.olxUrl.uuid,
+                    hrefs: this.olxUrl.hrefs
+                }
+
+                indexers.push(new Indexer(newOlxUrl));
+            });
+
+        } else {
+
+
+            results.forEach(result => {
+
+                if (result !== null && result.hasOwnProperty('hrefs')) {
+                    result.hrefs.forEach(href => {
+                        const newOlxUrl = {
+                            url: href,
+                            email: result.olxUrl.email,
+                            uuid: result.olxUrl.uuid,
+                            hrefs: this.olxUrl.hrefs
+                        }
+
+                        indexers.push(new Indexer(newOlxUrl));
+                    })
+                }
+
+            });
+        }
+
+        return indexers;
+    }
+
+    async indexPage(pageNumber) {
+        console.log("Page number in index page, max page number :")
+        console.log(pageNumber);
+
+        try {
+
+            console.log("Indexing page: " + this.olxUrl.url);
+            const res = await fetch(this.olxUrl.url);
+            const body = await res.text();
+            const $ = cheerio.load(body);
+            const hrefs = [];
+            let hasResults = false
+
+            $('#rezultatipretrage').find('.listitem').each((i, elem) => {
+                hasResults = true
+                const href = $(elem).find('a').first().attr('href');
+                hrefs.push(href);
+            });
+
+            console.log("this is hrefs for olxUrl" + this.olxUrl.url);
+            console.log("NUMBER OF HREFS " + hrefs.length);
+
+            return {
+                hrefs: hrefs,
+                hasResults: hasResults,
+                pageNumber: pageNumber,
+                olxUrl: this.olxUrl
+            }
+        } catch (e) {
+            console.error('Exception caught:' + e);
+        }
+    }
+
+    async indexSingle() {
+        try {
+            console.log("Index single");
+            console.log(this.olxUrl.url);
+
+            if (this.olxUrl.url === undefined) {
+                return {}
+            }
+
+            // if (global.hrefs) {
+
+            if (this.olxUrl.hrefs[this.olxUrl.uuid] && this.olxUrl.hrefs[this.olxUrl.uuid].includes(this.olxUrl.url)) {
+
+                console.log("We found duplicate URL");
+                return null
+            }
+            // }
+
+            const res = await fetch(this.olxUrl.url);
+            const body = await res.text();
+            const $ = cheerio.load(body);
+
+            const title = $('#naslovartikla').text().trim();
+            const realEstateType = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(3) > div > span:nth-child(3) > a > span').text();
+
+            const price = $('#pc > p:nth-child(2)').text();
+            const size = $('#dodatnapolja1 > div:nth-child(1) > div.df2').text();
+            const rooms = $('#dodatnapolja1 > div:nth-child(2) > div.df2').text();
+            const address = $('#dodatnapolja1 > div:nth-child(5) > div.df2').text();
+            const gardenSize = $('#dodatnapolja1 > div:nth-child(6) > div.df2').text();
+            const location = $('#artikal_glavni_div > div.artikal_lijevo > div.op.pop.mobile-lokacija').attr('data-content');
+
+            const time = $('time').attr('datetime');
+            const olxId = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(15) > div:nth-child(4) > div.df2').text();
+
+            const descriptions = $('.artikal_detaljniopis_tekst');
+            const latLngRe = /LatLng\(([0-9]+\.[0-9]+)\,\s+([0-9]+\.[0-9]+)\)/g;
+            const imgRe = /href":("[^"]*")/g;
+            const matches = latLngRe.exec(body);
+            let lng = '',
+                lat = '';
+            const parsePrice = (price) => parseFloat(price.replace(".", ""))
+
+            if (matches && matches.length >= 3) {
+                lat = matches[1];
+                lng = matches[2];
+            }
+
+            const parsedPrice = parsePrice(price);
+
+            const locationArray = location.split(",");
+            const region = locationArray[0];
+            const municipality = locationArray[1];
+
+            const data = {
+                realEstateType: this.getCategoryId(realEstateType),
+                email: this.olxUrl.email,
+                uuid: this.olxUrl.uuid,
+                olxId: olxId,
+                url: this.olxUrl.url,
+                title,
+                price: isNaN(parsedPrice) ? 0 : parsedPrice,
+                size: parseFloat(size),
+                gardenSize: isNaN(parseFloat(gardenSize)) ? 0 : parseFloat(gardenSize),
+                address,
+                region,
+                municipality,
+                time,
+                shortDescription: descriptions.first().text(),
+                longDescription: descriptions.last().text(),
+                lat,
+                lng,
+                loc: [parseFloat(lat), parseFloat(lng)],
+            };
+
+            return data;
+        } catch (e) {
+            console.error('Exception caught: ' + e.message);
+        }
+
+        return null;
+    }
+
+    getCategoryId(category) {
+
+        switch (category) {
+            case 'Stanovi':
+                return 'stan';
+
+            case 'Vikendice':
+                return 'vikendica'
+
+            case 'Kuće':
+                return 'kuca';
+
+            default:
+                return '';
+        }
+    }
+}
+
--- a/app/helpers/db/dbHelper.js
+++ b/app/helpers/db/dbHelper.js
@@ -1,15 +1,90 @@
 const db = require('../../models/index');

-// TODO Fetch only subscribed realestate requests
+/**
+ * Find all subscribed RealEstateRequests 
+ */
 const allRERequest = async () => {
-  return await db.RealEstateRequest.findAll();
+    return await db.RealEstateRequest.findAll({
+        where: {
+            subscribed: true
+        }
+      });
 }

-const findPointInsideBoundingBox = async (latLng) => {
-  return await db.sequelize.query("SELECT * FROM \"RealEstateRequests\" WHERE ST_Contains(\"RealEstateRequests\".bounding_box, ST_GEOMFROMTEXT(\'POINT (" + latLng[0] + " " + latLng[1]+ ")\'))");
+/**
+ * Find all subscribed RealEstateRequests by UUID
+ */
+const allRERequestByUiid = async (requestArray) => {
+
+  const Op = db.Sequelize.Op;
+  return await db.RealEstateRequest.findAll({
+      where: {
+          subscribed: true,
+          [Op.or]: requestArray
+      }
+    });
+}
+
+/**
+ * Find all , or all depending on notified bolean marketalerts, that the hasLocation is true, and order them by email
+ * 
+ * @param fechAll bolean
+ * @param notified bolean
+ * 
+ * @returns array of MarketAlerts
+ */
+const allMarketAlerts = async (fetchAll, notified) => {
+
+    let queryObject = {
+        order: [
+            ['email', 'DESC'],
+        ]
+    }
+
+    if (!fetchAll){
+        queryObject.where = {
+            notified: notified,
+            hasLocation: true
+        }
+    }
+
+    return await db.MarketAlert.findAll(queryObject);
+  }
+
+  /**
+ * Find all , MarketAlerts depending on request
+ * 
+ * @param request string
+ * 
+ * @returns array of MarketAlerts
+ */
+const allMarketAlertsByRequest = async (request) => {
+
+  let queryObject = {
+    where : {
+      request: request
+    }
+  }
+
+  return await db.MarketAlert.findAll(queryObject);
+}
+
+  
+/**
+ * Find all unnotified marketalerts 
+ *  @param latLng array
+ *  @param email string
+ * 
+ * @returns array of MarketAlerts
+ */
+const findPointInsideBoundingBox = async (latLng, email, uniqueId) => {
+  return await db.sequelize.query(`SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND "uniqueId" = '${uniqueId}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${latLng[0]} ${latLng[1]})'))`);
 }

 module.exports = {
  allRERequest,
-  findPointInsideBoundingBox
+  allMarketAlerts,
+  allRERequestByUiid,
+  findPointInsideBoundingBox,
+  allMarketAlertsByRequest
 };
--- a/app/helpers/url.js
+++ b/app/helpers/url.js
@@ -7,17 +7,6 @@ const currentRERequest = async (req) => {
  const request = await db.RealEstateRequest.findOne({ where: {uniqueId} });
  return request;
 };
-// TODO Fetch only subscribed realestate requests
-const allRERequest = async () => {
-  return await db.RealEstateRequest.findAll();
-}
-
-const findPointInsideBoundingBox = async (latLng) => {
-  return await db.sequelize.query("SELECT * FROM \"RealEstateRequests\" WHERE ST_Contains(\"RealEstateRequests\".bounding_box, ST_GEOMFROMTEXT(\'POINT (" + latLng[0] + " " + latLng[1]+ ")\'))");
-}
-
 module.exports = {
  currentRERequest,
-  allRERequest,
-  findPointInsideBoundingBox
 };
--- a/app/migrations/20190625120813-add-notification-sent-boolean-marketalerts.js
+++ b/app/migrations/20190625120813-add-notification-sent-boolean-marketalerts.js
@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn(
+        'MarketAlerts',
+        'notified',
+        {
+          type: Sequelize.BOOLEAN
+        }
+    );
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'notified'
+    );
+  }
+};
--- a/app/migrations/20190628165512-add-title-to-marketalerts.js
+++ b/app/migrations/20190628165512-add-title-to-marketalerts.js
@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn(
+        'MarketAlerts',
+        'title',
+        {
+          type: Sequelize.STRING
+        }
+    );
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'title'
+    );
+  }
+};
--- a/app/migrations/20190702132143-add-RREquet-uuid-to-marketalerts.js
+++ b/app/migrations/20190702132143-add-RREquet-uuid-to-marketalerts.js
@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn(
+        'MarketAlerts',
+        'request',
+        {
+          type: Sequelize.STRING
+        }
+    );
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'request'
+    );
+  }
+};
--- a/app/migrations/20190710141356-add-has-location-to-marketalerts.js
+++ b/app/migrations/20190710141356-add-has-location-to-marketalerts.js
@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn(
+        'MarketAlerts',
+        'hasLocation',
+        {
+          type: Sequelize.BOOLEAN
+        }
+    );
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'hasLocation'
+    );
+  }
+};
--- a/app/models/marketalert.js
+++ b/app/models/marketalert.js
@@ -11,6 +11,10 @@ module.exports = (sequelize, DataTypes) => {
    municipality : DataTypes.STRING,
    region : DataTypes.STRING,
    realEstateType : DataTypes.STRING,
+    notified : DataTypes.BOOLEAN,
+    title : DataTypes.STRING,
+    request: DataTypes.STRING,
+    hasLocation: DataTypes.BOOLEAN,
    
    email: { 
      type: DataTypes.STRING,
--- a/app/public/main.css
+++ b/app/public/main.css
@@ -2,6 +2,12 @@
  width: 100%; 
 }

+.next-center-button { 
+  width: 50%;
+  left: 25%; 
+}
+
+
 .welcome-big-logo { 
  font-size: 200pt;
  background-image: url(./images/logo.png);
@@ -13,6 +19,14 @@
  width: 95%
 }

+.centered-element {
+  margin-top: 200px;
+}
+
+.centered-element-small {
+  margin-top: 100px;
+}
+

 #map {
  height: 50%;
@@ -21,8 +35,7 @@
 html,
 body {
  height: 100%;
-  margin: 0;
-  padding: 0;
+
 }
  
 #floating-panel {
--- a/app/services/crawlerService.js
+++ b/app/services/crawlerService.js
@@ -2,54 +2,84 @@
 const Promise = require("bluebird");
 const OlxCrawler = require("../helpers/crawlers/olxClawler");
 const db = require("../models/index");
+const { allMarketAlerts } = require('../helpers/db/dbHelper');

-const olxCrawler = new OlxCrawler(1, 2, 3);
-
-const crawlers = [
-    olxCrawler,
-];

 async function crawlAll() {
+    console.log("CRAWLER SERVICE: crawlAll");

-    Promise.map(crawlers, function (crawler) {
-        return crawler.crawl();
-    }).then(async (results) => {
+    try {
+        const marketAlertsFromDb = await allMarketAlerts(true);
+        const hrefs = [];

-        try {
-
-            const marketAlertsFromDb = await db.MarketAlert.findAll();
-
-            const marketAlerts = [];
-            const mergedResults = [].concat.apply([], results);
-
-            for (const result of mergedResults) {
-                marketAlerts.push({
-                    url: result.url,
-                    realestateOrigin: "OLX",
-                    originId: 1,
-                    size: result.size,
-                    price: result.price,
-                    email: result.email,
-                    // lastDate: DataTypes.STRING,
-                    municipality: result.municipality,
-                    region: result.region,
-                    gardenSize: isNaN(result.gardenSize) ? 0 : result.gardenSize,
-                    realEstateType: result.realEstateType
-                })
+        marketAlertsFromDb.map(marketAlert => {
+            if (hrefs[marketAlert.request] === undefined) {
+                hrefs[marketAlert.request] = []
            }
+
+            hrefs[marketAlert.request].push(marketAlert.url);
+        })
+
+        console.log("CRAWLER SERVICE: GLOBAL HREFS");
+        console.log(hrefs);
+        const olxCrawler = new OlxCrawler(hrefs);
+
+        const crawlers = [
+            olxCrawler,
+        ];
+ 
+        return Promise.map(crawlers, function (crawler) {
+            return crawler.crawl();
+        }).then(async (results) => {
+
            try {
-                console.log(marketAlerts);
-                const filteredMarketAlerts =  marketAlerts.filter((elem) => !marketAlertsFromDb.find(({ url }) => elem.url === url));
-                await db.MarketAlert.bulkCreate(filteredMarketAlerts);
-                process.exit()
+
+                const marketAlertsFromDb = await allMarketAlerts(false, true);
+
+                console.log("CRAWLER SERVICE: number of existing MarketAlerts from db: " + marketAlertsFromDb.length);
+
+                const marketAlerts = [];
+                const mergedResults = [].concat.apply([], results);
+
+                for (const result of mergedResults) {
+                    marketAlerts.push({
+                        url: result.url,
+                        realestateOrigin: "OLX",
+                        originId: 1,
+                        size: result.size,
+                        price: result.price,
+                        email: result.email,
+                        request: result.uuid,
+                        municipality: result.municipality,
+                        region: result.region,
+                        gardenSize: isNaN(result.gardenSize) ? 0 : result.gardenSize,
+                        realEstateType: result.realEstateType,
+                        title: result.title,
+                        notified: false,
+                        hasLocation: result.hasLocation
+                    })
+                }
+                console.log("CRAWLER SERVICE: Number of crawler results: " + marketAlerts.length);
+
+                try {
+
+                    const filteredMarketAlerts = marketAlerts.filter((elem) => !marketAlertsFromDb.find(({ url, request }) => {
+
+                        return (elem.url === url && elem.request === request)
+                    }));
+                    console.log("CRAWLER SERVICE: Number of new crawler results: " + filteredMarketAlerts.length);
+
+                    await db.MarketAlert.bulkCreate(filteredMarketAlerts);
+
+                } catch (e) {
+                    console.log("CRAWLER SERVICE: Could not bulkCreate marketalers reason: ", e);
+                }
            } catch (e) {
-                console.log("Could not bulkCreate marketalers reason: ", e);
+                console.log("CRAWLER SERVICE: Error crawling. Trying next crawler! ", e);
            }
-        } catch (e) {
-            console.log("Error crawling. Trying next crawler! ", e);
-        }
-    })
+        })
+    } catch (e) {
+        console.error("CRAWLER SERVICE:could not fetch marketalerts ", e);
+    }
 };
-
-crawlAll();
-
+module.exports = crawlAll;
--- a/app/services/notificationService.js
+++ b/app/services/notificationService.js
@@ -0,0 +1,29 @@
+
+const db = require("../models/index");
+const { allMarketAlerts } = require('../helpers/db/dbHelper');
+const { createMarketAlertEmailTemplate, sendBulkEmail } = require('../helpers/awsEmail');
+
+
+async function processNotifications() {
+
+    try {
+        const marketAlerts = await allMarketAlerts(false, false);
+        console.log(marketAlerts.length)
+        await createMarketAlertEmailTemplate();
+        if (marketAlerts.length > 0) {
+            console.log("NOTIFICATION SERVICE: Number of new alerts: " + marketAlerts.length)
+            await sendBulkEmail(marketAlerts);
+        } else {
+            console.log("NOTIFICATION SERVICE: No new alerts");
+        }
+
+        await db.MarketAlert.update(
+            { notified: true }, /* set attributes' value */
+            { where: { notified: false } } /* where criteria */
+        );
+    } catch (e) {
+        console.log("NOTIFICATION SERVICE: could not send notifications reason: ", e);
+    }
+}
+
+module.exports = processNotifications;
--- a/app/views/gardenSize.ejs
+++ b/app/views/gardenSize.ejs
@@ -1,6 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koliko okućnice tražite ?</h2>
-</div>
-
 <% include partials/range %> 
--- a/app/views/goAgain.ejs
+++ b/app/views/goAgain.ejs
@@ -1,14 +1,6 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h4>Provjerite Vaš email !</h4>
-</div>
-
-<div class="row center-align">
-  <h4>Želite li pretražiti još jednu nekretninu ?</h4>
-</div>
-
 <form method="POST" id="form-goagain">
-<div class="row">
+<div class="row centered-element">
  <div class="col s3 push-s3">
    <a href="/" class="welcome-center-button waves-effect waves-light btn">
      Da
--- a/app/views/layout.ejs
+++ b/app/views/layout.ejs
@@ -1,22 +1,25 @@
-<!doctype> 
+<!doctype>
 <html>
-  <head>
-     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.css">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-      <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <meta charset="UTF-8" />
-    <link rel="stylesheet" href="/assets/main.css">
-  </head>
-  <body>
-    <div class="container">
-      <%-body%>
-    </div>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.js"></script> 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/wnumb/1.1.0/wNumb.min.js"></script> 
-    
-    
-  </body>
-</html>
+<head>
+  <link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.css">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" href="/assets/main.css">
+</head>
+
+<body>
+    <% include partials/navBar %> 
+  <div class="container">
+
+    <%-body%>
+  </div>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/wnumb/1.1.0/wNumb.min.js"></script>
+
+</body>
+</html>
--- a/app/views/municipality.ejs
+++ b/app/views/municipality.ejs
@@ -1,8 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojem mjestu tražite nekretninu?</h2>
-</div>
-
 <form method="POST" id="form-municipality">
 <div class="row center-align">
  <ul class="collection with-header">
--- a/app/views/neighborhoodMap.ejs
+++ b/app/views/neighborhoodMap.ejs
@@ -1,7 +1,3 @@
-<div class="row center-align">
-  <h2>U kojem naselju tražite nekretninu?</h2>
-</div>
-
 <div class="row center-align">
  <div id="floating-panel">
    <input id="address" type="textbox" value="">
--- a/app/views/partials/navBar.ejs
+++ b/app/views/partials/navBar.ejs
@@ -0,0 +1,7 @@
+<div class="row center-align">
+<nav style="background-color: #26a69a; margin: auto;">
+    <div class="row center-align">
+        <h6 style="padding-top: 20px;"><%= title %></h5>
+    </div>
+</nav>
+</div>
--- a/app/views/partials/range.ejs
+++ b/app/views/partials/range.ejs
@@ -1,9 +1,9 @@
 <form method="POST" id="form-range">

-  <div class="row center-align no-ui-slider" id="slider"></div>
+  <div class="row center-align no-ui-slider centered-element-small" id="slider"></div>

-  <div class="col s6 push-s3">
-    <a id="btnsubmit" href="#" class="welcome-center-button waves-effect waves-light btn">
+  <div class="col s6 push-s3 centered-element-small">
+    <a id="btnsubmit" href="#" class="next-center-button waves-effect waves-light btn">
      Dalje
    </a>
  </div>
--- a/app/views/price.ejs
+++ b/app/views/price.ejs
@@ -1,6 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koja Vam okvirna cijena odgovara ?</h2>
-</div>
-
 <% include partials/range %> 
--- a/app/views/queryReview.ejs
+++ b/app/views/queryReview.ejs
@@ -1,8 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Da li je ovo to što ste tražili ?</h2>
-</div>
-
 <form method="POST" id="form-queryreview">
 <div class="row center-align">
  <ul class="collection with-header">
--- a/app/views/querySubmit.ejs
+++ b/app/views/querySubmit.ejs
@@ -1,6 +1,6 @@
 <!--suppress HtmlUnknownAnchorTarget -->
 <div class="row center-align">
-  <h4>Da Vam javimo kada se Vaša željena nekretnina pojavi u oglasima, upišite svoj e-mail</h4>
+  <h6>Da Vam javimo kada se Vaša željena nekretnina pojavi u oglasima, upišite vaš e-mail</h6>
 </div>

 <form method="POST" id="form-submitquery">
--- a/app/views/realEstateType.ejs
+++ b/app/views/realEstateType.ejs
@@ -1,8 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koju nekretninu tražite?</h2>
-</div>
-
 <form method="POST" id="form-real-estate-type">
 <div class="row center-align">
  <ul class="collection with-header">
--- a/app/views/realEstates.ejs
+++ b/app/views/realEstates.ejs
@@ -0,0 +1,14 @@
+<!--suppress HtmlUnknownAnchorTarget -->
+<div class="row center-align">
+    <ul class="collection with-header">
+      <% for(const realEstate of realEstates) { %>
+      <li class="collection-item">
+        <div><%= realEstate.title %>
+          <a href="<%= realEstate.url %>" class="secondary-content">
+            <i class="material-icons">send</i>
+          </a>
+        </div>
+      </li>
+      <% } %>
+    </ul>
+  </div>
--- a/app/views/region.ejs
+++ b/app/views/region.ejs
@@ -1,8 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojoj regiji tražite nekretninu?</h2>
-</div>
-
 <form method="POST" id="form-region">
 <div class="row center-align">
  <ul class="collection with-header">
--- a/app/views/size.ejs
+++ b/app/views/size.ejs
@@ -1,6 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Od koliko kvadrata tražite nekretninu ?</h2>
-</div>
-
 <% include partials/range %> 
--- a/app/views/unsubscribe.ejs
+++ b/app/views/unsubscribe.ejs
@@ -2,9 +2,6 @@
 <div class="row center-align">
    <span class="welcome-big-logo">🤙</span>
 </div>
-<div class="row center-align">
-  <div>Uspješno ste se odjavili</div>
-</div>
 <div class="row">
 <div class="col s6 push-s3">
 <a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
--- a/development.env
+++ b/development.env
@@ -1,5 +1,6 @@
  AMAZON_ACCES_KEY_ID=(your-key-here)
  AMAZON_SECRET_ACCESS_KEY=(your-key-here)
  AMAZON_REGION=eu-west-1
+  AMAZON_NOTIFICATION_EMAIL_TEMPLATE=MarketAlertTemplateDevelopment
  APP_URL=http://localhost:3001
  SOURCE_EMAIL=info@saburly.com
--- a/index.js
+++ b/index.js
@@ -10,6 +10,10 @@ const { getQuerySubmit, postQuerySubmit } = require('./app/controllers/querySubm
 const { getGoAgain } = require('./app/controllers/goAgain');
 const { getNeighborhood, postNeighborhood } = require('./app/controllers/neighborhoodMap');
 const { getUnsubscribe } = require('./app/controllers/unsubscribe');
+const { getRealEstates} = require('./app/controllers/realEstates');
+const schedule = require('node-schedule');
+const crawlAll = require('./app/services/crawlerService')
+const processNotifications = require('./app/services/notificationService')

 let express = require("express");
 const path = require("path");
@@ -151,6 +155,29 @@ app.get('/odjava/:request_id', getUnsubscribe);

 app.get('/ponovo', getGoAgain);

+app.get('/nekretnine/:request_id', getRealEstates);
+
 app.use('/assets', express.static('./app/public'));

 app.listen(port, () => console.log(`Example app listening on port ${port}!`));
+
+var rule = new schedule.RecurrenceRule();
+  rule.seccond = 1;
+  schedule.scheduleJob(rule, async function () {
+    console.log(new Date(), 'Crawler service started');
+    await crawlAll();
+    console.log(new Date(), 'Crawler service finished, starting Notification service');
+    await processNotifications();
+    console.log(new Date(), 'Notification service finished');
+  });
+
+ /**
+  * Add flat method to Array
+  */
+  Object.defineProperty(Array.prototype, 'flat', {
+    value: function(depth = 1) {
+      return this.reduce(function (flat, toFlatten) {
+        return flat.concat((Array.isArray(toFlatten) && (depth>1)) ? toFlatten.flat(depth-1) : toFlatten);
+      }, []);
+    }
+});
--- a/package-lock.json
+++ b/package-lock.json
@@ -559,13 +559,38 @@
      }
    },
    "cliui": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
      "requires": {
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
      }
    },
    "cls-bluebird": {
@@ -577,11 +602,6 @@
        "shimmer": "^1.1.0"
      }
    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
    "collection-visit": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -701,9 +721,9 @@
      "dev": true
    },
    "core-js": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
-      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
+      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
    },
    "core-util-is": {
      "version": "1.0.2",
@@ -719,6 +739,15 @@
        "capture-stack-trace": "^1.0.0"
      }
    },
+    "cron-parser": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.12.0.tgz",
+      "integrity": "sha512-1GU6CQJ6gT9XDEGeTuzfhZgFMf82BSs3ihFA3i2wr4qGKJLhO1kOvaIF9biIo39CaPgzZ17U8FgYxRv/+UR50A==",
+      "requires": {
+        "is-nan": "^1.2.1",
+        "moment-timezone": "^0.5.25"
+      }
+    },
    "cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -754,11 +783,12 @@
      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
    },
    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
      "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
      }
    },
    "dashdash": {
@@ -799,6 +829,14 @@
      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
      "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
    "define-property": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -941,6 +979,11 @@
      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
      "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
    "encodeurl": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -960,9 +1003,9 @@
      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
    },
    "es5-ext": {
-      "version": "0.10.49",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
-      "integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
+      "version": "0.10.50",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
+      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
      "requires": {
        "es6-iterator": "~2.0.3",
        "es6-symbol": "~3.1.1",
@@ -989,13 +1032,13 @@
      }
    },
    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
      "requires": {
        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
        "es6-symbol": "^3.1.1"
      }
    },
@@ -1353,7 +1396,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -1374,12 +1418,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -1394,17 +1440,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -1521,7 +1570,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -1533,6 +1583,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -1547,6 +1598,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -1554,12 +1606,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@@ -1578,6 +1632,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -1658,7 +1713,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -1670,6 +1726,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -1755,7 +1812,8 @@
        "safe-buffer": {
          "version": "5.1.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -1791,6 +1849,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -1810,6 +1869,7 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -1853,12 +1913,14 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "yallist": {
          "version": "3.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -1868,9 +1930,9 @@
      "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w=="
    },
    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
    },
    "get-stream": {
      "version": "4.1.0",
@@ -1895,9 +1957,9 @@
      }
    },
    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -2243,6 +2305,14 @@
        "is-path-inside": "^1.0.0"
      }
    },
+    "is-nan": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.2.1.tgz",
+      "integrity": "sha1-n69ltvttskt/XAYoR16nH5iEAeI=",
+      "requires": {
+        "define-properties": "^1.1.1"
+      }
+    },
    "is-npm": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
@@ -2353,14 +2423,14 @@
      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
    },
    "js-beautify": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz",
-      "integrity": "sha512-oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz",
+      "integrity": "sha512-OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q==",
      "requires": {
        "config-chain": "^1.1.12",
-        "editorconfig": "^0.15.2",
+        "editorconfig": "^0.15.3",
        "glob": "^7.1.3",
-        "mkdirp": "~0.5.0",
+        "mkdirp": "~0.5.1",
        "nopt": "~4.0.1"
      }
    },
@@ -2440,6 +2510,11 @@
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
    },
+    "long-timeout": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz",
+      "integrity": "sha1-lyHXiLR+C8taJMLivuGg2lXatRQ="
+    },
    "lowercase-keys": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
@@ -2685,6 +2760,16 @@
      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz",
      "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
    },
+    "node-schedule": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.2.tgz",
+      "integrity": "sha512-GIND2pHMHiReSZSvS6dpZcDH7pGPGFfWBIEud6S00Q8zEIzAs9ommdyRK1ZbQt8y1LyZsJYZgPnyi7gpU2lcdw==",
+      "requires": {
+        "cron-parser": "^2.7.3",
+        "long-timeout": "0.1.1",
+        "sorted-array-functions": "^1.0.0"
+      }
+    },
    "nodemon": {
      "version": "1.19.0",
      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.0.tgz",
@@ -2751,11 +2836,6 @@
        "boolbase": "~1.0.0"
      }
    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
    "oauth-sign": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -2797,6 +2877,11 @@
        }
      }
    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
    "object-visit": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -3309,14 +3394,14 @@
      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
    },
    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
    },
    "resolve": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
      "requires": {
        "path-parse": "^1.0.6"
      }
@@ -3440,9 +3525,9 @@
      }
    },
    "sequelize-cli": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-5.4.0.tgz",
-      "integrity": "sha512-4Gvl0yH0T3hhSdiiOci3+IKIfVG9x2os0hGWsbfa8QuyGgk9mZOqgTBnSCRtuxsdAyzUix9kfcTnfNolVNtprg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-5.5.0.tgz",
+      "integrity": "sha512-twVQ02alCpr2XvxNmpi32C48WZs6xHTH1OFTfTS5Meg3BVqOM8ghiZoml4FITFjlD8sAJSQjlAHTwqTbuolA6Q==",
      "requires": {
        "bluebird": "^3.5.3",
        "cli-color": "^1.4.0",
@@ -3451,7 +3536,7 @@
        "lodash": "^4.17.5",
        "resolve": "^1.5.0",
        "umzug": "^2.1.0",
-        "yargs": "^12.0.5"
+        "yargs": "^13.1.0"
      }
    },
    "serve-static": {
@@ -3633,6 +3718,11 @@
        }
      }
    },
+    "sorted-array-functions": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz",
+      "integrity": "sha512-sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="
+    },
    "source-map": {
      "version": "0.5.7",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -3721,6 +3811,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
      "requires": {
        "is-fullwidth-code-point": "^2.0.0",
        "strip-ansi": "^4.0.0"
@@ -3738,6 +3829,7 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
      "requires": {
        "ansi-regex": "^3.0.0"
      },
@@ -3745,7 +3837,8 @@
        "ansi-regex": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
        }
      }
    },
@@ -3944,6 +4037,11 @@
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
    },
+    "type": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz",
+      "integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw=="
+    },
    "type-is": {
      "version": "1.6.16",
      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
@@ -4206,38 +4304,36 @@
      }
    },
    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
      },
      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
        },
        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
          }
        },
        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
          "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^4.1.0"
          }
        }
      }
@@ -4294,28 +4390,52 @@
      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
    },
    "yargs": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+      "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.2.0",
+        "cliui": "^5.0.0",
        "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "os-locale": "^3.1.0",
        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
+        "string-width": "^3.0.0",
        "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^11.1.1"
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
      }
    },
    "yargs-parser": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-      "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
      "requires": {
        "camelcase": "^5.0.0",
        "decamelize": "^1.2.0"
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
    "test": "echo \"Error: no test specified\" && exit 1",
    "start": "node ./index.js",
    "start-mon": "nodemon ./index.js",
-    "scheduler": "node ./app/services/crawlerService.js",
    "migrate": "cd app && npx sequelize db:migrate",
    "setup": "docker build -t marketalerts .  && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 4 && npm run migrate",
    "docker-start": "docker start pg_marketalerts",
@@ -35,10 +34,11 @@
    "express-ejs-layouts": "^2.5.0",
    "express-layout": "^0.1.0",
    "node-fetch": "^2.3.0",
+    "node-schedule": "^1.3.2",
    "pg": "^7.10.0",
    "react-step-wizard": "^5.1.0",
    "sequelize": "^4.43.2",
-    "sequelize-cli": "^5.4.0"
+    "sequelize-cli": "^5.5.0"
  },
  "devDependencies": {
    "nodemon": "^1.19.0"
Author	SHA1	Message	Date
Nedim Uka	a457226207	Fixed margin for navbar	2019-07-29 14:39:31 +02:00
Nedim Uka	4f35305b0a	Show only 10 realestates in notificatio email	2019-07-29 13:04:25 +02:00
Nedim Uka	09792db21c	Merge branch 'marketalerts-page' into 'master' Real Estate Page See merge request saburly/marketalarm/web!24	2019-07-15 09:48:08 +00:00
Nedim Uka	1999d45cb2	Changed template name	2019-07-15 11:47:41 +02:00
Nedim Uka	778b5ff411	Fixed bug, for duplicate results for 2 similar re reqests of one user	2019-07-15 11:40:28 +02:00
Nedim Uka	81c30c36ec	Added realestate link to bulk email	2019-07-12 18:00:02 +02:00
Nedim Uka	753a09aa36	Fixed crawler not reading and comparing all RERequest results	2019-07-12 16:13:03 +02:00
Bilal Catic	4517624fa8	Merge branch 'nav-bar' into 'master' Handle nav-bar See merge request saburly/marketalarm/web!23	2019-07-12 13:22:16 +00:00
Nedim Uka	f9abf48f61	Removed unecessary comments	2019-07-12 10:53:23 +02:00
Nedim Uka	afeffe8c71	Added roboto font	2019-07-11 14:33:59 +02:00
Nedim Uka	a6bd63b7b8	Handle nav-bar	2019-07-11 14:25:38 +02:00
Bilal Catic	e305c547e1	Merge branch 'fetch-optimisation' into 'master' Fetch optimization See merge request saburly/marketalarm/web!22	2019-07-10 14:35:37 +00:00
Nedim Uka	33f9e37d93	Filter data by geolocation now sets hasLocation boolean instead of excluding results	2019-07-10 15:21:46 +02:00
Nedim Uka	5829de64e0	Added hrefs to global varialbe	2019-07-10 12:39:32 +02:00
Bilal Catic	efea857889	Merge branch 'services-scheduler' into 'master' Added node schedule to run crawler and notification service See merge request saburly/marketalarm/web!21	2019-07-09 21:51:15 +00:00
Nedim Uka	a43723485c	Added node schedule to run crawler and notification service	2019-07-09 16:33:00 +02:00
Nedim Uka	1b098f181c	Reduced pager to 5 pages at a time	2019-07-08 13:02:28 +02:00
Bilal Catic	2dd1eaa5fd	Merge branch 'crawler-optimisation' into 'master' Crawler optimisation See merge request saburly/marketalarm/web!20	2019-07-08 08:01:48 +00:00
Nedim Uka	039b1a6376	Optimiset crawlers , and pagingation	2019-07-05 17:18:47 +02:00
Nedim Uka	222a134bbf	Optimised crawler speed by using promises	2019-07-04 17:28:09 +02:00
Nedim Uka	0672f3c019	Changed template name	2019-07-04 09:51:04 +02:00
Bilal Catic	e4b3e3961d	Merge branch 'notification-email-subject' into 'master' Notification email subject See merge request saburly/marketalarm/web!19	2019-07-04 07:44:49 +00:00
Nedim Uka	a807cb5bf2	Bulk emali subject	2019-07-03 16:01:55 +02:00
Nedim Uka	b79a274f96	Added formated subject to bulk email	2019-07-02 21:49:56 +02:00
Bilal Catic	7f0b2d299e	Merge branch 'send-notification' into 'master' Send notification See merge request saburly/marketalarm/web!18	2019-07-02 10:32:11 +00:00
Nedim Uka	8b20f0e170	Formated title	2019-07-02 12:25:22 +02:00
Nedim Uka	93c147e73b	Looged amazon send bulk email response, fixed some emails not sent bug	2019-07-02 11:54:33 +02:00
Nedim Uka	96e9da1fb1	Send templated bulk email, and remember notifed marketalerts	2019-06-28 18:06:19 +02:00
Nedim Uka	b3baffe174	Send notification email	2019-06-27 17:29:57 +02:00
Nedim Uka	208faa08df	Added send notification service, and queried unsent marketalerts, fixed some issues with crawler, and added proper logging	2019-06-25 17:07:02 +02:00
Bilal Catic	5ffdaef1bf	Merge branch 'crawler-service' into 'master' Crawler service See merge request saburly/marketalarm/web!17	2019-06-24 14:09:47 +00:00