diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 6aa24b1..5c0548e 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -23,6 +23,7 @@ function Footer() {

Copyright Free Code Camp Columbus 2023 - {new Date().getFullYear()}

+ Deploys by Netlify ); } diff --git a/src/components/Members.jsx b/src/components/Members.jsx index 05c80d2..5d3f726 100644 --- a/src/components/Members.jsx +++ b/src/components/Members.jsx @@ -1,16 +1,20 @@ function Members() { const admin = [ - { name: 'John', imgUrl: '/head.png' }, - { name: 'Amy', imgUrl: '/head.png' }, - { name: 'Kevin', imgUrl: '/head.png' }, + { id: 0, firstName: 'John', lastName: 'Riley', title: 'Admin & Coding Mentor', imgUrl: 'https://avatars.githubusercontent.com/u/41979303?v=4' }, + { id: 1, firstName: 'Kent', lastName: 'Utterback', title: 'Admin Emeritus & Coding Mentor', imgUrl: 'https://avatars.githubusercontent.com/u/17324971?v=4' }, + { id: 2, firstName: 'Amy', lastName: 'Bedinghaus', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/28076677?v=4' }, + { id: 3, firstName: 'Austin', lastName: 'Truss', title: 'Admin Emeritus', imgUrl: 'https://media.licdn.com/dms/image/C5603AQGQpynBhWiZLA/profile-displayphoto-shrink_200_200/0/1517355585710?e=1696464000&v=beta&t=DrPEzm5U1we4G7qUPoFrAA5gw_MHSN3dU8_02iWZYRA' }, + { id: 4, firstName: 'Kevin', lastName: 'Bruland', title: 'Admin Emeritus', imgUrl: 'https://avatars.githubusercontent.com/u/17850505?v=4' }, + { 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 = [ - { name: 'John', imgUrl: '/head.png' }, - { name: 'Ismael', imgUrl: '/head.png' }, - { name: 'Nirvignesh', imgUrl: '/head.png' }, - { name: 'Tijana', imgUrl: '/head.png' }, - { name: 'Jennifer', imgUrl: '/head.png' }, - { name: 'Kellan', imgUrl: '/head.png' }, + { 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' }, ] return (
@@ -18,19 +22,20 @@ function Members() {

Meet the Admins

{admin.map((member) => -
- {`beautiful -

{member.name}

+
+

{member.firstName}
{member.lastName}

+ {`beautiful +
{member.title}
)}
-
+

Meet the Contributors

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

{member.name}

)} diff --git a/src/index.css b/src/index.css index 7090888..477b0dd 100644 --- a/src/index.css +++ b/src/index.css @@ -197,22 +197,34 @@ th { justify-content: space-evenly; } -.admin, -.member { - height: 140px; - width: 140px; - padding: .75em; +.avatar { border: 1px solid #707070; background-color: #f5b742; } -.member { +.admin-avatar { + height: 140px; + width: 140px; +} + +.member-avatar { height: 100px; width: 100px; border-radius: 50%; } +.members h4 { + margin: 5px 0 5px 0; +} + +.members h5 { + margin-top: 15px; +} + footer { + display: flex; + flex-direction: column; + justify-content: space-around; background-color: #97dad0; padding: 1em 1em 2em 1em; } @@ -228,4 +240,14 @@ footer p { footer p { margin: 0; +} + +footer .image-wrapper { + display: inline-block; + width: 90px; + margin: 1rem auto 0; +} + +footer img { + max-width: 100%; } \ No newline at end of file diff --git a/src/links.js b/src/links.js index a5eeb68..a807cd2 100644 --- a/src/links.js +++ b/src/links.js @@ -2,8 +2,8 @@ export default [ { href: '/', text: 'Home' }, { href: '#about', text: 'About' }, { href: 'https://www.freecodecamp.org/', text: 'FreeCodeCamp' }, - { href: 'https://discord.gg', text: 'Discord' }, + { href: 'https://discord.com/invite/EXehPVnBYz', text: 'Discord' }, { href: 'https://github.com/FCCColumbus', text: 'GitHub' }, { href: '#events', text: 'Events' }, { href: 'https://github.com/FCCColumbus/cbus-web/graphs/contributors', text: 'Contributors' }, -] \ No newline at end of file +]; diff --git a/src/test/App.test.js b/src/test/App.test.js index d85f70b..3399587 100644 --- a/src/test/App.test.js +++ b/src/test/App.test.js @@ -12,7 +12,7 @@ describe("App", () => { describe("renders links to external sites", () => { it.each([ ['freeCodeCamp.org homepage', 'freecodecamp.org'], - ['Discord homepage', 'discord.gg'], + ['Discord homepage', 'discord.com/invite/EXehPVnBYz'], ['FCCColumbus Github profile', 'github.com/FCCColumbus'], ['FCCColumbus Github contributors', 'github.com/FCCColumbus/cbus-web/graphs/contributors'], ])(`%s`, (_, expected) => { diff --git a/src/test/__snapshots__/App.test.js.snap b/src/test/__snapshots__/App.test.js.snap index 5b7814d..5a452ce 100644 --- a/src/test/__snapshots__/App.test.js.snap +++ b/src/test/__snapshots__/App.test.js.snap @@ -34,7 +34,7 @@ exports[`App renders 1`] = `
  • Discord @@ -196,34 +196,116 @@ exports[`App renders 1`] = ` className="row" >
    - beautiful headshot of John.

    John +
    + + Riley

    + beautiful headshot of John Riley. +
    + Admin & Coding Mentor +
    +

    + Kent +
    + + Utterback +

    beautiful headshot of Amy. +
    + Admin Emeritus & Coding Mentor +
    +
    +

    Amy +
    + + Bedinghaus

    + beautiful headshot of Amy Bedinghaus. +
    + Admin Emeritus +
    +

    + Austin +
    + + Truss +

    beautiful headshot of Kevin. +
    + Admin Emeritus +
    +
    +

    Kevin +
    + + Bruland

    + beautiful headshot of Kevin Bruland. +
    + Admin Emeritus +
    +
    +
    +

    + Sarah +
    + + Lilly-Bruland +

    + beautiful headshot of Sarah Lilly-Bruland. +
    + Admin Emeritus +
    +
    +
    +

    + Justin +
    + + Woodward +

    + beautiful headshot of Justin Woodward. +
    + Admin Emeritus +
  • @@ -239,7 +321,7 @@ exports[`App renders 1`] = `
    beautiful headshot of John.

    @@ -249,7 +331,7 @@ exports[`App renders 1`] = `
    beautiful headshot of Ismael.

    @@ -259,7 +341,7 @@ exports[`App renders 1`] = `
    beautiful headshot of Nirvignesh.

    @@ -269,7 +351,7 @@ exports[`App renders 1`] = `
    beautiful headshot of Tijana.

    @@ -279,7 +361,7 @@ exports[`App renders 1`] = `
    beautiful headshot of Jennifer.

    @@ -289,7 +371,7 @@ exports[`App renders 1`] = `
    beautiful headshot of Kellan.

    @@ -318,7 +400,7 @@ exports[`App renders 1`] = `
  • Discord @@ -350,6 +432,19 @@ exports[`App renders 1`] = ` Copyright Free Code Camp Columbus 2023 - 2023

    + + + Deploys by Netlify + +
  • `; diff --git a/src/test/components/Footer.test.js b/src/test/components/Footer.test.js index d8da0c1..3f55f1d 100644 --- a/src/test/components/Footer.test.js +++ b/src/test/components/Footer.test.js @@ -7,4 +7,4 @@ describe("Footer", () => { const view = renderer.create(
    ); expect(view).toMatchSnapshot(); }); -}); +}); \ No newline at end of file diff --git a/src/test/components/Header.test.js b/src/test/components/Header.test.js index 81353be..2d08697 100644 --- a/src/test/components/Header.test.js +++ b/src/test/components/Header.test.js @@ -7,4 +7,4 @@ describe("Header", () => { const view = renderer.create(
    ); expect(view).toMatchSnapshot(); }); -}); +}); \ No newline at end of file diff --git a/src/test/components/__snapshots__/Footer.test.js.snap b/src/test/components/__snapshots__/Footer.test.js.snap index 406731b..6f7484c 100644 --- a/src/test/components/__snapshots__/Footer.test.js.snap +++ b/src/test/components/__snapshots__/Footer.test.js.snap @@ -20,7 +20,7 @@ exports[`Footer renders 1`] = `
  • Discord @@ -52,5 +52,18 @@ exports[`Footer renders 1`] = ` Copyright Free Code Camp Columbus 2023 - 2023

    + + + Deploys by Netlify + +
  • `; diff --git a/src/test/components/__snapshots__/Header.test.js.snap b/src/test/components/__snapshots__/Header.test.js.snap index 9fdeda1..e1172ea 100644 --- a/src/test/components/__snapshots__/Header.test.js.snap +++ b/src/test/components/__snapshots__/Header.test.js.snap @@ -31,7 +31,7 @@ exports[`Header renders 1`] = `
  • Discord diff --git a/src/test/components/__snapshots__/Members.test.js.snap b/src/test/components/__snapshots__/Members.test.js.snap index d3d6a99..6e9f6a9 100644 --- a/src/test/components/__snapshots__/Members.test.js.snap +++ b/src/test/components/__snapshots__/Members.test.js.snap @@ -12,34 +12,116 @@ exports[`Members renders 1`] = ` className="row" >
    - beautiful headshot of John.

    John +
    + + Riley

    + beautiful headshot of John Riley. +
    + Admin & Coding Mentor +
    +

    + Kent +
    + + Utterback +

    beautiful headshot of Amy. +
    + Admin Emeritus & Coding Mentor +
    +
    +

    Amy +
    + + Bedinghaus

    + beautiful headshot of Amy Bedinghaus. +
    + Admin Emeritus +
    +

    + Austin +
    + + Truss +

    beautiful headshot of Kevin. +
    + Admin Emeritus +
    +
    +

    Kevin +
    + + Bruland +

    + beautiful headshot of Kevin Bruland. +
    + Admin Emeritus +
    +
    +
    +

    + Sarah +
    + + Lilly-Bruland

    + beautiful headshot of Sarah Lilly-Bruland. +
    + Admin Emeritus +
    +
    +
    +

    + Justin +
    + + Woodward +

    + beautiful headshot of Justin Woodward. +
    + Admin Emeritus +
  • @@ -55,7 +137,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of John.

    @@ -65,7 +147,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of Ismael.

    @@ -75,7 +157,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of Nirvignesh.

    @@ -85,7 +167,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of Tijana.

    @@ -95,7 +177,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of Jennifer.

    @@ -105,7 +187,7 @@ exports[`Members renders 1`] = `
    beautiful headshot of Kellan.