From 278f3f96f8df8a5121115fd040f4bf72e332a2c8 Mon Sep 17 00:00:00 2001
From: Spectralitree <spectralitree@gmail.com>
Date: Sat, 6 Feb 2021 19:45:25 +0100
Subject: [PATCH] fix render loop

---
 src/Components/MemberCard.js | 17 +++++++----------
 src/Components/Memberlist.js | 27 ++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/Components/MemberCard.js b/src/Components/MemberCard.js
index 279f3cda..071ce083 100644
--- a/src/Components/MemberCard.js
+++ b/src/Components/MemberCard.js
@@ -113,6 +113,8 @@ export default function MemberCard(props) {
     }, [member.description, member.color, member.birthday, member.display_name, member.pronouns, member.avatar_url, member.proxy_tags]);
 
     const submitEdit = data => {
+        props.edit(Object.assign(member, data));
+        
         fetch(`${API_URL}m/${member.id}`,{
             method: 'PATCH',
             body: JSON.stringify(data),
@@ -132,6 +134,8 @@ export default function MemberCard(props) {
     }
 
     const submitPrivacy = data => {
+        props.edit(Object.assign(member, data));
+
         fetch(`${API_URL}m/${member.id}`,{
             method: 'PATCH',
             body: JSON.stringify(data),
@@ -181,6 +185,7 @@ export default function MemberCard(props) {
     const submitProxy = data => {
 
         const newdata = {proxy_tags: data.proxy_tags.filter(tag => !(tag.prefix === "" && tag.suffix === ""))}
+        props.edit(Object.assign(member, newdata));
 
         fetch(`${API_URL}m/${member.id}`,{
             method: 'PATCH',
@@ -191,8 +196,8 @@ export default function MemberCard(props) {
             }}).then (res => res.json()
             ).then (data => { 
                 setMember(prevState => {return {...prevState, ...data}}); 
-                setProxyTags(data.proxy_tags); 
-                setErrorAlert(false)
+                setProxyTags(data.proxy_tags);
+                setErrorAlert(false);
                 setProxyMode(false);
         }
             ).catch (error => {
@@ -202,14 +207,6 @@ export default function MemberCard(props) {
     }
 
     const didMount = useRef(false);
- 
-    useEffect(() => {
-      if (didMount.current) {
-        props.edit(member);
-      } else {
-        didMount.current = true;
-      }
-    }, [props, member]);
 
     function copyLink() {
         var link = `https://spectralitree.github.io/pk-webs/profile/${sysID}/${member.id}`
diff --git a/src/Components/Memberlist.js b/src/Components/Memberlist.js
index 166b52f0..6968bca8 100644
--- a/src/Components/Memberlist.js
+++ b/src/Components/Memberlist.js
@@ -82,9 +82,9 @@ export default function Memberlist() {
         return {...member, desc: member.description}
       } return {...member, desc: "(no description)"}
     })
-    
-    const currentMembers =  Members1.filter(member => {
-      if (!value & privacyFilter === 'all') return true;
+
+    const currentMembers = Members1.filter(member => {
+      if (!value) return true;
       
       if (privacyFilter === 'private') {
         if (member.visibility !== 'private') {
@@ -138,7 +138,7 @@ export default function Memberlist() {
       const memberList = sortMembers.map((member) => <BS.Card key={member.id}>
       <MemberCard
       member={member} 
-      edit={memberEdit => {setMembers(members.map(member => member.id === memberEdit.id ? Object.assign(member, memberEdit) : member)); console.log(members)}}
+      edit={memberEdit => setMembers(members.map(member => member.id === memberEdit.id ? Object.assign(member, memberEdit) : member))}
       />
     </BS.Card>
     );
@@ -250,11 +250,11 @@ export default function Memberlist() {
         <BS.Pagination className="ml-auto mr-auto">
           { currentPage === 1 ? <BS.Pagination.Prev disabled/> : <BS.Pagination.Prev onClick={() => setCurrentPage(currentPage - 1)} />}
           { currentPage < 3 ? "" : <BS.Pagination.Item  onClick={() => setCurrentPage(1)} active={1 === active}>{1}</BS.Pagination.Item>}
-          { currentPage < 4 ? "" :<BS.Pagination.Ellipsis disabled />}
+          { currentPage < 4 ? "" : currentPage < 5 ? <BS.Pagination.Item  onClick={() => setCurrentPage(2)} active={2 === active}>{2}</BS.Pagination.Item> : <BS.Pagination.Ellipsis disabled />}
           { currentPage > 1 ? <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage - 1)}>{currentPage - 1}</BS.Pagination.Item> : "" }
           <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage)} active={currentPage === active}>{currentPage}</BS.Pagination.Item>
           { currentPage < pageAmount ? <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage + 1)}>{currentPage + 1}</BS.Pagination.Item> : "" }
-          { currentPage > pageAmount - 3 ? "" : <BS.Pagination.Ellipsis disabled />}
+          { currentPage > pageAmount - 3 ? "" : currentPage === pageAmount - 3 ? <BS.Pagination.Item  onClick={() => setCurrentPage(pageAmount - 1)} active={pageAmount - 1 === active}>{pageAmount - 1}</BS.Pagination.Item> : <BS.Pagination.Ellipsis disabled />}
           { currentPage > pageAmount - 2 ? "" : <BS.Pagination.Item  onClick={() => setCurrentPage(pageAmount)} active={pageAmount === active}>{pageAmount}</BS.Pagination.Item>}
           { currentPage === pageAmount ? <BS.Pagination.Next disabled /> :<BS.Pagination.Next onClick={() => setCurrentPage(currentPage + 1)} />}
           </BS.Pagination>
@@ -391,6 +391,19 @@ export default function Memberlist() {
         <BS.Accordion className="mb-3 mt-3 w-100" defaultActiveKey="0">
             {memberList}
         </BS.Accordion>
+        <BS.Row className="justify-content-md-center">
+        <BS.Pagination className="ml-auto mr-auto">
+          { currentPage === 1 ? <BS.Pagination.Prev disabled/> : <BS.Pagination.Prev onClick={() => setCurrentPage(currentPage - 1)} />}
+          { currentPage < 3 ? "" : <BS.Pagination.Item  onClick={() => setCurrentPage(1)} active={1 === active}>{1}</BS.Pagination.Item>}
+          { currentPage < 4 ? "" : currentPage < 5 ? <BS.Pagination.Item  onClick={() => setCurrentPage(2)} active={2 === active}>{2}</BS.Pagination.Item> : <BS.Pagination.Ellipsis disabled />}
+          { currentPage > 1 ? <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage - 1)}>{currentPage - 1}</BS.Pagination.Item> : "" }
+          <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage)} active={currentPage === active}>{currentPage}</BS.Pagination.Item>
+          { currentPage < pageAmount ? <BS.Pagination.Item  onClick={() => setCurrentPage(currentPage + 1)}>{currentPage + 1}</BS.Pagination.Item> : "" }
+          { currentPage > pageAmount - 3 ? "" : currentPage === pageAmount - 3 ? <BS.Pagination.Item  onClick={() => setCurrentPage(pageAmount - 1)} active={pageAmount - 1 === active}>{pageAmount - 1}</BS.Pagination.Item> : <BS.Pagination.Ellipsis disabled />}
+          { currentPage > pageAmount - 2 ? "" : <BS.Pagination.Item  onClick={() => setCurrentPage(pageAmount)} active={pageAmount === active}>{pageAmount}</BS.Pagination.Item>}
+          { currentPage === pageAmount ? <BS.Pagination.Next disabled /> :<BS.Pagination.Next onClick={() => setCurrentPage(currentPage + 1)} />}
+          </BS.Pagination>
+        </BS.Row>
         </>
         }
         </>
@@ -398,7 +411,7 @@ export default function Memberlist() {
         <Route path={`${path}/:memberID`}>
           { isLoading ? <Loading/> :
           <MemberPages members={members}
-          edit={memberEdit => {setMembers(members.map(member => member.id === memberEdit.id ? Object.assign(member, memberEdit) : member)); console.log(members)}}/>}
+          edit={memberEdit => setMembers(members.map(member => member.id === memberEdit.id ? Object.assign(member, memberEdit) : member))}/>}
         </Route>
         </Switch>
     )