From b80577ef6be316b0169618f1339b4a608aa177e2 Mon Sep 17 00:00:00 2001
From: Naida Vatric <naida.dozic@gmail.com>
Date: Mon, 24 Feb 2020 23:15:48 +0100
Subject: [PATCH] WiP Ad preview page - flexslider problem.

---
 app/controllers/publishRealEstate.js      |  4 +--
 app/controllers/publishRealEstateTypes.js |  4 ++-
 app/controllers/viewRealEstate.js         | 20 +++++++++++--
 app/controllers/welcome.js                |  6 ++--
 app/public/main.css                       |  4 +++
 app/views/viewRealEstate.ejs              | 34 +++++++++++++++++------
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/app/controllers/publishRealEstate.js b/app/controllers/publishRealEstate.js
index 3e1b159..90ccec4 100644
--- a/app/controllers/publishRealEstate.js
+++ b/app/controllers/publishRealEstate.js
@@ -9,6 +9,8 @@ const {
   ACCESS_ROAD_TYPE,
   HEATING_TYPE
 } = require("../common/enums");
+const { APP_URL } = require("../config/appConfig");
+
 const {
   BASIC_BOOLEAN_PUBLISH,
   BASIC_SEGMENT_PUBLISH,
@@ -185,8 +187,6 @@ const postPublishInputs = async (req, res) => {
   }
 
   const nextStepPage = req.query.nextStep || "/uspjesnaobjava";
-  //
-  console.log("Req body:", req.body);
 
   const balcony = req.body.balcony === "on";
   const elevator = req.body.elevator === "on";
diff --git a/app/controllers/publishRealEstateTypes.js b/app/controllers/publishRealEstateTypes.js
index c053f1e..b49b415 100644
--- a/app/controllers/publishRealEstateTypes.js
+++ b/app/controllers/publishRealEstateTypes.js
@@ -6,6 +6,7 @@ const {
 const { createKiviOriginal } = require("../helpers/db/kiviOriginal");
 
 const { AD_CATEGORY, AD_TYPE, AD_AGENCY } = require("../common/enums");
+const { APP_URL } = require("../config/appConfig");
 
 const getPublishTypes = async (req, res) => {
   const kiviOriginal = await currentKiviRealEstate(req);
@@ -77,11 +78,12 @@ const postPublishTypes = async (req, res) => {
       const newKiviOriginal = await createKiviOriginal({
         email: ""
       });
+      const newKiviAdViewUrl = `${APP_URL}/preglednekretnine/${newKiviOriginal.kiviAdId}`;
 
       const newRealEstate = await createRealEstate({
         adType: adTypeStringId,
         realEstateType: selectedRealEstateType,
-        url: "http://localhost:5000/",
+        url: newKiviAdViewUrl,
         originAgencyName: AD_AGENCY.KIVI,
         agencyObjectId: newKiviOriginal.kiviAdId
       });
diff --git a/app/controllers/viewRealEstate.js b/app/controllers/viewRealEstate.js
index c63a2fd..f2dfd78 100644
--- a/app/controllers/viewRealEstate.js
+++ b/app/controllers/viewRealEstate.js
@@ -10,6 +10,8 @@ const {
   ADDITIONAL_INPUT_PUBLISH
 } = require("../common/publishEnums");
 
+const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
+
 const getViewRealEstate = async (req, res) => {
   const kiviOriginal = await currentKiviRealEstate(req);
 
@@ -163,6 +165,20 @@ const getViewRealEstate = async (req, res) => {
     "https://cdn.pixabay.com/photo/2020/02/18/01/16/down-4858219__340.jpg"
   ];
 
+  const showRealEstateType = AD_CATEGORY[realEstateType].title.toUpperCase();
+  let showAdType = "";
+  switch (adType) {
+    case AD_TYPE.AD_TYPE_SALE.stringId:
+      showAdType = AD_TYPE.AD_TYPE_SALE.title.toUpperCase();
+      break;
+    case AD_TYPE.AD_TYPE_RENT.stringId:
+      showAdType = AD_TYPE.AD_TYPE_RENT.title.toUpperCase();
+      break;
+    default:
+      showAdType = "-";
+      break;
+  }
+
   res.render("viewRealEstate", {
     title: pageTitle,
     booleanFields,
@@ -172,8 +188,8 @@ const getViewRealEstate = async (req, res) => {
     allSegmentSelectedValues,
     locationLat,
     locationLong,
-    adType,
-    realEstateType,
+    showAdType,
+    showRealEstateType,
     realEstatePhotosUrls
   });
 };
diff --git a/app/controllers/welcome.js b/app/controllers/welcome.js
index 11b42b5..30d793c 100644
--- a/app/controllers/welcome.js
+++ b/app/controllers/welcome.js
@@ -2,6 +2,7 @@ const { createSearchRequest } = require("../helpers/db/searchRequest");
 const { createRealEstate } = require("../helpers/db/realEstate");
 const { createKiviOriginal } = require("../helpers/db/kiviOriginal");
 const { AD_TYPE, AD_CATEGORY, AD_AGENCY } = require("../common/enums");
+const { APP_URL } = require("../config/appConfig");
 
 const getWelcome = (req, res) => {
   res.render("welcome", {
@@ -39,11 +40,12 @@ const postWelcome = async (req, res) => {
         email: ""
       });
 
+      const newKiviAdViewUrl = `${APP_URL}/preglednekretnine/${newKiviOriginal.kiviAdId}`;
+
       const newRealEstate = await createRealEstate({
         adType: adTypeStringId,
         realEstateType: AD_CATEGORY.FLAT.id,
-        //Temp variable because of the not null constraints
-        url: "http://localhost:5000/",
+        url: newKiviAdViewUrl,
         originAgencyName: AD_AGENCY.KIVI,
         agencyObjectId: newKiviOriginal.kiviAdId
       });
diff --git a/app/public/main.css b/app/public/main.css
index 5a30beb..d7e12a5 100644
--- a/app/public/main.css
+++ b/app/public/main.css
@@ -181,3 +181,7 @@ h3 {
   -webkit-hyphens: auto;
   hyphens: auto;
 }
+
+.flex-direction-nav li a {
+  height: 50px;
+}
diff --git a/app/views/viewRealEstate.ejs b/app/views/viewRealEstate.ejs
index 302863f..9112365 100644
--- a/app/views/viewRealEstate.ejs
+++ b/app/views/viewRealEstate.ejs
@@ -1,16 +1,28 @@
+<br/>
+<div class="row col s12 center-align">
+  <div class="col s6 center-align distinguished">
+    <div><%= showAdType %> </div>
+  </div>
+  <div class="col s6 center-align distinguished">
+    <%= showRealEstateType %> 
+  </div>
+</div>
+
+
+
 <section class="slider">
-  <div class="flexslider" style="direction:rtl">
+  <div class="flexslider" >
     <ul class="slides">
       <% for (const photoUrl of realEstatePhotosUrls) { %>
-        <li>
-          <img src=<%= photoUrl %> alt=""/>
-        </li>
-        <% } %>
+      <li>
+        <img src=<%= photoUrl %> alt=""/>
+    </li>
+    <% } %>
     </ul>
   </div>
 </section>
 
-
+<br/>
 <br>
 <div class="row col s12">
 <% for (const field of inputFields){ %>
@@ -60,12 +72,16 @@
 </div>
 
 <script type="text/javascript">
-  // Can also be used with $(document).ready()
        $(window).load(function() {
-         $('.flexslider').flexslider({
+   
+            $('.flexslider').flexslider({
            animation: "slide",
-           rtl: true
+          
+           smoothHeight: true
          });
+          
+       
+         
        });
 </script>