Skip to content

Commit

Permalink
Merge pull request #830 from usds/staging
Browse files Browse the repository at this point in the history
Merge latest updates to master
  • Loading branch information
kategreenUSDS authored Mar 17, 2023
2 parents d32d07b + cd1ae34 commit 95e293e
Show file tree
Hide file tree
Showing 87 changed files with 564 additions and 564 deletions.
1 change: 1 addition & 0 deletions .github/workflows/visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ jobs:
- name: Generate new base images
if: github.event_name == 'workflow_dispatch'
run: |
rm -rf ./cypress/snapshots/base
npm run visual-refresh
echo ":+1: New base images generated." > /tmp/message.md
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,22 @@ When pages are intentionally changed, refresh the base images with `npm run visu

A GitHub workflow automatically runs the regression script when a pull request targeting the `staging` branch is created or updated. A summary of results will appear as a comment on the PR. If a refresh is needed, users can activate the refresh script by manually running the `Visual regression tesing` Action and providing the PR number. New/updated base images will be added to the PR.

### Automated Accessibility testing

This website relies on Cypress and cypress-axe to identify page-level accessibility issues. Hopefully, the issues identified in this testing are caught earlier in the development process using a combination of a good accessibility linter such as [axe-Linter](https://marketplace.visualstudio.com/items?itemName=deque-systems.vscode-axe-linter) and a browser plugin such as [Microsoft Accessibility Insights](https://accessibilityinsights.io/docs/web/overview/). This type of testing is to catch any errors missed.

Currently, the tests are designed to test work as you develop locally. When you implement any changes in the UI, open the cypress e2e tests with `npm run cypress:open`. These tests will inject the axe-core library into the page-level instance and run the accessibility API.

Once you open cypress, select e2e testing and select your browser for testing. At this point you may click on the individual page-level tests. This will open a browser instance directly to the test, cypress will render the whole page. Accessibility violations will be visible on the left of the browser instance.

Additional output is in the browser console, which you'll want to open. With the console open, you can now click on any of the issues in the test body, and learn more information about the error and how to resolve it.

The accessibility.cy.js file runs a loop through all the pages, which may prove useful for future accessibility testing. A developer could more fully integrate cypress-axe testing with the CICD build process -- breaking the build if any accessibility error is detected.

Additional Resources about Cypress-axe:
- [Cypress-axe](https://www.npmjs.com/package/cypress-axe)
- [Setting up Cypress with axe for accessibility](https://timdeschryver.dev/blog/setting-up-cypress-with-axe-for-accessibility)

## Maintenance

### USWDS and custom styles
Expand Down
4 changes: 3 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@ exclude:
- Staticfile
- package-lock.json
- .github

- documentation
- wiki-photos
- pages/form.html
131 changes: 108 additions & 23 deletions _content/apply.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,120 @@
page_title:
heading_title: "Apply to USDS"
heading_text: |-
USDS operates on a tour-of-service model with a maximum term of four years. While most people serve for one or two years, we'll consider some shorter tours as well. Time commitments are not binding.
We're working to build a workforce that reflects the people we serve. We know that we better serve the public when our staff represents the country's diversity.
To learn about the developer, product, design, data science, and acquisition skills we're hiring for, see "[How we work](/how-we-work)".
Our projects impact people who come from diverse backgrounds, speak multiple languages, hold varying levels of education, and have differing access to technology. We want to build project teams that can understand a variety of lived experiences as we work to deliver services to all people, including those who have traditionally been underserved.
USDS operates on a tour-of-service model where people can join for up to four years. We're always looking for mission-driven people to serve. To learn more about the skills we're hiring for, see ["How we work."](https://www.usds.gov/how-we-work)
heading_button_text: "Read our hiring FAQ"
page_body:
hiring_process: |-
**Hiring process**
1. Complete the application below and attach your resume (and portfolio, if you're a designer!).
2. People who progress to the interview process will connect with a member of our talent team over the phone.
3. Participate in interviews to assess for skills important to our communities of practice.
4. If selected, your talent partner will work with you to match you to a project.
Onboarding to USDS can take several weeks, and sometimes longer depending on completion of a required background check. Our talent team will be with you every step of the way, and your talent partner will keep you up-to-date throughout the process.
accordion_header1: |-
Hiring process
accordion_item1: |-
Complete the application below and attach your resume (and portfolio, if you're a designer).
accordion_item2: |-
People who progress to the interview process will connect with a member of our talent team over the phone.
accordion_item3: |-
Participate in interviews to assess for skills important to our disciplines.
accordion_item4: |-
If selected, your USDS Talent partner will work with you throughout the selection and onboarding process.
accordion_content1: |-
Onboarding to USDS can take several weeks depending on completion of a required background check. Our Talent team will be with you every step of the way and your Talent partner will keep you up-to-date throughout the process.
If you aren't selected to join USDS, you can apply again after one year with an updated resume.
requirements: |-
**Requirements**
To work at USDS, you must be a U.S. citizen, and pass a background check and a drug test. As a federal employee, you will need to be vaccinated against COVID-19 or receive a legal exemption prior to employment.
accordion_header2: |-
Requesting accommodations
accordion_content2: |-
One of our core values is to hire and empower great people. We want all candidates to have the accommodations that will set them up for success in their interview.
During the COVID-19 pandemic, most people at USDS are working remotely from many locations across the country. During normal times, we ask that you make Washington, D.C. or the surrounding area your base during the work week.
compensation_benefits: |-
**Compensation and benefits**
You can say that you'd like to request a disability accommodation when you submit your application. If you progress through the interview process, a member of our Talent team will contact you to talk about any accommodations that will best help you demonstrate your skills.
Salaries in government change every year. For 2023, you may be paid up to $183,500 depending on where you are located in the United States. We provide health care and other benefits, such as retirement savings accounts. For more information, see the <a href="https://www.opm.gov/healthcare-insurance/healthcare/plan-information/plans/" target="blank">Office of Personnel Management website</a>.
eoe_statement: |-
<strong>U.S. Digital Service is proud to be an equal opportunity employer</strong>
A few examples are:
accordion_example1: |-
Requesting a sign language interpreter or video relay service
accordion_example2: |-
Asking for a video interview instead of phone
accordion_example3: |-
Asking for extended breaks between interviews
accordion_header3: |-
Work requirements
accordion_content3: |-
To work at USDS, you must be a U.S. citizen and pass a background check and a drug test.
We strongly encourage people of color, members of racial and ethnic minority groups, women, LGBTQI+ people, those with disabilities, and Veterans to apply. We build better products when our team represents all of America.
You may have applied for a government job that previously required a COVID-19 vaccine. As of August 2022, you don't need a COVID-19 vaccine to be hired as a federal employee. We'll update our information if this changes in the future.
We do not discriminate based off of color, race, age, religion, sex, gender identity, sexual orientation, political affiliation, pregnancy, status as a parent, national origin, disability (physical or mental), family medical history or genetic information, political affiliation, military service, or other non-merit based factors.
We're currently hiring both remote employees and people who are local to Washington, DC. If you have additional questions about remote or in-person work, please reach out to the USDS Talent Team at [[email protected]](mailto:[email protected]).
accordion_header4: |-
Compensation
accordion_content4: |-
Salaries in government may change every year. For 2023, you may be paid up to $183,500 depending on your experience as well as where you're located in the United States or U.S. territories.
accordion_header5: |-
Benefits
accordion_content5a: |-
USDS offers an expansive portfolio of benefits, like health insurance, work-life programs, and retirement plans for employees. We highlighted some of the benefits that applicants typically have questions about below.
accordion_bullet1: |-
Health insurance
accordion_bullet1_sub1: |-
The Federal Government provides a <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/healthcare/plan-information/compare-plans">comparison tool</a> []() that lets you see the plans that could be available to you. Plans very based on where you live.
accordion_bullet1_sub2: |-
Enter your zip code, then select "Federal & U.S. Postal Service Employee" for "enrollee type", and "biweekly" for "pay frequency" to see plans available to you.
accordion_bullet1_sub3: |-
Visit the <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/healthcare/">Healthcare section of OPM's website</a> for more information.
accordion_bullet2: |-
Dental and vision insurance
accordion_bullet2_sub1: |-
Visit the <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/dental-vision">Dental & Vision section of OPM's website</a> for more information.
accordion_bullet3: |-
Thrift savings plan (TSP)
accordion_bullet3_sub1: |-
Long-term retirement savings and investment plan similar to 401(k)
accordion_bullet3_sub2: |-
Employees are elegible to get up to 5% matching
accordion_bullet3_sub3: |-
Visit the <a class="usa-link usa-link--external" href="https://www.tsp.gov/tsp-basics/">"TSP basics" section of the TSP website</a> for more information.
accordion_bullet4: |-
Flexible spending plan
accordion_bullet4_sub1: |-
Pre-tax funds for out of pocket medical, dental, vision expenses as well as dependent and elder care expenses
accordion_bullet4_sub2: |-
Visit the <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/flexible-spending-accounts">Flexible Spending Accounts section of OPM's website</a> for more information.
accordion_bullet5: |-
Pension plan (Federal Employee Retirement System or FERS)
accordion_bullet5_sub1: |-
Pension for retirement that's calculated based on earnings and length of service
accordion_bullet5_sub2: |-
Visit the <a class="usa-link usa-link--external" href="https://www.opm.gov/retirement-center/fers-information/">FERS section of OPM's website</a> for more information.
accordion_bullet6: |-
Life insurance
accordion_bullet6_sub1: |-
Option to get life insurance, with additional voluntary life insurance available
accordion_bullet6_sub2: |-
Visit the <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/life-insurance">Life Insurance section of OPM's website</a> for more information.
accordion_bullet7: |-
Work-life programs
accordion_bullet7_sub1: |-
Confidential Employee Assistance Programs (EAP) to assist with life challenges that may affect your job, health, and well-being
accordion_bullet7_content5b: |-
For more information on federal benefits, visit <a class="usa-link usa-link--external" href="https://www.opm.gov/healthcare-insurance/Guide-Me/New-Prospective-Employees/#url=Overview">OPM's guide for new employees</a>.
accordion_header7: |-
Paid time off
accordion_header7_item1: |-
Paid time off
accordion_h7_item1_sub1: |-
13 days per year (for employees who are new to the Federal Government)
accordion_h7_item1_sub2: |-
Learn more about accruing <a class="usa-link usa-link--external" href="https://www.opm.gov/policy-data-oversight/pay-leave/leave-administration/fact-sheets/annual-leave/">paid time off on OPM's website</a>
accordion_header7_item2: |-
Paid sick days
accordion_h7_item2_sub1: |-
13 days per year
accordion_h7_item2_sub2: |-
Learn more about accruing <a class="usa-link usa-link--external" href="https://www.opm.gov/policy-data-oversight/pay-leave/leave-administration/fact-sheets/sick-leave-general-information/">sick leave on OPM's website</a>
accordion_header7_item3: |-
Paid federal holidays
accordion_h7_item3_sub1: |-
11 days per year
accordion_h7_item4: |-
Paid parental leave
accordion_h7_item4_sub1: |-
12 weeks (for employees who qualify)
4 changes: 2 additions & 2 deletions _content/how_we_work.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ roles_heading_text: |-
- **Hire and empower great people.** We work to untangle some of our nation’s most important and complex problems. We hire people with the experience, skills, compassion, curiosity, and tenacity to find new paths forward.
- **Design with users, not for them.** We build better solutions when our team reflects the people we serve. We hire people from all backgrounds, all corners of the technology, nonprofit, and government worlds, and all across the United States.
- **Design with users, not for them.** We build better solutions when our team reflects the people we serve, including people from communities that are traditionally underserved. We hire people from different demographic backgrounds, various industries, and all corners of the United States and its territories. We strongly encourage people who dientify as Black, Hispanic/Latinx, Native/Indigenous, women, LGBTQ+, disabled, veterans, and members of other underserved communities to apply.
- **Go where the work is.** We prioritize our work based on how much we’re needed—and how much we can help. We go where we’re needed most to do the greatest good for the greatest number of people in the greatest need.
- **Go where the work is.** We prioritize our work based on how much we’re needed—and how much impact we can make. We go where we’re needed most to do the greatest good for the greatest number of people in the greatest need.
Learn more about who we hire and how we work below. If you don’t find a description that fits you, but think you can help push our mission forward, [we encourage you to apply](../apply).
Expand Down
16 changes: 8 additions & 8 deletions _includes/_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<div class="grid-container">
<div class="grid-row flex-justify">
<div class="grid-col-12 desktop:grid-col margin-bottom-7">
<img class="site-c-footer__logo" src="{{ site.baseurl }}/assets/img/usds-logo-footer.svg" alt="USDS Logo">
<img class="site-c-footer__logo" src="{{ site.baseurl }}/assets/img/usds-logo-footer.svg" alt="USDS logo">
</div>
<div class="grid-col-12 tablet:grid-col-4 desktop:grid-col margin-bottom-7">
<h2 class="site-c-footer__heading">About USDS</h2>
<ul class="site-c-footer__list tablet:padding-right-3">
<li><a href="{{ site.baseurl }}{% link pages/contact-us.html %}">Contact us</a></li>
<li><a href="{{ site.baseurl }}/assets/files/{{ site.d_and_i_file_name }}" target="_blank">Diversity &amp; Inclusion Report</a></li>
<li><a href="{{ site.baseurl }}/resources/{{ site.impact_report_file_name }}" target="_blank">Impact Report</a></li>
<li><a href="{{ site.baseurl }}/assets/files/{{ site.press_kit_file_name }}" target="_blank">Press sheet</a></li>
<li><a href="{{ site.baseurl }}/assets/files/{{ site.d_and_i_file_name }}" target="_blank">Diversity &amp; Inclusion Report [PDF, 2 pages]</a></li>
<li><a href="{{ site.baseurl }}/resources/{{ site.impact_report_file_name }}" target="_blank">Impact Report [PDF, 20 pages]</a></li>
<li><a href="{{ site.baseurl }}/assets/files/{{ site.press_kit_file_name }}" target="_blank">Press sheet [PDF, 2 pages]</a></li>
<li><a href="{{ site.baseurl }}/faq">Hiring FAQ</a></li>
</ul>
</div>
<div class="grid-col-12 tablet:grid-col-4 desktop:grid-col margin-bottom-7">
<h2 class="site-c-footer__heading">Resources</h2>
<ul class="site-c-footer__list tablet:padding-right-3">
<li><a href="https://playbook.cio.gov/" target="_blank">Digital Services Playbook</a></li>
<li><a href="https://sprint.usds.gov/" target="_blank">Discovery Sprint Guide</a></li>
<li><a href="https://techfarhub.cio.gov/" target="_blank">TechFAR Hub</a></li>
<li><a href="https://designsystem.digital.gov/" target="_blank">U.S. Web Design System</a></li>
<li><a class="usa-link usa-link--alt usa-link--external" href="https://playbook.cio.gov/" target="_blank">Digital Services Playbook</a></li>
<li><a class="usa-link usa-link--alt usa-link--external" href="https://sprint.usds.gov/" target="_blank">Discovery Sprint Guide</a></li>
<li><a class="usa-link usa-link--alt usa-link--external" href="https://techfarhub.cio.gov/" target="_blank">TechFAR Hub</a></li>
<li><a class="usa-link usa-link--alt usa-link--external" href="https://designsystem.digital.gov/" target="_blank">U.S. Web Design System</a></li>
</ul>
</div>
<div class="grid-col-12 tablet:grid-col-4 desktop:grid-col margin-bottom-7">
Expand Down
17 changes: 4 additions & 13 deletions _includes/_template--people-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,10 @@ <h1 class="margin-y-5">{{ page.name }}</h1>
</div>
</section>

<hr aria-hidden="true">
{% assign content = site.data.people %}
<div class="site-c-section-heading__links">
<a class="usa-button usa-button--outline" href="{{ site.baseurl }}{% link pages/people.html %}">{{ content.page_title.heading_button_text }}</a>
</div>

<section class="site-c-section">
{% assign content = site.data.people %}
<div class="site-c-section-heading">
<h2 class="site-c-section-heading__heading">{{ content.page_title.heading_title }}</h2>
<div class="site-c-section-heading__links">
<a class="usa-button usa-button--outline" href="{{ site.baseurl }}{% link pages/people.html %}">{{ content.page_title.heading_button_text }}</a>
</div>
</div>
<div class="site-c-section__body">
{% include carousel-people.html %}
</div>
</section>

</div>
2 changes: 1 addition & 1 deletion _includes/card-people.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<span class="site-c-flag">
{% if person.alumni %}Alum{% else %}Staff{% endif %} / {{ person.cop }}
</span>
<span class="site-c-card__title">{{ person.name }}</span>
<h3 class="site-c-card__title">{{ person.name }}</h3>
{% if person.quote %}
<div class="usa-prose margin-top-3">
<p>“{{ person.quote }}”</p>
Expand Down
23 changes: 16 additions & 7 deletions _includes/carousel-people.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<div class="site-c-cards margin-x-neg-2 site-js-carousel">
{% assign people = site.people | where_exp:"person","person.url != page.url" | sample: 9 %}
{% for person in people limit:9 %}
<div class="padding-x-2">
{% include card-people.html %}
</div>
{% endfor %}
{% assign names = "David Holmes, Annie Nguyen, Anissa Pérez, Eunice Garcia, Brent Maravilla, Kasia Chmielinski" | split: ", " %}

<div class="grid-container">
<section class="site-c-section">
<div class="site-c-section__body">
<ul class="site-c-cards margin-x-neg-2 grid-row">
{% for name in names %}
{% assign people = site.people | where_exp:"person","person.name == name" %}
{% assign person = people[0] %}
<li class="tablet:grid-col-6 desktop:grid-col-4 padding-x-2 margin-bottom-4">
{% include card-people.html %}
</li>
{% endfor %}
</ul>
</div>
</section>
</div>
Loading

0 comments on commit 95e293e

Please sign in to comment.