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

Merge dev into main #789

Merged
merged 39 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
fc02e86
finos/a11y-theme-builder#481: add Docker image scanning github action
aaronreed708 Oct 23, 2023
1408ee6
finos/a11y-theme-builder#481: fix invalid workflow file caused by nano
aaronreed708 Oct 23, 2023
44f80fc
finos/a11y-theme-builder#481: moved docker scanning job to security.yml
aaronreed708 Oct 23, 2023
9c299ff
finos/a11y-theme-builder#481: added workflow to publish Docker image.…
aaronreed708 Oct 24, 2023
291027e
finos/a11y-theme-builder#481: prevent docker image publish if scan fails
aaronreed708 Oct 24, 2023
6b54142
min target area
lwnoble Nov 14, 2023
51c5d01
Merge branch 'dev' into github-action-docker-scanner
aaronreed708 Nov 16, 2023
0ef30f5
finos/a11y-theme-builder/issues/481: committing branch trigger name t…
aaronreed708 Nov 16, 2023
6b90126
finos/a11y-theme-builder/issues/481: changing underscores in workflow…
aaronreed708 Nov 16, 2023
097d932
finos/a11y-theme-builder/issues/481: remove docker scanning to allow …
aaronreed708 Nov 16, 2023
fe6e2d5
finos/a11y-theme-builder/issues/481: comment out test for repository …
aaronreed708 Nov 16, 2023
5d78a66
Merge pull request #728 from aaronreed708/github-action-docker-scanner
aaronreed708 Nov 16, 2023
8377ff2
finos/a11y-theme-builder/issues/481: fix incorrect Docker secret name
aaronreed708 Nov 16, 2023
cfb5507
finos/a11y-theme-builder/issues/481: made comment change to test new …
aaronreed708 Nov 16, 2023
f2ff149
fix context causing Dockerfile not found error
aaronreed708 Nov 20, 2023
7fc76a6
finos/a11y-theme-builder#481: adding back in finos repo test
aaronreed708 Nov 20, 2023
4b04457
finos/a11y-theme-builder#481: adding back in docker image scanning
aaronreed708 Nov 20, 2023
130f27b
finos/a11y-theme-builder#542:Removed white space at the top and botto…
DorothyEwuah Nov 29, 2023
d1686a6
finos/a11y-theme-builder#481: removing test branch from workflow. Wi…
aaronreed708 Dec 6, 2023
fed75c2
finos/a11y-theme-builder#481: adding severity threshold to docker sca…
aaronreed708 Dec 6, 2023
1642baa
finos/a11y-theme-builder#481: removing test branch from workflow. Wi…
aaronreed708 Dec 6, 2023
e2b896f
Merge pull request #733 from Turntabl-DorothyEwuah/remove-white-space…
evangk6 Dec 12, 2023
f62d9d4
Merge pull request #747 from finos/github-action-docker-scanner
aaronreed708 Dec 13, 2023
0be3718
finos/a11y-theme-builder#737: correct button note in CreateColorTheme
aaronreed708 Dec 13, 2023
990c1c5
Merge pull request #749 from aaronreed708/correct-button-text
aaronreed708 Jan 4, 2024
ab15d8b
finos/a11y-theme-builder#768: fixed reported vulnerabilities
aaronreed708 Jan 24, 2024
6ffe0dd
finos/a11y-theme-builder#742: changing bookworm-slim version for Dock…
aaronreed708 Jan 24, 2024
64eeee0
finos/a11y-theme-builder#742: removing change used to test fix
aaronreed708 Jan 24, 2024
22336ce
Update CONTRIBUTE.md
PaulaPaul Jan 25, 2024
0856466
Merge pull request #775 from aaronreed708/fix-scan-errors
aaronreed708 Jan 25, 2024
f5c9a7c
Merge pull request #778 from aaronreed708/fix-docker-scans
aaronreed708 Jan 25, 2024
2251d6a
Merge pull request #782 from PaulaPaul/patch-1
aaronreed708 Jan 26, 2024
6552749
finos/a11y-theme-builder#742
aaronreed708 Feb 2, 2024
11761aa
finos/a11y-theme-builder#742: testing with latest github actions, for…
aaronreed708 Feb 2, 2024
b18e2bb
finos/a11y-theme-builder#742: latest actions-setup-docker has issues,…
aaronreed708 Feb 2, 2024
c21f6fa
finos/a11y-theme-builder#742: latest actions-setup-docker has issues,…
aaronreed708 Feb 2, 2024
702f8cc
finos/a11y-theme-builder#742: latest actions-setup-docker release has…
aaronreed708 Feb 2, 2024
d6a29f6
finos/a11y-theme-builder#742: removing changes that I had added for t…
aaronreed708 Feb 2, 2024
ce675d5
Merge pull request #788 from aaronreed708/disable-docker-scan
aaronreed708 Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Publish Docker image

