Skip to content

Commit

Permalink
Merge pull request #1153 from necyberteam/md-2069
Browse files Browse the repository at this point in the history
CCMNet About page
  • Loading branch information
a-pasquale authored Apr 22, 2024
2 parents 2337b74 + 37d7fc1 commit 5dd73dc
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 18 deletions.
60 changes: 60 additions & 0 deletions tests/behat/features/wip/homepage_edit-account-auth.feature
Original file line number Diff line number Diff line change
@@ -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 "[email protected]"
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 "[email protected]"
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 "[email protected]"
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"
48 changes: 32 additions & 16 deletions web/themes/custom/accesstheme/package-lock.json

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

15 changes: 14 additions & 1 deletion web/themes/nect-theme/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
--purple: var(--ccmnet-purple);
--ccmnet-blue: #1DA9E5;
--ccmnet-blue-rollover: var(--ccmnet-blue);
--ccmnet-lighterblue: #DDF6FF;

}

body.careers-cyberteam{
Expand Down Expand Up @@ -1387,6 +1389,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%;
}
Expand Down Expand Up @@ -1854,7 +1865,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-purple);
}
@media screen and (min-width: 769px) {
.ccmnet-page-title-bg-2 {
Expand Down
Binary file added web/themes/nect-theme/img/kevin-brandt.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/themes/nect-theme/templates/page.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
{% else %}
{% if page.banner_image %}
{% set escdiv = 'div' %}
<header class="masthead" style="background-image: url('{% autoescape 'div' %}{% apply spaceless %}{{- page.banner_image -}}{% endapply %}{% endautoescape %}')">
<header class="masthead" style="background-image: url('{% autoescape 'html' %}{% apply spaceless %}{{- page.banner_image -}}{% endapply %}{% endautoescape %}')">
<div class="overlay"></div>
<div class="container">
<div class="row">
Expand Down

0 comments on commit 5dd73dc

Please sign in to comment.