fix config

app/components/forms.tsx

@@ -1,4 +1,4 @@
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export type ListOfErrors = Array<string | null | undefined> | null | undefined;
 

app/components/logo.tsx

@@ -1,4 +1,4 @@
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export function Logo({ className }: { className?: string }) {
   return (

app/components/ui/avatar.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Avatar = forwardRef<
   ElementRef<typeof AvatarPrimitive.Root>,

app/components/ui/breadcrumb.tsx

@@ -6,7 +6,7 @@ import {
   type ComponentPropsWithoutRef,
   type ReactNode,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Breadcrumb = forwardRef<
   HTMLElement,

app/components/ui/button.tsx

@@ -1,6 +1,6 @@
 import { Slot } from "@radix-ui/react-slot";
 import { forwardRef, type ButtonHTMLAttributes } from "react";
-import { cva, cx, type VariantProps } from "~/utils/misc";
+import { cva, cx, type VariantProps } from "~/lib/utils";
 
 export const buttonVariants = cva({
   base: "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",

app/components/ui/card.tsx

@@ -1,6 +1,6 @@
 import { Slot } from "@radix-ui/react-slot";
 import { forwardRef, type HTMLAttributes } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
   ({ className, ...props }, ref) => (

app/components/ui/dropdown-menu.tsx

@@ -10,7 +10,7 @@ import {
   type ElementRef,
   type HTMLAttributes,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const DropdownMenu = DropdownMenuPrimitive.Root;
 

app/components/ui/input.tsx

@@ -1,5 +1,5 @@
 import { forwardRef, type ComponentProps } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Input = forwardRef<HTMLInputElement, ComponentProps<"input">>(
   ({ className, ...props }, ref) => {

app/components/ui/label.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cva, cx, type VariantProps } from "~/utils/misc";
+import { cva, cx, type VariantProps } from "~/lib/utils";
 
 export const labelVariants = cva({
   base: "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",

app/components/ui/scroll-area.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const ScrollArea = forwardRef<
   ElementRef<typeof ScrollAreaPrimitive.Root>,

app/components/ui/separator.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Separator = forwardRef<
   ElementRef<typeof SeparatorPrimitive.Root>,

app/components/ui/textarea.tsx

@@ -1,5 +1,5 @@
 import { forwardRef, type ComponentProps } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const Textarea = forwardRef<
   HTMLTextAreaElement,

app/components/ui/toggle.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cva, cx, type VariantProps } from "~/utils/misc";
+import { cva, cx, type VariantProps } from "~/lib/utils";
 
 export const toggleVariants = cva({
   base: "inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",

app/components/ui/tooltip.tsx

@@ -4,7 +4,7 @@ import {
   type ComponentPropsWithoutRef,
   type ElementRef,
 } from "react";
-import { cx } from "~/utils/misc";
+import { cx } from "~/lib/utils";
 
 export const TooltipProvider = TooltipPrimitive.Provider;
 

app/root.tsx

@@ -2,7 +2,7 @@ import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 import type { Route } from "./+types/root";
 import stylesheet from "./app.css?url";
 import { TooltipProvider } from "./components/ui/tooltip";
-import { getUser } from "./utils/auth.server";
+import { getUser } from "./lib/auth.server";
 
 export const links: Route.LinksFunction = () => [
   { rel: "stylesheet", href: stylesheet },

app/routes/_auth.join.tsx

@@ -14,9 +14,9 @@ import {
 } from "~/components/ui/card";
 import { Input } from "~/components/ui/input";
 import { Label } from "~/components/ui/label";
-import { createUser, createUserSession } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
-import { composeSafeRedirectUrl } from "~/utils/misc";
+import { createUser, createUserSession } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
+import { composeSafeRedirectUrl } from "~/lib/utils";
 import type { Route } from "./+types/_auth.join";
 
 const CreateAccountSchema = z.object({

app/routes/_auth.login.tsx

@@ -14,8 +14,8 @@ import {
 } from "~/components/ui/card";
 import { Input } from "~/components/ui/input";
 import { Label } from "~/components/ui/label";
-import { createUserSession, verifyLogin } from "~/utils/auth.server";
-import { composeSafeRedirectUrl } from "~/utils/misc";
+import { createUserSession, verifyLogin } from "~/lib/auth.server";
+import { composeSafeRedirectUrl } from "~/lib/utils";
 import type { Route } from "./+types/_auth.login";
 
 const LoginSchema = z.object({

app/routes/_auth.logout.tsx

@@ -1,5 +1,5 @@
 import { redirect } from "react-router";
-import { logout } from "~/utils/auth.server";
+import { logout } from "~/lib/auth.server";
 import type { Route } from "./+types/_auth.logout";
 
 export async function loader() {

app/routes/_auth.tsx

@@ -1,5 +1,5 @@
 import { Outlet, redirect } from "react-router";
-import { getUserId } from "~/utils/auth.server";
+import { getUserId } from "~/lib/auth.server";
 import type { Route } from "./+types/_auth";
 
 export async function loader({ request }: Route.LoaderArgs) {

app/routes/_dashboard.contacts.$contactId._index.tsx

@@ -4,8 +4,8 @@ import { data, Form, Link } from "react-router";
 import { EmptyState } from "~/components/empty-state";
 import { Button } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
 import type { Route } from "./+types/_dashboard.contacts.$contactId._index";
 
 export async function loader({ request, params }: Route.LoaderArgs) {

app/routes/_dashboard.contacts.$contactId.notes.tsx

@@ -14,9 +14,9 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
-import { useClipboard } from "~/utils/misc";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
+import { useClipboard } from "~/lib/utils";
 import type { Route } from "./+types/_dashboard.contacts.$contactId.notes";
 
 type LoaderData = Route.ComponentProps["loaderData"];

app/routes/_dashboard.contacts.$contactId.notes_.$noteId.edit.tsx

@@ -10,8 +10,8 @@ import {
 } from "~/components/ui/breadcrumb";
 import { Button } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
 import type { Route } from "./+types/_dashboard.contacts.$contactId.notes_.$noteId.edit";
 
 export async function loader({ params }: Route.LoaderArgs) {

app/routes/_dashboard.contacts.$contactId.tsx

@@ -28,9 +28,9 @@ import {
 import { Button } from "~/components/ui/button";
 import { Separator } from "~/components/ui/separator";
 import { Toggle } from "~/components/ui/toggle";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
-import { cx } from "~/utils/misc";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
+import { cx } from "~/lib/utils";
 import type { Route } from "./+types/_dashboard.contacts.$contactId";
 
 export const meta: Route.MetaFunction = ({ data, error }) => {

app/routes/_dashboard.contacts.$contactId_.edit.tsx

@@ -22,8 +22,8 @@ import { Input } from "~/components/ui/input";
 import { Label } from "~/components/ui/label";
 import { Separator } from "~/components/ui/separator";
 import { Textarea } from "~/components/ui/textarea";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
 import type { Route } from "./+types/_dashboard.contacts.$contactId_.edit";
 
 const EditContactSchema = z.object({

app/routes/_dashboard.contacts.tsx

@@ -25,9 +25,9 @@ import { LoadingOverlay } from "~/components/loading-overlay";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
 import { ScrollArea } from "~/components/ui/scroll-area";
-import { requireUserId } from "~/utils/auth.server";
-import { db } from "~/utils/db.server";
-import { cx } from "~/utils/misc";
+import { requireUserId } from "~/lib/auth.server";
+import { db } from "~/lib/db.server";
+import { cx } from "~/lib/utils";
 import type { Route } from "./+types/_dashboard.contacts";
 
 export const meta: Route.MetaFunction = () => {

app/routes/_index.tsx

@@ -1,7 +1,7 @@
 import { Link } from "react-router";
 import { Logo } from "~/components/logo";
 import { buttonVariants } from "~/components/ui/button";
-import { useOptionalUser } from "~/utils/user";
+import { useOptionalUser } from "~/lib/user";
 import type { Route } from "./+types/_index";
 
 export const meta: Route.MetaFunction = () => {

components.json

@@ -5,7 +5,7 @@
   "tsx": true,
   "tailwind": {
     "config": "tailwind.config.ts",
-    "css": "app/tailwind.css",
+    "css": "app/app.css",
     "baseColor": "slate",
     "cssVariables": true,
     "prefix": ""
@@ -14,7 +14,7 @@
     "components": "~/components",
     "utils": "~/lib/utils",
     "ui": "~/components/ui",
-    "lib": "~/utils",
+    "lib": "~/lib",
     "hooks": "~/hooks"
   }
 }