Skip to content

Commit

Permalink
Move payout history section below the grid in payouts index and remov…
Browse files Browse the repository at this point in the history
…e AccountButton from payouts route
  • Loading branch information
jamalsoueidan committed Mar 30, 2024
1 parent bc20c80 commit 5f6797f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
10 changes: 5 additions & 5 deletions app/routes/($locale).account.payouts._index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ export default function AccountPayoutsIndex() {

return (
<Stack>
<div>
<Title order={3}>Historik</Title>
<Text c="dimmed">Listen af alle udbetalinger der er foretagt</Text>
</div>

<SimpleGrid cols={{base: 1, sm: 2, md: 3}}>
<Card withBorder>
<Stack gap="xs">
Expand Down Expand Up @@ -98,6 +93,11 @@ export default function AccountPayoutsIndex() {
</Card>
</SimpleGrid>

<div>
<Title order={3}>Historik</Title>
<Text c="dimmed">Listen af alle udbetalinger der er foretagt</Text>
</div>

<Table.ScrollContainer minWidth={500} type="native">
<Table>
<Table.Thead>
Expand Down
8 changes: 1 addition & 7 deletions app/routes/($locale).account.payouts.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {Group} from '@mantine/core';
import {Outlet} from '@remix-run/react';

import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
import {AccountButton} from '~/components/account/AccountButton';
import {AccountContent} from '~/components/account/AccountContent';
import {AccountTitle} from '~/components/account/AccountTitle';
import type {
Expand Down Expand Up @@ -32,11 +30,7 @@ export async function loader({context}: LoaderFunctionArgs) {
export default function AccountPayouts() {
return (
<>
<AccountTitle heading="Udbetalinger">
<Group>
<AccountButton to={'.'}>Udbetalinger</AccountButton>
</Group>
</AccountTitle>
<AccountTitle heading="Udbetalinger" />

<AccountContent>
<Outlet />
Expand Down

0 comments on commit 5f6797f

Please sign in to comment.