}
heading="PAT"
subHeading="Personal access tokens (PATs) provide programmatic access to organization resources via the API on behalf of a user."
diff --git a/web/sdk/admin/views/organizations/details/pat/pat.module.css b/web/sdk/admin/views/organizations/details/pat/pat.module.css
index 46f8a0a59..9b03ea1b7 100644
--- a/web/sdk/admin/views/organizations/details/pat/pat.module.css
+++ b/web/sdk/admin/views/organizations/details/pat/pat.module.css
@@ -6,6 +6,10 @@
padding: var(--rs-space-10);
}
+.zero-state {
+ padding-top: var(--rs-space-17);
+}
+
.empty-state-subheading {
max-width: 360px;
text-wrap: auto;
diff --git a/web/sdk/admin/views/organizations/details/projects/columns.tsx b/web/sdk/admin/views/organizations/details/projects/columns.tsx
index 4e4958ee3..fe58440c6 100644
--- a/web/sdk/admin/views/organizations/details/projects/columns.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/columns.tsx
@@ -5,8 +5,8 @@ import {
Flex,
Text,
Menu,
-} from "@raystack/apsara-v1";
-import type { DataTableColumnDef } from "@raystack/apsara-v1";
+} from "@raystack/apsara";
+import type { DataTableColumnDef } from "@raystack/apsara";
import type {
SearchOrganizationProjectsResponse_OrganizationProject,
User,
diff --git a/web/sdk/admin/views/organizations/details/projects/index.tsx b/web/sdk/admin/views/organizations/details/projects/index.tsx
index 1b3f87d4d..7f24dc73d 100644
--- a/web/sdk/admin/views/organizations/details/projects/index.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/index.tsx
@@ -4,7 +4,7 @@ import {
Flex,
type DataTableQuery,
type DataTableSort,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import { PageTitle } from "../../../../components/PageTitle";
import styles from "./projects.module.css";
import { useContext, useEffect, useMemo, useState } from "react";
diff --git a/web/sdk/admin/views/organizations/details/projects/members/add-members-dropdown.tsx b/web/sdk/admin/views/organizations/details/projects/members/add-members-dropdown.tsx
index 8b6ffa0b8..457dd690c 100644
--- a/web/sdk/admin/views/organizations/details/projects/members/add-members-dropdown.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/members/add-members-dropdown.tsx
@@ -5,7 +5,7 @@ import {
Flex,
getAvatarColor,
Text,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import type React from "react";
import Skeleton from "react-loading-skeleton";
import styles from "./members.module.css";
diff --git a/web/sdk/admin/views/organizations/details/projects/members/columns.tsx b/web/sdk/admin/views/organizations/details/projects/members/columns.tsx
index 4ce66b1d5..e653145ae 100644
--- a/web/sdk/admin/views/organizations/details/projects/members/columns.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/members/columns.tsx
@@ -10,8 +10,8 @@ import {
getAvatarColor,
Text,
AlertDialog,
-} from "@raystack/apsara-v1";
-import type { DataTableColumnDef } from "@raystack/apsara-v1";
+} from "@raystack/apsara";
+import type { DataTableColumnDef } from "@raystack/apsara";
import { DotsHorizontalIcon, UpdateIcon } from "@radix-ui/react-icons";
import { DeleteIcon } from "~/admin/assets/icons/DeleteIcon";
import type { UpdateRolePayload } from "./update-role";
diff --git a/web/sdk/admin/views/organizations/details/projects/members/index.tsx b/web/sdk/admin/views/organizations/details/projects/members/index.tsx
index 54ce6a2f7..9ee3a9e91 100644
--- a/web/sdk/admin/views/organizations/details/projects/members/index.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/members/index.tsx
@@ -1,5 +1,5 @@
-import { AlertDialog, DataTable, Dialog, EmptyState, Flex } from "@raystack/apsara-v1";
-import type { DataTableQuery } from "@raystack/apsara-v1";
+import { AlertDialog, DataTable, Dialog, EmptyState, Flex } from "@raystack/apsara";
+import type { DataTableQuery } from "@raystack/apsara";
import { useCallback, useMemo, useState } from "react";
import Skeleton from "react-loading-skeleton";
import {
@@ -12,7 +12,7 @@ import {
} from "@raystack/proton/frontier";
import { create } from "@bufbuild/protobuf";
import { useQuery, useInfiniteQuery } from "@connectrpc/connect-query";
-import { useDebouncedState } from "@raystack/apsara-v1/hooks";
+import { useDebouncedState } from "@raystack/apsara/hooks";
import styles from "./members.module.css";
import { UsersIcon } from "../../../../../assets/icons/UsersIcon";
import { getColumns } from "./columns";
diff --git a/web/sdk/admin/views/organizations/details/projects/members/remove-member.tsx b/web/sdk/admin/views/organizations/details/projects/members/remove-member.tsx
index 6317795f8..9d3464b17 100644
--- a/web/sdk/admin/views/organizations/details/projects/members/remove-member.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/members/remove-member.tsx
@@ -8,7 +8,7 @@ import { create } from "@bufbuild/protobuf";
import { useMutation } from "@connectrpc/connect-query";
import styles from "./members.module.css";
-import { AlertDialog, Button, Flex, Text, toastManager } from "@raystack/apsara-v1";
+import { AlertDialog, Button, Flex, Text, toastManager } from "@raystack/apsara";
import { useTerminology } from "../../../../../hooks/useTerminology";
interface RemoveMemberProps {
diff --git a/web/sdk/admin/views/organizations/details/projects/members/update-role.tsx b/web/sdk/admin/views/organizations/details/projects/members/update-role.tsx
index 719a7bdb6..0aa75a046 100644
--- a/web/sdk/admin/views/organizations/details/projects/members/update-role.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/members/update-role.tsx
@@ -15,7 +15,7 @@ import {
Button,
Text,
toastManager,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import { SCOPES } from "~/admin/utils/constants";
export type UpdateRolePayload = {
diff --git a/web/sdk/admin/views/organizations/details/projects/rename-project.tsx b/web/sdk/admin/views/organizations/details/projects/rename-project.tsx
index 74adb4381..612288646 100644
--- a/web/sdk/admin/views/organizations/details/projects/rename-project.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/rename-project.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, Field, Flex, Input, toastManager } from "@raystack/apsara-v1";
+import { Button, Dialog, Field, Flex, Input, toastManager } from "@raystack/apsara";
import {
FrontierServiceQueries,
UpdateProjectRequestSchema,
diff --git a/web/sdk/admin/views/organizations/details/projects/use-add-project-members.tsx b/web/sdk/admin/views/organizations/details/projects/use-add-project-members.tsx
index 9c882c1ab..84e612808 100644
--- a/web/sdk/admin/views/organizations/details/projects/use-add-project-members.tsx
+++ b/web/sdk/admin/views/organizations/details/projects/use-add-project-members.tsx
@@ -1,6 +1,6 @@
import { useCallback, useContext, useMemo, useState } from "react";
import { OrganizationContext } from "../contexts/organization-context";
-import { toastManager } from "@raystack/apsara-v1";
+import { toastManager } from "@raystack/apsara";
import { DEFAULT_ROLES, SCOPES } from "~/admin/utils/constants";
import { useQuery, useMutation } from "@connectrpc/connect-query";
import { FrontierServiceQueries, ListProjectUsersRequestSchema, ListRolesRequestSchema, SetProjectMemberRoleRequestSchema } from "@raystack/proton/frontier";
diff --git a/web/sdk/admin/views/organizations/details/security/block-organization.tsx b/web/sdk/admin/views/organizations/details/security/block-organization.tsx
index 19a4dd2f9..58195544f 100644
--- a/web/sdk/admin/views/organizations/details/security/block-organization.tsx
+++ b/web/sdk/admin/views/organizations/details/security/block-organization.tsx
@@ -1,4 +1,4 @@
-import { AlertDialog, Button, Flex, Text, toastManager } from "@raystack/apsara-v1";
+import { AlertDialog, Button, Flex, Text, toastManager } from "@raystack/apsara";
import { useContext, useState } from "react";
import { OrganizationStatus } from "../types";
import { OrganizationContext } from "../contexts/organization-context";
diff --git a/web/sdk/admin/views/organizations/details/security/domains-list.tsx b/web/sdk/admin/views/organizations/details/security/domains-list.tsx
index 13e964cd4..f5545b5d3 100644
--- a/web/sdk/admin/views/organizations/details/security/domains-list.tsx
+++ b/web/sdk/admin/views/organizations/details/security/domains-list.tsx
@@ -5,7 +5,7 @@ import {
IconButton,
Text,
toastManager,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import styles from "./security.module.css";
import { CheckCircledIcon, TrashIcon } from "@radix-ui/react-icons";
import Skeleton from "react-loading-skeleton";
diff --git a/web/sdk/admin/views/organizations/details/security/index.tsx b/web/sdk/admin/views/organizations/details/security/index.tsx
index f28b08ecd..4c1ca24e0 100644
--- a/web/sdk/admin/views/organizations/details/security/index.tsx
+++ b/web/sdk/admin/views/organizations/details/security/index.tsx
@@ -5,7 +5,7 @@ import {
Text,
Tooltip,
toastManager,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import styles from './security.module.css';
import { PlusIcon } from '@radix-ui/react-icons';
diff --git a/web/sdk/admin/views/organizations/details/side-panel/billing-details-section.tsx b/web/sdk/admin/views/organizations/details/side-panel/billing-details-section.tsx
index 8100a9fe9..73a236e2e 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/billing-details-section.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/billing-details-section.tsx
@@ -1,4 +1,4 @@
-import { Amount, CopyButton, Flex, Link, List, Text } from "@raystack/apsara-v1";
+import { Amount, CopyButton, Flex, Link, List, Text } from "@raystack/apsara";
import styles from "./side-panel.module.css";
import { convertBillingAddressToString } from "../../../../utils/helper";
import Skeleton from "react-loading-skeleton";
diff --git a/web/sdk/admin/views/organizations/details/side-panel/index.tsx b/web/sdk/admin/views/organizations/details/side-panel/index.tsx
index f794c11f5..ef1eb0ba3 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/index.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/index.tsx
@@ -1,4 +1,4 @@
-import { Avatar, getAvatarColor, SidePanel } from "@raystack/apsara-v1";
+import { Avatar, getAvatarColor, SidePanel } from "@raystack/apsara";
import { OrganizationDetailsSection } from "./org-details-section";
import { KYCDetailsSection } from "./kyc-section";
import { PlanDetailsSection } from "./plan-details-section";
diff --git a/web/sdk/admin/views/organizations/details/side-panel/kyc-section.tsx b/web/sdk/admin/views/organizations/details/side-panel/kyc-section.tsx
index f722c1458..8bd946196 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/kyc-section.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/kyc-section.tsx
@@ -1,11 +1,11 @@
-import { Flex, List, Text, Link, Tooltip } from "@raystack/apsara-v1";
+import { Flex, List, Text, Link, Tooltip } from "@raystack/apsara";
import { useContext } from "react";
import styles from "./side-panel.module.css";
import Skeleton from "react-loading-skeleton";
import {
CheckCircleFilledIcon,
CrossCircleFilledIcon,
-} from "@raystack/apsara-v1/icons";
+} from "@raystack/apsara/icons";
import { Link2Icon } from "@radix-ui/react-icons";
import { OrganizationContext } from "../contexts/organization-context";
diff --git a/web/sdk/admin/views/organizations/details/side-panel/org-details-section.tsx b/web/sdk/admin/views/organizations/details/side-panel/org-details-section.tsx
index b942a01cf..881c8b458 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/org-details-section.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/org-details-section.tsx
@@ -1,5 +1,5 @@
import { CalendarIcon } from "@radix-ui/react-icons";
-import { Flex, List, Text, CopyButton, Tooltip } from "@raystack/apsara-v1";
+import { Flex, List, Text, CopyButton, Tooltip } from "@raystack/apsara";
import styles from "./side-panel.module.css";
import dayjs from "dayjs";
import { useContext } from "react";
diff --git a/web/sdk/admin/views/organizations/details/side-panel/plan-details-section.tsx b/web/sdk/admin/views/organizations/details/side-panel/plan-details-section.tsx
index 9699d07b6..7a570f75d 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/plan-details-section.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/plan-details-section.tsx
@@ -1,5 +1,5 @@
import { useContext } from "react";
-import { List, Text, Flex } from "@raystack/apsara-v1";
+import { List, Text, Flex } from "@raystack/apsara";
import styles from "./side-panel.module.css";
import { CalendarIcon } from "@radix-ui/react-icons";
import Skeleton from "react-loading-skeleton";
diff --git a/web/sdk/admin/views/organizations/details/side-panel/tokens-details-section.tsx b/web/sdk/admin/views/organizations/details/side-panel/tokens-details-section.tsx
index 463c018d4..cc5027e30 100644
--- a/web/sdk/admin/views/organizations/details/side-panel/tokens-details-section.tsx
+++ b/web/sdk/admin/views/organizations/details/side-panel/tokens-details-section.tsx
@@ -1,5 +1,5 @@
-import { List, Text, Flex } from "@raystack/apsara-v1";
-import { CoinIcon, CoinColoredIcon } from "@raystack/apsara-v1/icons";
+import { List, Text, Flex } from "@raystack/apsara";
+import { CoinIcon, CoinColoredIcon } from "@raystack/apsara/icons";
import styles from "./side-panel.module.css";
import { useContext, useEffect } from "react";
import Skeleton from "react-loading-skeleton";
diff --git a/web/sdk/admin/views/organizations/details/tokens/columns.tsx b/web/sdk/admin/views/organizations/details/tokens/columns.tsx
index 4497499d9..38dc02aad 100644
--- a/web/sdk/admin/views/organizations/details/tokens/columns.tsx
+++ b/web/sdk/admin/views/organizations/details/tokens/columns.tsx
@@ -8,7 +8,7 @@ import {
getAvatarColor,
Text,
Tooltip,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import type {
SearchOrganizationTokensResponse_OrganizationToken,
} from "@raystack/proton/frontier";
diff --git a/web/sdk/admin/views/organizations/details/tokens/index.tsx b/web/sdk/admin/views/organizations/details/tokens/index.tsx
index 4cd4ad1d0..95e35896b 100644
--- a/web/sdk/admin/views/organizations/details/tokens/index.tsx
+++ b/web/sdk/admin/views/organizations/details/tokens/index.tsx
@@ -1,7 +1,7 @@
-import { DataTable, EmptyState, Flex } from "@raystack/apsara-v1";
-import type { DataTableQuery, DataTableSort } from "@raystack/apsara-v1";
+import { DataTable, EmptyState, Flex } from "@raystack/apsara";
+import type { DataTableQuery, DataTableSort } from "@raystack/apsara";
import styles from "./tokens.module.css";
-import { CoinIcon } from "@raystack/apsara-v1/icons";
+import { CoinIcon } from "@raystack/apsara/icons";
import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
import { useContext, useEffect, useMemo, useState } from "react";
import { OrganizationContext } from "../contexts/organization-context";
diff --git a/web/sdk/admin/views/organizations/list/columns.tsx b/web/sdk/admin/views/organizations/list/columns.tsx
index 8ce98f291..b3b57abeb 100644
--- a/web/sdk/admin/views/organizations/list/columns.tsx
+++ b/web/sdk/admin/views/organizations/list/columns.tsx
@@ -5,7 +5,7 @@ import {
Flex,
getAvatarColor,
Text,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import type {
SearchOrganizationsResponse_OrganizationResult,
Plan,
diff --git a/web/sdk/admin/views/organizations/list/create.tsx b/web/sdk/admin/views/organizations/list/create.tsx
index 7e1379ae9..4aa204155 100644
--- a/web/sdk/admin/views/organizations/list/create.tsx
+++ b/web/sdk/admin/views/organizations/list/create.tsx
@@ -11,9 +11,9 @@ import {
Drawer,
SidePanel,
Text,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import { Cross1Icon } from "@radix-ui/react-icons";
-import { ImageUpload } from "../../../../react/components/image-upload";
+import { ImageUpload } from "~/client/components/image-upload";
import { z } from "zod";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
diff --git a/web/sdk/admin/views/organizations/list/index.tsx b/web/sdk/admin/views/organizations/list/index.tsx
index 5379a4b6d..07961ea3e 100644
--- a/web/sdk/admin/views/organizations/list/index.tsx
+++ b/web/sdk/admin/views/organizations/list/index.tsx
@@ -1,5 +1,5 @@
-import { DataTable, EmptyState, Flex, type DataTableQuery, type DataTableSort } from "@raystack/apsara-v1";
-import { OrganizationIcon } from "@raystack/apsara-v1/icons";
+import { DataTable, EmptyState, Flex, type DataTableQuery, type DataTableSort } from "@raystack/apsara";
+import { OrganizationIcon } from "@raystack/apsara/icons";
import { useEffect, useState } from "react";
import { OrganizationsNavabar } from "./navbar";
import styles from "./list.module.css";
@@ -23,7 +23,7 @@ import {
} from "~/utils/connect-pagination";
import { transformDataTableQueryToRQLRequest } from "~/utils/transform-query";
import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
-import { useDebouncedState } from "@raystack/apsara-v1/hooks";
+import { useDebouncedState } from "@raystack/apsara/hooks";
import { useTerminology } from "../../../hooks/useTerminology";
const NoOrganizations = () => {
diff --git a/web/sdk/admin/views/organizations/list/navbar.tsx b/web/sdk/admin/views/organizations/list/navbar.tsx
index fd63c3ff4..c5122f996 100644
--- a/web/sdk/admin/views/organizations/list/navbar.tsx
+++ b/web/sdk/admin/views/organizations/list/navbar.tsx
@@ -6,8 +6,8 @@ import {
Separator,
IconButton,
Spinner,
-} from "@raystack/apsara-v1";
-import { OrganizationIcon } from "@raystack/apsara-v1/icons";
+} from "@raystack/apsara";
+import { OrganizationIcon } from "@raystack/apsara/icons";
import styles from "./list.module.css";
import {
DownloadIcon,
diff --git a/web/sdk/admin/views/plans/columns.tsx b/web/sdk/admin/views/plans/columns.tsx
index b37606d57..843a32fb2 100644
--- a/web/sdk/admin/views/plans/columns.tsx
+++ b/web/sdk/admin/views/plans/columns.tsx
@@ -1,4 +1,4 @@
-import { Text, type DataTableColumnDef } from "@raystack/apsara-v1";
+import { Text, type DataTableColumnDef } from "@raystack/apsara";
import type { Plan } from "@raystack/proton/frontier";
import { timestampToDate, type TimeStamp } from "../../utils/connect-timestamp";
import styles from "./plans.module.css";
diff --git a/web/sdk/admin/views/plans/details.tsx b/web/sdk/admin/views/plans/details.tsx
index d60a9429e..fab192f4b 100644
--- a/web/sdk/admin/views/plans/details.tsx
+++ b/web/sdk/admin/views/plans/details.tsx
@@ -1,4 +1,4 @@
-import { Flex, Text, Grid } from "@raystack/apsara-v1";
+import { Flex, Text, Grid } from "@raystack/apsara";
import type { Plan } from "@raystack/proton/frontier";
import { timestampToDate } from "../../utils/connect-timestamp";
diff --git a/web/sdk/admin/views/plans/index.tsx b/web/sdk/admin/views/plans/index.tsx
index 5e1e30fa9..cba939599 100644
--- a/web/sdk/admin/views/plans/index.tsx
+++ b/web/sdk/admin/views/plans/index.tsx
@@ -1,4 +1,4 @@
-import { EmptyState, Flex, DataTable, Drawer } from "@raystack/apsara-v1";
+import { EmptyState, Flex, DataTable, Drawer } from "@raystack/apsara";
import type { ReactNode } from "react";
import type { Plan } from "@raystack/proton/frontier";
import { reduceByKey } from "../../utils/helper";
diff --git a/web/sdk/admin/views/preferences/PreferencesView.tsx b/web/sdk/admin/views/preferences/PreferencesView.tsx
index 7be90cb31..3836f8324 100644
--- a/web/sdk/admin/views/preferences/PreferencesView.tsx
+++ b/web/sdk/admin/views/preferences/PreferencesView.tsx
@@ -1,4 +1,4 @@
-import { Flex, EmptyState } from "@raystack/apsara-v1";
+import { Flex, EmptyState } from "@raystack/apsara";
import type { ReactNode } from "react";
import { createQueryOptions, useTransport } from "@connectrpc/connect-query";
import {
diff --git a/web/sdk/admin/views/preferences/columns.tsx b/web/sdk/admin/views/preferences/columns.tsx
index c824d7921..c63c37364 100644
--- a/web/sdk/admin/views/preferences/columns.tsx
+++ b/web/sdk/admin/views/preferences/columns.tsx
@@ -1,4 +1,4 @@
-import { Text, type DataTableColumnDef } from "@raystack/apsara-v1";
+import { Text, type DataTableColumnDef } from "@raystack/apsara";
import { Preference, PreferenceTrait } from "@raystack/proton/frontier";
import styles from "./preferences.module.css";
diff --git a/web/sdk/admin/views/preferences/details.tsx b/web/sdk/admin/views/preferences/details.tsx
index d6240b0ee..aee3ebe2e 100644
--- a/web/sdk/admin/views/preferences/details.tsx
+++ b/web/sdk/admin/views/preferences/details.tsx
@@ -8,7 +8,7 @@ import {
Text,
Input,
toastManager,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import { useCallback, useEffect, useState } from "react";
import Skeleton from "react-loading-skeleton";
import dayjs from "dayjs";
diff --git a/web/sdk/admin/views/preferences/index.tsx b/web/sdk/admin/views/preferences/index.tsx
index 45d6b13cf..45cc0b345 100644
--- a/web/sdk/admin/views/preferences/index.tsx
+++ b/web/sdk/admin/views/preferences/index.tsx
@@ -1,4 +1,4 @@
-import { EmptyState, DataTable, Flex } from "@raystack/apsara-v1";
+import { EmptyState, DataTable, Flex } from "@raystack/apsara";
import type { ReactNode } from "react";
import { Preference, PreferenceTrait } from "@raystack/proton/frontier";
import { PageHeader } from "../../components/PageHeader";
diff --git a/web/sdk/admin/views/products/columns.tsx b/web/sdk/admin/views/products/columns.tsx
index ad38fb8d6..7bc7417d6 100644
--- a/web/sdk/admin/views/products/columns.tsx
+++ b/web/sdk/admin/views/products/columns.tsx
@@ -1,4 +1,4 @@
-import { Flex, Image, Amount, type DataTableColumnDef } from "@raystack/apsara-v1";
+import { Flex, Image, Amount, type DataTableColumnDef } from "@raystack/apsara";
import type { Product } from "@raystack/proton/frontier";
import { timestampToDate, TimeStamp } from "../../utils/connect-timestamp";
import styles from "./products.module.css";
diff --git a/web/sdk/admin/views/products/details.tsx b/web/sdk/admin/views/products/details.tsx
index d9e8f398b..4f90ff495 100644
--- a/web/sdk/admin/views/products/details.tsx
+++ b/web/sdk/admin/views/products/details.tsx
@@ -1,4 +1,4 @@
-import { Flex, Text, Grid, Drawer } from "@raystack/apsara-v1";
+import { Flex, Text, Grid, Drawer } from "@raystack/apsara";
import type { Product } from "@raystack/proton/frontier";
import styles from "./products.module.css";
import { SheetHeader } from "../../components/SheetHeader";
diff --git a/web/sdk/admin/views/products/index.tsx b/web/sdk/admin/views/products/index.tsx
index 9585b3302..9fbb73a73 100644
--- a/web/sdk/admin/views/products/index.tsx
+++ b/web/sdk/admin/views/products/index.tsx
@@ -1,4 +1,4 @@
-import { EmptyState, Flex, DataTable } from "@raystack/apsara-v1";
+import { EmptyState, Flex, DataTable } from "@raystack/apsara";
import type { ReactNode } from "react";
import { useQuery } from "@connectrpc/connect-query";
import { FrontierServiceQueries } from "@raystack/proton/frontier";
diff --git a/web/sdk/admin/views/products/prices/columns.tsx b/web/sdk/admin/views/products/prices/columns.tsx
index 3f257ad82..2038e45be 100644
--- a/web/sdk/admin/views/products/prices/columns.tsx
+++ b/web/sdk/admin/views/products/prices/columns.tsx
@@ -1,6 +1,6 @@
import type { Price as PriceType } from "@raystack/proton/frontier";
-import { Amount } from "@raystack/apsara-v1";
-import type { DataTableColumnDef } from "@raystack/apsara-v1";
+import { Amount } from "@raystack/apsara";
+import type { DataTableColumnDef } from "@raystack/apsara";
import { timestampToDate, TimeStamp } from "../../../utils/connect-timestamp";
import styles from "./prices.module.css";
diff --git a/web/sdk/admin/views/products/prices/index.tsx b/web/sdk/admin/views/products/prices/index.tsx
index d629ff7cb..d68371e55 100644
--- a/web/sdk/admin/views/products/prices/index.tsx
+++ b/web/sdk/admin/views/products/prices/index.tsx
@@ -1,5 +1,5 @@
import type { ReactNode } from "react";
-import { Flex, EmptyState, DataTable } from "@raystack/apsara-v1";
+import { Flex, EmptyState, DataTable } from "@raystack/apsara";
import { useQuery } from "@connectrpc/connect-query";
import { FrontierServiceQueries, type Product } from "@raystack/proton/frontier";
import { PageHeader } from "../../../components/PageHeader";
diff --git a/web/sdk/admin/views/roles/columns.tsx b/web/sdk/admin/views/roles/columns.tsx
index 9cbf9047b..bc7ff80df 100644
--- a/web/sdk/admin/views/roles/columns.tsx
+++ b/web/sdk/admin/views/roles/columns.tsx
@@ -1,4 +1,4 @@
-import { type DataTableColumnDef, Flex } from "@raystack/apsara-v1";
+import { type DataTableColumnDef, Flex } from "@raystack/apsara";
import type { Role } from "@raystack/proton/frontier";
import styles from "./roles.module.css";
export const getColumns: () => DataTableColumnDef
[] = () => {
diff --git a/web/sdk/admin/views/roles/details.tsx b/web/sdk/admin/views/roles/details.tsx
index 9d3bc91c0..3182f0992 100644
--- a/web/sdk/admin/views/roles/details.tsx
+++ b/web/sdk/admin/views/roles/details.tsx
@@ -1,4 +1,4 @@
-import { Flex, Text, Grid } from "@raystack/apsara-v1";
+import { Flex, Text, Grid } from "@raystack/apsara";
import type { Role } from "@raystack/proton/frontier";
export default function RoleDetails({ role }: { role: Role | null }) {
diff --git a/web/sdk/admin/views/roles/index.tsx b/web/sdk/admin/views/roles/index.tsx
index 42601e83c..cb2e36279 100644
--- a/web/sdk/admin/views/roles/index.tsx
+++ b/web/sdk/admin/views/roles/index.tsx
@@ -1,4 +1,4 @@
-import { EmptyState, Flex, DataTable, Drawer } from "@raystack/apsara-v1";
+import { EmptyState, Flex, DataTable, Drawer } from "@raystack/apsara";
import { useCallback, useState, type ReactNode } from "react";
import { reduceByKey } from "../../utils/helper";
diff --git a/web/sdk/admin/views/users/details/layout/layout.tsx b/web/sdk/admin/views/users/details/layout/layout.tsx
index 79eee6452..57a955a3c 100644
--- a/web/sdk/admin/views/users/details/layout/layout.tsx
+++ b/web/sdk/admin/views/users/details/layout/layout.tsx
@@ -1,5 +1,5 @@
import { ReactNode, useState } from "react";
-import { Flex } from "@raystack/apsara-v1";
+import { Flex } from "@raystack/apsara";
import { UserDetailsSidePanel } from "./side-panel";
import styles from "./layout.module.css";
import { UserDetailsNavbar } from "./navbar";
diff --git a/web/sdk/admin/views/users/details/layout/membership-dropdown.tsx b/web/sdk/admin/views/users/details/layout/membership-dropdown.tsx
index bfbd22fca..52a5b9320 100644
--- a/web/sdk/admin/views/users/details/layout/membership-dropdown.tsx
+++ b/web/sdk/admin/views/users/details/layout/membership-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Text, Menu, Skeleton } from "@raystack/apsara-v1";
+import { Text, Menu, Skeleton } from "@raystack/apsara";
import styles from "./side-panel.module.css";
import { useMemo, useState } from "react";
import {
diff --git a/web/sdk/admin/views/users/details/layout/navbar.tsx b/web/sdk/admin/views/users/details/layout/navbar.tsx
index 914fdbdeb..25538d8b4 100644
--- a/web/sdk/admin/views/users/details/layout/navbar.tsx
+++ b/web/sdk/admin/views/users/details/layout/navbar.tsx
@@ -5,8 +5,8 @@ import {
Flex,
IconButton,
getAvatarColor,
-} from "@raystack/apsara-v1";
-import { SidebarIcon } from "@raystack/apsara-v1/icons";
+} from "@raystack/apsara";
+import { SidebarIcon } from "@raystack/apsara/icons";
import UserIcon from "../../../../assets/icons/UsersIcon";
import styles from "./navbar.module.css";
import { getUserName } from "../../util";
diff --git a/web/sdk/admin/views/users/details/layout/side-panel-details.tsx b/web/sdk/admin/views/users/details/layout/side-panel-details.tsx
index 982b4c55a..5c4711b96 100644
--- a/web/sdk/admin/views/users/details/layout/side-panel-details.tsx
+++ b/web/sdk/admin/views/users/details/layout/side-panel-details.tsx
@@ -1,4 +1,4 @@
-import { Flex, List, Text, CopyButton, Tooltip } from "@raystack/apsara-v1";
+import { Flex, List, Text, CopyButton, Tooltip } from "@raystack/apsara";
import { CalendarIcon } from "@radix-ui/react-icons";
import styles from "./side-panel.module.css";
import { UserState, USER_STATES } from "../../util";
diff --git a/web/sdk/admin/views/users/details/layout/side-panel-membership.tsx b/web/sdk/admin/views/users/details/layout/side-panel-membership.tsx
index 36930e4f4..3dc0831c3 100644
--- a/web/sdk/admin/views/users/details/layout/side-panel-membership.tsx
+++ b/web/sdk/admin/views/users/details/layout/side-panel-membership.tsx
@@ -1,4 +1,4 @@
-import { Flex, List, Text, Avatar } from "@raystack/apsara-v1";
+import { Flex, List, Text, Avatar } from "@raystack/apsara";
import dayjs from "dayjs";
import { CalendarIcon } from "@radix-ui/react-icons";
import Skeleton from "react-loading-skeleton";
diff --git a/web/sdk/admin/views/users/details/layout/side-panel.tsx b/web/sdk/admin/views/users/details/layout/side-panel.tsx
index edbc94677..23fe1842a 100644
--- a/web/sdk/admin/views/users/details/layout/side-panel.tsx
+++ b/web/sdk/admin/views/users/details/layout/side-panel.tsx
@@ -1,4 +1,4 @@
-import { Avatar, getAvatarColor, SidePanel, Text } from "@raystack/apsara-v1";
+import { Avatar, getAvatarColor, SidePanel, Text } from "@raystack/apsara";
import { SidePanelDetails } from "./side-panel-details";
import { SidePanelMembership } from "./side-panel-membership";
import styles from "./side-panel.module.css";
diff --git a/web/sdk/admin/views/users/details/layout/suspend-user.tsx b/web/sdk/admin/views/users/details/layout/suspend-user.tsx
index 00c1578a5..5751998d9 100644
--- a/web/sdk/admin/views/users/details/layout/suspend-user.tsx
+++ b/web/sdk/admin/views/users/details/layout/suspend-user.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara-v1";
+import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara";
import { useTerminology } from "../../../../hooks/useTerminology";
interface SuspendDropdownProps {
diff --git a/web/sdk/admin/views/users/details/security/block-user.tsx b/web/sdk/admin/views/users/details/security/block-user.tsx
index e0f48c864..1754e7207 100644
--- a/web/sdk/admin/views/users/details/security/block-user.tsx
+++ b/web/sdk/admin/views/users/details/security/block-user.tsx
@@ -1,5 +1,5 @@
import { ComponentProps, useCallback, useState } from "react";
-import { AlertDialog, Button, toastManager } from "@raystack/apsara-v1";
+import { AlertDialog, Button, toastManager } from "@raystack/apsara";
import { useUser } from "../user-context";
import { getUserName } from "../../util";
import {
diff --git a/web/sdk/admin/views/users/details/security/security.tsx b/web/sdk/admin/views/users/details/security/security.tsx
index 8420681c9..57598d028 100644
--- a/web/sdk/admin/views/users/details/security/security.tsx
+++ b/web/sdk/admin/views/users/details/security/security.tsx
@@ -1,4 +1,4 @@
-import { Flex, Separator, Text } from "@raystack/apsara-v1";
+import { Flex, Separator, Text } from "@raystack/apsara";
import { PageTitle } from "../../../../components/PageTitle";
import { useUser } from "../user-context";
import { BlockUserDialog } from "./block-user";
diff --git a/web/sdk/admin/views/users/details/security/sessions/index.tsx b/web/sdk/admin/views/users/details/security/sessions/index.tsx
index 57cc89e5b..abb12817b 100644
--- a/web/sdk/admin/views/users/details/security/sessions/index.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/index.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { Flex, Text, Button, toastManager } from "@raystack/apsara-v1";
+import { Flex, Text, Button, toastManager } from "@raystack/apsara";
import { useUser } from "../../user-context";
import { RevokeSessionConfirm } from "./revoke-session-confirm";
import { SessionSkeleton } from "./session-skeleton";
diff --git a/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx b/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
index 27405c715..67c372145 100644
--- a/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/revoke-session-confirm.tsx
@@ -5,7 +5,7 @@ import {
Flex,
List,
Text
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { RevokeSessionFinalConfirm } from './revoke-session-final-confirm';
import { formatDeviceDisplay } from './index';
import styles from './sessions.module.css';
diff --git a/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx b/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
index 2c995ce06..2f1d2e457 100644
--- a/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/revoke-session-final-confirm.tsx
@@ -4,7 +4,7 @@ import {
Dialog,
Flex,
Text
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import styles from './sessions.module.css';
interface RevokeSessionFinalConfirmProps {
diff --git a/web/sdk/admin/views/users/details/security/sessions/session-skeleton.tsx b/web/sdk/admin/views/users/details/security/sessions/session-skeleton.tsx
index a9d2de34b..00b607051 100644
--- a/web/sdk/admin/views/users/details/security/sessions/session-skeleton.tsx
+++ b/web/sdk/admin/views/users/details/security/sessions/session-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Flex, Skeleton } from "@raystack/apsara-v1";
+import { Flex, Skeleton } from "@raystack/apsara";
import styles from "./sessions.module.css";
export const SessionSkeleton = ({ count = 3 }: { count?: number }) => {
diff --git a/web/sdk/admin/views/users/details/user-details.tsx b/web/sdk/admin/views/users/details/user-details.tsx
index 40c4bc1be..6befd997b 100644
--- a/web/sdk/admin/views/users/details/user-details.tsx
+++ b/web/sdk/admin/views/users/details/user-details.tsx
@@ -1,4 +1,4 @@
-import { Flex, EmptyState, Spinner } from "@raystack/apsara-v1";
+import { Flex, EmptyState, Spinner } from "@raystack/apsara";
import { PageTitle } from "../../../components/PageTitle";
import UserIcon from "../../../assets/icons/UsersIcon";
import { UserDetailsLayout } from "./layout";
diff --git a/web/sdk/admin/views/users/list/columns.tsx b/web/sdk/admin/views/users/list/columns.tsx
index 652a5331e..0083dc7d7 100644
--- a/web/sdk/admin/views/users/list/columns.tsx
+++ b/web/sdk/admin/views/users/list/columns.tsx
@@ -5,7 +5,7 @@ import {
Flex,
getAvatarColor,
Text,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import dayjs from "dayjs";
import styles from "./list.module.css";
import { getUserName, USER_STATES, UserState } from "../util";
diff --git a/web/sdk/admin/views/users/list/invite-users.tsx b/web/sdk/admin/views/users/list/invite-users.tsx
index 9b998f108..52ce166d8 100644
--- a/web/sdk/admin/views/users/list/invite-users.tsx
+++ b/web/sdk/admin/views/users/list/invite-users.tsx
@@ -8,7 +8,7 @@ import {
Text,
TextArea,
toastManager,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import { PlusIcon } from "@radix-ui/react-icons";
import * as z from "zod";
import { Controller, useForm } from "react-hook-form";
diff --git a/web/sdk/admin/views/users/list/list.tsx b/web/sdk/admin/views/users/list/list.tsx
index 67cb40829..7c9fd2d6b 100644
--- a/web/sdk/admin/views/users/list/list.tsx
+++ b/web/sdk/admin/views/users/list/list.tsx
@@ -1,5 +1,5 @@
-import { DataTable, EmptyState, Flex } from "@raystack/apsara-v1";
-import type { DataTableQuery, DataTableSort } from "@raystack/apsara-v1";
+import { DataTable, EmptyState, Flex } from "@raystack/apsara";
+import type { DataTableQuery, DataTableSort } from "@raystack/apsara";
import Navbar from "./navbar";
import styles from "./list.module.css";
import { getColumns } from "./columns";
@@ -14,7 +14,7 @@ import {
} from "~/utils/connect-pagination";
import { transformDataTableQueryToRQLRequest } from "~/utils/transform-query";
import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
-import { useDebouncedState } from "@raystack/apsara-v1/hooks";
+import { useDebouncedState } from "@raystack/apsara/hooks";
import { useTerminology } from "../../../hooks/useTerminology";
const NoUsers = () => {
diff --git a/web/sdk/admin/views/users/list/navbar.tsx b/web/sdk/admin/views/users/list/navbar.tsx
index 89526eb10..bfd4ff2da 100644
--- a/web/sdk/admin/views/users/list/navbar.tsx
+++ b/web/sdk/admin/views/users/list/navbar.tsx
@@ -5,7 +5,7 @@ import {
Separator,
IconButton,
Spinner,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import styles from "./list.module.css";
import { DownloadIcon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
import UserIcon from "../../../assets/icons/UsersIcon";
diff --git a/web/sdk/admin/views/webhooks/webhooks/columns.tsx b/web/sdk/admin/views/webhooks/webhooks/columns.tsx
index 8e62552a7..46c45c0a8 100644
--- a/web/sdk/admin/views/webhooks/webhooks/columns.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/columns.tsx
@@ -4,7 +4,7 @@ import {
Flex,
Text,
type DataTableColumnDef,
-} from "@raystack/apsara-v1";
+} from "@raystack/apsara";
import styles from "./webhooks.module.css";
import { type Webhook } from "@raystack/proton/frontier";
import {
diff --git a/web/sdk/admin/views/webhooks/webhooks/create/index.tsx b/web/sdk/admin/views/webhooks/webhooks/create/index.tsx
index da55b35eb..fe9056599 100644
--- a/web/sdk/admin/views/webhooks/webhooks/create/index.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/create/index.tsx
@@ -1,5 +1,5 @@
import { useCallback } from "react";
-import { Button, Flex, Drawer, toastManager } from "@raystack/apsara-v1";
+import { Button, Flex, Drawer, toastManager } from "@raystack/apsara";
import { SheetHeader } from "../../../../components/SheetHeader";
import { SheetFooter } from "../../../../components/SheetFooter";
import * as z from "zod";
diff --git a/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx b/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
index 85b6e66be..429971070 100644
--- a/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/delete/index.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara-v1";
+import { Button, Dialog, Flex, Text, toastManager } from "@raystack/apsara";
import type { useMutation } from "@connectrpc/connect-query";
interface DeleteWebhookDialogProps {
diff --git a/web/sdk/admin/views/webhooks/webhooks/index.tsx b/web/sdk/admin/views/webhooks/webhooks/index.tsx
index c25687897..ccb543543 100644
--- a/web/sdk/admin/views/webhooks/webhooks/index.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/index.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, DataTable, EmptyState } from "@raystack/apsara-v1";
+import { Button, Flex, DataTable, EmptyState } from "@raystack/apsara";
import { useCallback, type ReactNode } from "react";
import { getColumns } from "./columns";
import styles from "./webhooks.module.css";
diff --git a/web/sdk/admin/views/webhooks/webhooks/update/index.tsx b/web/sdk/admin/views/webhooks/webhooks/update/index.tsx
index 97b49a749..5486676e9 100644
--- a/web/sdk/admin/views/webhooks/webhooks/update/index.tsx
+++ b/web/sdk/admin/views/webhooks/webhooks/update/index.tsx
@@ -1,5 +1,5 @@
import { useCallback, useEffect } from "react";
-import { Button, Flex, Drawer, toastManager } from "@raystack/apsara-v1";
+import { Button, Flex, Drawer, toastManager } from "@raystack/apsara";
import { SheetHeader } from "../../../../components/SheetHeader";
import { SheetFooter } from "../../../../components/SheetFooter";
import * as z from "zod";
diff --git a/web/sdk/react/assets/bell-slash.svg b/web/sdk/client/assets/bell-slash.svg
similarity index 100%
rename from web/sdk/react/assets/bell-slash.svg
rename to web/sdk/client/assets/bell-slash.svg
diff --git a/web/sdk/react/assets/bell.svg b/web/sdk/client/assets/bell.svg
similarity index 100%
rename from web/sdk/react/assets/bell.svg
rename to web/sdk/client/assets/bell.svg
diff --git a/web/sdk/react/assets/check-circle.svg b/web/sdk/client/assets/check-circle.svg
similarity index 100%
rename from web/sdk/react/assets/check-circle.svg
rename to web/sdk/client/assets/check-circle.svg
diff --git a/web/sdk/react/assets/chevron-left.svg b/web/sdk/client/assets/chevron-left.svg
similarity index 100%
rename from web/sdk/react/assets/chevron-left.svg
rename to web/sdk/client/assets/chevron-left.svg
diff --git a/web/sdk/react/assets/close-close.svg b/web/sdk/client/assets/close-close.svg
similarity index 100%
rename from web/sdk/react/assets/close-close.svg
rename to web/sdk/client/assets/close-close.svg
diff --git a/web/sdk/react/assets/close-default.svg b/web/sdk/client/assets/close-default.svg
similarity index 100%
rename from web/sdk/react/assets/close-default.svg
rename to web/sdk/client/assets/close-default.svg
diff --git a/web/sdk/react/assets/close.svg b/web/sdk/client/assets/close.svg
similarity index 100%
rename from web/sdk/react/assets/close.svg
rename to web/sdk/client/assets/close.svg
diff --git a/web/sdk/react/assets/coin.svg b/web/sdk/client/assets/coin.svg
similarity index 100%
rename from web/sdk/react/assets/coin.svg
rename to web/sdk/client/assets/coin.svg
diff --git a/web/sdk/react/assets/cross.svg b/web/sdk/client/assets/cross.svg
similarity index 100%
rename from web/sdk/react/assets/cross.svg
rename to web/sdk/client/assets/cross.svg
diff --git a/web/sdk/react/assets/delete.svg b/web/sdk/client/assets/delete.svg
similarity index 100%
rename from web/sdk/react/assets/delete.svg
rename to web/sdk/client/assets/delete.svg
diff --git a/web/sdk/react/assets/exclamation-triangle.svg b/web/sdk/client/assets/exclamation-triangle.svg
similarity index 100%
rename from web/sdk/react/assets/exclamation-triangle.svg
rename to web/sdk/client/assets/exclamation-triangle.svg
diff --git a/web/sdk/react/assets/inbox-stack.svg b/web/sdk/client/assets/inbox-stack.svg
similarity index 100%
rename from web/sdk/react/assets/inbox-stack.svg
rename to web/sdk/client/assets/inbox-stack.svg
diff --git a/web/sdk/react/assets/key.svg b/web/sdk/client/assets/key.svg
similarity index 100%
rename from web/sdk/react/assets/key.svg
rename to web/sdk/client/assets/key.svg
diff --git a/web/sdk/react/assets/line.svg b/web/sdk/client/assets/line.svg
similarity index 100%
rename from web/sdk/react/assets/line.svg
rename to web/sdk/client/assets/line.svg
diff --git a/web/sdk/react/assets/logo.png b/web/sdk/client/assets/logo.png
similarity index 100%
rename from web/sdk/react/assets/logo.png
rename to web/sdk/client/assets/logo.png
diff --git a/web/sdk/react/assets/logos/google-logo.svg b/web/sdk/client/assets/logos/google-logo.svg
similarity index 100%
rename from web/sdk/react/assets/logos/google-logo.svg
rename to web/sdk/client/assets/logos/google-logo.svg
diff --git a/web/sdk/react/assets/open.svg b/web/sdk/client/assets/open.svg
similarity index 100%
rename from web/sdk/react/assets/open.svg
rename to web/sdk/client/assets/open.svg
diff --git a/web/sdk/react/assets/organization.png b/web/sdk/client/assets/organization.png
similarity index 100%
rename from web/sdk/react/assets/organization.png
rename to web/sdk/client/assets/organization.png
diff --git a/web/sdk/react/assets/resize-collapse.svg b/web/sdk/client/assets/resize-collapse.svg
similarity index 100%
rename from web/sdk/react/assets/resize-collapse.svg
rename to web/sdk/client/assets/resize-collapse.svg
diff --git a/web/sdk/react/assets/resize-default.svg b/web/sdk/client/assets/resize-default.svg
similarity index 100%
rename from web/sdk/react/assets/resize-default.svg
rename to web/sdk/client/assets/resize-default.svg
diff --git a/web/sdk/react/assets/resize-expand.svg b/web/sdk/client/assets/resize-expand.svg
similarity index 100%
rename from web/sdk/react/assets/resize-expand.svg
rename to web/sdk/client/assets/resize-expand.svg
diff --git a/web/sdk/react/assets/user-minus.svg b/web/sdk/client/assets/user-minus.svg
similarity index 100%
rename from web/sdk/react/assets/user-minus.svg
rename to web/sdk/client/assets/user-minus.svg
diff --git a/web/sdk/react/assets/user.png b/web/sdk/client/assets/user.png
similarity index 100%
rename from web/sdk/react/assets/user.png
rename to web/sdk/client/assets/user.png
diff --git a/web/sdk/react/assets/users.svg b/web/sdk/client/assets/users.svg
similarity index 100%
rename from web/sdk/react/assets/users.svg
rename to web/sdk/client/assets/users.svg
diff --git a/web/sdk/react/components/auth-container/auth-container.module.css b/web/sdk/client/components/auth-container/auth-container.module.css
similarity index 100%
rename from web/sdk/react/components/auth-container/auth-container.module.css
rename to web/sdk/client/components/auth-container/auth-container.module.css
diff --git a/web/sdk/react/components/auth-container/auth-container.tsx b/web/sdk/client/components/auth-container/auth-container.tsx
similarity index 92%
rename from web/sdk/react/components/auth-container/auth-container.tsx
rename to web/sdk/client/components/auth-container/auth-container.tsx
index 81c3e0994..2de64bc14 100644
--- a/web/sdk/react/components/auth-container/auth-container.tsx
+++ b/web/sdk/client/components/auth-container/auth-container.tsx
@@ -1,5 +1,5 @@
import { ComponentPropsWithRef, ReactNode } from 'react';
-import { Flex } from '@raystack/apsara-v1';
+import { Flex } from '@raystack/apsara';
import { cx } from 'class-variance-authority';
import styles from './auth-container.module.css';
diff --git a/web/sdk/react/components/auth-container/index.ts b/web/sdk/client/components/auth-container/index.ts
similarity index 100%
rename from web/sdk/react/components/auth-container/index.ts
rename to web/sdk/client/components/auth-container/index.ts
diff --git a/web/sdk/react/components/auth-header/auth-header.module.css b/web/sdk/client/components/auth-header/auth-header.module.css
similarity index 100%
rename from web/sdk/react/components/auth-header/auth-header.module.css
rename to web/sdk/client/components/auth-header/auth-header.module.css
diff --git a/web/sdk/react/components/auth-header/auth-header.tsx b/web/sdk/client/components/auth-header/auth-header.tsx
similarity index 87%
rename from web/sdk/react/components/auth-header/auth-header.tsx
rename to web/sdk/client/components/auth-header/auth-header.tsx
index 2cb8f62b2..5c37dcc2e 100644
--- a/web/sdk/react/components/auth-header/auth-header.tsx
+++ b/web/sdk/client/components/auth-header/auth-header.tsx
@@ -1,6 +1,6 @@
import { ComponentPropsWithRef, ReactNode } from 'react';
-import { Flex, Headline } from '@raystack/apsara-v1';
-import logo from '~/react/assets/logo.png';
+import { Flex, Headline } from '@raystack/apsara';
+import logo from '~/client/assets/logo.png';
import styles from './auth-header.module.css';
const defaultLogo = (
diff --git a/web/sdk/react/components/auth-header/index.ts b/web/sdk/client/components/auth-header/index.ts
similarity index 100%
rename from web/sdk/react/components/auth-header/index.ts
rename to web/sdk/client/components/auth-header/index.ts
diff --git a/web/sdk/react/components/auth-oidc-button/auth-oidc-button.module.css b/web/sdk/client/components/auth-oidc-button/auth-oidc-button.module.css
similarity index 100%
rename from web/sdk/react/components/auth-oidc-button/auth-oidc-button.module.css
rename to web/sdk/client/components/auth-oidc-button/auth-oidc-button.module.css
diff --git a/web/sdk/react/components/auth-oidc-button/auth-oidc-button.tsx b/web/sdk/client/components/auth-oidc-button/auth-oidc-button.tsx
similarity index 88%
rename from web/sdk/react/components/auth-oidc-button/auth-oidc-button.tsx
rename to web/sdk/client/components/auth-oidc-button/auth-oidc-button.tsx
index 91be9f26a..f89eefda3 100644
--- a/web/sdk/react/components/auth-oidc-button/auth-oidc-button.tsx
+++ b/web/sdk/client/components/auth-oidc-button/auth-oidc-button.tsx
@@ -1,6 +1,6 @@
-import { Button, Text } from '@raystack/apsara-v1';
+import { Button, Text } from '@raystack/apsara';
import { HTMLProps } from 'react';
-import GoogleLogo from '~/react/assets/logos/google-logo.svg';
+import GoogleLogo from '~/client/assets/logos/google-logo.svg';
import { capitalize } from '~/utils';
import styles from './auth-oidc-button.module.css';
diff --git a/web/sdk/react/components/auth-oidc-button/index.ts b/web/sdk/client/components/auth-oidc-button/index.ts
similarity index 100%
rename from web/sdk/react/components/auth-oidc-button/index.ts
rename to web/sdk/client/components/auth-oidc-button/index.ts
diff --git a/web/sdk/react/components/image-upload/image-upload.module.css b/web/sdk/client/components/image-upload/image-upload.module.css
similarity index 100%
rename from web/sdk/react/components/image-upload/image-upload.module.css
rename to web/sdk/client/components/image-upload/image-upload.module.css
diff --git a/web/sdk/react/components/image-upload/image-upload.tsx b/web/sdk/client/components/image-upload/image-upload.tsx
similarity index 99%
rename from web/sdk/react/components/image-upload/image-upload.tsx
rename to web/sdk/client/components/image-upload/image-upload.tsx
index 5729a9ca1..737ff0f84 100644
--- a/web/sdk/react/components/image-upload/image-upload.tsx
+++ b/web/sdk/client/components/image-upload/image-upload.tsx
@@ -16,7 +16,7 @@ import {
Flex,
IconButton,
Text
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import 'react-image-crop/dist/ReactCrop.css';
import styles from './image-upload.module.css';
import { type SyntheticEvent, type ChangeEvent } from 'react';
diff --git a/web/sdk/react/components/image-upload/index.ts b/web/sdk/client/components/image-upload/index.ts
similarity index 100%
rename from web/sdk/react/components/image-upload/index.ts
rename to web/sdk/client/components/image-upload/index.ts
diff --git a/web/sdk/react/components/view-container/index.ts b/web/sdk/client/components/view-container/index.ts
similarity index 100%
rename from web/sdk/react/components/view-container/index.ts
rename to web/sdk/client/components/view-container/index.ts
diff --git a/web/sdk/react/components/view-container/view-container.module.css b/web/sdk/client/components/view-container/view-container.module.css
similarity index 100%
rename from web/sdk/react/components/view-container/view-container.module.css
rename to web/sdk/client/components/view-container/view-container.module.css
diff --git a/web/sdk/react/components/view-container/view-container.tsx b/web/sdk/client/components/view-container/view-container.tsx
similarity index 93%
rename from web/sdk/react/components/view-container/view-container.tsx
rename to web/sdk/client/components/view-container/view-container.tsx
index 8ab4adbc6..71ee048e4 100644
--- a/web/sdk/react/components/view-container/view-container.tsx
+++ b/web/sdk/client/components/view-container/view-container.tsx
@@ -1,5 +1,5 @@
import { ComponentProps } from 'react';
-import { Flex } from '@raystack/apsara-v1';
+import { Flex } from '@raystack/apsara';
import styles from './view-container.module.css';
import { cx } from 'class-variance-authority';
diff --git a/web/sdk/react/components/view-header/index.ts b/web/sdk/client/components/view-header/index.ts
similarity index 100%
rename from web/sdk/react/components/view-header/index.ts
rename to web/sdk/client/components/view-header/index.ts
diff --git a/web/sdk/react/components/view-header/view-header.tsx b/web/sdk/client/components/view-header/view-header.tsx
similarity index 95%
rename from web/sdk/react/components/view-header/view-header.tsx
rename to web/sdk/client/components/view-header/view-header.tsx
index f36606c90..8893eecfc 100644
--- a/web/sdk/react/components/view-header/view-header.tsx
+++ b/web/sdk/client/components/view-header/view-header.tsx
@@ -1,5 +1,5 @@
import { ComponentProps, ReactNode } from 'react';
-import { Flex, Headline, Text } from '@raystack/apsara-v1';
+import { Flex, Headline, Text } from '@raystack/apsara';
export interface ViewHeaderProps extends ComponentProps {
title: string;
diff --git a/web/sdk/react/contexts/CustomizationContext.tsx b/web/sdk/client/contexts/CustomizationContext.tsx
similarity index 100%
rename from web/sdk/react/contexts/CustomizationContext.tsx
rename to web/sdk/client/contexts/CustomizationContext.tsx
diff --git a/web/sdk/react/contexts/FrontierContext.tsx b/web/sdk/client/contexts/FrontierContext.tsx
similarity index 100%
rename from web/sdk/react/contexts/FrontierContext.tsx
rename to web/sdk/client/contexts/FrontierContext.tsx
diff --git a/web/sdk/react/contexts/FrontierProvider.tsx b/web/sdk/client/contexts/FrontierProvider.tsx
similarity index 93%
rename from web/sdk/react/contexts/FrontierProvider.tsx
rename to web/sdk/client/contexts/FrontierProvider.tsx
index d588f764f..48ac17c19 100644
--- a/web/sdk/react/contexts/FrontierProvider.tsx
+++ b/web/sdk/client/contexts/FrontierProvider.tsx
@@ -1,4 +1,4 @@
-import { ThemeProvider, Toast } from '@raystack/apsara-v1';
+import { Theme, Toast } from '@raystack/apsara';
import { FrontierProviderProps } from '../../shared/types';
import { FrontierContextProvider } from './FrontierContext';
import { CustomizationProvider } from './CustomizationContext';
@@ -36,7 +36,7 @@ export const FrontierProvider = (props: FrontierProviderProps) => {
config={config}
{...options}
>
-
+
{children}
diff --git a/web/sdk/react/contexts/useMaxAllowedInstancesGuard.tsx b/web/sdk/client/contexts/useMaxAllowedInstancesGuard.tsx
similarity index 100%
rename from web/sdk/react/contexts/useMaxAllowedInstancesGuard.tsx
rename to web/sdk/client/contexts/useMaxAllowedInstancesGuard.tsx
diff --git a/web/sdk/react/hooks/useBillingPermission.ts b/web/sdk/client/hooks/useBillingPermission.ts
similarity index 100%
rename from web/sdk/react/hooks/useBillingPermission.ts
rename to web/sdk/client/hooks/useBillingPermission.ts
diff --git a/web/sdk/react/hooks/useConnectQueryPolling.tsx b/web/sdk/client/hooks/useConnectQueryPolling.tsx
similarity index 100%
rename from web/sdk/react/hooks/useConnectQueryPolling.tsx
rename to web/sdk/client/hooks/useConnectQueryPolling.tsx
diff --git a/web/sdk/react/hooks/useCopyToClipboard.ts b/web/sdk/client/hooks/useCopyToClipboard.ts
similarity index 100%
rename from web/sdk/react/hooks/useCopyToClipboard.ts
rename to web/sdk/client/hooks/useCopyToClipboard.ts
diff --git a/web/sdk/react/hooks/useLastActiveTracker.ts b/web/sdk/client/hooks/useLastActiveTracker.ts
similarity index 100%
rename from web/sdk/react/hooks/useLastActiveTracker.ts
rename to web/sdk/client/hooks/useLastActiveTracker.ts
diff --git a/web/sdk/react/hooks/useMessages.ts b/web/sdk/client/hooks/useMessages.ts
similarity index 100%
rename from web/sdk/react/hooks/useMessages.ts
rename to web/sdk/client/hooks/useMessages.ts
diff --git a/web/sdk/react/hooks/useOrganizationDomain.ts b/web/sdk/client/hooks/useOrganizationDomain.ts
similarity index 100%
rename from web/sdk/react/hooks/useOrganizationDomain.ts
rename to web/sdk/client/hooks/useOrganizationDomain.ts
diff --git a/web/sdk/react/hooks/useOrganizationDomains.ts b/web/sdk/client/hooks/useOrganizationDomains.ts
similarity index 100%
rename from web/sdk/react/hooks/useOrganizationDomains.ts
rename to web/sdk/client/hooks/useOrganizationDomains.ts
diff --git a/web/sdk/react/hooks/useOrganizationMembers.ts b/web/sdk/client/hooks/useOrganizationMembers.ts
similarity index 100%
rename from web/sdk/react/hooks/useOrganizationMembers.ts
rename to web/sdk/client/hooks/useOrganizationMembers.ts
diff --git a/web/sdk/react/hooks/useOrganizationProjects.ts b/web/sdk/client/hooks/useOrganizationProjects.ts
similarity index 100%
rename from web/sdk/react/hooks/useOrganizationProjects.ts
rename to web/sdk/client/hooks/useOrganizationProjects.ts
diff --git a/web/sdk/react/hooks/useOrganizationTeams.ts b/web/sdk/client/hooks/useOrganizationTeams.ts
similarity index 100%
rename from web/sdk/react/hooks/useOrganizationTeams.ts
rename to web/sdk/client/hooks/useOrganizationTeams.ts
diff --git a/web/sdk/react/hooks/usePermissions.ts b/web/sdk/client/hooks/usePermissions.ts
similarity index 100%
rename from web/sdk/react/hooks/usePermissions.ts
rename to web/sdk/client/hooks/usePermissions.ts
diff --git a/web/sdk/react/hooks/usePreferences.ts b/web/sdk/client/hooks/usePreferences.ts
similarity index 100%
rename from web/sdk/react/hooks/usePreferences.ts
rename to web/sdk/client/hooks/usePreferences.ts
diff --git a/web/sdk/react/hooks/useSessions.ts b/web/sdk/client/hooks/useSessions.ts
similarity index 91%
rename from web/sdk/react/hooks/useSessions.ts
rename to web/sdk/client/hooks/useSessions.ts
index 363c4b94b..640a84477 100644
--- a/web/sdk/react/hooks/useSessions.ts
+++ b/web/sdk/client/hooks/useSessions.ts
@@ -7,7 +7,7 @@ import {
} from '@connectrpc/connect-query';
import { useQueryClient } from '@tanstack/react-query';
import { FrontierServiceQueries } from '@raystack/proton/frontier';
-import { toast } from '@raystack/apsara';
+import { toastManager } from '@raystack/apsara';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
import { timestampToDayjs } from '../../utils/timestamp';
@@ -86,11 +86,16 @@ export const useSessions = () => {
cardinality: 'finite'
})
});
- toast.success('Session revoked successfully');
+ toastManager.add({
+ title: 'Session revoked successfully',
+ type: 'success'
+ });
},
onError: (error: any) => {
- toast.error('Failed to revoke session', {
- description: getErrorMessage(error)
+ toastManager.add({
+ title: 'Failed to revoke session',
+ description: getErrorMessage(error),
+ type: 'error'
});
}
}
diff --git a/web/sdk/react/hooks/useTerminology.ts b/web/sdk/client/hooks/useTerminology.ts
similarity index 100%
rename from web/sdk/react/hooks/useTerminology.ts
rename to web/sdk/client/hooks/useTerminology.ts
diff --git a/web/sdk/react/hooks/useTokens.ts b/web/sdk/client/hooks/useTokens.ts
similarity index 88%
rename from web/sdk/react/hooks/useTokens.ts
rename to web/sdk/client/hooks/useTokens.ts
index 5a30b0e24..cfbdf6aeb 100644
--- a/web/sdk/react/hooks/useTokens.ts
+++ b/web/sdk/client/hooks/useTokens.ts
@@ -3,7 +3,7 @@ import { useQuery } from '@connectrpc/connect-query';
import { create } from '@bufbuild/protobuf';
import { FrontierServiceQueries, GetBillingBalanceRequestSchema } from '@raystack/proton/frontier';
import { useFrontier } from '../contexts/FrontierContext';
-import { toast } from '@raystack/apsara';
+import { toastManager } from '@raystack/apsara';
interface UseTokensReturn {
tokenBalance: bigint;
@@ -34,7 +34,10 @@ export const useTokens = (): UseTokensReturn => {
useEffect(() => {
if (error) {
console.error(error);
- toast.error('Unable to fetch balance');
+ toastManager.add({
+ title: 'Unable to fetch balance',
+ type: 'error'
+ });
}
}, [error]);
diff --git a/web/sdk/client/index.ts b/web/sdk/client/index.ts
new file mode 100644
index 000000000..787cebd89
--- /dev/null
+++ b/web/sdk/client/index.ts
@@ -0,0 +1,58 @@
+import '@raystack/apsara/style.css';
+import '@raystack/apsara/normalize.css';
+
+export { ImageUpload } from './components/image-upload';
+export { ViewContainer } from './components/view-container';
+export { ViewHeader } from './components/view-header';
+export { AuthContainer } from './components/auth-container';
+export { AuthHeader } from './components/auth-header';
+
+export { SignInView } from './views/auth/sign-in';
+export { SignUpView } from './views/auth/sign-up';
+export { MagicLinkView } from './views/auth/magic-link';
+export { MagicLinkVerifyView } from './views/auth/magic-link-verify';
+export { SubscribeView } from './views/auth/subscribe';
+export { UpdatesView } from './views/auth/updates';
+
+export { GeneralView } from './views/general';
+export { PreferencesView, PreferenceRow } from './views/preferences';
+export { ProfileView } from './views/profile';
+export { SessionsView } from './views/sessions';
+export { MembersView } from './views/members';
+export { SecurityView } from './views/security';
+export { ProjectsView, ProjectDetailsView } from './views/projects';
+export { BillingView } from './views/billing';
+export { TokensView } from './views/tokens';
+export { TeamsView, TeamDetailsView } from './views/teams';
+export {
+ ServiceAccountsView,
+ ServiceAccountDetailsView
+} from './views/service-accounts';
+export { PlansView } from './views/plans';
+export { PatsView, PATDetailsView } from './views/pat';
+export { CreateOrganizationView } from './views/create-organization';
+
+export { useFrontier } from './contexts/FrontierContext';
+export { FrontierProvider, queryClient } from './contexts/FrontierProvider';
+export { CustomizationProvider } from './contexts/CustomizationContext';
+
+export { useTerminology } from './hooks/useTerminology';
+export { useTokens } from './hooks/useTokens';
+export { useBillingPermission } from './hooks/useBillingPermission';
+export { useConnectQueryPolling } from './hooks/useConnectQueryPolling';
+export { usePreferences } from './hooks/usePreferences';
+
+export type {
+ FrontierClientOptions,
+ FrontierClientBillingOptions,
+ FrontierClientCustomizationOptions
+} from '../shared/types';
+
+export { PREFERENCE_OPTIONS } from './utils/constants';
+
+export {
+ timestampToDate,
+ timestampToDayjs,
+ isNullTimestamp
+} from '../utils/timestamp';
+export type { TimeStamp } from '../utils/timestamp';
diff --git a/web/sdk/react/package.json b/web/sdk/client/package.json
similarity index 100%
rename from web/sdk/react/package.json
rename to web/sdk/client/package.json
diff --git a/web/sdk/react/utils/connect-pagination.ts b/web/sdk/client/utils/connect-pagination.ts
similarity index 100%
rename from web/sdk/react/utils/connect-pagination.ts
rename to web/sdk/client/utils/connect-pagination.ts
diff --git a/web/sdk/react/utils/constants.ts b/web/sdk/client/utils/constants.ts
similarity index 100%
rename from web/sdk/react/utils/constants.ts
rename to web/sdk/client/utils/constants.ts
diff --git a/web/sdk/react/utils/fetch.ts b/web/sdk/client/utils/fetch.ts
similarity index 100%
rename from web/sdk/react/utils/fetch.ts
rename to web/sdk/client/utils/fetch.ts
diff --git a/web/sdk/react/utils/index.ts b/web/sdk/client/utils/index.ts
similarity index 100%
rename from web/sdk/react/utils/index.ts
rename to web/sdk/client/utils/index.ts
diff --git a/web/sdk/react/utils/transform-query.ts b/web/sdk/client/utils/transform-query.ts
similarity index 99%
rename from web/sdk/react/utils/transform-query.ts
rename to web/sdk/client/utils/transform-query.ts
index 55a03a4fb..f4af7e210 100644
--- a/web/sdk/react/utils/transform-query.ts
+++ b/web/sdk/client/utils/transform-query.ts
@@ -1,4 +1,4 @@
-import type { DataTableQuery, DataTableSort } from '@raystack/apsara-v1';
+import type { DataTableQuery, DataTableSort } from '@raystack/apsara';
import type { RQLRequest, RQLFilter, RQLSort } from '@raystack/proton/frontier';
import {
RQLRequestSchema,
diff --git a/web/sdk/react/views-new/auth/magic-link-verify/index.ts b/web/sdk/client/views/auth/magic-link-verify/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/magic-link-verify/index.ts
rename to web/sdk/client/views/auth/magic-link-verify/index.ts
diff --git a/web/sdk/react/views-new/auth/magic-link-verify/magic-link-verify-view.module.css b/web/sdk/client/views/auth/magic-link-verify/magic-link-verify-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/magic-link-verify/magic-link-verify-view.module.css
rename to web/sdk/client/views/auth/magic-link-verify/magic-link-verify-view.module.css
diff --git a/web/sdk/react/views-new/auth/magic-link-verify/magic-link-verify-view.tsx b/web/sdk/client/views/auth/magic-link-verify/magic-link-verify-view.tsx
similarity index 95%
rename from web/sdk/react/views-new/auth/magic-link-verify/magic-link-verify-view.tsx
rename to web/sdk/client/views/auth/magic-link-verify/magic-link-verify-view.tsx
index 9d5189e08..f07935163 100644
--- a/web/sdk/react/views-new/auth/magic-link-verify/magic-link-verify-view.tsx
+++ b/web/sdk/client/views/auth/magic-link-verify/magic-link-verify-view.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Button, Text, Link, Flex, Input } from '@raystack/apsara-v1';
+import { Button, Text, Link, Flex, Input } from '@raystack/apsara';
import {
ChangeEvent,
ComponentPropsWithRef,
@@ -13,12 +13,12 @@ import {
} from 'react';
import { useMutation } from '@connectrpc/connect-query';
import { FrontierServiceQueries } from '@raystack/proton/frontier';
-import { useFrontier } from '~/react/contexts/FrontierContext';
+import { useFrontier } from '~/client/contexts/FrontierContext';
import {
AuthContainer,
type AuthContainerProps
-} from '~/react/components/auth-container';
-import { AuthHeader } from '~/react/components/auth-header';
+} from '~/client/components/auth-container';
+import { AuthHeader } from '~/client/components/auth-header';
import styles from './magic-link-verify-view.module.css';
export type MagicLinkVerifyViewProps = ComponentPropsWithRef<'div'> &
diff --git a/web/sdk/react/views-new/auth/magic-link/index.ts b/web/sdk/client/views/auth/magic-link/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/magic-link/index.ts
rename to web/sdk/client/views/auth/magic-link/index.ts
diff --git a/web/sdk/react/views-new/auth/magic-link/magic-link-view.module.css b/web/sdk/client/views/auth/magic-link/magic-link-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/magic-link/magic-link-view.module.css
rename to web/sdk/client/views/auth/magic-link/magic-link-view.module.css
diff --git a/web/sdk/react/views-new/auth/magic-link/magic-link-view.tsx b/web/sdk/client/views/auth/magic-link/magic-link-view.tsx
similarity index 93%
rename from web/sdk/react/views-new/auth/magic-link/magic-link-view.tsx
rename to web/sdk/client/views/auth/magic-link/magic-link-view.tsx
index 897213bbf..2b87b71a0 100644
--- a/web/sdk/react/views-new/auth/magic-link/magic-link-view.tsx
+++ b/web/sdk/client/views/auth/magic-link/magic-link-view.tsx
@@ -5,20 +5,20 @@ import {
Separator,
Flex,
Input
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { ComponentPropsWithRef, ReactNode, useCallback, useState } from 'react';
import { useForm } from 'react-hook-form';
import * as yup from 'yup';
import isEmail from 'validator/lib/isEmail';
import { useMutation } from '@connectrpc/connect-query';
import { FrontierServiceQueries } from '@raystack/proton/frontier';
-import { useFrontier } from '~/react/contexts/FrontierContext';
-import { HttpErrorResponse } from '~/react/utils';
+import { useFrontier } from '~/client/contexts/FrontierContext';
+import { HttpErrorResponse } from '~/client/utils';
import {
AuthContainer,
type AuthContainerProps
-} from '~/react/components/auth-container';
-import { AuthHeader } from '~/react/components/auth-header';
+} from '~/client/components/auth-container';
+import { AuthHeader } from '~/client/components/auth-header';
import styles from './magic-link-view.module.css';
export type MagicLinkViewProps = ComponentPropsWithRef<'div'> &
diff --git a/web/sdk/react/views-new/auth/sign-in/index.ts b/web/sdk/client/views/auth/sign-in/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/sign-in/index.ts
rename to web/sdk/client/views/auth/sign-in/index.ts
diff --git a/web/sdk/react/views-new/auth/sign-in/sign-in-view.module.css b/web/sdk/client/views/auth/sign-in/sign-in-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/sign-in/sign-in-view.module.css
rename to web/sdk/client/views/auth/sign-in/sign-in-view.module.css
diff --git a/web/sdk/react/views-new/auth/sign-in/sign-in-view.tsx b/web/sdk/client/views/auth/sign-in/sign-in-view.tsx
similarity index 89%
rename from web/sdk/react/views-new/auth/sign-in/sign-in-view.tsx
rename to web/sdk/client/views/auth/sign-in/sign-in-view.tsx
index 7d5e03a12..51e8e68f0 100644
--- a/web/sdk/react/views-new/auth/sign-in/sign-in-view.tsx
+++ b/web/sdk/client/views/auth/sign-in/sign-in-view.tsx
@@ -1,14 +1,14 @@
-import { Link, Text, Flex } from '@raystack/apsara-v1';
+import { Link, Text, Flex } from '@raystack/apsara';
import { ComponentPropsWithRef, ReactNode, useCallback } from 'react';
import { useMutation, useQuery } from '@connectrpc/connect-query';
import { FrontierServiceQueries } from '@raystack/proton/frontier';
-import { useFrontier } from '~/react/contexts/FrontierContext';
+import { useFrontier } from '~/client/contexts/FrontierContext';
import {
AuthContainer,
type AuthContainerProps
-} from '~/react/components/auth-container';
-import { AuthHeader } from '~/react/components/auth-header';
-import { AuthOIDCButton } from '~/react/components/auth-oidc-button';
+} from '~/client/components/auth-container';
+import { AuthHeader } from '~/client/components/auth-header';
+import { AuthOIDCButton } from '~/client/components/auth-oidc-button';
import { MagicLinkView } from '../magic-link/magic-link-view';
import styles from './sign-in-view.module.css';
diff --git a/web/sdk/react/views-new/auth/sign-up/index.ts b/web/sdk/client/views/auth/sign-up/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/sign-up/index.ts
rename to web/sdk/client/views/auth/sign-up/index.ts
diff --git a/web/sdk/react/views-new/auth/sign-up/sign-up-view.module.css b/web/sdk/client/views/auth/sign-up/sign-up-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/sign-up/sign-up-view.module.css
rename to web/sdk/client/views/auth/sign-up/sign-up-view.module.css
diff --git a/web/sdk/react/views-new/auth/sign-up/sign-up-view.tsx b/web/sdk/client/views/auth/sign-up/sign-up-view.tsx
similarity index 89%
rename from web/sdk/react/views-new/auth/sign-up/sign-up-view.tsx
rename to web/sdk/client/views/auth/sign-up/sign-up-view.tsx
index e0e8a213d..676135078 100644
--- a/web/sdk/react/views-new/auth/sign-up/sign-up-view.tsx
+++ b/web/sdk/client/views/auth/sign-up/sign-up-view.tsx
@@ -1,14 +1,14 @@
-import { Link, Text, Flex } from '@raystack/apsara-v1';
+import { Link, Text, Flex } from '@raystack/apsara';
import { ComponentPropsWithRef, ReactNode, useCallback } from 'react';
import { useMutation, useQuery } from '@connectrpc/connect-query';
import { FrontierServiceQueries } from '@raystack/proton/frontier';
-import { useFrontier } from '~/react/contexts/FrontierContext';
+import { useFrontier } from '~/client/contexts/FrontierContext';
import {
AuthContainer,
type AuthContainerProps
-} from '~/react/components/auth-container';
-import { AuthHeader } from '~/react/components/auth-header';
-import { AuthOIDCButton } from '~/react/components/auth-oidc-button';
+} from '~/client/components/auth-container';
+import { AuthHeader } from '~/client/components/auth-header';
+import { AuthOIDCButton } from '~/client/components/auth-oidc-button';
import { MagicLinkView } from '../magic-link/magic-link-view';
import styles from './sign-up-view.module.css';
diff --git a/web/sdk/react/views-new/auth/subscribe/index.ts b/web/sdk/client/views/auth/subscribe/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/subscribe/index.ts
rename to web/sdk/client/views/auth/subscribe/index.ts
diff --git a/web/sdk/react/views-new/auth/subscribe/subscribe-view.module.css b/web/sdk/client/views/auth/subscribe/subscribe-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/subscribe/subscribe-view.module.css
rename to web/sdk/client/views/auth/subscribe/subscribe-view.module.css
diff --git a/web/sdk/react/views-new/auth/subscribe/subscribe-view.tsx b/web/sdk/client/views/auth/subscribe/subscribe-view.tsx
similarity index 98%
rename from web/sdk/react/views-new/auth/subscribe/subscribe-view.tsx
rename to web/sdk/client/views/auth/subscribe/subscribe-view.tsx
index 9aede705b..94a59a810 100644
--- a/web/sdk/react/views-new/auth/subscribe/subscribe-view.tsx
+++ b/web/sdk/client/views/auth/subscribe/subscribe-view.tsx
@@ -14,14 +14,14 @@ import {
toastManager,
Image,
EmptyState
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useMutation } from '@connectrpc/connect-query';
import {
CreateProspectPublicRequestSchema,
FrontierServiceQueries
} from '@raystack/proton/frontier';
import { create } from '@bufbuild/protobuf';
-import checkCircle from '~/react/assets/check-circle.svg';
+import checkCircle from '~/client/assets/check-circle.svg';
import styles from './subscribe-view.module.css';
const schema = yup.object({
diff --git a/web/sdk/react/views-new/auth/updates/index.ts b/web/sdk/client/views/auth/updates/index.ts
similarity index 100%
rename from web/sdk/react/views-new/auth/updates/index.ts
rename to web/sdk/client/views/auth/updates/index.ts
diff --git a/web/sdk/react/views-new/auth/updates/updates-view.module.css b/web/sdk/client/views/auth/updates/updates-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/auth/updates/updates-view.module.css
rename to web/sdk/client/views/auth/updates/updates-view.module.css
diff --git a/web/sdk/react/views-new/auth/updates/updates-view.tsx b/web/sdk/client/views/auth/updates/updates-view.tsx
similarity index 92%
rename from web/sdk/react/views-new/auth/updates/updates-view.tsx
rename to web/sdk/client/views/auth/updates/updates-view.tsx
index 0479b6275..7eba80ab4 100644
--- a/web/sdk/react/views-new/auth/updates/updates-view.tsx
+++ b/web/sdk/client/views/auth/updates/updates-view.tsx
@@ -2,13 +2,13 @@
import { yupResolver } from '@hookform/resolvers/yup';
import { type ReactNode } from 'react';
-import { Button, Flex, Text, Switch, Skeleton } from '@raystack/apsara-v1';
+import { Button, Flex, Text, Switch, Skeleton } from '@raystack/apsara';
import { Controller, useForm } from 'react-hook-form';
import * as yup from 'yup';
-import { PREFERENCE_OPTIONS } from '~/react/utils/constants';
-import { usePreferences } from '~/react/hooks/usePreferences';
-import { AuthContainer } from '~/react/components/auth-container';
-import { AuthHeader } from '~/react/components/auth-header';
+import { PREFERENCE_OPTIONS } from '~/client/utils/constants';
+import { usePreferences } from '~/client/hooks/usePreferences';
+import { AuthContainer } from '~/client/components/auth-container';
+import { AuthHeader } from '~/client/components/auth-header';
import styles from './updates-view.module.css';
const schema = yup.object({
diff --git a/web/sdk/react/views-new/billing/billing-view.module.css b/web/sdk/client/views/billing/billing-view.module.css
similarity index 95%
rename from web/sdk/react/views-new/billing/billing-view.module.css
rename to web/sdk/client/views/billing/billing-view.module.css
index 947c8879c..d1a3ace8b 100644
--- a/web/sdk/react/views-new/billing/billing-view.module.css
+++ b/web/sdk/client/views/billing/billing-view.module.css
@@ -43,3 +43,7 @@
.viewInvoiceBtn {
color: var(--rs-color-foreground-accent-primary);
}
+
+.emptyState {
+ padding-top: var(--rs-space-17);
+}
diff --git a/web/sdk/react/views-new/billing/billing-view.tsx b/web/sdk/client/views/billing/billing-view.tsx
similarity index 98%
rename from web/sdk/react/views-new/billing/billing-view.tsx
rename to web/sdk/client/views/billing/billing-view.tsx
index b9f096914..cda8fa84b 100644
--- a/web/sdk/react/views-new/billing/billing-view.tsx
+++ b/web/sdk/client/views/billing/billing-view.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useMemo } from 'react';
import qs from 'query-string';
-import { Flex, Dialog, EmptyState, toastManager } from '@raystack/apsara-v1';
+import { Flex, Dialog, EmptyState, toastManager } from '@raystack/apsara';
import {
CreateCheckoutRequestSchema,
ListInvoicesRequestSchema,
@@ -28,6 +28,7 @@ import {
type ConfirmCycleSwitchPayload
} from './components/confirm-cycle-switch-dialog';
import { ExclamationTriangleIcon } from '@radix-ui/react-icons';
+import styles from './billing-view.module.css';
const cycleSwitchDialogHandle =
Dialog.createHandle();
@@ -162,6 +163,7 @@ export function BillingView({ onNavigateToPlans }: BillingViewProps) {
{hasNoAccess ? (
}
heading="Restricted Access"
subHeading="Admin access required, please reach out to your admin to view billing."
diff --git a/web/sdk/react/views-new/billing/components/billing-details-card.tsx b/web/sdk/client/views/billing/components/billing-details-card.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/billing-details-card.tsx
rename to web/sdk/client/views/billing/components/billing-details-card.tsx
index a99864204..a937672ec 100644
--- a/web/sdk/react/views-new/billing/components/billing-details-card.tsx
+++ b/web/sdk/client/views/billing/components/billing-details-card.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Button, Skeleton, Text, Flex, Tooltip } from '@raystack/apsara-v1';
+import { Button, Skeleton, Text, Flex, Tooltip } from '@raystack/apsara';
import type { BillingAccount } from '@raystack/proton/frontier';
import { convertBillingAddressToString } from '../../../utils';
import styles from '../billing-view.module.css';
diff --git a/web/sdk/react/views-new/billing/components/confirm-cycle-switch-dialog.tsx b/web/sdk/client/views/billing/components/confirm-cycle-switch-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/confirm-cycle-switch-dialog.tsx
rename to web/sdk/client/views/billing/components/confirm-cycle-switch-dialog.tsx
index 7bdb2e474..6c2417b47 100644
--- a/web/sdk/react/views-new/billing/components/confirm-cycle-switch-dialog.tsx
+++ b/web/sdk/client/views/billing/components/confirm-cycle-switch-dialog.tsx
@@ -9,7 +9,7 @@ import {
Flex,
Dialog,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useFrontier } from '../../../contexts/FrontierContext';
import { getPlanIntervalName, getPlanPrice } from '../../../utils';
import { DEFAULT_DATE_FORMAT } from '../../../utils/constants';
diff --git a/web/sdk/react/views-new/billing/components/invoices.tsx b/web/sdk/client/views/billing/components/invoices.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/invoices.tsx
rename to web/sdk/client/views/billing/components/invoices.tsx
index c674a539b..b1a180f43 100644
--- a/web/sdk/react/views-new/billing/components/invoices.tsx
+++ b/web/sdk/client/views/billing/components/invoices.tsx
@@ -8,12 +8,12 @@ import {
Flex,
Text,
Amount
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import type {
DataTableColumnDef,
DataTableQuery,
DataTableSort
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import {
ExclamationTriangleIcon,
} from '@radix-ui/react-icons';
diff --git a/web/sdk/react/views-new/billing/components/payment-issue.tsx b/web/sdk/client/views/billing/components/payment-issue.tsx
similarity index 96%
rename from web/sdk/react/views-new/billing/components/payment-issue.tsx
rename to web/sdk/client/views/billing/components/payment-issue.tsx
index 9a815385e..d16326591 100644
--- a/web/sdk/react/views-new/billing/components/payment-issue.tsx
+++ b/web/sdk/client/views/billing/components/payment-issue.tsx
@@ -1,7 +1,7 @@
'use client';
import { useCallback } from 'react';
-import { Button, Text, Flex } from '@raystack/apsara-v1';
+import { Button, Text, Flex } from '@raystack/apsara';
import { ExclamationTriangleIcon } from '@radix-ui/react-icons';
import { INVOICE_STATES, SUBSCRIPTION_STATES } from '../../../utils/constants';
import { Subscription, Invoice } from '@raystack/proton/frontier';
diff --git a/web/sdk/react/views-new/billing/components/payment-method-card.tsx b/web/sdk/client/views/billing/components/payment-method-card.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/payment-method-card.tsx
rename to web/sdk/client/views/billing/components/payment-method-card.tsx
index 762e3f7ae..98db2c665 100644
--- a/web/sdk/react/views-new/billing/components/payment-method-card.tsx
+++ b/web/sdk/client/views/billing/components/payment-method-card.tsx
@@ -1,7 +1,7 @@
'use client';
import qs from 'query-string';
-import { Button, Skeleton, Text, Flex, Tooltip, toastManager } from '@raystack/apsara-v1';
+import { Button, Skeleton, Text, Flex, Tooltip, toastManager } from '@raystack/apsara';
import { useFrontier } from '../../../contexts/FrontierContext';
import {
PaymentMethod as PaymentMethodType,
diff --git a/web/sdk/react/views-new/billing/components/upcoming-billing-cycle.tsx b/web/sdk/client/views/billing/components/upcoming-billing-cycle.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/upcoming-billing-cycle.tsx
rename to web/sdk/client/views/billing/components/upcoming-billing-cycle.tsx
index 4dc22b72e..9fe4a4ff1 100644
--- a/web/sdk/react/views-new/billing/components/upcoming-billing-cycle.tsx
+++ b/web/sdk/client/views/billing/components/upcoming-billing-cycle.tsx
@@ -18,7 +18,7 @@ import {
Flex,
Amount,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { InfoCircledIcon } from '@radix-ui/react-icons';
import {
getPlanIntervalName,
diff --git a/web/sdk/react/views-new/billing/components/upcoming-plan-change-banner.tsx b/web/sdk/client/views/billing/components/upcoming-plan-change-banner.tsx
similarity index 99%
rename from web/sdk/react/views-new/billing/components/upcoming-plan-change-banner.tsx
rename to web/sdk/client/views/billing/components/upcoming-plan-change-banner.tsx
index e6f368ed4..1210be633 100644
--- a/web/sdk/react/views-new/billing/components/upcoming-plan-change-banner.tsx
+++ b/web/sdk/client/views/billing/components/upcoming-plan-change-banner.tsx
@@ -1,7 +1,7 @@
'use client';
import { useCallback, useMemo } from 'react';
-import { Button, Text, Flex, toastManager } from '@raystack/apsara-v1';
+import { Button, Text, Flex, toastManager } from '@raystack/apsara';
import { InfoCircledIcon } from '@radix-ui/react-icons';
import { useFrontier } from '../../../contexts/FrontierContext';
import {
diff --git a/web/sdk/react/views-new/billing/index.ts b/web/sdk/client/views/billing/index.ts
similarity index 100%
rename from web/sdk/react/views-new/billing/index.ts
rename to web/sdk/client/views/billing/index.ts
diff --git a/web/sdk/react/views-new/create-organization/create-organization-view.module.css b/web/sdk/client/views/create-organization/create-organization-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/create-organization/create-organization-view.module.css
rename to web/sdk/client/views/create-organization/create-organization-view.module.css
diff --git a/web/sdk/react/views-new/create-organization/create-organization-view.tsx b/web/sdk/client/views/create-organization/create-organization-view.tsx
similarity index 97%
rename from web/sdk/react/views-new/create-organization/create-organization-view.tsx
rename to web/sdk/client/views/create-organization/create-organization-view.tsx
index a4573db53..97c086b03 100644
--- a/web/sdk/react/views-new/create-organization/create-organization-view.tsx
+++ b/web/sdk/client/views/create-organization/create-organization-view.tsx
@@ -9,7 +9,7 @@ import {
Field,
Input,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { ComponentPropsWithRef } from 'react';
import { useForm } from 'react-hook-form';
import * as yup from 'yup';
@@ -19,7 +19,7 @@ import {
CreateOrganizationRequestSchema
} from '@raystack/proton/frontier';
import { create } from '@bufbuild/protobuf';
-import { useTerminology } from '~/react/hooks/useTerminology';
+import { useTerminology } from '~/client/hooks/useTerminology';
import styles from './create-organization-view.module.css';
export type CreateOrganizationViewProps = ComponentPropsWithRef<'div'> & {
diff --git a/web/sdk/react/views-new/create-organization/index.ts b/web/sdk/client/views/create-organization/index.ts
similarity index 100%
rename from web/sdk/react/views-new/create-organization/index.ts
rename to web/sdk/client/views/create-organization/index.ts
diff --git a/web/sdk/react/views-new/general/components/delete-organization-dialog.tsx b/web/sdk/client/views/general/components/delete-organization-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/general/components/delete-organization-dialog.tsx
rename to web/sdk/client/views/general/components/delete-organization-dialog.tsx
index edff67f85..3519bb798 100644
--- a/web/sdk/react/views-new/general/components/delete-organization-dialog.tsx
+++ b/web/sdk/client/views/general/components/delete-organization-dialog.tsx
@@ -17,7 +17,7 @@ import {
Input,
Text,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useFrontier } from '../../../contexts/FrontierContext';
import { useTerminology } from '../../../hooks/useTerminology';
import { handleConnectError } from '~/utils/error';
diff --git a/web/sdk/react/views-new/general/general-view.module.css b/web/sdk/client/views/general/general-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/general/general-view.module.css
rename to web/sdk/client/views/general/general-view.module.css
diff --git a/web/sdk/react/views-new/general/general-view.tsx b/web/sdk/client/views/general/general-view.tsx
similarity index 99%
rename from web/sdk/react/views-new/general/general-view.tsx
rename to web/sdk/client/views/general/general-view.tsx
index 80e7b7d45..2cffaa7e5 100644
--- a/web/sdk/react/views-new/general/general-view.tsx
+++ b/web/sdk/client/views/general/general-view.tsx
@@ -24,7 +24,7 @@ import {
Field,
Input,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useFrontier } from '../../contexts/FrontierContext';
import { usePermissions } from '../../hooks/usePermissions';
import { useTerminology } from '../../hooks/useTerminology';
diff --git a/web/sdk/react/views-new/general/index.ts b/web/sdk/client/views/general/index.ts
similarity index 100%
rename from web/sdk/react/views-new/general/index.ts
rename to web/sdk/client/views/general/index.ts
diff --git a/web/sdk/react/views-new/members/components/invite-member-dialog.tsx b/web/sdk/client/views/members/components/invite-member-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/members/components/invite-member-dialog.tsx
rename to web/sdk/client/views/members/components/invite-member-dialog.tsx
index 40995ad00..c704b7017 100644
--- a/web/sdk/react/views-new/members/components/invite-member-dialog.tsx
+++ b/web/sdk/client/views/members/components/invite-member-dialog.tsx
@@ -24,7 +24,7 @@ import {
Field,
TextArea,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useFrontier } from '../../../contexts/FrontierContext';
import { PERMISSIONS } from '../../../../utils';
import { handleConnectError } from '~/utils/error';
diff --git a/web/sdk/react/views-new/members/components/member-columns.module.css b/web/sdk/client/views/members/components/member-columns.module.css
similarity index 100%
rename from web/sdk/react/views-new/members/components/member-columns.module.css
rename to web/sdk/client/views/members/components/member-columns.module.css
diff --git a/web/sdk/react/views-new/members/components/member-columns.tsx b/web/sdk/client/views/members/components/member-columns.tsx
similarity index 97%
rename from web/sdk/react/views-new/members/components/member-columns.tsx
rename to web/sdk/client/views/members/components/member-columns.tsx
index fcc45a5e6..4ee75a674 100644
--- a/web/sdk/react/views-new/members/components/member-columns.tsx
+++ b/web/sdk/client/views/members/components/member-columns.tsx
@@ -9,9 +9,9 @@ import {
Menu,
IconButton,
DataTableColumnDef
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import type { Role } from '@raystack/proton/frontier';
-import type { MemberWithInvite } from '~/react/hooks/useOrganizationMembers';
+import type { MemberWithInvite } from '~/client/hooks/useOrganizationMembers';
import { differenceWith, getInitials, isEqualById } from '~/utils';
import styles from './member-columns.module.css';
diff --git a/web/sdk/react/views-new/members/components/remove-member-dialog.tsx b/web/sdk/client/views/members/components/remove-member-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/members/components/remove-member-dialog.tsx
rename to web/sdk/client/views/members/components/remove-member-dialog.tsx
index b863e8799..c36784928 100644
--- a/web/sdk/react/views-new/members/components/remove-member-dialog.tsx
+++ b/web/sdk/client/views/members/components/remove-member-dialog.tsx
@@ -12,7 +12,7 @@ import {
AlertDialog,
Button,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { useFrontier } from '../../../contexts/FrontierContext';
import { useTerminology } from '../../../hooks/useTerminology';
import { handleConnectError } from '~/utils/error';
diff --git a/web/sdk/react/views-new/members/components/update-role-dialog.tsx b/web/sdk/client/views/members/components/update-role-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/members/components/update-role-dialog.tsx
rename to web/sdk/client/views/members/components/update-role-dialog.tsx
index 5cf63a106..9c82ceed6 100644
--- a/web/sdk/react/views-new/members/components/update-role-dialog.tsx
+++ b/web/sdk/client/views/members/components/update-role-dialog.tsx
@@ -12,7 +12,7 @@ import {
AlertDialog,
Button,
toastManager
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import { handleConnectError } from '~/utils/error';
export type UpdateRolePayload = { memberId: string; role: Role };
diff --git a/web/sdk/react/views-new/members/index.ts b/web/sdk/client/views/members/index.ts
similarity index 100%
rename from web/sdk/react/views-new/members/index.ts
rename to web/sdk/client/views/members/index.ts
diff --git a/web/sdk/react/views-new/members/members-view.module.css b/web/sdk/client/views/members/members-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/members/members-view.module.css
rename to web/sdk/client/views/members/members-view.module.css
diff --git a/web/sdk/react/views-new/members/members-view.tsx b/web/sdk/client/views/members/members-view.tsx
similarity index 99%
rename from web/sdk/react/views-new/members/members-view.tsx
rename to web/sdk/client/views/members/members-view.tsx
index d50dfc6e8..9b283f107 100644
--- a/web/sdk/react/views-new/members/members-view.tsx
+++ b/web/sdk/client/views/members/members-view.tsx
@@ -14,7 +14,7 @@ import {
Dialog,
Image,
Menu
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import deleteIcon from '../../assets/delete.svg';
import { useFrontier } from '../../contexts/FrontierContext';
import { useOrganizationMembers } from '../../hooks/useOrganizationMembers';
diff --git a/web/sdk/react/views-new/pat/components/pat-columns.tsx b/web/sdk/client/views/pat/components/pat-columns.tsx
similarity index 99%
rename from web/sdk/react/views-new/pat/components/pat-columns.tsx
rename to web/sdk/client/views/pat/components/pat-columns.tsx
index d1f638eb7..23cb946ac 100644
--- a/web/sdk/react/views-new/pat/components/pat-columns.tsx
+++ b/web/sdk/client/views/pat/components/pat-columns.tsx
@@ -2,7 +2,7 @@
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
-import { Button, Text, DataTableColumnDef } from '@raystack/apsara-v1';
+import { Button, Text, DataTableColumnDef } from '@raystack/apsara';
import type { PAT } from '@raystack/proton/frontier';
import { timestampToDayjs, isNullTimestamp } from '~/utils/timestamp';
import styles from '../pat-view.module.css';
diff --git a/web/sdk/react/views-new/pat/components/pat-created-dialog.tsx b/web/sdk/client/views/pat/components/pat-created-dialog.tsx
similarity index 98%
rename from web/sdk/react/views-new/pat/components/pat-created-dialog.tsx
rename to web/sdk/client/views/pat/components/pat-created-dialog.tsx
index e2bc7d819..e88e11006 100644
--- a/web/sdk/react/views-new/pat/components/pat-created-dialog.tsx
+++ b/web/sdk/client/views/pat/components/pat-created-dialog.tsx
@@ -9,7 +9,7 @@ import {
Flex,
Input,
Text
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
export interface PATCreatedPayload {
token: string;
diff --git a/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx b/web/sdk/client/views/pat/components/pat-form-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/pat/components/pat-form-dialog.tsx
rename to web/sdk/client/views/pat/components/pat-form-dialog.tsx
index fc770c7cf..6790c738e 100644
--- a/web/sdk/react/views-new/pat/components/pat-form-dialog.tsx
+++ b/web/sdk/client/views/pat/components/pat-form-dialog.tsx
@@ -32,9 +32,9 @@ import {
Spinner,
Text,
toastManager
-} from '@raystack/apsara-v1';
-import { useFrontier } from '~/react/contexts/FrontierContext';
-import { DEFAULT_DATE_FORMAT } from '~/react/utils/constants';
+} from '@raystack/apsara';
+import { useFrontier } from '~/client/contexts/FrontierContext';
+import { DEFAULT_DATE_FORMAT } from '~/client/utils/constants';
import { PERMISSIONS } from '../../../../utils';
import { handleConnectError } from '~/utils/error';
import { EXPIRY_OPTIONS } from '../utils';
diff --git a/web/sdk/react/views-new/pat/components/pat-project-chips.module.css b/web/sdk/client/views/pat/components/pat-project-chips.module.css
similarity index 100%
rename from web/sdk/react/views-new/pat/components/pat-project-chips.module.css
rename to web/sdk/client/views/pat/components/pat-project-chips.module.css
diff --git a/web/sdk/react/views-new/pat/components/pat-project-chips.tsx b/web/sdk/client/views/pat/components/pat-project-chips.tsx
similarity index 97%
rename from web/sdk/react/views-new/pat/components/pat-project-chips.tsx
rename to web/sdk/client/views/pat/components/pat-project-chips.tsx
index 2eee006fc..317aec4f5 100644
--- a/web/sdk/react/views-new/pat/components/pat-project-chips.tsx
+++ b/web/sdk/client/views/pat/components/pat-project-chips.tsx
@@ -1,7 +1,7 @@
'use client';
import { useLayoutEffect, useRef, useState } from 'react';
-import { Chip } from '@raystack/apsara-v1';
+import { Chip } from '@raystack/apsara';
import styles from './pat-project-chips.module.css';
interface ProjectChipItem {
diff --git a/web/sdk/react/views-new/pat/components/regenerate-pat-dialog.module.css b/web/sdk/client/views/pat/components/regenerate-pat-dialog.module.css
similarity index 100%
rename from web/sdk/react/views-new/pat/components/regenerate-pat-dialog.module.css
rename to web/sdk/client/views/pat/components/regenerate-pat-dialog.module.css
diff --git a/web/sdk/react/views-new/pat/components/regenerate-pat-dialog.tsx b/web/sdk/client/views/pat/components/regenerate-pat-dialog.tsx
similarity index 96%
rename from web/sdk/react/views-new/pat/components/regenerate-pat-dialog.tsx
rename to web/sdk/client/views/pat/components/regenerate-pat-dialog.tsx
index 49cd8ddc8..fecbe80f3 100644
--- a/web/sdk/react/views-new/pat/components/regenerate-pat-dialog.tsx
+++ b/web/sdk/client/views/pat/components/regenerate-pat-dialog.tsx
@@ -16,9 +16,9 @@ import {
Select,
Text,
toastManager
-} from '@raystack/apsara-v1';
-import { useFrontier } from '~/react/contexts/FrontierContext';
-import { DEFAULT_DATE_FORMAT } from '~/react/utils/constants';
+} from '@raystack/apsara';
+import { useFrontier } from '~/client/contexts/FrontierContext';
+import { DEFAULT_DATE_FORMAT } from '~/client/utils/constants';
import { handleConnectError } from '~/utils/error';
import { EXPIRY_OPTIONS } from '../utils';
import styles from './regenerate-pat-dialog.module.css';
diff --git a/web/sdk/react/views-new/pat/components/revoke-pat-dialog.tsx b/web/sdk/client/views/pat/components/revoke-pat-dialog.tsx
similarity index 99%
rename from web/sdk/react/views-new/pat/components/revoke-pat-dialog.tsx
rename to web/sdk/client/views/pat/components/revoke-pat-dialog.tsx
index 735cc10d1..ce31536a5 100644
--- a/web/sdk/react/views-new/pat/components/revoke-pat-dialog.tsx
+++ b/web/sdk/client/views/pat/components/revoke-pat-dialog.tsx
@@ -7,7 +7,7 @@ import {
FrontierServiceQueries,
DeleteCurrentUserPATRequestSchema
} from '@raystack/proton/frontier';
-import { AlertDialog, Button, toastManager } from '@raystack/apsara-v1';
+import { AlertDialog, Button, toastManager } from '@raystack/apsara';
import { handleConnectError } from '~/utils/error';
export interface RevokePATDialogProps {
diff --git a/web/sdk/react/views-new/pat/components/token-cell.tsx b/web/sdk/client/views/pat/components/token-cell.tsx
similarity index 97%
rename from web/sdk/react/views-new/pat/components/token-cell.tsx
rename to web/sdk/client/views/pat/components/token-cell.tsx
index 340a7abf6..0b224edf5 100644
--- a/web/sdk/react/views-new/pat/components/token-cell.tsx
+++ b/web/sdk/client/views/pat/components/token-cell.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Button, Flex, Text } from '@raystack/apsara-v1';
+import { Button, Flex, Text } from '@raystack/apsara';
import styles from '../pat-view.module.css';
function KeyIcon() {
diff --git a/web/sdk/react/views-new/pat/index.ts b/web/sdk/client/views/pat/index.ts
similarity index 100%
rename from web/sdk/react/views-new/pat/index.ts
rename to web/sdk/client/views/pat/index.ts
diff --git a/web/sdk/react/views-new/pat/pat-details-view.module.css b/web/sdk/client/views/pat/pat-details-view.module.css
similarity index 100%
rename from web/sdk/react/views-new/pat/pat-details-view.module.css
rename to web/sdk/client/views/pat/pat-details-view.module.css
diff --git a/web/sdk/react/views-new/pat/pat-details-view.tsx b/web/sdk/client/views/pat/pat-details-view.tsx
similarity index 99%
rename from web/sdk/react/views-new/pat/pat-details-view.tsx
rename to web/sdk/client/views/pat/pat-details-view.tsx
index a61ea2870..ab15cbb21 100644
--- a/web/sdk/react/views-new/pat/pat-details-view.tsx
+++ b/web/sdk/client/views/pat/pat-details-view.tsx
@@ -19,7 +19,7 @@ import {
Text,
toastManager,
Tooltip
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import deleteIcon from '../../assets/delete.svg';
import { useQuery } from '@connectrpc/connect-query';
import { create } from '@bufbuild/protobuf';
diff --git a/web/sdk/react/views-new/pat/pat-view.module.css b/web/sdk/client/views/pat/pat-view.module.css
similarity index 89%
rename from web/sdk/react/views-new/pat/pat-view.module.css
rename to web/sdk/client/views/pat/pat-view.module.css
index 5b25d383b..201d38a91 100644
--- a/web/sdk/react/views-new/pat/pat-view.module.css
+++ b/web/sdk/client/views/pat/pat-view.module.css
@@ -27,3 +27,7 @@
justify-content: center;
align-items: center;
}
+
+.emptyState {
+ padding-top: var(--rs-space-17);
+}
diff --git a/web/sdk/react/views-new/pat/pat-view.tsx b/web/sdk/client/views/pat/pat-view.tsx
similarity index 94%
rename from web/sdk/react/views-new/pat/pat-view.tsx
rename to web/sdk/client/views/pat/pat-view.tsx
index 45137278b..5b1e409b8 100644
--- a/web/sdk/react/views-new/pat/pat-view.tsx
+++ b/web/sdk/client/views/pat/pat-view.tsx
@@ -11,10 +11,10 @@ import {
Flex,
Image,
Skeleton
-} from '@raystack/apsara-v1';
+} from '@raystack/apsara';
import keyIcon from '../../assets/key.svg';
-import type { DataTableQuery, DataTableSort } from '@raystack/apsara-v1';
-import { useDebouncedState } from '@raystack/apsara-v1/hooks';
+import type { DataTableQuery, DataTableSort } from '@raystack/apsara';
+import { useDebouncedState } from '@raystack/apsara/hooks';
import { useInfiniteQuery } from '@connectrpc/connect-query';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
@@ -171,6 +171,7 @@ export function PatsView({ onPATClick }: PatsViewProps = {}) {
) : hasNoPats ? (
}
- heading="No Personal Access Token Found"
- subHeading={`Create a personal access token to securely access ${t.appName()} resources and APIs.`}
+ heading="PAT"
+ subHeading={`A Personal Access Token (PAT) is a secure credential that allows external applications and scripts to interact with ${t.appName()} APIs. It enables authenticated access to resources and workflows without requiring direct user login.`}
primaryAction={