From 10ccb76f9163a1587448739c6f62eecb939c7983 Mon Sep 17 00:00:00 2001 From: Barney Laurance Date: Thu, 28 Nov 2024 12:45:54 +0000 Subject: [PATCH 1/3] BG2-2775: Don't adjust CC URL after start of Feb 2025 The implementation we have of this at the moment is specific to 2024 --- src/app/highlight-cards/HighlightCard.spec.ts | 4 ++++ src/app/highlight-cards/HighlightCard.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/highlight-cards/HighlightCard.spec.ts b/src/app/highlight-cards/HighlightCard.spec.ts index 22005e86b..df09bf931 100644 --- a/src/app/highlight-cards/HighlightCard.spec.ts +++ b/src/app/highlight-cards/HighlightCard.spec.ts @@ -113,6 +113,10 @@ describe('highlightCard', () => { }); it('should replace CC24 link with metacampaign page', () => { + if (new Date() > new Date('2025-02-01')) { + pending('Implementation was only made for 2024'); + } + const cardFromApi = cardLinkingTo("https://example-blog.com/christmas-challenge/"); const highlightCardForHomepage = SFAPIHighlightCardToHighlightCard( diff --git a/src/app/highlight-cards/HighlightCard.ts b/src/app/highlight-cards/HighlightCard.ts index 38f6824b8..c398204c3 100644 --- a/src/app/highlight-cards/HighlightCard.ts +++ b/src/app/highlight-cards/HighlightCard.ts @@ -62,7 +62,7 @@ export const SFAPIHighlightCardToHighlightCard = (experienceUriPrefix: string, b let href = replaceURLOrigin(experienceUriPrefix, blogUriPrefix, donateUriPrefix, sfApiHighlightCard.button.href); // temp fix for 2024. Will need to think of something better and probably move this logic to SF for next year. - if (href.pathname.includes('christmas-challenge')) { + if (href.pathname.includes('christmas-challenge') && (new Date() < new Date('2025-02-01'))) { href = new URL(donateUriPrefix + '/christmas-challenge-2024'); } From c4e7cd433a6d47b9ae0b9596d9ea7ddf8aa644d8 Mon Sep 17 00:00:00 2001 From: Noel Light-Hilary Date: Thu, 28 Nov 2024 16:28:19 +0000 Subject: [PATCH 2/3] =?UTF-8?q?DON-1095=20=E2=80=93=20upgrade=20components?= =?UTF-8?q?=20to=20v202411281608.0.0;=20get=20new=20X=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d0bba38c..37701c648 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,8 +21,8 @@ "@angular/platform-server": "^18.2.8", "@angular/router": "^18.2.8", "@angular/ssr": "^18.2.8", - "@biggive/components": "^202411271427.0.0", - "@biggive/components-angular": "^202411271427.0.0", + "@biggive/components": "^202411281608.0.0", + "@biggive/components-angular": "^202411281608.0.0", "@fortawesome/angular-fontawesome": "~0.15.0", "@fortawesome/free-brands-svg-icons": "^6.6.0", "@fortawesome/free-solid-svg-icons": "^6.6.0", @@ -2930,9 +2930,9 @@ } }, "node_modules/@biggive/components": { - "version": "202411271427.0.0", - "resolved": "https://registry.npmjs.org/@biggive/components/-/components-202411271427.0.0.tgz", - "integrity": "sha512-W6EqGHmO0fXYxMm2myNg7aYGXGSh/Odeit6YC56WSyJ1HJ8jSsuA7MkzWkDmmZ4P4gJ71SyV9mKiqz+44QWvzw==", + "version": "202411281608.0.0", + "resolved": "https://registry.npmjs.org/@biggive/components/-/components-202411281608.0.0.tgz", + "integrity": "sha512-bGmT9s98N6VqPEeyULZawT0diR7w8+SpGzrRsl4ijpaAJic2lw+wRX61dnCyFg99piqrV5MMFL6cRzCj7IIB9Q==", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.6.0", @@ -2945,9 +2945,9 @@ } }, "node_modules/@biggive/components-angular": { - "version": "202411271427.0.0", - "resolved": "https://registry.npmjs.org/@biggive/components-angular/-/components-angular-202411271427.0.0.tgz", - "integrity": "sha512-ccr4Yue1nsLtbVqS5SXbPhM4BCFIKWkX/2tsuosVfi4YVxn7oB0QXK+CyyzI1G+ltTWqqgXYxSvpWiHBZNvn0w==", + "version": "202411281608.0.0", + "resolved": "https://registry.npmjs.org/@biggive/components-angular/-/components-angular-202411281608.0.0.tgz", + "integrity": "sha512-C7+K40EFmhrmdre98ZkAHTKg1eeLXHrwFPOAxbIm+GuUsv/+4CChOjYE9rvsP32kbRxm4pISVS4JKBtXUiVASQ==", "dependencies": { "tslib": "^2.6.2" }, diff --git a/package.json b/package.json index c3672e183..4aa7100ba 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "@angular/platform-server": "^18.2.8", "@angular/router": "^18.2.8", "@angular/ssr": "^18.2.8", - "@biggive/components": "^202411271427.0.0", - "@biggive/components-angular": "^202411271427.0.0", + "@biggive/components": "^202411281608.0.0", + "@biggive/components-angular": "^202411281608.0.0", "@fortawesome/angular-fontawesome": "~0.15.0", "@fortawesome/free-brands-svg-icons": "^6.6.0", "@fortawesome/free-solid-svg-icons": "^6.6.0", From 89ced5eebac763dd9c359489f01a010a38ba79eb Mon Sep 17 00:00:00 2001 From: Noel Light-Hilary Date: Thu, 28 Nov 2024 16:28:56 +0000 Subject: [PATCH 3/3] =?UTF-8?q?DON-1095=20=E2=80=93=20use=20x.com=20intent?= =?UTF-8?q?=20format=20directly,=20to=20reduce=20redirects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/donation-thanks/donation-thanks.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/donation-thanks/donation-thanks.component.html b/src/app/donation-thanks/donation-thanks.component.html index 96c8482ae..892655bc6 100644 --- a/src/app/donation-thanks/donation-thanks.component.html +++ b/src/app/donation-thanks/donation-thanks.component.html @@ -205,7 +205,7 @@

Thank you!