Skip to content

finalized scrolling and fixed bugs #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonj-lee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

finalized scrolling and fixed bugs #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bffa9f
changed page scrolling and fixed bugs
jasonj-lee Mar 3, 2024
5254693
Merge branch 'main' into jason/order-management-page
jasonj-lee Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/pages/Order/Sorters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const Sorter: React.FC<SorterProps> = ({ orders, setOrders, whichSorters, classe

const sortPartnerName = () => {
let orderCopy: Order[] = orders.slice();
orderCopy.sort((a, b) => (a.partner < b.partner ? -1 : 1));
orderCopy.sort((a, b) => (a.partner.toLowerCase() < b.partner.toLowerCase() ? -1 : 1));
setOrders(orderCopy);
}

Expand All @@ -44,8 +44,6 @@ const Sorter: React.FC<SorterProps> = ({ orders, setOrders, whichSorters, classe
const statusSorter = (a: Order, b: Order) => {
const aRank = statusRank.get(a.status);
const bRank = statusRank.get(b.status);

console.log(a.status + " " + aRank + " " + b.status + " " + bRank);

if (!aRank) return -1;
if (!bRank) return 1;
Expand Down
24 changes: 13 additions & 11 deletions src/pages/OrderManagement/OrderManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ const OrderManagement: React.FC = () => {
elem.size6,
)
});
console.log(data);
setOrders(data);
setShownOrders(data);
}
Expand Down Expand Up @@ -97,16 +96,19 @@ const OrderManagement: React.FC = () => {

return (
<div className="page-wrapper">
<h1>Order Management</h1>
<Group justify="space-between" className="modifiers">
<div>
<Filter baseOrders={orders} setOrders={setShownOrders} classes="mod-button"></Filter>
<Sorter orders={orders} setOrders={setShownOrders} classes="mod-button" whichSorters={["OrderName", "PartnerName", "Date", "Num", "Status"]}></Sorter>
<Button className="mod-button" onClick={reverse}><IconArrowsDownUp></IconArrowsDownUp></Button>
</div>

<Autocomplete leftSection={<IconSearch></IconSearch>} data={[]} value={searchVal} onChange={searchBar}></Autocomplete>
</Group>
<div className="dont-scroll">
<h1 className="management-title">Order Management</h1>
<Group justify="space-between" className="modifiers">
<div>
<Filter baseOrders={orders} setOrders={setShownOrders} classes="mod-button"></Filter>
<Sorter orders={orders} setOrders={setShownOrders} classes="mod-button" whichSorters={["PartnerName", "Date", "Num", "Status"]}></Sorter>
<Button className="mod-button" onClick={reverse}><IconArrowsDownUp></IconArrowsDownUp></Button>
</div>

<Autocomplete leftSection={<IconSearch></IconSearch>} radius="md" data={[]} value={searchVal} onChange={searchBar}></Autocomplete>
</Group>
</div>

<StaffOrderTable orders={shownOrders}></StaffOrderTable>
</div>

Expand Down
38 changes: 20 additions & 18 deletions src/pages/OrderManagement/StaffOrderTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,26 @@ const StaffOrderTable: React.FC<TableProps> = ({ orders }: TableProps) => {
<Text fw={700}>Order Status</Text>
</Group>
</Container>
{orders?.map((val: Order, index: number) => {
return (
<Container className="OrderPopup-container" w="100%" fluid key={index}>
<OrderPopup order={val}>
<Group style={{ width: '100%' }} grow gap="xl">
<Text>{val.partner}</Text>
<Text>{val.datePlaced.toDateString()}</Text>
<Text>{val.numDiapers}</Text>
<Flex direction="row" gap="sm" align={"center"}>
<StatusImage status={val.status}></StatusImage>
<Text>{val.status}</Text>
</Flex>

</Group>
</OrderPopup>
</Container>
)
})}
<div className="scrollable">
{orders?.map((val: Order, index: number) => {
return (
<Container className="OrderPopup-container" w="100%" fluid key={index}>
<OrderPopup order={val}>
<Group style={{ width: '100%' }} grow gap="xl">
<Text>{val.partner}</Text>
<Text>{val.datePlaced.toDateString()}</Text>
<Text>{val.numDiapers}</Text>
<Flex direction="row" gap="sm" align={"center"}>
<StatusImage status={val.status}></StatusImage>
<Text>{val.status}</Text>
</Flex>

</Group>
</OrderPopup>
</Container>
)
})}
</div>
</Stack>
</div>

Expand Down
25 changes: 18 additions & 7 deletions src/styles/OrderManagement.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,22 @@
--dark-color-1: #201a1e;
--dark-color-2: #4e444b;
--gray-color: #bab6b9;
--yellow-color: #ffea00;
}

.page-wrapper {
background-color: var(--primary-color-20);
.page-wrapper {
background-color: var(--light-color-1);
padding: 1rem;
}

.modifiers {
background-color: var(--primary-color-50);
.modifiers {
background-color: var(--chart-color-2);
border-radius: 0.5rem;
padding: 0.5rem;
}

.mod-button {
background-color: var(--primary-color-50);
background-color: var(--chart-color-2);
color: black;
}

Expand All @@ -32,8 +34,17 @@
border-bottom: 0.125rem solid var(--gray-color);
}

.scrollable {
overflow: auto;
height: 65vh;
}

.OrderPopup-container {
padding: 0.5rem;
}

.OrderPopup-container:hover {
background-color: var(--primary-color-50);
background-color: var(--primary-color-20);
cursor: pointer;
}

Expand All @@ -49,7 +60,7 @@
}

.yellow_circle {
background-color: yellow;
background-color: var(--yellow-color);
}

.light-green_circle {
Expand Down