Skip to content

Commit

Permalink
Merge branch 'deploy' into feature/#6
Browse files Browse the repository at this point in the history
  • Loading branch information
jongsujin authored Sep 12, 2023
2 parents fbb35b2 + ceba7cd commit 4b31725
Show file tree
Hide file tree
Showing 21 changed files with 592 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/jsLinters/eslint.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/wiki.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@types/react-modal": "^3.16.0",
"@types/styled-components": "^5.1.27",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
Expand Down
Binary file added public/fe3-wiki-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/components/Employee/CardAddMember.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { PlusOutlined } from "@ant-design/icons";
import React from "react";
import { Button, Dropdown } from "antd";
import type { MenuProps } from "antd";

const items: MenuProps["items"] = [
{
label: "Add Member",
key: "addMember",
},
{
label: "Add Team",
key: "addTeam",
},
];

export default function TableAddMember() {
return (
<Dropdown
menu={{ items }}
autoAdjustOverflow={true}
placement="bottomRight"
trigger={["click"]}
>
<Button type="primary" icon={<PlusOutlined />} size="large" />
</Dropdown>
);
}
12 changes: 12 additions & 0 deletions src/components/Employee/CardExportBtn.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { CloudDownloadOutlined } from "@ant-design/icons";
import React from "react";
import { Button } from "antd";

export default function TableExportBtn() {
return (
<Button size="large">
<CloudDownloadOutlined />
<span>Export</span>
</Button>
);
}
59 changes: 59 additions & 0 deletions src/components/Employee/CardFilter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { FilterFilled } from "@ant-design/icons";
import React from "react";
import { Button, Dropdown } from "antd";
import type { MenuProps } from "antd";

const items: MenuProps["items"] = [
{
type: "group",
label: "SORT BY:",
children: [
{
label: "default",
key: "sortDefault",
},
{
label: "Name",
key: "sortName",
},
{
label: "Team",
key: "sortTeam",
},
],
},
{
type: "group",
label: "MEMBERS:",
children: [
{
label: "All",
key: "membersAll",
},
{
label: "Manager",
key: "membersManager",
},
{
label: "Member",
key: "membersMember",
},
],
},
];

export default function TableFilter() {
return (
<Dropdown
menu={{ items }}
placement="bottomLeft"
className="filter-btn"
trigger={["click"]}
>
<Button size="large">
<FilterFilled />
<span>Filter</span>
</Button>
</Dropdown>
);
}
45 changes: 45 additions & 0 deletions src/components/Employee/CardHeading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from "react";
import { Button, Space } from "antd";
import styled from "styled-components";
import TableFilter from "./CardFilter";
import TableSearch from "./CardSearch";
import TableAddMember from "./CardAddMember";
import TableExportBtn from "./CardExportBtn";

const CardHeader = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
position: relative;
padding: 1.5rem;
`;

const ToggleWrap = styled.div`
display: flex;
flex-wrap: wrap;
gap: 0.75rem;
align-items: center;
`;

export default function CardHeading() {
return (
<CardHeader className="card-header">
<ToggleWrap>
<Space direction="vertical">
<TableFilter />
</Space>
<Space direction="vertical">
<TableSearch />
</Space>
</ToggleWrap>
<ToggleWrap>
<TableExportBtn />
<Space direction="vertical">
<Space wrap>
<TableAddMember />
</Space>
</Space>
</ToggleWrap>
</CardHeader>
);
}
16 changes: 16 additions & 0 deletions src/components/Employee/CardSearch.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from "react";

import { Input } from "antd";

const { Search } = Input;

export default function TableSearch() {
return (
<Search
placeholder="input search text"
allowClear
size="large"
style={{ width: 300 }}
/>
);
}
Loading

0 comments on commit 4b31725

Please sign in to comment.