Merge pull request #128 from wethmiranasinghe/main

Header role updated
cepdnaclk · Oct 11, 2024 · e23253a · e23253a
2 parents 131e383 + 2f7e84c
commit e23253a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/front-end/src/Pages/Profile.jsx b/front-end/src/Pages/Profile.jsx
@@ -43,7 +43,7 @@ function Profile() {
         <h3><u><span style={{ color:'rgba(10, 48, 128)'}}>User Details</span></u></h3>
         <h4><span style={{ color:'hsl(107, 69%, 18%)'}}>Email: <br></br>{loggedInUser.email}</span></h4>
 
-        <h4><span style={{ color:'hsl(107, 69%, 18%)'}}>User Role: <br></br>{loggedInUser.appUserRole}</span></h4>
+        <h4><span style={{ color:'hsl(107, 69%, 18%)'}}>User Role: <br></br>{loggedInUser.userRole}</span></h4>
     </div>
     </div>
     </>

diff --git a/front-end/src/components/Header.jsx b/front-end/src/components/Header.jsx
@@ -297,7 +297,7 @@ function closeOnClickOutside(selector, toggleClass) {
                     )}
 
                     {/* Display user name */}
-                    <h3>{loggedInUser.name} {loggedInUser.lastName}</h3>
+                    <h3>{loggedInUser.firstName} {loggedInUser.lastName}</h3>
                 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -297,7 +297,7 @@ function closeOnClickOutside(selector, toggleClass) { @@
                         )}
                         {/* Display user name */}
-                        <h3>{loggedInUser.name} {loggedInUser.lastName}</h3>
+                        <h3>{loggedInUser.firstName} {loggedInUser.lastName}</h3>
                     </div>
@@ Expand Down @@