From b5825dff87e88f4269d992bec10a633b1a1c284b Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 22 Jan 2025 10:30:32 +0100 Subject: [PATCH] Move email footer and header components --- src/emails/{templates => components}/EmailFooter.tsx | 0 src/emails/{templates => components}/EmailHeader.tsx | 0 src/emails/{templates => components}/HeaderStyles.tsx | 0 src/emails/templates/boilerplate/BoilerplateEmail.tsx | 4 ++-- src/emails/templates/breachAlert/BreachAlertEmail.tsx | 9 ++++++--- .../FirstDataBrokerRemovalFixed.tsx | 6 +++--- .../monthlyActivityFree/MonthlyActivityFreeEmail.tsx | 4 ++-- .../monthlyActivityPlus/MonthlyActivityPlusEmail.tsx | 6 +++--- src/emails/templates/signupReport/SignupReportEmail.tsx | 6 +++--- .../verifyEmailAddress/VerifyEmailAddressEmail.tsx | 6 +++--- 10 files changed, 22 insertions(+), 19 deletions(-) rename src/emails/{templates => components}/EmailFooter.tsx (100%) rename src/emails/{templates => components}/EmailHeader.tsx (100%) rename src/emails/{templates => components}/HeaderStyles.tsx (100%) diff --git a/src/emails/templates/EmailFooter.tsx b/src/emails/components/EmailFooter.tsx similarity index 100% rename from src/emails/templates/EmailFooter.tsx rename to src/emails/components/EmailFooter.tsx diff --git a/src/emails/templates/EmailHeader.tsx b/src/emails/components/EmailHeader.tsx similarity index 100% rename from src/emails/templates/EmailHeader.tsx rename to src/emails/components/EmailHeader.tsx diff --git a/src/emails/templates/HeaderStyles.tsx b/src/emails/components/HeaderStyles.tsx similarity index 100% rename from src/emails/templates/HeaderStyles.tsx rename to src/emails/components/HeaderStyles.tsx diff --git a/src/emails/templates/boilerplate/BoilerplateEmail.tsx b/src/emails/templates/boilerplate/BoilerplateEmail.tsx index b6ee278fc0f..a3d432c3dc1 100644 --- a/src/emails/templates/boilerplate/BoilerplateEmail.tsx +++ b/src/emails/templates/boilerplate/BoilerplateEmail.tsx @@ -4,8 +4,8 @@ import { SanitizedSubscriberRow } from "../../../app/functions/server/sanitize"; import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; +import { EmailFooter } from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; export type Props = { subscriber: SanitizedSubscriberRow; diff --git a/src/emails/templates/breachAlert/BreachAlertEmail.tsx b/src/emails/templates/breachAlert/BreachAlertEmail.tsx index 926b4f76435..35a43daea9b 100644 --- a/src/emails/templates/breachAlert/BreachAlertEmail.tsx +++ b/src/emails/templates/breachAlert/BreachAlertEmail.tsx @@ -4,8 +4,11 @@ import type { SubscriberRow } from "knex/types/tables"; import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter, RedesignedEmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; +import { + EmailFooter, + RedesignedEmailFooter, +} from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; import { HibpLikeDbBreach } from "../../../utils/hibp"; import { BreachCard } from "../../components/BreachCard"; import { FeatureFlagName } from "../../../db/tables/featureFlags"; @@ -19,7 +22,7 @@ import { DashboardSummary } from "../../../app/functions/server/dashboard"; import { ResolutionRelevantBreachDataTypes } from "../../../app/functions/universal/breach"; import { EmailBanner } from "../../components/EmailBanner"; import { DataPointCount } from "../../components/EmailDataPointCount"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; export type Props = { l10n: ExtendedReactLocalization; diff --git a/src/emails/templates/firstDataBrokerRemovalFixed/FirstDataBrokerRemovalFixed.tsx b/src/emails/templates/firstDataBrokerRemovalFixed/FirstDataBrokerRemovalFixed.tsx index be2994c344c..9ab84688eba 100644 --- a/src/emails/templates/firstDataBrokerRemovalFixed/FirstDataBrokerRemovalFixed.tsx +++ b/src/emails/templates/firstDataBrokerRemovalFixed/FirstDataBrokerRemovalFixed.tsx @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { EmailFooter } from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; export type Props = { l10n: ExtendedReactLocalization; diff --git a/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.tsx b/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.tsx index c4a34c4c60d..440c3cb24f6 100644 --- a/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.tsx +++ b/src/emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail.tsx @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import type { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { RedesignedEmailFooter } from "../EmailFooter"; +import { RedesignedEmailFooter } from "../../components/EmailFooter"; import { EmailHero } from "../../components/EmailHero"; import { DataPointCount } from "../../components/EmailDataPointCount"; import { DashboardSummary } from "../../../app/functions/server/dashboard"; @@ -11,7 +11,7 @@ import { EmailBanner } from "../../components/EmailBanner"; import { getPremiumSubscriptionUrl } from "../../../app/functions/server/getPremiumSubscriptionInfo"; import { isEligibleForPremium } from "../../../app/functions/universal/premium"; import { getSignupLocaleCountry } from "../../functions/getSignupLocaleCountry"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; import { SanitizedSubscriberRow } from "../../../app/functions/server/sanitize"; import { sumSanitizedDataPoints } from "../../functions/reduceSanitizedDataPoints"; import { modifyAttributionsForUrl } from "../../../app/functions/universal/attributions"; diff --git a/src/emails/templates/monthlyActivityPlus/MonthlyActivityPlusEmail.tsx b/src/emails/templates/monthlyActivityPlus/MonthlyActivityPlusEmail.tsx index 723a8245182..c78d835b44b 100644 --- a/src/emails/templates/monthlyActivityPlus/MonthlyActivityPlusEmail.tsx +++ b/src/emails/templates/monthlyActivityPlus/MonthlyActivityPlusEmail.tsx @@ -5,9 +5,9 @@ import { DashboardSummary } from "../../../app/functions/server/dashboard"; import { SanitizedSubscriberRow } from "../../../app/functions/server/sanitize"; import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { EmailFooter } from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; export type Props = { subscriber: SanitizedSubscriberRow; diff --git a/src/emails/templates/signupReport/SignupReportEmail.tsx b/src/emails/templates/signupReport/SignupReportEmail.tsx index e1fa0c5b7b4..1cab4861c8e 100644 --- a/src/emails/templates/signupReport/SignupReportEmail.tsx +++ b/src/emails/templates/signupReport/SignupReportEmail.tsx @@ -4,11 +4,11 @@ import { Fragment } from "react"; import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; +import { EmailFooter } from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; import { HibpLikeDbBreach } from "../../../utils/hibp"; import { BreachCard } from "../../components/BreachCard"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; export type Props = { l10n: ExtendedReactLocalization; diff --git a/src/emails/templates/verifyEmailAddress/VerifyEmailAddressEmail.tsx b/src/emails/templates/verifyEmailAddress/VerifyEmailAddressEmail.tsx index eaef262236b..3901a37e4ad 100644 --- a/src/emails/templates/verifyEmailAddress/VerifyEmailAddressEmail.tsx +++ b/src/emails/templates/verifyEmailAddress/VerifyEmailAddressEmail.tsx @@ -4,9 +4,9 @@ import { SanitizedSubscriberRow } from "../../../app/functions/server/sanitize"; import { ExtendedReactLocalization } from "../../../app/functions/l10n"; -import { EmailFooter } from "../EmailFooter"; -import { EmailHeader } from "../EmailHeader"; -import { HeaderStyles, MetaTags } from "../HeaderStyles"; +import { EmailFooter } from "../../components/EmailFooter"; +import { EmailHeader } from "../../components/EmailHeader"; +import { HeaderStyles, MetaTags } from "../../components/HeaderStyles"; export type Props = { l10n: ExtendedReactLocalization;