Skip to content

Commit 4f717e2

Browse files
Merge branch 'main' into external-link-docs
2 parents c7d760a + 513d005 commit 4f717e2

File tree

98 files changed

+1309
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1309
-454
lines changed

.github/ISSUE_TEMPLATE/DST-component_accessibility_review.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ We need to conduct a full accessibility review of the [component name] component
2424

2525
## Acceptance Criteria
2626
- [ ] Component has been reviewed for accessibility issues
27-
- [ ] Any accessibility issues have been addressed
27+
- [ ] Any accessibility issues have been addressed or ticket has been written with issues that need to be fixed

.github/ISSUE_TEMPLATE/DST-component_design.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ assignees: babsdenney, danbrady, lwwright7
1515
- [ ] Delete this section once complete
1616

1717
## Description
18-
Create design for [component name] and/or update Sketch artifacts for [component name]
18+
Create design for [component name] and/or update Figma artifacts for [component name]
1919

2020
If this is a pattern or component that is already in existence, conduct a small-scale audit (3-5 examples) to make sure there aren't design issues that need to be addressed. Also, check the Design System Team backlog for outstanding design issues. If you find any, link to them in a comment on this ticket. If possible, address any outstanding issues with this design and link to this issue from the original issue. If not, indicate that in the original issue.
2121

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
name: "DST - Experimental request - design"
3+
about: INTERNAL DST USE ONLY
4+
title: "[experimental component name] - Design"
5+
labels: platform-design-system-team
6+
assignees: babsdenney, danbrady, lwwright7
7+
8+
---
9+
10+
## Configuring this issue
11+
- [ ] Add issue to appropriate epic
12+
- [ ] Add Design System component label (such as `va-alert`)
13+
- [ ] Add `component-new` or `component-update` label, if applicable
14+
- [ ] Complete sections below
15+
- [ ] Delete this section once complete
16+
17+
## Description
18+
Create design and/or update Figma artifacts for [experimental design component name]
19+
20+
## Details
21+
[add links to experimental design request ticket or notes with details about the design]
22+
[add links to any research documents related to the component]
23+
24+
## Tasks
25+
- [ ] Create designs for component
26+
- [ ] Review designs with PO and DST designers
27+
- [ ] Review designs with developers and accessibility specialist
28+
- [ ] Address any comments from reviews, if necessary
29+
- [ ] Comment on this ticket with any accessibility considerations engineers may need to know
30+
- [ ] Comment on this ticket with content specifications (e.g. labels and error messages)
31+
- [ ] Comment on this ticket with a link to the designs and post in DST Slack channel
32+
33+
## Acceptance Criteria
34+
- [ ] Component design is complete and has been reviewed
35+
- [ ] Accessibility and development considerations have been added to this ticket, if necessary
36+
- [ ] Content specifications have been added to this ticket, if necessary
37+
- [ ] Link to design has been added to this ticket and shared in Slack

