Real estate input clean up.

app/views/publishAdditionalData.ejs

@@ -1,7 +1,7 @@
 <br>
 <div class="row">
 <% for (const input of additionalInputInputs){ %>
-    <div class="input-field col s3 m4 l5">
+    <div class="input-field col s12">
     <textarea
             id="<%= input.dbField %>"
             form="publishForm"
@@ -15,9 +15,9 @@
 </div>
 
 <br>
-
+<div class="col s12">
 <% for (const input of additionalBooleanPublishInputs){ %>
-  <p>
+  <p class="col s3">
     <label class="checkbox-label">
       <input type="checkbox" class="filled-in" name="<%= input.dbField %>"
         <% if (additionalBooleanPublishValues[input.dbField]) { %>
@@ -27,10 +27,13 @@
     </label>
   </p>
 <% } %>
-
+</div>
+<br>
+<br>
 <br>
 <% for (const input of additionalSegmentSelectInputs){ %>
   <div>
+    <br>
     <label class="checkbox-label"><%= input.title %>: </label><br><br>
     <span class="segmented small">
       <% for (const segmentObject of input.values) { %>

app/views/publishBasicData.ejs

@@ -13,9 +13,9 @@
 <% } %>
 </div>
 <br>
-<div class="row">
+<div class="col s12">
 <% for (const input of basicBooleanPublishInputs){ %>
-  <p>
+  <p class="col s3">
     <label class="checkbox-label">
       <input type="checkbox" class="filled-in" name="<%= input.dbField %>"
         <% if (basicBooleanPublishValues[input.dbField]) { %>

app/views/publishEnd.ejs

@@ -4,15 +4,16 @@
     Unesite kontakt email i objavite oglas.
 
 <br>
-<div class="row center-align input-field col s3 m4 l5 form-group">
-  <input
-          id="email"
-          name="email"
-          type="email"
-  >
-  <div class="messages"></div>
-  <label for="email">Email</label>
-</div>
+
+<div class="row center-align">
+  <div class="col">
+      <input id="email" name="email" type="email" placeholder="vas.email@mail.com"  required size="250" />
+    </div>
+  </div>
+  <div class="col">
+    <h6 id="error-label-email" style="color: red"> </h6>
+  </div>
+
 </div>
 <br>
 <div class="row center-align">

app/views/publishLocation.ejs

@@ -1,7 +1,8 @@
 <div class="row center-align">
-    <h3>
+    <h3 class="custom-h3">
         Izaberite lokaciju nekretnine na mapi. 
     </h3>
+    <span>(Kliknite ili prevucite oznaku.)</span>
   </div>
   
   <div class="row center-align">

app/views/publishPhotos.ejs

@@ -1,111 +1,12 @@
 <br>
-<div class="mdl-textfield mdl-js-textfield mdl-textfield--file">
-  <input type="file" id="selector">
-</div>
+<br>
 
-<input class="mdl-button mdl-button--raised mdl-button--colored" type="button" value="Upload"
-  onclick="generateSignedURL()">
-
-  <div class="mdl-textfield mdl-js-textfield mdl-textfield--file" id="status"></div>
-
-<s>******************************</s>
 <div action="/photos-upload" class="dropzone" id="photos-upload">
       <div class="fallback">
         <input name="file" type="file" multiple />
       </div>
       
     </div>
-<button id="test">TEST</button>
-<input type="hidden" name="imageUrls" id="imageUrls" value="">
-<script type="text/javascript">
-  
-    $(document).ready(function(){
-     // Manual dropzone init
-      const dropzoneOptions = {
-					url: "/photos-upload", //can be a function that returns url ?
-          autoProcessQueue:false, //not to upload files automaticly
-          method: "put", //or post
-          parallelUploads: 1,
-          uploadMultiple: false, //or true ??
-					addRemoveLinks: true,
-					maxFilesize: 2, //MB,
-          resizeWidth: 600, 
-          maxFiles: 10, // ??
-          acceptedFiles: "image/*",
-          accept: function(file, done){
-            console.log('test');
-          },
-					dictDefaultMessage: `<span class="text-center">
-                              <h3>Prevuci fotografije ili klikni za dodavanje!</h3>
-                              </span>`,
-					dictResponseError: 'Error uploading file!',
-          dictRemoveFile: 'Izbriši '
-				};
-      var photosUploader = new Dropzone('#photos-upload', dropzoneOptions);
 
-      $("#test").click(function(e){
-        e.preventDefault();
-       const addedFiles = photosUploader.files.filter(file => file.status==="added");
-        addedFiles.forEach( file => {
-          generateSignedURL(file);
+<input type="hidden" name="imageUrls" id="imageUrls">
 
-        })
-      });
-
-    });
-
-    function uuidv4() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-      });
-    }
-
-    function getFileName(fileName) {
-        const encodedFileName = (uuidv4() + fileName).replace(/\s+/g, '');
-        return encodedFileName;
-    }
-
-    function upload() {
-      var file = $('#selector')[0].files[0];
-      uploadFile(file)
-    }
-
-
-    async function generateSignedURL(file) {
-      const fileName = getFileName(file.name);
-      const response = await fetch('/generateSignedURL?filename=' + fileName);
-      if (!response.ok) {
-        throw new Error('Network response for fetch was not ok.');
-      }
-      let signedUrl = await response.text();
-      signedUrl = signedUrl.replace(/\"/g, "")
-     // console.log("Got signedURL: " + c)
-     // console.log("Trying to upload " + fileName)
-      uploadFile(file, fileName, signedUrl);
-     // console.log("Complete")
-      return false;
-    }
-
-       function uploadFile(file, fileName, url) {
-      $("#status").html('Starting Upload...')
-     fetch(url, {
-        method: 'PUT',
-        headers: new Headers({'content-type': 'image/*'}),
-        mode: 'cors',
-        body: file
-      })
-        .then(response => response.text())
-        .then (response => {
-          return response;
-        }
-        )
-        .catch(error => $("#status").html(error)
-        )
-        .then(response => {
-          $("#status").html('File uploaded successfully: ' + fileName )
-          $("#imageUrls").val($("#imageUrls").val()+ fileName+"|");
-        });
-
-    }
-</script>

app/views/publishRealEstate.ejs

@@ -36,6 +36,8 @@
   $(document).ready(function(){
     $('.tabs').tabs();
 
+    //VALIDATION
+
     //Helper validation functions
     const isValidEmail = $email => {
       const simpleEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -151,9 +153,86 @@
     }
 
 }
+//FILE UPLOADS
 
+// Manual dropzone init
+const dropzoneOptions = {
+					url: "/photos-upload", //not used
+          autoProcessQueue:false, //not to upload files automaticly
+          method: "put", 
+          parallelUploads: 1,
+					addRemoveLinks: true,
+					maxFilesize: 2, //MB,
+          resizeWidth: 600, 
+          maxFiles: 10, 
+          init: function() {
+           this.on("addedfile", function(event) {
+           while (this.files.length > this.options.maxFiles) { //removes to many files
+            this.removeFile(this.files[0]);
+          }
+           });
+          },
+          acceptedFiles: "image/*",
+          dictDefaultMessage: `<span class="text-center">
+                              <h3 class="custom-h3">Prevuci fotografije ili klikni za dodavanje!</h3>
+                              (Maksimalno 10 fotografija.)
+                              </span>`,
+					dictResponseError: 'Greska pri uploadu fajla!',
+          dictRemoveFile: 'Ukloni',
+          dictFileTooBig: `Fajl mora biti manji od 2 MB!`,
+          dictInvalidFileType: 'Izabrani fajl mora biti fotografija!'
+				};
+      const photosUploader = new Dropzone('#photos-upload', dropzoneOptions);
+     
+      function uuidv4() {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    }
+
+    function getFileName(fileName) {
+        const encodedFileName = (uuidv4() + fileName).replace(/\s+/g, '');
+        return encodedFileName;
+    }
+
+    async function generateSignedURL(file) {
+      const fileName = getFileName(file.name);
+      const response = await fetch('/generateSignedURL?filename=' + fileName);
+      if (!response.ok) {
+        throw new Error('Network response for fetch was not ok.');
+      }
+      let signedUrl = await response.text();
+      signedUrl = signedUrl.replace(/\"/g, "")
+   
+      uploadFile(file, fileName, signedUrl);
+
+      return true;
+    }
+
+       function uploadFile(file, fileName, url) {
+     fetch(url, {
+        method: 'PUT',
+        headers: new Headers({'content-type': 'image/*'}),
+        mode: 'cors',
+        body: file
+      })
+        .then(response => response.text())
+        .then (response => {
+          return response;
+        }
+        )
+        .catch(error => console.error(error)
+        )
+        .then(response => {
+          $("#imageUrls").val($("#imageUrls").val()+ fileName+"|");
+        });
+
+    }
+  
     $("#submit").click( function () {
 
+      //SET LOCATION DATA
       if (marker) {
         const currentLocation = marker.getPosition();
 
@@ -170,16 +249,20 @@
         $("#lng").val(0);
       }
       
-
+      //UPLOAD IMAGE FILES
+      const addedFiles = photosUploader.files.filter(file => file.status!=="error");
+        addedFiles.forEach( file => {
+          generateSignedURL(file);
+        })
+    
+        //SHOW ERRORS
        //Tag for checking of error presence 
        let hasErrors = false;
       //Check if email is valid
        const validEmail = isValidEmail($("#email").val());
        //Show messeges for invalid email is present
       if (!validEmail) {
-        const errorMsgs = ["Unesite validan email."];
-        const email = document.querySelector("#email");
-        showErrorsForInput( email, errorMsgs) 
+        $("#error-label-email").text("Greška ! Unešeni email nije validan");
         hasErrors = true;
       };
       //Check if other input fields are valid - vratiti se na ovo!!