From d4b031216b69ccd4aee6d740477d3b6de3fdbc87 Mon Sep 17 00:00:00 2001
From: Marissa Halim <66540719+marissahalim@users.noreply.github.com>
Date: Sun, 12 Nov 2023 20:18:40 -1000
Subject: [PATCH] Update navbar (#1)

* Update navbar

* Update profile message to match new navbar

* sign in dropdown fix
---
 app/imports/ui/components/NavBar.jsx | 10 ++++++----
 app/imports/ui/pages/Profile.jsx     |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/imports/ui/components/NavBar.jsx b/app/imports/ui/components/NavBar.jsx
index 60c579d..71a4605 100644
--- a/app/imports/ui/components/NavBar.jsx
+++ b/app/imports/ui/components/NavBar.jsx
@@ -30,11 +30,13 @@ const NavBar = () => {
       <Navbar.Collapse id="basic-navbar-nav" color="white">
         <Nav className="me-auto justify-content-start">
           {currentUser ? ([
-            <Nav.Link id="add-sim-nav" as={NavLink} to="/SimGenerator" key="simGenerator">Simulation</Nav.Link>,
-            <Nav.Link id="add-model-nav" as={NavLink} to="/NewModel" key="addModel">New Model</Nav.Link>,
+            <Nav.Link id="discussions" as={NavLink} to="/Discussions" key="discussions">Discussions</Nav.Link>,
             <Nav.Link id="view-gallery-nav" as={NavLink} to="/gallery" key="viewGallery">Gallery</Nav.Link>,
+            <NavDropdown title="Upload" key="upload-new-nav" align="down-centered">
+              <NavDropdown.Item id="add-model-nav" as={NavLink} to="/NewModel" key="addModel">New Model</NavDropdown.Item>
+              <NavDropdown.Item id="add-sim-nav" as={NavLink} to="/SimGenerator" key="simGenerator">New Simulation</NavDropdown.Item>
+            </NavDropdown>,
             <Nav.Link id="statistics" as={NavLink} to="/Statistics" key="statistics">Statistics</Nav.Link>,
-            <Nav.Link id="discussions" as={NavLink} to="/Discussions" key="discussions">Discussions</Nav.Link>,
           ]) : ''}
 
         </Nav>
@@ -51,7 +53,7 @@ const NavBar = () => {
               </NavDropdown.Item>
             </NavDropdown>
           ) : (
-            <NavDropdown id="navbar-current-user" title={currentUser} key="User">
+            <NavDropdown id="navbar-current-user" title={currentUser} align="end" key="User">
               <NavDropdown.Item id="navbar-profile" as={NavLink} key="profile" to="/profile">
                 <BsPersonSquare />
                 {' '}
diff --git a/app/imports/ui/pages/Profile.jsx b/app/imports/ui/pages/Profile.jsx
index 18ef4da..8a0429f 100644
--- a/app/imports/ui/pages/Profile.jsx
+++ b/app/imports/ui/pages/Profile.jsx
@@ -72,7 +72,7 @@ const Profile = () => {
             </Row>
             {myModels.length === 0 ? (
             // eslint-disable-next-line react/no-unescaped-entities
-              <h4 className="my-3"> You haven't uploaded any models yet. Head to the New Model tab to start. </h4>
+              <h4 className="my-3"> You haven't uploaded any models yet. Head to Upload tab and select New Model to start. </h4>
             ) : (
               <Row xs={2} md={3} lg={4}>
                 {myModels.map((model) => <ModelItem key={model._id} model={model} />)}
@@ -98,7 +98,7 @@ const Profile = () => {
             </Row>
             {mySims.length === 0 ? (
             // eslint-disable-next-line react/no-unescaped-entities
-              <h4 className="my-3"> You haven't made any simulations yet. Head to the Simulation tab to start. </h4>
+              <h4 className="my-3"> You haven't made any simulations yet. Head to the Upload tab and select New Simulation to start. </h4>
             ) : (
               <Row xs={2} md={3} lg={4}>
                 {mySims.map((sim) => <SimulationItem key={sim._id} sim={sim} />)}