From ca8632e03df850bf2d8b240f5ee7154d2fb2f0fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 02:18:26 +0000 Subject: [PATCH 1/5] build(deps): bump tar in /web/themes/custom/accesstheme Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.11...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../custom/accesstheme/package-lock.json | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/web/themes/custom/accesstheme/package-lock.json b/web/themes/custom/accesstheme/package-lock.json index 011396c57..873021704 100644 --- a/web/themes/custom/accesstheme/package-lock.json +++ b/web/themes/custom/accesstheme/package-lock.json @@ -6372,19 +6372,27 @@ } }, "node_modules/tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" }, "engines": { - "node": ">= 10" + "node": ">=10" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" } }, "node_modules/tar/node_modules/mkdirp": { @@ -11979,18 +11987,23 @@ } }, "tar": { - "version": "6.1.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", - "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", + "minipass": "^5.0.0", "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" }, "dependencies": { + "minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + }, "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", From cfb6def94ee3bd1051b4e619b808bfbf26752827 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:21:19 +0000 Subject: [PATCH 2/5] build(deps-dev): bump minimist in /web/themes/custom/accesstheme Bumps [minimist](https://github.com/minimistjs/minimist) from 1.1.3 to 1.2.8. - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.1.3...v1.2.8) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- web/themes/custom/accesstheme/package-lock.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/themes/custom/accesstheme/package-lock.json b/web/themes/custom/accesstheme/package-lock.json index 873021704..914a4c2e1 100644 --- a/web/themes/custom/accesstheme/package-lock.json +++ b/web/themes/custom/accesstheme/package-lock.json @@ -4045,10 +4045,13 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minimist-options": { "version": "4.1.0", @@ -10190,9 +10193,9 @@ } }, "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true }, "minimist-options": { From dffd059223ea30f9800fd5af34f57e88c093c8f9 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 12 Apr 2024 16:40:20 +0000 Subject: [PATCH 3/5] Update amp_dev module --- composer.lock | 4 +- .../wip/homepage_edit-account-auth.feature | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 tests/behat/features/wip/homepage_edit-account-auth.feature diff --git a/composer.lock b/composer.lock index 63f841c08..32ce17b76 100644 --- a/composer.lock +++ b/composer.lock @@ -16960,7 +16960,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/amp_dev.git", - "reference": "7785bd2d16b0e8bdac221ce8fb87fc9c8345a7a3" + "reference": "abb3c2019b4faf6edc295865da1d8877fe533e17" }, "default-branch": true, "type": "drupal-custom-module", @@ -16972,7 +16972,7 @@ "keywords": [ "Drupal" ], - "time": "2023-10-06T18:01:24+00:00" + "time": "2024-04-11T14:11:08+00:00" }, { "name": "colinodell/psr-testlogger", diff --git a/tests/behat/features/wip/homepage_edit-account-auth.feature b/tests/behat/features/wip/homepage_edit-account-auth.feature new file mode 100644 index 000000000..9e0314bf7 --- /dev/null +++ b/tests/behat/features/wip/homepage_edit-account-auth.feature @@ -0,0 +1,60 @@ +@wip +@api +@javascript + +Feature: For an authenticated user, the Edit Account Page displays + the first and last name of the user as its title. The page features + tabs for navigating to "View" (user's profile page), "Edit" (current page), and "Security" (MFA setup page). + The fields on the page include Program (region), Email Address, Roles (checkboxes for various roles), + First Name, Last Name, preferred pronouns, bio, Picture (file upload), Institution, ACCESS Organization, + CV/Resume (file upload), Time Zone (dropdown), and Citizenships. + +Scenario: Authenticated user tests the edit account page + Given I am logged in with email "pecan@pie.org" + When I go to the homepage + Then I should see "My profile" + When I click "Edit my account" + Then I should see "Pecan Pie" + Then I should see "View" + Then I should see "Edit" + Then I should see "TFA" + Then I should see "Program" + Then I should see "Email Address" + Then value of element "edit-mail" should contain "pecan@pie.org" + Then I should see "Password strength" + Then I should see "Confirm Password" + Then I should see "First Name" + Then I should see "Last Name" + Then value of element "edit-field-user-preferred-pronouns-0-value" should contain "they/them" + Then value of element "edit-field-user-bio-0-value" should contain "I am a pie" + Then I should see "Picture" + Then value of element "edit-field-access-organization-0-target-id" should contain "MGHPCC (4300)" + Then I should see "CV" + Then I should see "Time Zone" + Then I should see "Citizenships" + + Scenario: Authenticated user tests the add interest/skills page + Given I am logged in with email "pecan@pie.org" + When I go to "/community-persona" + Then I should not see "access-account" + + # toggle interest in "access-account" + When I go to "/community-persona/add-interest" + Then I should see "Add Interest" + When I click the element with selector "access-account" + When I go to "/community-persona" + Then I should see "access-account" + When I go to "/community-persona/add-interest" + When I click the element with selector "access-account" + When I go to "/community-persona" + Then I should not see "access-account" + + # toggle skill with "access-account" + When I go to "/community-persona/add-skill" + When I click the element with selector "access-account" + When I go to "/community-persona" + Then I should see "access-account" + When I go to "/community-persona/add-skill" + When I click the element with selector "access-account" + When I go to "/community-persona" + Then I should not see "access-account" From 1daae98dc48d168fc4906192c9fc8ca5658b512c Mon Sep 17 00:00:00 2001 From: FloQuinn <78665445+FloQuinn@users.noreply.github.com> Date: Fri, 19 Apr 2024 18:22:34 +0000 Subject: [PATCH 4/5] style additions for ccmnet about page --- web/themes/nect-theme/css/style.css | 14 +++++++++++++- web/themes/nect-theme/img/kevin-brandt.jpg | Bin 0 -> 32793 bytes web/themes/nect-theme/templates/page.html.twig | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 web/themes/nect-theme/img/kevin-brandt.jpg diff --git a/web/themes/nect-theme/css/style.css b/web/themes/nect-theme/css/style.css index e01c576ef..c5ed8af74 100755 --- a/web/themes/nect-theme/css/style.css +++ b/web/themes/nect-theme/css/style.css @@ -47,6 +47,7 @@ --purple: var(--ccmnet-purple); --ccmnet-blue: #1DA9E5; --ccmnet-blue-rollover: var(--ccmnet-blue); + --ccmnet-lighterblue: #DDF6FF; } body.careers-cyberteam{ @@ -1387,6 +1388,15 @@ table.sticky-header th { .ccmnet .bg-ccmnet-lightblue #joinModal .description { margin-bottom: 12px; } + +.ccmnet .rounded-light-bg { + background: var(--ccmnet-lighterblue); + border-radius: 20px; +} +.ccmnet .bg-lighterblue { + background: var(--ccmnet-lighterblue); +} + .ccmnet img { max-width: 100%; } @@ -1853,7 +1863,9 @@ button.copyclip:has(:hover, + details.search-ci-links summary:hover) { background-size: contain; background-repeat: no-repeat; background-color: var(--ccmnet-lightblue); - +} +.ccmnet-subtitle { + color: var(--ccmnet-blue); } @media screen and (min-width: 769px) { .ccmnet-page-title-bg-2 { diff --git a/web/themes/nect-theme/img/kevin-brandt.jpg b/web/themes/nect-theme/img/kevin-brandt.jpg new file mode 100644 index 0000000000000000000000000000000000000000..796bf2e0f3a6059ac4851cd4e2d317f50cffdac8 GIT binary patch literal 32793 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 +
From 37d7fc12bfd5a1d5c6bd54fad0bc5ac40a30ab03 Mon Sep 17 00:00:00 2001 From: FloQuinn <78665445+FloQuinn@users.noreply.github.com> Date: Mon, 22 Apr 2024 19:13:57 +0000 Subject: [PATCH 5/5] for ccmnet subtitle class, use ccmnet-purple --- web/themes/nect-theme/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/themes/nect-theme/css/style.css b/web/themes/nect-theme/css/style.css index c5ed8af74..c74fb8b50 100755 --- a/web/themes/nect-theme/css/style.css +++ b/web/themes/nect-theme/css/style.css @@ -48,6 +48,7 @@ --ccmnet-blue: #1DA9E5; --ccmnet-blue-rollover: var(--ccmnet-blue); --ccmnet-lighterblue: #DDF6FF; + } body.careers-cyberteam{ @@ -1865,7 +1866,7 @@ button.copyclip:has(:hover, + details.search-ci-links summary:hover) { background-color: var(--ccmnet-lightblue); } .ccmnet-subtitle { - color: var(--ccmnet-blue); + color: var(--ccmnet-purple); } @media screen and (min-width: 769px) { .ccmnet-page-title-bg-2 {