+
-
|
-
|---|
+ <%= paragraph %> +
+<% }) %> + +<% if (highlightedText) { %> +- <%= greeting %> -
-<% } %> - -<% (message).forEach(function(paragraph) { %> -- <%= paragraph %> -
-<% }) %> - -<% if (highlightedText) { %> -
-
|
-
|---|
- <%= greeting %> -
-<% } %> - -<% (message).forEach(function(paragraph) { %> -- <%= paragraph %> -
-<% }) %> - -| - - <%= ctaText %> - - | -
- <%= paragraph %> -
- <% }) %> -<% } %> - -- If the button above does not appear, please copy and paste this link into your browser's address bar: -
-- <%= ctaURL %> -
- -<% if (gmailGoToAction) { %> - -<% } %>\ -`) diff --git a/services/web/app/src/Features/Email/EmailBuilder.mjs b/services/web/app/src/Features/Email/EmailBuilder.mjs index 69bb1f3adb..ecc6e341d3 100644 --- a/services/web/app/src/Features/Email/EmailBuilder.mjs +++ b/services/web/app/src/Features/Email/EmailBuilder.mjs @@ -4,12 +4,9 @@ import moment from 'moment' import EmailMessageHelper from './EmailMessageHelper.mjs' import StringHelper from '../Helpers/StringHelper.mjs' import BaseEmailLayout from './Layouts/BaseEmailLayout.mjs' -import UpdatedBaseEmailLayout from './Layouts/UpdatedBaseEmailLayout.mjs' import SpamSafe from './SpamSafe.mjs' import ctaEmailBody from './Bodies/cta-email.mjs' -import updatedCtaEmailBody from './Bodies/updated-cta-email.mjs' import NoCTAEmailBody from './Bodies/NoCTAEmailBody.mjs' -import UpdatedNoCTAEmailBody from './Bodies/UpdatedNoCTAEmailBody.mjs' function _emailBodyPlainText(content, opts, ctaEmail) { let emailBody = `${content.greeting(opts, true)}` @@ -79,10 +76,7 @@ function ctaTemplate(content) { return content.subject(opts) }, layout(opts) { - const layoutFn = opts.useNewEmailDesign - ? UpdatedBaseEmailLayout - : BaseEmailLayout - return layoutFn(opts) + return BaseEmailLayout(opts) }, footerMessage(opts) { return content.footerMessage(opts) @@ -91,8 +85,7 @@ function ctaTemplate(content) { return _emailBodyPlainText(content, opts, true) }, compiledTemplate(opts) { - const bodyFn = opts.useNewEmailDesign ? updatedCtaEmailBody : ctaEmailBody - return bodyFn({ + return ctaEmailBody({ title: content.title(opts), greeting: content.greeting(opts), message: content.message(opts), @@ -118,10 +111,7 @@ function NoCTAEmailTemplate(content) { return content.subject(opts) }, layout(opts) { - const layoutFn = opts.useNewEmailDesign - ? UpdatedBaseEmailLayout - : BaseEmailLayout - return layoutFn(opts) + return BaseEmailLayout(opts) }, plainTextTemplate(opts) { return `\ @@ -134,10 +124,7 @@ The ${settings.appName} Team - ${settings.siteUrl}\ ` }, compiledTemplate(opts) { - const bodyFn = opts.useNewEmailDesign - ? UpdatedNoCTAEmailBody - : NoCTAEmailBody - return bodyFn({ + return NoCTAEmailBody({ title: typeof content.title === 'function' ? content.title(opts) : undefined, greeting: content.greeting(opts), diff --git a/services/web/app/src/Features/Email/EmailHandler.mjs b/services/web/app/src/Features/Email/EmailHandler.mjs index 0c0b769688..054a578284 100644 --- a/services/web/app/src/Features/Email/EmailHandler.mjs +++ b/services/web/app/src/Features/Email/EmailHandler.mjs @@ -4,8 +4,6 @@ import logger from '@overleaf/logger' import EmailBuilder from './EmailBuilder.mjs' import EmailSender from './EmailSender.mjs' import Queues from '../../infrastructure/Queues.mjs' -import SplitTestHandler from '../SplitTests/SplitTestHandler.mjs' -import UserGetter from '../User/UserGetter.mjs' const EMAIL_SETTINGS = Settings.email || {} @@ -14,27 +12,6 @@ const EMAIL_SETTINGS = Settings.email || {} * @param {object} opts */ async function sendEmail(emailType, opts) { - if (opts.to) { - try { - const user = await UserGetter.promises.getUserByAnyEmail(opts.to, { - _id: 1, - }) - if (user) { - const { variant } = - await SplitTestHandler.promises.getAssignmentForUser( - user._id.toString(), - 'new-email-design' - ) - opts.useNewEmailDesign = variant === 'enabled' - } - } catch (err) { - logger.warn( - { err }, - 'failed to get new-email-design split test assignment' - ) - } - } - const email = EmailBuilder.buildEmail(emailType, opts) if (email.type === 'lifecycle' && !EMAIL_SETTINGS.lifecycle) { return diff --git a/services/web/app/src/Features/Email/Layouts/BaseEmailLayout.mjs b/services/web/app/src/Features/Email/Layouts/BaseEmailLayout.mjs index 4242241135..174bd6d8d1 100644 --- a/services/web/app/src/Features/Email/Layouts/BaseEmailLayout.mjs +++ b/services/web/app/src/Features/Email/Layouts/BaseEmailLayout.mjs @@ -1,395 +1,169 @@ import _ from 'lodash' import settings from '@overleaf/settings' +import { fontFamily, colors } from '../emailStyles.mjs' + +const _isSaas = settings.env === 'saas' +const _imageBase = settings.cdn?.web?.host || settings.siteUrl || null + +let _logoHtml = `${settings.appName}` +let _taglineHtml = '' +if (_isSaas && _imageBase) { + _logoHtml = ` + +
+
+ `
+
+ _taglineHtml = `
+
+
+ 
+
+ `
+}
+
+const _customFooter = settings.email?.template?.customFooter || ''
export default _.template(`\
-
+
+
+
+
+
+
+
+
-
+
+
-@media only screen and (max-width: 596px) {
- .small-float-center {
- margin: 0 auto !important;
- float: none !important;
- text-align: center !important;
- }
+
+
- .small-text-center {
- text-align: center !important;
- }
+
- .small-text-left {
- text-align: left !important;
- }
+
+
|
+
-
|
-