diff --git a/apps/web/app/(auth)/signin/page.tsx b/apps/web/app/(auth)/signin/page.tsx index bfe85ce..df41a4b 100644 --- a/apps/web/app/(auth)/signin/page.tsx +++ b/apps/web/app/(auth)/signin/page.tsx @@ -1,7 +1,13 @@ -"use client" - +import { fetchQuery } from "convex/nextjs" +import { connection } from "next/server" import { AuthForm } from "@/components/auth-form" +import { api } from "@otunes/convex/_generated/api" -export default function SignInPage() { - return +export default async function SignInPage() { + await connection() + const { disableAccountCreation } = await fetchQuery(api.users.getAppSettings) + + return ( + + ) } diff --git a/apps/web/app/(auth)/signup/page.tsx b/apps/web/app/(auth)/signup/page.tsx index 8169ec4..566276c 100644 --- a/apps/web/app/(auth)/signup/page.tsx +++ b/apps/web/app/(auth)/signup/page.tsx @@ -1,7 +1,13 @@ -"use client" - +import { fetchQuery } from "convex/nextjs" +import { connection } from "next/server" import { AuthForm } from "@/components/auth-form" +import { api } from "@otunes/convex/_generated/api" -export default function SignUpPage() { - return +export default async function SignUpPage() { + await connection() + const { disableAccountCreation } = await fetchQuery(api.users.getAppSettings) + + return ( + + ) } diff --git a/apps/web/components/auth-form.tsx b/apps/web/components/auth-form.tsx index 659dd38..65d1c26 100644 --- a/apps/web/components/auth-form.tsx +++ b/apps/web/components/auth-form.tsx @@ -4,10 +4,8 @@ import { useState } from "react" import { useRouter } from "next/navigation" import Link from "next/link" import { useAuthActions } from "@convex-dev/auth/react" -import { useQuery } from "convex/react" import { Button } from "@/components/ui/button" -import { api } from "@otunes/convex/_generated/api" import { Card, CardContent, @@ -50,15 +48,19 @@ const copy: Record< }, } -export function AuthForm({ flow }: { flow: AuthFlow }) { +export function AuthForm({ + flow, + accountCreationDisabled, +}: { + flow: AuthFlow + accountCreationDisabled: boolean +}) { const { signIn } = useAuthActions() const router = useRouter() - const appSettings = useQuery(api.users.getAppSettings) const [error, setError] = useState(null) const [submitting, setSubmitting] = useState(false) const text = copy[flow] - const accountCreationDisabled = appSettings?.disableAccountCreation ?? false const signupsDisabled = flow === "signUp" && accountCreationDisabled const hideSignUpLink = flow === "signIn" && accountCreationDisabled