Merge branch 'develop' of https://github.com/laravel/react-starter-kit into develop

tnylea · tnylea · commit 675b7b353b19 · 2024-12-30T12:10:55.000-05:00
diff --git a/resources/js/Components/Settings/DeleteUser.tsx b/resources/js/Components/Settings/DeleteUser.tsx
@@ -46,18 +46,18 @@ export default function DeleteUser() {
         <div>
             <SettingsHeading 
                 title="Delete Account"
-                description="Remove your account and all of its resources"
+                description="Delete your account and all of its resources"
             />
             <Dialog>
                 <DialogTrigger asChild>
                     <Button variant="destructive">Delete Account</Button>
                 </DialogTrigger>
                 <DialogContent>
-                    <form className="space-y-4" onSubmit={deleteUser}>
+                    <form className="space-y-6" onSubmit={deleteUser}>
                         <DialogHeader className="space-y-3">
                             <DialogTitle>Are you sure you want to delete your account?</DialogTitle>
                             <DialogDescription>
-                                Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.
+                                Once your account is deleted, all of its resources and data will also be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.
                             </DialogDescription>
                         </DialogHeader>
                         <div className="grid gap-2">
@@ -94,17 +94,6 @@ export default function DeleteUser() {
                     </form>
                 </DialogContent>
             </Dialog>
-
-            <Alert variant="destructive" className="mt-4">
-                <TriangleAlert className="h-4 w-4" />
-                <AlertTitle>Warning</AlertTitle>
-                <AlertDescription>
-                    Once your account is deleted, all of its resources and data
-                    will be permanently removed. Before deleting your account,
-                    please download any data or information that you wish to
-                    retain.
-                </AlertDescription>
-            </Alert>
         </div>
     );
 }
diff --git a/resources/js/Pages/Auth/ForgotPassword.tsx b/resources/js/Pages/Auth/ForgotPassword.tsx
@@ -60,7 +60,7 @@ export default function ForgotPassword({ status }: { status?: string }) {
                     <hr />
                 </form>
                 <div className="text-center text-sm space-x-1">
-                    <span>Return back to the</span>
+                    <span>Or, return to the</span>
                     <Link href={route("login")} className="underline underline-offset-4">
                         login page
                     </Link>
diff --git a/resources/js/Pages/Auth/Login.tsx b/resources/js/Pages/Auth/Login.tsx
@@ -46,7 +46,7 @@ export default function Login({
     return (
         <AuthLayout 
             title="Log in to your account"
-            description="Enter your email and password below to login"
+            description="Enter your email and password below to log in"
         >
             <Head title="Log in" />
 
@@ -101,7 +101,7 @@ export default function Login({
                         {processing && (
                             <LoaderCircle className="h-4 w-4 animate-spin" />
                         )}
-                        Log in
+                        Log In
                     </Button>
 
                     <hr />
diff --git a/resources/js/Pages/Auth/Register.tsx b/resources/js/Pages/Auth/Register.tsx
@@ -120,7 +120,7 @@ export default function Register() {
                         href={route("login")} 
                         className="underline underline-offset-4"
                     >
-                        Sign in
+                        Log in
                     </Link>
                 </div>
             </form>
diff --git a/resources/js/Pages/Settings/Profile.tsx b/resources/js/Pages/Settings/Profile.tsx
@@ -61,7 +61,7 @@ export default function Profile({
                 <div class="flex flex-col">
                     <SettingsHeading 
                         title="Profile Information"
-                        description="Update your account's profile information and email address."
+                        description="Update your name and email address"
                     />
 
                     <form onSubmit={submit} className="space-y-6">
@@ -141,4 +141,4 @@ export default function Profile({
             </SettingsLayout>
         </AppLayout>
     );
-}
+}
diff --git a/resources/js/Pages/Welcome.tsx b/resources/js/Pages/Welcome.tsx
@@ -56,7 +56,7 @@ export default function Welcome({
                                             href={route('login')}
                                             className="rounded-md px-3 py-2 text-black ring-1 ring-transparent transition hover:text-black/70 focus:outline-none focus-visible:ring-[#FF2D20] dark:text-white dark:hover:text-white/80 dark:focus-visible:ring-white"
                                         >
-                                            Log in
+                                            Log In
                                         </Link>
                                         <Link
                                             href={route('register')}

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export default function Register() {`
`120`	`120`	`href={route("login")}`
`121`	`121`	`className="underline underline-offset-4"`
`122`	`122`	`>`
`123`		`- Sign in`
	`123`	`+ Log in`
`124`	`124`	`</Link>`
`125`	`125`	`</div>`
`126`	`126`	`</form>`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export default function Welcome({`
`56`	`56`	`href={route('login')}`
`57`	`57`	`className="rounded-md px-3 py-2 text-black ring-1 ring-transparent transition hover:text-black/70 focus:outline-none focus-visible:ring-[#FF2D20] dark:text-white dark:hover:text-white/80 dark:focus-visible:ring-white"`
`58`	`58`	`>`
`59`		`- Log in`
	`59`	`+ Log In`
`60`	`60`	`</Link>`
`61`	`61`	`<Link`
`62`	`62`	`href={route('register')}`