Merge branch 'main' into add-starting-example

vercel · Oct 26, 2023 · 44418bc · 44418bc
2 parents a980d6f + 3814b8d
commit 44418bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/dashboard/final-example/app/lib/data.ts b/dashboard/final-example/app/lib/data.ts
@@ -16,7 +16,7 @@ export async function fetchRevenue() {
   // This is equivalent to in fetch(..., {cache: 'no-store'}).
   noStore();
   try {
-    // Artificially delay a response for demo purposes.
+    // Artificially delay a reponse for demo purposes.
     // Don't do this in real life :)
 
     // console.log('Fetching revenue data...');

diff --git a/dashboard/final-example/app/ui/login-form.tsx b/dashboard/final-example/app/ui/login-form.tsx
@@ -13,6 +13,7 @@ import { useFormState, useFormStatus } from 'react-dom';
 
 export default function LoginForm() {
   const [code, action] = useFormState(authenticate, undefined);
+  const { pending } = useFormStatus();
 
   return (
     <form action={action} className="space-y-3">
@@ -61,7 +62,9 @@ export default function LoginForm() {
             </div>
           </div>
         </div>
-        <LoginButton />
+        <Button className="mt-4 w-full" aria-disabled={pending}>
+          Log in <ArrowRightIcon className="ml-auto h-5 w-5 text-gray-50" />
+        </Button>
         <div className="flex h-8 items-end space-x-1">
           {code === 'CredentialsSignin' && (
             <>

diff --git a/dashboard/final-example/package.json b/dashboard/final-example/package.json
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.1",
-    "@types/react": "18.2.32",
+    "@types/react": "18.2.21",
     "@types/react-dom": "18.2.14",
     "dotenv": "^16.3.1",
     "prettier": "^3.0.3"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml