Skip to content

Commit

Permalink
Merge branch 'deploy' into feature/#5
Browse files Browse the repository at this point in the history
  • Loading branch information
skyeome authored Sep 13, 2023
2 parents fbe5dd5 + d186902 commit 2289101
Show file tree
Hide file tree
Showing 31 changed files with 1,673 additions and 10 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.

98 changes: 98 additions & 0 deletions package-lock.json

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

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^5.2.6",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -15,9 +16,11 @@
"antd": "^5.9.0",
"dotenv": "^16.3.1",
"firebase": "^10.3.1",
"framer-motion": "^10.16.4",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.2.0",
"react-modal": "^3.16.1",
"react-router-dom": "^6.15.0",
"react-scripts": "5.0.1",
"recoil": "^0.7.7",
Expand Down Expand Up @@ -52,6 +55,7 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@types/react-beautiful-dnd": "^13.1.4",
"@types/styled-components": "^5.1.27",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
Expand Down
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>
);
}
Loading

0 comments on commit 2289101

Please sign in to comment.