Commit 3df89fbd authored by Shanelle Valencia's avatar Shanelle Valencia

[AFP-98] 🚧 Style ui using chakra [@svalencia]

parent e16c32b0
import React, { useState, useEffect } from 'react' import React, { useState, useEffect } from 'react'
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
import { Order } from 'Order'; // import { Order } from 'Order';
import { useAllOrders } from 'hooks'
const SearchOrder = (props: any) => { const SearchOrder = (props: any) => {
const orders = props.orders; // const orders = props.orders;
const { orders } = useAllOrders();
const [searchInput, setSearchInput] = useState(""); const [searchInput, setSearchInput] = useState("");
const [searchResult, setSearchResult] = useState([]); const [searchResult, setSearchResult] = useState([]);
...@@ -26,12 +28,11 @@ const SearchOrder = (props: any) => { ...@@ -26,12 +28,11 @@ const SearchOrder = (props: any) => {
useEffect(() => { useEffect(() => {
if (orders.length > 0) { if (orders.length > 0) {
const res = orders.filter((order: any) => const res = orders.filter((order: any) =>
order.orderNumber.includes(searchInput) //|| order.date.includes(searchInput) order.id.includes(searchInput) //|| order.date.includes(searchInput)
// console.log(orderNum) // console.log(orderNum)
); );
// debugger // debugger
setSearchResult(res); // setSearchResult(res);
} }
}, [searchInput]); }, [searchInput]);
......
...@@ -15,7 +15,7 @@ code { ...@@ -15,7 +15,7 @@ code {
monospace; monospace;
} }
tbody, tr, th, span, td { /* tbody, tr, th, span, td {
border: 2px solid orangered; border: 2px solid orangered;
} }
...@@ -72,4 +72,4 @@ li { ...@@ -72,4 +72,4 @@ li {
.nav-link:hover { .nav-link:hover {
background-color: black; background-color: black;
} } */
\ No newline at end of file \ No newline at end of file
...@@ -3,14 +3,20 @@ import {OrderDetails, SearchOrder} from 'components' ...@@ -3,14 +3,20 @@ import {OrderDetails, SearchOrder} from 'components'
import { OrderService } from 'services'; import { OrderService } from 'services';
import { Order } from 'Order'; import { Order } from 'Order';
import { useAllOrders } from 'hooks' import { useAllOrders } from 'hooks'
import {
Table,
Thead,
Tbody,
Tfoot,
Tr,
Th,
Td,
TableCaption,
} from "@chakra-ui/react"
const OrderIndexPage = () => { const OrderIndexPage = () => {
// const { orders } = useAllOrders(); const { orders } = useAllOrders();
let [orders, setOrders] = useState([]);
useEffect(() => {
OrderService.allOrders().then((data) => setOrders(data));
}, [])
const orderDetailsArr = orders.map((order: Order, idx: any) => { const orderDetailsArr = orders.map((order: Order, idx: any) => {
return <tr key={idx}><OrderDetails return <tr key={idx}><OrderDetails
...@@ -22,16 +28,16 @@ const OrderIndexPage = () => { ...@@ -22,16 +28,16 @@ const OrderIndexPage = () => {
return ( return (
<> <>
<table> <Table variant="striped" colorScheme="teal" size="lg">
<tbody> <Tbody>
<tr> <Tr>
<th>Order number</th> <Th>Order number</Th>
<th>Created</th> <Th>Created</Th>
<th>Order Status</th> <Th>Order Status</Th>
</tr> </Tr>
{orderDetailsArr} {orderDetailsArr}
</tbody> </Tbody>
</table> </Table>
<SearchOrder orders={orders}/> <SearchOrder orders={orders}/>
</> </>
) )
......
...@@ -4,9 +4,11 @@ import { Nav } from 'components' ...@@ -4,9 +4,11 @@ import { Nav } from 'components'
import { AccountPage, AuthPage, OrderIndexPage, OrderShowPage } from 'pages'; import { AccountPage, AuthPage, OrderIndexPage, OrderShowPage } from 'pages';
import { GoogleAuthProvider } from 'hooks' import { GoogleAuthProvider } from 'hooks'
import { PublicRoute, PrivateRoute } from 'router' import { PublicRoute, PrivateRoute } from 'router'
import { StyleProvider } from 'styles'
const MainRouter: React.FC = () => { const MainRouter: React.FC = () => {
return ( return (
<StyleProvider>
<BrowserRouter> <BrowserRouter>
<GoogleAuthProvider> <GoogleAuthProvider>
<Nav /> <Nav />
...@@ -21,6 +23,8 @@ const MainRouter: React.FC = () => { ...@@ -21,6 +23,8 @@ const MainRouter: React.FC = () => {
</main> </main>
</GoogleAuthProvider> </GoogleAuthProvider>
</BrowserRouter> </BrowserRouter>
</StyleProvider>
) )
} }
......
import { ChakraProvider } from "@chakra-ui/react" import { ChakraProvider } from "@chakra-ui/react"
import {Nav} from 'components'
import { extendTheme } from "@chakra-ui/react" import { extendTheme } from "@chakra-ui/react"
// 2. Extend the theme to include custom colors, fonts, etc // 2. Extend the theme to include custom colors, fonts, etc
...@@ -9,12 +12,15 @@ const colors = { ...@@ -9,12 +12,15 @@ const colors = {
700: "#2a69ac", 700: "#2a69ac",
}, },
} }
const theme = extendTheme({ colors }) const theme = extendTheme({ colors })
const StyleProvider = () => { const StyleProvider: React.FC = ({children}) => {
return ( return (
<ChakraProvider theme={theme}> <ChakraProvider theme={theme}>
{children}
</ChakraProvider> </ChakraProvider>
) )
} }
......
export {default as StyleProvider} from './StyleProvider'
\ No newline at end of file
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