Skip to content

Commit

Permalink
Updated new changes and scrollbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilalmohib
bilalmohib committed May 4, 2023
1 parent 44af74b commit 6f4931c
Show file tree
Hide file tree
Showing 13 changed files with 365 additions and 246 deletions.
50 changes: 26 additions & 24 deletions components/CustomModal/InviteMembers/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Typography
} from '@mui/material';
import Image from 'next/image';
import { useSnackbar } from 'notistack';
import CustomPopOver from '@app/components/CustomPopOver';
import MultiSelectCustomAutoComplete from '@app/components/MultiSelectCustomAutoComplete';

Expand All @@ -16,14 +17,17 @@ interface InviteMembersProps {
projects: any;
projectMembers: string[];
projectID: string;
handleClose: () => void;
}

const InviteMembers: React.FC<InviteMembersProps> = (
{
projects,
projectMembers,
projectID
projectID,
handleClose
}) => {
const { enqueueSnackbar } = useSnackbar();

const styles = {
label: {
Expand Down Expand Up @@ -93,11 +97,11 @@ const InviteMembers: React.FC<InviteMembersProps> = (
}
];

const [selectedMembers, setSelectedMembers] = React.useState<string[]>([]);
const [selectedMembers, setSelectedMembers] = React.useState<any>([]);

const [membersError, setMembersError] = React.useState<boolean>(false);

const [selectedProjects, setSelectedProjects] = React.useState<string[]>([]);
const [selectedProjects, setSelectedProjects] = React.useState<any>([]);

// For popover
const [anchorEl, setAnchorEl] = React.useState<HTMLElement | null>(null);
Expand Down Expand Up @@ -165,17 +169,10 @@ const InviteMembers: React.FC<InviteMembersProps> = (
let selectedProjectsLocal: any = [];

for (let i = 0; i < selectedMembers.length; i++) {
// const firstName = email.split(".")[0];
// const lastName = email.split(".")[1];
// // Extract first and last name first letter and make it the avatar
// const avatar = firstName.charAt(0) + lastName.charAt(0);

// @ts-ignore
selectedMembersEmails.push(selectedMembers[i]?.title);
}

for (let i = 0; i < selectedProjects.length; i++) {
// @ts-ignore
selectedProjectsLocal.push(selectedProjects[i]?.value);
}

Expand All @@ -186,24 +183,29 @@ const InviteMembers: React.FC<InviteMembersProps> = (
// projectID: string,
// projects: any, // Add the projects array as an argument
// projectMembers: [] | null | undefined
// enqueueSnackbar: any

addProjectMembers(
// Pass enqueueSnackbar as an argument
await addProjectMembers(
selectedProjectsLocal,
projectID,
projects,
selectedMembersEmails
)

// sendInvite('John Doe', '[email protected]')
// .then((response) => {
// console.log(response.message);
// alert(response.message);
// })
// .catch((error) => {
// console.error(error.message)
// alert(error.message);
// });

selectedMembersEmails,
enqueueSnackbar
);

handleClose();

setTimeout(() => {
let message: string = `Project Member ${selectedMembersEmails.toString()} added to Project ${selectedProjectsLocal.toString()} successfully`;
enqueueSnackbar(
message,
{
variant: 'success',
anchorOrigin: { vertical: 'bottom', horizontal: 'right' }
},
);
}, 3000);
}

return (
Expand Down
2 changes: 2 additions & 0 deletions components/CustomModal/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ const CustomModal: React.FC<CustomModalProps> = (
projectMembers={projectMembers}
// @ts-ignore
projectID={projectID}

handleClose={handleClose}
/>
)}

Expand Down
27 changes: 17 additions & 10 deletions components/Main/Home/MainContent/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,26 +242,33 @@ const MainContent: React.FC<MainContentProps> = (
/>
</section>

{/* Inbox Page */}
{/* Team's Page */}
<section className={currentMenuItem === 3 ? '' : 'd-none'}>
<br />
<h3 style={{ marginLeft: 30, marginTop: 5, color: 'white', fontWeight: 'lighter' }}>Teams Page</h3>
<p style={{ marginLeft: 30, color: "white", fontWeight: 'lighter' }}>
This page is under development.
</p>
</section>

{/* Inbox Page */}
<section className={currentMenuItem === 4 ? '' : 'd-none'}>
<Inbox email={email} />
</section>

{/* Reporting Page */}
<section className={currentMenuItem === 4 ? '' : 'd-none'}>
<section className={currentMenuItem === 5 ? '' : 'd-none'}>
<Reporting email={email} />
</section>

{/* Portfolios Page */}
{/* <section className={currentMenuItem === 5 ? '' : 'd-none'}>
<br />
<h3 style={{ marginLeft: 30, marginTop: 5, color: 'black', fontWeight: 'lighter' }}>Portfolios</h3>
</section> */}

{/* Goals Page */}
{/* Profile Page */}
<section className={currentMenuItem === 6 ? '' : 'd-none'}>
{/* <br />
<h3 style={{ marginLeft: 30, marginTop: 5, color: 'black', fontWeight: 'lighter' }}>Notifications</h3> */}
<h3 style={{ marginLeft: 30, marginTop: 5, color: 'black', fontWeight: 'lighter' }}>Profile</h3> */}
</section>

{/* Notifications Page */}
<section className={currentMenuItem === 7 ? '' : 'd-none'}>
<Notifications />
</section>
</div>
Expand Down
Loading

1 comment on commit 6f4931c

@vercel
Copy link

@vercel vercel bot commented on 6f4931c May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

fyp-project-management-software – ./

fyp-project-management-software-topideas.vercel.app
fyp-project-management-software-git-main-topideas.vercel.app
fyp-project-management-software.vercel.app
www.taskencher.com
taskencher.com

Please sign in to comment.