Procházet zdrojové kódy

Change account strand to "settings".
Update style on the settings strand again.

Lee Morgan před 5 roky
rodič
revize
42863f5736

+ 8 - 1
views/dashboardPage/dashboard.css

@@ -580,6 +580,8 @@ ACCOUNT STRAND
         display: flex;
         flex-direction: column;
         width: 75%;
+        max-height: 100%;
+        overflow-y: auto;
     }
 
         .settingsSection{
@@ -592,8 +594,13 @@ ACCOUNT STRAND
             padding: 35px;
         }
 
-            .settingsSection h2{
+            .settingsSectionHeader{
+                width: 100%;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
                 margin-bottom: 25px;
+                border-bottom: 1px solid black;
             }
 
     #accountUpdate{

+ 17 - 3
views/dashboardPage/ejs/strands/account.ejs

@@ -5,7 +5,9 @@
 
     <div class="settings">
         <div class="settingsSection">
-            <h2>ACCOUNT INFORMATION</h2>
+            <div class="settingsSectionHeader">
+                <h2>ACCOUNT INFORMATION</h2>
+            </div>
             <label>EMAIL
                 <input id="accountEmail" type="email">
             </label>
@@ -14,8 +16,20 @@
         </div>
 
         <div class="settingsSection">
-            <h2>SECURITY</h2>
-            
+            <div class="settingsSectionHeader">
+                <h2>YOUR LOCATIONS</h2>
+
+                <button id="settingsAddMerchant" class="button">NEW LOCATION</button>
+            </div>
+
+            <div id="settingsMerchants"></div>
+        </div>
+
+        <div class="settingsSection">
+            <div class="settingsSectionHeader">
+                <h2>SECURITY</h2>
+            </div>
+
             <button id="accountShowPassword" class="button">CHANGE PASSWORD</button>
 
             <div id="changePasswordBox"style="display:none;">