From 4bfe12b8b634eb2a855aaac3957760d10eb3717b Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 27 Feb 2025 20:37:16 +0800 Subject: [PATCH 1/6] Add default ID for hubspot form --- src/hooks/useNewsletter.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hooks/useNewsletter.js b/src/hooks/useNewsletter.js index a420b025..79a32be3 100644 --- a/src/hooks/useNewsletter.js +++ b/src/hooks/useNewsletter.js @@ -1,7 +1,9 @@ import version from '../version/version' -const PORTAL_ID = process.env.REACT_APP_HUBSPOT_PORTAL_ID -const FORM_GUID = process.env.REACT_APP_HUBSPOT_FORM_GUID +const PORTAL_ID = process.env.REACT_APP_HUBSPOT_PORTAL_ID || '25945010' +const FORM_GUID = + process.env.REACT_APP_HUBSPOT_FORM_GUID || + '991e2a09-77c2-4428-9242-ebf26bfc6c64' const PAGE_NAME = process.env.NODE_ENV === 'development' From 02cec2b9c16edc3430ce541cd4a86fd6d41a035b Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 27 Feb 2025 20:42:17 +0800 Subject: [PATCH 2/6] Add default .env --- .env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 00000000..966a3456 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +# Hubspot newsletter +REACT_APP_HUBSPOT_PORTAL_ID=25945010 +REACT_APP_HUBSPOT_FORM_GUID=991e2a09-77c2-4428-9242-ebf26bfc6c64 From 4f74594ddb39290bd86bfd634319b5a1739a99b6 Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 27 Feb 2025 20:47:28 +0800 Subject: [PATCH 3/6] Remove defaults from code, use .env only --- src/hooks/useNewsletter.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/hooks/useNewsletter.js b/src/hooks/useNewsletter.js index 79a32be3..a420b025 100644 --- a/src/hooks/useNewsletter.js +++ b/src/hooks/useNewsletter.js @@ -1,9 +1,7 @@ import version from '../version/version' -const PORTAL_ID = process.env.REACT_APP_HUBSPOT_PORTAL_ID || '25945010' -const FORM_GUID = - process.env.REACT_APP_HUBSPOT_FORM_GUID || - '991e2a09-77c2-4428-9242-ebf26bfc6c64' +const PORTAL_ID = process.env.REACT_APP_HUBSPOT_PORTAL_ID +const FORM_GUID = process.env.REACT_APP_HUBSPOT_FORM_GUID const PAGE_NAME = process.env.NODE_ENV === 'development' From 63dfc14ee0920e8d37c4f5f78d45d345f2fc1178 Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 27 Feb 2025 20:59:20 +0800 Subject: [PATCH 4/6] Bump version --- package.json | 2 +- src/version/version.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 20d295a9..4c3d37c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mini-dashboard", - "version": "0.2.17", + "version": "0.2.18", "private": true, "dependencies": { "@meilisearch/instant-meilisearch": "0.24", diff --git a/src/version/version.js b/src/version/version.js index 2a3ee692..393e72eb 100644 --- a/src/version/version.js +++ b/src/version/version.js @@ -1 +1 @@ -export default '0.2.17' +export default '0.2.18' From dd5242c78a7f599ac34f1761247ffc3911085e00 Mon Sep 17 00:00:00 2001 From: Strift Date: Mon, 3 Mar 2025 16:43:08 +0800 Subject: [PATCH 5/6] Add test for email subscription --- cypress/e2e/side-panel.cy.js | 11 +++++++++++ src/components/NewsletterForm.jsx | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cypress/e2e/side-panel.cy.js b/cypress/e2e/side-panel.cy.js index bdca51b3..0a662e22 100644 --- a/cypress/e2e/side-panel.cy.js +++ b/cypress/e2e/side-panel.cy.js @@ -1,3 +1,5 @@ +const WAITING_TIME = Cypress.env('waitingTime') + describe(`Right side panel`, () => { beforeEach(() => { cy.saveApiTokenCookie() @@ -18,4 +20,13 @@ describe(`Right side panel`, () => { cy.get('button[aria-label="Open Panel"]').click() cy.get('[data-testid="right-panel"]').should('be.visible') }) + + it('Should allow subscribing to the newsletter', () => { + cy.get('input[placeholder="Enter your email"]').type('kero@meilisearch.com') + cy.get('button[aria-label="Subscribe"]').click() + cy.wait(WAITING_TIME) + cy.get('[data-testid="right-panel"]').within(() => { + cy.get('p').should('contain', 'Thanks for subscribing!') + }) + }) }) diff --git a/src/components/NewsletterForm.jsx b/src/components/NewsletterForm.jsx index e5fffc55..29793b4c 100644 --- a/src/components/NewsletterForm.jsx +++ b/src/components/NewsletterForm.jsx @@ -127,7 +127,11 @@ const NewsletterForm = () => { required style={{ marginTop: '0rem' }} /> -