From f005ae1c46b4cb290047f1c148dec54431e5ef2b Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Wed, 3 Sep 2025 12:43:51 -0300 Subject: [PATCH] Biome format --- apps/server/src/db/schema/auth.ts | 2 +- apps/server/src/index.ts | 11 ++--- apps/server/src/lib/auth.ts | 2 +- apps/web/src/components/mode-toggle.tsx | 9 ++-- apps/web/src/components/sign-in-form.tsx | 26 +++++----- apps/web/src/components/sign-up-form.tsx | 30 ++++++------ apps/web/src/components/theme-provider.tsx | 2 +- apps/web/src/components/ui/button.tsx | 14 +++--- apps/web/src/components/ui/card.tsx | 18 +++---- apps/web/src/components/ui/checkbox.tsx | 10 ++-- apps/web/src/components/ui/dropdown-menu.tsx | 50 ++++++++++---------- apps/web/src/components/ui/input.tsx | 12 ++--- apps/web/src/components/ui/label.tsx | 6 +-- apps/web/src/components/ui/skeleton.tsx | 2 +- apps/web/src/components/ui/sonner.tsx | 2 +- apps/web/src/components/user-menu.tsx | 7 ++- apps/web/src/lib/utils.ts | 2 +- apps/web/src/main.tsx | 7 ++- apps/web/src/routes/__root.tsx | 22 ++++----- apps/web/src/routes/dashboard.tsx | 6 +-- apps/web/src/routes/index.tsx | 4 +- apps/web/src/routes/login.tsx | 4 +- apps/web/src/utils/trpc.ts | 2 +- apps/web/vite.config.ts | 4 +- 24 files changed, 125 insertions(+), 129 deletions(-) diff --git a/apps/server/src/db/schema/auth.ts b/apps/server/src/db/schema/auth.ts index ca8f6e0..cadfc9f 100644 --- a/apps/server/src/db/schema/auth.ts +++ b/apps/server/src/db/schema/auth.ts @@ -1,4 +1,4 @@ -import { pgTable, text, timestamp, boolean, serial } from "drizzle-orm/pg-core"; +import { boolean, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core"; export const user = pgTable("user", { id: text("id").primaryKey(), diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts index 7fbf355..714062f 100644 --- a/apps/server/src/index.ts +++ b/apps/server/src/index.ts @@ -1,15 +1,14 @@ import "dotenv/config"; +import { execSync } from "node:child_process"; +import { join } from "node:path"; import { trpcServer } from "@hono/trpc-server"; -import { createContext } from "./lib/context"; -import { appRouter } from "./routers/index"; -import { auth } from "./lib/auth"; import { Hono } from "hono"; import { cors } from "hono/cors"; import { logger as honoLogger } from "hono/logger"; - -import { join } from "node:path"; -import { execSync } from "node:child_process"; +import { auth } from "./lib/auth"; +import { createContext } from "./lib/context"; import { logger } from "./lib/logger"; +import { appRouter } from "./routers/index"; const app = new Hono(); diff --git a/apps/server/src/lib/auth.ts b/apps/server/src/lib/auth.ts index ca30fd7..5980bbc 100644 --- a/apps/server/src/lib/auth.ts +++ b/apps/server/src/lib/auth.ts @@ -7,7 +7,7 @@ export const auth = betterAuth({ database: drizzleAdapter(db, { provider: "pg", - schema: schema, + schema, }), trustedOrigins: [process.env.CORS_ORIGIN || ""], emailAndPassword: { diff --git a/apps/web/src/components/mode-toggle.tsx b/apps/web/src/components/mode-toggle.tsx index 199d09f..c5ddea2 100644 --- a/apps/web/src/components/mode-toggle.tsx +++ b/apps/web/src/components/mode-toggle.tsx @@ -1,5 +1,5 @@ import { Moon, Sun } from "lucide-react"; - +import { useTheme } from "@/components/theme-provider"; import { Button } from "@/components/ui/button"; import { DropdownMenu, @@ -7,7 +7,6 @@ import { DropdownMenuItem, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; -import { useTheme } from "@/components/theme-provider"; export function ModeToggle() { const { setTheme } = useTheme(); @@ -15,9 +14,9 @@ export function ModeToggle() { return ( - diff --git a/apps/web/src/components/sign-in-form.tsx b/apps/web/src/components/sign-in-form.tsx index 4c5b044..7179063 100644 --- a/apps/web/src/components/sign-in-form.tsx +++ b/apps/web/src/components/sign-in-form.tsx @@ -1,8 +1,8 @@ -import { authClient } from "@/lib/auth-client"; import { useForm } from "@tanstack/react-form"; import { useNavigate } from "@tanstack/react-router"; import { toast } from "sonner"; import z from "zod"; +import { authClient } from "@/lib/auth-client"; import Loader from "./loader"; import { Button } from "./ui/button"; import { Input } from "./ui/input"; @@ -55,16 +55,16 @@ export default function SignInForm({ } return ( -
-

Welcome Back

+
+

Welcome Back

{ e.preventDefault(); e.stopPropagation(); form.handleSubmit(); }} - className="space-y-4" >
@@ -74,13 +74,13 @@ export default function SignInForm({ field.handleChange(e.target.value)} + type="email" + value={field.state.value} /> {field.state.meta.errors.map((error) => ( -

+

{error?.message}

))} @@ -97,13 +97,13 @@ export default function SignInForm({ field.handleChange(e.target.value)} + type="password" + value={field.state.value} /> {field.state.meta.errors.map((error) => ( -

+

{error?.message}

))} @@ -115,9 +115,9 @@ export default function SignInForm({ {(state) => ( @@ -127,9 +127,9 @@ export default function SignInForm({
diff --git a/apps/web/src/components/sign-up-form.tsx b/apps/web/src/components/sign-up-form.tsx index 56ea996..63b7748 100644 --- a/apps/web/src/components/sign-up-form.tsx +++ b/apps/web/src/components/sign-up-form.tsx @@ -1,8 +1,8 @@ -import { authClient } from "@/lib/auth-client"; import { useForm } from "@tanstack/react-form"; import { useNavigate } from "@tanstack/react-router"; import { toast } from "sonner"; import z from "zod"; +import { authClient } from "@/lib/auth-client"; import Loader from "./loader"; import { Button } from "./ui/button"; import { Input } from "./ui/input"; @@ -58,16 +58,16 @@ export default function SignUpForm({ } return ( -
-

Create Account

+
+

Create Account

{ e.preventDefault(); e.stopPropagation(); form.handleSubmit(); }} - className="space-y-4" >
@@ -77,12 +77,12 @@ export default function SignUpForm({ field.handleChange(e.target.value)} + value={field.state.value} /> {field.state.meta.errors.map((error) => ( -

+

{error?.message}

))} @@ -99,13 +99,13 @@ export default function SignUpForm({ field.handleChange(e.target.value)} + type="email" + value={field.state.value} /> {field.state.meta.errors.map((error) => ( -

+

{error?.message}

))} @@ -122,13 +122,13 @@ export default function SignUpForm({ field.handleChange(e.target.value)} + type="password" + value={field.state.value} /> {field.state.meta.errors.map((error) => ( -

+

{error?.message}

))} @@ -140,9 +140,9 @@ export default function SignUpForm({ {(state) => ( @@ -152,9 +152,9 @@ export default function SignUpForm({
diff --git a/apps/web/src/components/theme-provider.tsx b/apps/web/src/components/theme-provider.tsx index d962534..c7426de 100644 --- a/apps/web/src/components/theme-provider.tsx +++ b/apps/web/src/components/theme-provider.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; import { ThemeProvider as NextThemesProvider } from "next-themes"; +import type * as React from "react"; export function ThemeProvider({ children, diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx index 68d62d8..1fd90bd 100644 --- a/apps/web/src/components/ui/button.tsx +++ b/apps/web/src/components/ui/button.tsx @@ -1,20 +1,20 @@ -import * as React from "react"; -import { Slot as SlotPrimitive } from "radix-ui"; import { cva, type VariantProps } from "class-variance-authority"; +import { Slot as SlotPrimitive } from "radix-ui"; +import type * as React from "react"; import { cn } from "@/lib/utils"; const buttonVariants = cva( - "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", + "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md font-medium text-sm outline-none transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0", { variants: { variant: { default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90", destructive: - "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", + "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40", outline: - "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50", + "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50", secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80", ghost: @@ -23,7 +23,7 @@ const buttonVariants = cva( }, size: { default: "h-9 px-4 py-2 has-[>svg]:px-3", - sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5", + sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5", lg: "h-10 rounded-md px-6 has-[>svg]:px-4", icon: "size-9", }, @@ -49,8 +49,8 @@ function Button({ return ( ); diff --git a/apps/web/src/components/ui/card.tsx b/apps/web/src/components/ui/card.tsx index 93a82d9..f2b0c2e 100644 --- a/apps/web/src/components/ui/card.tsx +++ b/apps/web/src/components/ui/card.tsx @@ -1,15 +1,15 @@ -import * as React from "react"; +import type * as React from "react"; import { cn } from "@/lib/utils"; function Card({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -18,11 +18,11 @@ function Card({ className, ...props }: React.ComponentProps<"div">) { function CardHeader({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -31,8 +31,8 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) { function CardTitle({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -41,8 +41,8 @@ function CardTitle({ className, ...props }: React.ComponentProps<"div">) { function CardDescription({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -51,11 +51,11 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) { function CardAction({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -64,8 +64,8 @@ function CardAction({ className, ...props }: React.ComponentProps<"div">) { function CardContent({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -74,8 +74,8 @@ function CardContent({ className, ...props }: React.ComponentProps<"div">) { function CardFooter({ className, ...props }: React.ComponentProps<"div">) { return (
); diff --git a/apps/web/src/components/ui/checkbox.tsx b/apps/web/src/components/ui/checkbox.tsx index 9d874d3..0e82ef8 100644 --- a/apps/web/src/components/ui/checkbox.tsx +++ b/apps/web/src/components/ui/checkbox.tsx @@ -1,6 +1,6 @@ -import * as React from "react"; -import { Checkbox as CheckboxPrimitive } from "radix-ui"; import { CheckIcon } from "lucide-react"; +import { Checkbox as CheckboxPrimitive } from "radix-ui"; +import type * as React from "react"; import { cn } from "@/lib/utils"; @@ -10,16 +10,16 @@ function Checkbox({ }: React.ComponentProps) { return ( diff --git a/apps/web/src/components/ui/dropdown-menu.tsx b/apps/web/src/components/ui/dropdown-menu.tsx index 80e3b40..301922d 100644 --- a/apps/web/src/components/ui/dropdown-menu.tsx +++ b/apps/web/src/components/ui/dropdown-menu.tsx @@ -1,8 +1,8 @@ "use client"; -import * as React from "react"; -import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui"; import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react"; +import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui"; +import type * as React from "react"; import { cn } from "@/lib/utils"; @@ -39,12 +39,12 @@ function DropdownMenuContent({ return ( @@ -70,13 +70,13 @@ function DropdownMenuItem({ }) { return ( ); @@ -90,12 +90,12 @@ function DropdownMenuCheckboxItem({ }: React.ComponentProps) { return ( @@ -126,11 +126,11 @@ function DropdownMenuRadioItem({ }: React.ComponentProps) { return ( @@ -152,12 +152,12 @@ function DropdownMenuLabel({ }) { return ( ); @@ -169,8 +169,8 @@ function DropdownMenuSeparator({ }: React.ComponentProps) { return ( ); @@ -182,11 +182,11 @@ function DropdownMenuShortcut({ }: React.ComponentProps<"span">) { return ( ); @@ -208,12 +208,12 @@ function DropdownMenuSubTrigger({ }) { return ( {children} @@ -228,11 +228,11 @@ function DropdownMenuSubContent({ }: React.ComponentProps) { return ( ); diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsx index 0316cc4..fa4853a 100644 --- a/apps/web/src/components/ui/input.tsx +++ b/apps/web/src/components/ui/input.tsx @@ -1,18 +1,18 @@ -import * as React from "react"; +import type * as React from "react"; import { cn } from "@/lib/utils"; function Input({ className, type, ...props }: React.ComponentProps<"input">) { return ( ); diff --git a/apps/web/src/components/ui/label.tsx b/apps/web/src/components/ui/label.tsx index a94bfae..18588d5 100644 --- a/apps/web/src/components/ui/label.tsx +++ b/apps/web/src/components/ui/label.tsx @@ -1,5 +1,5 @@ -import * as React from "react"; import { Label as LabelPrimitive } from "radix-ui"; +import type * as React from "react"; import { cn } from "@/lib/utils"; @@ -9,11 +9,11 @@ function Label({ }: React.ComponentProps) { return ( ); diff --git a/apps/web/src/components/ui/skeleton.tsx b/apps/web/src/components/ui/skeleton.tsx index 0168998..c9bce7d 100644 --- a/apps/web/src/components/ui/skeleton.tsx +++ b/apps/web/src/components/ui/skeleton.tsx @@ -3,8 +3,8 @@ import { cn } from "@/lib/utils"; function Skeleton({ className, ...props }: React.ComponentProps<"div">) { return (
); diff --git a/apps/web/src/components/ui/sonner.tsx b/apps/web/src/components/ui/sonner.tsx index f96a98d..14e7a85 100644 --- a/apps/web/src/components/ui/sonner.tsx +++ b/apps/web/src/components/ui/sonner.tsx @@ -8,7 +8,6 @@ const Toaster = ({ ...props }: ToasterProps) => { return ( { "--normal-border": "var(--border)", } as React.CSSProperties } + theme={theme as ToasterProps["theme"]} {...props} /> ); diff --git a/apps/web/src/components/user-menu.tsx b/apps/web/src/components/user-menu.tsx index 3f92e13..a5b3009 100644 --- a/apps/web/src/components/user-menu.tsx +++ b/apps/web/src/components/user-menu.tsx @@ -1,3 +1,4 @@ +import { Link, useNavigate } from "@tanstack/react-router"; import { DropdownMenu, DropdownMenuContent, @@ -7,10 +8,8 @@ import { DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; import { authClient } from "@/lib/auth-client"; -import { useNavigate } from "@tanstack/react-router"; import { Button } from "./ui/button"; import { Skeleton } from "./ui/skeleton"; -import { Link } from "@tanstack/react-router"; export default function UserMenu() { const navigate = useNavigate(); @@ -22,7 +21,7 @@ export default function UserMenu() { if (!session) { return ( - ); @@ -39,7 +38,6 @@ export default function UserMenu() { {session.user.email} diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts index a5ef193..365058c 100644 --- a/apps/web/src/lib/utils.ts +++ b/apps/web/src/lib/utils.ts @@ -1,4 +1,4 @@ -import { clsx, type ClassValue } from "clsx"; +import { type ClassValue, clsx } from "clsx"; import { twMerge } from "tailwind-merge"; export function cn(...inputs: ClassValue[]) { diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx index bdc5d91..d0c8ae3 100644 --- a/apps/web/src/main.tsx +++ b/apps/web/src/main.tsx @@ -1,9 +1,8 @@ -import { RouterProvider, createRouter } from "@tanstack/react-router"; +import { QueryClientProvider } from "@tanstack/react-query"; +import { createRouter, RouterProvider } from "@tanstack/react-router"; import ReactDOM from "react-dom/client"; import Loader from "./components/loader"; import { routeTree } from "./routeTree.gen"; - -import { QueryClientProvider } from "@tanstack/react-query"; import { queryClient, trpc } from "./utils/trpc"; const router = createRouter({ @@ -11,7 +10,7 @@ const router = createRouter({ defaultPreload: "intent", defaultPendingComponent: () => , context: { trpc, queryClient }, - Wrap: function WrapComponent({ children }: { children: React.ReactNode }) { + Wrap({ children }: { children: React.ReactNode }) { return ( {children} ); diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx index 6fdf250..73f3a2a 100644 --- a/apps/web/src/routes/__root.tsx +++ b/apps/web/src/routes/__root.tsx @@ -1,17 +1,17 @@ +import type { QueryClient } from "@tanstack/react-query"; +import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; +import { + createRootRouteWithContext, + HeadContent, + Outlet, + useRouterState, +} from "@tanstack/react-router"; +import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"; import Header from "@/components/header"; import Loader from "@/components/loader"; import { ThemeProvider } from "@/components/theme-provider"; import { Toaster } from "@/components/ui/sonner"; import type { trpc } from "@/utils/trpc"; -import type { QueryClient } from "@tanstack/react-query"; -import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; -import { - HeadContent, - Outlet, - createRootRouteWithContext, - useRouterState, -} from "@tanstack/react-router"; -import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"; import "../index.css"; export interface RouterAppContext { @@ -54,14 +54,14 @@ function RootComponent() { disableTransitionOnChange storageKey="vite-ui-theme" > -
+
{isFetching ? : }
- + ); } diff --git a/apps/web/src/routes/dashboard.tsx b/apps/web/src/routes/dashboard.tsx index c53ce0c..b84d4b8 100644 --- a/apps/web/src/routes/dashboard.tsx +++ b/apps/web/src/routes/dashboard.tsx @@ -1,8 +1,8 @@ -import { authClient } from "@/lib/auth-client"; -import { trpc } from "@/utils/trpc"; import { useQuery } from "@tanstack/react-query"; import { createFileRoute } from "@tanstack/react-router"; import { useEffect } from "react"; +import { authClient } from "@/lib/auth-client"; +import { trpc } from "@/utils/trpc"; export const Route = createFileRoute("/dashboard")({ component: RouteComponent, @@ -16,7 +16,7 @@ function RouteComponent() { const privateData = useQuery(trpc.privateData.queryOptions()); useEffect(() => { - if (!session && !isPending) { + if (!(session || isPending)) { navigate({ to: "/login", }); diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx index 9f5a627..ff9d3ca 100644 --- a/apps/web/src/routes/index.tsx +++ b/apps/web/src/routes/index.tsx @@ -1,6 +1,6 @@ +import { useQuery } from "@tanstack/react-query"; import { createFileRoute } from "@tanstack/react-router"; import { trpc } from "@/utils/trpc"; -import { useQuery } from "@tanstack/react-query"; export const Route = createFileRoute("/")({ component: HomeComponent, @@ -35,7 +35,7 @@ function HomeComponent() {
- + {healthCheck.isLoading ? "Checking..." : healthCheck.data diff --git a/apps/web/src/routes/login.tsx b/apps/web/src/routes/login.tsx index 81dc6a0..5fbaa46 100644 --- a/apps/web/src/routes/login.tsx +++ b/apps/web/src/routes/login.tsx @@ -1,7 +1,7 @@ -import SignInForm from "@/components/sign-in-form"; -import SignUpForm from "@/components/sign-up-form"; import { createFileRoute } from "@tanstack/react-router"; import { useState } from "react"; +import SignInForm from "@/components/sign-in-form"; +import SignUpForm from "@/components/sign-up-form"; export const Route = createFileRoute("/login")({ component: RouteComponent, diff --git a/apps/web/src/utils/trpc.ts b/apps/web/src/utils/trpc.ts index 986941c..7195c7c 100644 --- a/apps/web/src/utils/trpc.ts +++ b/apps/web/src/utils/trpc.ts @@ -1,8 +1,8 @@ -import type { AppRouter } from "../../../server/src/routers"; import { QueryCache, QueryClient } from "@tanstack/react-query"; import { createTRPCClient, httpBatchLink } from "@trpc/client"; import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query"; import { toast } from "sonner"; +import type { AppRouter } from "../../../server/src/routers"; export const queryClient = new QueryClient({ queryCache: new QueryCache({ diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 1a0a1e1..539bb91 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -1,9 +1,9 @@ -import { VitePWA } from "vite-plugin-pwa"; +import path from "node:path"; import tailwindcss from "@tailwindcss/vite"; import { tanstackRouter } from "@tanstack/router-plugin/vite"; import react from "@vitejs/plugin-react"; -import path from "node:path"; import { defineConfig } from "vite"; +import { VitePWA } from "vite-plugin-pwa"; export default defineConfig({ plugins: [