diff --git a/client/public/icons/drawer/reg.svg b/client/public/icons/drawer/reg.svg new file mode 100644 index 0000000..8567abe --- /dev/null +++ b/client/public/icons/drawer/reg.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/public/icons/drawer/save.svg b/client/public/icons/drawer/save.svg new file mode 100644 index 0000000..f23b41b --- /dev/null +++ b/client/public/icons/drawer/save.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/public/icons/header/add_2.svg b/client/public/icons/header/add_2.svg new file mode 100644 index 0000000..a53ab05 --- /dev/null +++ b/client/public/icons/header/add_2.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/public/icons/sider/more.svg b/client/public/icons/header/more.svg similarity index 100% rename from client/public/icons/sider/more.svg rename to client/public/icons/header/more.svg diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx index 1dd99bf..2ff9076 100644 --- a/client/src/components/Header.tsx +++ b/client/src/components/Header.tsx @@ -3,9 +3,10 @@ import Title from 'antd/es/typography/Title'; interface HeaderProps { title: string; + additionalContent?: React.ReactNode; } -export default function Header({ title }: HeaderProps) { +export default function Header({ title, additionalContent }: HeaderProps) { return (
+ {additionalContent} more diff --git a/client/src/config/customTheme.ts b/client/src/config/customTheme.ts index 3863996..fa1ae99 100644 --- a/client/src/config/customTheme.ts +++ b/client/src/config/customTheme.ts @@ -1,7 +1,7 @@ export const theme = { token: { fontFamily: 'Roboto, sans-serif', - colorPrimary: '#548d10', + colorPrimary: '#C2DA3D', Menu: { itemColor: 'f2f2f2', itemBg: '#f2f2f2', diff --git a/client/src/index.css b/client/src/index.css index 46693ff..1cd3abf 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -26,6 +26,15 @@ code { color: #548d10; } +.ant-menu-item-selected { + background-color: transparent !important; +} + +.ant-menu-item-selected a, +.ant-menu-item-selected { + color: #548d10 !important; +} + .sider { background-color: #f2f2f2; } diff --git a/client/src/pages/AccountsPage.tsx b/client/src/pages/AccountsPage.tsx index 979f796..cb47e41 100644 --- a/client/src/pages/AccountsPage.tsx +++ b/client/src/pages/AccountsPage.tsx @@ -1,9 +1,143 @@ +import { Button, Form, Input, Select } from 'antd'; import Header from '../components/Header'; +import { useState } from 'react'; +import ContentDrawer from '../components/ContentDrawer'; + +const { Option } = Select; export default function AccountsPage() { + const [open, setOpen] = useState(false); + + const showDrawer = () => setOpen(true); + const closeDrawer = () => setOpen(false); + + const userEdit = ( +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ ); + return ( <> -
+
+ } + /> + + + {userEdit} + ); }