-
- Features
-
-
-
-
-
-
-
Task Management
-
- Create, edit, and delete todos with ease
-
-
-
-
-
-
-
Categories
-
- Organize your todos with custom categories
-
-
-
-
-
Rich Features
-
- Priorities, due dates, images, and more
-
-
+ {/* Quick Actions */}
+
+
Quick Actions
+
+
+
+
+
+
diff --git a/src/modules/deals/actions/create-deal.action.ts b/src/modules/deals/actions/create-deal.action.ts
new file mode 100644
index 0000000..61a50ef
--- /dev/null
+++ b/src/modules/deals/actions/create-deal.action.ts
@@ -0,0 +1,70 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+import { redirect } from "next/navigation";
+import { getDb } from "@/db";
+import { requireAuth } from "@/modules/auth/utils/auth-utils";
+import { deals, insertDealSchema } from "@/modules/deals/schemas/deal.schema";
+import dealsRoutes from "../deals.route";
+
+export async function createDealAction(formData: FormData) {
+ try {
+ const user = await requireAuth();
+
+ // Extract form fields
+ const dealData: Record
= {};
+ for (const [key, value] of formData.entries()) {
+ if (value && value !== "" && typeof value === "string") {
+ // Handle numeric fields
+ if (key === "value") {
+ dealData[key] = Number.parseFloat(value);
+ } else if (key === "contactId") {
+ const numValue = Number.parseInt(value);
+ if (!Number.isNaN(numValue)) {
+ dealData[key] = numValue;
+ }
+ } else if (key === "expectedCloseDate") {
+ // Convert YYYY-MM-DD to unix timestamp
+ dealData[key] = new Date(value).getTime();
+ } else {
+ dealData[key] = value;
+ }
+ }
+ }
+
+ // Validate the data
+ const validatedData = insertDealSchema.parse({
+ ...dealData,
+ userId: Number.parseInt(user.id),
+ });
+
+ const db = await getDb();
+ await db.insert(deals).values({
+ ...validatedData,
+ userId: Number.parseInt(user.id),
+ createdAt: Date.now(),
+ updatedAt: Date.now(),
+ });
+
+ revalidatePath(dealsRoutes.board);
+ redirect(dealsRoutes.board);
+ } catch (error) {
+ // Handle Next.js redirect errors - these are not actual errors
+ if (error instanceof Error && error.message === "NEXT_REDIRECT") {
+ throw error; // Re-throw redirect errors as-is
+ }
+
+ console.error("Error creating deal:", error);
+
+ if (
+ error instanceof Error &&
+ error.message === "Authentication required"
+ ) {
+ throw new Error("Authentication required");
+ }
+
+ throw new Error(
+ error instanceof Error ? error.message : "Failed to create deal",
+ );
+ }
+}
diff --git a/src/modules/deals/actions/delete-deal.action.ts b/src/modules/deals/actions/delete-deal.action.ts
new file mode 100644
index 0000000..c9ac288
--- /dev/null
+++ b/src/modules/deals/actions/delete-deal.action.ts
@@ -0,0 +1,47 @@
+"use server";
+
+import { eq } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
+import { getDb } from "@/db";
+import { requireAuth } from "@/modules/auth/utils/auth-utils";
+import { deals } from "@/modules/deals/schemas/deal.schema";
+import dealsRoutes from "../deals.route";
+
+export async function deleteDealAction(id: number): Promise {
+ try {
+ const user = await requireAuth();
+ const db = await getDb();
+
+ // Verify ownership
+ const existingDeal = await db.query.deals.findFirst({
+ where: eq(deals.id, id),
+ });
+
+ if (!existingDeal) {
+ throw new Error("Deal not found");
+ }
+
+ if (existingDeal.userId !== Number.parseInt(user.id)) {
+ throw new Error("Forbidden: You do not own this deal");
+ }
+
+ // Delete deal
+ await db.delete(deals).where(eq(deals.id, id));
+
+ revalidatePath(dealsRoutes.board);
+ return true;
+ } catch (error) {
+ console.error("Error deleting deal:", error);
+
+ if (
+ error instanceof Error &&
+ error.message === "Authentication required"
+ ) {
+ throw new Error("Authentication required");
+ }
+
+ throw new Error(
+ error instanceof Error ? error.message : "Failed to delete deal",
+ );
+ }
+}
diff --git a/src/modules/deals/actions/get-deals.action.ts b/src/modules/deals/actions/get-deals.action.ts
new file mode 100644
index 0000000..bc9302c
--- /dev/null
+++ b/src/modules/deals/actions/get-deals.action.ts
@@ -0,0 +1,63 @@
+"use server";
+
+import { and, eq, sql } from "drizzle-orm";
+import { getDb } from "@/db";
+import { requireAuth } from "@/modules/auth/utils/auth-utils";
+import { contacts } from "@/modules/contacts/schemas/contact.schema";
+import { type Deal, deals } from "@/modules/deals/schemas/deal.schema";
+import type { DealStageType } from "../models/deal.enum";
+
+export type DealWithContact = Deal & {
+ contactName: string | null;
+ contactEmail: string | null;
+};
+
+export async function getDealsAction(
+ stage?: DealStageType,
+ contactId?: number,
+): Promise {
+ try {
+ const user = await requireAuth();
+ const db = await getDb();
+
+ // Build the where clause
+ const conditions = [eq(deals.userId, Number.parseInt(user.id))];
+
+ // Add stage filter if provided
+ if (stage) {
+ conditions.push(eq(deals.stage, stage));
+ }
+
+ // Add contact filter if provided
+ if (contactId) {
+ conditions.push(eq(deals.contactId, contactId));
+ }
+
+ // Fetch deals with contact info using LEFT JOIN
+ const results = await db
+ .select({
+ id: deals.id,
+ title: deals.title,
+ contactId: deals.contactId,
+ value: deals.value,
+ currency: deals.currency,
+ stage: deals.stage,
+ expectedCloseDate: deals.expectedCloseDate,
+ description: deals.description,
+ userId: deals.userId,
+ createdAt: deals.createdAt,
+ updatedAt: deals.updatedAt,
+ contactName: sql`${contacts.firstName} || ' ' || ${contacts.lastName}`,
+ contactEmail: contacts.email,
+ })
+ .from(deals)
+ .leftJoin(contacts, eq(deals.contactId, contacts.id))
+ .where(and(...conditions))
+ .orderBy(deals.createdAt);
+
+ return results;
+ } catch (error) {
+ console.error("Error fetching deals:", error);
+ return [];
+ }
+}
diff --git a/src/modules/deals/actions/update-deal.action.ts b/src/modules/deals/actions/update-deal.action.ts
new file mode 100644
index 0000000..87206de
--- /dev/null
+++ b/src/modules/deals/actions/update-deal.action.ts
@@ -0,0 +1,81 @@
+"use server";
+
+import { eq } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
+import { redirect } from "next/navigation";
+import { getDb } from "@/db";
+import { requireAuth } from "@/modules/auth/utils/auth-utils";
+import { deals, updateDealSchema } from "@/modules/deals/schemas/deal.schema";
+import dealsRoutes from "../deals.route";
+
+export async function updateDealAction(id: number, formData: FormData) {
+ try {
+ const user = await requireAuth();
+ const db = await getDb();
+
+ // Verify ownership
+ const existingDeal = await db.query.deals.findFirst({
+ where: eq(deals.id, id),
+ });
+
+ if (!existingDeal) {
+ throw new Error("Deal not found");
+ }
+
+ if (existingDeal.userId !== Number.parseInt(user.id)) {
+ throw new Error("Forbidden: You do not own this deal");
+ }
+
+ // Extract form fields
+ const dealData: Record = {};
+ for (const [key, value] of formData.entries()) {
+ if (typeof value === "string") {
+ // Handle numeric fields
+ if (key === "value") {
+ dealData[key] = Number.parseFloat(value);
+ } else if (key === "contactId") {
+ const numValue = Number.parseInt(value);
+ dealData[key] = Number.isNaN(numValue) ? null : numValue;
+ } else if (key === "expectedCloseDate") {
+ // Convert YYYY-MM-DD to unix timestamp
+ dealData[key] = value ? new Date(value).getTime() : null;
+ } else {
+ dealData[key] = value;
+ }
+ }
+ }
+
+ // Validate the data
+ const validatedData = updateDealSchema.parse(dealData);
+
+ // Update deal
+ await db
+ .update(deals)
+ .set({
+ ...validatedData,
+ updatedAt: Date.now(),
+ })
+ .where(eq(deals.id, id));
+
+ revalidatePath(dealsRoutes.board);
+ redirect(dealsRoutes.board);
+ } catch (error) {
+ // Handle Next.js redirect errors - these are not actual errors
+ if (error instanceof Error && error.message === "NEXT_REDIRECT") {
+ throw error; // Re-throw redirect errors as-is
+ }
+
+ console.error("Error updating deal:", error);
+
+ if (
+ error instanceof Error &&
+ error.message === "Authentication required"
+ ) {
+ throw new Error("Authentication required");
+ }
+
+ throw new Error(
+ error instanceof Error ? error.message : "Failed to update deal",
+ );
+ }
+}
diff --git a/src/modules/deals/components/deal-card.tsx b/src/modules/deals/components/deal-card.tsx
new file mode 100644
index 0000000..b641e0e
--- /dev/null
+++ b/src/modules/deals/components/deal-card.tsx
@@ -0,0 +1,103 @@
+import { Calendar, Edit, Mail, User } from "lucide-react";
+import Link from "next/link";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import type { DealWithContact } from "../actions/get-deals.action";
+import dealsRoutes from "../deals.route";
+import { DeleteDeal } from "./delete-deal";
+
+interface DealCardProps {
+ deal: DealWithContact;
+}
+
+const stageColors: Record = {
+ Prospecting: "bg-blue-100 text-blue-800 border-blue-200",
+ Qualification: "bg-purple-100 text-purple-800 border-purple-200",
+ Proposal: "bg-yellow-100 text-yellow-800 border-yellow-200",
+ Negotiation: "bg-orange-100 text-orange-800 border-orange-200",
+ "Closed Won": "bg-green-100 text-green-800 border-green-200",
+ "Closed Lost": "bg-gray-100 text-gray-800 border-gray-200",
+};
+
+export function DealCard({ deal }: DealCardProps) {
+ const formatCurrency = (value: number, currency: string) => {
+ return new Intl.NumberFormat("en-AU", {
+ style: "currency",
+ currency: currency,
+ }).format(value);
+ };
+
+ const formatDate = (timestamp: number | null) => {
+ if (!timestamp) return null;
+ return new Date(timestamp).toLocaleDateString("en-AU", {
+ year: "numeric",
+ month: "short",
+ day: "numeric",
+ });
+ };
+
+ return (
+
+
+
+
+
+ {deal.title}
+
+
+ {formatCurrency(deal.value, deal.currency)}
+
+
+
+
+
+
+
+
+ {deal.contactName}
+
+ )}
+
+ {deal.contactEmail && (
+
+ )}
+
+ {deal.expectedCloseDate && (
+
+
+ {formatDate(deal.expectedCloseDate)}
+
+ )}
+
+ {deal.description && (
+
+ {deal.description}
+
+ )}
+
+
+
+ {deal.stage}
+
+
+
+
+ );
+}
diff --git a/src/modules/deals/components/deal-form.tsx b/src/modules/deals/components/deal-form.tsx
new file mode 100644
index 0000000..59c80b0
--- /dev/null
+++ b/src/modules/deals/components/deal-form.tsx
@@ -0,0 +1,316 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useState, useTransition } from "react";
+import { useForm } from "react-hook-form";
+import type { z } from "zod";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+ Form,
+ FormControl,
+ FormDescription,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { Textarea } from "@/components/ui/textarea";
+import type { Contact } from "@/modules/contacts/schemas/contact.schema";
+import { insertDealSchema } from "@/modules/deals/schemas/deal.schema";
+import { dealStageEnum } from "../models/deal.enum";
+import { createDealAction } from "../actions/create-deal.action";
+import { updateDealAction } from "../actions/update-deal.action";
+import type { DealWithContact } from "../actions/get-deals.action";
+
+interface DealFormProps {
+ initialData?: DealWithContact;
+ contacts: Contact[];
+}
+
+type FormData = z.infer;
+
+export function DealForm({ initialData, contacts }: DealFormProps) {
+ const [isPending, startTransition] = useTransition();
+ const [error, setError] = useState(null);
+
+ const form = useForm({
+ resolver: zodResolver(insertDealSchema),
+ defaultValues: {
+ title: initialData?.title || "",
+ contactId: initialData?.contactId || undefined,
+ value: initialData?.value || 0,
+ currency: initialData?.currency || "AUD",
+ stage: initialData?.stage || "Prospecting",
+ expectedCloseDate: initialData?.expectedCloseDate || undefined,
+ description: initialData?.description || "",
+ },
+ });
+
+ async function onSubmit(data: FormData) {
+ setError(null);
+ const formData = new FormData();
+
+ // Add all form fields to FormData
+ Object.entries(data).forEach(([key, value]) => {
+ if (value !== null && value !== undefined) {
+ if (key === "expectedCloseDate" && typeof value === "number") {
+ // Convert timestamp to YYYY-MM-DD
+ const date = new Date(value);
+ formData.append(key, date.toISOString().split("T")[0]);
+ } else {
+ formData.append(key, value.toString());
+ }
+ }
+ });
+
+ startTransition(async () => {
+ try {
+ if (initialData) {
+ await updateDealAction(initialData.id, formData);
+ } else {
+ await createDealAction(formData);
+ }
+ } catch (err) {
+ setError(
+ err instanceof Error ? err.message : "Failed to save deal",
+ );
+ }
+ });
+ }
+
+ return (
+
+
+ {initialData ? "Edit Deal" : "New Deal"}
+
+
+
+
+
+
+ );
+}
diff --git a/src/modules/deals/components/delete-deal.tsx b/src/modules/deals/components/delete-deal.tsx
new file mode 100644
index 0000000..8e760fa
--- /dev/null
+++ b/src/modules/deals/components/delete-deal.tsx
@@ -0,0 +1,76 @@
+"use client";
+
+import { Trash2 } from "lucide-react";
+import { useState, useTransition } from "react";
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import { deleteDealAction } from "../actions/delete-deal.action";
+
+interface DeleteDealProps {
+ dealId: number;
+}
+
+export function DeleteDeal({ dealId }: DeleteDealProps) {
+ const [isPending, startTransition] = useTransition();
+ const [error, setError] = useState(null);
+
+ const handleDelete = () => {
+ setError(null);
+ startTransition(async () => {
+ try {
+ await deleteDealAction(dealId);
+ } catch (err) {
+ setError(
+ err instanceof Error ? err.message : "Failed to delete deal",
+ );
+ }
+ });
+ };
+
+ return (
+
+
+
+
+
+
+ Delete Deal
+
+ Are you sure you want to delete this deal? This action cannot
+ be undone.
+
+
+ {error && (
+
+ {error}
+
+ )}
+
+ Cancel
+ {
+ e.preventDefault();
+ handleDelete();
+ }}
+ disabled={isPending}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ {isPending ? "Deleting..." : "Delete"}
+
+
+
+
+ );
+}
diff --git a/src/modules/deals/deals.route.ts b/src/modules/deals/deals.route.ts
new file mode 100644
index 0000000..a4177d0
--- /dev/null
+++ b/src/modules/deals/deals.route.ts
@@ -0,0 +1,7 @@
+const dealsRoutes = {
+ board: "/dashboard/deals",
+ new: "/dashboard/deals/new",
+ edit: (id: number) => `/dashboard/deals/${id}/edit`,
+} as const;
+
+export default dealsRoutes;
diff --git a/src/modules/deals/models/deal.enum.ts b/src/modules/deals/models/deal.enum.ts
new file mode 100644
index 0000000..f670d7d
--- /dev/null
+++ b/src/modules/deals/models/deal.enum.ts
@@ -0,0 +1,19 @@
+export const DealStage = {
+ PROSPECTING: "Prospecting",
+ QUALIFICATION: "Qualification",
+ PROPOSAL: "Proposal",
+ NEGOTIATION: "Negotiation",
+ CLOSED_WON: "Closed Won",
+ CLOSED_LOST: "Closed Lost",
+} as const;
+
+export type DealStageType = (typeof DealStage)[keyof typeof DealStage];
+
+export const dealStageEnum = [
+ DealStage.PROSPECTING,
+ DealStage.QUALIFICATION,
+ DealStage.PROPOSAL,
+ DealStage.NEGOTIATION,
+ DealStage.CLOSED_WON,
+ DealStage.CLOSED_LOST,
+] as const;
diff --git a/src/modules/deals/schemas/deal.schema.ts b/src/modules/deals/schemas/deal.schema.ts
new file mode 100644
index 0000000..3466711
--- /dev/null
+++ b/src/modules/deals/schemas/deal.schema.ts
@@ -0,0 +1,70 @@
+import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import { z } from "zod";
+import { user } from "@/modules/auth/schemas/auth.schema";
+import { contacts } from "@/modules/contacts/schemas/contact.schema";
+import {
+ DealStage,
+ type DealStageType,
+ dealStageEnum,
+} from "@/modules/deals/models/deal.enum";
+
+// Deals table
+export const deals = sqliteTable("deals", {
+ id: integer("id").primaryKey({ autoIncrement: true }),
+ title: text("title").notNull(),
+ contactId: integer("contact_id").references(() => contacts.id, {
+ onDelete: "set null",
+ }),
+ value: real("value").notNull(),
+ currency: text("currency").notNull().default("AUD"),
+ stage: text("stage")
+ .$type()
+ .notNull()
+ .default(DealStage.PROSPECTING),
+ expectedCloseDate: integer("expected_close_date", { mode: "number" }),
+ description: text("description"),
+ userId: integer("user_id")
+ .notNull()
+ .references(() => user.id, { onDelete: "cascade" }),
+ createdAt: integer("created_at", { mode: "number" })
+ .notNull()
+ .$defaultFn(() => Date.now()),
+ updatedAt: integer("updated_at", { mode: "number" })
+ .notNull()
+ .$defaultFn(() => Date.now()),
+});
+
+// Zod schemas for validation
+export const insertDealSchema = createInsertSchema(deals, {
+ title: z
+ .string()
+ .min(1, "Deal title is required")
+ .max(255, "Title too long"),
+ contactId: z.number().optional(),
+ value: z
+ .number()
+ .min(0, "Value must be positive")
+ .refine((val) => !Number.isNaN(val), "Value must be a valid number"),
+ currency: z.string().length(3, "Currency must be a 3-letter ISO code").optional(),
+ stage: z.enum(dealStageEnum).optional(),
+ expectedCloseDate: z.number().optional(),
+ description: z
+ .string()
+ .max(5000, "Description too long")
+ .optional()
+ .or(z.literal("")),
+ userId: z.number().min(1, "User ID is required"),
+});
+
+export const selectDealSchema = createSelectSchema(deals);
+
+export const updateDealSchema = insertDealSchema.partial().omit({
+ id: true,
+ userId: true,
+ createdAt: true,
+});
+
+// Type exports
+export type Deal = typeof deals.$inferSelect;
+export type NewDeal = typeof deals.$inferInsert;
diff --git a/src/modules/todos/actions/create-category.action.ts b/src/modules/todos/actions/create-category.action.ts
index 48eaa2c..5890a19 100644
--- a/src/modules/todos/actions/create-category.action.ts
+++ b/src/modules/todos/actions/create-category.action.ts
@@ -10,7 +10,11 @@ import {
} from "@/modules/todos/schemas/category.schema";
import todosRoutes from "../todos.route";
-export async function createCategory(data: unknown): Promise {
+export async function createCategory(data: unknown): Promise<{
+ success: boolean;
+ data?: Category;
+ error?: string;
+}> {
try {
const user = await requireAuth();
const validatedData = insertCategorySchema.parse({
@@ -30,21 +34,39 @@ export async function createCategory(data: unknown): Promise {
.returning();
if (!result[0]) {
- throw new Error("Failed to create category");
+ return {
+ success: false,
+ error: "Failed to create category",
+ };
}
// Revalidate pages that might show categories
revalidatePath(todosRoutes.list);
revalidatePath(todosRoutes.new);
- return result[0];
+ return {
+ success: true,
+ data: result[0],
+ };
} catch (error) {
console.error("Error creating category:", error);
- throw new Error(
- error instanceof Error
- ? error.message
- : "Failed to create category",
- );
+ if (
+ error instanceof Error &&
+ error.message === "Authentication required"
+ ) {
+ return {
+ success: false,
+ error: "Authentication required",
+ };
+ }
+
+ return {
+ success: false,
+ error:
+ error instanceof Error
+ ? error.message
+ : "Failed to create category",
+ };
}
}
diff --git a/src/modules/todos/components/add-category.tsx b/src/modules/todos/components/add-category.tsx
index 1c90cbd..5a95a5d 100644
--- a/src/modules/todos/components/add-category.tsx
+++ b/src/modules/todos/components/add-category.tsx
@@ -59,23 +59,18 @@ export function AddCategory({ onCategoryAdded }: AddCategoryProps) {
const onSubmit = (data: AddCategoryFormData) => {
startTransition(async () => {
- try {
- const newCategory = await createCategory(data);
- onCategoryAdded(newCategory);
+ const result = await createCategory(data);
+ if (!result.success) {
+ toast.error(result.error || "Failed to create category");
+ return;
+ }
+
+ if (result.data) {
+ onCategoryAdded(result.data);
form.reset();
setOpen(false);
-
toast.success("Category created successfully!");
- } catch (error) {
- console.error("Error creating category:", error);
-
- const errorMessage =
- error instanceof Error
- ? error.message
- : "Failed to create category";
-
- toast.error(errorMessage);
}
});
};
diff --git a/wrangler.jsonc b/wrangler.jsonc
index 525553b..08a3ff0 100644
--- a/wrangler.jsonc
+++ b/wrangler.jsonc
@@ -18,8 +18,8 @@
"d1_databases": [
{
"binding": "next_cf_app",
- "database_name": "next-cf-app",
- "database_id": "757a32d1-5779-4f09-bcf3-b268013395d4",
+ "database_name": "fullstack-crm",
+ "database_id": "a1d231c7-b7e7-4e7a-aa0e-78a56c2e123a",
"migrations_dir": "./src/drizzle"
}
],