From 590d9a767ab528e334e3ab371a208fac187b6867 Mon Sep 17 00:00:00 2001 From: Thibaud BRAULT Date: Thu, 24 Oct 2024 10:54:57 +0200 Subject: [PATCH 1/3] :truck: move assets in public folder --- {src/assets => public}/faqmaker.png | Bin {src/assets => public}/faqmaker.svg | 0 {src/assets => public}/google.svg | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {src/assets => public}/faqmaker.png (100%) rename {src/assets => public}/faqmaker.svg (100%) rename {src/assets => public}/google.svg (100%) diff --git a/src/assets/faqmaker.png b/public/faqmaker.png similarity index 100% rename from src/assets/faqmaker.png rename to public/faqmaker.png diff --git a/src/assets/faqmaker.svg b/public/faqmaker.svg similarity index 100% rename from src/assets/faqmaker.svg rename to public/faqmaker.svg diff --git a/src/assets/google.svg b/public/google.svg similarity index 100% rename from src/assets/google.svg rename to public/google.svg From 5396c988996f5f6b949961875188cec5dad99d7b Mon Sep 17 00:00:00 2001 From: Thibaud BRAULT Date: Thu, 24 Oct 2024 10:56:17 +0200 Subject: [PATCH 2/3] :truck: update import path for google svg --- src/app/login/page.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 7b41df944..24d7b3e2f 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -2,7 +2,6 @@ import Image from 'next/image'; import Link from 'next/link'; import { signInAction } from '@/actions'; -import googleIcon from '@/assets/google.svg'; import { Button } from '@/components'; import { Routes } from '@/utils'; @@ -64,7 +63,7 @@ export default function Page({ searchParams }) { weight="bold" type="submit" > - + Sign In with Google From 9bd2e267f2cac2a2ef3639c9902e59cbdf4052bf Mon Sep 17 00:00:00 2001 From: Thibaud BRAULT Date: Thu, 24 Oct 2024 10:56:58 +0200 Subject: [PATCH 3/3] :construction: wip emails templates --- .../emails/{NewUser.tsx => InviteUser.tsx} | 15 ++-- src/components/emails/Register.tsx | 69 +++++++++++++++++-- src/components/emails/index.ts | 2 +- 3 files changed, 76 insertions(+), 10 deletions(-) rename src/components/emails/{NewUser.tsx => InviteUser.tsx} (88%) diff --git a/src/components/emails/NewUser.tsx b/src/components/emails/InviteUser.tsx similarity index 88% rename from src/components/emails/NewUser.tsx rename to src/components/emails/InviteUser.tsx index 4b3c892ef..af0157cc4 100644 --- a/src/components/emails/NewUser.tsx +++ b/src/components/emails/InviteUser.tsx @@ -21,7 +21,7 @@ interface Props { invitedByEmail: string; } -export const NewUserEmailTemplate = ({ +export const FaqmakerInviteUserEmail = ({ company, username, invitedByUsername, @@ -38,7 +38,7 @@ export const NewUserEmailTemplate = ({
FAQMaker Join {company} on FAQMaker - Hello XXX, + Hi {username}, {invitedByUsername} ( ( -
-

Welcome to FAQMaker

-
-); +import { + Body, + Button, + Container, + Head, + Html, + Img, + Preview, + Section, + Tailwind, + Text, +} from '@react-email/components'; + +interface Props { + company: string; +} + +export const RegisterEmailTemplate = ({ company }: Props) => { + const previewText = `Join XXX on FAQMaker`; + + return ( + + + {previewText} + + + +
+ FAQMaker +
+ Hi {company}, + + Welcome to FAQMaker, + +
+ +
+
+ + Best, +
+ The FAQMaker team +
+
+
+ +
+ + ); +}; + +export default RegisterEmailTemplate; diff --git a/src/components/emails/index.ts b/src/components/emails/index.ts index 95fd743ad..22491c58b 100644 --- a/src/components/emails/index.ts +++ b/src/components/emails/index.ts @@ -1,2 +1,2 @@ export * from './Register'; -export * from './NewUser'; +export * from './InviteUser';