Skip to content

Commit

Permalink
Merge pull request #792 from eisbuk/fix/approvals
Browse files Browse the repository at this point in the history
Fix approvals button container classes
  • Loading branch information
fadwamahmoud committed Jul 13, 2023
2 parents 478c2a1 + 4e006c6 commit 755ec3f
Showing 1 changed file with 26 additions and 20 deletions.
46 changes: 26 additions & 20 deletions packages/client/src/pages/customers/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import { Link, useHistory } from "react-router-dom";

import { OrgSubCollection, Customer } from "@eisbuk/shared";
import { PrivateRoutes } from "@eisbuk/shared/ui";
import { CustomerGrid, SearchBar, LayoutContent, Button, ButtonColor,} from "@eisbuk/ui";
import {
CustomerGrid,
SearchBar,
LayoutContent,
Button,
ButtonColor,
} from "@eisbuk/ui";
import {
useTranslation,
NavigationLabel,
Expand Down Expand Up @@ -46,7 +52,6 @@ const AthletesPage: React.FC = () => {

const customers = useSelector(getCustomersList(true));


// Search logic
const [filterString, setFilterString] = React.useState("");

Expand All @@ -69,24 +74,25 @@ const AthletesPage: React.FC = () => {
<div className="!pt-16">
{!isEmpty(customers) && (
<>
<SearchBar
value={filterString}
onChange={(e) => setFilterString(e.target.value)}
/>
<Button
aria-label={t(AdminAria.AthletesApprovalButton)}
onClick={toggleApprovals}
color={toggled ? ButtonColor.Primary : undefined}
className={[
"h-8",
!toggled
? "!text-black outline outline-gray-300 border-box"
: "",
].join(" ")}
>
{t(AdminAria.AthletesApprovalButton)}
</Button>
{/* </div> */}
<div className="flex w-full items-center justify-between">
<SearchBar
value={filterString}
onChange={(e) => setFilterString(e.target.value)}
/>
<Button
aria-label={t(AdminAria.AthletesApprovalButton)}
onClick={toggleApprovals}
color={toggled ? ButtonColor.Primary : undefined}
className={[
"h-8",
!toggled
? "!text-black outline outline-gray-300 border-box"
: "",
].join(" ")}
>
{t(AdminAria.AthletesApprovalButton)}
</Button>
</div>

<CustomerGrid
onCustomerClick={openCustomerCard}
Expand Down

0 comments on commit 755ec3f

Please sign in to comment.