From c5ab658228a08d651c63067df35cd75acb114c3e Mon Sep 17 00:00:00 2001 From: Noah Onyejese <129368606+noahonyejese@users.noreply.github.com> Date: Fri, 6 Dec 2024 06:48:31 +0100 Subject: [PATCH 1/7] fix: Changed IXT support email from cc to bcc --- app/docs/homepage.docs.mdx | 4 ++-- app/docs/homepage.stories.tsx | 4 ++-- app/login/components/login-menu.tsx | 4 ++-- app/static-pages/de/index.mdx | 6 +++--- app/static-pages/en/index.mdx | 6 +++--- app/static-pages/fr/index.mdx | 6 +++--- app/static-pages/it/index.mdx | 6 +++--- app/templates/email/index.ts | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/docs/homepage.docs.mdx b/app/docs/homepage.docs.mdx index 4f054848d..60536675b 100644 --- a/app/docs/homepage.docs.mdx +++ b/app/docs/homepage.docs.mdx @@ -65,7 +65,7 @@ import { Contribute, Examples, Intro, Tutorial, Newsletter, BugReport, FeatureRe buttonUrl={createMailtoLink("en", { recipients: { to: "visualize@bafu.admin.ch", - cc: "supprt@interactivethings.com", + bcc: "supprt@interactivethings.com", }, template: featureRequestTemplates, subject: "Visualize Feature Request", @@ -78,7 +78,7 @@ import { Contribute, Examples, Intro, Tutorial, Newsletter, BugReport, FeatureRe buttonUrl={createMailtoLink("en", { recipients: { to: "visualize@bafu.admin.ch", - cc: "supprt@interactivethings.com", + bcc: "supprt@interactivethings.com", }, template: bugReportTemplates, subject: "Visualize Bug Report", diff --git a/app/docs/homepage.stories.tsx b/app/docs/homepage.stories.tsx index ccd8ec845..0e98025a2 100644 --- a/app/docs/homepage.stories.tsx +++ b/app/docs/homepage.stories.tsx @@ -75,7 +75,7 @@ const HomepageStory = { buttonUrl={createMailtoLink("en", { recipients: { to: "visualize@bafu.admin.ch", - cc: "supprt@interactivethings.com", + bcc: "supprt@interactivethings.com", }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -89,7 +89,7 @@ const HomepageStory = { buttonUrl={createMailtoLink("en", { recipients: { to: "visualize@bafu.admin.ch", - cc: "supprt@interactivethings.com", + bcc: "supprt@interactivethings.com", }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/login/components/login-menu.tsx b/app/login/components/login-menu.tsx index ab4166cde..19c8de8ab 100644 --- a/app/login/components/login-menu.tsx +++ b/app/login/components/login-menu.tsx @@ -153,7 +153,7 @@ const Feedback = ({ href={createMailtoLink(locale, { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -170,7 +170,7 @@ const Feedback = ({ href={createMailtoLink(locale, { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/static-pages/de/index.mdx b/app/static-pages/de/index.mdx index 5ff8d8b44..4e259316b 100644 --- a/app/static-pages/de/index.mdx +++ b/app/static-pages/de/index.mdx @@ -47,7 +47,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("de", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: newsletterTemplates, subject: "Visualize Newsletter Abonnieren", @@ -66,7 +66,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("de", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -84,7 +84,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("de", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/static-pages/en/index.mdx b/app/static-pages/en/index.mdx index 9efccf4e2..84e79b549 100644 --- a/app/static-pages/en/index.mdx +++ b/app/static-pages/en/index.mdx @@ -47,7 +47,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("en", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: newsletterTemplates, subject: "Visualize Newsletter Subscribe", @@ -66,7 +66,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("en", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -84,7 +84,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("en", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/static-pages/fr/index.mdx b/app/static-pages/fr/index.mdx index 3f72e039b..075af98f5 100644 --- a/app/static-pages/fr/index.mdx +++ b/app/static-pages/fr/index.mdx @@ -47,7 +47,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("fr", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: newsletterTemplates, subject: "Visualize Newsletter Abonnement", @@ -66,7 +66,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("fr", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -84,7 +84,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("fr", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/static-pages/it/index.mdx b/app/static-pages/it/index.mdx index d3567cb1d..4d0b22274 100644 --- a/app/static-pages/it/index.mdx +++ b/app/static-pages/it/index.mdx @@ -48,7 +48,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("it", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: newsletterTemplates, subject: "Visualize Newsletter Iscrizione", @@ -67,7 +67,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("it", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: bugReportTemplates, subject: "Visualize Bug Report", @@ -85,7 +85,7 @@ export const contentId = "home"; buttonUrl={createMailtoLink("it", { recipients: { to: OWNER_ORGANIZATION_EMAIL, - cc: SUPPORT_EMAIL, + bcc: SUPPORT_EMAIL, }, template: featureRequestTemplates, subject: "Visualize Feature Request", diff --git a/app/templates/email/index.ts b/app/templates/email/index.ts index a1726e278..4decce43b 100644 --- a/app/templates/email/index.ts +++ b/app/templates/email/index.ts @@ -2,7 +2,7 @@ import { bugReportTemplates } from "./bug-report"; type EmailRecipients = { to: string; - cc: string; + bcc: string; }; export const createMailtoLink = ( @@ -14,8 +14,8 @@ export const createMailtoLink = ( } ) => { const template = options.template[lang]; - return `mailto:${options.recipients.to}?cc=${ - options.recipients.cc + return `mailto:${options.recipients.to}?bcc=${ + options.recipients.bcc }&subject=${encodeURIComponent(options.subject)}&body=${encodeURIComponent( template )}`; From 4e716b7a80166fbd47646b09b91a0053c9d2e6c3 Mon Sep 17 00:00:00 2001 From: Noah Onyejese <129368606+noahonyejese@users.noreply.github.com> Date: Fri, 6 Dec 2024 06:48:45 +0100 Subject: [PATCH 2/7] fix: Changed italien Newsletter translations --- app/static-pages/it/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/static-pages/it/index.mdx b/app/static-pages/it/index.mdx index 4d0b22274..85165d058 100644 --- a/app/static-pages/it/index.mdx +++ b/app/static-pages/it/index.mdx @@ -42,8 +42,8 @@ export const contentId = "home"; sx={{ display: ["hidden", "box"] }} /> Date: Fri, 6 Dec 2024 06:49:07 +0100 Subject: [PATCH 3/7] feat: Added Contact information for newsletter email body --- app/templates/email/newsletter.ts | 38 ++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/app/templates/email/newsletter.ts b/app/templates/email/newsletter.ts index a764aab3e..dcb1dfc7e 100644 --- a/app/templates/email/newsletter.ts +++ b/app/templates/email/newsletter.ts @@ -1,17 +1,53 @@ export const newsletterTemplates = { en: ` I would like to subscribe to the Visualize newsletter. Please add my email address to the mailing list + + Contact Information + Title: + Last Name: + First Name: + Position: + Organization: + Email: + Phone Number (for any questions): `, de: ` - Ich möchte mich für den Visualize Newsletter anmelden. Bitte fügen Sie meine E-Mail-Adresse zur Verteilerliste hinzu. + Ich möchte mich für den Visualize Newsletter anmelden. Bitte fügen Sie meine E-Mail-Adresse zur Verteilerliste hinzu. + + Kontakt Information + Anrede: + Name: + Vorname: + Funktion: + Organisation: + Mail: + Telefonnummer (für Rückfragen): `, fr: ` Je souhaite m'abonner à la newsletter de Visualize. Veuillez ajouter mon adresse e-mail à la liste de diffusion. + + Informations de contact + Civilité: + Nom: + Prénom: + Fonction: + Organisation: + E-mail: + Numéro de téléphone (pour d'éventuelles questions): `, it: ` Vorrei iscrivermi alla newsletter di Visualize. Si prega di aggiungere il mio indirizzo e-mail alla mailing list. + + Informazioni di contatto + Titolo: + Cognome: + Nome: + Ruolo: + Organizzazione: + E-mail: + Numero di telefono (per eventuali domande): `, }; From bc2040125e4f5c55aafdf9f6a821ac93c654c7cb Mon Sep 17 00:00:00 2001 From: Noah Onyejese <129368606+noahonyejese@users.noreply.github.com> Date: Fri, 6 Dec 2024 06:50:20 +0100 Subject: [PATCH 4/7] fix: Changed Italien translation for Bug report title --- app/static-pages/it/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/static-pages/it/index.mdx b/app/static-pages/it/index.mdx index 85165d058..0b2d53253 100644 --- a/app/static-pages/it/index.mdx +++ b/app/static-pages/it/index.mdx @@ -61,8 +61,8 @@ export const contentId = "home"; }} > Date: Fri, 6 Dec 2024 06:51:39 +0100 Subject: [PATCH 5/7] feat: Added Contact Information to bug report email body --- app/templates/email/bug-report.ts | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/app/templates/email/bug-report.ts b/app/templates/email/bug-report.ts index 695f198dd..33ab8a8e7 100644 --- a/app/templates/email/bug-report.ts +++ b/app/templates/email/bug-report.ts @@ -33,6 +33,15 @@ Please complete the following information. Additional context Add any other context about the problem here. Please describe... + +Contact Information +Title: +Last Name: +First Name: +Position: +Organization: +Email: +Phone Number (for any questions): `, de: ` @@ -70,6 +79,15 @@ Bitte vervollständigen Sie die folgenden Informationen. Zusätzlicher Kontext Fügen Sie hier weitere Kontextinformationen zum Problem hinzu. Bitte beschreiben Sie... + +Kontakt Information +Anrede: +Name: +Vorname: +Funktion: +Organisation: +Mail: +Telefonnummer (für Rückfragen): `, fr: ` @@ -106,6 +124,15 @@ Veuillez compléter les informations suivantes. Contexte supplémentaire Ajoutez ici tout autre contexte concernant le problème. Veuillez décrire... + +Informations de contact +Civilité: +Nom: +Prénom: +Fonction: +Organisation: +E-mail: +Numéro de téléphone (pour d'éventuelles questions): `, it: ` @@ -142,5 +169,14 @@ Si prega di completare le seguenti informazioni. Contesto aggiuntivo Aggiungere qui qualsiasi altro contesto sul problema. Si prega di descrivere... + +Informazioni di contatto +Titolo: +Cognome: +Nome: +Ruolo: +Organizzazione: +E-mail: +Numero di telefono (per eventuali domande): `, }; From e4f37d1b9d44e1809d59d67b9cb8e90e26515d26 Mon Sep 17 00:00:00 2001 From: Noah Onyejese <129368606+noahonyejese@users.noreply.github.com> Date: Fri, 6 Dec 2024 06:54:54 +0100 Subject: [PATCH 6/7] fix: removed unecassary tabs --- app/templates/email/newsletter.ts | 72 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/app/templates/email/newsletter.ts b/app/templates/email/newsletter.ts index dcb1dfc7e..679577235 100644 --- a/app/templates/email/newsletter.ts +++ b/app/templates/email/newsletter.ts @@ -1,53 +1,53 @@ export const newsletterTemplates = { en: ` - I would like to subscribe to the Visualize newsletter. Please add my email address to the mailing list +I would like to subscribe to the Visualize newsletter. Please add my email address to the mailing list - Contact Information - Title: - Last Name: - First Name: - Position: - Organization: - Email: - Phone Number (for any questions): +Contact Information +Title: +Last Name: +First Name: +Position: +Organization: +Email: +Phone Number (for any questions): `, de: ` - Ich möchte mich für den Visualize Newsletter anmelden. Bitte fügen Sie meine E-Mail-Adresse zur Verteilerliste hinzu. +Ich möchte mich für den Visualize Newsletter anmelden. Bitte fügen Sie meine E-Mail-Adresse zur Verteilerliste hinzu. - Kontakt Information - Anrede: - Name: - Vorname: - Funktion: - Organisation: - Mail: - Telefonnummer (für Rückfragen): +Kontakt Information +Anrede: +Name: +Vorname: +Funktion: +Organisation: +Mail: +Telefonnummer (für Rückfragen): `, fr: ` - Je souhaite m'abonner à la newsletter de Visualize. Veuillez ajouter mon adresse e-mail à la liste de diffusion. +Je souhaite m'abonner à la newsletter de Visualize. Veuillez ajouter mon adresse e-mail à la liste de diffusion. - Informations de contact - Civilité: - Nom: - Prénom: - Fonction: - Organisation: - E-mail: - Numéro de téléphone (pour d'éventuelles questions): +Informations de contact +Civilité: +Nom: +Prénom: +Fonction: +Organisation: +E-mail: +Numéro de téléphone (pour d'éventuelles questions): `, it: ` - Vorrei iscrivermi alla newsletter di Visualize. Si prega di aggiungere il mio indirizzo e-mail alla mailing list. +Vorrei iscrivermi alla newsletter di Visualize. Si prega di aggiungere il mio indirizzo e-mail alla mailing list. - Informazioni di contatto - Titolo: - Cognome: - Nome: - Ruolo: - Organizzazione: - E-mail: - Numero di telefono (per eventuali domande): +Informazioni di contatto +Titolo: +Cognome: +Nome: +Ruolo: +Organizzazione: +E-mail: +Numero di telefono (per eventuali domande): `, }; From ca71c95db7b87695e9f3c449e96a5da24fbc1d91 Mon Sep 17 00:00:00 2001 From: Noah Onyejese <129368606+noahonyejese@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:07:38 +0100 Subject: [PATCH 7/7] fix: Added extended Contract information too Feature Request Body --- app/templates/email/feature-request.ts | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/app/templates/email/feature-request.ts b/app/templates/email/feature-request.ts index 285256df4..c2e28c7a9 100644 --- a/app/templates/email/feature-request.ts +++ b/app/templates/email/feature-request.ts @@ -25,6 +25,15 @@ Please describe... Additional context Add any other context or screenshots about the feature request here. Please describe... + +Contact Information +Title: +Last Name: +First Name: +Position: +Organization: +Email: +Phone Number (for any questions): `, de: ` @@ -53,6 +62,15 @@ Bitte beschreiben Sie... Zusätzlicher Kontext Fügen Sie hier weitere Kontextinformationen oder Screenshots zur Feature-Anfrage hinzu. Bitte beschreiben Sie... + +Kontakt Information +Anrede: +Name: +Vorname: +Funktion: +Organisation: +Mail: +Telefonnummer (für Rückfragen): `, fr: ` @@ -81,6 +99,15 @@ Veuillez décrire... Contexte supplémentaire Ajoutez ici tout autre contexte ou captures d'écran concernant la demande de fonctionnalité. Veuillez décrire... + +Informations de contact +Civilité: +Nom: +Prénom: +Fonction: +Organisation: +E-mail: +Numéro de téléphone (pour d'éventuelles questions): `, it: ` @@ -109,5 +136,14 @@ Si prega di descrivere... Contesto aggiuntivo Aggiunga qui qualsiasi altro contesto o screenshot sulla richiesta di funzionalità. Si prega di descrivere... + +Informazioni di contatto +Titolo: +Cognome: +Nome: +Ruolo: +Organizzazione: +E-mail: +Numero di telefono (per eventuali domande): `, };