Add frontend to display and update address.

Update some style on the settings page.

controllers/merchantData.js

@@ -261,7 +261,7 @@ module.exports = {
             mailgun.messages().send(mailgunData, (err, body)=>{});
         }
 
-        if(req.body.address !== "", req.body.address !== res.locals.merchant.address.full){
+        if(req.body.address !== "", req.body.address.toLowerCase() !== res.locals.merchant.address.full.toLowerCase()){
             let baseURL = "https://geocoding.geo.census.gov/geocoder/locations/onelineaddress/";
             let address = req.body.address.replace(/ /g, "+");
             let geocode = await axios.get(`${baseURL}?address=${address}&benchmark=2020&format=json`);

views/dashboardPage/css/strands/settings.css

@@ -48,7 +48,7 @@
         }
 
         #accountInformationData{
-            width: 50%;
+            width: 75%;
         }
 
             #accountInformation label{
@@ -58,6 +58,10 @@
                 margin-bottom: 10px;
             }
 
+            #accountInformation input{
+                width: 75%;
+            }
+
     #accountUpdate{
         max-width: 500px;
     }

views/dashboardPage/ejs/strands/account.ejs

@@ -18,6 +18,10 @@
                     <input id="accountEmail" type="email">
                 </label>
 
+                <label>ADDRESS:
+                    <input id="accountAddress" type="text">
+                </label>
+
                 <button id="accountUpdate" class="button">UPDATE</button>
             </div>
         </div>

views/dashboardPage/js/classes/Merchant.js

@@ -53,6 +53,7 @@ class Merchant{
             ingredients,
             recipes,
             transactions,
+            address,
             owner
         ){
         this._name = name;
@@ -61,6 +62,7 @@ class Merchant{
         this._recipes = [];
         this._transactions = [];
         this._orders = [];
+        this._address = address;
         this._owner = {
             id: owner._id,
             email: owner.email,
@@ -153,6 +155,14 @@ class Merchant{
         return this._inventory;
     }
 
+    get address(){
+        return this._address;
+    }
+
+    set address(address){
+        this._address = address;
+    }
+
     /*
     ingredient: [{
         ingredient: {

views/dashboardPage/js/dashboard.js

@@ -23,12 +23,14 @@ const modalScript = require("./modal.js");
 
 const Merchant = require("./classes/Merchant.js");
 
+console.log(data);
 window.merchant = new Merchant(
     data.merchant.name,
     data.merchant.pos,
     data.merchant.inventory,
     data.merchant.recipes,
     data.transactions,
+    data.merchant.address.full,
     data.owner
 );
 

views/dashboardPage/js/modal.js

@@ -77,6 +77,7 @@ let modal = {
                         response[1].inventory,
                         response[1].recipes,
                         [],
+                        response[1].address,
                         response[0]
                     );
 
@@ -134,6 +135,7 @@ let modal = {
                         response[1].inventory,
                         response[1].recipes,
                         [],
+                        response[1].address,
                         response[0]
                     );
 

views/dashboardPage/js/strands/account.js

@@ -5,6 +5,7 @@ let account = {
         document.getElementById("accountStrandTitle").innerText = merchant.owner.name;
         document.getElementById("accountEmail").value = merchant.owner.email;
         document.getElementById("accountOwnerName").value = merchant.owner.name;
+        document.getElementById("accountAddress").value = merchant.address;
 
         document.getElementById("accountUpdate").onclick = ()=>{this.updateData()};
         document.getElementById("deleteMerchant").onclick = ()=>{controller.openModal("confirmDeleteMerchant")};
@@ -48,7 +49,8 @@ let account = {
     updateData: function(){
         let data = {
             email: document.getElementById("accountEmail").value,
-            name: document.getElementById("accountOwnerName").value
+            name: document.getElementById("accountOwnerName").value,
+            address: document.getElementById("accountAddress").value
         }
 
         let loader = document.getElementById("loaderContainer");
@@ -73,10 +75,12 @@ let account = {
                     }
 
                     merchant.owner.name = response.name;
+                    merchant.address = response.address;
 
                     document.getElementById("accountOwnerName").value = merchant.owner.name;
                     document.getElementById("accountStrandTitle").innerText = merchant.owner.name;
                     document.getElementById("accountEmail").value = merchant.owner.email;
+                    document.getElementById("accountAddress").value = merchant.address;
                 }
             })
             .catch((err)=>{
@@ -140,6 +144,7 @@ let account = {
                         response[1].inventory,
                         response[1].recipes,
                         response[2],
+                        response[1].address,
                         response[0]
                     );
 
@@ -171,6 +176,7 @@ let account = {
                         response[1].inventory,
                         response[1].recipes,
                         response[2],
+                        response[1].address,
                         response[0]
                     );
                     state.updateMerchant();