refactor and reorganize

src/app/[orgId]/layout.tsx

@@ -1,5 +1,5 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import ProfileIcon from "@app/components/ProfileIcon";
 import { verifySession } from "@app/lib/auth/verifySession";
 import UserProvider from "@app/providers/UserProvider";

src/app/[orgId]/page.tsx

@@ -2,11 +2,11 @@ import ProfileIcon from "@app/components/ProfileIcon";
 import { verifySession } from "@app/lib/auth/verifySession";
 import UserProvider from "@app/providers/UserProvider";
 import { cache } from "react";
-import OrganizationLandingCard from "./components/OrganizationLandingCard";
+import OrganizationLandingCard from "./OrganizationLandingCard";
 import { GetOrgOverviewResponse } from "@server/routers/org/getOrgOverview";
-import { internal } from "@app/api";
+import { internal } from "@app/lib/api";
 import { AxiosResponse } from "axios";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { redirect } from "next/navigation";
 
 type OrgPageProps = {

src/app/[orgId]/settings/access/roles/CreateRoleForm.tsx

@@ -28,8 +28,8 @@ import {
 } from "@app/components/Credenza";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { CreateRoleBody, CreateRoleResponse } from "@server/routers/role";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 type CreateRoleFormProps = {

src/app/[orgId]/settings/access/roles/DeleteRoleForm.tsx

@@ -35,8 +35,8 @@ import {
     SelectValue,
 } from "@app/components/ui/select";
 import { RoleRow } from "./RolesTable";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 type CreateRoleFormProps = {

src/app/[orgId]/settings/access/roles/RolesTable.tsx

@@ -17,7 +17,7 @@ import { RolesDataTable } from "./RolesDataTable";
 import { Role } from "@server/db/schema";
 import CreateRoleForm from "./CreateRoleForm";
 import DeleteRoleForm from "./DeleteRoleForm";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 export type RoleRow = Role;

src/app/[orgId]/settings/access/roles/page.tsx

@@ -1,13 +1,13 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { AxiosResponse } from "axios";
 import { GetOrgResponse } from "@server/routers/org";
 import { cache } from "react";
 import OrgProvider from "@app/providers/OrgProvider";
 import { ListRolesResponse } from "@server/routers/role";
-import RolesTable, { RoleRow } from "./components/RolesTable";
+import RolesTable, { RoleRow } from "./RolesTable";
 import { SidebarSettings } from "@app/components/SidebarSettings";
-import AccessPageHeaderAndNav from "../components/AccessPageHeaderAndNav";
+import AccessPageHeaderAndNav from "../AccessPageHeaderAndNav";
 
 type RolesPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/access/users/InviteUserForm.tsx

@@ -37,8 +37,8 @@ import {
 } from "@app/components/Credenza";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { ListRolesResponse } from "@server/routers/role";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { Checkbox } from "@app/components/ui/checkbox";
 

src/app/[orgId]/settings/access/users/UsersDataTable.tsx

@@ -22,7 +22,7 @@ import {
 import { Button } from "@app/components/ui/button";
 import { useState } from "react";
 import { Input } from "@app/components/ui/input";
-import { DataTablePagination } from "../../../../../../components/DataTablePagination";
+import { DataTablePagination } from "@app/components/DataTablePagination";
 import { Plus, Search } from "lucide-react";
 
 interface DataTableProps<TData, TValue> {

src/app/[orgId]/settings/access/users/UsersTable.tsx

@@ -17,8 +17,8 @@ import { useOrgContext } from "@app/hooks/useOrgContext";
 import { useToast } from "@app/hooks/useToast";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useUserContext } from "@app/hooks/useUserContext";
 

src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx

@@ -28,8 +28,8 @@ import { userOrgUserContext } from "@app/hooks/useOrgUserContext";
 import { useParams } from "next/navigation";
 import { Button } from "@app/components/ui/button";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const formSchema = z.object({

src/app/[orgId]/settings/access/users/[userId]/layout.tsx

@@ -1,7 +1,7 @@
-import { internal } from "@app/api";
+import { internal } from "@app/lib/api";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { SidebarSettings } from "@app/components/SidebarSettings";
 import { GetOrgUserResponse } from "@server/routers/user";
 import OrgUserProvider from "@app/providers/OrgUserProvider";

src/app/[orgId]/settings/access/users/page.tsx

@@ -1,15 +1,14 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListUsersResponse } from "@server/routers/user";
 import { AxiosResponse } from "axios";
-import UsersTable, { UserRow } from "./components/UsersTable";
+import UsersTable, { UserRow } from "./UsersTable";
 import { GetOrgResponse } from "@server/routers/org";
 import { cache } from "react";
 import OrgProvider from "@app/providers/OrgProvider";
 import UserProvider from "@app/providers/UserProvider";
 import { verifySession } from "@app/lib/auth/verifySession";
-import { SidebarSettings } from "@app/components/SidebarSettings";
-import AccessPageHeaderAndNav from "../components/AccessPageHeaderAndNav";
+import AccessPageHeaderAndNav from "../AccessPageHeaderAndNav";
 
 type UsersPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/general/layout.tsx

@@ -1,5 +1,5 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { SidebarSettings } from "@app/components/SidebarSettings";
 import { verifySession } from "@app/lib/auth/verifySession";

src/app/[orgId]/settings/general/page.tsx

@@ -19,9 +19,9 @@ import { Input } from "@/components/ui/input";
 import { z } from "zod";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { AlertTriangle, Trash2 } from "lucide-react";
 import {
     Card,

src/app/[orgId]/settings/layout.tsx

@@ -4,10 +4,10 @@ import { Cog, Combine, Link, Settings, Users, Waypoints } from "lucide-react";
 import { Header } from "@app/components/Header";
 import { verifySession } from "@app/lib/auth/verifySession";
 import { redirect } from "next/navigation";
-import { internal } from "@app/api";
+import { internal } from "@app/lib/api";
 import { AxiosResponse } from "axios";
 import { GetOrgResponse, ListOrgsResponse } from "@server/routers/org";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { cache } from "react";
 import { GetOrgUserResponse } from "@server/routers/user";
 import UserProvider from "@app/providers/UserProvider";

src/app/[orgId]/settings/resources/CreateResourceForm.tsx

@@ -28,7 +28,7 @@ import {
 } from "@app/components/Credenza";
 import { useParams, useRouter } from "next/navigation";
 import { ListSitesResponse } from "@server/routers/site";
-import { cn, formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";
 import { CheckIcon } from "lucide-react";
 import {
     Popover,
@@ -44,13 +44,14 @@ import {
     CommandList
 } from "@app/components/ui/command";
 import { CaretSortIcon } from "@radix-ui/react-icons";
-import CustomDomainInput from "../[resourceId]/components/CustomDomainInput";
+import CustomDomainInput from "./[resourceId]/CustomDomainInput";
 import { Axios, AxiosResponse } from "axios";
 import { Resource } from "@server/db/schema";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { subdomainSchema } from "@server/schemas/subdomainSchema";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
+import { cn } from "@app/lib/cn";
 
 const accountFormSchema = z.object({
     subdomain: subdomainSchema,

src/app/[orgId]/settings/resources/ResourcesTable.tsx

@@ -25,9 +25,9 @@ import CreateResourceForm from "./CreateResourceForm";
 import { useState } from "react";
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { set } from "zod";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { useToast } from "@app/hooks/useToast";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import CopyToClipboard from "@app/components/CopyToClipboard";
 

src/app/[orgId]/settings/resources/[resourceId]/authentication/SetResourcePasswordForm.tsx

@@ -26,10 +26,10 @@ import {
     CredenzaHeader,
     CredenzaTitle,
 } from "@app/components/Credenza";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { AxiosResponse } from "axios";
 import { Resource } from "@server/db/schema";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const setPasswordFormSchema = z.object({

src/app/[orgId]/settings/resources/[resourceId]/authentication/SetResourcePincodeForm.tsx

@@ -26,7 +26,7 @@ import {
     CredenzaHeader,
     CredenzaTitle,
 } from "@app/components/Credenza";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { AxiosResponse } from "axios";
 import { Resource } from "@server/db/schema";
 import {
@@ -34,7 +34,7 @@ import {
     InputOTPGroup,
     InputOTPSlot,
 } from "@app/components/ui/input-otp";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const setPincodeFormSchema = z.object({

src/app/[orgId]/settings/resources/[resourceId]/authentication/page.tsx

@@ -6,7 +6,7 @@ import { useToast } from "@app/hooks/useToast";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { useResourceContext } from "@app/hooks/useResourceContext";
 import { AxiosResponse } from "axios";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import {
     GetResourceAuthInfoResponse,
     GetResourceWhitelistResponse,
@@ -33,10 +33,10 @@ import { ListUsersResponse } from "@server/routers/user";
 import { Switch } from "@app/components/ui/switch";
 import { Label } from "@app/components/ui/label";
 import { Binary, Key, ShieldCheck } from "lucide-react";
-import SetResourcePasswordForm from "./components/SetResourcePasswordForm";
+import SetResourcePasswordForm from "./SetResourcePasswordForm";
 import { Separator } from "@app/components/ui/separator";
-import SetResourcePincodeForm from "./components/SetResourcePincodeForm";
-import { createApiClient } from "@app/api";
+import SetResourcePincodeForm from "./SetResourcePincodeForm";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const UsersRolesFormSchema = z.object({

src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx

@@ -48,9 +48,9 @@ import { useToast } from "@app/hooks/useToast";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { useResourceContext } from "@app/hooks/useResourceContext";
 import { ArrayElement } from "@server/types/ArrayElement";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api/formatAxiosError";;
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { GetSiteResponse } from "@server/routers/site";
 
 const addTargetSchema = z.object({

src/app/[orgId]/settings/resources/[resourceId]/general/page.tsx

@@ -2,7 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
-import { cn, formatAxiosError } from "@/lib/utils";
+import { formatAxiosError } from "@app/lib/api";
 import { Button } from "@/components/ui/button";
 import {
     Form,
@@ -39,10 +39,10 @@ import { GetResourceAuthInfoResponse } from "@server/routers/resource";
 import { useToast } from "@app/hooks/useToast";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { useOrgContext } from "@app/hooks/useOrgContext";
-import CustomDomainInput from "../components/CustomDomainInput";
-import ResourceInfoBox from "../components/ResourceInfoBox";
+import CustomDomainInput from "../CustomDomainInput";
+import ResourceInfoBox from "../ResourceInfoBox";
 import { subdomainSchema } from "@server/schemas/subdomainSchema";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const GeneralFormSchema = z.object({

src/app/[orgId]/settings/resources/[resourceId]/layout.tsx

@@ -1,19 +1,19 @@
 import ResourceProvider from "@app/providers/ResourceProvider";
-import { internal } from "@app/api";
+import { internal } from "@app/lib/api";
 import {
     GetResourceAuthInfoResponse,
     GetResourceResponse,
 } from "@server/routers/resource";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { SidebarSettings } from "@app/components/SidebarSettings";
 import {  Cloud, Settings, Shield } from "lucide-react";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { GetOrgResponse } from "@server/routers/org";
 import OrgProvider from "@app/providers/OrgProvider";
 import { cache } from "react";
-import ResourceInfoBox from "./components/ResourceInfoBox";
+import ResourceInfoBox from "./ResourceInfoBox";
 import {
     Breadcrumb,
     BreadcrumbItem,

src/app/[orgId]/settings/resources/page.tsx

@@ -1,6 +1,6 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
-import ResourcesTable, { ResourceRow } from "./components/ResourcesTable";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
+import ResourcesTable, { ResourceRow } from "./ResourcesTable";
 import { AxiosResponse } from "axios";
 import { ListResourcesResponse } from "@server/routers/resource";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";

src/app/[orgId]/settings/share-links/CreateShareLinkForm.tsx

@@ -38,8 +38,9 @@ import {
 } from "@app/components/Credenza";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { ListRolesResponse } from "@server/routers/role";
-import { cn, formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";
+import { cn } from "@app/lib/cn";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { ListResourcesResponse } from "@server/routers/resource";
 import {

src/app/[orgId]/settings/share-links/ShareLinksTable.tsx

@@ -24,9 +24,9 @@ import { useRouter } from "next/navigation";
 // import CreateResourceForm from "./CreateResourceForm";
 import { useState } from "react";
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { useToast } from "@app/hooks/useToast";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { ArrayElement } from "@server/types/ArrayElement";
 import { ListAccessTokensResponse } from "@server/routers/accessToken";

src/app/[orgId]/settings/share-links/page.tsx

@@ -1,5 +1,5 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { AxiosResponse } from "axios";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { redirect } from "next/navigation";
@@ -7,7 +7,7 @@ import { cache } from "react";
 import { GetOrgResponse } from "@server/routers/org";
 import OrgProvider from "@app/providers/OrgProvider";
 import { ListAccessTokensResponse } from "@server/routers/accessToken";
-import ShareLinksTable, { ShareLinkRow } from "./components/ShareLinksTable";
+import ShareLinksTable, { ShareLinkRow } from "./ShareLinksTable";
 
 type ShareLinksPageProps = {
     params: Promise<{ orgId: string }>;

src/app/[orgId]/settings/sites/CreateSiteForm.tsx

@@ -21,7 +21,7 @@ import {
     CreateSiteResponse,
     PickSiteDefaultsResponse
 } from "@server/routers/site";
-import { generateKeypair } from "../[niceId]/components/wireguardConfig";
+import { generateKeypair } from "./[niceId]/wireguardConfig";
 import CopyTextBox from "@app/components/CopyTextBox";
 import { Checkbox } from "@app/components/ui/checkbox";
 import {
@@ -31,8 +31,8 @@ import {
     SelectTrigger,
     SelectValue
 } from "@app/components/ui/select";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { SiteRow } from "./SitesTable";
 import { AxiosResponse } from "axios";

src/app/[orgId]/settings/sites/SitesDataTable.tsx

@@ -23,7 +23,7 @@ import {
 import { Button } from "@app/components/ui/button";
 import { useState } from "react";
 import { Input } from "@app/components/ui/input";
-import { DataTablePagination } from "../../../../../components/DataTablePagination";
+import { DataTablePagination } from "@app/components/DataTablePagination";
 import { Plus, Search } from "lucide-react";
 
 interface DataTableProps<TData, TValue> {

src/app/[orgId]/settings/sites/SitesTable.tsx

@@ -23,8 +23,8 @@ import { useState } from "react";
 import CreateSiteForm from "./CreateSiteForm";
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { useToast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import CreateSiteFormModal from "./CreateSiteModal";
 

src/app/[orgId]/settings/sites/[niceId]/general/page.tsx

@@ -18,8 +18,8 @@ import { useForm } from "react-hook-form";
 import { useToast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const GeneralFormSchema = z.object({

src/app/[orgId]/settings/sites/[niceId]/layout.tsx

@@ -1,9 +1,9 @@
 import SiteProvider from "@app/providers/SiteProvider";
-import { internal } from "@app/api";
+import { internal } from "@app/lib/api";
 import { GetSiteResponse } from "@server/routers/site";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { SidebarSettings } from "@app/components/SidebarSettings";
 import Link from "next/link";
 import { ArrowLeft } from "lucide-react";
@@ -15,7 +15,7 @@ import {
     BreadcrumbPage,
     BreadcrumbSeparator
 } from "@app/components/ui/breadcrumb";
-import SiteInfoCard from "./components/SiteInfoCard";
+import SiteInfoCard from "./SiteInfoCard";
 
 interface SettingsLayoutProps {
     children: React.ReactNode;

src/app/[orgId]/settings/sites/page.tsx

@@ -1,8 +1,8 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListSitesResponse } from "@server/routers/site";
 import { AxiosResponse } from "axios";
-import SitesTable, { SiteRow } from "./components/SitesTable";
+import SitesTable, { SiteRow } from "./SitesTable";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 
 type SitesPageProps = {

src/app/auth/login/DashboardLoginForm.tsx

@@ -7,7 +7,7 @@ import {
     CardHeader,
     CardTitle
 } from "@/components/ui/card";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import LoginForm from "@app/components/LoginForm";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useRouter } from "next/navigation";

src/app/auth/reset-password/ResetPasswordForm.tsx

@@ -25,14 +25,12 @@ import { Input } from "@/components/ui/input";
 import {
     InputOTP,
     InputOTPGroup,
-    InputOTPSeparator,
     InputOTPSlot
 } from "@/components/ui/input-otp";
 import { AxiosResponse } from "axios";
 import {
     RequestPasswordResetBody,
     RequestPasswordResetResponse,
-    resetPasswordBody,
     ResetPasswordBody,
     ResetPasswordResponse
 } from "@server/routers/auth";
@@ -40,12 +38,11 @@ import { Loader2 } from "lucide-react";
 import { Alert, AlertDescription } from "../../../components/ui/alert";
 import { useToast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { passwordSchema } from "@server/auth/passwordSchema";
-import { get } from "http";
 import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
+import { passwordSchema } from "@server/auth/passwordSchema";
 
 const requestSchema = z.object({
     email: z.string().email()

src/app/auth/resource/[resourceId]/AccessToken.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { Button } from "@app/components/ui/button";
 import {
     Card,

src/app/auth/resource/[resourceId]/ResourceAuthPortal.tsx

@@ -42,13 +42,13 @@ import {
 } from "@app/components/ui/input-otp";
 import { useRouter } from "next/navigation";
 import { Alert, AlertDescription } from "@app/components/ui/alert";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { AxiosResponse } from "axios";
 import LoginForm from "@app/components/LoginForm";
 import { AuthWithPasswordResponse, AuthWithAccessTokenResponse, AuthWithWhitelistResponse } from "@server/routers/resource";
 import { redirect } from "next/dist/server/api-utils";
 import ResourceAccessDenied from "./ResourceAccessDenied";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useToast } from "@app/hooks/useToast";
 

src/app/auth/resource/[resourceId]/page.tsx

@@ -3,19 +3,19 @@ import {
     GetResourceAuthInfoResponse,
     GetResourceResponse
 } from "@server/routers/resource";
-import ResourceAuthPortal from "./components/ResourceAuthPortal";
-import { internal, priv } from "@app/api";
+import ResourceAuthPortal from "./ResourceAuthPortal";
+import { internal, priv } from "@app/lib/api";
 import { AxiosResponse } from "axios";
-import { authCookieHeader } from "@app/api/cookies";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { cache } from "react";
 import { verifySession } from "@app/lib/auth/verifySession";
 import { redirect } from "next/navigation";
-import ResourceNotFound from "./components/ResourceNotFound";
-import ResourceAccessDenied from "./components/ResourceAccessDenied";
+import ResourceNotFound from "./ResourceNotFound";
+import ResourceAccessDenied from "./ResourceAccessDenied";
 import { cookies } from "next/headers";
 import { CheckResourceSessionResponse } from "@server/routers/auth";
-import AccessTokenInvalid from "./components/AccessToken";
-import AccessToken from "./components/AccessToken";
+import AccessTokenInvalid from "./AccessToken";
+import AccessToken from "./AccessToken";
 
 export default async function ResourceAuthPage(props: {
     params: Promise<{ resourceId: number }>;

src/app/auth/signup/SignupForm.tsx

@@ -26,8 +26,8 @@ import { SignUpResponse } from "@server/routers/auth";
 import { useRouter } from "next/navigation";
 import { passwordSchema } from "@server/auth/passwordSchema";
 import { AxiosResponse } from "axios";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 type SignupFormProps = {

src/app/auth/verify-email/VerifyEmailForm.tsx

@@ -33,8 +33,8 @@ import { Loader2 } from "lucide-react";
 import { Alert, AlertDescription } from "../../../components/ui/alert";
 import { useToast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 const FormSchema = z.object({

src/app/invite/InviteStatusCard.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { Button } from "@app/components/ui/button";
 import {
     Card,

src/app/invite/page.tsx

@@ -1,11 +1,11 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { verifySession } from "@app/lib/auth/verifySession";
 import { AcceptInviteResponse } from "@server/routers/user";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
 import InviteStatusCard from "./InviteStatusCard";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 
 export default async function InvitePage(props: {
     searchParams: Promise<{ [key: string]: string | string[] | undefined }>;

src/app/page.tsx

@@ -1,5 +1,5 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import ProfileIcon from "@app/components/ProfileIcon";
 import { verifySession } from "@app/lib/auth/verifySession";
 import UserProvider from "@app/providers/UserProvider";

src/app/setup/page.tsx

@@ -14,8 +14,8 @@ import {
     CardTitle
 } from "@app/components/ui/card";
 import CopyTextBox from "@app/components/CopyTextBox";
-import { formatAxiosError } from "@app/lib/utils";
-import { createApiClient } from "@app/api";
+import { formatAxiosError } from "@app/lib/api";;
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { Separator } from "@/components/ui/separator";
 import { z } from "zod";
@@ -32,7 +32,7 @@ import {
     FormMessage
 } from "@app/components/ui/form";
 import { Alert, AlertDescription } from "@app/components/ui/alert";
-import CreateSiteForm from "../[orgId]/settings/sites/components/CreateSiteForm";
+import CreateSiteForm from "../[orgId]/settings/sites/CreateSiteForm";
 
 type Step = "org" | "site" | "resources";
 

src/components/ConfirmDeleteDialog.tsx

@@ -41,7 +41,7 @@ import {
 } from "@app/components/Credenza";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { Description } from "@radix-ui/react-toast";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
 type InviteUserFormProps = {

src/components/Credenza.tsx

@@ -2,7 +2,7 @@
 
 import * as React from "react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 import { useMediaQuery } from "@app/hooks/useMediaQuery";
 import {
     Dialog,

src/components/Disable2FaForm.tsx

@@ -3,7 +3,7 @@
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { AxiosResponse } from "axios";
 import { Disable2faBody, Disable2faResponse } from "@server/routers/auth";
@@ -29,7 +29,7 @@ import {
     CredenzaTitle
 } from "@app/components/Credenza";
 import { useToast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { useUserContext } from "@app/hooks/useUserContext";
 import { InputOTP, InputOTPGroup, InputOTPSlot } from "./ui/input-otp";
 import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";

src/components/Enable2FaForm.tsx

@@ -5,7 +5,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { AlertCircle, CheckCircle2 } from "lucide-react";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { AxiosResponse } from "axios";
 import {
@@ -36,7 +36,7 @@ import {
     CredenzaTitle
 } from "@app/components/Credenza";
 import { useToast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import CopyTextBox from "@app/components/CopyTextBox";
 import { QRCodeCanvas, QRCodeSVG } from "qrcode.react";
 import { useUserContext } from "@app/hooks/useUserContext";

src/components/Header.tsx

@@ -16,7 +16,7 @@ import {
     PopoverTrigger
 } from "@app/components/ui/popover";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { cn } from "@app/lib/utils";
+import { cn } from "@app/lib/cn";
 import { ListOrgsResponse } from "@server/routers/org";
 import { Check, ChevronsUpDown, Plus } from "lucide-react";
 import Link from "next/link";

src/components/LoginForm.tsx

@@ -25,9 +25,9 @@ import { Alert, AlertDescription } from "@/components/ui/alert";
 import { LoginResponse } from "@server/routers/auth";
 import { useRouter } from "next/navigation";
 import { AxiosResponse } from "axios";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { LockIcon } from "lucide-react";
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import {
     InputOTP,

src/components/ProfileIcon.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { createApiClient } from "@app/api";
+import { createApiClient } from "@app/lib/api";
 import { Avatar, AvatarFallback } from "@app/components/ui/avatar";
 import { Button } from "@app/components/ui/button";
 import {
@@ -13,7 +13,7 @@ import {
 } from "@app/components/ui/dropdown-menu";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useToast } from "@app/hooks/useToast";
-import { formatAxiosError } from "@app/lib/utils";
+import { formatAxiosError } from "@app/lib/api";;
 import { Laptop, LogOut, Moon, Sun } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useRouter } from "next/navigation";

src/components/SidebarNav.tsx

@@ -3,7 +3,7 @@
 import React, { useEffect } from "react";
 import Link from "next/link";
 import { useParams, usePathname, useRouter } from "next/navigation";
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 import { buttonVariants } from "@/components/ui/button";
 import {
     Select,

src/components/SidebarSettings.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { SidebarNav } from "@app/components/sidebar-nav";
+import { SidebarNav } from "@app/components/SidebarNav";
 import React from "react";
 
 interface SideBarSettingsProps {
@@ -18,7 +18,7 @@ export function SidebarSettings({
     children,
     sidebarNavItems,
     disabled,
-    limitWidth,
+    limitWidth
 }: SideBarSettingsProps) {
     return (
         <div className="space-y-8 pb-16k">

src/components/TopbarNav.tsx

@@ -3,7 +3,7 @@
 import React from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 interface TopbarNavProps extends React.HTMLAttributes<HTMLElement> {
     items: {

src/components/ui/alert.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 const alertVariants = cva(
     "relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",

src/components/ui/avatar.tsx

@@ -3,7 +3,7 @@
 import * as React from "react"
 import * as AvatarPrimitive from "@radix-ui/react-avatar"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Avatar = React.forwardRef<
   React.ElementRef<typeof AvatarPrimitive.Root>,

src/components/ui/badge.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 const badgeVariants = cva(
     "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",

src/components/ui/breadcrumb.tsx

@@ -2,7 +2,7 @@ import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
 import { ChevronRight, MoreHorizontal } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Breadcrumb = React.forwardRef<
   HTMLElement,

src/components/ui/button.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 import { Loader2 } from "lucide-react";
 
 const buttonVariants = cva(

src/components/ui/card.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 const Card = React.forwardRef<
     HTMLDivElement,

src/components/ui/checkbox.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
 import { Check } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,

src/components/ui/command.tsx

@@ -5,7 +5,7 @@ import { type DialogProps } from "@radix-ui/react-dialog"
 import { Command as CommandPrimitive } from "cmdk"
 import { Search } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 import { Dialog, DialogContent } from "@/components/ui/dialog"
 
 const Command = React.forwardRef<

src/components/ui/dialog.tsx

@@ -4,7 +4,7 @@ import * as React from "react";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 const Dialog = DialogPrimitive.Root;
 

src/components/ui/drawer.tsx

@@ -3,7 +3,7 @@
 import * as React from "react";
 import { Drawer as DrawerPrimitive } from "vaul";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 
 const Drawer = ({
     shouldScaleBackground = true,

src/components/ui/dropdown-menu.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
 import { Check, ChevronRight, Circle } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const DropdownMenu = DropdownMenuPrimitive.Root
 

src/components/ui/form.tsx

@@ -12,7 +12,7 @@ import {
     useFormContext,
 } from "react-hook-form"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 import { Label } from "@/components/ui/label"
 
 const Form = FormProvider

src/components/ui/input-otp.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import { OTPInput, OTPInputContext } from "input-otp"
 import { Dot } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const InputOTP = React.forwardRef<
   React.ElementRef<typeof OTPInput>,

src/components/ui/input.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { cn } from "@/lib/utils";
+import { cn } from "@app/lib/cn";
 import { EyeOff, Eye } from "lucide-react";
 
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;

src/components/ui/label.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import * as LabelPrimitive from "@radix-ui/react-label"
 import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const labelVariants = cva(
     "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"

src/components/ui/popover.tsx

@@ -3,7 +3,7 @@
 import * as React from "react"
 import * as PopoverPrimitive from "@radix-ui/react-popover"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Popover = PopoverPrimitive.Root
 

src/components/ui/radio-group.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"
 import { Circle } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const RadioGroup = React.forwardRef<
   React.ElementRef<typeof RadioGroupPrimitive.Root>,

src/components/ui/select.tsx

@@ -4,7 +4,7 @@ import * as React from "react"
 import * as SelectPrimitive from "@radix-ui/react-select"
 import { Check, ChevronDown, ChevronUp } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Select = SelectPrimitive.Root
 

src/components/ui/separator.tsx

@@ -3,7 +3,7 @@
 import * as React from "react"
 import * as SeparatorPrimitive from "@radix-ui/react-separator"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Separator = React.forwardRef<
   React.ElementRef<typeof SeparatorPrimitive.Root>,

src/components/ui/sheet.tsx

@@ -5,7 +5,7 @@ import * as SheetPrimitive from "@radix-ui/react-dialog"
 import { cva, type VariantProps } from "class-variance-authority"
 import { X } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Sheet = SheetPrimitive.Root
 

src/components/ui/switch.tsx

@@ -3,7 +3,7 @@
 import * as React from "react"
 import * as SwitchPrimitives from "@radix-ui/react-switch"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Switch = React.forwardRef<
   React.ElementRef<typeof SwitchPrimitives.Root>,

src/components/ui/table.tsx

@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Table = React.forwardRef<
   HTMLTableElement,

src/components/ui/tabs.tsx

@@ -3,7 +3,7 @@
 import * as React from "react"
 import * as TabsPrimitive from "@radix-ui/react-tabs"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const Tabs = TabsPrimitive.Root
 

src/components/ui/textarea.tsx

@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 export interface TextareaProps
   extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}

src/components/ui/toast.tsx

@@ -5,7 +5,7 @@ import * as ToastPrimitives from "@radix-ui/react-toast"
 import { cva, type VariantProps } from "class-variance-authority"
 import { X } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@app/lib/cn"
 
 const ToastProvider = ToastPrimitives.Provider
 

src/lib/api/formatAxiosError.ts

@@ -1,10 +1,3 @@
-import { clsx, type ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-export function cn(...inputs: ClassValue[]) {
-    return twMerge(clsx(inputs));
-}
-
 export function formatAxiosError(error: any, defaultMessage?: string): string {
     return (
         error.response?.data?.message ||

src/lib/api/index.ts

@@ -58,3 +58,6 @@ export const priv = axios.create({
         "Content-Type": "application/json"
     }
 });
+
+export * from "./formatAxiosError";
+

src/lib/auth/verifySession.ts

@@ -1,5 +1,5 @@
-import { internal } from "@app/api";
-import { authCookieHeader } from "@app/api/cookies";
+import { internal } from "@app/lib/api";
+import { authCookieHeader } from "@app/lib/api/cookies";
 import { GetUserResponse } from "@server/routers/user";
 import { AxiosResponse } from "axios";
 

src/lib/cn.ts

@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+    return twMerge(clsx(inputs));
+}