From ac45dfe7e0e3f2e676f3a0a40490fd20307a9e16 Mon Sep 17 00:00:00 2001 From: Bianca Date: Wed, 5 Jun 2024 10:09:17 -0600 Subject: [PATCH 1/4] Trash css --- .../components/Viewing/Collection/Members.js | 20 +++++++++++++------ frontend/public/commitHash.txt | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frontend/components/Viewing/Collection/Members.js b/frontend/components/Viewing/Collection/Members.js index c1a5a7af..80afdcb3 100644 --- a/frontend/components/Viewing/Collection/Members.js +++ b/frontend/components/Viewing/Collection/Members.js @@ -406,13 +406,21 @@ function MemberTable(properties) { {getType(member)} {member.description} - {!isPublicCollection && ( - handleIconClick(member)}> - + {!isPublicCollection && icon === faTrash && ( + + handleIconClick(member)} className={styles.modalicon} title="Delete Member"> + - )} - - ); + + )} + {!isPublicCollection && icon === faUnlink && ( + handleIconClick(member)} className={styles.modalicon} title="Remove member from collection"> + + + + )} + + ); }} /> diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt index e0af29d9..0b50503c 100644 --- a/frontend/public/commitHash.txt +++ b/frontend/public/commitHash.txt @@ -1 +1 @@ -ee02edf1d93748a2bab27328c0a80bf7e9e82515 \ No newline at end of file +0d00eb6ae1e00c8819c9e3a5f257473fe42ea96f \ No newline at end of file From 438f4afa7b08703b5a5cddd52db3eecd50330620 Mon Sep 17 00:00:00 2001 From: Bianca Date: Wed, 5 Jun 2024 10:17:52 -0600 Subject: [PATCH 2/4] Trash css --- frontend/components/Viewing/Collection/Members.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/components/Viewing/Collection/Members.js b/frontend/components/Viewing/Collection/Members.js index 80afdcb3..9d90b1cf 100644 --- a/frontend/components/Viewing/Collection/Members.js +++ b/frontend/components/Viewing/Collection/Members.js @@ -411,13 +411,11 @@ function MemberTable(properties) { handleIconClick(member)} className={styles.modalicon} title="Delete Member"> - )} {!isPublicCollection && icon === faUnlink && ( handleIconClick(member)} className={styles.modalicon} title="Remove member from collection"> - )} ); From 7c65c6c199ed7a19a7728008ab928ecc79ca575f Mon Sep 17 00:00:00 2001 From: Bianca Date: Wed, 5 Jun 2024 10:30:21 -0600 Subject: [PATCH 3/4] Trash css --- frontend/components/Viewing/Collection/Members.js | 1 - frontend/public/commitHash.txt | 2 +- frontend/styles/view.module.css | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/Viewing/Collection/Members.js b/frontend/components/Viewing/Collection/Members.js index 9d90b1cf..6e0ba753 100644 --- a/frontend/components/Viewing/Collection/Members.js +++ b/frontend/components/Viewing/Collection/Members.js @@ -407,7 +407,6 @@ function MemberTable(properties) { {getType(member)} {member.description} {!isPublicCollection && icon === faTrash && ( - handleIconClick(member)} className={styles.modalicon} title="Delete Member"> diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt index 0b50503c..02f0ef16 100644 --- a/frontend/public/commitHash.txt +++ b/frontend/public/commitHash.txt @@ -1 +1 @@ -0d00eb6ae1e00c8819c9e3a5f257473fe42ea96f \ No newline at end of file +438f4afa7b08703b5a5cddd52db3eecd50330620 \ No newline at end of file diff --git a/frontend/styles/view.module.css b/frontend/styles/view.module.css index f16193dd..cc75505b 100644 --- a/frontend/styles/view.module.css +++ b/frontend/styles/view.module.css @@ -987,6 +987,7 @@ font-size: 3rem; margin-bottom: 1rem; color: #2C3E50; + cursor: pointer; } .ownercustomselect, From 77f7b5b597331b90c460238b28779fc18961c00f Mon Sep 17 00:00:00 2001 From: Bianca Date: Wed, 5 Jun 2024 10:37:01 -0600 Subject: [PATCH 4/4] Update .gitignore to ignore synbiohub-docker directory --- frontend/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/.gitignore b/frontend/.gitignore index 3a3f5892..36e0f891 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -31,3 +31,4 @@ yarn-error.log* # vercel .vercel +../synbiohub-docker/