Commit d429673a authored by Shanelle Valencia's avatar Shanelle Valencia

[AFP-98} 🚧 Style show page [@svalencia]

parent 872cf962
import React from 'react' import React from 'react'
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
import {
Table,
Thead,
Tbody,
Tfoot,
Tr,
Th,
Td,
TableCaption,
Input,
Wrap,
WrapItem
} from "@chakra-ui/react"
const OrderDetails = (props: any) => { const OrderDetails = (props: any) => {
...@@ -8,9 +21,9 @@ const OrderDetails = (props: any) => { ...@@ -8,9 +21,9 @@ const OrderDetails = (props: any) => {
const status = props.status const status = props.status
return ( return (
<> <>
<td><Link to={"/orders/" + orderNumber}>{orderNumber}</Link></td> <Td><Link to={"/orders/" + orderNumber}>{orderNumber}</Link></Td>
<td>{date}</td> <Td>{date}</Td>
<td>{status}</td> <Td>{status}</Td>
</> </>
) )
} }
......
...@@ -24,10 +24,10 @@ const OrderShowDetails = (props: any) => { ...@@ -24,10 +24,10 @@ const OrderShowDetails = (props: any) => {
return items.map((item: Item, idx: number) => { return items.map((item: Item, idx: number) => {
return ( return (
<tr key={idx}> <tr key={idx}>
<td>{item.itemId}</td> <Td >{item.itemId}</Td >
<td>{item.itemPrice}</td> <Td >{item.itemPrice}</Td >
<td>{item.itemQuantity}</td> <Td >{item.itemQuantity}</Td >
<td>{item.itemSku}</td> <Td >{item.itemSku}</Td >
</tr> </tr>
) )
}); });
...@@ -37,17 +37,19 @@ const OrderShowDetails = (props: any) => { ...@@ -37,17 +37,19 @@ const OrderShowDetails = (props: any) => {
return ( return (
items ? items ?
<Table variant="striped" colorScheme="messenger" size="lg"> <div className="table-div">
<Tbody> <Table variant="striped" colorScheme="messenger" size="lg">
<Tr> <Tbody>
<Th>ID</Th> <Tr>
<Th>Price</Th> <Th>ID</Th>
<Th>Quantity</Th> <Th>Price</Th>
<Th>SKU</Th> <Th>Quantity</Th>
</Tr> <Th>SKU</Th>
{itemDetails} </Tr>
</Tbody> {itemDetails}
</Table> </Tbody>
</Table>
</div>
: :
<div className="Order without items"> <div className="Order without items">
This order didn't contain any items. This order didn't contain any items.
......
...@@ -75,13 +75,15 @@ const SearchOrder = (props: any) => { ...@@ -75,13 +75,15 @@ const SearchOrder = (props: any) => {
</WrapItem> </WrapItem>
</Wrap> </Wrap>
<Table variant="striped" colorScheme="messenger" size="lg"> <Table variant="striped" colorScheme="messenger" size="md">
<Tbody> <Thead>
<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>
</Thead>
<Tbody>
{searchResultArr} {searchResultArr}
</Tbody> </Tbody>
</Table> </Table>
......
...@@ -30,13 +30,15 @@ const OrderIndexPage = () => { ...@@ -30,13 +30,15 @@ const OrderIndexPage = () => {
<div className="table-div"> <div className="table-div">
<SearchOrder orders={orders}/> <SearchOrder orders={orders}/>
<div className="index-table"> <div className="index-table">
<Table variant="striped" colorScheme="messenger" size="lg"> <Table variant="striped" colorScheme="messenger" size="md">
<Tbody> <Thead>
<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>
</Thead>
<Tbody>
{orderDetailsArr} {orderDetailsArr}
</Tbody> </Tbody>
</Table> </Table>
......
...@@ -4,6 +4,10 @@ import {OrderShowDetails} from 'components'; ...@@ -4,6 +4,10 @@ import {OrderShowDetails} from 'components';
import { Order, Item } from 'Order'; import { Order, Item } from 'Order';
import { useOrder } from 'hooks' import { useOrder } from 'hooks'
import { OrderService } from 'services' import { OrderService } from 'services'
import {
Wrap,
WrapItem
} from "@chakra-ui/react"
...@@ -28,12 +32,12 @@ const OrderShowPage = (props: any) => { ...@@ -28,12 +32,12 @@ const OrderShowPage = (props: any) => {
} }
return ( return (
<div> <div className="table-div">
<span> <Wrap>
<h3>Order Date: {order.orderCreatedAt}</h3> <WrapItem>Order Date: {order.orderCreatedAt}</WrapItem>
<h3>Order Number: {order.id}</h3> <WrapItem>Order Number: {order.id}</WrapItem>
<h3>Order Status: {order.orderStatus}</h3> <WrapItem>Order Status: {order.orderStatus}</WrapItem>
</span> </Wrap>
<OrderShowDetails items={order.orderItems}/> <OrderShowDetails items={order.orderItems}/>
</div> </div>
......
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