From 7157ae5d213a733936d3b62296588be518bb8efb Mon Sep 17 00:00:00 2001
From: Yojita Sharma <ysharma@berkeley.edu>
Date: Sun, 3 Apr 2022 20:15:11 -0700
Subject: [PATCH 1/3] fixed user + admin navbars

---
 client/src/pages/MobileUserNavbar.js | 54 ++++++++++++++++++++++++++++
 client/src/pages/UserNavbar.js       | 17 +++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 client/src/pages/MobileUserNavbar.js
 create mode 100644 client/src/pages/UserNavbar.js

diff --git a/client/src/pages/MobileUserNavbar.js b/client/src/pages/MobileUserNavbar.js
new file mode 100644
index 00000000..a4d8fed3
--- /dev/null
+++ b/client/src/pages/MobileUserNavbar.js
@@ -0,0 +1,54 @@
+import './MobNavbar.css';
+import bfpLogo from './../images/bfpLogo.svg';
+import xButton from './../images/isbees-x-symbol.svg';
+import groceries from './../images/navBarImage.png';
+import React, { useState } from 'react';
+import dropdownIcon from './../images/dropdown-icon.svg'
+import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
+
+function MobNavbar() {
+    const [dropdown, setDropdown] = useState(0);
+    function setTrue() {
+        setDropdown(true)
+    }
+    function setFalse() {
+        setDropdown(false)
+    }
+    if (dropdown) {
+        return (
+            <div className='canvas'>
+                <div className = "dropNavBar">
+                    <img src = {bfpLogo} className = "logo"></img>
+                    <button onClick={setFalse}>
+                        <img src = {xButton} className = "xButton" />
+                    </button>
+                </div>
+                <div className ='imageAndDropDowns'>
+                    <img src = {groceries} className = "dropDownLogo"></img>
+                    <div className='dropDownLinks'>
+                        <a href="https://www.berkeleyfoodpantry.org/aboutus" 
+                        target="_blank" rel="noopener noreferrer" className='dropDownText' onClick = {setFalse}>About the Pantry</a>
+                        <Link to = "/stockListingAdmin" onClick={setFalse} className = 'dropDownText'> View Today's Stock </Link>
+                        <a href="google.com" className='dropDownText'>Schedule Appointment</a>
+                        <Link to = "/adminLogin" onClick={setFalse} className = 'dropDownText'> Login </Link>
+                        {/* <a href="google.com" className='dropDownText'>Edit Today's Stock</a>
+                        <a href="google.com" className='dropDownText'>View Appointments</a>
+                        <a href="google.com" className='dropDownText'>Logout</a> */}
+                    </div>
+                </div>
+            </div>
+        )
+    } 
+    return (
+            <div className='navBar'>
+                <img src = {bfpLogo} className = "logo"></img>
+                <button onClick={setTrue}>
+                    <img src = {dropdownIcon} className = "icon"></img>
+                </button>
+            </div>
+            
+    )
+    
+}
+
+export default MobNavbar;
\ No newline at end of file
diff --git a/client/src/pages/UserNavbar.js b/client/src/pages/UserNavbar.js
new file mode 100644
index 00000000..0f053b29
--- /dev/null
+++ b/client/src/pages/UserNavbar.js
@@ -0,0 +1,17 @@
+import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
+import './Navbar.css';
+import berkeleyfoodpantrylogo from './../images/berkeley-food-pantry-logo.png';
+
+export default function AdminLoginNavbar() {
+   return(
+      <div className= "navbarContainer">
+         <img src={berkeleyfoodpantrylogo} className = "navbarLogo" alt = "navbar logo"></img>
+            <ul className = "navbar-container"> 
+                  <Link to="https://www.berkeleyfoodpantry.org/aboutus" className = "headerTags" style={{ textDecoration: 'none'}} >About the Pantry</Link>
+                  <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }}>View Today's Stock</Link>
+                  <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>Schedule Appointment</Link>
+                  <Link to="/adminLogin" className = "headerTags" style={{ textDecoration: 'none' }}>Login</Link>
+            </ul>
+      </div>
+   )
+}

From ae80738c2b745ca478ceda924863c668d54457d2 Mon Sep 17 00:00:00 2001
From: Yojita Sharma <ysharma@berkeley.edu>
Date: Thu, 7 Apr 2022 03:05:26 -0700
Subject: [PATCH 2/3] navbar using state function

