Commit 15edcb2a authored by Darrick Yong's avatar Darrick Yong

refactor with button atom

parent 6fdd862c
.filter { .filter {
width: 50%; /* width: 50%; */
display: flex; display: flex;
justify-content: space-evenly;
align-items: center; align-items: center;
padding: 20px;
} }
.filter > * { .filter-btns {
display: flex;
justify-content: space-between;
align-items: center;
}
.filter-btns > * {
cursor: pointer; cursor: pointer;
display: flex; display: flex;
padding: 10px 20px; padding: 10px 20px;
margin-left: 10px;
border-radius: 5px; border-radius: 5px;
border: 1px solid black; border: 1px solid black;
} }
...@@ -24,9 +31,11 @@ ...@@ -24,9 +31,11 @@
.filter-rec.selected { .filter-rec.selected {
background: blue; background: blue;
} }
.filter-ful.selected { .filter-ful.selected {
background: green; background: green;
} }
.filter-can.selected { .filter-can.selected {
background: red; background: red;
} }
\ No newline at end of file
const Button = ({ className, onClick, text }) => (
<div className={className} onClick={onClick}>
{text}
</div>
)
export default Button;
\ No newline at end of file
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Button from "../atoms/Button";
const Filter = ({ orders, setOrdersToShow }) => { const Filter = ({ orders, setOrdersToShow }) => {
const [all, setAll] = useState(true); const [all, setAll] = useState(true);
...@@ -77,27 +78,29 @@ const Filter = ({ orders, setOrdersToShow }) => { ...@@ -77,27 +78,29 @@ const Filter = ({ orders, setOrdersToShow }) => {
return ( return (
<div className="filter"> <div className="filter">
Filter: <div>Filter:</div>
<div className={`filter-all ${all ? "selected" : ""}`} onClick={reset}>
All <div className="filter-btns">
</div> <Button
<div className={`filter-all ${all ? "selected" : ""}`}
className={`filter-rec ${received ? "selected" : ""}`} onClick={reset}
onClick={receive} text="All"
> />
Received <Button
</div> className={`filter-rec ${received ? "selected" : ""}`}
<div onClick={receive}
className={`filter-ful ${fulfilled ? "selected" : ""}`} text="Received"
onClick={fulfill} />
> <Button
Fulfilled className={`filter-ful ${fulfilled ? "selected" : ""}`}
</div> onClick={fulfill}
<div text="Fulfilled"
className={`filter-can ${cancelled ? "selected" : ""}`} />
onClick={cancel} <Button
> className={`filter-can ${cancelled ? "selected" : ""}`}
Cancelled onClick={cancel}
text="Cancelled"
/>
</div> </div>
</div> </div>
); );
......
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { editOrder } from "../../actions/order_actions"; import { editOrder } from "../../actions/order_actions";
import Button from "../atoms/Button";
const OrderButtons = ({ order, editOrder }) => { const OrderButtons = ({ order, editOrder }) => {
// const { id, orderId, status, orderItems, createdAt, modifiedAt } = order; // const { id, orderId, status, orderItems, createdAt, modifiedAt } = order;
...@@ -14,20 +15,10 @@ const OrderButtons = ({ order, editOrder }) => { ...@@ -14,20 +15,10 @@ const OrderButtons = ({ order, editOrder }) => {
} }
}; };
const fulfill = (
<div className="fulfill-btn" onClick={() => handleUpdate("FULFILL")}>
Fulfill
</div>
);
const cancel = (
<div className="cancel-btn" onClick={() => handleUpdate("CANCEL")}>
Cancel
</div>
);
return ( return (
<div className="oii-buttons"> <div className="oii-buttons">
{fulfill} {cancel} <Button className="fulfill-btn" onClick={() => handleUpdate("FULFILL")} text="Fulfill"/>
<Button className="cancel-btn" onClick={() => handleUpdate("CANCEL")} text="Cancel"/>
</div> </div>
); );
}; };
......
...@@ -26,7 +26,7 @@ const OrderIndexItem = ({ order }) => { ...@@ -26,7 +26,7 @@ const OrderIndexItem = ({ order }) => {
<div className="oii-container"> <div className="oii-container">
<div className="oii-left"> <div className="oii-left">
<FiChevronRight className={`oii-drop ${showDetails ? "rotate" : ""}`} onClick={() => setShowDetails(!showDetails)}/> <FiChevronRight className={`oii-drop ${showDetails ? "rotate" : ""}`} onClick={() => setShowDetails(!showDetails)}/>
<div className="oii-num">{`Order #: ${orderId}`} {id} </div> <div className="oii-num">{`Order #:${orderId} --`} {`Warehouse #:${id}`} </div>
</div> </div>
{actions} {actions}
</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