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

updating wins-feature-1 with changes made on gh-pages #1869

Merged
merged 126 commits into from
Jul 12, 2021
Merged

updating wins-feature-1 with changes made on gh-pages #1869

merged 126 commits into from
Jul 12, 2021

Conversation

jbubar
Copy link
Member

@jbubar jbubar commented Jun 30, 2021 •
edited
Loading

@marcobarrera made some changes to the wins page on gh-pages, so I thought we should merge those changes into the wins-feature-1 branch.. This will also include all the gh-pages changes up till now. So it is like an update for the wins-feature-1 development branch..

We are going to have to do this eventually.. why not now.. before it gets worse.

marcobarrera1996 and others added 30 commits June 13, 2021 12:01
@marcobarrera1996
Changed margin for toolkit page header (#1726)
cd8416e
@HackforLABot
Updating wins data
2c4bce2
@HackforLABot @actions-user
Update meeting data
7a1638b
@HackforLABot @actions-user
Update contributor and language data
a287e5c
@grhhhh
Wins page modal a11y (#1679)
c122699 
* makes ESC key close wins page modal

* progress toward mwins page modal fix

* in progress

* fixes issue w hideoverly and inert

* removes package-lock.json and commented code

* fixes bug where inert remained true after window resize < 960

* fixes inert bug
@akibrhast
Revert "Wins page modal a11y (#1679)" (#1738)
c492445 
This reverts commit c122699.
@HackforLABot
Updating wins data
bc54eab
@HackforLABot @actions-user
Update meeting data
e5d77d1
@HackforLABot @actions-user
Update contributor and language data
46ca5e3
@jbubar
revert wins-data.json (#1745)
42b3fbd
@HackforLABot
Updating wins data
b76dcb6
@jbubar
need to delete this, this check is in the app sheet, plus it is break…
d73e16d 
…ing the page (#1746)
@arghmatey
Update program areas page to reflect correct mini project cards (#1684)
ca01dbf 
* Updates program areas to reflect correct project cards

* Add placeholder image to repo and update on corresponding cards
@akibrhast
Revert "Revert "Wins page modal a11y (#1679)" (#1738)" (#1747)
aedbca2 
This reverts commit c492445.
@jbubar
Wins form css (#1314)
7e204ce 
* begin css changes

* initial page styling

* add submit success message

* styled the inputs to be more simple

* small update

* change colors to variables

* fix github error checking, and make textarea required
@Zak234
Update CONTRIBUTING.md
71c8a08
@Zak234
Update CONTRIBUTING.md
f81f4d6
@HackforLABot
Updating wins data
88e0852
@HackforLABot @actions-user
Update meeting data
e25c293
@HackforLABot @actions-user
Update contributor and language data
1ef31dd
@Aveline-art
Create add-issue-labels-to-pr.yml (#1740)
f15cb4e 
* Create add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Added auth. To be reverted.

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml
@akibrhast
Update add-issue-labels-to-pr.yml
6d50f58
@Zak234
Update CONTRIBUTING.md (#1751)
17065d6
@akibrhast
Update update-comment-on-update-label.yml
72fa7a2 
Fix typo
@akibrhast
Create pull_request_template.md
10482ce
@akibrhast
Delete pull_request_template.md
f54cef3
@akibrhast
Create pull_request_template.md
c23f5e7
@akibrhast
Update pull_request_template.md
6dec998
@akibrhast
Update pull_request_template.md
75d3d08
@Abel-Zambrano
Fixes #1574 (#1764)
d9cb7c1
@github-pages github-pages bot temporarily deployed to github-pages July 1, 2021 08:28 Inactive
@github-pages github-pages bot temporarily deployed to github-pages July 1, 2021 10:16 Inactive
@github-pages github-pages bot temporarily deployed to github-pages July 1, 2021 11:22 Inactive
@jbubar
Copy link
Member Author

jbubar commented Jul 1, 2021 •
edited
Loading

Ok. So I resolved the merge conflicts... if you want to pull it to your machine run these commands.

git fetch upstream
git checkout -b gh-pages-1 upstream/gh-pages-1
git merge wins-feature-1

I created a branch gh-pages-1 for resolving the merge conflicts. we can delete it after this merge.

Oh wait.. going to update some things..

@jbubar
Copy link
Member Author

jbubar commented Jul 1, 2021

Ok. I think it is ready to merge

@jbubar jbubar marked this pull request as ready for review July 1, 2021 21:01
@jbubar jbubar requested review from akibrhast and Aveline-art July 1, 2021 21:02
@akibrhast
Copy link
Member

akibrhast commented Jul 2, 2021 •
edited
Loading

Quick question @jbubar . This looks like it is a merge of gh-pages into wins-feature-1 , is that correct? If it is, may I recommend an alternative to do a rebase instead. What are your thoughts and opinions on this ?

Because:

  1. The feature branch will have an extraneous merge commit every time you need to incorporate upstream changes. If main is very active, this can pollute your feature branch’s history quite a bit
  2. The major benefit of rebasing is that you get a much cleaner project history. It eliminates the unnecessary merge commits required by git merge.

source:

Aveline-art
Aveline-art approved these changes Jul 2, 2021
View reviewed changes
Copy link
Member

@Aveline-art Aveline-art 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.

I have examined every page and the code and everything works as intended! Thanks for taking the time for this, Josh. To avoid doing this again, would you like me to make an issue to research methods to concurrently update the wins-feature-1 branch with the gh-pages branch?

Also, what are your thoughts on implementing unittesting for the website project?

@akibrhast
Copy link
Member

issue to research methods to concurrently update the wins-feature-1 branch with the gh-pages branch

Yes to opening an issue to research and discuss about the possibilities, benefits and potential pitfalls

  • One side effect to that , of the top of my head is that it is going to create a lot of headache and overheads for anyone working on a feature branch.

@jbubar
Copy link
Member Author

jbubar commented Jul 2, 2021

@Aveline-art I am so sorry that you had to read through all the files. True MVP!!

I did this because of marco's commit where he added a 'x' closing button to the wins page on gh-pages. I thought it was necessary to have that commit on feature branch. I also thought that it would be a chance to resolve merge conflicts if there were any.

When the feature is ready we will merge it into gh-pages, I do not imagine that we have to do this again, unless we make changes to the wins page on gh-pages

@akibrhast I do not know about rebase. Lets bring this up in the dev meeting.

@akibrhast
Copy link
Member

I am going to take my self as a reviewer off of this. Leaving the decisions to @hackforla/website-merge

@akibrhast akibrhast removed their request for review July 3, 2021 16:32
@akibrhast
Copy link
Member

@jbubar What exactly do you want us to discuss on our next dev meeting regarding this ?

@abuna1985 abuna1985 mentioned this pull request Jul 6, 2021
Closed
12 tasks
@jbubar
Copy link
Member Author

jbubar commented Jul 7, 2021

Only need to look at these two commits
e2f624a

dd908a1

@jbubar jbubar requested a review from averdin2 July 7, 2021 02:56
@jbubar jbubar mentioned this pull request Jul 11, 2021
Merged
@Aveline-art Aveline-art mentioned this pull request Jul 12, 2021
Merged
averdin2
averdin2 approved these changes Jul 12, 2021
View reviewed changes
Copy link
Member

@averdin2 averdin2 left a comment

Choose a reason for hiding this comment

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

@jbubar Everything on the wins page looks good to me. I think this should be ready to merge.

@averdin2 averdin2 merged commit 7f5c39a into wins-feature-1 Jul 12, 2021
@averdin2 averdin2 deleted the gh-pages-1 branch July 12, 2021 22:11
abuna1985 added a commit that referenced this pull request Aug 29, 2021
@jbubar @erikaBell
@jamesberke @Linda-OC @averdin2 @wendywilhelm10 @akibrhast @marcobarrera1996 @abuna1985 @Aveline-art @qiqicodes @HackforLABot @grhhhh @arghmatey @Zak234 @Abel-Zambrano @aliibsin @abenipa3 @mgodoy2023 @mgodoy2020 @vickiychung @benrempel @MariannaAskova @aalieu @alexeysergeev-cm @josiehandeveloper @anonymousanemone @Sihemgourou @macho-catt @adrian-zaragoza
wins-feature-1 merge with gh-pages (#2140)
c6358c0 
* New wins text badge (#1466)

* edited js

* edited html

* edited scss

* added all svgs

* all changes added minus one

Co-authored-by: erikaBell <[email protected]>

* New wins change (#1516)

* overlay and styling

* mobile styling

* see more toggle

* adjusted styling, issues with onClick function

* badges are clickable on mobile

* badge icon click hooked up to seeMore

* design edits + see more functionality edit

Co-authored-by: erikaBell <[email protected]>

* filtered unintended commas out of cardList (#1601)

* Adjust styling of Wins page with badges in mobile

Fixes #1550

Changed from 1.7em to 1.4em and 1.5em to 1em

* Revert "Adjust styling of Wins page with badges in mobile" (#1641)

This reverts commit 9fc22fb.

* Adjust styling wins (#1620)

* adjust styling of Wins page with badges

* charge roles wrap

* revert wins-data.json

* Changed badge description from setup to set up in wins page (#1785)

* adjusted.wins-badge-icon size for mobile 1.4em when card is collapsed, 1em when expanded (#1670)

* 1817 - remove "I setup 2FA" from wins-data.json and refactored icon parser in wins.html (#1883)

* Fixed wins modal position to prevent it from penetrating menu in mobile (#1897)

* Add github actions files to wins branch (#1905)

* Revert "Add github actions files to wins branch (#1905)" (#1925)

This reverts commit b6d4c09.

* see more <-> see less on wins page mobile view (#1924)

* [qiqicodes-1549-see-less-button-wins-pages] toggle see more/see less functionality

* [qiqicodes-1549-see-less-button-wins-pages] adds caret svg

* [qiqicodes-1549-see-less-button-wins-pages] toggle see more/see less for wins card

* [qiqicodes-1549-see-less-button-wins-pages] delete commented lines of old code

* [qiqicodes-1549-see-less-button-wins-pages] see more/see less styling

* change position of see more in mobile, and clean up code

* make placement on expansion work

* move see more to bottom of text, and see less to bottom of card in mobile

* delete console.log

* remove commented code

Co-authored-by: qiqicodes <[email protected]>

* updating wins-feature-1 with changes made on gh-pages (#1869)

* Changed margin for toolkit page header (#1726)

* Updating wins data

* Update meeting data

* Update contributor and language data

* Wins page modal a11y (#1679)

* makes ESC key close wins page modal

* progress toward mwins page modal fix

* in progress

* fixes issue w hideoverly and inert

* removes package-lock.json and commented code

* fixes bug where inert remained true after window resize < 960

* fixes inert bug

* Revert "Wins page modal a11y (#1679)" (#1738)

This reverts commit c122699.

* Updating wins data

* Update meeting data

* Update contributor and language data

* revert wins-data.json (#1745)

* Updating wins data

* need to delete this, this check is in the app sheet, plus it is breaking the page (#1746)

* Update program areas page to reflect correct mini project cards (#1684)

* Updates program areas to reflect correct project cards

* Add placeholder image to repo and update on corresponding cards

* Revert "Revert "Wins page modal a11y (#1679)" (#1738)" (#1747)

This reverts commit c492445.

* Wins form css (#1314)

* begin css changes

* initial page styling

* add submit success message

* styled the inputs to be more simple

* small update

* change colors to variables

* fix github error checking, and make textarea required

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Updating wins data

* Update meeting data

* Update contributor and language data

* Create add-issue-labels-to-pr.yml (#1740)

* Create add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Added auth. To be reverted.

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update add-issue-labels-to-pr.yml

* Update CONTRIBUTING.md (#1751)

* Update update-comment-on-update-label.yml

Fix typo

* Create pull_request_template.md

* Delete pull_request_template.md

* Create pull_request_template.md

* Update pull_request_template.md

* Update pull_request_template.md

* Fixes #1574 (#1764)

* Update people2.yml (#1763)

* Update meeting data

* Update contributor and language data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Updating wins data

* Update meeting data

* Update contributor and language data

* Updating wins data

* Change Alt Text for Delegate Icon on Credit page (#1771)

* Fixes #1574

* Change Alt Text for Delegate Icon on Credit page

* change resume alt to resume icon (#1765)

* Update comment on gh action add-issue-labels-to-pr (#1758)

The comments added to the action clarifies and notes the decision behind the usage of the event
`pull_request_target` instead of `pull_request`

* Contributing.md changes (#1471)

* Got Akibs Changes

* Update CONTRIBUTING.md file

* Accepted incoming merge conflict

* Made github username wording more consistent

* Added documentation for using Docker back to the file

* Added git status code back to file

* Changed edits to pull request

* Changed wording of issue and pull request headers

* Fixed broken link in edits to a pull request

* Changed wording of first pull request in bottom greeting

* Removed unnecessary text

* Added info about VS Code and moved Changes from Upsream section

* Added hfla-site slack link

* Made changes suggested by alyssa

* Update CONTRIBUTING.md

Minor changes. Made two changes to the file.

Co-authored-by: Josh Bubar <[email protected]>
Co-authored-by: Alyssa <[email protected]>

* Updating wins data

* Update meeting data

* Update contributor and language data

* Updating wins data

* Update meeting data

* Update contributor and language data

* Changed the alt attribute value to 'Design Community Concept Illustration' for the Design Image on the Credit Page (#1780)

Co-authored-by: Mateo Godoy <[email protected]>

* 1586 - update alt itext for "Technology" image within the "Credits" page (#1784)

* Updating wins data

* Update meeting data

* Update contributor and language data

* Adjusts Program Areas page image cards in mobile (#1774)

* Adjusts Program Areas page image cards in mobile

* Updates height of card image to correct size

* Updating wins data

* Update meeting data

* Update contributor and language data

* Change alt text (#1782)

* changed alt text for Partnership Icon on Credit page (#1783)

* Updating wins data

* Update meeting data

* Update contributor and language data

* changed alt office worker (#1804)

* changed alt text for designer life image on credits page (#1801)

* add missing periods in the Getting Started Page (#1799)

* remove margin: auto to split header paragraphs (#1790)

* Adding button xl-long class and applying it to CTA "Join Us" home page button (#1773)

* Testing

* New home button

* Removed test

* New Classes

* removed}

* }

* removed accidental changes

Co-authored-by: Sakari Salminiitty <[email protected]>

* 1792 - add HTML/CSS to ensure "Online Project Team Meetings" button wraps text within the mobile view of the "Events" page (#1813)

* Standardize join us page mobile (#1731)

* added title attibutes to sponsor and partner logos in about pages

* Changed "vertical" to "program area"

* standardized join us page on mobile

* media queries changed and header name change

* text-align left added to mobile & header container added

Co-authored-by: Linda-OC <[email protected]>
Co-authored-by: avali4907 <[email protected]>

* Updating wins data

* Update meeting data

* Update contributor and language data

* Rename security.yml (#1821)

* issue 1570, change email alt text (#1827)

* Updating wins data

* Update meeting data

* Update contributor and language data

* Updating wins data

* Update meeting data

* Update contributor and language data

* Updating wins data

* Update meeting data

* Update contributor and language data

* Create Responsiveness on mobile

* Rename Responsiveness on mobile to Mobile_responsiveness.md

* Update Mobile_responsiveness.md

* Update Mobile_responsiveness.md

* Update Mobile_responsiveness.md

* Update Mobile_responsiveness.md

* Update Mobile_responsiveness.md

* Update issue templates

* Updating wins data

* Update meeting data

* Update contributor and language data

* Updating wins data

* Update meeting data

* Update contributor and language data

* Update Toolkit page's filter banner font weight  (#1831)

* Fixes #1574

* Change Alt Text for Delegate Icon on Credit page

* changed toolkit banner font to 400

* Revert "changed toolkit banner font to 400"

This reverts commit 7c24302.

* Revert "Revert "changed toolkit banner font to 400""

This reverts commit b4b1c83.

* Added documentation for unseen changes (#1854)

* Added documentation for fixing jekyll livereloading bug

* Fixed some typos

* Moved location of changes

* removed max height property so all getting started cards were visible (#1853)

* Add x modal wins page (#1775)

* Added x to modal in wins page to exit

* Styled x closing icon to fit in upper right corner of modal

* Used svg icon to show close icon on modal in wins page

* Implementing new design system heading typography in the code base (#1814)

* New typography

* removed {

* removes }

* Added ,

* Update _typography.scss

* Update _typography.scss

* Update _typography.scss

* Update _print.scss

* Update _typography.scss

* Update _typography.scss

* Fixed title1 print

Co-authored-by: Sakari Salminiitty <[email protected]>

* Updating wins data

* Update meeting data

* Update contributor and language data

* Add media query to .leader-description (#1855)

* Update credits.html

* Clarified adding images

* Update pull_request_template.md

* 1748, closed pr 1832, attempt 2 (#1858)

* 1748, closed pr 1832, attempt 2

* 1858 pr update

* change alt for video conference icon (#1860)

* changed alt attribute for meetings icon on credit page (#1862)

* Updating wins data

* Update meeting data

* Update contributor and language data

* fix overlay

Co-authored-by: Marco Barrera <[email protected]>
Co-authored-by: HackforLABot <[email protected]>
Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Garrett Hickman <[email protected]>
Co-authored-by: Akib Rhast <[email protected]>
Co-authored-by: Sarah W <[email protected]>
Co-authored-by: Zak234 <[email protected]>
Co-authored-by: Ava Li <[email protected]>
Co-authored-by: Abel-Zambrano <[email protected]>
Co-authored-by: Ali Ibsin <[email protected]>
Co-authored-by: Alex Verdin <[email protected]>
Co-authored-by: Alyssa <[email protected]>
Co-authored-by: mgodoy2023 <[email protected]>
Co-authored-by: Mateo Godoy <[email protected]>
Co-authored-by: Adam Abundis <[email protected]>
Co-authored-by: Vicki Chung <[email protected]>
Co-authored-by: benrempel <[email protected]>
Co-authored-by: Marianna Askova <[email protected]>
Co-authored-by: Andrew Lieu <[email protected]>
Co-authored-by: Alexey Sergeev <[email protected]>
Co-authored-by: Sakari Salminiitty <[email protected]>
Co-authored-by: Josephine Han <[email protected]>
Co-authored-by: Linda-OC <[email protected]>
Co-authored-by: avali4907 <[email protected]>
Co-authored-by: Sophia Ling <[email protected]>
Co-authored-by: Sihemgourou <[email protected]>
Co-authored-by: macho-catt <[email protected]>

* Add github actions files to wins branch (#1926)

* Fix to mobile margin on Wins page (#1936)

* Changed margin to 32px

* reversed back the main margin and changed only the margin for mobile

* remove tablet view and fix responsiveness issues (#1954)

* remove tablet view and fix responsiveness issues

* make icons clickable in mobile

* remove clickable icons in desktop

* quick fix to remove see less on desktop

* better fix for removing see less on desktop

* fix the unclickability issue on the see more after resize

* fix overlay other icon parser problem

* clean up

* make icons unclickable when expanded

* delete console log

* Wins Spacing, between text and badge icons #1551 (#1964)

* fixes spacing between wins-text and wins-badges

* clean up

* more spacing added

* spacing

* resolved

Co-authored-by: erikaBell <[email protected]>
Co-authored-by: Josh Bubar <[email protected]>

* Wins refactor js (#2019)

* Clarified comments, Change functions to arrow functions and removed extra spaces

* Revert "Clarified comments, Change functions to arrow functions and removed extra spaces"

This reverts commit 7bf6086.

* Clarified comments, changed function into arrow function and removed extra spaces

* removed spacing in functions

Co-authored-by: avali4907 <[email protected]>

* Fix see more toggle when clicking an icon (#2133)

* more merge conflicts

* remove json data files from pr

* Add accompanying map file for polyfill (#2144)

* merge conflicts

* Add title1 class to h1 tag in wins hero file (#2189)

Co-authored-by: erikaBell <[email protected]>
Co-authored-by: erikaBell <[email protected]>
Co-authored-by: James Berke <[email protected]>
Co-authored-by: Linda-OC <[email protected]>
Co-authored-by: Alex Verdin <[email protected]>
Co-authored-by: wendywilhelm10 <[email protected]>
Co-authored-by: Akib Mohaimenur Rahman <[email protected]>
Co-authored-by: Marco Barrera <[email protected]>
Co-authored-by: Adam Abundis <[email protected]>
Co-authored-by: Ava Li <[email protected]>
Co-authored-by: qiqicodes <[email protected]>
Co-authored-by: HackforLABot <[email protected]>
Co-authored-by: GitHub Actions Bot <[email protected]>
Co-authored-by: Garrett Hickman <[email protected]>
Co-authored-by: Sarah W <[email protected]>
Co-authored-by: Zak234 <[email protected]>
Co-authored-by: Abel-Zambrano <[email protected]>
Co-authored-by: Ali Ibsin <[email protected]>
Co-authored-by: Alyssa <[email protected]>
Co-authored-by: mgodoy2023 <[email protected]>
Co-authored-by: Mateo Godoy <[email protected]>
Co-authored-by: Vicki Chung <[email protected]>
Co-authored-by: benrempel <[email protected]>
Co-authored-by: Marianna Askova <[email protected]>
Co-authored-by: Andrew Lieu <[email protected]>
Co-authored-by: Alexey Sergeev <[email protected]>
Co-authored-by: Sakari Salminiitty <[email protected]>
Co-authored-by: Josephine Han <[email protected]>
Co-authored-by: avali4907 <[email protected]>
Co-authored-by: Sophia Ling <[email protected]>
Co-authored-by: Sihemgourou <[email protected]>
Co-authored-by: macho-catt <[email protected]>
Co-authored-by: Adrian Zaragoza <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aveline-art Aveline-art Aveline-art approved these changes

@averdin2 averdin2 averdin2 approved these changes

Assignees

@jbubar jbubar

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.