diff --git a/apps/backoffice/src/app/accounts/page.tsx b/apps/backoffice/src/app/accounts/page.tsx index 61a8fd4..5b7233b 100644 --- a/apps/backoffice/src/app/accounts/page.tsx +++ b/apps/backoffice/src/app/accounts/page.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; -import { FC, ReactElement } from 'react'; +import { FC, ReactElement, useState } from 'react'; import { FilterOutlined, SearchOutlined, EditOutlined, } from '@ant-design/icons'; import { Button, Input } from '@imphnen-frontend-service/ui/atoms'; -import { DataTable } from '@imphnen-frontend-service/ui/organisms'; +import { DataTable, Filter } from '@imphnen-frontend-service/ui/organisms'; import { ColumnDef, @@ -100,6 +100,7 @@ export const Components: FC = (): ReactElement => { }); const [rowSelection, setRowSelection] = React.useState({}); + const [showFilter, setShowFilter] = useState(false); const table = useReactTable({ data: mockData, @@ -138,15 +139,23 @@ export const Components: FC = (): ReactElement => { - +
+ + {showFilter && ( +
+ setShowFilter(false)} /> +
+ )} +
{/* Table */} diff --git a/apps/backoffice/src/app/prizes/page.tsx b/apps/backoffice/src/app/prizes/page.tsx index c638599..e53327e 100644 --- a/apps/backoffice/src/app/prizes/page.tsx +++ b/apps/backoffice/src/app/prizes/page.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; -import { FC, ReactElement } from 'react'; +import { FC, ReactElement, useState } from 'react'; import { FilterOutlined, SearchOutlined, AuditOutlined, } from '@ant-design/icons'; import { Button, Input } from '@imphnen-frontend-service/ui/atoms'; -import { DataTable } from '@imphnen-frontend-service/ui/organisms'; +import { DataTable, Filter } from '@imphnen-frontend-service/ui/organisms'; import { ColumnDef, @@ -165,6 +165,7 @@ export const Components: FC = (): ReactElement => { }); const [rowSelection, setRowSelection] = React.useState({}); + const [showFilter, setShowFilter] = useState(false); const table = useReactTable({ data: mockData, @@ -203,14 +204,22 @@ export const Components: FC = (): ReactElement => { - +
+ + {showFilter && ( +
+ setShowFilter(false)} /> +
+ )} +
{/* Table */} diff --git a/apps/backoffice/src/app/transactions/page.tsx b/apps/backoffice/src/app/transactions/page.tsx index 0df99f3..a03b161 100644 --- a/apps/backoffice/src/app/transactions/page.tsx +++ b/apps/backoffice/src/app/transactions/page.tsx @@ -1,13 +1,12 @@ import * as React from 'react'; - -import { FC, ReactElement } from 'react'; +import { FC, ReactElement, useState } from 'react'; import { FilterOutlined, SearchOutlined, AuditOutlined, } from '@ant-design/icons'; import { Button, Input } from '@imphnen-frontend-service/ui/atoms'; -import { DataTable } from '@imphnen-frontend-service/ui/organisms'; +import { DataTable, Filter } from '@imphnen-frontend-service/ui/organisms'; import { ColumnDef, @@ -120,6 +119,7 @@ export const Components: FC = (): ReactElement => { }); const [rowSelection, setRowSelection] = React.useState({}); + const [showFilter, setShowFilter] = useState(false); const table = useReactTable({ data: mockTransactions, @@ -158,14 +158,22 @@ export const Components: FC = (): ReactElement => { - +
+ + {showFilter && ( +
+ setShowFilter(false)} /> +
+ )} +
{/* Table */} diff --git a/apps/backoffice/src/index.css b/apps/backoffice/src/index.css index b92b6ea..a477593 100644 --- a/apps/backoffice/src/index.css +++ b/apps/backoffice/src/index.css @@ -17,14 +17,14 @@ --color-neutral-50: #f6f6f6; --color-neutral-100: #e7e7e7; - --color-neutral-200: #d0d0d0; - --color-neutral-300: #b7b7b7; - --color-neutral-400: #9f9f9f; - --color-neutral-500: #7e7e7e; + --color-neutral-200: #d1d1d1; + --color-neutral-300: #b0b0b0; + --color-neutral-400: #888888; + --color-neutral-500: #6d6d6d; --color-neutral-600: #5d5d5d; - --color-neutral-700: #4a4a4a; - --color-neutral-800: #3a3a3a; - --color-neutral-900: #2f2f2f; + --color-neutral-700: #4f4f4f; + --color-neutral-800: #454545; + --color-neutral-900: #3d3d3d; --color-neutral-950: #2b2b2b; --color-success-100: #e0fbd8; diff --git a/apps/gacha/src/index.css b/apps/gacha/src/index.css index b92b6ea..a477593 100644 --- a/apps/gacha/src/index.css +++ b/apps/gacha/src/index.css @@ -17,14 +17,14 @@ --color-neutral-50: #f6f6f6; --color-neutral-100: #e7e7e7; - --color-neutral-200: #d0d0d0; - --color-neutral-300: #b7b7b7; - --color-neutral-400: #9f9f9f; - --color-neutral-500: #7e7e7e; + --color-neutral-200: #d1d1d1; + --color-neutral-300: #b0b0b0; + --color-neutral-400: #888888; + --color-neutral-500: #6d6d6d; --color-neutral-600: #5d5d5d; - --color-neutral-700: #4a4a4a; - --color-neutral-800: #3a3a3a; - --color-neutral-900: #2f2f2f; + --color-neutral-700: #4f4f4f; + --color-neutral-800: #454545; + --color-neutral-900: #3d3d3d; --color-neutral-950: #2b2b2b; --color-success-100: #e0fbd8; diff --git a/libs/ui/src/index.css b/libs/ui/src/index.css index b92b6ea..a477593 100644 --- a/libs/ui/src/index.css +++ b/libs/ui/src/index.css @@ -17,14 +17,14 @@ --color-neutral-50: #f6f6f6; --color-neutral-100: #e7e7e7; - --color-neutral-200: #d0d0d0; - --color-neutral-300: #b7b7b7; - --color-neutral-400: #9f9f9f; - --color-neutral-500: #7e7e7e; + --color-neutral-200: #d1d1d1; + --color-neutral-300: #b0b0b0; + --color-neutral-400: #888888; + --color-neutral-500: #6d6d6d; --color-neutral-600: #5d5d5d; - --color-neutral-700: #4a4a4a; - --color-neutral-800: #3a3a3a; - --color-neutral-900: #2f2f2f; + --color-neutral-700: #4f4f4f; + --color-neutral-800: #454545; + --color-neutral-900: #3d3d3d; --color-neutral-950: #2b2b2b; --color-success-100: #e0fbd8; diff --git a/libs/ui/src/organisms/filter/filter.tsx b/libs/ui/src/organisms/filter/filter.tsx index 0dc2567..268a36c 100644 --- a/libs/ui/src/organisms/filter/filter.tsx +++ b/libs/ui/src/organisms/filter/filter.tsx @@ -20,7 +20,7 @@ const Radio = ({ value, onChange, }: RadioProps) => ( -
+
); -export const Filter = () => { +interface FilterProps { + onClose?: () => void; +} + +export const Filter = ({ onClose }: FilterProps) => { const [selectedStatus, setSelectedStatus] = useState('delivered'); const handleStatusChange = (e: React.ChangeEvent) => { @@ -48,13 +52,11 @@ export const Filter = () => { }; return ( -
+
Filters