From 198a8ac335b585e7400bf095b6d0883fb8ed494f Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Mon, 8 Jan 2024 13:17:42 +0530 Subject: [PATCH] Add members tab layout in project settings (#39) * Add layout for members panel * Get members detail from projects json * Add members to all project --------- Co-authored-by: neeraj --- packages/frontend/src/assets/members.json | 20 +++++++ packages/frontend/src/assets/projects.json | 18 ++++-- .../projects/project/SettingsTabPanel.tsx | 7 +-- .../projects/project/settings/MemberCard.tsx | 38 ++++++++++++ .../project/settings/MembersTabPanel.tsx | 59 +++++++++++++++++++ packages/frontend/src/types/project.ts | 8 +++ 6 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 packages/frontend/src/assets/members.json create mode 100644 packages/frontend/src/components/projects/project/settings/MemberCard.tsx create mode 100644 packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx diff --git a/packages/frontend/src/assets/members.json b/packages/frontend/src/assets/members.json new file mode 100644 index 00000000..680be790 --- /dev/null +++ b/packages/frontend/src/assets/members.json @@ -0,0 +1,20 @@ +[ + { + "name": "Saugat Yadav", + "email": "saugaty@airfoil.studio", + "isOwner": true, + "id": 1 + }, + { + "name": "Gideon Low", + "email": "gideonl@airfoil.studio", + "isOwner": false, + "id": 2 + }, + { + "name": "Sushan Yadav", + "email": "sushany@airfoil.studio", + "isOwner": false, + "id": 3 + } +] diff --git a/packages/frontend/src/assets/projects.json b/packages/frontend/src/assets/projects.json index f962f809..1c73fe87 100644 --- a/packages/frontend/src/assets/projects.json +++ b/packages/frontend/src/assets/projects.json @@ -16,7 +16,8 @@ "createdAt": "2023-12-11T04:20:00", "branch": "main" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [1, 2, 3] }, { "id": 2, @@ -35,7 +36,8 @@ "createdAt": "2023-12-11T04:20:00", "branch": "staging" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [2, 3] }, { "id": 3, @@ -54,7 +56,8 @@ "createdAt": "2023-12-01T04:20:00", "branch": "main" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [1] }, { "id": 4, @@ -73,7 +76,8 @@ "createdAt": "2023-12-01T04:20:00", "branch": "main" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [1] }, { "id": 5, @@ -92,7 +96,8 @@ "createdAt": "2023-12-09T04:20:00", "branch": "main" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [1] }, { "id": 6, @@ -111,6 +116,7 @@ "createdAt": "2023-12-09T04:20:00", "branch": "prod" }, - "repositoryId": 1 + "repositoryId": 1, + "members": [1] } ] diff --git a/packages/frontend/src/components/projects/project/SettingsTabPanel.tsx b/packages/frontend/src/components/projects/project/SettingsTabPanel.tsx index 52a57951..7b338ad3 100644 --- a/packages/frontend/src/components/projects/project/SettingsTabPanel.tsx +++ b/packages/frontend/src/components/projects/project/SettingsTabPanel.tsx @@ -11,10 +11,7 @@ import Domains from './settings/Domains'; import GeneralTabPanel from './settings/GeneralTabPanel'; import { EnvironmentVariablesTabPanel } from './settings/EnvironmentVariablesTabPanel'; import GitTabPanel from './settings/GitTabPanel'; - -const Members = () => { - return
Members
; -}; +import MembersTabPanel from './settings/MembersTabPanel'; const tabsData = [ { @@ -45,7 +42,7 @@ const tabsData = [ label: 'Members', icon: '^', value: 'members', - component: Members, + component: MembersTabPanel, }, ]; diff --git a/packages/frontend/src/components/projects/project/settings/MemberCard.tsx b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx new file mode 100644 index 00000000..feb0e7a0 --- /dev/null +++ b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx @@ -0,0 +1,38 @@ +import React from 'react'; + +import { Select, Typography, Option } from '@material-tailwind/react'; + +import { Member } from '../../../../types/project'; + +const PERMISSION_OPTIONS = ['View only', 'View and edit']; + +interface MemberCardProps { + member: Member; + isFirstCard: boolean; +} + +const MemberCard = ({ member, isFirstCard }: MemberCardProps) => { + return ( +
+
^
+
+ {member.name} + {member.email} +
+
+ +
+
+ ); +}; + +export default MemberCard; diff --git a/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx b/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx new file mode 100644 index 00000000..3ca386b7 --- /dev/null +++ b/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx @@ -0,0 +1,59 @@ +import React, { useMemo } from 'react'; +import { useParams } from 'react-router-dom'; + +import { Chip, Button, Typography } from '@material-tailwind/react'; + +import MemberCard from './MemberCard'; +import membersData from '../../../../assets/members.json'; +import projectData from '../../../../assets/projects.json'; + +import { Member } from '../../../../types/project'; + +const FIRST_MEMBER_CARD = 0; + +const MembersTabPanel = () => { + const { id } = useParams(); + + const currProject = useMemo(() => { + return projectData.find((data) => data.id === Number(id)); + }, [id]); + + const members = useMemo(() => { + return ( + currProject?.members.map((memberId) => { + return membersData.find((member) => member.id === memberId); + }) || [] + ); + }, [currProject]); + + return ( +
+
+
+ Members +
+ +
+
+
+ +
+
+ {(members as Member[]).map((member, index) => { + return ( + + ); + })} +
+ ); +}; + +export default MembersTabPanel; diff --git a/packages/frontend/src/types/project.ts b/packages/frontend/src/types/project.ts index d784ed17..a3f558cb 100644 --- a/packages/frontend/src/types/project.ts +++ b/packages/frontend/src/types/project.ts @@ -16,6 +16,7 @@ export interface ProjectDetails { branch: string; }; repositoryId: number; + members: number[]; } export interface DeploymentDetails { @@ -81,3 +82,10 @@ export interface DomainDetails { }; isRedirectedto: boolean; } + +export interface Member { + name: string; + email: string; + isOwner: boolean; + id: number; +}