diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx index d41fdcdd7953fd7079f3777ccac565ac350b5f85..c522b0221339c1d7b90931336aa8f7ea3bf72a45 100644 --- a/src/components/Nav.tsx +++ b/src/components/Nav.tsx @@ -15,37 +15,41 @@ const Nav = () => { <Avatar name={manager.firstName + " " + manager.lastName} boxSize="40px" borderRadius="full" src={manager.imageUrl} alt="profile"/> : null return ( - <Flex className="header"> - <Box className="left-nav"> - <Link to="/"><Image src={Logo} alt="project logo"height="90%" width="80%" /></Link> - </Box> - <Spacer /> - <Flex className="right-nav"> - <Link className="nav-link" to="/account">{userIcon}</Link> - <Button - p={2} - size="sm" - color="white" - fontWeight="bold" - borderRadius="sm" - bgGradient="linear(to-r, teal.500,blue.500)" - _hover={{ - bgGradient: "linear(to-r, blue.500, yellow.500)", - }} - ><Link to="/orders">Orders</Link></Button> - <Button - p={2} - size="sm" - color="white" - fontWeight="bold" - borderRadius="sm" - bgGradient="linear(to-r, teal.500,blue.500)" - _hover={{ - bgGradient: "linear(to-r, blue.500, yellow.500)", - }} - onClick={handleAuth}>{authLinkText}</Button> + <div > + <Flex className="header"> + {/* <Box className="left-nav"> + <Link to="/"><Image src={Logo} alt="project logo"height="90%" width="80%" /></Link> + </Box> */} + <Spacer /> + <Flex className="right-nav"> + <Link className="nav-link" to="/account">{userIcon}</Link> + <button + // p={2} + // size="sm" + // color="white" + // fontWeight="bold" + // borderRadius="sm" + // bgGradient="linear(to-r, teal.500,blue.500)" + // _hover={{ + // bgGradient: "linear(to-r, blue.500, yellow.500)", + // }} + > + <Link to="/orders">Orders</Link></button> + <button + // p={2} + // size="sm" + // color="white" + // fontWeight="bold" + // borderRadius="sm" + // bgGradient="linear(to-r, teal.500,blue.500)" + // _hover={{ + // bgGradient: "linear(to-r, blue.500, yellow.500)", + // }} + + onClick={handleAuth}>{authLinkText}</button> + </Flex> </Flex> - </Flex> + </div> ) } diff --git a/src/img/searchicon.png b/src/img/searchicon.png new file mode 100644 index 0000000000000000000000000000000000000000..bfe5d5fd6160b3faddb26a7f5944f78257b28f0d Binary files /dev/null and b/src/img/searchicon.png differ diff --git a/src/index.css b/src/index.css index aad81b50183b3527249621c49d758d91060feba5..96136adfdf584f31a2d3565b13e906319d453594 100644 --- a/src/index.css +++ b/src/index.css @@ -49,7 +49,9 @@ body { /* header */ .header { - border-bottom: 1.5px solid orange; + /* border-bottom: 1.5px solid orange; */ + background-color: rgba(216, 130, 32, 0.404); + } @@ -88,14 +90,35 @@ body { .search-div { - padding: 5px; + padding: 2px; } -.searchbar { - width: 300px; +/* .searchbar { + width: 220px; margin-right: 150px; border: 1px solid blue; border-radius: 2px; +} */ + + + +input[type=text] { + width: 220px; + border: 2px solid rgb(184, 180, 180); + border-radius: 4px; + font-size: 14px; + background-color: white; + background-image: url('./img/searchicon.png'); + background-size: 18px; + background-position: 10px 8px; + background-repeat: no-repeat; + padding: 12px 20px 12px 40px; + transition: width 0.4s ease-in-out; + height: 35px; +} + +input[type=text]:focus { + width: 100%; } @@ -145,8 +168,7 @@ body { .footer { padding: 5px 0; /* border-top: 1.5px solid orange; */ - background-color: rgba(253, 165, 0, 0.404); + background-color: rgba(216, 130, 32, 0.404); flex-shrink: 0; font-size: 12px; - /* height: 50px; */ } \ No newline at end of file diff --git a/src/pages/OrderIndexPage.tsx b/src/pages/OrderIndexPage.tsx index 8c369310e9c109aeec640cc0de647f982c34a0ab..48b041084d0e9e27aca51a56f1a77ad3c387b1e6 100644 --- a/src/pages/OrderIndexPage.tsx +++ b/src/pages/OrderIndexPage.tsx @@ -61,7 +61,7 @@ const OrderIndexPage = () => { <div className="search-div"> <input type="text" - placeholder=" Search by Order Number" + placeholder="Search Order Number" value={searchInput} onChange={handleChange} onKeyDown={handleChange}