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 Project Profile: Lucky Parking (Remove Sijia Pitts) #5904

Merged

Conversation

djbradleyii
Copy link
Member

Fixes #5800

What changes did you make?

  • Removed Sijia Pitts from the lucky-parking.md

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 (if any, please do not screen shot code changes)

Visuals before changes are applied

before

Visuals after changes are applied

after

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 djbradleyii-update-project-profile-LP-5800 gh-pages
git pull https://github.com/djbradleyii/website.git update-project-profile-LP-5800

Note that CONTRIBUTING.md cannot previewed locally; rather it should be previewed at this URL:

https://github.com/djbradleyii/website/blob/update-project-profile-LP-5800/CONTRIBUTING.md  

@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 Nov 14, 2023
@KyleA99 KyleA99 self-requested a review November 15, 2023 03:16
@roslynwythe roslynwythe requested a review from mademarc November 15, 2023 03:26
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

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

See inline comment regarding single/double quotes.

I'll review again once these issues are fixed

_projects/lucky-parking.md Outdated Show resolved Hide resolved
@LRenDO
Copy link
Member

LRenDO commented Nov 16, 2023

Hi @mademarc! Thanks for volunteering to review this issue! When you have a minute, please add your ETA and Availability. If for some reason you find that you're unable to review the request, please remove yourself as a reviewer. Thanks!

@mademarc
Copy link
Member

Review ETA: 11/16/2023
Availability: 7:10PM

mademarc
mademarc previously approved these changes Nov 17, 2023
Copy link
Member

@mademarc mademarc left a comment

Choose a reason for hiding this comment

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

Hey @djbradleyii good call on the changes for lines 58-63 and also on the adding of the double quotes either with or without linter.

@djbradleyii
Copy link
Member Author

@KyleA99 good catch. I fixed the issue. Let me know if you notice anything else.

KyleA99
KyleA99 previously approved these changes Nov 23, 2023
Copy link
Member

@KyleA99 KyleA99 left a comment

Choose a reason for hiding this comment

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

@djbradleyii changes look great. Thank you for the great work!

@t-will-gillis t-will-gillis self-requested a review November 26, 2023 22:17
Copy link
Member

@t-will-gillis t-will-gillis left a comment

Choose a reason for hiding this comment

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

Hey @djbradleyii Great job on your first PR.

  • Branches from/ to are good
  • Linked back to original issue
  • There is a concise description of what was done and why
  • Relevant 'before' and 'after' screenshots are shown
  • The code edits only change what needs to be changed

Everything looks good on your end- thanks!

You'll notice below that there is a merge conflict on this PR. If you have not seen this before, it just means that other people were working on the same file as you so the branch you started with is out of date. It is relatively easy to fix: First select "Resolve conflicts". The conflicts are shown on the next screen:

Merge conflicts Screenshot 2023-11-26 143153

Your branch is showing 'Jodie Chen' and 'Yujin Chang' in Lucky Parking still, but if you look at #4909 these two have been removed by other issues. To resolve the conflict, you will want to delete these two profiles, so everything from lines 46-66. When done, select "Mark as resolved" and this should take care of the conflicts flag.

When you are done, select the chasing arrows next to my name to "re-request review".

Thanks for working on this issue!

@djbradleyii
Copy link
Member Author

@KyleA99 Now that the edits have been made, can you please approve the PR? Thanks.

Copy link
Member

@t-will-gillis t-will-gillis left a comment

Choose a reason for hiding this comment

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

Hey @djbradleyii - Awesome, thanks for fixing the merge conflict!

@t-will-gillis t-will-gillis merged commit 338416f into hackforla:gh-pages Nov 28, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
None yet
Development

Successfully merging this pull request may close these issues.

Update Project Profile: Lucky Parking (Remove Sijia Pitts)
5 participants