Skip to content

Commit

Permalink
updating wins-feature-1 with changes made on gh-pages (#1869)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
1 parent 02add26 commit 7f5c39a
Show file tree
Hide file tree
Showing 55 changed files with 2,622 additions and 1,490 deletions.
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/Mobile_responsiveness.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: 'Responsiveness on mobile '
about: 'Standard HackforLA issue template '
title: 'Mobile Responsiveness on [name of the page] : [quick recap of the bug here]'
labels: 'role: design'
assignees: ''

---

### Overview
We need to check the mobile version of every pages on the website so that we correct any bug that is appearing on mobile.

REPLACE THIS TEXT -
1. Explain the bug that you have observed
2. Put a screenshot of the bug: you can use the following template to create a drop down image
<details>
<summary>TITLE IMAGE </summary>

PASTE_YOUR_IMAGE_HERE
</details>

### Action Items
Design:
- [ ] Check the mobile responsiveness of this page (use your mobile to do it ;) )
- [ ] If there is any bug/any inconsistency or problem, however small or large, edit this issue and list the bug with screenshots in the Overview section above :arrow_up:. _You have more than one bug? duplicate this issue and create one issue per bug.
- [ ] List all the changes to implement to correct the bug (eg: resizing..) in the development action items below :arrow_down:. (don't hesitate to create 1 checkbox for each changes)
- [ ] Put the issue(s) in the review column to check the feasibility with the devs.

Development
- [ ] Implement the following changes : "_list your changes here_ "
- [ ] Ensure that the correction doesn't break any other pages that is connected to the one your changing. For that, check [the sitemap](https://www.hackforla.org/sitemap.xml)


### Resources/Instructions
REPLACE THIS TEXT - Provide links to the figma file (if there is one), and to the page where the bug is observed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Project Profile Card review and update
about: To track project profile card updates
title: 'Update Project Profile: [Project Name]'
labels: Feature - Project Info and Page
labels: ''
assignees: ''

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/suggest-a-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Suggest a guide
about: 'For guides that could be helpful and listed on the toolkit page. '
title: ''
labels: Feature - Toolkit, documentation, enhancement
labels: documentation, enhancement
assignees: ''

---
Expand Down
25 changes: 25 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Fixes #replace_this_text_with_the_issue_number

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

-
-
-

### Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)
<!-- Note, if your images are too big, use the <img src="" width="" length="" /> syntax instead of ![image](link) to format the images -->
<!-- If images are not loading properly, you might need to double check the syntax or add a newline after the closing </summary> tag -->

<details>
<summary>Visuals before changes are applied</summary>

![image](Paste_Your_Image_Link_Here_After_Attaching_Files)

</details>

<details>
<summary>Visuals after changes are applied</summary>

![image](Paste_Your_Image_Link_Here_After_Attaching_Files)

</details>
144 changes: 144 additions & 0 deletions .github/workflows/add-issue-labels-to-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
# Name that appears on the workflow
name: Add Linked Issue Labels to Pull Request
on:
# github actions triggered by a pull request runs with only read only context due to security and safety reasons(this is the expected behaviour),
# as such the event trigger `pull_request` could not be used in this action, since this action needs to make a repository edit.
# To bypass this github has provided the event trigger `pull_request_target`, more information regarding this can be found here
# - https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
# - https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
pull_request_target:
types: [opened, edited]
jobs:
# Adds linked issue labels to pull request
# Step1: Reads pull request comment and return the linked issue
# Step2: Perform a GET request to retrieve labels from linked issue
# Step3: Perform a PUT request to apply labels to original pull request
# Note: Step1 uses RegEx to extract linked issues. This is not the best choice, but is required as GitHub does not include linked issues in the context. If this changes in the future, please revise Step1 ASAP for a more robust code.
# Note2: Below you will see ${{ github }} and the github variable used. The former is a context from GitHub actions and the latter is an object argument of the actions/github-script@v4 workflow. These two are not the same and should not be treated as such!
Add-Linked-Issue-Labels-to-Pull-Request:
runs-on: ubuntu-latest
steps:
- name: Retrieve Linked Issue From Comment
# https://github.com/actions/github-script
uses: actions/github-script@v4
# Escapes user input for injection attacks
env:
BODY: ${{ github.event.pull_request.body }}
id: issue-number
with:
result-encoding: string
script: |
// Retrieve comments
const { BODY } = process.env
// Create RegEx for capturing KEYWORD #ISSUE-NUMBER syntax (i.e. resolves #1234)
const KEYWORDS = ['close', 'closes', 'closed', 'fix', 'fixes', 'fixed', 'resolve', 'resolves', 'resolved']
let reArr = []
for (const word of KEYWORDS) {
reArr.push(`[\\n|\\s|^]${word} #\\d*\\s|^${word} #\\d*\\s|\\s${word} #\\d*$|^${word} #\\d*$`)
}
// Receive and unpack matches into an Array of Array objs
let re = new RegExp(reArr.join('|'), 'gi')
let match = BODY.matchAll(re)
match = [...match]
// If only one match is found, return the issue number. Else return false. Also console.log results.
if (match.length == 1) {
const linkedIssue = match[0][0]
const issueNumber = match[0][0].match(/\d+/)
console.log(`Issue number found for PR #${context.payload.number}. Issue #${issueNumber}`)
return issueNumber[0]
} else {
console.log('Make sure there is only one issue!')
return false
}
# https://docs.github.com/en/rest/reference/issues#list-labels-for-an-issue
- name: Get Labels from Linked Issue
uses: actions/github-script@v4
id: linked-labels
with:
script: |
// Retrieve issue number from previous step.
const issueNum = ${{ steps.issue-number.outputs.result }}
if (!issueNum) {
return false
}
// GET request to retrieve data from results of request
// https://octokit.github.io/rest.js/v18#issues-list-labels-on-issue
let data;
try {
const results = await github.issues.listLabelsOnIssue({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issueNum,
});
data = results.data
}
catch(err) {
console.log('Error with GET Request to get labels')
console.log(err)
return false
}
// Gather all label names into an array of strings and return the array
let labelNameArray = []
for (const label of data) {
labelNameArray.push(label.name)
}
console.log(`Labels found on Issue #${issueNum}: ${labelNameArray.join(', ')}`)
return labelNameArray
# https://docs.github.com/en/rest/reference/issues#set-labels-for-an-issue
- name: Put Labels to Pull Request
uses: actions/github-script@v4
id: final-result
with:
github-token: ${{ secrets.GH_BOT_TOKEN_1 }}
script: |
// Retrieve labels from previous step
const arrayOfLabels = ${{ steps.linked-labels.outputs.result }}
if (!arrayOfLabels) {
return false
}
// PUT request to apply labels to pull request
// https://octokit.github.io/rest.js/v18#issues-add-labels
let results;
try {
results = await github.issues.setLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: ${{ github.event.number }},
labels: arrayOfLabels,
})
}
catch(err) {
console.log('Error with PUT Request to edit labels')
console.log(err)
return false
}
// Log result of script
console.log(results)
if (results.status == 200) {
return true
} else {
return false
}
# For use if there are follow-up actions following script success or failure.
- name: Return Failure
if: steps.final-result.outputs.result == 'false'
run: |
echo "Please expand above outputs for errors."
exit 1
- name: Return Success
run: |
echo "${{ steps.final-result.outputs.result }}"
echo "Success"
2 changes: 1 addition & 1 deletion .github/workflows/update-comment-on-update-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ jobs:
@${{ github.event.issue.assignee.login }} Please add update
1. Progress
2. Blockers
3. Avaibility
3. Availability
4. ETA
Loading

0 comments on commit 7f5c39a

Please sign in to comment.