reverting changes

Author: Jiawei Wu

src/components/banner/banner.js

@@ -6,11 +6,7 @@ export const Banner = () => {
     return (
         <Box className="banner-main">
             <a href="www.google.com">
-<<<<<<< HEAD
                 <img src="thrifty_logos/NEW_Thrifty_Logo.png" className="banner-img"></img>
-=======
-                <img src="images/banner.png" className="banner-img"></img>
->>>>>>> parent of d38be9d (fixing merge conflicts)
             </a>
         </Box>
     )

src/components/footer/footer.js

@@ -6,7 +6,6 @@ import FacebookIcon from '@mui/icons-material/Facebook';
 import GoogleIcon from '@mui/icons-material/Google';
 import InstagramIcon from '@mui/icons-material/Instagram';
 import TwitterIcon from '@mui/icons-material/Twitter';
-import "./footer.css";
 
 const Footer = () =>
 {

src/components/header/header.css

@@ -45,7 +45,6 @@
     color: #C8AFAB;
     transition: ease-in 0.1s;
 }
-<<<<<<< HEAD
 
 .dropbtn {
     color: black;
@@ -108,5 +107,3 @@
     box-shadow: inset 100px 0 0 0 #E4D6D4;
     color: black;
 }
-=======
->>>>>>> parent of d38be9d (fixing merge conflicts)

src/components/header/header.js

@@ -1,12 +1,12 @@
 import * as React from 'react';
+import { useState } from 'react';
 import { Box } from '@mui/system';
 import LoginIcon from '@mui/icons-material/Login';
 
 import "./header.css";
 
 
 export const Header = () => {
-<<<<<<< HEAD
     const [anchorEl, setAnchorEl] = useState(null);
 
     const handleClick = (event) => {
@@ -18,8 +18,6 @@ export const Header = () => {
     };
 
 
-=======
->>>>>>> parent of d38be9d (fixing merge conflicts)
     return(
         <Box className="bar">
             {/* left */}
@@ -28,7 +26,6 @@ export const Header = () => {
                     <img src={process.env.PUBLIC_URL + 'thrifty_logos/NEW_Thrifty_Mini_Logo.png'} className="header-logo the-logo" title='Home_page' alt=""/>
                 </a>
                 <Box className='header-text'>
-<<<<<<< HEAD
                     <a className='header_link' href='/about'>About</a>
                     <a className="dropdown">
                         <button className="dropbtn">Categories</button>
@@ -39,10 +36,6 @@ export const Header = () => {
                             <a href="#">Miscellaneous</a>
                         </div>
                     </a>
-=======
-                    <a className='header_link' href='/about'>About ▾</a>
-                    <a className='header_link' href=''>Categories ▾</a>
->>>>>>> parent of d38be9d (fixing merge conflicts)
                     <a className='header_link' href='https://github.com/rpi-thrifty'>Github</a>
                     <a className='header_link' href='https://discord.gg/PFqRbcPq'>Discord</a>
                 </Box>

src/pages/itempage.js

@@ -71,7 +71,7 @@ export const ItemPage = () => {
     return(
         <Box className='everything'>
 
-            <Box> <SIDEBAR handleShift = {handleShift}/> </Box>
+            {/* <Box> <SIDEBAR handleShift = {handleShift}/> </Box> */}
 
             <Box className="main_div" sx = {{marginLeft: leftMargin, width: mainWidth}}>
                 <Header/>