Merge branch 'nav-bar' into 'master'

Handle nav-bar See merge request saburly/marketalarm/web!23
2019-07-12 13:22:16 +00:00
parent e305c547e1 f9abf48f61
commit 4517624fa8
28 changed files with 107 additions and 90 deletions
--- 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/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 = "Koju nekretninu tražite?"
+  res.render('welcome', { nextStep: '/vrstanekretnine', title } );
 };

 module.exports = {
--- 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,15 @@
  width: 95%
 }

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

 #map {
  height: 50%;
@@ -23,6 +38,7 @@ body {
  height: 100%;
  margin: 0;
  padding: 0;
+  font-family: 'Tangerine', serif;
 }
  
 #floating-panel {
--- a/app/views/gardenSize.ejs
+++ b/app/views/gardenSize.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koliko okućnice tražite ?</h2>
-</div>
+<% include partials/navBar %> 

 <% include partials/range %> 
--- a/app/views/goAgain.ejs
+++ b/app/views/goAgain.ejs
@@ -1,14 +1,8 @@
 <!--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>
+<% include partials/navBar %> 

 <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,23 @@
-<!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>
+  <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,7 +1,5 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojem mjestu tražite nekretninu?</h2>
-</div>
+<% include partials/navBar %> 

 <form method="POST" id="form-municipality">
 <div class="row center-align">
--- a/app/views/neighborhoodMap.ejs
+++ b/app/views/neighborhoodMap.ejs
@@ -1,6 +1,4 @@
-<div class="row center-align">
-  <h2>U kojem naselju tražite nekretninu?</h2>
-</div>
+<% include partials/navBar %> 

 <div class="row center-align">
  <div id="floating-panel">
--- 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,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koja Vam okvirna cijena odgovara ?</h2>
-</div>
+<% include partials/navBar %> 

 <% include partials/range %> 
--- a/app/views/queryReview.ejs
+++ b/app/views/queryReview.ejs
@@ -1,7 +1,5 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Da li je ovo to što ste tražili ?</h2>
-</div>
+<% include partials/navBar %> 

 <form method="POST" id="form-queryreview">
 <div class="row center-align">
--- a/app/views/querySubmit.ejs
+++ b/app/views/querySubmit.ejs
@@ -1,6 +1,9 @@
 <!--suppress HtmlUnknownAnchorTarget -->
+<% include partials/navBar %> 
+
+
 <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,7 +1,5 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koju nekretninu tražite?</h2>
-</div>
+<% include partials/navBar %> 

 <form method="POST" id="form-real-estate-type">
 <div class="row center-align">
--- a/app/views/region.ejs
+++ b/app/views/region.ejs
@@ -1,7 +1,5 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojoj regiji tražite nekretninu?</h2>
-</div>
+<% include partials/navBar %> 

 <form method="POST" id="form-region">
 <div class="row center-align">
--- a/app/views/size.ejs
+++ b/app/views/size.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Od koliko kvadrata tražite nekretninu ?</h2>
-</div>
+<% include partials/navBar %> 

 <% include partials/range %> 
--- a/app/views/unsubscribe.ejs
+++ b/app/views/unsubscribe.ejs
@@ -1,10 +1,8 @@

+<% include partials/navBar %> 
 <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/index.js
+++ b/index.js
@@ -119,25 +119,6 @@ app.post("/api/payforalert", (req, res) => {
  });
 });

-var runServices = async () => {
-
-  
-}
-
-runServices();
-
-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');
-  });
-
-
-
 app.get('/', welcome);
 app.get('/vrstanekretnine/:request_id', getRealEstateTypes);
 app.get('/vrstanekretnine', getRealEstateTypes);
@@ -176,3 +157,13 @@ app.get('/ponovo', getGoAgain);
 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');
+  });