on:
workflow_dispatch: {}
push:
branches:
- 'main'
- 'dev'
paths:
- 'code/src/**'
- 'code/package.json'
- 'code/Dockerfile'
- '.github/workflows/publish-docker.yml'

jobs:
docker-scan:
name: ${{ github.event.repository.name }}-docker-scan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: docker-practice/actions-setup-docker@321477a1e481dd60b05f9b489cf4b9be467aa15c
- name: Build
run: docker build -f Dockerfile -t user/app:latest .
working-directory: code
#- name: Scan for vulnerabilities
# uses: crazy-max/ghaction-container-scan@dfa7e54dc32045120f06d0bc8d7724860f5db0ad
# with:
# image: user/app:latest
# severity_threshold: HIGH
push-to-registry:
name: Push Docker image to Docker Hub
needs: docker-scan
runs-on: ubuntu-latest
# save forks from having issue trying to publish to Docker
# without the correct credentials
if: github.repository_owner == 'finos'
outputs:
digest: ${{ steps.build_publish.outputs.digest }}
steps:
- name: Check out the repo
uses: actions/checkout@v4

- name: Log in to Docker Hub
uses: docker/[email protected]
with:
username: finos
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/[email protected]
with:
images: finos/a11y-theme-builder
tags: |
type=ref,event=branch
type=sha
- name: Build and push Docker image
id: build_publish
uses: docker/[email protected]
with:
context: code
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
13 changes: 13 additions & 0 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,16 @@ jobs:
with:
name: Depcheck report
path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
docker-scan:
name: ${{ github.event.repository.name }}-docker-scan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: docker-practice/actions-setup-docker@321477a1e481dd60b05f9b489cf4b9be467aa15c
- name: Build
run: docker build -f Dockerfile -t user/app:latest .
working-directory: code
- name: Scan for vulnerabilities
uses: crazy-max/ghaction-container-scan@dfa7e54dc32045120f06d0bc8d7724860f5db0ad
with:
image: user/app:latest
5 changes: 4 additions & 1 deletion CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ This section includes ways to get started with your open source project. Include
Participating in our project community spans a variety of activities:

