finalize UI fixes

gramcracker40 · May 3, 2023 · 81fefeb · 81fefeb
1 parent 6fdd178
commit 81fefeb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.flaskenv b/.flaskenv
@@ -1,6 +1,6 @@
 FLASK_APP=app:app
-FLASK_DEBUG=0
-PRODUCTION=1
+FLASK_DEBUG=1
+PRODUCTION=0
 DBHOST=postgresql://adminadminSECURE!!!:ThisIsProductionBaby!!@db:5432/greenwatch_production
 SQL_PORT=5432
 SQL_HOST=db

diff --git a/UserInterface/js/modal.js b/UserInterface/js/modal.js
@@ -130,15 +130,15 @@ function checkEditUserInputFields() {
 
   // Check if inputfields are empty and if the password is strong.
   // If both are true, then allow for the creation of the user.
-  if (!strongPassword) {
-    // console.log("weak password");
-    editUserButton.disabled = true;
-    passwordParamText.style.visibility = 'visible';
-  }else{
-    // console.log("strong password");
-    editUserButton.disabled = false;
-    passwordParamText.style.visibility = 'hidden';
-  }
+  // if (!strongPassword) {
+  //   // console.log("weak password");
+  //   editUserButton.disabled = true;
+  //   passwordParamText.style.visibility = 'visible';
+  // }else{
+  //   // console.log("strong password");
+  //   editUserButton.disabled = false;
+  //   passwordParamText.style.visibility = 'hidden';
+  // }
 }
 
 function setUserEditPlaceholderValues() {
@@ -164,7 +164,7 @@ function setUserEditPlaceholderValues() {
 }
 
 function populateEmptyFields() {
-  const user = getEditUserObject();
+  let user = getEditUserObject();
   // Pull previous user from session storage
   const previousUserString = sessionStorage.getItem('selectedUser');
   const previousUser = JSON.parse(previousUserString);
@@ -184,6 +184,10 @@ function populateEmptyFields() {
       user[key] = previousUser[key];
     }
   }
+
+  if (user['password'] == '') {
+    delete user['password'];
+  }
   console.log(user);
   return user;
 }