From 704bc83513d7a9199d47f3cbbbf809ae0412757f Mon Sep 17 00:00:00 2001 From: Michael McBride Date: Wed, 30 Aug 2023 14:11:54 -0400 Subject: [PATCH 1/5] update-contributors-section --- src/components/Members.jsx | 21 +++++++++++++-------- src/index.css | 9 +++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/components/Members.jsx b/src/components/Members.jsx index 5d3f726..b1489ef 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -9,12 +9,15 @@ function Members() { { id: 6, firstName: 'Justin', lastName: 'Woodward', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/17994108?v=4' }, ] const members = [ - { id: 0, name: 'John', imgUrl: '/head.png' }, - { id: 1, name: 'Ismael', imgUrl: '/head.png' }, - { id: 2, name: 'Nirvignesh', imgUrl: '/head.png' }, - { id: 3, name: 'Tijana', imgUrl: '/head.png' }, - { id: 4, name: 'Jennifer', imgUrl: '/head.png' }, - { id: 5, name: 'Kellan', imgUrl: '/head.png' }, + { id: 0, name: 'Jed', imgUrl: 'https://avatars.githubusercontent.com/u/22714448?v=4' }, + { id: 1, name: 'John', imgUrl: 'https://avatars.githubusercontent.com/u/41979303?v=4' }, + { id: 2, name: 'Amy', imgUrl: 'https://avatars.githubusercontent.com/u/28076677?v=4' }, + { id: 3, name: 'Ismael', imgUrl: 'https://avatars.githubusercontent.com/u/90379217?v=4' }, + { id: 4, name: 'Nash', imgUrl: 'https://avatars.githubusercontent.com/u/90426925?v=4' }, + { id: 5, name: 'Tijana', imgUrl: 'https://avatars.githubusercontent.com/u/16984496?v=4' }, + { id: 6, name: 'Jennifer', imgUrl: 'https://avatars.githubusercontent.com/u/97619638?v=4' }, + { id: 7, name: 'Kellan', imgUrl: 'https://avatars.githubusercontent.com/u/20804931?v=4' }, + { id: 8, name: 'FCCCAdmin', imgUrl: 'https://avatars.githubusercontent.com/u/87655129?v=4' }, ] return (
@@ -32,14 +35,16 @@ function Members() {

Meet the Contributors

-
+ +
{members.map((member) =>
{`beautiful -

{member.name}

+
{member.name}
)}
+
); diff --git a/src/index.css b/src/index.css index 477b0dd..cfc00e5 100644 --- a/src/index.css +++ b/src/index.css @@ -208,8 +208,8 @@ th { } .member-avatar { - height: 100px; - width: 100px; + height: 125px; + width: 125px; border-radius: 50%; } @@ -250,4 +250,9 @@ footer .image-wrapper { footer img { max-width: 100%; +} + +.contributors-link { + text-decoration: none; + color: #707070; } \ No newline at end of file From c9a42ea18e6f716f68e0add99d2ab89795930263 Mon Sep 17 00:00:00 2001 From: Michael McBride Date: Mon, 4 Sep 2023 14:20:08 -0400 Subject: [PATCH 2/5] add contributor photo and style --- src/components/Members.jsx | 37 ++++++++++++++++++------------------- src/index.css | 21 +++++++++++++++++---- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/components/Members.jsx b/src/components/Members.jsx index b1489ef..d77e2d7 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -9,15 +9,16 @@ function Members() { { id: 6, firstName: 'Justin', lastName: 'Woodward', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/17994108?v=4' }, ] const members = [ - { id: 0, name: 'Jed', imgUrl: 'https://avatars.githubusercontent.com/u/22714448?v=4' }, - { id: 1, name: 'John', imgUrl: 'https://avatars.githubusercontent.com/u/41979303?v=4' }, - { id: 2, name: 'Amy', imgUrl: 'https://avatars.githubusercontent.com/u/28076677?v=4' }, - { id: 3, name: 'Ismael', imgUrl: 'https://avatars.githubusercontent.com/u/90379217?v=4' }, - { id: 4, name: 'Nash', imgUrl: 'https://avatars.githubusercontent.com/u/90426925?v=4' }, - { id: 5, name: 'Tijana', imgUrl: 'https://avatars.githubusercontent.com/u/16984496?v=4' }, - { id: 6, name: 'Jennifer', imgUrl: 'https://avatars.githubusercontent.com/u/97619638?v=4' }, - { id: 7, name: 'Kellan', imgUrl: 'https://avatars.githubusercontent.com/u/20804931?v=4' }, - { id: 8, name: 'FCCCAdmin', imgUrl: 'https://avatars.githubusercontent.com/u/87655129?v=4' }, + { id: 0, name: 'Jed' }, + { id: 1, name: 'John' }, + { id: 2, name: 'Amy' }, + { id: 3, name: 'Mike' }, + { id: 4, name: 'Ismael' }, + { id: 5, name: 'Nash', }, + { id: 6, name: 'Tijana' }, + { id: 7, name: 'Jennifer' }, + { id: 8, name: 'Kellan' }, + { id: 9, name: 'FCCCAdmin' }, ] return (
@@ -33,18 +34,16 @@ function Members() { )}
-
+

Meet the Contributors

- -
- {members.map((member) => -
- {`beautiful -
{member.name}
-
- )} + + beautiful headshots of our members + +
+ {members.map((member) => +

{member.name}

+ )}
-
); diff --git a/src/index.css b/src/index.css index cfc00e5..b875739 100644 --- a/src/index.css +++ b/src/index.css @@ -207,10 +207,8 @@ th { width: 140px; } -.member-avatar { - height: 125px; - width: 125px; - border-radius: 50%; +.members-avatar { + width: 1000px; } .members h4 { @@ -221,6 +219,21 @@ th { margin-top: 15px; } +.contributors { + display: flex; + flex-flow: column nowrap; + align-items: center; +} + +.contributors-name-container { + max-width: 1000px; +} + +.contributors-name-container h4 { + margin-top: 15px; + width: 140px; +} + footer { display: flex; flex-direction: column; From e91cc67adac321acf42c4f9b50c7467c76097ea9 Mon Sep 17 00:00:00 2001 From: Michael McBride Date: Mon, 4 Sep 2023 14:25:49 -0400 Subject: [PATCH 3/5] clean up syntax, update members snapshot --- src/components/Members.jsx | 2 +- src/index.css | 9 +- .../__snapshots__/Members.test.js.snap | 106 ++++++++---------- 3 files changed, 47 insertions(+), 70 deletions(-) diff --git a/src/components/Members.jsx b/src/components/Members.jsx index d77e2d7..1eeb675 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -14,7 +14,7 @@ function Members() { { id: 2, name: 'Amy' }, { id: 3, name: 'Mike' }, { id: 4, name: 'Ismael' }, - { id: 5, name: 'Nash', }, + { id: 5, name: 'Nash' }, { id: 6, name: 'Tijana' }, { id: 7, name: 'Jennifer' }, { id: 8, name: 'Kellan' }, diff --git a/src/index.css b/src/index.css index b875739..82a138f 100644 --- a/src/index.css +++ b/src/index.css @@ -183,7 +183,8 @@ th { width: 33%; } -.members { +.members, +.contributors { display: flex; flex-flow: column nowrap; align-items: center; @@ -219,12 +220,6 @@ th { margin-top: 15px; } -.contributors { - display: flex; - flex-flow: column nowrap; - align-items: center; -} - .contributors-name-container { max-width: 1000px; } diff --git a/src/test/components/__snapshots__/Members.test.js.snap b/src/test/components/__snapshots__/Members.test.js.snap index 6e9f6a9..4c17a79 100644 --- a/src/test/components/__snapshots__/Members.test.js.snap +++ b/src/test/components/__snapshots__/Members.test.js.snap @@ -126,74 +126,56 @@ exports[`Members renders 1`] = `

Meet the Contributors

+ + beautiful headshots of our members +
-
- beautiful headshot of John. -

- John -

-
-
- beautiful headshot of Ismael. -

- Ismael -

-
-
- beautiful headshot of Nirvignesh. -

- Nirvignesh -

-
-
- beautiful headshot of Tijana. -

- Tijana -

-
-
- beautiful headshot of Jennifer. -

- Jennifer -

-
-
- beautiful headshot of Kellan. -

- Kellan -

-
+

+ Jed +

+

+ John +

+

+ Amy +

+

+ Mike +

+

+ Ismael +

+

+ Nash +

+

+ Tijana +

+

+ Jennifer +

+

+ Kellan +

+

+ FCCCAdmin +

From 8a1df572d1ae21d4305f926a5502fed2b13786fe Mon Sep 17 00:00:00 2001 From: Michael McBride Date: Tue, 12 Sep 2023 09:27:02 -0400 Subject: [PATCH 4/5] remove members names and update snapShot --- src/components/Members.jsx | 18 +--------- src/index.css | 13 +++---- .../__snapshots__/Members.test.js.snap | 34 ------------------- 3 files changed, 5 insertions(+), 60 deletions(-) diff --git a/src/components/Members.jsx b/src/components/Members.jsx index 1eeb675..43c141f 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -8,18 +8,7 @@ function Members() { { id: 5, firstName: 'Sarah', lastName: 'Lilly-Bruland', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/17872422?v=4' }, { id: 6, firstName: 'Justin', lastName: 'Woodward', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/17994108?v=4' }, ] - const members = [ - { id: 0, name: 'Jed' }, - { id: 1, name: 'John' }, - { id: 2, name: 'Amy' }, - { id: 3, name: 'Mike' }, - { id: 4, name: 'Ismael' }, - { id: 5, name: 'Nash' }, - { id: 6, name: 'Tijana' }, - { id: 7, name: 'Jennifer' }, - { id: 8, name: 'Kellan' }, - { id: 9, name: 'FCCCAdmin' }, - ] + return (
@@ -39,11 +28,6 @@ function Members() { beautiful headshots of our members -
- {members.map((member) => -

{member.name}

- )} -
); diff --git a/src/index.css b/src/index.css index 82a138f..cb8d729 100644 --- a/src/index.css +++ b/src/index.css @@ -190,6 +190,10 @@ th { align-items: center; } +.contributors { + margin-bottom: 25px; +} + .row { display: flex; flex-direction: row; @@ -220,15 +224,6 @@ th { margin-top: 15px; } -.contributors-name-container { - max-width: 1000px; -} - -.contributors-name-container h4 { - margin-top: 15px; - width: 140px; -} - footer { display: flex; flex-direction: column; diff --git a/src/test/components/__snapshots__/Members.test.js.snap b/src/test/components/__snapshots__/Members.test.js.snap index 4c17a79..f63307c 100644 --- a/src/test/components/__snapshots__/Members.test.js.snap +++ b/src/test/components/__snapshots__/Members.test.js.snap @@ -143,40 +143,6 @@ exports[`Members renders 1`] = ` src="https://contrib.rocks/image?repo=FCCColumbus/cbus-web" /> -
-

- Jed -

-

- John -

-

- Amy -

-

- Mike -

-

- Ismael -

-

- Nash -

-

- Tijana -

-

- Jennifer -

-

- Kellan -

-

- FCCCAdmin -

-
`; From 3f16d8da2c2cb43e0249e74bccc806915d0b2635 Mon Sep 17 00:00:00 2001 From: Michael McBride Date: Wed, 20 Sep 2023 07:29:07 -0400 Subject: [PATCH 5/5] fix className inconsistencies --- src/components/Members.jsx | 4 ++-- src/index.css | 8 ++++---- src/test/components/__snapshots__/Members.test.js.snap | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Members.jsx b/src/components/Members.jsx index 43c141f..cad92c4 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -11,7 +11,7 @@ function Members() { return (
-
+

Meet the Admins

{admin.map((member) => @@ -26,7 +26,7 @@ function Members() {

Meet the Contributors

- beautiful headshots of our members + beautiful headshots of our members
diff --git a/src/index.css b/src/index.css index cb8d729..7ad6d20 100644 --- a/src/index.css +++ b/src/index.css @@ -183,7 +183,7 @@ th { width: 33%; } -.members, +.admins, .contributors { display: flex; flex-flow: column nowrap; @@ -212,15 +212,15 @@ th { width: 140px; } -.members-avatar { +.members-avatar, .contributors-avatar { width: 1000px; } -.members h4 { +.admins h4 { margin: 5px 0 5px 0; } -.members h5 { +.admins h5 { margin-top: 15px; } diff --git a/src/test/components/__snapshots__/Members.test.js.snap b/src/test/components/__snapshots__/Members.test.js.snap index f63307c..194b56d 100644 --- a/src/test/components/__snapshots__/Members.test.js.snap +++ b/src/test/components/__snapshots__/Members.test.js.snap @@ -3,7 +3,7 @@ exports[`Members renders 1`] = `

Meet the Admins @@ -139,7 +139,7 @@ exports[`Members renders 1`] = ` > beautiful headshots of our members