diff --git a/app/common/publishEnums.js b/app/common/publishEnums.js index e98f361..93f6073 100644 --- a/app/common/publishEnums.js +++ b/app/common/publishEnums.js @@ -6,6 +6,16 @@ const { } = require("./enums"); const BASIC_BOOLEAN_PUBLISH = [ + { + dbField: "balcony", + title: "Balkon", + categoriesToShow: [ + AD_CATEGORY.FLAT, + AD_CATEGORY.HOUSE, + AD_CATEGORY.APARTMENT, + AD_CATEGORY.COTTAGE + ] + }, { dbField: "newBuilding", title: "Novogradnja", @@ -18,17 +28,6 @@ const BASIC_BOOLEAN_PUBLISH = [ AD_CATEGORY.GARAGE ] }, - { - dbField: "balcony", - title: "Balkon", - categoriesToShow: [ - AD_CATEGORY.FLAT, - AD_CATEGORY.HOUSE, - AD_CATEGORY.APARTMENT, - AD_CATEGORY.COTTAGE - ] - }, - { dbField: "elevator", title: "Lift", @@ -52,34 +51,6 @@ const BASIC_BOOLEAN_PUBLISH = [ ]; const BASIC_INPUT_PUBLISH = [ - { - dbField: "title", - title: "Naslov", - categoriesToShow: [ - AD_CATEGORY.FLAT, - AD_CATEGORY.HOUSE, - AD_CATEGORY.APARTMENT, - AD_CATEGORY.COTTAGE, - AD_CATEGORY.OFFICE, - AD_CATEGORY.LAND, - AD_CATEGORY.GARAGE - ], - constraint: ["required"] - }, - { - dbField: "shortDescription", - title: "Opis", - categoriesToShow: [ - AD_CATEGORY.FLAT, - AD_CATEGORY.HOUSE, - AD_CATEGORY.APARTMENT, - AD_CATEGORY.COTTAGE, - AD_CATEGORY.OFFICE, - AD_CATEGORY.LAND, - AD_CATEGORY.GARAGE - ], - constraint: [] - }, { dbField: "price", title: "Cijena (KM)", @@ -114,20 +85,6 @@ const BASIC_INPUT_PUBLISH = [ categoriesToShow: [AD_CATEGORY.HOUSE, AD_CATEGORY.COTTAGE], constraint: ["numerical"] }, - { - dbField: "streetName", - title: "Adresa", - categoriesToShow: [ - AD_CATEGORY.FLAT, - AD_CATEGORY.HOUSE, - AD_CATEGORY.APARTMENT, - AD_CATEGORY.COTTAGE, - AD_CATEGORY.OFFICE, - AD_CATEGORY.LAND, - AD_CATEGORY.GARAGE - ], - constraint: [] - }, { dbField: "numberOfRooms", title: "Broj soba", @@ -160,6 +117,48 @@ const BASIC_INPUT_PUBLISH = [ AD_CATEGORY.OFFICE ], constraint: ["integer"] + }, + { + dbField: "title", + title: "Naslov", + categoriesToShow: [ + AD_CATEGORY.FLAT, + AD_CATEGORY.HOUSE, + AD_CATEGORY.APARTMENT, + AD_CATEGORY.COTTAGE, + AD_CATEGORY.OFFICE, + AD_CATEGORY.LAND, + AD_CATEGORY.GARAGE + ], + constraint: ["required"] + }, + { + dbField: "shortDescription", + title: "Opis", + categoriesToShow: [ + AD_CATEGORY.FLAT, + AD_CATEGORY.HOUSE, + AD_CATEGORY.APARTMENT, + AD_CATEGORY.COTTAGE, + AD_CATEGORY.OFFICE, + AD_CATEGORY.LAND, + AD_CATEGORY.GARAGE + ], + constraint: [] + }, + { + dbField: "streetName", + title: "Adresa", + categoriesToShow: [ + AD_CATEGORY.FLAT, + AD_CATEGORY.HOUSE, + AD_CATEGORY.APARTMENT, + AD_CATEGORY.COTTAGE, + AD_CATEGORY.OFFICE, + AD_CATEGORY.LAND, + AD_CATEGORY.GARAGE + ], + constraint: [] } ]; diff --git a/app/controllers/publishRealEstate.js b/app/controllers/publishRealEstate.js index b072551..8bb66a5 100644 --- a/app/controllers/publishRealEstate.js +++ b/app/controllers/publishRealEstate.js @@ -243,9 +243,6 @@ const postPublishInputs = async (req, res) => { //Contact email saved in other table const contactEmail = req.body.email || ""; - const imageUrlsArray = req.body.imageUrls || []; - console.log(imageUrlsArray); - realEstate.balcony = balcony; realEstate.elevator = elevator; realEstate.newBuilding = newBuilding; diff --git a/app/public/main.css b/app/public/main.css index d2ba8e1..afb8c00 100644 --- a/app/public/main.css +++ b/app/public/main.css @@ -164,6 +164,7 @@ h3 { } .custom-col { + width: 18%; margin-left: auto; left: auto; right: auto; @@ -174,16 +175,7 @@ h3 { border-radius: 10px; border: 4px dashed #02adba; border-image: none; - max-width: 100%; + max-width: 500px; margin-left: auto; margin-right: auto; } - -.dz-progress { - /* progress bar covers file name */ - display: none; -} - -h3.custom-h3 { - font-size: 20px; -} diff --git a/app/views/publishAdditionalData.ejs b/app/views/publishAdditionalData.ejs index 7a5a21d..6e57174 100644 --- a/app/views/publishAdditionalData.ejs +++ b/app/views/publishAdditionalData.ejs @@ -1,7 +1,7 @@
<% for (const input of additionalInputInputs){ %> -
+