.github/workflows/deploy-reusable.yml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
github-sha:
5+
required: true
6+
type: string
7+
github-run-id:
8+
required: true
9+
type: string
10+
github-event-number:
11+
required: false
12+
type: string
13+
matrix-name:
14+
required: true
15+
type: string
16+
matrix-bucket:
17+
required: true
18+
type: string
19+
matrix-config:
20+
required: true
21+
type: string
22+
secrets:
23+
aws-access-key-id:
24+
required: true
25+
aws-secret-access-key:
26+
required: true
27+
jobs:
28+
jekyll-deploy-reusable_workflow_job:
29+
runs-on: ubuntu-latest
30+
environment:
31+
name: ${{ inputs.matrix-name }}
32+
url: "https://${{ inputs.matrix-bucket }}"
33+
steps:
34+
- uses: actions/checkout@v2
35+
with:
36+
fetch-depth: 0
37+
- name: Use Node.js 16.x
38+
uses: actions/setup-node@v2
39+
with:
40+
node-version: 16.x
41+
cache: 'yarn'
42+
- uses: ruby/setup-ruby@v1
43+
with:
44+
ruby-version: 2.7.5 # Not needed with a .ruby-version file
45+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
46+
- run: yarn install
47+
- run: yarn run build
48+
- run: bundle exec jekyll build --config _config.yml,jekyll-configs/${{ inputs.matrix-config }} --baseurl /${{ inputs.github-event-number }}
49+
- name: Make BUILD.txt file
50+
# The -e flag enables the interpretation of the \n newline character
51+
run: |
52+
echo -e "REF=${{ inputs.github-sha }}\n\
53+
BUILD_ID=${{ inputs.github-run-id }}\n\
54+
BUILDTIME=$(date)" > _site/BUILD.txt
55+
# We are taking these extra steps due to some differences between Jekyll and AWS S3.
56+
# To access a .html file served from S3, the URL needs to have the .html extension.
57+
# We're removing the extension to make the URLs prettier.
58+
# More context:
59+
# https://simpleit.rocks/ruby/jekyll/tutorials/having-pretty-urls-in-a-jekyll-website-hosted-in-amazon-s3/
60+
- name: Remove .html extension on non-index files
61+
run: |
62+
find _site/ -type f ! -iname 'index.html' -iname '*.html' \
63+
-print0 | while read -d $'\0' f; do mv "$f" "${f%.html}"; done
64+
- uses: aws-actions/configure-aws-credentials@v4
65+
with:
66+
aws-access-key-id: ${{ secrets.aws-access-key-id }}
67+
aws-secret-access-key: ${{ secrets.aws-secret-access-key }}
68+
aws-region: "us-gov-west-1"
69+
- name: Sync extensionless html files with correct type
70+
run: |
71+
aws s3 sync _site s3://${{ inputs.matrix-bucket }} \
72+
--acl public-read \
73+
--delete \
74+
--exclude "storybook/*" \
75+
--exclude "*.*" \
76+
--content-type "text/html"
77+
- name: Sync remaining files
78+
run: |
79+
aws s3 sync _site s3://${{ inputs.matrix-bucket }} \
80+
--acl public-read \
81+
--delete \
82+
--exclude "*" \
83+
--include "*.*" \
84+
--exclude "storybook/*"

.github/workflows/deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
deploy:
99
strategy:
1010
matrix:
11-
environment: [{ bucket: dev-design.va.gov, config: dev.yml }, { bucket: staging-design.va.gov, config: staging.yml }, { bucket: design.va.gov, config: prod.yml }]
11+
environment: [{ bucket: staging-design.va.gov, config: staging.yml }, { bucket: design.va.gov, config: prod.yml }]
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
find _site/ -type f ! -iname 'index.html' -iname '*.html' \
4343
-print0 | while read -d $'\0' f; do mv "$f" "${f%.html}"; done
44-
- uses: aws-actions/configure-aws-credentials@v1
44+
- uses: aws-actions/configure-aws-credentials@v4
4545
with:
4646
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4747
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/preview.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Preview
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
9+
10+
jobs:
11+
dev-deploy-preview:
12+
strategy:
13+
matrix:
14+
environment: [{ name: development, bucket: "dev-design.va.gov/${{ github.event.number }}", config: dev.yml }]
15+
uses: ./.github/workflows/deploy-reusable.yml
16+
with:
17+
github-sha: ${{ github.sha }}
18+
github-run-id: ${{ github.run_id }}
19+
github-event-number: ${{ github.event.number }}
20+
matrix-name: ${{ matrix.environment.name }}
21+
matrix-bucket: ${{ matrix.environment.bucket }}
22+
matrix-config: ${{ matrix.environment.config }}
23+
secrets:
24+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
25+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/pull-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
strategy:
99
matrix:
10-
environment: [{ bucket: dev-design.va.gov, config: dev.yml }, { bucket: staging-design.va.gov, config: staging.yml }, { bucket: design.va.gov, config: prod.yml }]
10+
environment: [ { bucket: design.va.gov, config: prod.yml }]
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.jekyll-metadata
33
.sass-cache
44
.vscode
5+
*.code-workspace
56
_site
67
fonts
78
node_modules

Gemfile.lock

+2-4
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,18 @@ GEM
6464
rb-fsevent (0.11.1)
6565
rb-inotify (0.10.1)
6666
ffi (~> 1.0)
67-
rexml (3.3.6)
68-
strscan
67+
rexml (3.3.9)
6968
rouge (3.29.0)
7069
safe_yaml (1.0.5)
7170
sass-embedded (1.0.21)
7271
google-protobuf (~> 3.19.0)
7372
rake (>= 12.3.0)
7473
sassc (2.4.0)
7574
ffi (~> 1.9)
76-
strscan (3.1.0)
7775
terminal-table (2.0.0)
7876
unicode-display_width (~> 1.1, >= 1.1.1)
7977
unicode-display_width (1.8.0)
80-
webrick (1.7.0)
78+
webrick (1.8.2)
8179

