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.

Sign up for GitHub

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

Jump to bottom

Update Project Profile: 311 Data Add Joy Truex #7637

Merged
merged 2 commits into from
Nov 10, 2024
Merged

Update Project Profile: 311 Data Add Joy Truex #7637

merged 2 commits into from
Nov 10, 2024

Conversation

rachelcorawood
Copy link
Member

@rachelcorawood rachelcorawood commented Oct 25, 2024 •
edited
Loading

Fixes #7541

What changes did you make?

-In the _projects/311-data.md file.

-Found the leadership variable and add the following profile.

-name: Joy Truex
github-handle: Joy-Truex
role: UX Design Lead
links:
slack: https://hackforla.slack.com/team/U03VBPSEH52
github: https://github.com/Joy-Truex
picture: https://avatars.githubusercontent.com/Joy-Truex

-Verified the changes by viewing the following in your local environment on 311 Data page

Why did you make the changes (we will use this info to test)?

-We need to keep project information up to date so that visitors to the website can find accurate information.

Screenshots of Proposed Changes Of The Website

Visuals before changes are applied

Screenshot 2024-10-25 at 3 51 31 PM

Visuals after changes are applied

Screenshot 2024-10-25 at 3 51 08 PM

@github-actions GitHub Actions
Copy link

Want to review this pull request? Take a look at this documentation for a step by step guide!

From your project repository, check out a new branch and test the changes.

git checkout -b rachelcorawood-311-data-add-joy-7541 gh-pages
git pull https://github.com/rachelcorawood/website.git 311-data-add-joy-7541

@t-will-gillis
Copy link
Member

t-will-gillis commented Oct 26, 2024 •
edited
Loading

Hi @rachelcorawood The Pull Request template includes the word "Fixes" before the issue number. This word is required and this is why there are two workflows failing below- please add it back as shown in the PR template instructions. (Adding the word "Fixes" tells GitHub to link your PR with the issue that you are fixing.)

PR template Screenshot 2024-10-25 192336

Also, please note that in Markdown, there needs to be a single space between the dash and the text that follows in a list. Please add the spaces back so that your PR is formatted correctly with bullet points.

Example:
-list1
-list2
-list3

Versus:

  • list1
  • list2
  • list3

@github-actions github-actions bot added good first issue Good for newcomers role: front end Tasks for front end developers role: back end/devOps Tasks for back-end developers P-Feature: Project Info and Page A project's detail page (e.g. https://www.hackforla.org/projects/100-automations) time sensitive Needs to be worked on by a particular timeframe size: 0.25pt Can be done in 0.5 to 1.5 hours labels Oct 28, 2024
@rachelcorawood
Copy link
Member Author

@t-will-gillis Thank you for the feedback.

I updates the pull request as per your suggestions.

@siyunfeng siyunfeng self-requested a review October 29, 2024 03:16
@siyunfeng
Copy link
Member

Review ETA: 10/29/2024 Tuesday
Availability: 6-10 PM Weekdays (EDT)

siyunfeng
siyunfeng approved these changes Oct 29, 2024
View reviewed changes
Copy link
Member

@siyunfeng siyunfeng left a comment

Choose a reason for hiding this comment

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

Nice job working on this issue, @rachelcorawood !

I appreciate you providing your availability and ETA in the original issue and updating the linked issue to your PR. The branch you made the change in is accurate. The change you made is correct. It's helpful to provide the before-and-after screenshots.

Improvements:

  • Avoid including your bookmark bar or other personal info in the screenshots
  • Leave a space between "-" and the content to list your bullet points, such as - Found the leadership variable and add the following profile, or you can type your bullet points, select all of them, and click the unordered list button in the editor

Other than these, it looks good. Thank you for your contribution!

@floydferrer floydferrer self-requested a review October 29, 2024 04:56
@floydferrer
Copy link
Member

Review ETA: 10/29/2024 Tuesday
Availability: 11AM-2PM Weekdays (PST)

@Thinking-Panda
Copy link
Member

