diff --git a/apps/web/lib/api/sendChangeEmailVerificationRequest.ts b/apps/web/lib/api/sendChangeEmailVerificationRequest.ts index 67b09edb..0d0564c8 100644 --- a/apps/web/lib/api/sendChangeEmailVerificationRequest.ts +++ b/apps/web/lib/api/sendChangeEmailVerificationRequest.ts @@ -51,7 +51,7 @@ export default async function sendChangeEmailVerificationRequest( baseUrl: process.env.BASE_URL, oldEmail, newEmail, - verifyUrl: `${process.env.BASE_URL}/auth/verify-email?token=${token}`, + url: `${process.env.BASE_URL}/auth/verify-email?token=${token}`, }), }); } diff --git a/apps/web/lib/api/sendPasswordResetRequest.ts b/apps/web/lib/api/sendPasswordResetRequest.ts index 0085c173..1eb407f7 100644 --- a/apps/web/lib/api/sendPasswordResetRequest.ts +++ b/apps/web/lib/api/sendPasswordResetRequest.ts @@ -37,7 +37,6 @@ export default async function sendPasswordResetRequest( subject: "Linkwarden: Reset password instructions", html: emailTemplate({ user, - baseUrl: process.env.BASE_URL, url: `${process.env.BASE_URL}/auth/reset-password?token=${token}`, }), }); diff --git a/apps/web/templates/acceptInvitation.html b/apps/web/templates/acceptInvitation.html index d51c2bf1..8ec60f9c 100644 --- a/apps/web/templates/acceptInvitation.html +++ b/apps/web/templates/acceptInvitation.html @@ -3,51 +3,40 @@ + + Email @@ -81,11 +52,11 @@ style=" font-family: Helvetica, sans-serif; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1.3; + font-size: 15px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background-color: #f8f8f8; + color: black; margin: 0; padding: 0; " @@ -95,350 +66,255 @@ border="0" cellpadding="0" cellspacing="0" - class="body" style=" border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; - background-color: #f8f8f8; width: 100%; " width="100%" - bgcolor="#f8f8f8" > - -   - - -
  + + + - - Please verify your email address by clicking the button - below. - - + Please verify your email address by clicking the button below: + + + + Linkwarden + + + + + + + +
+   +
+ +

+ Dear {{identifier}}, +

+ + + + + + +
+   +
+ +

+ You have been invited to join Linkwarden by + {{parentSubscriptionEmail}}! +

+ + + + + + +
+   +
+ +

+ Linkwarden helps teams and individuals collect, read, annotate, and + fully preserve what matters, all in one place. +

+ + + + + + +
+   +
+ + + - + + - - + + + + + +
+   +
- -
- - - - -
- logo -
-
+

+ Please note that your Linkwarden account and billing will be managed + by + + {{parentSubscriptionEmail}}. +

- + + + + + +
+   +
- -
- - -   +
+ + + + + + +
+   +
+ +

+ If you’re having trouble clicking the button, click on the following + link: +

+ + + {{url}} + +   diff --git a/apps/web/templates/passwordReset.html b/apps/web/templates/passwordReset.html index 82534f4e..abdd8812 100644 --- a/apps/web/templates/passwordReset.html +++ b/apps/web/templates/passwordReset.html @@ -1,53 +1,42 @@ - + + + Email @@ -81,11 +52,11 @@ style=" font-family: Helvetica, sans-serif; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1.3; + font-size: 15px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background-color: #f8f8f8; + color: black; margin: 0; padding: 0; " @@ -95,293 +66,249 @@ border="0" cellpadding="0" cellspacing="0" - class="body" style=" border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; - background-color: #f8f8f8; width: 100%; " width="100%" - bgcolor="#f8f8f8" > - -   - - -
  + + + - - Reset your password? - - + You requested to change your password. Please click the button below + to proceed. + + + + Linkwarden + + + + + + + +
+   +
+ +

+ Reset your password? +

+ + + + + + +
+   +
+ +

Hi {{user}}!

+ + + + + + +
+   +
+ +

+ Someone has requested a link to change your password. +

+ + + + + + +
+   +
+ + + - + + - - + + + + + +
+   +
- -
- - - - -
- logo -
-
+

+ If you didn't request this, you can safely ignore this email and + your password will not be changed. +

- + + + + + +
+   +
- -
- - -   +
+ + + + + + +
+   +
+ +

+ If you’re having trouble clicking the button, click on the following + link: +

+ + + {{url}} + +   diff --git a/apps/web/templates/verifyEmail.html b/apps/web/templates/verifyEmail.html index c9780f56..410dcc01 100644 --- a/apps/web/templates/verifyEmail.html +++ b/apps/web/templates/verifyEmail.html @@ -1,53 +1,42 @@ - + + + Email @@ -81,11 +52,11 @@ style=" font-family: Helvetica, sans-serif; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1.3; + font-size: 15px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background-color: #f8f8f8; + color: black; margin: 0; padding: 0; " @@ -95,318 +66,232 @@ border="0" cellpadding="0" cellspacing="0" - class="body" style=" border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; - background-color: #f8f8f8; width: 100%; " width="100%" - bgcolor="#f8f8f8" > - -   - - -
  + + + - - Please verify your email address by clicking the button - below. - - + Please verify your email address by clicking the button below: + + + + Linkwarden + + + + + + + +
