-
Notifications
You must be signed in to change notification settings - Fork 0
Delete members #6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AzizaAlSayed
wants to merge
3
commits into
main
Choose a base branch
from
delete-members
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,55 @@ | ||
| import Header from './header'; | ||
| import Search from './search'; | ||
| import NewMember from './newMember'; | ||
| import '../App.css'; | ||
| import Header from "./header"; | ||
| import Search from "./search"; | ||
| import NewMember from "./newMember"; | ||
| import "../App.css"; | ||
| import { useState } from "react"; | ||
| import { members } from '../data'; | ||
| import MemberList from './memberList'; | ||
| import { members } from "../data"; | ||
| import MemberList from "./memberList"; | ||
|
|
||
| export default function App() { | ||
| const [listOfMembers, setListOfMembers] = useState(members); | ||
| const [memberName, setMemberName] = useState(""); | ||
| const searchMemberResult = !memberName | ||
| ? listOfMembers | ||
| : listOfMembers.filter((member) => | ||
| member.name.toLowerCase().includes(memberName.toLowerCase()) | ||
| ); | ||
|
|
||
| function handleAddNewMember(memberName) { | ||
| setListOfMembers(members => [...members, { | ||
| id: listOfMembers.length, | ||
| name: memberName, | ||
| }]); | ||
| setListOfMembers((members) => [ | ||
| ...members, | ||
| { | ||
| id: listOfMembers.length, | ||
| name: memberName, | ||
| }, | ||
| ]); | ||
| } | ||
|
|
||
| function handleDeleteMembers(activeMembers) { | ||
|
|
||
| const searchMemberResult = !memberName | ||
| ? listOfMembers : listOfMembers.filter(member => | ||
| (member.name.toLowerCase()).includes(memberName.toLowerCase()) | ||
| setListOfMembers( | ||
| listOfMembers.filter((member) => !activeMembers[member.id] === true) | ||
| ); | ||
| } | ||
|
|
||
| function handleDeleteMember(memberId) { | ||
| setListOfMembers(listOfMembers.filter(member => member.id !== memberId)); | ||
| setListOfMembers(listOfMembers.filter((member) => member.id !== memberId)); | ||
| } | ||
|
|
||
| return ( | ||
| <div className="Container"> | ||
| <div className="LeftPadding" > | ||
| <div className="LeftPadding"> | ||
| <Header /> | ||
| <div className="TitleStyle"> | ||
| <Search memberName={memberName} | ||
| onMemberNameChange={setMemberName} /> | ||
| <MemberList members={searchMemberResult} onDeleteMember={handleDeleteMember} /> | ||
| <Search memberName={memberName} onMemberNameChange={setMemberName} /> | ||
| <MemberList | ||
| members={searchMemberResult} | ||
| onDeleteMember={handleDeleteMember} | ||
| deleteMembers={handleDeleteMembers} | ||
| /> | ||
| <NewMember onAddNewMember={handleAddNewMember} /> | ||
| </div> | ||
| </div> | ||
| </div > | ||
| </div> | ||
| ); | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| export default function DeleteMembers({ onDeleteMembers }) { | ||
| return ( | ||
| <div className="MembersDeleting"> | ||
| <p className="FontMembersDeleting">Selected Members to Delete</p> | ||
| <button | ||
| type="button" | ||
| className="ButtonDeleteMembers" | ||
| onClick={onDeleteMembers} | ||
| > | ||
| Delete | ||
| </button> | ||
| </div> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| export default function Header() { | ||
| return ( | ||
| <h5> Add members to Front-end development team </h5> | ||
| ); | ||
| } | ||
| return <h5> Add members to Front-end development team </h5>; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,51 @@ | ||
| import { useState } from "react"; | ||
|
|
||
| export default function Member({ id, name, onDelete }) { | ||
| const [isActive, setActive] = useState(false); | ||
| export default function Member({ id, name, onDelete, setActive, isActive }) { | ||
|
|
||
| return ( | ||
| <div key={id} className="FlexDisplay"> | ||
| <div class="Members"> | ||
| <div className="Member"> | ||
| <svg width="18px" height="18px" viewBox="0 0 49 49" fill="none" xmlns="http://www.w3.org/2000/svg"> | ||
| <path | ||
| d="M24.5 25.98C29.4725 25.98 33.5 21.9227 33.5 16.9133C33.5 11.904 29.4725 7.84668 24.5 7.84668C19.5275 7.84668 15.5 11.904 15.5 16.9133C15.5 21.9227 19.5275 25.98 24.5 25.98Z" | ||
| fill="#000000" /> | ||
| <path | ||
| d="M17.3786 29.2021C17.8814 29.0785 18.3971 29.3313 18.6254 29.7991L22.6893 32.7994C24.5 32.799 24.5 32.7995 26.3105 32.7991L30.3746 29.7991C30.6029 29.3313 31.1186 29.0785 31.6214 29.2021C37.0255 30.5301 42.5 33.238 42.5 37.3116V41.845H6.5V37.3116C6.5 33.238 11.9745 30.5301 17.3786 29.2021Z" | ||
| fill="#000000" /> | ||
| </svg> | ||
| <p key={id}>{name}</p> | ||
| </div> | ||
| <div className="MemberPadding"> | ||
| <button type="button" className={isActive ? "CheckIconMember ButtonCheckMember" : "ButtonCheckMember CyrcleIconMember"} onClick={() => setActive(!isActive)}> | ||
| </button> | ||
| </div> | ||
| </div> | ||
| <button id="delet_m7" type="button" className="ButtonDeleteMember" onClick={() => onDelete(id)}> Delete | ||
| </button> | ||
| function onCheckDelete() { | ||
| setActive(!isActive); | ||
| } | ||
| return ( | ||
| <div key={id} className="FlexDisplay"> | ||
| <div class="Members"> | ||
| <div className="Member"> | ||
| <svg | ||
| width="18px" | ||
| height="18px" | ||
| viewBox="0 0 49 49" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| > | ||
| <path | ||
| d="M24.5 25.98C29.4725 25.98 33.5 21.9227 33.5 16.9133C33.5 11.904 29.4725 7.84668 24.5 7.84668C19.5275 7.84668 15.5 11.904 15.5 16.9133C15.5 21.9227 19.5275 25.98 24.5 25.98Z" | ||
| fill="#000000" | ||
| /> | ||
| <path | ||
| d="M17.3786 29.2021C17.8814 29.0785 18.3971 29.3313 18.6254 29.7991L22.6893 32.7994C24.5 32.799 24.5 32.7995 26.3105 32.7991L30.3746 29.7991C30.6029 29.3313 31.1186 29.0785 31.6214 29.2021C37.0255 30.5301 42.5 33.238 42.5 37.3116V41.845H6.5V37.3116C6.5 33.238 11.9745 30.5301 17.3786 29.2021Z" | ||
| fill="#000000" | ||
| /> | ||
| </svg> | ||
| <p key={id}>{name}</p> | ||
| </div> | ||
| ); | ||
| <div className="MemberPadding"> | ||
| <button | ||
| type="button" | ||
| className={ | ||
| isActive | ||
| ? "CheckIconMember ButtonCheckMember" | ||
| : "ButtonCheckMember CyrcleIconMember" | ||
| } | ||
| onClick={() => onCheckDelete()} | ||
| ></button> | ||
| </div> | ||
| </div> | ||
| <button | ||
| type="button" | ||
| className="ButtonDeleteMember" | ||
| onClick={() => onDelete(id)} | ||
| > | ||
| Delete | ||
| </button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,37 @@ | ||
| import Member from "./member"; | ||
| export default function MemberList({ members, onDeleteMember }) { | ||
| const membersList = members.map(member => | ||
| <Member key={member.id} id={member.id} name={member.name} onDelete={onDeleteMember}></Member>) | ||
| ; | ||
| import DeleteMembers from "./deleteMembers"; | ||
| import { useState } from "react"; | ||
|
|
||
| export default function MemberList({ | ||
| members, | ||
| onDeleteMember, | ||
| deleteMembers, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please stay consistent with call back props names. |
||
| }) { | ||
| const [activeMembers, setActiveMembers] = useState({}); | ||
|
|
||
| const isDeleteVisible = Object.values(activeMembers).some((v) => v === true); | ||
| return ( | ||
| <p> {membersList} </p> | ||
| <div> | ||
| <p> | ||
| {members.map((member) => ( | ||
| <Member | ||
| key={member.id} | ||
| id={member.id} | ||
| name={member.name} | ||
| onDelete={onDeleteMember} | ||
| isActive={Boolean(activeMembers[member.id])} | ||
| setActive={() => | ||
| setActiveMembers((members) => { | ||
| const isActive = Boolean(activeMembers[member.id]); | ||
| return { ...members, [member.id]: !isActive }; | ||
| }) | ||
| } | ||
| ></Member> | ||
| ))} | ||
| {isDeleteVisible && ( | ||
| <DeleteMembers onDeleteMembers={() => deleteMembers(activeMembers)} /> | ||
| )} | ||
| </p> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,52 @@ | ||
| import { useState } from "react"; | ||
|
|
||
| export default function NewMember({ onAddNewMember }) { | ||
| const [name, setName] = useState(''); | ||
| const [name, setName] = useState(""); | ||
|
|
||
| return ( | ||
| <div className="FlexDisplay"> | ||
| <div className="Members"> | ||
| <div className="Member"> | ||
| <input className="AddInput" id="add" type="text" name="add" placeholder="Add a member" value={name} | ||
| onChange={memberName => setName(memberName.target.value)} /> | ||
| <input | ||
| className="AddInput" | ||
| id="add" | ||
| type="text" | ||
| name="add" | ||
| placeholder="Add a member" | ||
| value={name} | ||
| onChange={(memberName) => setName(memberName.target.value)} | ||
| /> | ||
| </div> | ||
| </div> | ||
| <button disabled={name === "" || name === null} type="reset" name="learn" className="ButtonAddMember" value="myimage" onClick={() => { setName(''); onAddNewMember(name); }}> | ||
| <svg version="1.1" width="10" height="10" id="Capa_1" xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 490 490" | ||
| fill="white" space="preserve"> | ||
| <polygon points="222.031,490 267.969,490 267.969,267.969 490,267.969 490,222.031 267.969,222.031 267.969,0 222.031,0 | ||
| 222.031,222.031 0,222.031 0,267.969 222.031,267.969 " /> | ||
| <button | ||
| disabled={name === "" || name === null} | ||
| type="reset" | ||
| name="learn" | ||
| className="ButtonAddMember" | ||
| value="myimage" | ||
| onClick={() => { | ||
| setName(""); | ||
| onAddNewMember(name); | ||
| }} | ||
| > | ||
| <svg | ||
| version="1.1" | ||
| width="10" | ||
| height="10" | ||
| id="Capa_1" | ||
| xlink="http://www.w3.org/1999/xlink" | ||
| x="0px" | ||
| y="0px" | ||
| viewBox="0 0 490 490" | ||
| fill="white" | ||
| space="preserve" | ||
| > | ||
| <polygon | ||
| points="222.031,490 267.969,490 267.969,267.969 490,267.969 490,222.031 267.969,222.031 267.969,0 222.031,0 | ||
| 222.031,222.031 0,222.031 0,267.969 222.031,267.969 " | ||
| /> | ||
| </svg> | ||
| </button> | ||
| </div > | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,14 @@ | ||
| export default function Search({ memberName, onMemberNameChange }) { | ||
| const onHandleChange = name => { | ||
| const onHandleChange = (name) => { | ||
| onMemberNameChange(name.target.value); | ||
| }; | ||
| return ( | ||
| <input className="SearchInput" value={memberName} type="search" placeholder="Find members" onChange={onHandleChange} /> | ||
| <input | ||
| className="SearchInput" | ||
| value={memberName} | ||
| type="search" | ||
| placeholder="Find members" | ||
| onChange={onHandleChange} | ||
| /> | ||
| ); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can reuse the deleteMembers to implement deleting a single member right? So we don't have to provide 2 props of deleting single/multiple members