@rachelcorawood Please resolve the merge conflict and push the branch again. To resolve merge conflict read -(https://github.com/hackforla/website/wiki/How-to-Resolve-Merge-Conflicts)

@codyyjxn codyyjxn self-requested a review October 31, 2024 00:36
codyyjxn
codyyjxn previously approved these changes Nov 3, 2024
View reviewed changes
Copy link
Member

@codyyjxn codyyjxn left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@rachelcorawood Thank you for taking this issue.

Things that went well:

  • You made the correct changes
  • The description is very detailed and concise
  • The issue is linked correctly

Things that need to be fixed:

  • Merge conflict

@t-will-gillis
Copy link
Member

Hi @rachelcorawood Please see the merge conflict and resolve it so that your issue can be finished. If you need help with it, please let us know. Thanks!

floydferrer
floydferrer previously approved these changes Nov 4, 2024
View reviewed changes
Copy link
Member

@floydferrer floydferrer left a comment

Choose a reason for hiding this comment

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

Hi @rachelcorawood thanks for taking this issue!

Things that went well:

  • You made the correct changes
  • The description is very detailed and concise
  • The issue is linked correctly

Things that need to be fixed:

  • Merge conflict

Thank you for your contribution!

@floydferrer floydferrer mentioned this pull request Nov 4, 2024
Open
siyunfeng
siyunfeng requested changes Nov 4, 2024
View reviewed changes
Copy link
Member

@siyunfeng siyunfeng left a comment

Choose a reason for hiding this comment

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

@rachelcorawood , the change you made was accurate.

You need to update your branch before your PR can be merged because some issues related to yours were being merged. You can click the Resolve conflicts button to merge.

Request changes:

  • Resolve conflicts (Conflicting files: _projects/311-data.md)

Let us know if you have any questions. Thanks!

@rachelcorawood
Copy link
Member Author

Thank you all for your comments and suggested edits. I will make these by Wednesday evening. I'm dealing with unexpected event that is taking away my attention from solving this pull request.

@patelbansi3009 patelbansi3009 self-requested a review November 8, 2024 07:21
@patelbansi3009
Copy link
Member

ETA: End of the Day
Availability: 9-5 PM 11/08/24

patelbansi3009
patelbansi3009 previously approved these changes Nov 8, 2024
View reviewed changes
Copy link
Member

@patelbansi3009 patelbansi3009 left a comment •
edited by rachelcorawood
Loading

Choose a reason for hiding this comment

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

Hi @rachelcorawood, thank you for addressing this issue!

What went well:

  • The changes made were correct
  • The description is clear and detailed
  • The issue has been properly linked

Things to address:

  • Resolve the merge conflict

Thanks again for your contribution!

@rachelcorawood
Copy link
Member Author

Thank you for your patience. Resolved the Merge Conflict I believe....

siyunfeng
siyunfeng approved these changes Nov 8, 2024
View reviewed changes
Copy link
Member

@siyunfeng siyunfeng left a comment

Choose a reason for hiding this comment

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

Thank you for resolving the merge conflict, @rachelcorawood !

  • The branch you made change on is correct
  • The linked issue is included
  • The change you made is accurate
  • Before-and-after screenshots match the website view

Nice job and keep it up!

@t-will-gillis
Copy link
Member

@rachelcorawood You can let your reviewers know that your PR is ready for a re-review by clicking on the 'chasing arrows' next to your PR reviewer's names:

Screenshot 2024-11-09 111123

floydferrer
floydferrer approved these changes Nov 10, 2024
View reviewed changes
Copy link
Member

@floydferrer floydferrer left a comment

Choose a reason for hiding this comment

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

Hi @rachelcorawood thanks for merging the conflict! This now approved.

Thank you for your contribution!

@t-will-gillis t-will-gillis merged commit ac75635 into hackforla:gh-pages Nov 10, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floydferrer floydferrer floydferrer approved these changes

@siyunfeng siyunfeng siyunfeng approved these changes

@patelbansi3009 patelbansi3009 Awaiting requested review from patelbansi3009

@codyyjxn codyyjxn Awaiting requested review from codyyjxn

Assignees
No one assigned
Labels
good first issue Good for newcomers 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.25pt Can be done in 0.5 to 1.5 hours time sensitive Needs to be worked on by a particular timeframe
Projects
P: HfLA Website: Project Board
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Project Profile: 311 Data Add Joy Truex
7 participants
@rachelcorawood @t-will-gillis @siyunfeng @floydferrer @Thinking-Panda @patelbansi3009 @codyyjxn