Skip to content

Commit

Permalink
Fixes missing href for register button (#621)
Browse files Browse the repository at this point in the history
Co-authored-by: mreed-maphabit <mreed@maphabit.com>
  • Loading branch information
mreed101 and mreed-maphabit authored Jul 29, 2024
1 parent 21ca016 commit cf3b8b6
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 66 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
"@types/react-dom": "^18.2.18",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.5.0",
"@typescript-eslint/parser": "^7.17.0",
"axe-core": "^4.8.4",
"debug": "^4.3.4",
"eslint": "8.57.0",
"eslint-config-next": "^14.1.4",
"eslint-config-next": "^14.2.5",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-jest-dom": "^5.2.0",
Expand Down
2 changes: 2 additions & 0 deletions src/templates/layouts/event/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ describe('<Event /> Component', () => {
},
link: {
url: { path: '/event-link' },
uri: '/event-link',
title: 'A title',
},
urlOfOnlineEvent: {
uri: '/online-event',
Expand Down
9 changes: 3 additions & 6 deletions src/templates/layouts/event/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export const Event = ({

{/* CTA */}
{(link || additionalInfo || eventCTA) && (
<div className="registration vads-u-margin-top--4 vads-u-margin-bottom--1">
<div className="registration vads-u-margin-top--4 vads-u-margin-bottom--1 vads-u-padding-x--1p5 medium-screen:vads-u-padding--0">
{isEventInPast(mostRecentDate?.value) ? (
<p className="vads-u-margin--0 vads-u-color--secondary vads-u-font-weight--bold">
This event already happened.
Expand All @@ -218,10 +218,7 @@ export const Event = ({
<>
{link && (
<p className="vads-u-margin--0">
<a
className="vads-c-action-link--green"
href={link?.url?.path}
>
<a className="vads-c-action-link--green" href={link?.uri}>
{eventCTA
? eventCTA.charAt(0).toUpperCase() + eventCTA.slice(1)
: 'More details'}
Expand All @@ -238,7 +235,7 @@ export const Event = ({
emailCTA,
title,
mostRecentDate,
link?.url?.path
link?.uri
)}
>
{eventCTA && formatEventCTA(eventCTA)}
Expand Down
2 changes: 2 additions & 0 deletions src/types/drupal/field_type.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export interface FieldNestedLink {
url: {
path: string
}
uri: string
title: string
}

export interface FieldDateTimeRange {
Expand Down
2 changes: 2 additions & 0 deletions src/types/formatted/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ interface Link {
url: {
path: string
}
uri: string
title: string
}

export type Event = PublishedEntity & {
Expand Down
116 changes: 58 additions & 58 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2651,12 +2651,12 @@ __metadata:
languageName: node
linkType: hard

"@next/eslint-plugin-next@npm:14.2.3":
version: 14.2.3
resolution: "@next/eslint-plugin-next@npm:14.2.3"
"@next/eslint-plugin-next@npm:14.2.5":
version: 14.2.5
resolution: "@next/eslint-plugin-next@npm:14.2.5"
dependencies:
glob: 10.3.10
checksum: f149344f0f347e02a7d2302c0e318a42a565e6930cd7a72b4681e157a0aa2c5079d2c5cf019b9b58a1e19ff5a3fe273fd80d53add8b3c1a9fe5b7ed70d70ae4a
checksum: fe0233a03382b46c67b022fa5e5d905911eecc7ce303bf60b884a9bdd436f8b3218bd0484d52bbe40bf2c6668f223246a1c4a620e0c1686002c178ff0b444c0b
languageName: node
linkType: hard

Expand Down Expand Up @@ -5120,21 +5120,21 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^7.5.0":
version: 7.11.0
resolution: "@typescript-eslint/parser@npm:7.11.0"
"@typescript-eslint/parser@npm:^7.17.0":
version: 7.17.0
resolution: "@typescript-eslint/parser@npm:7.17.0"
dependencies:
"@typescript-eslint/scope-manager": 7.11.0
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/typescript-estree": 7.11.0
"@typescript-eslint/visitor-keys": 7.11.0
"@typescript-eslint/scope-manager": 7.17.0
"@typescript-eslint/types": 7.17.0
"@typescript-eslint/typescript-estree": 7.17.0
"@typescript-eslint/visitor-keys": 7.17.0
debug: ^4.3.4
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 630c912555b4952b2daee02b66b81a55ac2d2566f37e4aff767968e1dc161bcda5e09ff2860ddf80d46761643f18c0a993c336506f0a34cc33a5315321afa23b
checksum: f0525317af174b5547d0a7ed8eadbbb7bbc1da9e9ab86882ed616b0ffb053170818a48cab2aaa627001ee991ee559630fbe5ad632b3df7cdf4a2b1b07a571907
languageName: node
linkType: hard

Expand All @@ -5158,16 +5158,6 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/scope-manager@npm:7.11.0"
dependencies:
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/visitor-keys": 7.11.0
checksum: c3fbf6c091b418a79cc3eb671184b83eaa26c06766aa78b4f32234d366f1130271317525b0b3bc38670195e4c608df049ae400cc343f6afa6104b2eec1bbb577
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.16.1":
version: 7.16.1
resolution: "@typescript-eslint/scope-manager@npm:7.16.1"
Expand All @@ -5178,6 +5168,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.17.0":
version: 7.17.0
resolution: "@typescript-eslint/scope-manager@npm:7.17.0"
dependencies:
"@typescript-eslint/types": 7.17.0
"@typescript-eslint/visitor-keys": 7.17.0
checksum: 0cb77db6243455b47947df693d9b16f8e2b07e14994d755918dcc98693dba97036806d8f80a12bbd5c82f61883d134dd42d25880f20448c1e2376a9d873f9ef8
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:7.2.0":
version: 7.2.0
resolution: "@typescript-eslint/scope-manager@npm:7.2.0"
Expand Down Expand Up @@ -5219,20 +5219,20 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/types@npm:7.11.0"
checksum: 1c2cf1540f08240e12da522fe3b23054adaffc7c5a82eb0fc94b982454ba527358f00c018fba06826ad42708fcb73237f823891d4d3bf18faa5cabee37cd76d4
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.16.1":
version: 7.16.1
resolution: "@typescript-eslint/types@npm:7.16.1"
checksum: 5fbcf214deda21fc3e0eaab8052d5f7bf30830bbb2c7fff93d39111091bf74fafc9afad2974937ae96b67e92e508c400c9108b4fa98761411db1c1e5aff19642
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.17.0":
version: 7.17.0
resolution: "@typescript-eslint/types@npm:7.17.0"
checksum: efd4fadf8f3f2496d813338f873564b903fbaaff53f3ce496159c76d49e01f6e2dbbf037f5e7318d0292cca7b6191c8f8462fa31cba1b5c50a11676bbb5df9ba
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.2.0":
version: 7.2.0
resolution: "@typescript-eslint/types@npm:7.2.0"
Expand Down Expand Up @@ -5277,12 +5277,12 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/typescript-estree@npm:7.11.0"
"@typescript-eslint/typescript-estree@npm:7.16.1":
version: 7.16.1
resolution: "@typescript-eslint/typescript-estree@npm:7.16.1"
dependencies:
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/visitor-keys": 7.11.0
"@typescript-eslint/types": 7.16.1
"@typescript-eslint/visitor-keys": 7.16.1
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
Expand All @@ -5292,16 +5292,16 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 026e857152874764c18a4f3a7b443f4fc757cf3e1d106f85df9d283205f6b2192ec3d771d71dddd77d1f15df61fb99e3a65e661c5fe39793462050d425463f33
checksum: 2557c21f0645f9150020821db500b6be367f83e7e80be87fb04fcc7e2e0d5e5b8f413107873cf05485a4c5516f0cadc9b7754fa5b459a451effc98ccf27f4ce6
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:7.16.1":
version: 7.16.1
resolution: "@typescript-eslint/typescript-estree@npm:7.16.1"
"@typescript-eslint/typescript-estree@npm:7.17.0":
version: 7.17.0
resolution: "@typescript-eslint/typescript-estree@npm:7.17.0"
dependencies:
"@typescript-eslint/types": 7.16.1
"@typescript-eslint/visitor-keys": 7.16.1
"@typescript-eslint/types": 7.17.0
"@typescript-eslint/visitor-keys": 7.17.0
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
Expand All @@ -5311,7 +5311,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 2557c21f0645f9150020821db500b6be367f83e7e80be87fb04fcc7e2e0d5e5b8f413107873cf05485a4c5516f0cadc9b7754fa5b459a451effc98ccf27f4ce6
checksum: 0f7a7618431c94603c742d1bcb1cb3a5aa646a6ebb3adff89b35db1fe014f9a060d550e6ca5f0ab152615ae129e8a0f84020dda56cd2d2c73386f657dccf7e34
languageName: node
linkType: hard

Expand Down Expand Up @@ -5386,16 +5386,6 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/visitor-keys@npm:7.11.0"
dependencies:
"@typescript-eslint/types": 7.11.0
eslint-visitor-keys: ^3.4.3
checksum: 5f1170c1e3110c53b5433949f98079d8bbc8a4334dfef96c802a6df6d475e187796180f844edcff0928a5c2ae5da4babcb5f50c658f61c6fb940efda7457a433
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.16.1":
version: 7.16.1
resolution: "@typescript-eslint/visitor-keys@npm:7.16.1"
Expand All @@ -5406,6 +5396,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.17.0":
version: 7.17.0
resolution: "@typescript-eslint/visitor-keys@npm:7.17.0"
dependencies:
"@typescript-eslint/types": 7.17.0
eslint-visitor-keys: ^3.4.3
checksum: fae45049d06c15473784fc442271a9ebab1d1139246d47f185645a64407669c85c7519ef083886d74c921e34fcc68889f35caa858b345469d8bb26eb9f26728e
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.2.0":
version: 7.2.0
resolution: "@typescript-eslint/visitor-keys@npm:7.2.0"
Expand Down Expand Up @@ -8897,11 +8897,11 @@ __metadata:
languageName: node
linkType: hard

"eslint-config-next@npm:^14.1.4":
version: 14.2.3
resolution: "eslint-config-next@npm:14.2.3"
"eslint-config-next@npm:^14.2.5":
version: 14.2.5
resolution: "eslint-config-next@npm:14.2.5"
dependencies:
"@next/eslint-plugin-next": 14.2.3
"@next/eslint-plugin-next": 14.2.5
"@rushstack/eslint-patch": ^1.3.3
"@typescript-eslint/parser": ^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0
eslint-import-resolver-node: ^0.3.6
Expand All @@ -8916,7 +8916,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 512bc0c21c189d086a6aa1f01fbb3b1d4ee62c017670a5bbf6b0fa9b44ad2b61047364d9b0800ec25f6208364090d87a20b513e65902367e795f33327c09e023
checksum: 3c362f080775541e936a5f2d273ffc63ed177b6cbb45a80d25efa2857e8eb265250ad9f60c2e3d940f4e565ec49ddc6c9885f2b7260c550aae77237620df9420
languageName: node
linkType: hard

Expand Down Expand Up @@ -13339,7 +13339,7 @@ __metadata:
"@types/react-gtm-module": ^2.0.3
"@types/uuid": ^9.0.7
"@typescript-eslint/eslint-plugin": ^7.16.1
"@typescript-eslint/parser": ^7.5.0
"@typescript-eslint/parser": ^7.17.0
axe-core: ^4.8.4
axios: ^1.6.3
chalk: ^5.3.0
Expand All @@ -13349,7 +13349,7 @@ __metadata:
drupal-jsonapi-params: ^2.3.1
env-loader: 0.1.0
eslint: 8.57.0
eslint-config-next: ^14.1.4
eslint-config-next: ^14.2.5
eslint-config-prettier: ^9.1.0
eslint-plugin-jest: ^27.9.0
eslint-plugin-jest-dom: ^5.2.0
Expand Down

0 comments on commit cf3b8b6

Please sign in to comment.