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

Integrate Donation GIF component into Join Us donation include #4926

Conversation

adrianang
Copy link
Member

@adrianang adrianang commented Jul 9, 2023

Fixes #4507

What changes did you make?

  • Make <h3> heading as a sibling of the component, within <div class="join-us-donation">.
    • This matches the implementation of the <h3> in the integration of the component in related issue Create donation gif component 4439 #4650 (implementing the component into the Donate page donation include).
  • Replace individual elements of the section in pages/join-donate-card.html with the new donation GIF component that encompasses the same content (body, image/GIF, footer)
  • Minor styling changes
    • .join-us-donation div now uses flex-direction: column to accommodate structure using the new component, also matching the previously merged implementation on /donate
    • increased top margin on .donation-footer (48px) as the previous amount (20px) would cause the first line of the footer text to overlap with the last line of ordered list item 2, especially at viewport widths from 767-790px (likely due to additional padding within the subsection the component is situated in)
  • Refactor SCSS files
    • _sass/components/_join-us.scss was refactored to delete styles that are no longer used, and to separate component styles from target page styles (mostly deleting styles using/related to .join-us-donation-body)
    • _sass/components/_donate-components.scss was refactored to remove margins/paddings that caused component body text to be misaligned/extending past parent container boundaries, as well as adding some missing spaces within styles (new line 106, 113)
      • NOTE: If this PR gets merged first, the developer who gets assigned to Integrate Donation gif component into About Us donate include #4504 should also take extra care to ensure that the donation GIF component on both the Join Us and Donate pages are not affected by changes to this stylesheet (and likewise, if this gets closed while issue 4504 is being worked on, then 4504 may have to resolve merge conflicts).

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

  • Integration of the donation GIF component allows for a consistent appearance for the animated donation GIF and associated text used throughout the website, as well as modularization
  • Refactoring SCSS styles to account for previous integrations (on Donate page), as well as future integrations (on Join Us, About page)

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

Visuals before changes are applied localhost4000_join-Before-Desktop localhost4000_join-Before-Mobile
Visuals after changes are applied localhost4000_join-After-Mobile localhost4000_join-After-Desktop

Notes:
-Header is intentionally different from before change to (1) separate the header from the component internal code, and (2) ensure consistency with the implementation of the header in the integrated component on /donate.
-'100% of donation proceeds...' line is below the GIF per action item 4 in the linked issue.

@github-actions
Copy link

github-actions bot commented Jul 9, 2023

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 adrianang-integrate-donation-gif-component-into-join-us-include-4507 gh-pages
git pull https://github.com/adrianang/website.git integrate-donation-gif-component-into-join-us-include-4507

@github-actions github-actions bot added role: front end Tasks for front end developers Complexity: Medium time sensitive Needs to be worked on by a particular timeframe Feature: Refactor CSS Page is working fine - CSS needs changes to become consistent with other pages P-Feature: Join Page https://www.hackforla.org/join Feature: Refactor HTML size: 1pt Can be done in 4-6 hours labels Jul 9, 2023
@Adastros Adastros requested review from roslynwythe and rdhmdhl July 9, 2023 17:16
@blulady
Copy link
Member

blulady commented Jul 12, 2023

@roslynwythe & @rdhmdhl when you guys get a chance please put down your eta?

@blulady blulady requested review from ronaldpaek and mademarc July 12, 2023 02:17
@rdhmdhl
Copy link
Member

rdhmdhl commented Jul 12, 2023

I will have this reviewed by tomorrow night.

Copy link
Member

@ronaldpaek ronaldpaek left a comment

Choose a reason for hiding this comment

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

From my end, checking the code and looking at the Figma design and the local host version, it does look different from the current hack4la website, but you said you made these visual changes to accommodate the drop-down menu, so if that is true, I think everything looks good and the other code rendered correctly. You did a great job making these design decisions yourself.

Copy link
Member

@rdhmdhl rdhmdhl 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 here.

I've reviewed these changes in my browser for mobile and desktop. It looks like the gif component is linked properly in the join-donate-card.html file, and the previous elements inside the join-us-donation div are removed. Your minor styling changes look good. All of the un-used classes in _join-us.css are removed.

My only callout for the merge team is that the the new component, donate-gif-text.html, re-ordered the gif to be at the bottom of the ordered list, instead of at the top like the website currently is. Not sure if this was intensional, but it does look better this way.

@mademarc
Copy link
Member

Review ETA: 7/13/2023
Availability: 7:05PM

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 @adrianang the changes from mg tags to h3 was done well and thr same for the css and the scss properties changes as well

@drakenguyen4000
Copy link
Member

Nicely done @adrianang!

@drakenguyen4000 drakenguyen4000 merged commit 1cff2f6 into hackforla:gh-pages Jul 16, 2023
ronaldpaek pushed a commit to ronaldpaek/website that referenced this pull request Jul 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Complexity: Medium Feature: Refactor CSS Page is working fine - CSS needs changes to become consistent with other pages Feature: Refactor HTML P-Feature: Join Page https://www.hackforla.org/join role: front end Tasks for front end developers size: 1pt Can be done in 4-6 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.

Integrate Donation gif component into Join Us donate include
6 participants