Tasklypm 20 code cleanup

CONTRIBUTORS.md

@@ -1,3 +1,4 @@
 Guru Updesh Singh <guruupdeshsingh@gmail.com>
 Guru Updesh Singh <guruupdeshsingh@gmail.com>
 Guru Updesh Singh <guruupdeshsingh@gmail.com>
+Guru Updesh Singh <guruupdeshsingh@gmail.com>

package.json

@@ -35,7 +35,6 @@
     "geist": "^1.1.0",
     "lucide-react": "^0.292.0",
     "next": "^14.0.0",
-    "next-auth": "^4.24.4",
     "openai": "^4.20.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

src/app/(application)/layout.tsx

@@ -0,0 +1,21 @@
+import "~/styles/globals.css";
+import { UserButton } from "@clerk/nextjs";
+
+export const metadata = {
+	title: "Taskly",
+	description: "Simplified project management tool",
+	icons: [{ rel: "icon", url: "/favicon.ico" }],
+};
+
+export default function ApplicationLayout({
+	children,
+}: {
+	children: React.ReactNode;
+}) {
+	return (
+		<div>
+			<UserButton afterSignOutUrl="/" />
+			{children}
+		</div>
+	);
+}

src/app/projects/page.tsx → src/app/(application)/projects/page.tsx

@@ -1,5 +1,5 @@
-import { getAllProjects } from "~/actions/projectActions";
-import ProjectTable from "~/components/project/ProjectTable";
+import { getAllProjects } from "~/app/(application)/projects/_actions/project-actions";
+import ProjectTable from "~/app/(application)/projects/project-table";
 
 export default async function ProjectsPage() {
 	const projects = await getAllProjects();

src/components/project/ProjectTable.tsx → src/app/(application)/projects/project-table.tsx

@@ -40,12 +40,15 @@ import {
 	FormItem,
 	FormMessage,
 } from "~/components/ui/form";
-import { Input } from "../ui/input";
-import { Button } from "../ui/button";
-import { createProject, deleteProject } from "~/actions/projectActions";
-import ProjectChip, { type projectChipVariants } from "./ProjectChip";
+import { Input } from "../../../components/ui/input";
+import { Button } from "../../../components/ui/button";
+import {
+	createProject,
+	deleteProject,
+} from "~/app/(application)/projects/_actions/project-actions";
+import ProjectChip, { type projectChipVariants } from "./project-chip";
 import { ChevronRight, Target, Loader2, Trash } from "lucide-react";
-import { Checkbox } from "../ui/checkbox";
+import { Checkbox } from "../../../components/ui/checkbox";
 
 type OptimisticProject = Project & { pending: boolean };
 

src/components/task/AiDialog.tsx → src/app/(application)/tasks/ai-dialog.tsx

@@ -18,7 +18,7 @@ import { Label } from "~/components/ui/label";
 import { Bot, ChevronRight, Loader2 } from "lucide-react";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { type Task, insertTaskSchema } from "~/server/db/schema";
-import { createTask } from "~/actions/taskActions";
+import { createTask } from "~/app/(application)/tasks/_actions/task-actions";
 
 type AiTask = { [K in keyof Omit<Task, "id">]?: Task[K] };
 

src/app/tasks/page.tsx → src/app/(application)/tasks/page.tsx

@@ -1,5 +1,5 @@
-import { getAllTasks } from "~/actions/taskActions";
-import TaskTable from "~/components/task/TaskTable";
+import { getAllTasks } from "~/app/(application)/tasks/_actions/task-actions";
+import TaskTable from "~/app/(application)/tasks/task-table";
 import { env } from "~/env.mjs";
 
 export default async function TaskPage() {

src/components/task/TaskTable.tsx → src/app/(application)/tasks/task-table.tsx

@@ -37,10 +37,13 @@ import {
 	FormItem,
 	FormMessage,
 } from "~/components/ui/form";
-import { Input } from "../ui/input";
-import { Button } from "../ui/button";
-import { createTask, deleteTask } from "~/actions/taskActions";
-import TaskChip, { type taskChipVariants } from "./TaskChip";
+import { Input } from "../../../components/ui/input";
+import { Button } from "../../../components/ui/button";
+import {
+	createTask,
+	deleteTask,
+} from "~/app/(application)/tasks/_actions/task-actions";
+import TaskChip, { type taskChipVariants } from "./task-chip";
 
 import {
 	ChevronRight,
@@ -50,8 +53,8 @@ import {
 	Component,
 	Trash,
 } from "lucide-react";
-import { Checkbox } from "../ui/checkbox";
-import AiDialog from "./AiDialog";
+import { Checkbox } from "../../../components/ui/checkbox";
+import AiDialog from "./ai-dialog";
 
 type OptimisticTask = Task & { pending: boolean };
 

src/app/page.tsx → src/app/(landing)/page.tsx

@@ -1,17 +1,13 @@
-import { getAllTasks } from "~/actions/taskActions";
 import { IBM_Plex_Sans } from "next/font/google";
 import { cn } from "~/lib/utils";
 import { Brain, LampDesk, Rabbit } from "lucide-react";
 import { Button } from "~/components/ui/button";
-import Grid from "~/components/branding/Grid";
+import Grid from "~/app/(landing)/backgroun-grid";
 import Link from "next/link";
 
 const plexSans = IBM_Plex_Sans({ weight: ["700"], subsets: ["latin"] });
 
-export default async function HomePage() {
-	const tasks = await getAllTasks();
-	if (tasks === undefined) return null;
-
+export default function HomePage() {
 	return (
 		<main className="flex h-screen justify-center bg-blue-500/10">
 			<div className="z-30 flex max-w-[900px] flex-col gap-6 py-28 text-center">

src/app/api/cron/route.tsx

@@ -1,7 +1,7 @@
 import type { NextRequest } from "next/server";
 import { env } from "~/env.mjs";
 import { Resend } from "resend";
-import SampleEmail from "~/emails/SampleEmail";
+import SampleEmail from "~/components/email/sample-email";
 
 export async function GET(request: NextRequest) {
 	const authHeader = request.headers.get("authorization");

src/app/email/_actions/send-email.tsx

@@ -3,7 +3,7 @@
 import { Resend } from "resend";
 import { env } from "~/env.mjs";
 import { render } from "@react-email/render";
-import SampleEmail from "~/emails/SampleEmail";
+import SampleEmail from "~/components/email/sample-email";
 
 export async function sendSampleEmailAction(userName: string, emailTo: string) {
 	const resend = new Resend(env.RESEND_API_KEY);

src/app/layout.tsx

@@ -1,7 +1,6 @@
 import "~/styles/globals.css";
 import { GeistSans } from "geist/font/sans";
 import { ClerkProvider } from "@clerk/nextjs";
-import { UserButton } from "@clerk/nextjs";
 
 export const metadata = {
 	title: "Taskly",
@@ -20,10 +19,7 @@ export default function RootLayout({
 				lang="en"
 				className="min-h-screen bg-background font-sans antialiased"
 			>
-				<body className={GeistSans.className}>
-					<UserButton afterSignOutUrl="/" />
-					{children}
-				</body>
+				<body className={GeistSans.className}>{children}</body>
 			</html>
 		</ClerkProvider>
 	);