diff --git a/package.json b/package.json index 1bdfff7728..57ccaca948 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "@babel/preset-react": "^7.23.3", "@babel/register": "^7.23.7", "@department-of-veterans-affairs/eslint-plugin": "^1.1.0", - "@department-of-veterans-affairs/web-components": "^11.2.5", + "@department-of-veterans-affairs/web-components": "^14.3.0", "@octokit/rest": "^18.10.0", "@sentry/browser": "^6.13.1", "@testing-library/cypress": "^8.0.3", diff --git a/src/applications/registry.json b/src/applications/registry.json index 138215595b..0fad7ca18e 100644 --- a/src/applications/registry.json +++ b/src/applications/registry.json @@ -473,35 +473,6 @@ "vagovprod": true } }, - { - "appName": "22-1990E Education benefits form", - "entryName": "1990e-edu-benefits", - "rootUrl": "/education/apply-for-education-benefits/application/1990E", - "template": { - "title": "Apply For Education Benefits", - "heading": "Apply for education benefits", - "display_title": "Apply to use transferred benefits", - "layout": "page-react.html", - "description": "Use your VA education benefits to pay for college or training programs. Find out which documents you’ll need to apply for benefits, and start your online application today.", - "order": 4, - "hideFromSidebar": true, - "includeBreadcrumbs": true, - "breadcrumbs_override": [ - { - "name": "Education and training", - "path": "education/" - }, - { - "name": "How to apply", - "path": "education/how-to-apply/" - }, - { - "name": "Apply for education benefits", - "path": "education/apply-for-education-benefits/application/1990E" - } - ] - } - }, { "appName": "22-10203 Education benefits form", "entryName": "10203-edu-benefits", @@ -602,32 +573,6 @@ "hideFromSidebar": true } }, - { - "appName": "22-1990N Education benefits form", - "entryName": "1990n-edu-benefits", - "rootUrl": "/education/apply-for-education-benefits/application/1990N", - "template": { - "title": "Apply For Education Benefits", - "heading": "Apply for education benefits", - "layout": "page-react.html", - "description": "Use your VA education benefits to pay for college or training programs. Find out which documents you’ll need to apply for benefits, and start your online application today.", - "includeBreadcrumbs": true, - "breadcrumbs_override": [ - { - "name": "Education and training", - "path": "education/" - }, - { - "name": "How to apply", - "path": "education/how-to-apply/" - }, - { - "name": "Apply for education benefits", - "path": "education/apply-for-education-benefits/application/1990N" - } - ] - } - }, { "appName": "22-1995 Education benefits form", "entryName": "1995-edu-benefits", @@ -754,6 +699,18 @@ "loadingMessage": "Please wait while we log you in." } }, + { + "appName": "Sign-in changes reminder", + "entryName": "sign-in-changes", + "rootUrl": "/sign-in-changes-reminder", + "template": { + "title": "Sign-in changes reminder", + "layout": "page-react.html", + "description": "Learn more about the changes coming to sign-in", + "keywords": "Sign-in changes, identity verification, verify", + "vagovprod": false + } + }, { "appName": "GI Bill Comparison Tool", "entryName": "gi", @@ -1012,31 +969,6 @@ "description": "Ask VA (AVA) is an online portal that allows veterans, caregivers, and supporting personnel in education, debt, loans, etc. to submit questions to VA and receive a secure message response." } }, - { - "appName": "Veteran Rapid Retraining Assistance Program (VRRAP)", - "entryName": "1990s-edu-benefits", - "rootUrl": "/education/other-va-education-benefits/veteran-rapid-retraining-assistance/apply-for-vrrap-form-22-1990s", - "template": { - "title": "Apply for the Veteran Rapid Retraining Assistance Program (VRRAP)", - "heading": "Apply for the Veteran Rapid Retraining Assistance Program (VRRAP)", - "layout": "page-react.html", - "includeBreadcrumbs": true, - "breadcrumbs_override": [ - { - "name": "Education and training", - "path": "education/" - }, - { - "name": "Other VA education benefits", - "path": "education/other-va-education-benefits/" - }, - { - "name": "Apply for VRRAP VA Form 22 1990s", - "path": "education/other-va-education-benefits/veteran-rapid-retraining-assistance/apply-for-vrrap-form-22-1990s" - } - ] - } - }, { "appName": "Request a Board Appeal", "entryName": "10182-board-appeal", @@ -1724,7 +1656,7 @@ "rootUrl": "/my-health/travel-claim-status", "productId": "1e585463-5625-4868-b5f5-58ee0490ea28", "template": { - "vagovprod": false, + "vagovprod": true, "layout": "page-react.html" } }, @@ -1755,7 +1687,9 @@ "productId": "89100c00-5b5f-46fd-bd98-d3b35f220958", "template": { "vagovprod": false, - "layout": "accredited-representative-portal.html" + "layout": "accredited-representative-portal.html", + "title": "Apply to become a VA accredited attorney or claims agent", + "description": "Apply to become a VA accredited attorney or claims agent (VA Form 21a)" } }, { @@ -1769,7 +1703,7 @@ } }, { - "appName": "Foreign Medical Program (FMP) Registration Form", + "appName": "Register for the Foreign Medical Program (FMP)", "entryName": "10-7959f-1-FMP", "rootUrl": "/health-care/foreign-medical-program/register-form-10-7959f-1", "productId": "901c3f1f-2616-46da-89b2-30649821e335", @@ -1839,40 +1773,13 @@ "includeBreadcrumbs": true } }, - { - "appName": "Apply to become a VA accredited attorney or claims agent", - "entryName": "21a", - "rootUrl": "/accreditation/attorney-claims-agent-form-21a", - "productId": "55b00994-6f3c-4527-98be-5a90e37eec01", - "template": { - "vagovprod": false, - "title": "Apply to become a VA accredited attorney or claims agent", - "description": "Apply to become a VA accredited attorney or claims agent (VA Form 21a)", - "layout": "page-react.html", - "includeBreadcrumbs": true, - "breadcrumbs_override": [ - { - "name": "Home", - "path": "" - }, - { - "name": "VA accreditation representatives", - "path": "accreditation" - }, - { - "name": "Apply to become a VA accredited attorney or claims agent", - "path": "accreditation/attorney-claims-agent-form-21a" - } - ] - } - }, { "appName": "Resources for schools", "entryName": "sco", - "rootUrl": "/education/school-administrators", + "rootUrl": "/school-administrators", "productId": "40938a35-1cfa-4808-917b-37e0baec6a7c", "template": { - "vagovprod": false, + "vagovprod": true, "layout": "page-react.html" } }, @@ -1954,5 +1861,15 @@ "vagovprod": false, "layout": "page-react.html" } + }, + { + "appName": "Benefit Eligibility Questionnaire", + "entryName": "benefit-eligibility-questionnaire", + "rootUrl": "/benefit-eligibility-questionnaire", + "productId": "87f2c91f-46c3-4461-8890-3636130af4ab", + "template": { + "vagovprod": false, + "layout": "page-react.html" + } } -] +] \ No newline at end of file diff --git a/src/site/assets/img/navigate_before.svg b/src/site/assets/img/navigate_before.svg new file mode 100644 index 0000000000..cea8c93cae --- /dev/null +++ b/src/site/assets/img/navigate_before.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/site/assets/img/navigate_far_before.svg b/src/site/assets/img/navigate_far_before.svg new file mode 100644 index 0000000000..9fe06e4cbe --- /dev/null +++ b/src/site/assets/img/navigate_far_before.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/site/assets/img/navigate_far_next.svg b/src/site/assets/img/navigate_far_next.svg new file mode 100644 index 0000000000..14f41f602f --- /dev/null +++ b/src/site/assets/img/navigate_far_next.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/site/assets/img/navigate_next.svg b/src/site/assets/img/navigate_next.svg new file mode 100644 index 0000000000..70d35ba4dd --- /dev/null +++ b/src/site/assets/img/navigate_next.svg @@ -0,0 +1,2 @@ + + diff --git a/src/site/assets/img/sprite.svg b/src/site/assets/img/sprite.svg index 2dcd4e333c..7973e696d3 100644 --- a/src/site/assets/img/sprite.svg +++ b/src/site/assets/img/sprite.svg @@ -1,3 +1,5 @@ - + + + - + \ No newline at end of file diff --git a/src/site/assets/img/vet-centers/vet-center-banner.jpg b/src/site/assets/img/vet-centers/vet-center-banner.jpg new file mode 100644 index 0000000000..6f6bd3e63a Binary files /dev/null and b/src/site/assets/img/vet-centers/vet-center-banner.jpg differ diff --git a/src/site/assets/sass/style.scss b/src/site/assets/sass/style.scss index 10c9cf3e33..4a98cd6c01 100644 --- a/src/site/assets/sass/style.scss +++ b/src/site/assets/sass/style.scss @@ -49,6 +49,10 @@ } } +.break-word-wrap { + word-wrap: break-word; +} + .spotlight-card { min-width: 30%; word-wrap: break-word; @@ -263,6 +267,7 @@ } } } + // fix for sidenav btn .va-sidenav-btn-close { background-size: 0.625rem 0.625rem; diff --git a/src/site/components/va_related_form.drupal.liquid b/src/site/components/va_related_form.drupal.liquid new file mode 100644 index 0000000000..392bd38dfe --- /dev/null +++ b/src/site/components/va_related_form.drupal.liquid @@ -0,0 +1,46 @@ +{% if vaForm.entityUrl.path and vaForm.entityPublished %} + +

