Skip to content

Michelle/order tracking button #40

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
m1chelle7 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Michelle/order tracking button #40

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
b986467
Added count of users shown (user directory)
m1chelle7 Apr 14, 2024
be859f2
Shifted pencil icon (order tracking)
m1chelle7 Apr 14, 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
35 changes: 19 additions & 16 deletions src/pages/OrderTracking/OrderTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,6 @@ const OrderTable: React.FC<TableProps> = ({

const rows = orderCut?.map((val: Order, index: number) => (
<Table.Tr key={index}>
<Table.Td>
<OrderPopup order={val}>
<ActionIcon
variant="filled"
color="var(--primary-color)"
radius="xl"
aria-label="Edit Order"
>
<IconPencil
style={{ width: "70%", height: "70%" }}
stroke={1.5}
/>
</ActionIcon>
</OrderPopup>
</Table.Td>
<Table.Td ta="center">{index + 1}</Table.Td>
<Table.Td ta="center">{val.location}</Table.Td>
<Table.Td ta="center">{val.datePlaced.toDateString()}</Table.Td>
Expand Down Expand Up @@ -130,21 +115,39 @@ const OrderTable: React.FC<TableProps> = ({
</Flex>
</Flex>
</Table.Td>
<Table.Td>
<OrderPopup order={val}>
<ActionIcon
variant="filled"
color="white"
// color="var(--primary-color)"
radius="xl"
aria-label="Edit Order"
style={{ '--ai-hover': 'var(--background-color)' }}
>
<IconPencil
style={{ width: "70%", height: "70%" }}
color="black"
stroke={1.5}
/>
</ActionIcon>
</OrderPopup>
</Table.Td>
</Table.Tr>
));
return (
<>
<Table>
<Table.Thead>
<Table.Tr>
<Table.Th />
<Table.Th ta="center">Order #</Table.Th>
<Table.Th ta="center">Distribution Center</Table.Th>
<Table.Th ta="center">Order Date</Table.Th>
<Table.Th ta="end">Total Quantity</Table.Th>
<Table.Th className="table-order-status" ta={"center"}>
Order Status
</Table.Th>
<Table.Th />
</Table.Tr>
</Table.Thead>
<Table.Tbody>
Expand Down
6 changes: 5 additions & 1 deletion src/pages/UserDirectory/UserDirectory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import { useAuth } from "../../AuthContext";
import { Stack, Button, Group } from "@mantine/core";
import { Stack, Button, Group, Text} from "@mantine/core";
import { IconPlus, IconX } from "@tabler/icons-react";
import Register from "../Auth/Register";
import Partner from "./PartnerClass";
Expand Down Expand Up @@ -138,6 +138,7 @@ const UserDirectory: React.FC = () => {
<Group className="background-bubble-light-1" justify="space-between">
<Group>
<SearchBar searchVal={searchVal} searchFunc={searchFunc} classes="background-light"></SearchBar>

<Button
onClick={toggleShowStaff}
className={showStaff ? "button-chosen" : "button-not-chosen"}
Expand All @@ -148,6 +149,9 @@ const UserDirectory: React.FC = () => {
className={showPartners ? "button-chosen" : "button-not-chosen"}
rightSection={showPartners && <IconX height={"1rem"}></IconX>}
>Partners</Button>
<Text>
{shownUsers.length} / {users.length}
</Text>
</Group>

<UserSorter users={shownUsers} setUsers={setShownUsers} whichSorters={["Name", "Reverse"]} wrapperClasses="background-light" classes="button-transparent"></UserSorter>
Expand Down
2 changes: 2 additions & 0 deletions src/styles/OrderTracking.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,5 @@
background-color: var(--mantine-color-gray-4);
cursor: pointer;
}