From 29f2f43871113103b57bb72ef9d710ec295ac608 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Tue, 26 Mar 2024 21:46:09 +0100 Subject: [PATCH 01/20] Created github workflow for accessibility test (using Axe) Create axe.yml file in the workflows folder that will check for accessibility issues when a push or PR is made --- .github/workflows/axe.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/axe.yml diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml new file mode 100644 index 000000000..b53b56262 --- /dev/null +++ b/.github/workflows/axe.yml @@ -0,0 +1,22 @@ +name: axe +on: + push: + branches: [master] + pull_request: + branches: [master] +jobs: + axe: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 16.x, 18.x + uses: actions/setup-node@v1 + with: + node-version: 16.x, 18.x + - run: npm ci + - run: npm run build --if-present + - run: npm start & npx wait-on http://localhost:4010 + - name: Run axe + run: | + npm install -g @axe-core/cli + axe http://localhost:4010 --exit From 789964f99081b0ea84f56b5963794665f4782e41 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Tue, 26 Mar 2024 22:12:59 +0100 Subject: [PATCH 02/20] Rename axe.yml to axe-accessibility-check.yml --- .github/workflows/{axe.yml => axe-accessibility-check.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{axe.yml => axe-accessibility-check.yml} (100%) diff --git a/.github/workflows/axe.yml b/.github/workflows/axe-accessibility-check.yml similarity index 100% rename from .github/workflows/axe.yml rename to .github/workflows/axe-accessibility-check.yml From cf1c0eb2a2b2d37f4be7dd2065001c42e0888988 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:55:21 +0100 Subject: [PATCH 03/20] added develop branch --- .github/workflows/axe-accessibility-check.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/axe-accessibility-check.yml b/.github/workflows/axe-accessibility-check.yml index b53b56262..30a2905aa 100644 --- a/.github/workflows/axe-accessibility-check.yml +++ b/.github/workflows/axe-accessibility-check.yml @@ -1,9 +1,13 @@ name: axe on: push: - branches: [master] + branches: + - master + - develop pull_request: - branches: [master] + branches: + - master + - develop jobs: axe: runs-on: ubuntu-latest From e6ac640197fafb586b4ada1e98cb01e730c7d29e Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Sat, 30 Mar 2024 01:20:02 +0100 Subject: [PATCH 04/20] fixed node versions --- .github/workflows/axe-accessibility-check.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/axe-accessibility-check.yml b/.github/workflows/axe-accessibility-check.yml index 30a2905aa..0a596c753 100644 --- a/.github/workflows/axe-accessibility-check.yml +++ b/.github/workflows/axe-accessibility-check.yml @@ -11,12 +11,16 @@ on: jobs: axe: runs-on: ubuntu-latest + strategy: + matrix: + node-version: [16.x, 18.x] + steps: - uses: actions/checkout@v2 - - name: Use Node.js 16.x, 18.x + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: - node-version: 16.x, 18.x + node-version: ${{ matrix.node-version }} - run: npm ci - run: npm run build --if-present - run: npm start & npx wait-on http://localhost:4010 From 6ff61db63f6624d3d9a266b42bf9062f99131ad4 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Wed, 3 Apr 2024 23:44:45 +0100 Subject: [PATCH 05/20] added start script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 83f457b01..6efe96e97 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "3.0.0", "description": "", "scripts": { + "start": "node index.js" "test": "mocha test --recursive", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" From f6d2c514ea269c08b7259756eee190cf2b2e9a2f Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:10:31 +0100 Subject: [PATCH 06/20] Update axe-accessibility-check.yml --- .github/workflows/axe-accessibility-check.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/axe-accessibility-check.yml b/.github/workflows/axe-accessibility-check.yml index 0a596c753..f29c69e0e 100644 --- a/.github/workflows/axe-accessibility-check.yml +++ b/.github/workflows/axe-accessibility-check.yml @@ -23,8 +23,12 @@ jobs: node-version: ${{ matrix.node-version }} - run: npm ci - run: npm run build --if-present - - run: npm start & npx wait-on http://localhost:4010 + - name: Start Docker Container + run: | + docker run -d -p 80:80 my-apache-server + sleep 5 # Wait for container to start + docker ps # Display running containers for debugging - name: Run axe run: | npm install -g @axe-core/cli - axe http://localhost:4010 --exit + axe http://localhost:80 --exit From e1e8c16c6c67b07965c17521cb9bd65876e8bb70 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:11:51 +0100 Subject: [PATCH 07/20] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 6efe96e97..83f457b01 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "3.0.0", "description": "", "scripts": { - "start": "node index.js" "test": "mocha test --recursive", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" From 5f8f5c623bb4558f842bc6668720f5fe9ce8df19 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:37:46 +0100 Subject: [PATCH 08/20] Update axe-accessibility-check.yml --- .github/workflows/axe-accessibility-check.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/axe-accessibility-check.yml b/.github/workflows/axe-accessibility-check.yml index f29c69e0e..0a596c753 100644 --- a/.github/workflows/axe-accessibility-check.yml +++ b/.github/workflows/axe-accessibility-check.yml @@ -23,12 +23,8 @@ jobs: node-version: ${{ matrix.node-version }} - run: npm ci - run: npm run build --if-present - - name: Start Docker Container - run: | - docker run -d -p 80:80 my-apache-server - sleep 5 # Wait for container to start - docker ps # Display running containers for debugging + - run: npm start & npx wait-on http://localhost:4010 - name: Run axe run: | npm install -g @axe-core/cli - axe http://localhost:80 --exit + axe http://localhost:4010 --exit From 9764a68c7dfac70f2d7e0fb09092be6230206931 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:40:13 +0100 Subject: [PATCH 09/20] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 83f457b01..49670f784 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "3.0.0", "description": "", "scripts": { + "start": "npm start" "test": "mocha test --recursive", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" From 7e1176a9835b5f0310ce8934f9cb26d81ad90331 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 4 Apr 2024 01:43:46 +0100 Subject: [PATCH 10/20] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49670f784..10eeb9df1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "3.0.0", "description": "", "scripts": { - "start": "npm start" + "start": "npm start", "test": "mocha test --recursive", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" From f5c7bf14b91d44f8a8a6f509d56f86201c7703b6 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:11:24 +0100 Subject: [PATCH 11/20] Update and rename axe-accessibility-check.yml to axe-a11y-check.yml --- .../{axe-accessibility-check.yml => axe-a11y-check.yml} | 3 +++ 1 file changed, 3 insertions(+) rename .github/workflows/{axe-accessibility-check.yml => axe-a11y-check.yml} (83%) diff --git a/.github/workflows/axe-accessibility-check.yml b/.github/workflows/axe-a11y-check.yml similarity index 83% rename from .github/workflows/axe-accessibility-check.yml rename to .github/workflows/axe-a11y-check.yml index 0a596c753..42c53d034 100644 --- a/.github/workflows/axe-accessibility-check.yml +++ b/.github/workflows/axe-a11y-check.yml @@ -17,6 +17,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Fetch caracal.js + run: | + curl -o caracal.js https://github.com/camicroscope/Caracal/blob/master/caracal.js - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: From d975ac4bcb2ee8189ea54a65ec04ccc76580ce5a Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:30:14 +0100 Subject: [PATCH 12/20] Update axe-a11y-check.yml --- .github/workflows/axe-a11y-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/axe-a11y-check.yml b/.github/workflows/axe-a11y-check.yml index 42c53d034..2da2ee918 100644 --- a/.github/workflows/axe-a11y-check.yml +++ b/.github/workflows/axe-a11y-check.yml @@ -29,5 +29,6 @@ jobs: - run: npm start & npx wait-on http://localhost:4010 - name: Run axe run: | + console.log("Debug message: Running axe-core accessibility checks..."); npm install -g @axe-core/cli axe http://localhost:4010 --exit From 3bce8eb223388f9ea10b8da5a7790fb5b1a8e552 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:58:40 +0100 Subject: [PATCH 13/20] Update package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 10eeb9df1..83f457b01 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "3.0.0", "description": "", "scripts": { - "start": "npm start", "test": "mocha test --recursive", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" From 94a29e930b919ce95f41140481d59e5619f1e2eb Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:41:44 +0100 Subject: [PATCH 14/20] Update axe-a11y-check.yml --- .github/workflows/axe-a11y-check.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/axe-a11y-check.yml b/.github/workflows/axe-a11y-check.yml index 2da2ee918..b4eeceed0 100644 --- a/.github/workflows/axe-a11y-check.yml +++ b/.github/workflows/axe-a11y-check.yml @@ -17,9 +17,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Fetch caracal.js - run: | - curl -o caracal.js https://github.com/camicroscope/Caracal/blob/master/caracal.js - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: @@ -29,6 +26,6 @@ jobs: - run: npm start & npx wait-on http://localhost:4010 - name: Run axe run: | - console.log("Debug message: Running axe-core accessibility checks..."); + echo "Running axe-core accessibility checks..." npm install -g @axe-core/cli axe http://localhost:4010 --exit From 54e1f04047d9f88150ad2f8675ddb46894566de5 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:42:45 +0100 Subject: [PATCH 15/20] added start script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 83f457b01..d44aa38b5 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "", "scripts": { "test": "mocha test --recursive", + "start": "http-server -p 4010", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" }, From 8753e5ed99e02294c051b3525e319762afac7349 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:53:41 +0100 Subject: [PATCH 16/20] Update start script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d44aa38b5..5b94ff0ec 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "scripts": { "test": "mocha test --recursive", - "start": "http-server -p 4010", + "start": "http-server landing -p 4010", "lint": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet", "lint-fix": "eslint ./core/*.js ./components/**/*.js ./common/smartpen/*.js ./apps/*.js ./apps/port/*.js ./apps/heatmap/*.js ./apps/multi/*.js ./apps/labeling/*.js ./apps/loader/*.js ./apps/model/*.js ./apps/segment/*.js ./apps/model/**/*.js ./apps/segment/**/*.js ./apps/viewer/*.js --quiet --fix" }, From 0eccd5b48a06b37f55874e5e5819957b0f938be6 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:59:00 +0100 Subject: [PATCH 17/20] added http server dependencies --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5b94ff0ec..d9b9f50d2 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "author": "", "license": "BSD-3-Clause", "dependencies": { + "http-server": "^0.12.3" "chai": "^4.3.7", "eslint": "^6.8.0", "eslint-config-google": "^0.14.0", From e1de51128af3e317e92dedb063bf344b9e92eaf1 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:05:24 +0100 Subject: [PATCH 18/20] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9b9f50d2..871b69772 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "author": "", "license": "BSD-3-Clause", "dependencies": { - "http-server": "^0.12.3" + "http-server": "^0.12.3", "chai": "^4.3.7", "eslint": "^6.8.0", "eslint-config-google": "^0.14.0", From f7a048edb9ac50e78512837f22cc3725fa523249 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:11:07 +0100 Subject: [PATCH 19/20] Update axe-a11y-check.yml --- .github/workflows/axe-a11y-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/axe-a11y-check.yml b/.github/workflows/axe-a11y-check.yml index b4eeceed0..dfe429dd2 100644 --- a/.github/workflows/axe-a11y-check.yml +++ b/.github/workflows/axe-a11y-check.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - run: npm install - run: npm ci - run: npm run build --if-present - run: npm start & npx wait-on http://localhost:4010 From 61c5b7996776c2ffb9c06c2a62c45165208a9838 Mon Sep 17 00:00:00 2001 From: Victoria Nduka <122698422+nwanduka@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:21:37 +0100 Subject: [PATCH 20/20] Update axe-a11y-check.yml --- .github/workflows/axe-a11y-check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/axe-a11y-check.yml b/.github/workflows/axe-a11y-check.yml index dfe429dd2..a180dd53d 100644 --- a/.github/workflows/axe-a11y-check.yml +++ b/.github/workflows/axe-a11y-check.yml @@ -17,6 +17,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install wait-on + run: npm install --save wait-on - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: