Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update profile food oasis 3232 #3318

Closed

Conversation

lilyarj
Copy link
Member

@lilyarj lilyarj commented Jun 27, 2022

Fixes #3232

What changes did you make and why did you make them ?

  • I updated the food oasis profile
  • Deleted the leadership people and changed their names and position to :

Name: John
GitHub handle: @entrotech
Role: Architect and Technology Lead
Slack ID: UFLDX9V19

Name: Bryan Wu
GitHub handle: @fancyham
Role: Design Lead
Slack ID: U01PG6RD0T1

Name: Jieun Ryu
GitHub handle: @ryu-jieun
Role: UX Researcher
Slack ID: U02LL2DF4HL

Name: Gigi Patel
GitHub handle: @LIlinit
Role: UX Researcher
Slack ID: U02KZ8WSHHV

Name: Virginia Wu
GitHub handle: VirginiaWu11
Role: Full Stack Engineer
Slack ID: U02G7SBKSV7

Name: Seiko Igi
GitHub handle: @sei1122
Role: Product Designer
Slack ID: U02U55MQEQ7

Name: Hannah Zulueta
GitHub handle: hanapotski
Role: Full Stack Engineer
Slack ID: U9SCMTNK0 ( I actually used a different slack id, one that I got off slack for Hannah Zulueta because this one did not connect to an account) - This was the one I used (U01G7AH18J3)

  • I made these changes so the Food Oasis could have an updated profile with the people who are currently on the leadership team and all of their roles were described accurately.

Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)

Visuals before changes are applied Screen Shot 2022-06-26 at 10 51 39 AM
Visuals after changes are applied Screen Shot 2022-06-26 at 10 50 44 AM

@github-actions github-actions bot added P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less Complexity: Small Take this type of issues after the successful merge of your second good first issue time sensitive Needs to be worked on by a particular timeframe labels Jun 27, 2022
@lilyarj
Copy link
Member Author

lilyarj commented Jun 27, 2022

For some reason it is saying I submitted two commits, when I only submitted the second one. How do I change this?

@Sparky-code Sparky-code self-requested a review June 27, 2022 22:47
@Sparky-code
Copy link
Member

Hi @lilyarj Thank you for making note of the issues you encountered while working through this issue. I am checking in with @raswani2023 as it looks like she is the one responsible for the other commit. I will probably have you rebase this PR (and will write out some directions for that) but would like you to hold on for a bit while I figure out what happened on their side. Thanks for your patience.

@lilyarj
Copy link
Member Author

lilyarj commented Jun 28, 2022

Okay cool thank you so much. Also idk if this is useful information but I did review Riya's PR request right before I started working on this issue.

@Sparky-code
Copy link
Member

Hey @lilyarj after checking on the issue it looks like you were a reviewer on the issue that the extra file/commit is connected to.
I believe this ended up as part of your commit here as a result of that.

Please make sure that when you are adding files to commit that you do so explicitly. Using git status will help you see which files will be added when you use git add (it is always better to add files individually especially when you are only making changes to a single file). I would also say to make sure that you are pulling the most up to date commits from the website repository before committing your changes.

For this issue I'm going to ask you to follow this guide to remove the extra file. Let me know if you have any issues.

Copy link
Member

@Sparky-code Sparky-code left a comment

Choose a reason for hiding this comment

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

Please follow the linked guide to remove the credits/code.yml file as this deals with another issue. Please rerequest a review once this is done and I will check this PR again.

image

@kathrynsilvaconway
Copy link
Member

ETA: End of day, as soon as requested changes are made.
Availability: 1 hour

@lilyarj Don't forget to request a re-review from me as soon as you finish your changes.

@lilyarj
Copy link
Member Author

lilyarj commented Jun 29, 2022

Hi, @kathrynsilvaconway @Sparky-code I followed the steps in the guide, but I'm unsure what to do after that. Do I re submit another pull request, or is it supposed to auto update?
`lilyarjomand@Lilys-MacBook-Pro website % git rev-parse upstream/gh-pages
a2883aa

lilyarjomand@Lilys-MacBook-Pro website % git checkout a2883aa -- _data/internal/credits/code.yml`

@kathrynsilvaconway
Copy link
Member

Hi, @kathrynsilvaconway @Sparky-code I followed the steps in the guide, but I'm unsure what to do after that. Do I re submit another pull request, or is it supposed to auto update? `lilyarjomand@Lilys-MacBook-Pro website % git rev-parse upstream/gh-pages a2883aa

lilyarjomand@Lilys-MacBook-Pro website % git checkout a2883aa -- _data/internal/credits/code.yml`

hI @lilyarj , I am not completely sure if further action is needed or not. I am going to discuss it during office hours this evening.

@kathrynsilvaconway
Copy link
Member

The commit errors in this PR have prompted us to begin work on a new guide for deleting/preventing these issues. For the immediate issue, we will close this PR and have @lilyarj open a new one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Complexity: Small Take this type of issues after the successful merge of your second good first issue P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) role: back end/devOps Tasks for back-end developers role: front end Tasks for front end developers size: 0.5pt Can be done in 3 hours or less time sensitive Needs to be worked on by a particular timeframe
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Project Profile: Food Oasis
3 participants