Fixed margin for navbar

Show only 10 realestates in notificatio email
2019-07-29 14:39:31 +02:00 · 2019-07-29 13:04:25 +02:00
17 changed files with 12 additions and 33 deletions
--- a/app/controllers/welcome.js
+++ b/app/controllers/welcome.js
@@ -1,5 +1,5 @@
 const getWelcome = (req,res) => {
-  const title = "Koju nekretninu tražite?"
+  const title = ""
  res.render('welcome', { nextStep: '/vrstanekretnine', title } );
 };

--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -4,7 +4,8 @@ const { getRealEstateTypeEnum } = require('./enums');
 const { getRegionName, getMunicipalityName } = require('./codes');
 const { allRERequestByUiid } = require('./db/dbHelper');
 var AWS = require('aws-sdk');
-const TEMPLATE_NAME = "MarketAlertTemplate"
+const TEMPLATE_NAME = process.env.AMAZON_NOTIFICATION_EMAIL_TEMPLATE;
+const NUMBER_OF_RESULTS_TO_SHOW=10;

 AWS.config.update({
  region: process.env.AMAZON_REGION,
@@ -100,9 +101,7 @@ const sendBulkEmail = async (marketAlerts) => {
    destinations = []
    groupedRERequests = [];

-
    const RERequestUuidsMaped = marketAlerts.map(marketAlert => marketAlert.request);
-
    const RERequestUuidsArray = Array.from(new Set(RERequestUuidsMaped));

    const RERequestUuids = RERequestUuidsArray.map(marketAlert => {
@@ -196,9 +195,13 @@ const sendBulkEmail = async (marketAlerts) => {
 const toAWSArray = (urlArray) => {

  let arrayString = ""
+  i = 0
  urlArray.forEach(element => {
    const formatetdTitle = element.title.replace(/"/g, "");
-    arrayString = arrayString + `{"url":"${element.url.trim()}" , "title":"${formatetdTitle}"},`
+    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);

--- a/app/public/main.css
+++ b/app/public/main.css
@@ -23,7 +23,6 @@
  margin-top: 200px;
 }

-
 .centered-element-small {
  margin-top: 100px;
 }
@@ -36,9 +35,7 @@
 html,
 body {
  height: 100%;
-  margin: 0;
-  padding: 0;
-  font-family: 'Tangerine', serif;
+
 }
  
 #floating-panel {
--- a/app/views/gardenSize.ejs
+++ b/app/views/gardenSize.ejs
@@ -1,4 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <% include partials/range %> 
--- a/app/views/goAgain.ejs
+++ b/app/views/goAgain.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <form method="POST" id="form-goagain">
 <div class="row centered-element">
  <div class="col s3 push-s3">
--- a/app/views/layout.ejs
+++ b/app/views/layout.ejs
@@ -12,7 +12,9 @@
 </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>
--- a/app/views/municipality.ejs
+++ b/app/views/municipality.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <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,5 +1,3 @@
-<% include partials/navBar %> 
-
 <div class="row center-align">
  <div id="floating-panel">
    <input id="address" type="textbox" value="">
--- a/app/views/price.ejs
+++ b/app/views/price.ejs
@@ -1,4 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <% include partials/range %> 
--- a/app/views/queryReview.ejs
+++ b/app/views/queryReview.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <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,7 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
-
 <div class="row center-align">
  <h6>Da Vam javimo kada se Vaša željena nekretnina pojavi u oglasima, upišite vaš e-mail</h6>
 </div>
--- a/app/views/realEstateType.ejs
+++ b/app/views/realEstateType.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <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
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <div class="row center-align">
    <ul class="collection with-header">
      <% for(const realEstate of realEstates) { %>
--- a/app/views/region.ejs
+++ b/app/views/region.ejs
@@ -1,6 +1,4 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <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,4 +1,2 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
-
 <% include partials/range %> 
--- a/app/views/unsubscribe.ejs
+++ b/app/views/unsubscribe.ejs
@@ -1,5 +1,4 @@

-<% include partials/navBar %> 
 <div class="row center-align">
    <span class="welcome-big-logo">🤙</span>
 </div>
--- 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
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