+   +
+ +

+ Verify your email address +

+ + + + + + +
+   +
+ +

+ Thank you for signing up with Linkwarden! 🥳 +

+ + + + + + +
+   +
+ +

+ Just one small step left. Simply verify your email address, and + you’re all set! +

+ + + + + + +
+   +
+ + + - + + - - + + + + + +
+   +
- -
- - - - -
- logo -
-
+
- + + + + + +
+   +
- -
- - -   +

+ If you’re having trouble clicking the button, click on the following + link: +

+ + + {{url}} + +   diff --git a/apps/web/templates/verifyEmailChange.html b/apps/web/templates/verifyEmailChange.html index ac19326c..3dcb19a6 100644 --- a/apps/web/templates/verifyEmailChange.html +++ b/apps/web/templates/verifyEmailChange.html @@ -3,51 +3,40 @@ + + Email @@ -81,11 +52,11 @@ style=" font-family: Helvetica, sans-serif; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1.3; + font-size: 15px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background-color: #f8f8f8; + color: black; margin: 0; padding: 0; " @@ -95,329 +66,270 @@ border="0" cellpadding="0" cellspacing="0" - class="body" style=" border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; - background-color: #f8f8f8; width: 100%; " width="100%" - bgcolor="#f8f8f8" > - -   - - -
  + + + - - You recently requested to change the email address associated - with your Linkwarden account. To verify your new email address, - please click the button below. - - + You requested to change your email address. Please verify your new + email by clicking the button below. + + + + Linkwarden + + + + + + + +
+   +
+ +

+ Verify your new Linkwarden email address +

+ + + + + + +
+   +
+ +

Hi {{user}}!

+ + + + + + +
+   +
+ +

+ You recently requested to change the email address associated with + your Linkwarden account. To verify your + new email address, please click the button below. +

+ + + + + + +
+   +
+ +

+ Old Email: +

+

{{oldEmail}}

+ + + + + + +
+   +
+ +

+ New Email: +

+

{{newEmail}}

+ + + + + + +
+   +
+ + + - + + - - + + + + + +
+   +
- -
- - - - -
- logo -
-
+
- + + + + + +
+   +
- -
- - -   +

+ If you’re having trouble clicking the button, click on the following + link: +

+ + + {{url}} + +   diff --git a/apps/worker/templates/trialEnded.html b/apps/worker/templates/trialEnded.html index 4dd871fe..33fd2e5f 100644 --- a/apps/worker/templates/trialEnded.html +++ b/apps/worker/templates/trialEnded.html @@ -3,51 +3,40 @@ + + Email @@ -81,11 +52,11 @@ style=" font-family: Helvetica, sans-serif; -webkit-font-smoothing: antialiased; - font-size: 16px; - line-height: 1.3; + font-size: 15px; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; background-color: #f8f8f8; + color: black; margin: 0; padding: 0; " @@ -95,356 +66,268 @@ border="0" cellpadding="0" cellspacing="0" - class="body" style=" border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; - background-color: #f8f8f8; width: 100%; " width="100%" - bgcolor="#f8f8f8" > - -   - - -
  + + + - - - Upgrade your account to continue using Linkwarden. - - - + Your free trial has ended. Upgrade your account to continue using + Linkwarden. + + + + Linkwarden + + + + + + + +
+   +
+ +

+ Your Linkwarden free trial has ended +

+ + + + + + +
+   +
+ +

Hi {{name}},

+ + + + + + +
+   +
+ +

+ Thanks for trying Linkwarden! Your free trial has now ended, and + some features are no longer available. +

+ + + + + + +
+   +
+ +

+ To continue saving, organizing, and accessing your links and + preserved data, please upgrade your account. +

+ + + + + + +
+   +
+ + + - + + - - + + + + + +
+   +
- -
- - - - -
- logo -
-
+

+ Have questions? Just reply, we’re happy to help! +

- + + + + + +
+   +
- -
- - -   +
+ + + + + + +
+   +
+ +

+ If you’re having trouble clicking the button, click on the following + link: +

+ + + {{url}} + +   diff --git a/apps/worker/workers/trialEndEmailWorker.ts b/apps/worker/workers/trialEndEmailWorker.ts index 3fc6f5e3..b657b06b 100644 --- a/apps/worker/workers/trialEndEmailWorker.ts +++ b/apps/worker/workers/trialEndEmailWorker.ts @@ -7,7 +7,7 @@ import path from "path"; const sleep = (ms: number) => new Promise((res) => setTimeout(res, ms)); const batchSize = 10; -const pauseMs = 60000; +const pauseMs = 30000; /** * Runs the "trial ended" notifier in batches. diff --git a/assets/logo_small.png b/assets/logo_small.png new file mode 100644 index 00000000..04da489f Binary files /dev/null and b/assets/logo_small.png differ