Commit 247238dd authored by Shanelle Valencia's avatar Shanelle Valencia

Add more styling

parent 0322c786
...@@ -6,6 +6,7 @@ import { faUser } from '@fortawesome/free-solid-svg-icons' ...@@ -6,6 +6,7 @@ import { faUser } from '@fortawesome/free-solid-svg-icons'
import { AccountPage } from 'pages' import { AccountPage } from 'pages'
import { Box, Heading, Flex, Spacer, Button, Image, Avatar, HStack, Input } from "@chakra-ui/react" import { Box, Heading, Flex, Spacer, Button, Image, Avatar, HStack, Input } from "@chakra-ui/react"
import Logo from '../img/logo.png' import Logo from '../img/logo.png'
import Nisum from '../img/nisum.jpeg'
import { import {
Drawer, Drawer,
DrawerBody, DrawerBody,
...@@ -50,11 +51,12 @@ const Nav = () => { ...@@ -50,11 +51,12 @@ const Nav = () => {
<Flex className="header" justifyContent="space-between"> <Flex className="header" justifyContent="space-between">
<Box > <Box >
<h1 className="header-title">Ascend Final Project</h1> <h1 className="header-title">Ascend Final Project</h1>
{/* <Image src={Nisum} alt="project logo" className="nisumImg"/> */}
</Box> </Box>
<Box className="center-nav" display="-ms-inline-flexbox"> <Box className="center-nav" display="-ms-inline-flexbox">
<HStack> <HStack>
<Link to="/"><Image src={Logo} alt="project logo" className="logoImg"/></Link> <Link to="/"><Image src={Logo} alt="project logo" className="logoImg"/></Link>
<h1>Order Management</h1> <h1>Order Management PRO</h1>
{/* <Link to="/"><h1>Order Management</h1></Link> */} {/* <Link to="/"><h1>Order Management</h1></Link> */}
</HStack> </HStack>
</Box> </Box>
...@@ -80,16 +82,16 @@ const Nav = () => { ...@@ -80,16 +82,16 @@ const Nav = () => {
<Box > <Box >
<Menu> <Menu>
<MenuButton rightIcon={<ChevronDownIcon />} onClick={onOpen} width="300px" className="right-nav"> <MenuButton rightIcon={<ChevronDownIcon />} onClick={onOpen} width="300px" className="right-nav">
<HStack> <HStack className="dropdown-icon">
<span>{userIcon}</span> <span className="dropdown-icon">{userIcon}</span>
<span>{userName}</span> <span className="dropdown-icon">{userName}</span>
{/* <span>{authLinkText}</span> */} {/* <span>{authLinkText}</span> */}
</HStack> </HStack>
</MenuButton> </MenuButton>
<MenuList> <MenuList>
<MenuItem color="black"><Link to="/orders">Orders</Link></MenuItem> <MenuItem color="black"><Link to="/orders" className="dropdown">Orders</Link></MenuItem>
<MenuItem color="black"><Link to="/account">Account</Link></MenuItem> <MenuItem color="black"><Link to="/account" className="dropdown">Account</Link></MenuItem>
<MenuItem color="black"><button onClick={handleAuth}>{authLinkText}</button></MenuItem> <MenuItem color="black"><button onClick={handleAuth} className="dropdown">{authLinkText}</button></MenuItem>
</MenuList> </MenuList>
</Menu> </Menu>
</Box> </Box>
......
...@@ -79,6 +79,12 @@ body { ...@@ -79,6 +79,12 @@ body {
} }
.nisumImg {
height: 100px;
width: 50px;
}
.left-nav Link { .left-nav Link {
color: red; color: red;
} }
...@@ -193,12 +199,33 @@ input[type=text]:focus { ...@@ -193,12 +199,33 @@ input[type=text]:focus {
/* User Drawer */ /* User Drawer */
.account { .account {
padding: 40px 0; padding: 80px 0;
/* padding: 150px; */
border-top: 1px solid rgba(68, 64, 64, 0.363); border-top: 1px solid rgba(68, 64, 64, 0.363);
border-bottom: 1px solid rgba(68, 64, 64, 0.363); /* border-bottom: 1px solid rgba(68, 64, 64, 0.363); */
}
.account h1 {
padding-top: 50px;
} }
.dropdown-icon span :hover {
/* color: #cccdcf; */
color: red;
/* background-color: #cccdcf; */
transition: 0.3s;
}
.dropdown:hover {
color: #cccdcf;
background-color: #e9ecef;
transition: 0.4s;
border-radius: 2px;
padding: 0 2px;
/* width: 80px; */
}
/* .user-name { /* .user-name {
padding-top: 3.5px; padding-top: 3.5px;
} */ } */
......
...@@ -3,31 +3,34 @@ import {useGoogleAuth} from 'hooks' ...@@ -3,31 +3,34 @@ import {useGoogleAuth} from 'hooks'
const AccountPage = () => { const AccountPage = () => {
const { manager } = useGoogleAuth(); const { manager } = useGoogleAuth();
return ( return (
<VStack className="account"> <div>
<Avatar name={manager.firstName + " " + manager.lastName} size="2xl" src={manager.imageUrl} alt="profile" /> <VStack className="account">
<Box w="270px" > <h1>Account Info</h1>
<VStack <Avatar name={manager.firstName + " " + manager.lastName} size="2xl" src={manager.imageUrl} alt="profile" />
divider={<StackDivider borderColor="gray.200" />} <Box w="270px" >
spacing={4} <VStack
align="center" divider={<StackDivider borderColor="gray.200" />}
> spacing={4}
<Box h="5px" className="user-name">{manager.firstName} {manager.lastName}</Box> align="center"
<Box h="28px" >
w="280px" <Box h="5px" className="user-name">{manager.firstName} {manager.lastName}</Box>
size="sm" <Box h="28px"
align="center" w="280px"
color="white" size="sm"
fontWeight="bold" align="center"
borderRadius="md" color="white"
bgGradient="linear(to-r, teal.500,blue.500)" fontWeight="bold"
// _hover={{ borderRadius="md"
// bgGradient: "linear(to-r, blue.500, yellow.500)", bgGradient="linear(to-r, teal.500,blue.500)"
// }} // _hover={{
>{manager.email } // bgGradient: "linear(to-r, blue.500, yellow.500)",
// }}
>{manager.email }
</Box>
</VStack>
</Box> </Box>
</VStack> </VStack>
</Box> </div>
</VStack>
) )
} }
......
...@@ -15,7 +15,8 @@ const OrderShowPage = (props: any) => { ...@@ -15,7 +15,8 @@ const OrderShowPage = (props: any) => {
// const { id } = useParams<any>(); // const { id } = useParams<any>();
// const { order } = useOrder(id) // const { order } = useOrder(id)
const location = props.match.params.id; const location = props.match.params.id;
const apiUrl = 'http://localhost:8080/api/orders/' + location; const apiUrl = 'http://localhost:8080/api/orders';
// const apiUrl = 'http://138.91.251.222:8086/api/orders/' + location;
const [order, setOrder] = useState<Order>(); const [order, setOrder] = useState<Order>();
const [items, setItems] = useState<Item[]>() const [items, setItems] = useState<Item[]>()
......
...@@ -22,7 +22,7 @@ const MainRouter: React.FC = () => { ...@@ -22,7 +22,7 @@ const MainRouter: React.FC = () => {
{/* <Route component={NotFoundPage} /> */} {/* <Route component={NotFoundPage} /> */}
</Switch> </Switch>
</main> </main>
<Footer /> {/* <Footer /> */}
</body> </body>
</GoogleAuthProvider> </GoogleAuthProvider>
</BrowserRouter> </BrowserRouter>
......
...@@ -3,6 +3,7 @@ import { Order } from 'Order'; ...@@ -3,6 +3,7 @@ import { Order } from 'Order';
export const allOrders = () => { export const allOrders = () => {
const apiUrl = 'http://localhost:8080/api/orders'; const apiUrl = 'http://localhost:8080/api/orders';
// const apiUrl = 'http://138.91.251.222:8086/api/orders';
return fetch(apiUrl).then((response) => response.json()) return fetch(apiUrl).then((response) => response.json())
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment