Skip to content

Commit

Permalink
Squashed commit of the following: state-enhancement
Browse files Browse the repository at this point in the history 
commit 330cd03
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Wed Oct 23 10:25:18 2024 -0600

    VOTE-2972 additional check reg box (#1060)

commit 88cf019
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Wed Oct 23 07:11:09 2024 -0600

    VOTE-3020 Reenable the NVRF details field in the state override content (#1065)

commit f83098b
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Tue Oct 22 11:31:43 2024 -0400

    Vote-2958: No mail registration block (#1058)

    * update to twig template

    * Update to config

    * updated no mail to have nvrf render if checked

    * VOTE-2958 Fix the mail deadline replacement

    * VOTE-2958 Use state name var with capital letter

    ---------

    Co-authored-by: SamiraMSadat <samira.sadat@gsa.gov>

commit a110d94
Author: Mandy Lloyd <amanda.lloyd@gsa.gov>
Date:   Fri Oct 18 20:18:59 2024 -0400

    VOTE-2880/2881: Configure and style call out box (#1047)

commit f1a9963
Merge: 284b521 fbc4145
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Fri Oct 18 17:16:15 2024 -0700

    Merge remote-tracking branch 'origin/dev' into state-enhancement

commit fbc4145
Merge: 218a142 bb38a76
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Fri Oct 18 11:29:46 2024 -0700

    Merge pull request #1052 from usagov/stage

    VOTE-2993 HOTFIX release merge to DEV

commit 284b521
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Fri Oct 18 10:41:03 2024 -0400

    Vote-2959: Deprecate Registration Intro Field (#1056)

    * Update to twig templete

    * Update to config

    ---------

    Co-authored-by: SamiraMSadat <samira.sadat@gsa.gov>

commit 939de51
Author: SamiraMSadat <samira.sadat@gsa.gov>
Date:   Fri Oct 18 08:39:20 2024 -0600

    HOTFIX - Restore registration type variables

commit b3a5941
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Thu Oct 17 15:36:31 2024 -0400

    Vote-2957: No Online Registration (#1054)

    * add placeholder for no online reg

    * Updating twig template

    * Update to config for  new field

commit 218a142
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Thu Oct 17 12:36:54 2024 -0400

    Vote-2979: Chinese Simplified String Updates (#1053)

    * zh-hans string updates

    * VOTE-2979 Fix titles

    ---------

    Co-authored-by: SamiraMSadat <samira.sadat@gsa.gov>

commit bb38a76
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Wed Oct 16 07:10:40 2024 -0700

    VOTE-2993 update nvrf data asset directory location
    Update NVRF to v0.18.2

commit 8b38dcc
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Tue Oct 15 16:02:50 2024 -0400

    Vote-2990: Link Style Update to Emergency Banner (#1046)

commit 68f40b9
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Tue Oct 15 13:41:56 2024 -0400

    Vote-2978: Config for Override NVRF field (#1045)

    * Updating twing file for some clean up

    * Update to config for new NVRF override field

commit 78826db
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 14 09:32:49 2024 -0400

    Vote-2977: Bump @uswds/uswds from 3.8.2 to 3.9.0

commit 4975b65
Merge: e40282c 3a41fba
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Thu Oct 10 16:10:13 2024 -0700

    Merge pull request #1043 from usagov/dev

    Sprint 69 HOTFIX Release to Stage

commit 3a41fba
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Thu Oct 10 17:33:28 2024 -0400

    Vote-2826: Migrate Cypress Backend Test to Page Objects (#1041)

    * init work

    * saving work - footer menu

    * adding data-test attribute to twig file

    * update to cypress tests

commit af7a011
Author: Mandy Lloyd <amanda.lloyd@gsa.gov>
Date:   Thu Oct 10 16:56:24 2024 -0400

    VOTE-2965: Fix body text wrap (#1038)

commit d0016aa
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Thu Oct 10 14:24:16 2024 -0600

    Update NVRF to v0.18.1 (#1042)

commit 9a3d932
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Thu Oct 10 15:39:15 2024 -0400

    Vote-2887: Config for Outside US Info Card (#1040)

commit 2acf5df
Author: Daniel Crowder <daniel.crowder@gsa.gov>
Date:   Wed Oct 9 17:51:24 2024 -0400

    VOTE-2462 & VOTE-2460: Document steps for drupal core and module updates. Update list of custom m… (#1031)

commit 570529c
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Wed Oct 9 06:17:48 2024 -0700

    VOTE-2885 configure state mail registration section (#1039)

commit 926fd75
Author: Mandy Lloyd <amanda.lloyd@gsa.gov>
Date:   Tue Oct 8 13:49:08 2024 -0400

    VOTE-2888: Configure in-page navigation (#1026)

    * VOTE-2888: Configure in-page nav on stage page

    * make aside block empty on not needed template

commit 5a0150f
Merge: 87873bb 18ab113
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Tue Oct 8 10:26:17 2024 -0700

    Merge remote-tracking branch 'origin/dev' into state-enhancement

commit 87873bb
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Mon Oct 7 14:09:23 2024 -0600

    VOTE-2884 Configure the display of online reg card (#1035)

commit b103f80
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Fri Oct 4 12:55:36 2024 -0600

    VOTE-2883 Election date display (#1025)

commit d821f0a
Author: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com>
Date:   Fri Oct 4 09:54:31 2024 -0600

    VOTE-2886 state enhancement in person (#1028)

commit f9e5279
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Wed Oct 2 12:50:18 2024 -0700

    VOTE-2882 refine fallbacks for the state display content (#1024)

commit 9d9b28b
Author: Ray Estrada <raymond.estrada@gsa.gov>
Date:   Wed Oct 2 10:46:49 2024 -0700

    VOTE-2882 display intro or not needed state content (#1023)

commit bdeba7f
Author: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com>
Date:   Tue Oct 1 11:18:27 2024 -0400

    Vote-2878: add new Info Card Component (#1014)
  • Loading branch information
@rayestrada
rayestrada committed Oct 29, 2024
1 parent cd93b0e commit 1b4ccf5
Show file tree
Hide file tree
Showing 53 changed files with 1,246 additions and 415 deletions.
85 changes: 64 additions & 21 deletions config/sync/core.entity_form_display.block_content.state_display_content.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ dependencies:
- field.field.block_content.state_display_content.field_in_person_registration
- field.field.block_content.state_display_content.field_mail_registration
- field.field.block_content.state_display_content.field_military_and_overseas_regi
- field.field.block_content.state_display_content.field_no_mail_registration
- field.field.block_content.state_display_content.field_no_online_registration
- field.field.block_content.state_display_content.field_nvrf_details
- field.field.block_content.state_display_content.field_online_registration
- field.field.block_content.state_display_content.field_registration_intro
- field.field.block_content.state_display_content.field_registration_not_needed
module:
- allowed_formats
Expand All @@ -27,9 +28,13 @@ mode: default
content:
field_check_registration:
type: vote_fields_state_content
weight: 3
weight: 2
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_display_title:
type: string_textfield
Expand All @@ -41,13 +46,13 @@ content:
third_party_settings: { }
field_election_date:
type: datetime_default
weight: 10
weight: 11
region: content
settings: { }
third_party_settings: { }
field_election_text:
type: text_textarea
weight: 11
weight: 12
region: content
settings:
rows: 3
Expand All @@ -58,45 +63,83 @@ content:
hide_guidelines: '0'
field_in_person_registration:
type: vote_fields_state_content
weight: 7
weight: 8
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_mail_registration:
type: vote_fields_state_content
weight: 5
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_military_and_overseas_regi:
type: vote_fields_state_content
weight: 8
weight: 9
region: content
settings: { }
settings:
form_subfield_display:
heading: heading
text: text
link_text: 0
third_party_settings: { }
field_nvrf_details:
field_no_mail_registration:
type: vote_fields_state_content
weight: 6
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_online_registration:
field_no_online_registration:
type: vote_fields_state_content
weight: 4
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_registration_intro:
field_nvrf_details:
type: vote_fields_state_content
weight: 2
weight: 7
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_online_registration:
type: vote_fields_state_content
weight: 3
region: content
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_registration_not_needed:
type: vote_fields_state_content
weight: 9
weight: 10
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
info:
type: string_textfield
Expand All @@ -108,13 +151,13 @@ content:
third_party_settings: { }
langcode:
type: language_select
weight: 13
weight: 14
region: content
settings:
include_locked: true
third_party_settings: { }
translation:
weight: 12
weight: 13
region: content
settings: { }
third_party_settings: { }
Expand Down
61 changes: 45 additions & 16 deletions config/sync/core.entity_form_display.node.state_territory.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies:
- field.field.node.state_territory.field_metatags
- field.field.node.state_territory.field_military_and_overseas_regi
- field.field.node.state_territory.field_more_info_link
- field.field.node.state_territory.field_nvrf_details
- field.field.node.state_territory.field_nvrf_fields
- field.field.node.state_territory.field_nvrf_last_updated_date
- field.field.node.state_territory.field_of_state_name
Expand All @@ -42,7 +43,6 @@ dependencies:
- field.field.node.state_territory.field_personal_information_inst
- field.field.node.state_territory.field_political_party_inst
- field.field.node.state_territory.field_reg_eligibility_desc
- field.field.node.state_territory.field_registration_intro
- field.field.node.state_territory.field_registration_link
- field.field.node.state_territory.field_registration_not_needed
- field.field.node.state_territory.field_registration_type
Expand Down Expand Up @@ -228,6 +228,7 @@ third_party_settings:
- field_registration_intro
- field_online_registration
- field_mail_registration
- field_nvrf_details
- field_in_person_registration
- field_military_and_overseas_regi
- field_registration_not_needed
Expand Down Expand Up @@ -277,7 +278,11 @@ content:
type: vote_fields_state_content
weight: 12
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_confirm_registration_link:
type: link_default
Expand Down Expand Up @@ -368,9 +373,13 @@ content:
third_party_settings: { }
field_in_person_registration:
type: vote_fields_state_content
weight: 16
weight: 17
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_in_state_name:
type: string_textfield
Expand Down Expand Up @@ -403,7 +412,11 @@ content:
type: vote_fields_state_content
weight: 15
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_mail_registration_link:
type: link_default
Expand Down Expand Up @@ -438,9 +451,13 @@ content:
third_party_settings: { }
field_military_and_overseas_regi:
type: vote_fields_state_content
weight: 17
weight: 18
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_more_info_link:
type: link_default
Expand All @@ -450,6 +467,16 @@ content:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
field_nvrf_details:
type: vote_fields_state_content
weight: 16
region: content
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_nvrf_fields:
type: field_nvrf_fields
weight: 22
Expand Down Expand Up @@ -497,7 +524,11 @@ content:
type: vote_fields_state_content
weight: 14
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_override_confirm_reg_link:
type: link_default
Expand Down Expand Up @@ -571,12 +602,6 @@ content:
rows: 5
placeholder: ''
third_party_settings: { }
field_registration_intro:
type: vote_fields_state_content
weight: 13
region: content
settings: { }
third_party_settings: { }
field_registration_link:
type: link_default
weight: 6
Expand All @@ -587,9 +612,13 @@ content:
third_party_settings: { }
field_registration_not_needed:
type: vote_fields_state_content
weight: 18
weight: 19
region: content
settings: { }
settings:
form_subfield_display:
- heading
- text
- link_text
third_party_settings: { }
field_registration_type:
type: options_buttons
Expand Down
24 changes: 16 additions & 8 deletions config/sync/core.entity_view_display.block_content.state_display_content.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ dependencies:
- field.field.block_content.state_display_content.field_in_person_registration
- field.field.block_content.state_display_content.field_mail_registration
- field.field.block_content.state_display_content.field_military_and_overseas_regi
- field.field.block_content.state_display_content.field_no_mail_registration
- field.field.block_content.state_display_content.field_no_online_registration
- field.field.block_content.state_display_content.field_nvrf_details
- field.field.block_content.state_display_content.field_online_registration
- field.field.block_content.state_display_content.field_registration_intro
- field.field.block_content.state_display_content.field_registration_not_needed
module:
- datetime
Expand Down Expand Up @@ -44,7 +45,7 @@ content:
label: above
settings:
timezone_override: ''
format_type: medium
format_type: long_date
third_party_settings: { }
weight: 10
region: content
Expand Down Expand Up @@ -76,26 +77,33 @@ content:
third_party_settings: { }
weight: 8
region: content
field_nvrf_details:
field_no_mail_registration:
type: vote_fields_state_content_default
label: above
settings: { }
third_party_settings: { }
weight: 6
weight: 13
region: content
field_online_registration:
field_no_online_registration:
type: vote_fields_state_content_default
label: above
settings: { }
third_party_settings: { }
weight: 4
weight: 12
region: content
field_registration_intro:
field_nvrf_details:
type: vote_fields_state_content_default
label: above
settings: { }
third_party_settings: { }
weight: 3
weight: 6
region: content
field_online_registration:
type: vote_fields_state_content_default
label: above
settings: { }
third_party_settings: { }
weight: 4
region: content
field_registration_not_needed:
type: vote_fields_state_content_default
Expand Down
Loading

0 comments on commit 1b4ccf5

Please sign in to comment.