Merge pull request #264 from moinulmoin/improve-structure

refactor: ♻️ improve file, folder structure

Author: moinulmoin

package.json

@@ -60,7 +60,6 @@
     "autoprefixer": "10.4.20",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
-    "encoding": "^0.1.13",
     "eslint": "8.56.0",
     "eslint-config-next": "15.0.3",
     "eslint-config-prettier": "^8.10.0",

pnpm-lock.yaml

@@ -3,13 +3,12 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { alphabet, generateRandomString } from "oslo/crypto";
-import { deleteSessionTokenCookie } from "~/lib/cookies";
-import prisma from "~/lib/prisma";
-import { getCurrentSession, invalidateSession } from "~/lib/session";
+import { deleteSessionTokenCookie } from "~/lib/server/cookies";
+import prisma from "~/lib/server/prisma";
+import { getCurrentSession, invalidateSession } from "~/lib/server/session";
 
 export async function logout() {
   const { session } = await getCurrentSession();
-
   if (!session) {
     return {
       message: "Unauthorized",

src/actions/auth.ts

@@ -3,7 +3,7 @@
 import ThanksTemp from "emails/thanks";
 import VerificationTemp from "emails/verification";
 import { nanoid } from "nanoid";
-import { resend } from "~/lib/resend";
+import { resend } from "~/lib/server/resend";
 import { type SendOTPProps, type SendWelcomeEmailProps } from "~/types";
 
 export const sendWelcomeEmail = async ({

src/actions/mail.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import { freePlan, proPlan } from "~/config/subscription";
-import prisma from "~/lib/prisma";
+import prisma from "~/lib/server/prisma";
 import { type UserSubscriptionPlan } from "~/types";
 
 export async function getUserSubscriptionPlan(

src/actions/subscription.ts

@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation";
 import AuthForm from "~/components/layout/auth-form";
 import { Card } from "~/components/ui/card";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 export default async function Login() {
   const { session } = await getCurrentSession();

src/app/[locale]/login/page.tsx renamed to src/app/[locale]/(auth)/login/page.tsx

@@ -4,7 +4,7 @@ import { type Metadata } from "next";
 function AboutCard(about: About) {
   return (
     <article className="prose prose-slate mb-8 dark:prose-invert">
-      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors ">
+      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors">
         {about.title}
       </h2>
       <div dangerouslySetInnerHTML={{ __html: about.content }} />

src/app/[locale]/about/page.tsx renamed to src/app/[locale]/(marketing)/about/page.tsx

@@ -5,10 +5,10 @@ import { type Metadata } from "next";
 function ChangeCard(change: Change) {
   return (
     <article className="prose prose-slate mb-8 dark:prose-invert">
-      <h2 className=" mb-0 text-3xl font-semibold tracking-tight transition-colors">
+      <h2 className="mb-0 text-3xl font-semibold tracking-tight transition-colors">
         {change.title}
       </h2>
-      <time className=" text-sm text-muted-foreground" dateTime={change.date}>
+      <time className="text-sm text-muted-foreground" dateTime={change.date}>
         {dayjs(change.date).format("MMM DD YYYY")}
       </time>
       <div dangerouslySetInnerHTML={{ __html: change.content }} />

src/app/[locale]/changelog/page.tsx renamed to src/app/[locale]/(marketing)/changelog/page.tsx

@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import LoginModal from "~/components/layout/login-modal";
-import { getCurrentSession } from "~/lib/session";
+import { getCurrentSession } from "~/lib/server/session";
 
 export default async function Login() {
   const { session } = await getCurrentSession();

src/app/[locale]/@loginDialog/(.)login/page.tsx

@@ -2,8 +2,8 @@ import { AlertTriangleIcon } from "lucide-react";
 import { getUserSubscriptionPlan } from "~/actions/subscription";
 import { BillingForm } from "~/components/billing-form";
 import { Alert, AlertDescription } from "~/components/ui/alert";
-import { getCurrentSession } from "~/lib/session";
-import { stripe } from "~/lib/stripe";
+import { getCurrentSession } from "~/lib/server/session";
+import { stripe } from "~/lib/server/stripe";
 
 export const revalidate = 0;
 export const dynamic = "force-dynamic";