diff --git a/apps/web/src/app/(dashboard)/emails/email-status-badge.tsx b/apps/web/src/app/(dashboard)/emails/email-status-badge.tsx
index 31e0d7f..674c544 100644
--- a/apps/web/src/app/(dashboard)/emails/email-status-badge.tsx
+++ b/apps/web/src/app/(dashboard)/emails/email-status-badge.tsx
@@ -12,7 +12,7 @@ export const EmailStatusBadge: React.FC<{ status: EmailStatus }> = ({
badgeColor = "bg-emerald-500/10 text-emerald-500 border-emerald-600/10";
break;
case "BOUNCED":
- badgeColor = "bg-red-500/10 text-red-800 border-red-600/10";
+ badgeColor = "bg-red-500/10 text-red-600 border-red-600/10";
break;
case "CLICKED":
badgeColor = "bg-cyan-500/10 text-cyan-600 border-cyan-600/10";
@@ -47,27 +47,27 @@ export const EmailStatusIcon: React.FC<{ status: EmailStatus }> = ({
switch (status) {
case "DELIVERED":
- outsideColor = "bg-emerald-500/40";
+ outsideColor = "bg-emerald-500/30";
insideColor = "bg-emerald-500";
break;
case "BOUNCED":
- outsideColor = "bg-red-500/40";
+ outsideColor = "bg-red-500/30";
insideColor = "bg-red-500";
break;
case "CLICKED":
- outsideColor = "bg-cyan-500/40";
+ outsideColor = "bg-cyan-500/30";
insideColor = "bg-cyan-500";
break;
case "OPENED":
- outsideColor = "bg-indigo-500/40";
+ outsideColor = "bg-indigo-500/30";
insideColor = "bg-indigo-500";
break;
case "DELIVERY_DELAYED":
- outsideColor = "bg-yellow-500/40";
+ outsideColor = "bg-yellow-500/30";
insideColor = "bg-yellow-500";
break;
case "COMPLAINED":
- outsideColor = "bg-yellow-500/40";
+ outsideColor = "bg-yellow-500/30";
insideColor = "bg-yellow-500";
break;
default:
diff --git a/apps/web/src/server/public-api/api/get-domains.ts b/apps/web/src/server/public-api/api/domains/get-domains.ts
similarity index 80%
rename from apps/web/src/server/public-api/api/get-domains.ts
rename to apps/web/src/server/public-api/api/domains/get-domains.ts
index 09db101..629527f 100644
--- a/apps/web/src/server/public-api/api/get-domains.ts
+++ b/apps/web/src/server/public-api/api/domains/get-domains.ts
@@ -1,8 +1,8 @@
import { createRoute, z } from "@hono/zod-openapi";
import { DomainSchema } from "~/lib/zod/domain-schema";
-import { PublicAPIApp } from "../hono";
-import { db } from "../../db";
-import { getTeamFromToken } from "../auth";
+import { PublicAPIApp } from "~/server/public-api/hono";
+import { db } from "~/server/db";
+import { getTeamFromToken } from "~/server/public-api/auth";
const route = createRoute({
method: "get",
diff --git a/apps/web/src/server/public-api/api/send-email.ts b/apps/web/src/server/public-api/api/emails/send-email.ts
similarity index 91%
rename from apps/web/src/server/public-api/api/send-email.ts
rename to apps/web/src/server/public-api/api/emails/send-email.ts
index 0a735ca..ec3cf93 100644
--- a/apps/web/src/server/public-api/api/send-email.ts
+++ b/apps/web/src/server/public-api/api/emails/send-email.ts
@@ -1,6 +1,6 @@
import { createRoute, z } from "@hono/zod-openapi";
-import { PublicAPIApp } from "../hono";
-import { getTeamFromToken } from "../auth";
+import { PublicAPIApp } from "~/server/public-api/hono";
+import { getTeamFromToken } from "~/server/public-api/auth";
import { sendEmail } from "~/server/service/email-service";
const route = createRoute({
diff --git a/apps/web/src/server/public-api/auth.ts b/apps/web/src/server/public-api/auth.ts
index 9f28d8d..5f80d0e 100644
--- a/apps/web/src/server/public-api/auth.ts
+++ b/apps/web/src/server/public-api/auth.ts
@@ -3,6 +3,9 @@ import { hashToken } from "../auth";
import { db } from "../db";
import { UnsendApiError } from "./api-error";
+/**
+ * Gets the team from the token. Also will check if the token is valid.
+ */
export const getTeamFromToken = async (c: Context) => {
const authHeader = c.req.header("Authorization");
if (!authHeader) {
@@ -11,7 +14,7 @@ export const getTeamFromToken = async (c: Context) => {
message: "No Authorization header provided",
});
}
- const token = authHeader.split(" ")[1]; // Assuming the Authorization header is in the format "Bearer
"
+ const token = authHeader.split(" ")[1];
if (!token) {
throw new UnsendApiError({
code: "UNAUTHORIZED",
@@ -38,5 +41,15 @@ export const getTeamFromToken = async (c: Context) => {
});
}
+ // No await so it won't block the request. Need to be moved to a queue in future
+ db.apiKey.update({
+ where: {
+ tokenHash: hashedToken,
+ },
+ data: {
+ lastUsed: new Date(),
+ },
+ });
+
return team;
};
diff --git a/apps/web/src/server/public-api/index.ts b/apps/web/src/server/public-api/index.ts
index 4fc662c..9b41d1d 100644
--- a/apps/web/src/server/public-api/index.ts
+++ b/apps/web/src/server/public-api/index.ts
@@ -1,10 +1,13 @@
import { getApp } from "./hono";
-import getDomains from "./api/get-domains";
-import sendEmail from "./api/send-email";
+import getDomains from "./api/domains/get-domains";
+import sendEmail from "./api/emails/send-email";
export const app = getApp();
+/**Domain related APIs */
getDomains(app);
+
+/**Email related APIs */
sendEmail(app);
export default app;
diff --git a/packages/ui/src/code.tsx b/packages/ui/src/code.tsx
index 3eae0f4..c23512f 100644
--- a/packages/ui/src/code.tsx
+++ b/packages/ui/src/code.tsx
@@ -9,6 +9,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "./tabs";
import { Button } from "./button";
import { ClipboardCopy, Check } from "lucide-react";
import { useState } from "react";
+import { cn } from "../lib/utils";
type Language = "js" | "ruby" | "php" | "python";
@@ -17,6 +18,7 @@ type CodeProps = {
language: Language;
code: string;
}[];
+ codeClassName?: string;
};
SyntaxHighlighter.registerLanguage("js", js);
@@ -24,7 +26,7 @@ SyntaxHighlighter.registerLanguage("ruby", ruby);
SyntaxHighlighter.registerLanguage("php", php);
SyntaxHighlighter.registerLanguage("python", python);
-export const Code: React.FC = ({ codeBlocks }) => {
+export const Code: React.FC = ({ codeBlocks, codeClassName }) => {
const [selectedTab, setSelectedTab] = useState(
codeBlocks[0]?.language ?? "js"
);
@@ -41,7 +43,7 @@ export const Code: React.FC = ({ codeBlocks }) => {
};
return (
-
+
setSelectedTab(val as Language)}
@@ -53,7 +55,7 @@ export const Code: React.FC = ({ codeBlocks }) => {
{block.language}
@@ -81,9 +83,9 @@ export const Code: React.FC = ({ codeBlocks }) => {
-