8280
PLATFORMS
8381
ruby

README.md

+32-2
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,39 @@ While `vets-design-system-documentation` is running and make further updates to
9090

9191
1. Commit this along with any updates to the documentation site and submit a PR.
9292

93-
## Deploying
93+
## Deployments
9494

95-
Merges into `main` will automatically be deployed to `dev-design.va.gov`. Production is automatically deployed every weekday at 2pm. Deploys are executed by creating a release of vets-website via Jenkins. You can track the deployment in the Slack channel, #design-system.
95+
Merges into `main` will automatically deploy to production `design.va.gov` after CI checks have completed.
96+
97+
### Previewing Pull Requests
98+
99+
When a PR is created, a preview of those changes will be available after the [Preview workflow](https://github.com/department-of-veterans-affairs/vets-design-system-documentation/blob/main/.github/workflows/preview.yml) has completed. There will be a "View deployment" button visible that will launch the preview environment when clicked:
100+
101+
![The "view deployment" button on a pull request](https://github.com/department-of-veterans-affairs/vets-design-system-documentation/blob/main/src/images/readme/pr-view-deployment-button.png?raw=true)
102+
103+
The preview link can also be accessed directly using this pattern: `https://dev-design.va.gov/PR_NUMBER`. For example, `https://dev-design.va.gov/3435` where `3435` is the unique PR number visible in the PR title.
104+
105+
### Preview Troubleshooting
106+
107+
#### Check the branch name
108+
109+
A preview environment will generate only when the PR has been created from a direct branch from the main repository. It does not work if the PR was created from a fork.
110+
111+
You can confirm if your PR was created from a fork by looking at the branch name at the top of the PR. If you see your Github username in front of your branch name, this means the PR was created from a fork and the preview will not generate.
112+
113+
![The top of a PR showing the branch to be merged into main. There is a Github username at the front of a branch name which means the branch is from a fork](https://raw.githubusercontent.com/department-of-veterans-affairs/vets-design-system-documentation/refs/heads/main/src/images/readme/pr-branch-from-fork.png)
114+
115+
If this was done because you don't have write access to this repository, you can request that access by submitting a support request in the #vfs-platform-support Slack channel.
116+
117+
#### Re-running the preview workflow
118+
119+
If the preview has stopped working (for example if you're only seeing a 403 Forbidden error or similar), re-run the preview workflow by clicking "Details" next to the Preview check:
120+
121+
![A list of PR checks with an arrow pointing to the details link for the Preview workflow](https://raw.githubusercontent.com/department-of-veterans-affairs/vets-design-system-documentation/refs/heads/main/src/images/readme/pr-checks-preview-details.png)
122+
123+
Then click the "Re-run all jobs" button at the top of the page:
124+
125+
![The "Re-run all jobs" button for running a Github workflow again](https://github.com/department-of-veterans-affairs/vets-design-system-documentation/blob/main/src/images/readme/re-run-workflow-button.png?raw=true)
96126

97127
## Additional Testing
98128

_config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ example_library_name: "VADS Example Library"
99
resource_library_name: "VADS Templates, Patterns, and Forms"
1010

1111
# Common links
12-
figma_example_library: https://www.figma.com/file/JDFpGLIojfuQwANXScQjqe/VADS-Component-Examples?type=design&node-id=0%3A1&mode=design&t=c29j3xBxzMAyLWxu-1
12+
figma_example_library: https://www.figma.com/file/JDFpGLIojfuQwANXScQjqe/VADS-Component-Examples?type=design&node-id=0%3A1&mode=design&t=c29j3xBxzMAyLWxu-1
1313
figma_component_library: https://www.figma.com/file/afurtw4iqQe6y4gXfNfkkk/VADS-Component-Library?type=design&node-id=121%3A1484&mode=design&t=ygQCLqlAL5VdSPil-1
1414
figma_templates_library: https://www.figma.com/file/4A3O3mVx4xDAKfHE7fPF1U/VADS-Templates%2C-Patterns%2C-and-Forms?type=design&node-id=2988%3A29744&mode=design&t=A89mK0w9KGp2uWIR-1
1515
figma_annotations_library: https://www.figma.com/file/CZcnWfQOwtLqPm4WA5paYG/VADS-Web-Annotation-Kit?type=design&node-id=415%3A1135&mode=design&t=V0V5YZrcbM7VnWa6-1
@@ -34,16 +34,16 @@ new_pattern_template_raw_link: https://raw.githubusercontent.com/department-of-v
3434
update_documentation_link: https://github.com/department-of-veterans-affairs/vets-design-system-documentation/issues/new?assignees=&labels=vsp-design-system-team&template=2_documentation_request_form.yml
3535
uswds_link: https://designsystem.digital.gov/
3636

37-
3837
# People
39-
sketch_for_teams_admin: "Kevin Hoffman"
38+
sketch_for_teams_admin: "Kevin Hoffman"
4039
sketch_library_owner: "Lillian Boot, Barb Denney"
4140
experimental_reviewer_1: "Matthew Dingee"
4241

43-
4442
# Build settings
4543
markdown: kramdown
46-
highlighter: none
44+
highlighter: rouge
45+
kramdown:
46+
syntax_highlighter: rouge
4747
plugins:
4848
- jekyll-last-modified-at
4949
- jekyll-redirect-from
@@ -91,7 +91,7 @@ exclude:
9191
- _foundation/layout/html
9292
- _foundation/utilities/html
9393

94-
# Default for building locally.
94+
# Default for building locally.
9595
# See configuration files in jekyll-configs/ for environment overrides.
9696
storybook_path: "http://127.0.0.1:6006"
9797
storybook_prod_uswds_path: "https://design.va.gov/storybook/?path=/docs/uswds"

jekyll-configs/dev.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
storybook_path: "/storybook"
1+
url: "https://dev-design.va.gov" # Base hostname & protocol for the preview site
2+
storybook_path: "/storybook"
23.1 KB
Loading

src/_about/contributing/index.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,15 @@ When considering if a component or pattern should be added to the design system
2424
2. The component or pattern is different in more than one major way than existing components in the design system, if the component is only different in color or format, for instance, then it would be better as a variant of the existing component. Note that variants of existing components should also go through this experimental process.
2525
3. Our existing components and patterns will not solve the user problems sufficiently.
2626

27-
{% include _site-in-this-section.html %}
27+
### Experimental design decision tree and process
28+
29+
{% include component-example.html alt="A thumbnail image of experimental design decision tree and process Mural" file="/images/about/experimental-design.png" caption="A thumbnail image of experimental design decision tree and process Mural" %}
30+
31+
<va-link-action
32+
href="https://app.mural.co/t/departmentofveteransaffairs9999/m/departmentofveteransaffairs9999/1715279885465/a8a7701ed5948be8cd98f972ee930a16b9e7444b"
33+
text="Open experimental design Mural file"
34+
/>
35+
36+
<a href="https://app.mural.co/t/departmentofveteransaffairs9999/m/departmentofveteransaffairs9999/1715279885465/a8a7701ed5948be8cd98f972ee930a16b9e7444b">View the experimental design decision tree and process Mural.</a>
37+
38+
{% include _site-in-this-section.html %}

src/_about/developers/using-web-components.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ If the Web Component has a custom event that you need to use and you're **not**
148148
const element = document.querySelector('va-example-component');
149149
const exampleCallback = event => { console.log(event.detail) }
150150
element.addEventListener('vaChange', exampleCallback)
151-
<script>
151+
</script>
152152

153153
<va-example-component>
154154
```

src/_about/experience-standards.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Governance team references these standards when we review products during the Co
2020

2121
## List of Experience Standards
2222

23-
There are 22 experience standards grouped into 7 user experience categories.
23+
There are 23 experience standards grouped into 7 user experience categories.
2424

2525
### Category: Comprehension
2626

@@ -118,6 +118,12 @@ GitHub label: [exp-std-voice-tone](https://github.com/department-of-veterans-aff
118118

119119
GitHub label: [exp-std-form-integrity](https://github.com/department-of-veterans-affairs/va.gov-team/labels/exp-std-form-integrity)
120120

121+
#### User receives appropriate notification from the VA or VA.gov about the status of their request
122+
123+
**There's an issue when:** User does not receive appropriate notification from the VA or VA.gov about the status of their request.
124+
125+
GitHub label: [exp-std-submission-status](https://github.com/department-of-veterans-affairs/va.gov-team/labels/exp-std-submission-status)
126+
121127
### Category: Efficiency
122128

123129
User can accomplish their goals as quickly and efficiently as possible, with minimal cognitive load.

0 commit comments

Comments
 (0)