From 0cfc81480a798f500ef6ce794607e14163eb5516 Mon Sep 17 00:00:00 2001 From: PedroAntunesCosta <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:52:36 -0300 Subject: [PATCH 1/7] feat: link new feedback form --- src/utils/get-url.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/get-url.tsx b/src/utils/get-url.tsx index 5cf5ba6ee..112834b6a 100644 --- a/src/utils/get-url.tsx +++ b/src/utils/get-url.tsx @@ -1,5 +1,5 @@ export const getFeedbackURL = () => { - return `https://docs.google.com/forms/d/e/1FAIpQLSfmnotPvPjw-SjiE7lt2Nt3RQgNUe10ixXZmuO2v9enOJReoQ/viewform?entry.1972292648=developers.vtex.com&entry.1799503232=` + return `https://docs.google.com/forms/d/e/1FAIpQLSejjkI4aRPadDn0C9EKa-_mESUWPjwoS6yMTN8KA9PPCLfcfA/viewform?usp=pp_url&entry.1077155995=` } export const getGithubURL = () => { From abd85e68fd62cfb0611b9e084c522dd2ebf8644b Mon Sep 17 00:00:00 2001 From: PedroAntunesCosta <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:54:22 -0300 Subject: [PATCH 2/7] feat(footer): add url autofill param to the feedback form link --- src/components/footer/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/footer/index.tsx b/src/components/footer/index.tsx index d0a5b3d36..83071d784 100644 --- a/src/components/footer/index.tsx +++ b/src/components/footer/index.tsx @@ -1,4 +1,5 @@ import { Box, FooterLanding } from '@vtex/brand-ui' +import { useRouter } from 'next/router' import { getMessages } from 'utils/get-messages' import styles from './styles' import { @@ -9,6 +10,8 @@ import { } from 'utils/get-url' const messages = getMessages() +const router = useRouter() +const currentPage = router.asPath.split('?')[0] const links = [ { @@ -25,7 +28,7 @@ const links = [ }, { message: messages['landing_page_footer_feedback.message'], - to: () => getFeedbackURL(), + to: () => `${getFeedbackURL()}https://developers.vtex.com${currentPage}`, }, ] From 3e0ed61d36a18452e03de849a97241ea6e0f2453 Mon Sep 17 00:00:00 2001 From: PedroAntunesCosta <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:56:06 -0300 Subject: [PATCH 3/7] feat(header): add url autofill to feedback form link --- src/components/header/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/header/index.tsx b/src/components/header/index.tsx index 9fa75c3b6..3d94225b7 100644 --- a/src/components/header/index.tsx +++ b/src/components/header/index.tsx @@ -30,6 +30,7 @@ interface Props { const Header = ({ isEditor }: Props) => { const router = useRouter() const isBranchPreview = router.isPreview + const currentPage = router.asPath.split('?')[0] const { branchPreview } = useContext(PreviewContext) @@ -153,7 +154,7 @@ const Header = ({ isEditor }: Props) => { From ac39b54e72f0267626dbd9b4dfa611ece55c5fda Mon Sep 17 00:00:00 2001 From: Pedro Antunes <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:16:39 -0300 Subject: [PATCH 4/7] fix(feedback url): change feedback url to new form --- src/pages/404.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 4c0da88ab..27cecb639 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -8,14 +8,19 @@ import getNavigation from 'utils/getNavigation' import { GetStaticProps } from 'next' import { useContext } from 'react' import { PreviewContext } from 'utils/contexts/preview' +import { getFeedbackURL } from 'utils/get-url' +import { useRouter } from 'next/router' interface Props { branch: string } const FourOhFour: Page = ({ branch }) => { + const router = useRouter() const { setBranchPreview } = useContext(PreviewContext) setBranchPreview(branch) + const currentPage = router.asPath.split('?')[0] + const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}` return ( <> @@ -34,10 +39,7 @@ const FourOhFour: Page = ({ branch }) => { error. From c18c06e1d046ef399af49d86ab0b5d22ffea5a6a Mon Sep 17 00:00:00 2001 From: Pedro Antunes <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:19:01 -0300 Subject: [PATCH 5/7] fix(500 page): change feedback url to new form --- src/pages/500.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/500.tsx b/src/pages/500.tsx index a31b0cb64..17b7f3b15 100644 --- a/src/pages/500.tsx +++ b/src/pages/500.tsx @@ -8,14 +8,19 @@ import { GetStaticProps } from 'next' import getNavigation from 'utils/getNavigation' import { useContext } from 'react' import { PreviewContext } from 'utils/contexts/preview' +import { getFeedbackURL } from 'utils/get-url' +import { useRouter } from 'next/router' interface Props { branch: string } const fiveHundredPage: Page = ({ branch }) => { + const router = useRouter() const { setBranchPreview } = useContext(PreviewContext) setBranchPreview(branch) + const currentPage = router.asPath.split('?')[0] + const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}` return ( <> @@ -31,10 +36,7 @@ const fiveHundredPage: Page = ({ branch }) => { contact us if the problem persists. From c9831f2a62ce5997d14a17be00e3c44ee22ace5d Mon Sep 17 00:00:00 2001 From: Pedro Antunes <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:49:06 -0300 Subject: [PATCH 6/7] fix(404 page): add pre filled error to feedback form url --- src/pages/404.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 27cecb639..c96cbe097 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -20,7 +20,7 @@ const FourOhFour: Page = ({ branch }) => { const { setBranchPreview } = useContext(PreviewContext) setBranchPreview(branch) const currentPage = router.asPath.split('?')[0] - const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}` + const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}&entry.358925425=Page+not+found` return ( <> From bb80c3bff2bfae4bcbe3b678e6e22de22e4dc174 Mon Sep 17 00:00:00 2001 From: Pedro Antunes <47991446+PedroAntunesCosta@users.noreply.github.com> Date: Thu, 13 Feb 2025 20:49:47 -0300 Subject: [PATCH 7/7] fix(500 page): add pre filled error to feedback form url --- src/pages/500.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/500.tsx b/src/pages/500.tsx index 17b7f3b15..2289447b5 100644 --- a/src/pages/500.tsx +++ b/src/pages/500.tsx @@ -20,7 +20,7 @@ const fiveHundredPage: Page = ({ branch }) => { const { setBranchPreview } = useContext(PreviewContext) setBranchPreview(branch) const currentPage = router.asPath.split('?')[0] - const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}` + const feedbackUrl = `${getFeedbackURL()}https://developers.vtex.com${currentPage}&entry.358925425=Site+error` return ( <>