Skip to content

Commit

Permalink
VACMS-19649: Update Connect with us queries & templates for CLPs and …
Browse files Browse the repository at this point in the history
…BHLPs (#2351)

* Update landing_page.drupal.liquid

* changing fieldRelatedOffice to fieldConnectWithUs

* block -> blockcontent

* Rebase 2351 (#2362)

* Removes registry entry for form-renderer app. (#2345)

* Update appName to correct title for Authenticated Experience Design Patterns (#2353)

* update appName to correct title

* cleanup from merge main

* VEBT-729 Removing 22-0993 (#2352)

* Update SCO registry.json route

* vagovprod to true for sco page

* Fix to breadcrumb padding on certain drupal pages. (#2241)

* Fix to breadcrumb padding on certain drupal pages.

* Adding row back

* Removing another un-needed class

* Adding padding to containing div

* Turn on production flag for rollout (#2246)

* update web-components (#2249)

* update web-components

Signed-off-by: Micah Chiang <[email protected]>

* bump version

Signed-off-by: Micah Chiang <[email protected]>

---------

Signed-off-by: Micah Chiang <[email protected]>

* Medallia - Add feedback button to checklist page layout (#2247)

* added feedback button to checklist drupal template

* moved element to under back-to-top element

* VACMS 18909 KISS autosuggest data for services from taxonomies (#2248)

* creates va-healthcare-services.json
* remove spaces from JSONs
* process the processed HTML to text
* simplify

* bump web components (#2250)

Signed-off-by: Micah Chiang <[email protected]>

* VEBT-423 Update SCO registry.json route to match prod (#2245)

* Update SCO registry.json route

* Update registry.json for sco url

* Making separate PR

* Fix to breadcrumb padding on certain drupal pages. (#2241)

* Fix to breadcrumb padding on certain drupal pages.

* Adding row back

* Removing another un-needed class

* Adding padding to containing div

* Turn on production flag for rollout (#2246)

* update web-components (#2249)

* update web-components

Signed-off-by: Micah Chiang <[email protected]>

* bump version

Signed-off-by: Micah Chiang <[email protected]>

---------

Signed-off-by: Micah Chiang <[email protected]>

* Medallia - Add feedback button to checklist page layout (#2247)

* added feedback button to checklist drupal template

* moved element to under back-to-top element

* VACMS 18909 KISS autosuggest data for services from taxonomies (#2248)

* creates va-healthcare-services.json
* remove spaces from JSONs
* process the processed HTML to text
* simplify

* bump web components (#2250)

Signed-off-by: Micah Chiang <[email protected]>

---------

Signed-off-by: Micah Chiang <[email protected]>
Co-authored-by: Andrew Steele <[email protected]>
Co-authored-by: Kevin Duensing <[email protected]>
Co-authored-by: Micah Chiang <[email protected]>
Co-authored-by: Aubrey Arcangel <[email protected]>
Co-authored-by: Eli Selkin <[email protected]>

* Remove 0993-edu-benefits

---------

Signed-off-by: Micah Chiang <[email protected]>
Co-authored-by: Andrew Steele <[email protected]>
Co-authored-by: Kevin Duensing <[email protected]>
Co-authored-by: Micah Chiang <[email protected]>
Co-authored-by: Aubrey Arcangel <[email protected]>
Co-authored-by: Eli Selkin <[email protected]>

* 1217 - Add breadcrumbs (#2356)

* CST - Added useLocalStylesAndComponents to the claims-status app (#2360)

* add useLocalStylesAndComponents to the claims-status app

* update flag placement and registry schema

Signed-off-by: Micah Chiang <[email protected]>

---------

Signed-off-by: Micah Chiang <[email protected]>
Co-authored-by: Micah Chiang <[email protected]>

* remove conditional style.css (#2361)

Signed-off-by: Micah Chiang <[email protected]>

---------

Signed-off-by: Micah Chiang <[email protected]>
Co-authored-by: Ryan Koch <[email protected]>
Co-authored-by: Adam Whitlock <[email protected]>
Co-authored-by: Liz Wendling <[email protected]>
Co-authored-by: Andrew Steele <[email protected]>
Co-authored-by: Kevin Duensing <[email protected]>
Co-authored-by: Micah Chiang <[email protected]>
Co-authored-by: Aubrey Arcangel <[email protected]>
Co-authored-by: Eli Selkin <[email protected]>
Co-authored-by: Nick Sayre <[email protected]>
Co-authored-by: Peri-Ann McLaren <[email protected]>

* revert header rebase change

* spaces fix

* more spaces

---------

Signed-off-by: Micah Chiang <[email protected]>
Co-authored-by: Ryan Koch <[email protected]>
Co-authored-by: Adam Whitlock <[email protected]>
Co-authored-by: Liz Wendling <[email protected]>
Co-authored-by: Andrew Steele <[email protected]>
Co-authored-by: Kevin Duensing <[email protected]>
Co-authored-by: Micah Chiang <[email protected]>
Co-authored-by: Aubrey Arcangel <[email protected]>
Co-authored-by: Eli Selkin <[email protected]>
Co-authored-by: Nick Sayre <[email protected]>
Co-authored-by: Peri-Ann McLaren <[email protected]>
Co-authored-by: Eli Selkin <[email protected]>
  • Loading branch information
12 people authored Nov 22, 2024
1 parent ea9cb7f commit 934bf91
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
22 changes: 11 additions & 11 deletions src/site/layouts/campaign_landing_page.drupal.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -529,26 +529,26 @@
<!--/ FAQs -->

<!-- Connect with us -->
{% if fieldRelatedOffice.entity.fieldExternalLink.title %}
{% assign socialLinksObject = fieldRelatedOffice.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
{% if fieldConnectWithUs.entity.fieldExternalLink.title %}
{% assign socialLinksObject = fieldConnectWithUs.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
<div class="vads-l-grid-container vads-u-padding-y--3 vads-u-padding-x--4 desktop-lg:vads-u-padding-x--0">
<div class="vads-l-row">
<!-- CONTENT -->
<div class="vads-l-col--12 medium-screen:vads-l-col--9">
<!-- Title -->
<p class="va-u-text-transform--uppercase vads-u-color--gray-medium vads-u-font-size--sm vads-u-margin-bottom--0">Connect with us</p>
<h2 class="vads-u-margin-top--0">Get updates from {{ fieldRelatedOffice.entity.fieldExternalLink.title }}</h2>
<h2 class="vads-u-margin-top--0">Get updates from {{ fieldConnectWithUs.entity.fieldExternalLink.title }}</h2>
</div>
</div>

<div class="vads-l-row medium-screen:vads-u-margin-x--neg1">
{% if fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path and fieldRelatedOffice.entity.fieldEmailUpdatesLink.title %}
{% if fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path and fieldConnectWithUs.entity.fieldEmailUpdatesLink.title %}
<div class="vads-l-col--12 medium-screen:vads-l-col--4">
<div class="vads-u-margin-y--1 medium-screen:vads-u-margin-x--1">
<va-icon icon="mail" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path }}"
text="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.title }}"
href="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path }}"
text="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.title }}"
/>
</div>
</div>
Expand All @@ -560,7 +560,7 @@
<va-icon icon="x" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="https://twitter.com/{{ socialLinksObject.twitter.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} X (formerly Twitter)"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} X (formerly Twitter)"
/>
</div>
</div>
Expand All @@ -572,7 +572,7 @@
<va-icon icon="facebook" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="https://facebook.com/{{ socialLinksObject.facebook.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} Facebook"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} Facebook"
/>
</div>
</div>
Expand All @@ -584,7 +584,7 @@
<va-icon icon="youtube" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="https://youtube.com/{{ socialLinksObject.youtube.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} YouTube"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} YouTube"
/>
</div>
</div>
Expand All @@ -596,7 +596,7 @@
<va-icon icon="linkedin" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="https://linkedin.com/{{ socialLinksObject.linkedin.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} LinkedIn"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} LinkedIn"
/>
</div>
</div>
Expand All @@ -608,7 +608,7 @@
<va-icon icon="instagram" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
<va-link
href="https://instagram.com/{{ socialLinksObject.instagram.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} Instagram"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} Instagram"
/>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions src/site/layouts/landing_page.drupal.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,20 @@
{% endif %}

<!-- Connect with us -->
{% if fieldRelatedOffice != empty and fieldRelatedOffice.entity.fieldExternalLink.title != "Records benefits hub" %}
{% if fieldConnectWithUs != empty and fieldConnectWithUs.entity.fieldExternalLink.title != "Records benefits hub" %}
<va-accordion-item
class="va-accordion-item"
level="2"
header="Connect with us"
bordered
uswds
open="true"
id="{{ fieldRelatedOffice.entity.fieldExternalLink.title | hashReference: 60 }}">
{% if fieldRelatedOffice.entity.fieldExternalLink.url.path != empty %}
id="{{ fieldConnectWithUs.entity.fieldExternalLink.title | hashReference: 60 }}">
{% if fieldConnectWithUs.entity.fieldExternalLink.url.path != empty %}
<h3 class="va-nav-linkslist-list vads-u-font-size--h4">
<va-link
href="{{ fieldRelatedOffice.entity.fieldExternalLink.url.path }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }}"
href="{{ fieldConnectWithUs.entity.fieldExternalLink.url.path }}"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }}"
/>
</h3>
{% endif %}
Expand All @@ -163,16 +163,16 @@
<p>
<va-icon icon="mail" size="3" class="vads-u-color--link-default vads-u-padding-right--0p5"></va-icon>
<va-link
href="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path }}"
text="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.title }}"
href="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path }}"
text="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.title }}"
/>
</p>
</section>

<section>
<h3 class="vads-u-font-size--h4">Follow us</h3>
<ul class="va-nav-linkslist-list social">
{% assign socialLinks = fieldRelatedOffice.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
{% assign socialLinks = fieldConnectWithUs.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
{% assign socialPlatforms = socialLinks | keys %}

{% for socialPlatform in socialPlatforms %}
Expand All @@ -193,7 +193,7 @@
class="vads-u-color--link-default vads-u-padding-right--0p5"></va-icon>
<va-link
href="http://{{ socialPlatform }}.com/{{ socialLink.value }}"
text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} {{ platform | formatSocialPlatform }}"
text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} {{ platform | formatSocialPlatform }}"
>
</va-link>
</li>
Expand All @@ -219,4 +219,4 @@
{% endif %}

{% include "src/site/includes/footer.html" %}
{% include "src/site/includes/debug.drupal.liquid" %}
{% include "src/site/includes/debug.drupal.liquid" %}
4 changes: 2 additions & 2 deletions src/site/stages/build/drupal/graphql/landingPage.graphql.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ const landingPageFragment = `
date
}
fieldTeaserText
fieldRelatedOffice {
fieldConnectWithUs {
entity {
... on NodeOffice {
... on BlockContentConnectWithUs {
fieldExternalLink {
url {
path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@ const nodeCampaignLandingPage = `
... button
}
}
fieldRelatedOffice {
fieldConnectWithUs {
entity {
... on NodeOffice {
... on BlockContentConnectWithUs {
fieldExternalLink {
url {
path
Expand Down

0 comments on commit 934bf91

Please sign in to comment.