---
 client/src/pages/AdminLoginNavbar.js | 25 +++++++++++++++++++++++--
 client/src/pages/MobNavbar.js        | 28 +++++++++++++++++++++++++---
 client/src/pages/UserNavbar.js       |  1 +
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/AdminLoginNavbar.js b/client/src/pages/AdminLoginNavbar.js
index fdfea4aa..fb0142f1 100644
--- a/client/src/pages/AdminLoginNavbar.js
+++ b/client/src/pages/AdminLoginNavbar.js
@@ -3,13 +3,34 @@ import './Navbar.css';
 import berkeleyfoodpantrylogo from './../images/berkeley-food-pantry-logo.png';
 
 export default function AdminLoginNavbar() {
+
+   const [admin, setAdmin] = useState(false);
+
+    function setDisplay() {
+        if (admin) {
+            return(
+               <ul className = "navbar-container">
+               <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }} >Edit Today's Stock</Link>
+               <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>View Appointments</Link>
+               </ul>
+            )
+        }
+
+        return(
+         <ul className = "navbar-container">
+         <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }} >View Today's Stock</Link>
+         <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>Schedule Appointment</Link>
+         </ul>
+        )
+    }
+
+
    return(
       <div className= "navbarContainer">
          <img src={berkeleyfoodpantrylogo} className = "navbarLogo" alt = "navbar logo"></img>
             <ul className = "navbar-container"> 
                   <Link to="https://www.berkeleyfoodpantry.org/aboutus" className = "headerTags" style={{ textDecoration: 'none'}} >About the Pantry</Link>
-                  <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }} >Edit Today's Stock</Link>
-                  <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>View Appointments</Link>
+                  {setDisplay()}
                   <Link to="/adminLogin" className = "headerTags" style={{ textDecoration: 'none' }}>Login</Link>
             </ul>
       </div>
diff --git a/client/src/pages/MobNavbar.js b/client/src/pages/MobNavbar.js
index 96228881..e63b28b9 100644
--- a/client/src/pages/MobNavbar.js
+++ b/client/src/pages/MobNavbar.js
@@ -8,6 +8,27 @@ import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
 
 function MobNavbar() {
     const [dropdown, setDropdown] = useState(0);
+
+    const [admin, setAdmin] = useState(false);
+
+    function setDisplay() {
+        if (admin) {
+            return(
+               <ul className = "navbar-container">
+               <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }} >Edit Today's Stock</Link>
+               <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>View Appointments</Link>
+               </ul>
+            )
+        }
+
+        return(
+         <ul className = "navbar-container">
+         <Link to="/stockListingAdmin" className = "headerTags" style={{ textDecoration: 'none' }} >View Today's Stock</Link>
+         <Link to="/appointmentScheduler" className = "headerTags" style={{ textDecoration: 'none' }}>Schedule Appointment</Link>
+         </ul>
+        )
+    }
+
     function setTrue() {
         setDropdown(true)
     }
@@ -28,8 +49,9 @@ function MobNavbar() {
                     <div className='dropDownLinks'>
                         <a href="https://www.berkeleyfoodpantry.org/aboutus" 
                         target="_blank" rel="noopener noreferrer" className='dropDownText' onClick = {setFalse}>About the Pantry</a>
-                        <Link to = "/stockListingAdmin" onClick={setFalse} className = 'dropDownText'> Edit Today's Stock </Link>
-                        <a href="google.com" className='dropDownText'>View Appointments</a>
+                        {/* <Link to = "/stockListingAdmin" onClick={setFalse} className = 'dropDownText'> Edit Today's Stock </Link>
+                        <a href="google.com" className='dropDownText'>View Appointments</a> */}
+                        {setDisplay()}
                         <Link to = "/adminLogin" onClick={setFalse} className = 'dropDownText'> Login </Link>
                         {/* <a href="google.com" className='dropDownText'>Edit Today's Stock</a>
                         <a href="google.com" className='dropDownText'>View Appointments</a>
@@ -51,4 +73,4 @@ function MobNavbar() {
     
 }
 
-export default MobNavbar;
\ No newline at end of file
+export default MobNavbar;
diff --git a/client/src/pages/UserNavbar.js b/client/src/pages/UserNavbar.js
index 0f053b29..78904e1d 100644
--- a/client/src/pages/UserNavbar.js
+++ b/client/src/pages/UserNavbar.js
@@ -3,6 +3,7 @@ import './Navbar.css';
 import berkeleyfoodpantrylogo from './../images/berkeley-food-pantry-logo.png';
 
 export default function AdminLoginNavbar() {
+   
    return(
       <div className= "navbarContainer">
          <img src={berkeleyfoodpantrylogo} className = "navbarLogo" alt = "navbar logo"></img>

From 22366c8b61ae7ef57b5a1cd9baec6fedce0389ae Mon Sep 17 00:00:00 2001
From: Yojita Sharma <ysharma@berkeley.edu>
Date: Thu, 7 Apr 2022 21:29:41 -0700
Subject: [PATCH 3/3] working web navbar

---
 client/src/pages/AdminLoginNavbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/pages/AdminLoginNavbar.js b/client/src/pages/AdminLoginNavbar.js
index fb0142f1..b7b7ef4d 100644
--- a/client/src/pages/AdminLoginNavbar.js
+++ b/client/src/pages/AdminLoginNavbar.js
@@ -1,6 +1,7 @@
 import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
 import './Navbar.css';
 import berkeleyfoodpantrylogo from './../images/berkeley-food-pantry-logo.png';
+import React, { useState } from 'react';
 
 export default function AdminLoginNavbar() {