Merge branch 'main' into fix/routes-enum

src/app/(main)/dashboard/billing/_components/manage-subscription-form.tsx

@@ -1,21 +1,18 @@
 "use client";
 
 import * as React from "react";
-import { type z } from "zod";
 
 import { Button } from "@/components/ui/button";
-import { type manageSubscriptionSchema } from "@/lib/validators/stripe";
+import type { ManageSubscriptionInput } from "@/server/api/routers/stripe/stripe.input";
 import { api } from "@/trpc/react";
 import { toast } from "sonner";
 
-type ManageSubscriptionFormProps = z.infer<typeof manageSubscriptionSchema>;
-
 export function ManageSubscriptionForm({
   isPro,
   stripeCustomerId,
   stripeSubscriptionId,
   stripePriceId,
-}: ManageSubscriptionFormProps) {
+}: ManageSubscriptionInput) {
   const [isPending, startTransition] = React.useTransition();
   const managePlanMutation = api.stripe.managePlan.useMutation();
 

src/app/(main)/dashboard/page.tsx

@@ -3,11 +3,11 @@ import { env } from "@/env";
 import { api } from "@/trpc/server";
 import { type Metadata } from "next";
 import * as React from "react";
-import { z } from "zod";
 import { Posts } from "./_components/posts";
 import { PostsSkeleton } from "./_components/posts-skeleton";
 import { validateRequest } from "@/lib/auth/validate-request";
 import { Paths } from "@/lib/constants";
+import { myPostsSchema } from "@/server/api/routers/post/post.input";
 
 export const metadata: Metadata = {
   metadataBase: new URL(env.NEXT_PUBLIC_APP_URL),
@@ -19,13 +19,8 @@ interface Props {
   searchParams: Record<string, string | string[] | undefined>;
 }
 
-const schmea = z.object({
-  page: z.coerce.number().default(1).optional(),
-  perPage: z.coerce.number().default(12).optional(),
-});
-
 export default async function DashboardPage({ searchParams }: Props) {
-  const { page } = schmea.parse(searchParams);
+  const { page, perPage } = myPostsSchema.parse(searchParams);
 
   const { user } = await validateRequest();
   if (!user) redirect(Paths.Login);
@@ -36,7 +31,10 @@ export default async function DashboardPage({ searchParams }: Props) {
    * @see https://www.youtube.com/shorts/A7GGjutZxrs
    * @see https://nextjs.org/docs/app/building-your-application/data-fetching/patterns#parallel-data-fetching
    */
-  const promises = Promise.all([api.post.myPosts.query({ page }), api.stripe.getPlan.query()]);
+  const promises = Promise.all([
+    api.post.myPosts.query({ page, perPage }),
+    api.stripe.getPlan.query(),
+  ]);
 
   return (
     <div>

src/app/(main)/editor/[postId]/_components/post-editor.tsx

@@ -1,6 +1,5 @@
 "use client";
 import { useRef } from "react";
-import { z } from "zod";
 import { type RouterOutputs } from "@/trpc/shared";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -21,22 +20,14 @@ import { api } from "@/trpc/react";
 import { Pencil2Icon } from "@/components/icons";
 import { LoadingButton } from "@/components/loading-button";
 import Link from "next/link";
+import { createPostSchema } from "@/server/api/routers/post/post.input";
 
-const markdownlink = "https://remarkjs.github.io/react-markdown/" // Can also be changed for something like /markdown
+const markdownlink = "https://remarkjs.github.io/react-markdown/";
 
 interface Props {
   post: RouterOutputs["post"]["get"];
 }
 
-const schema = z.object({
-  title: z.string().min(3).max(255),
-  excerpt: z.string().min(3).max(255),
-  content: z
-    .string()
-    .min(3)
-    .max(2048 * 2),
-});
-
 export const PostEditor = ({ post }: Props) => {
   if (!post) return null;
   const formRef = useRef<HTMLFormElement>(null);
@@ -47,7 +38,7 @@ export const PostEditor = ({ post }: Props) => {
       excerpt: post.excerpt,
       content: post.content,
     },
-    resolver: zodResolver(schema),
+    resolver: zodResolver(createPostSchema),
   });
   const onSubmit = form.handleSubmit(async (values) => {
     updatePost.mutate({ id: post.id, ...values });
@@ -70,11 +61,7 @@ export const PostEditor = ({ post }: Props) => {
       </div>
       <div className="h-6"></div>
       <Form {...form}>
-        <form
-          ref={formRef}
-          onSubmit={onSubmit}
-          className="block max-w-screen-md space-y-4"
-        >
+        <form ref={formRef} onSubmit={onSubmit} className="block max-w-screen-md space-y-4">
           <FormField
             control={form.control}
             name="title"
@@ -98,9 +85,7 @@ export const PostEditor = ({ post }: Props) => {
                 <FormControl>
                   <Textarea {...field} rows={2} className="min-h-0" />
                 </FormControl>
-                <FormDescription>
-                  A short description of your post
-                </FormDescription>
+                <FormDescription>A short description of your post</FormDescription>
                 <FormMessage />
               </FormItem>
             )}
@@ -127,13 +112,11 @@ export const PostEditor = ({ post }: Props) => {
                     <PostPreview text={form.watch("content") || post.content} />
                   </div>
                 </TabsContent>
-                <Link
-                    href={markdownlink}
-                    >
-                    <span className="text-[0.8rem] text-muted-foreground underline underline-offset-4">
-                        Supports markdown
-                    </span>
-                  </Link>
+                <Link href={markdownlink}>
+                  <span className="text-[0.8rem] text-muted-foreground underline underline-offset-4">
+                    Supports markdown
+                  </span>
+                </Link>
               </Tabs>
             )}
           />

src/app/(main)/editor/[postId]/page.tsx

@@ -17,7 +17,7 @@ export default async function EditPostPage({ params }: Props) {
   const { user } = await validateRequest();
   if (!user) redirect(Paths.Login);
 
-  const post = await api.post.get.query(params.postId);
+  const post = await api.post.get.query({ id: params.postId });
   if (!post) notFound();
 
   return (

src/lib/auth/index.ts

@@ -4,6 +4,7 @@ import { DrizzlePostgreSQLAdapter } from "@lucia-auth/adapter-drizzle";
 import { env } from "@/env.js";
 import { db } from "@/server/db";
 import { sessions, users, type User as DbUser } from "@/server/db/schema";
+import { absoluteUrl } from "@/lib/utils"
 
 // Uncomment the following lines if you are using nodejs 18 or lower. Not required in Node.js 20, CloudFlare Workers, Deno, Bun, and Vercel Edge Functions.
 // import { webcrypto } from "node:crypto";
@@ -39,7 +40,7 @@ export const lucia = new Lucia(adapter, {
 export const discord = new Discord(
   env.DISCORD_CLIENT_ID,
   env.DISCORD_CLIENT_SECRET,
-  env.NEXT_PUBLIC_APP_URL + "/login/discord/callback",
+  absoluteUrl("/login/discord/callback")
 );
 
 declare module "lucia" {

src/lib/utils.ts

@@ -52,5 +52,5 @@ export function formatPrice(
 }
 
 export function absoluteUrl(path: string) {
-  return `${env.NEXT_PUBLIC_APP_URL}${path}`;
+  return new URL(path, env.NEXT_PUBLIC_APP_URL).href
 }

src/server/api/root.ts

@@ -1,6 +1,6 @@
-import { postRouter } from "./routers/post";
-import { stripeRouter } from "./routers/stripe";
-import { userRouter } from "./routers/user";
+import { postRouter } from "./routers/post/post.procedure";
+import { stripeRouter } from "./routers/stripe/stripe.procedure";
+import { userRouter } from "./routers/user/user.procedure";
 import { createTRPCRouter } from "./trpc";
 
 export const appRouter = createTRPCRouter({

src/server/api/routers/post/post.input.ts

@@ -0,0 +1,35 @@
+import { z } from "zod";
+
+export const listPostsSchema = z.object({
+  page: z.number().int().default(1),
+  perPage: z.number().int().default(12),
+});
+export type ListPostsInput = z.infer<typeof listPostsSchema>;
+
+export const getPostSchema = z.object({
+  id: z.string(),
+});
+export type GetPostInput = z.infer<typeof getPostSchema>;
+
+export const createPostSchema = z.object({
+  title: z.string().min(3).max(255),
+  excerpt: z.string().min(3).max(255),
+  content: z.string().min(3),
+});
+export type CreatePostInput = z.infer<typeof createPostSchema>;
+
+export const updatePostSchema = createPostSchema.extend({
+  id: z.string(),
+});
+export type UpdatePostInput = z.infer<typeof updatePostSchema>;
+
+export const deletePostSchema = z.object({
+  id: z.string(),
+});
+export type DeletePostInput = z.infer<typeof deletePostSchema>;
+
+export const myPostsSchema = z.object({
+  page: z.number().int().default(1),
+  perPage: z.number().int().default(12),
+});
+export type MyPostsInput = z.infer<typeof myPostsSchema>;

src/server/api/routers/post/post.procedure.ts

@@ -0,0 +1,29 @@
+import { createTRPCRouter, protectedProcedure } from "../../trpc";
+import * as inputs from "./post.input";
+import * as services from "./post.service";
+
+export const postRouter = createTRPCRouter({
+  list: protectedProcedure
+    .input(inputs.listPostsSchema)
+    .query(({ ctx, input }) => services.listPosts(ctx, input)),
+
+  get: protectedProcedure
+    .input(inputs.getPostSchema)
+    .query(({ ctx, input }) => services.getPost(ctx, input)),
+
+  create: protectedProcedure
+    .input(inputs.createPostSchema)
+    .mutation(({ ctx, input }) => services.createPost(ctx, input)),
+
+  update: protectedProcedure
+    .input(inputs.updatePostSchema)
+    .mutation(({ ctx, input }) => services.updatePost(ctx, input)),
+
+  delete: protectedProcedure
+    .input(inputs.deletePostSchema)
+    .mutation(async ({ ctx, input }) => services.deletePost(ctx, input)),
+
+  myPosts: protectedProcedure
+    .input(inputs.myPostsSchema)
+    .query(({ ctx, input }) => services.myPosts(ctx, input)),
+});