diff --git a/apps/web/app/(dashboard)/home/[account]/_components/dashboard-demo.tsx b/apps/web/app/(dashboard)/home/[account]/_components/dashboard-demo.tsx
index 466c9fda7..20b325776 100644
--- a/apps/web/app/(dashboard)/home/[account]/_components/dashboard-demo.tsx
+++ b/apps/web/app/(dashboard)/home/[account]/_components/dashboard-demo.tsx
@@ -206,7 +206,9 @@ function generateDemoData() {
});
}
- return [data, data[data.length - 1].value] as [typeof data, string];
+ const lastValue = data[data.length - 1]?.value;
+
+ return [data, lastValue] as [typeof data, string];
}
function Chart(
diff --git a/apps/web/app/(dashboard)/home/[account]/billing/_components/team-account-checkout-form.tsx b/apps/web/app/(dashboard)/home/[account]/billing/_components/team-account-checkout-form.tsx
index c1495949c..dc39b3cce 100644
--- a/apps/web/app/(dashboard)/home/[account]/billing/_components/team-account-checkout-form.tsx
+++ b/apps/web/app/(dashboard)/home/[account]/billing/_components/team-account-checkout-form.tsx
@@ -26,7 +26,6 @@ export function TeamAccountCheckoutForm(params: { accountId: string }) {
if (checkoutToken) {
return (
diff --git a/apps/web/app/(marketing)/blog/[slug]/page.tsx b/apps/web/app/(marketing)/blog/[slug]/page.tsx
index 1bc901833..9ce0c447f 100644
--- a/apps/web/app/(marketing)/blog/[slug]/page.tsx
+++ b/apps/web/app/(marketing)/blog/[slug]/page.tsx
@@ -9,7 +9,7 @@ import Post from '~/(marketing)/blog/_components/post';
import appConfig from '~/config/app.config';
import { withI18n } from '~/lib/i18n/with-i18n';
-export function generateMetadata({
+export async function generateMetadata({
params,
}: {
params: { slug: string };
@@ -17,7 +17,7 @@ export function generateMetadata({
const post = allPosts.find((post) => post.slug === params.slug);
if (!post) {
- return;
+ notFound();
}
const { title, date, description, image, slug } = post;
diff --git a/apps/web/app/(marketing)/docs/_lib/build-documentation-tree.ts b/apps/web/app/(marketing)/docs/_lib/build-documentation-tree.ts
index f0d654616..ca624f2f9 100644
--- a/apps/web/app/(marketing)/docs/_lib/build-documentation-tree.ts
+++ b/apps/web/app/(marketing)/docs/_lib/build-documentation-tree.ts
@@ -5,8 +5,8 @@ import type { DocumentationPage } from 'contentlayer/generated';
export interface ProcessedDocumentationPage extends DocumentationPage {
collapsible: boolean;
pathSegments: string[];
- nextPage: ProcessedDocumentationPage | DocumentationPage | null;
- previousPage: ProcessedDocumentationPage | DocumentationPage | null;
+ nextPage: ProcessedDocumentationPage | DocumentationPage | undefined;
+ previousPage: ProcessedDocumentationPage | DocumentationPage | undefined;
children: DocsTree;
}
diff --git a/apps/web/app/(marketing)/pricing/page.tsx b/apps/web/app/(marketing)/pricing/page.tsx
index e9474bce3..53de5a32e 100644
--- a/apps/web/app/(marketing)/pricing/page.tsx
+++ b/apps/web/app/(marketing)/pricing/page.tsx
@@ -1,4 +1,4 @@
-import { PricingTable } from '@kit/billing/components/pricing-table';
+import { PricingTable } from '@kit/billing-gateway/components';
import { SitePageHeader } from '~/(marketing)/_components/site-page-header';
import billingConfig from '~/config/billing.config';
diff --git a/apps/web/app/auth/callback/route.ts b/apps/web/app/auth/callback/route.ts
index b853041d9..125b40e04 100644
--- a/apps/web/app/auth/callback/route.ts
+++ b/apps/web/app/auth/callback/route.ts
@@ -6,30 +6,37 @@ import { getSupabaseRouteHandlerClient } from '@kit/supabase/route-handler-clien
import pathsConfig from '~/config/paths.config';
+const defaultNextUrl = pathsConfig.app.home;
+
export async function GET(request: NextRequest) {
const requestUrl = new URL(request.url);
const searchParams = requestUrl.searchParams;
const authCode = searchParams.get('code');
- const inviteCode = searchParams.get('inviteCode');
const error = searchParams.get('error');
- const nextUrl = searchParams.get('next') ?? pathsConfig.app.home;
+ const nextUrlPathFromParams = searchParams.get('next');
+ const inviteToken = searchParams.get('invite_token');
- let userId: string | undefined = undefined;
+ let nextUrl = nextUrlPathFromParams ?? defaultNextUrl;
+
+ // if we have an invite token, we redirect to the join team page
+ // instead of the default next url. This is because the user is trying
+ // to join a team and we want to make sure they are redirected to the
+ // correct page.
+ if (inviteToken) {
+ nextUrl = `${pathsConfig.app.joinTeam}?invite_token=${inviteToken}`;
+ }
if (authCode) {
const client = getSupabaseRouteHandlerClient();
try {
- const { error, data } =
- await client.auth.exchangeCodeForSession(authCode);
+ const { error } = await client.auth.exchangeCodeForSession(authCode);
// if we have an error, we redirect to the error page
if (error) {
return onError({ error: error.message });
}
-
- userId = data.user.id;
} catch (error) {
Logger.error(
{
@@ -42,34 +49,6 @@ export async function GET(request: NextRequest) {
return onError({ error: message as string });
}
-
- if (inviteCode && userId) {
- try {
- Logger.info(
- {
- userId,
- inviteCode,
- },
- `Attempting to accept user invite...`,
- );
-
- // if we have an invite code, we accept the invite
- await acceptInviteFromEmailLink({ inviteCode, userId });
- } catch (error) {
- Logger.error(
- {
- userId,
- inviteCode,
- error,
- },
- `An error occurred while accepting user invite`,
- );
-
- const message = error instanceof Error ? error.message : error;
-
- return onError({ error: message as string });
- }
- }
}
if (error) {
@@ -79,37 +58,6 @@ export async function GET(request: NextRequest) {
return redirect(nextUrl);
}
-/**
- * @name acceptInviteFromEmailLink
- * @description If we find an invite code, we try to accept the invite
- * received from the email link method
- * @param params
- */
-async function acceptInviteFromEmailLink(params: {
- inviteCode: string;
- userId: string | undefined;
-}) {
- if (!params.userId) {
- Logger.error(params, `Attempted to accept invite, but no user id provided`);
-
- return;
- }
-
- Logger.info(params, `Found invite code. Accepting invite...`);
-
- await acceptInviteToOrganization(
- getSupabaseRouteHandlerClient({
- admin: true,
- }),
- {
- code: params.inviteCode,
- userId: params.userId,
- },
- );
-
- Logger.info(params, `Invite successfully accepted`);
-}
-
function onError({ error }: { error: string }) {
const errorMessage = getAuthErrorMessage(error);
diff --git a/apps/web/app/join/page.tsx b/apps/web/app/join/page.tsx
index 03dbbf067..889e62117 100644
--- a/apps/web/app/join/page.tsx
+++ b/apps/web/app/join/page.tsx
@@ -1,9 +1,6 @@
import { notFound } from 'next/navigation';
import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
-import { Heading } from '@kit/ui/heading';
-import { If } from '@kit/ui/if';
-import { Trans } from '@kit/ui/trans';
import { withI18n } from '~/lib/i18n/with-i18n';
@@ -25,36 +22,7 @@ async function JoinTeamAccountPage({ searchParams }: Context) {
notFound();
}
- return (
- <>
-
-
-
-
-
-
- }}
- />
-
-
-
-
-
-
-
-
{props.children}
;
}
diff --git a/packages/features/admin/src/components/AdminGuard.tsx b/packages/features/admin/src/components/admin-guard.tsx
similarity index 52%
rename from packages/features/admin/src/components/AdminGuard.tsx
rename to packages/features/admin/src/components/admin-guard.tsx
index d5e35ed56..6a255a27d 100644
--- a/packages/features/admin/src/components/AdminGuard.tsx
+++ b/packages/features/admin/src/components/admin-guard.tsx
@@ -1,22 +1,23 @@
import { notFound } from 'next/navigation';
-import isUserSuperAdmin from '../../../app/admin/utils/is-user-super-admin';
+import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
+
+import { isSuperAdmin } from '../lib/is-super-admin';
type LayoutOrPageComponent = React.ComponentType;
-function AdminGuard(
+export function AdminGuard(
Component: LayoutOrPageComponent,
) {
return async function AdminGuardServerComponentWrapper(params: Params) {
- const isAdmin = await isUserSuperAdmin();
+ const client = getSupabaseServerComponentClient();
+ const isUserSuperAdmin = await isSuperAdmin(client);
// if the user is not a super-admin, we redirect to a 404
- if (!isAdmin) {
+ if (!isUserSuperAdmin) {
notFound();
}
return ;
};
}
-
-export default AdminGuard;
diff --git a/packages/features/admin/src/components/AdminHeader.tsx b/packages/features/admin/src/components/admin-header.tsx
similarity index 88%
rename from packages/features/admin/src/components/AdminHeader.tsx
rename to packages/features/admin/src/components/admin-header.tsx
index fe54d9890..1bc62a9b9 100644
--- a/packages/features/admin/src/components/AdminHeader.tsx
+++ b/packages/features/admin/src/components/admin-header.tsx
@@ -5,11 +5,10 @@ import { ArrowLeft } from 'lucide-react';
import { Button } from '@kit/ui/button';
import { PageHeader } from '@kit/ui/page';
-function AdminHeader({
+export function AdminHeader({
children,
paths,
}: React.PropsWithChildren<{
- appHome: string;
paths: {
appHome: string;
};
@@ -28,5 +27,3 @@ function AdminHeader({
);
}
-
-export default AdminHeader;
diff --git a/packages/features/admin/src/components/AdminSidebar.tsx b/packages/features/admin/src/components/admin-sidebar.tsx
similarity index 87%
rename from packages/features/admin/src/components/AdminSidebar.tsx
rename to packages/features/admin/src/components/admin-sidebar.tsx
index 48aca4079..73e166b05 100644
--- a/packages/features/admin/src/components/AdminSidebar.tsx
+++ b/packages/features/admin/src/components/admin-sidebar.tsx
@@ -1,10 +1,8 @@
-'use client';
-
import { Home, User, Users } from 'lucide-react';
import { Sidebar, SidebarContent, SidebarItem } from '@kit/ui/sidebar';
-function AdminSidebar(props: { Logo: React.ReactNode }) {
+export function AdminSidebar(props: { Logo: React.ReactNode }) {
return (
{props.Logo}
@@ -28,5 +26,3 @@ function AdminSidebar(props: { Logo: React.ReactNode }) {
);
}
-
-export default AdminSidebar;
diff --git a/packages/features/admin/src/index.ts b/packages/features/admin/src/index.ts
new file mode 100644
index 000000000..427d99962
--- /dev/null
+++ b/packages/features/admin/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/is-super-admin';
diff --git a/packages/features/admin/src/lib/is-super-admin.ts b/packages/features/admin/src/lib/is-super-admin.ts
new file mode 100644
index 000000000..f6f610561
--- /dev/null
+++ b/packages/features/admin/src/lib/is-super-admin.ts
@@ -0,0 +1,19 @@
+import { SupabaseClient } from '@supabase/supabase-js';
+
+import { Database } from '@kit/supabase/database';
+
+export async function isSuperAdmin(client: SupabaseClient) {
+ const { data, error } = await client.auth.getUser();
+
+ if (error) {
+ throw error;
+ }
+
+ if (!data.user) {
+ return false;
+ }
+
+ const appMetadata = data.user.app_metadata;
+
+ return appMetadata?.role === 'super-admin';
+}
diff --git a/packages/features/team-accounts/src/services/account-invitations.service.ts b/packages/features/team-accounts/src/services/account-invitations.service.ts
index fd5887590..cded7f533 100644
--- a/packages/features/team-accounts/src/services/account-invitations.service.ts
+++ b/packages/features/team-accounts/src/services/account-invitations.service.ts
@@ -72,7 +72,7 @@ export class AccountInvitationsService {
role: params.role,
})
.match({
- id: params.id,
+ id: params.invitationId,
});
if (error) {
diff --git a/packages/shared/src/utils.ts b/packages/shared/src/utils.ts
index d90aa3e9f..f440452f7 100644
--- a/packages/shared/src/utils.ts
+++ b/packages/shared/src/utils.ts
@@ -1,3 +1,10 @@
export function isBrowser() {
return typeof window !== 'undefined';
}
+
+export function formatCurrency(currencyCode: string, value: string | number) {
+ return new Intl.NumberFormat('en-US', {
+ style: 'currency',
+ currency: currencyCode,
+ }).format(Number(value));
+}
diff --git a/packages/supabase/src/hooks/use-supabase.ts b/packages/supabase/src/hooks/use-supabase.ts
index 251384dcb..19ff67a11 100644
--- a/packages/supabase/src/hooks/use-supabase.ts
+++ b/packages/supabase/src/hooks/use-supabase.ts
@@ -1,8 +1,7 @@
import { useMemo } from 'react';
import { getSupabaseBrowserClient } from '../clients/browser.client';
-import { Database } from '../database.types';
-export function useSupabase() {
- return useMemo(() => getSupabaseBrowserClient(), []);
+export function useSupabase() {
+ return useMemo(() => getSupabaseBrowserClient(), []);
}
diff --git a/packages/ui/src/makerkit/data-table.tsx b/packages/ui/src/makerkit/data-table.tsx
index 5fd88ce30..f96d63677 100644
--- a/packages/ui/src/makerkit/data-table.tsx
+++ b/packages/ui/src/makerkit/data-table.tsx
@@ -36,7 +36,7 @@ import {
TableRow,
} from '../shadcn/table';
import { cn } from '../utils';
-import Trans from './trans';
+import { Trans } from './trans';
interface ReactTableProps {
data: T[];
diff --git a/packages/ui/src/makerkit/image-upload-input.tsx b/packages/ui/src/makerkit/image-upload-input.tsx
index 8bf5d4728..774aa53e6 100644
--- a/packages/ui/src/makerkit/image-upload-input.tsx
+++ b/packages/ui/src/makerkit/image-upload-input.tsx
@@ -49,6 +49,11 @@ export const ImageUploadInput = forwardRef, Props>(
if (files?.length) {
const file = files[0];
+
+ if (!file) {
+ return;
+ }
+
const data = URL.createObjectURL(file);
setState({
diff --git a/packages/ui/src/makerkit/is-route-active.ts b/packages/ui/src/makerkit/is-route-active.ts
index 018647aed..98898e618 100644
--- a/packages/ui/src/makerkit/is-route-active.ts
+++ b/packages/ui/src/makerkit/is-route-active.ts
@@ -14,7 +14,7 @@ export default function isRouteActive(
depth: number,
) {
// we remove any eventual query param from the route's URL
- const currentRoutePath = currentRoute.split('?')[0];
+ const currentRoutePath = currentRoute.split('?')[0] ?? '';
if (!isRoot(currentRoutePath) && isRoot(targetLink)) {
return false;
diff --git a/packages/ui/src/makerkit/mdx/mdx-components.tsx b/packages/ui/src/makerkit/mdx/mdx-components.tsx
index 963f7f2fb..c046d3ac0 100644
--- a/packages/ui/src/makerkit/mdx/mdx-components.tsx
+++ b/packages/ui/src/makerkit/mdx/mdx-components.tsx
@@ -2,7 +2,7 @@ import { forwardRef } from 'react';
import Image from 'next/image';
-import { cn } from '../../shadcn';
+import { cn } from '../../utils';
import { LazyRender } from '../lazy-render';
const NextImage: React.FC<{
diff --git a/packages/ui/src/makerkit/mdx/mdx-renderer.tsx b/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
index 30e800048..73931d83e 100644
--- a/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
+++ b/packages/ui/src/makerkit/mdx/mdx-renderer.tsx
@@ -2,6 +2,7 @@ import type { MDXComponents } from 'mdx/types';
import { getMDXComponent } from 'next-contentlayer/hooks';
import Components from './mdx-components';
+// @ts-ignore
import styles from './mdx-renderer.module.css';
export function Mdx({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 47404b492..f5f965f79 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -319,6 +319,9 @@ importers:
'@kit/prettier-config':
specifier: 0.1.0
version: link:../../../tooling/prettier
+ '@kit/supabase':
+ specifier: '*'
+ version: link:../../supabase
'@kit/tailwind-config':
specifier: 0.1.0
version: link:../../../tooling/tailwind
@@ -328,6 +331,12 @@ importers:
'@kit/ui':
specifier: '*'
version: link:../../ui
+ '@supabase/supabase-js':
+ specifier: 2.40.0
+ version: 2.40.0
+ lucide-react:
+ specifier: ^0.363.0
+ version: 0.363.0(react@18.2.0)
packages/features/auth:
devDependencies: