diff --git a/bun.lockb b/bun.lockb index 807725d7..9510e147 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/email/package.json b/src/email/package.json index 50ba3c00..685d15da 100644 --- a/src/email/package.json +++ b/src/email/package.json @@ -7,7 +7,7 @@ "export": "email export" }, "dependencies": { - "@react-email/components": "0.0.12", - "react-email": "^1.10.0" + "@react-email/components": "^0.0.25", + "react-email": "^3.0.1" } } diff --git a/src/email/templates/join-workspace.tsx b/src/email/templates/join-workspace.tsx index b2d56f02..c8158514 100644 --- a/src/email/templates/join-workspace.tsx +++ b/src/email/templates/join-workspace.tsx @@ -1,16 +1,13 @@ -import { - Body, - Button, - Container, - Head, - Heading, - Html, - Hr, - Link, - Preview, - Tailwind, - Text, -} from "@react-email/components"; +import { Body } from "@react-email/body"; +import { Button } from "@react-email/button"; +import { Container } from "@react-email/container"; +import { Head } from "@react-email/head"; +import { Heading } from "@react-email/heading"; +import { Html } from "@react-email/html"; +import { Hr } from "@react-email/hr"; +import { Link } from "@react-email/link"; +import { Preview } from "@react-email/preview"; +import { Text } from "@react-email/text"; import * as React from "react"; @@ -19,82 +16,92 @@ export const JoinWorkspaceTemplate = ({ }: { magicLoginUrl?: string; }) => ( - - - - Log in with this magic link - - - - kan.bn - - - Login to your Kan account - - - Click the button below to instantly login to your account. - - + + If you didn't try to login, you can safely ignore this email. + +
+ + - Login to your account - - - If you didn't try to login, you can safely ignore this email. - -
- - - Kan - - , the open source Trello alternative. - -
- - -
+ Kan + + , the open source Trello alternative. + + + + ); export default JoinWorkspaceTemplate; diff --git a/src/email/templates/magic-link.tsx b/src/email/templates/magic-link.tsx index 99cf01f3..d1bbf69d 100644 --- a/src/email/templates/magic-link.tsx +++ b/src/email/templates/magic-link.tsx @@ -1,100 +1,107 @@ -import { - Body, - Button, - Container, - Head, - Heading, - Html, - Hr, - Link, - Preview, - Tailwind, - Text, -} from "@react-email/components"; +import { Body } from "@react-email/body"; +import { Button } from "@react-email/button"; +import { Container } from "@react-email/container"; +import { Head } from "@react-email/head"; +import { Heading } from "@react-email/heading"; +import { Html } from "@react-email/html"; +import { Hr } from "@react-email/hr"; +import { Link } from "@react-email/link"; +import { Preview } from "@react-email/preview"; +import { Text } from "@react-email/text"; import * as React from "react"; -interface MagicLinkEmailProps { - loginUrl?: string; -} - -export const MagicLinkTemplate = ({ loginUrl }: MagicLinkEmailProps) => ( - - - - Log in with this magic link - - - - kan.bn - - - Login to your Kan account - - - Click the button below to instantly login to your account. - - + + If you didn't try to login, you can safely ignore this email. + +
+ + - Login to your account - - - If you didn't try to login, you can safely ignore this email. - -
- - - Kan - - , the open source Trello alternative. - -
- - -
+ Kan + + , the open source Trello alternative. + + + + ); export default MagicLinkTemplate; diff --git a/src/server/api/routers/card.ts b/src/server/api/routers/card.ts index 7f06abb0..95a882f2 100644 --- a/src/server/api/routers/card.ts +++ b/src/server/api/routers/card.ts @@ -264,7 +264,7 @@ export const cardRouter = createTRPCRouter({ input.cardPublicId, ); - if (!card ?? !card?.list?.id) + if (!card?.list?.id) throw new TRPCError({ message: `Card with public ID ${input.cardPublicId} not found`, code: "NOT_FOUND",