* Reporting bugs and enhancements requests
* Contributing bug/feature solutions
* Contributing bug/feature solutions and ideas for community content (see issues tagged with the 'community' tag for examples)
* Joining Community Collaboration Space calls, held every other week at 11am ET (details on the [FINOS Calendar](https://www.finos.org/calendar))
* Speaking at conferences and meetups to build awareness and community
* Participating in Collaboration Summits
* [Improving documentation](https://finos.github.io/a11y-theme-builder/)
* [Identifying and tracking new use cases](https://finos.github.io/a11y-theme-builder/contribute)
* Create an example of the project in real world by building something or showing what others have built.
Expand Down
2 changes: 1 addition & 1 deletion code/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18-bookworm-slim
FROM node:18.19-bookworm-slim
RUN node -v
# Copy source
RUN mkdir $HOME/code
Expand Down
12 changes: 6 additions & 6 deletions code/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions code/src/ui/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.html,body {
margin: 0;
padding: 0;
overflow: hidden;
}

.top40 {
Expand Down Expand Up @@ -47,7 +48,7 @@ p a:hover {
display: flex;
border-radius: 16px;
gap: 16px;
background: "white";
background: white;
border: 1px solid rgba(0,0,0,.15);
min-height: 24px;
}
Expand Down Expand Up @@ -90,14 +91,14 @@ p a:hover {
height: 24px;
margin: 10px;
float: left;
border: 1px solid gray;
border: 1px solid rgb(128, 128, 128); /*replaced deprecated gray with rgb equivalent*/
}

.input-1 {
width: 100%;
height: 30px;
font-size: var(--baseFont);
margin: 8px 0px;
margin: 8px 0;
}

.darkmode .background, .darkmode.background {
Expand Down
2 changes: 1 addition & 1 deletion code/src/ui/src/components/CreateColorTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const CreateColorTheme: React.FC<Props> = ({atom, handleDefaultThemeIniti
</div>
<div className="formRow">
<div className="subtitle1">Button Color</div>
<div className="small">Note: The "To Color" will be limited to those colors with the same "On Color" or text color to make sure the gradiemt meets WCAG 2.1 AA contrast guidelines.</div>
<div className="small">Note: Buttons limited to colors with a contrast against your primary and secondary backgrounds of 3.1: 1 to meet WCAG 2.1 AA Guidelines.</div>
<div className="form-columns top16">
<ColorSelect value={_colorTheme.button} label="Color:"></ColorSelect>
</div>
Expand Down
5 changes: 3 additions & 2 deletions code/src/ui/src/mui-a11y-tb/themes/TB.css
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@
--button-shadow: var(--elevation-1);
--sm-button-height: 4;
--sm-button-padding: 2;
--mobile-button-radius: calc(calc( calc(var(--button-radius) * var(--radius-1)) / calc(var(--button-height) * var(--spacing-1)) ) * var(--mobile-min-target));
/* Chips */
--chip-minwidth: 80px;
--chip-height: 5;
Expand Down Expand Up @@ -2551,8 +2552,8 @@
}

[data-background="primary"] {
--background: var(--primary-alt-background);
--alt-background: var(--primary-background);
--background: var(--primary-background);
--alt-background: var(--primary-alt-background);
--on-background: var(--primary-on-background);
/* Button */
--button: var(--primary-button);
Expand Down
9 changes: 9 additions & 0 deletions code/src/ui/src/mui-a11y-tb/themes/Theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -1723,6 +1723,9 @@ button.MuiPaginationItem-root:hover {
position: relative;
box-shadow: var(--sliderhandle-shadow);
}
.MuiSwitch-root:hover .MuiSwitch-switchBase:hover {
box-shadow: none;
}
.MuiSwitch-root .MuiSwitch-switchBase .MuiSwitch-thumb::after {
position: absolute;
pointer-events: none;
Expand Down Expand Up @@ -1795,6 +1798,7 @@ button.MuiPaginationItem-root:hover {
height: var(--min-target) !important;
width: var(--min-target) !important;
background: transparent !important;
box-shadow: none !important;
}
.MuiSlider-root .MuiSlider-thumb::before {
height: calc( var(--sliderhandleHeight) * var(--spacing-1) );
Expand Down Expand Up @@ -1823,6 +1827,8 @@ button.MuiPaginationItem-root:hover {
box-shadow: none !important;
}



/* popovers */
.MuiPopover-paper {
border-radius: calc(var(--popoverRadius) * var(--radius-1)) !important;
Expand Down Expand Up @@ -1937,6 +1943,9 @@ button.MuiPaginationItem-root:hover {
bottom: calc(0px - calc(var(--focusBorder) + 2px));
opacity: 1;
}
.MuiSwitch-switchBase:hover {
background-color: transparent !important;
}
/* icons */
.icon-body {
display: flex;
Expand Down
3 changes: 1 addition & 2 deletions code/src/ui/src/mui-a11y-tb/themes/Theme.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,6 @@ try {
height: "calc(var(--sliderhandleHeight) * var(--spacing-1))",
width: "calc(var(--sliderhandleHeight) * var(--spacing-1) )",
borderRadius: "calc(var(--sliderhandleRadius) * var(--radius-1))",
boxShadow: "var(--sliderhandle-shadow)",
backgroundColor: "var(--button)",
position: "absolute",
top: "50%",
Expand Down Expand Up @@ -1033,7 +1032,7 @@ try {
minHeight: "calc( calc( var(--chip-height) * var(--spacing-1) ) - calc( var(--border-1) * var(--button-border) * 2 ))",
},
"&:hover::after": {
opacity: "var(--button-half)",
opacity: ".5",
top: "calc(((var(--min-target) - (var(--spacing-1) * var(--chip-height)))/2) - 3px)",
bottom: "calc(((var(--min-target) - (var(--spacing-1) * var(--chip-height)))/2) - 3px)",
left: "calc(-1px - calc(var(--border-1) * 2))",
Expand Down
Loading