cleanup

Author: iamtouha

src/app/(main)/_components/user-dropdown.tsx

@@ -22,6 +22,7 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { logoutAction } from "@/lib/auth/actions";
 import { APP_TITLE } from "@/lib/constants";
+import Image from "next/image";
 import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -42,14 +43,32 @@ export const UserDropdown = ({
   return (
     <DropdownMenu>
       <DropdownMenuTrigger className={className}>
-        {/* eslint @next/next/no-img-element:off */}
-        <img
-          src={avatar ?? "https://source.boringavatars.com/marble/60/" + email}
-          alt="Avatar"
-          className="block h-8 w-8 rounded-full leading-none"
-          width={64}
-          height={64}
-        ></img>
+        {avatar ? (
+          <Image
+            src={avatar}
+            alt="Avatar"
+            className="block h-8 w-8 rounded-full leading-none"
+            width={64}
+            height={64}
+          />
+        ) : (
+          <div>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              className="h-8 w-8 text-muted-foreground"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M19 9l-7 7-7-7"
+              />
+            </svg>
+          </div>
+        )}
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
         <DropdownMenuLabel className="text-muted-foreground">{email}</DropdownMenuLabel>

src/lib/auth/actions.ts

@@ -2,7 +2,6 @@
 
 import { env } from "@/env";
 import { EmailTemplate, sendMail } from "@/lib/email";
-import { loginSchema, resetPasswordSchema, signupSchema } from "@/lib/validators/auth";
 import { redirect } from "next/navigation";
 import { z } from "zod";
 import { validateRequest } from ".";
@@ -11,6 +10,19 @@ import { Paths } from "../constants";
 import adapter from "./adapter";
 import utils from "./utils";
 
+const loginSchema = z.object({
+  email: z.string().email("Please enter a valid email"),
+  password: z.string().min(1, "Please provide your password.").max(255),
+});
+const signupSchema = z.object({
+  email: z.string().email("Please enter a valid email."),
+  password: z.string().min(8, "Password is too short. Minimum 8 characters required.").max(255),
+});
+const resetPasswordSchema = z.object({
+  token: z.string().min(1, "Invalid token"),
+  password: z.string().min(8, "Password is too short").max(255),
+});
+
 export const loginAction = validatedAction(loginSchema, async (_, input) => {
   const { email, password } = input;
   try {

src/lib/hooks/use-debounce.ts

@@ -9,60 +9,42 @@ enum LogLevel {
   ERROR = "ERROR",
 }
 
+type LoggerParams = [string, Record<string, unknown>];
+
 class Logger {
-  private level: LogLevel;
   private logFilePath: string;
-
-  constructor(level: LogLevel = LogLevel.INFO, logFilePath = "application.log") {
-    this.level = level;
+  constructor(logFilePath = "application.log") {
     this.logFilePath = path.resolve(logFilePath);
   }
-
   private getTimestamp(): string {
     return new Date().toISOString();
   }
-
-  private formatMessage(level: LogLevel, args: unknown[]): string {
-    const message = args
-      .map((arg) => (typeof arg === "object" ? JSON.stringify(arg) : arg))
-      .join(" ");
-
+  private formatMessage(level: LogLevel, msg: string, args: Record<string, unknown>): string {
+    const message = { timestamp: this.getTimestamp(), level, msg, ...args };
     if (env.NODE_ENV === "development") {
       console.log(message);
     }
-
-    return `[${this.getTimestamp()}] [${level}] ${message}`;
+    return JSON.stringify(message);
   }
 
-  private log(level: LogLevel, ...args: unknown[]): void {
-    if (this.shouldLog(level)) {
-      const logMessage = this.formatMessage(level, args) + "\n";
-      fs.appendFile(this.logFilePath, logMessage, (err) => {
-        if (err) throw err;
-      });
-    }
+  private log(level: LogLevel, msg: string, args: Record<string, unknown>): void {
+    const logMessage = this.formatMessage(level, msg, args) + "\n";
+    fs.appendFile(this.logFilePath, logMessage, (err) => {
+      if (err) throw err;
+    });
   }
-
-  private shouldLog(level: LogLevel): boolean {
-    const levels = [LogLevel.DEBUG, LogLevel.INFO, LogLevel.WARN, LogLevel.ERROR];
-    return levels.indexOf(level) >= levels.indexOf(this.level);
-  }
-
-  debug(...args: unknown[]): void {
-    this.log(LogLevel.DEBUG, ...args);
+  debug(...args: LoggerParams) {
+    if (env.NODE_ENV !== "production") this.log(LogLevel.DEBUG, ...args);
   }
-
-  info(...args: unknown[]): void {
+  info(...args: LoggerParams) {
     this.log(LogLevel.INFO, ...args);
   }
-
-  warn(...args: unknown[]): void {
+  warn(...args: LoggerParams) {
     this.log(LogLevel.WARN, ...args);
   }
-
-  error(...args: unknown[]): void {
+  error(...args: LoggerParams) {
     this.log(LogLevel.ERROR, ...args);
   }
 }
 
-export const logger = new Logger(env.NODE_ENV === "development" ? LogLevel.DEBUG : LogLevel.INFO);
+export const logger = new Logger();

src/lib/logger.ts

@@ -1,5 +1,3 @@
-import "server-only";
-
 import { env } from "@/env";
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";

src/lib/validators/auth.ts

@@ -19,7 +19,7 @@ export const users = pgTable(
     discordId: varchar("discord_id", { length: 255 }).unique(),
     email: varchar("email", { length: 255 }).unique().notNull(),
     emailVerified: boolean("email_verified").default(false).notNull(),
-    hashedPassword: varchar("hashed_password", { length: 255 }),
+    hashedPassword: varchar("hashed_password", { length: 63 }),
     avatar: varchar("avatar", { length: 255 }),
     stripeSubscriptionId: varchar("stripe_subscription_id", { length: 191 }),
     stripePriceId: varchar("stripe_price_id", { length: 191 }),

src/server/db/index.ts

@@ -6,7 +6,7 @@ import { type AppRouter } from "@/server/api/root";
 export const transformer = superjson;
 
 function getBaseUrl() {
-  if (typeof window !== "undefined") return "";
+  if (typeof window !== "undefined") return window.location.origin;
   if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`;
   return `http://localhost:${process.env.PORT ?? 3000}`;
 }