diff --git a/app/config/appConfig.js b/app/config/appConfig.js index 3e6003f..4b2b1aa 100644 --- a/app/config/appConfig.js +++ b/app/config/appConfig.js @@ -55,5 +55,4 @@ module.exports = { STAGING, CHECK_UP_DAYS, PROSTOR_LOGIN - }; diff --git a/app/controllers/viewRealEstate.js b/app/controllers/viewRealEstate.js index 403e902..e002751 100644 --- a/app/controllers/viewRealEstate.js +++ b/app/controllers/viewRealEstate.js @@ -134,9 +134,7 @@ const getViewRealEstate = async (req, res) => { ...BASIC_SEGMENT_PUBLISH, ...ADDITIONAL_SEGMENT_PUBLISH ]; - // - console.log("ALL BOOLEAN FIELDS:", ALL_BOOLEAN_FIELDS); - console.log("All boolean values", allBooleanValues); + //On view add page we will show only values that are not - null, or "", or undefined const forShowing = value => { return value !== false && value !== null && value !== ""; @@ -153,15 +151,15 @@ const getViewRealEstate = async (req, res) => { return forShowing(allSegmentSelectedValues[object.dbField]); }); - //console.log("booleanFields", booleanFields); - res.render("viewRealEstate", { title: pageTitle, booleanFields, inputFields, allInputValues, segmentFields, - allSegmentSelectedValues + allSegmentSelectedValues, + locationLat, + locationLong }); }; diff --git a/app/public/main.css b/app/public/main.css index 2f53359..5a30beb 100644 --- a/app/public/main.css +++ b/app/public/main.css @@ -169,3 +169,15 @@ h3 { left: auto; right: auto; } + +.dont-break-out { + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-all; + word-break: break-word; + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; +} diff --git a/app/views/publishRealEstate.ejs b/app/views/publishRealEstate.ejs index 9a863a5..51adf17 100644 --- a/app/views/publishRealEstate.ejs +++ b/app/views/publishRealEstate.ejs @@ -198,9 +198,7 @@ } */ if (!hasErrors) { - // - alert("Pokusavam submit formu!"); - + $("#publishForm").submit(); }; diff --git a/app/views/viewRealEstate.ejs b/app/views/viewRealEstate.ejs index fb64c1a..7acf2b7 100644 --- a/app/views/viewRealEstate.ejs +++ b/app/views/viewRealEstate.ejs @@ -1,20 +1,11 @@
-
-<% for (const field of booleanFields){ %> -

- <%= field.title %> - -

-<% } %> -
- -
-
+
<% for (const field of inputFields){ %>

- <%= field.title %> - <%= allInputValues[field.dbField] %> + <%= field.title %> + <%= allInputValues[field.dbField] %>

+
<% } %>
@@ -22,12 +13,81 @@
<% for (const field of segmentFields){ %>

- <%= field.title %> + <%= field.title.replace(/>/g,'') %> <% for (const segmentObject of field.values) { %> <% if (allSegmentSelectedValues[field.dbField] === segmentObject.id) { %> - <%= segmentObject.title %> - <% } %>> + <%= segmentObject.title.replace(/>/g,'') %> + <% } %> <% } %>

+
<% } %> -
\ No newline at end of file +
+
+
+<% for (const field of booleanFields){ %> +

+ + <%= field.title %> + +

+<% } %> +
+ +
+
+ Lokacija nekretnine + +
+
+
+
+
+
+
+ + + \ No newline at end of file