VA Form {{ vaForm.fieldVaFormNumber }}

+ +{% else %} +

VA Form {{ vaForm.fieldVaFormNumber }}

+{% endif %} +

+ Form name: {{ vaForm.fieldVaFormName }} +

+ +{{ vaForm.fieldVaFormUsage.processed }} + +{% assign showPDFModal = ''| featureFindFormsPDFModal %} + +{% if showPDFModal %} +
+ +
+{% else %} + + + {% assign translatedDownloadText = vaForm.fieldVaFormLanguage | deriveLanguageTranslation: 'downloadVaForm', vaForm.fieldVaFormNumber %} + {{ translatedDownloadText }} (PDF) + +{% endif %} \ No newline at end of file diff --git a/src/site/facilities/facility_health_service.drupal.liquid b/src/site/facilities/facility_health_service.drupal.liquid index a18fcab9ad..419674d550 100644 --- a/src/site/facilities/facility_health_service.drupal.liquid +++ b/src/site/facilities/facility_health_service.drupal.liquid @@ -18,9 +18,9 @@ id="{{ serviceTaxonomy.entityBundle }}-{{ serviceTaxonomy.entityId }}" > {% if serviceTaxonomy.fieldCommonlyTreatedCondition %} -
- Common conditions: {{ serviceTaxonomy.fieldCommonlyTreatedCondition }} -
+

