Skip to content

Conversation

@MatthewCCChang
Copy link
Contributor

Closes #395

@MatthewCCChang MatthewCCChang self-assigned this Nov 8, 2023
Copy link
Contributor

@leeaj8-uci leeaj8-uci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your commit looks good to me: the one thing I need you to do is resolve the merge conflict (since other people have merged their photo in). Don't forget to maintain the alphabetic order for developers!

Also, I think your picture is a bit weirdly squashed on the site because it's not square: you can either replace it with a square photo (also nice if it makes the file-size smaller) or I'll go in later and fix the CSS on the website to make it look right. That's more a reflection of how not great the website's styling is, but what can you do right?

@MatthewCCChang
Copy link
Contributor Author

Fixed the merge conflict and the image

@leeaj8-uci
Copy link
Contributor

Cool, LGTM! Thank youuu

@leeaj8-uci leeaj8-uci merged commit 347f2bd into reinforcement-exercise-1 Nov 9, 2023
SubinQKim pushed a commit that referenced this pull request Nov 9, 2023
Co-authored-by: Andrew Lee <87255788+leeaj8-uci@users.noreply.github.com>
@leeaj8-uci leeaj8-uci deleted the mc-member-photo branch February 2, 2024 09:32
leeaj8-uci added a commit that referenced this pull request Feb 5, 2024
* Move Project Lead profiles

* Alyssia Tan member photo (#373)

* Closes issue #372

* track my file

* Add kevinwu image

* Revert "Add kevinwu image"

This reverts commit 8a10c99.

* Add member image for Sean Fong (#376)

* Zion's Member Photo Added (#382)

* added zion's image

* Fixed the 404 Linkedin Error

* Closes issue #375 and adds member image for Sean Kelman (#377)

* Attempt to fix potential format issues via editorconfig

* Add kevinwu image (#380)

* Add member image for Nathan Pietrantonio (#394)

* Added member image for Ethan Ho (#386)

* Added member photo for Ethan Ho

* Swapped cards to show up alphabetically

* Edited headshot for better centering

* Update members.js

Removed empty line that was breaking eslint

* Fixed alphabetical order

* Fixed merge conflict (#396)

Co-authored-by: Andrew Lee <87255788+leeaj8-uci@users.noreply.github.com>

* Add member image for Maithy Le (#398)

* Added Maithy Le member card to AISS team

* Put name in alphabetical order

---------

Co-authored-by: maithyy <maithyle265@yahoo.com>
Co-authored-by: leeaj8-uci <leeaj8@uci.edu>

* added member photo

* Try to disable ESLint line break checking

* Add member photo for elena (#409)

* added member photo - Priska Kunaidy

* Add Kaitlin Leung member photo to FPH page

* Added member image of Lana Ramadan (#384)

* Add photo and member data for Phillip Cutter (#402)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Fix ordering real quick

* Added member photo for Shawn Liu (#404)

* Shawn Liu photo file added

* Shawn Liu photo added

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added member photo for Rayan Tighiouart (#411)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added cc member photo (#414)

Co-authored-by: Cheryl Chen <cherylchen@Cheryls-MacBook-Pro-M2.local>

* added chloe cheng member photo (#415)

* added profile for katy on ctc website (#445)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added profile picture (#443)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added pfp (#441)

Co-authored-by: David <david.gershony.7@gmail.com>
Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Add member image for Jessie He (#435)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Adds member information and image for Lianne (#434)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added bobby member photo (#433)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added Member Image (#432)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added kristen's picture to aiss member page (#425)

Co-authored-by: Kristen Yee <kristenyee@Kristens-MacBook-Air.local>
Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Add member photo for Subin Kim (#421)

* Add member image for Subin Kim

* Fix merge conflict (correctly this time)

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Adding member photo for Emmy Chen (#419)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Farahnaz (#417)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added member photo for benson (#403)

* added member photo for benson

* fixed merge conflicts

* Redited name

* resolve merge conflicts

* fixed mergue conflicts

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Reorder because I don't know the alphabet

* The exciting sequel to 'Andrew doesn't know the alphabet'

* Crosslist board members when appropriate

* Reorder Project Leads

* Add designers (initial pass)

* Add a few remaining profiles

---------

Co-authored-by: Alyssia Tan <129691562+arralia@users.noreply.github.com>
Co-authored-by: Kevin Wu <kevinwu098@gmail.com>
Co-authored-by: Sean Fong <seancfong@gmail.com>
Co-authored-by: Zion <z10n.mateo@gmail.com>
Co-authored-by: Sean Kelman <seanrkelman@gmail.com>
Co-authored-by: Nathan Pietrantonio <78774649+theNatePi@users.noreply.github.com>
Co-authored-by: Ethan Ho <hoea2@uci.edu>
Co-authored-by: MatthewCCChang <86019269+MatthewCCChang@users.noreply.github.com>
Co-authored-by: ctc-devops <90984711+ctc-devops@users.noreply.github.com>
Co-authored-by: maithyy <maithyle265@yahoo.com>
Co-authored-by: Steven Zhou <stevenz9@uci.edu>
Co-authored-by: Elena Kao <83284069+pncntt8@users.noreply.github.com>
Co-authored-by: Priska Kunaidy <kunaidyp@uci.edu>
Co-authored-by: Kaitlin Leung <leungkn@uci.edu>
Co-authored-by: Lana Ramadan <70675417+lanaramadan@users.noreply.github.com>
Co-authored-by: Phillip Cutter <mrfleap@gmail.com>
Co-authored-by: ShawnnnLiu <130177750+ShawnnnLiu@users.noreply.github.com>
Co-authored-by: Rayan Tighiouart <88558727+tig-github@users.noreply.github.com>
Co-authored-by: cherhchen <54284307+cherhchen@users.noreply.github.com>
Co-authored-by: Cheryl Chen <cherylchen@Cheryls-MacBook-Pro-M2.local>
Co-authored-by: chloecheng8 <30807247+chloecheng8@users.noreply.github.com>
Co-authored-by: Katy Huang <96160110+KatyH820@users.noreply.github.com>
Co-authored-by: Kevin Liu <100456861+kevnlliu@users.noreply.github.com>
Co-authored-by: gdavid7 <67811641+gdavid7@users.noreply.github.com>
Co-authored-by: David <david.gershony.7@gmail.com>
Co-authored-by: Jessie He <104229166+jessieh9@users.noreply.github.com>
Co-authored-by: liannejl <91288901+liannejl@users.noreply.github.com>
Co-authored-by: Bobby Zhong <107908524+bobbyzhong@users.noreply.github.com>
Co-authored-by: Kade Na <78989039+kadejna@users.noreply.github.com>
Co-authored-by: kristenyee <66435886+kristenyee@users.noreply.github.com>
Co-authored-by: Kristen Yee <kristenyee@Kristens-MacBook-Air.local>
Co-authored-by: Subin Kim <67926982+SubinQKim@users.noreply.github.com>
Co-authored-by: Emmy Chen <58098646+eachen1010@users.noreply.github.com>
Co-authored-by: Farahnaz Hoque <107436970+farahnazhoque@users.noreply.github.com>
Co-authored-by: Benson Manzano <72283466+benson-fm@users.noreply.github.com>
leeaj8-uci added a commit that referenced this pull request Feb 5, 2024
* Move data files to more reasonable place

* Fix imports

* Add Profile Pictures for 2023-2024 (#448)

* Move Project Lead profiles

* Alyssia Tan member photo (#373)

* Closes issue #372

* track my file

* Add kevinwu image

* Revert "Add kevinwu image"

This reverts commit 8a10c99.

* Add member image for Sean Fong (#376)

* Zion's Member Photo Added (#382)

* added zion's image

* Fixed the 404 Linkedin Error

* Closes issue #375 and adds member image for Sean Kelman (#377)

* Attempt to fix potential format issues via editorconfig

* Add kevinwu image (#380)

* Add member image for Nathan Pietrantonio (#394)

* Added member image for Ethan Ho (#386)

* Added member photo for Ethan Ho

* Swapped cards to show up alphabetically

* Edited headshot for better centering

* Update members.js

Removed empty line that was breaking eslint

* Fixed alphabetical order

* Fixed merge conflict (#396)

Co-authored-by: Andrew Lee <87255788+leeaj8-uci@users.noreply.github.com>

* Add member image for Maithy Le (#398)

* Added Maithy Le member card to AISS team

* Put name in alphabetical order

---------

Co-authored-by: maithyy <maithyle265@yahoo.com>
Co-authored-by: leeaj8-uci <leeaj8@uci.edu>

* added member photo

* Try to disable ESLint line break checking

* Add member photo for elena (#409)

* added member photo - Priska Kunaidy

* Add Kaitlin Leung member photo to FPH page

* Added member image of Lana Ramadan (#384)

* Add photo and member data for Phillip Cutter (#402)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Fix ordering real quick

* Added member photo for Shawn Liu (#404)

* Shawn Liu photo file added

* Shawn Liu photo added

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added member photo for Rayan Tighiouart (#411)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added cc member photo (#414)

Co-authored-by: Cheryl Chen <cherylchen@Cheryls-MacBook-Pro-M2.local>

* added chloe cheng member photo (#415)

* added profile for katy on ctc website (#445)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added profile picture (#443)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added pfp (#441)

Co-authored-by: David <david.gershony.7@gmail.com>
Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Add member image for Jessie He (#435)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Adds member information and image for Lianne (#434)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added bobby member photo (#433)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added Member Image (#432)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* added kristen's picture to aiss member page (#425)

Co-authored-by: Kristen Yee <kristenyee@Kristens-MacBook-Air.local>
Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Add member photo for Subin Kim (#421)

* Add member image for Subin Kim

* Fix merge conflict (correctly this time)

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Adding member photo for Emmy Chen (#419)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Farahnaz (#417)

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Added member photo for benson (#403)

* added member photo for benson

* fixed merge conflicts

* Redited name

* resolve merge conflicts

* fixed mergue conflicts

---------

Co-authored-by: Andrew Lee <leeaj8@uci.edu>

* Reorder because I don't know the alphabet

* The exciting sequel to 'Andrew doesn't know the alphabet'

* Crosslist board members when appropriate

* Reorder Project Leads

* Add designers (initial pass)

* Add a few remaining profiles

---------

Co-authored-by: Alyssia Tan <129691562+arralia@users.noreply.github.com>
Co-authored-by: Kevin Wu <kevinwu098@gmail.com>
Co-authored-by: Sean Fong <seancfong@gmail.com>
Co-authored-by: Zion <z10n.mateo@gmail.com>
Co-authored-by: Sean Kelman <seanrkelman@gmail.com>
Co-authored-by: Nathan Pietrantonio <78774649+theNatePi@users.noreply.github.com>
Co-authored-by: Ethan Ho <hoea2@uci.edu>
Co-authored-by: MatthewCCChang <86019269+MatthewCCChang@users.noreply.github.com>
Co-authored-by: ctc-devops <90984711+ctc-devops@users.noreply.github.com>
Co-authored-by: maithyy <maithyle265@yahoo.com>
Co-authored-by: Steven Zhou <stevenz9@uci.edu>
Co-authored-by: Elena Kao <83284069+pncntt8@users.noreply.github.com>
Co-authored-by: Priska Kunaidy <kunaidyp@uci.edu>
Co-authored-by: Kaitlin Leung <leungkn@uci.edu>
Co-authored-by: Lana Ramadan <70675417+lanaramadan@users.noreply.github.com>
Co-authored-by: Phillip Cutter <mrfleap@gmail.com>
Co-authored-by: ShawnnnLiu <130177750+ShawnnnLiu@users.noreply.github.com>
Co-authored-by: Rayan Tighiouart <88558727+tig-github@users.noreply.github.com>
Co-authored-by: cherhchen <54284307+cherhchen@users.noreply.github.com>
Co-authored-by: Cheryl Chen <cherylchen@Cheryls-MacBook-Pro-M2.local>
Co-authored-by: chloecheng8 <30807247+chloecheng8@users.noreply.github.com>
Co-authored-by: Katy Huang <96160110+KatyH820@users.noreply.github.com>
Co-authored-by: Kevin Liu <100456861+kevnlliu@users.noreply.github.com>
Co-authored-by: gdavid7 <67811641+gdavid7@users.noreply.github.com>
Co-authored-by: David <david.gershony.7@gmail.com>
Co-authored-by: Jessie He <104229166+jessieh9@users.noreply.github.com>
Co-authored-by: liannejl <91288901+liannejl@users.noreply.github.com>
Co-authored-by: Bobby Zhong <107908524+bobbyzhong@users.noreply.github.com>
Co-authored-by: Kade Na <78989039+kadejna@users.noreply.github.com>
Co-authored-by: kristenyee <66435886+kristenyee@users.noreply.github.com>
Co-authored-by: Kristen Yee <kristenyee@Kristens-MacBook-Air.local>
Co-authored-by: Subin Kim <67926982+SubinQKim@users.noreply.github.com>
Co-authored-by: Emmy Chen <58098646+eachen1010@users.noreply.github.com>
Co-authored-by: Farahnaz Hoque <107436970+farahnazhoque@users.noreply.github.com>
Co-authored-by: Benson Manzano <72283466+benson-fm@users.noreply.github.com>

---------

Co-authored-by: Alyssia Tan <129691562+arralia@users.noreply.github.com>
Co-authored-by: Kevin Wu <kevinwu098@gmail.com>
Co-authored-by: Sean Fong <seancfong@gmail.com>
Co-authored-by: Zion <z10n.mateo@gmail.com>
Co-authored-by: Sean Kelman <seanrkelman@gmail.com>
Co-authored-by: Nathan Pietrantonio <78774649+theNatePi@users.noreply.github.com>
Co-authored-by: Ethan Ho <hoea2@uci.edu>
Co-authored-by: MatthewCCChang <86019269+MatthewCCChang@users.noreply.github.com>
Co-authored-by: ctc-devops <90984711+ctc-devops@users.noreply.github.com>
Co-authored-by: maithyy <maithyle265@yahoo.com>
Co-authored-by: Steven Zhou <stevenz9@uci.edu>
Co-authored-by: Elena Kao <83284069+pncntt8@users.noreply.github.com>
Co-authored-by: Priska Kunaidy <kunaidyp@uci.edu>
Co-authored-by: Kaitlin Leung <leungkn@uci.edu>
Co-authored-by: Lana Ramadan <70675417+lanaramadan@users.noreply.github.com>
Co-authored-by: Phillip Cutter <mrfleap@gmail.com>
Co-authored-by: ShawnnnLiu <130177750+ShawnnnLiu@users.noreply.github.com>
Co-authored-by: Rayan Tighiouart <88558727+tig-github@users.noreply.github.com>
Co-authored-by: cherhchen <54284307+cherhchen@users.noreply.github.com>
Co-authored-by: Cheryl Chen <cherylchen@Cheryls-MacBook-Pro-M2.local>
Co-authored-by: chloecheng8 <30807247+chloecheng8@users.noreply.github.com>
Co-authored-by: Katy Huang <96160110+KatyH820@users.noreply.github.com>
Co-authored-by: Kevin Liu <100456861+kevnlliu@users.noreply.github.com>
Co-authored-by: gdavid7 <67811641+gdavid7@users.noreply.github.com>
Co-authored-by: David <david.gershony.7@gmail.com>
Co-authored-by: Jessie He <104229166+jessieh9@users.noreply.github.com>
Co-authored-by: liannejl <91288901+liannejl@users.noreply.github.com>
Co-authored-by: Bobby Zhong <107908524+bobbyzhong@users.noreply.github.com>
Co-authored-by: Kade Na <78989039+kadejna@users.noreply.github.com>
Co-authored-by: kristenyee <66435886+kristenyee@users.noreply.github.com>
Co-authored-by: Kristen Yee <kristenyee@Kristens-MacBook-Air.local>
Co-authored-by: Subin Kim <67926982+SubinQKim@users.noreply.github.com>
Co-authored-by: Emmy Chen <58098646+eachen1010@users.noreply.github.com>
Co-authored-by: Farahnaz Hoque <107436970+farahnazhoque@users.noreply.github.com>
Co-authored-by: Benson Manzano <72283466+benson-fm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants