Fix merge issues

src/components/Nav.tsx

@@ -11,7 +11,10 @@ import NisumLogo from '../img/nisum.jpeg'
 =======
 import Logo from '../img/logo.png'
 import Nisum from '../img/nisum.jpeg'
+<<<<<<< HEAD
 >>>>>>> Add more styling
+=======
+>>>>>>> 247238ddabaea9507af45d4bae4b6f96e4a77a5a
 import {
     Drawer,
     DrawerBody,
@@ -77,7 +80,10 @@ const Nav = () => {
                 <HStack>
                     <Link to="/"><Image src={Logo} alt="project logo" className="logoImg"/></Link>
                     <h1>Order Management PRO</h1>
+<<<<<<< HEAD
 >>>>>>> Add more styling
+=======
+>>>>>>> 247238ddabaea9507af45d4bae4b6f96e4a77a5a
                     {/* <Link to="/"><h1>Order Management</h1></Link> */}
                 </HStack>
             </Box>

src/index.css

@@ -207,9 +207,28 @@ input[type=text]:focus {
 
 .account h1 {
   padding-top: 50px;
+<<<<<<< HEAD
 }
 
 
+.dropdown-icon span :hover {
+    /* color: #cccdcf; */
+    color: red;
+    /* background-color: #cccdcf; */
+    transition: 0.3s;
+=======
+>>>>>>> 247238ddabaea9507af45d4bae4b6f96e4a77a5a
+}
+
+.dropdown:hover {
+  color: #cccdcf;
+  background-color: #e9ecef;
+  transition: 0.4s;
+  border-radius: 2px;
+  padding: 0 2px;
+  /* width: 80px; */
+}
+
 .dropdown-icon span :hover {
     /* color: #cccdcf; */
     color: red;

src/pages/OrderShowPage.tsx

@@ -15,12 +15,17 @@ const OrderShowPage = (props: any) => {
     // const { id } = useParams<any>();
     // const { order } = useOrder(id)
     const location = props.match.params.id;
+<<<<<<< HEAD
 <<<<<<< HEAD
     const apiUrl = 'http://localhost:8084/api/orders/' + location;
 =======
     const apiUrl = 'http://localhost:8080/api/orders';
     // const apiUrl = 'http://138.91.251.222:8086/api/orders/' + location;
 >>>>>>> Add more styling
+=======
+    const apiUrl = 'http://localhost:8080/api/orders';
+    // const apiUrl = 'http://138.91.251.222:8086/api/orders/' + location;
+>>>>>>> 247238ddabaea9507af45d4bae4b6f96e4a77a5a
     const [order, setOrder] = useState<Order>();
     const [items, setItems] = useState<Item[]>()
 

src/router/MainRouter.tsx

@@ -22,9 +22,13 @@ const MainRouter: React.FC = () => {
                             </Switch>
                         </main>
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                         {/* <Footer /> */}
 >>>>>>> Add more styling
+=======
+                        {/* <Footer /> */}
+>>>>>>> 247238ddabaea9507af45d4bae4b6f96e4a77a5a
                     </body>
                 </GoogleAuthProvider>
             </BrowserRouter>