+ Common conditions: {{ serviceTaxonomy.fieldCommonlyTreatedCondition }} +

{% endif %} {% if serviceSection.name == "Lovell - TRICARE" and serviceTaxonomy.fieldTricareDescription %} diff --git a/src/site/facilities/health_service.drupal.liquid b/src/site/facilities/health_service.drupal.liquid index 42d27882ee..a75f97c0f0 100644 --- a/src/site/facilities/health_service.drupal.liquid +++ b/src/site/facilities/health_service.drupal.liquid @@ -15,9 +15,9 @@
{% if serviceTaxonomy.fieldCommonlyTreatedCondition %} -
- Common conditions: {{ serviceTaxonomy.fieldCommonlyTreatedCondition }} -
+

+ Common conditions: {{ serviceTaxonomy.fieldCommonlyTreatedCondition }} +

{% endif %} {% if section.name == "Lovell - TRICARE" and serviceTaxonomy.fieldTricareDescription %} {{ serviceTaxonomy.fieldTricareDescription | phoneLinks }} @@ -34,7 +34,7 @@ {% if location.entity.status and facility != empty %}
  • diff --git a/src/site/filters/liquid.js b/src/site/filters/liquid.js index 4a7f1b85e1..9f8c86816e 100644 --- a/src/site/filters/liquid.js +++ b/src/site/filters/liquid.js @@ -673,26 +673,20 @@ module.exports = function registerFilters() { return breadcrumbs; }; - liquid.filters.deriveLcBreadcrumbs = ( - breadcrumbs, - string, - currentPath, - pageTitle, - ) => { + liquid.filters.deriveLcBreadcrumbs = breadcrumbs => { // Remove any resources crumb - we don't want the drupal page title. const filteredCrumbs = breadcrumbs.filter( crumb => crumb.url.path !== '/resources', ); - // Add the resources crumb with the correct crumb title. - filteredCrumbs.push({ - url: { path: '/resources', routed: false }, - text: 'Resources and support', - }); - if (pageTitle) { - filteredCrumbs.push({ - url: { path: currentPath, routed: true }, - text: string, + const firstBreadcrumbIsHome = + breadcrumbs?.[0].text.toLowerCase() === 'home'; + + if (firstBreadcrumbIsHome) { + // Add the resources crumb with the correct crumb title after "home" + filteredCrumbs.splice(1, 0, { + url: { path: '/resources', routed: false }, + text: 'Resources and support', }); } @@ -2197,4 +2191,8 @@ module.exports = function registerFilters() { } return null; }; + + liquid.filters.featureFindFormsPDFModal = () => { + return cmsFeatureFlags.FEATURE_FIND_FORMS_MODAL; + }; }; diff --git a/src/site/includes/breadcrumbs.drupal.liquid b/src/site/includes/breadcrumbs.drupal.liquid index 22133e66e1..8280c990d4 100644 --- a/src/site/includes/breadcrumbs.drupal.liquid +++ b/src/site/includes/breadcrumbs.drupal.liquid @@ -1,4 +1,4 @@ -
    +
    {% assign crumbs = entityUrl.breadcrumb %} {% if deriveBreadcrumbsFromUrl == true %} @@ -6,15 +6,16 @@ {% endif %} {% if constructLcBreadcrumbs == true %} - {% assign crumbs = entityUrl.breadcrumb | deriveLcBreadcrumbs: title, entityUrl.path, titleInclude %} + {% assign crumbs = entityUrl.breadcrumb | deriveLcBreadcrumbs %} {% endif %} {% assign crumbs = crumbs | formatForBreadcrumbs: title, entityUrl.path, hideHomeBreadcrumb, customHomeCrumbText %} - +