From 70cb7f0594cb2c60932b03942d7e48224dd6b426 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:32:05 +0100 Subject: [PATCH 01/47] Replace Figtree font with Inter --- resources/css/app.css | 2 +- resources/js/pages/welcome.tsx | 8 ++++---- resources/views/app.blade.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index 7ef9e6509..1b6d2e5ae 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -7,7 +7,7 @@ @custom-variant dark (&:is(.dark *)); @theme { - --font-sans: Figtree, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; + --font-sans: 'Inter', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; --radius-lg: var(--radius); --radius-md: calc(var(--radius) - 2px); diff --git a/resources/js/pages/welcome.tsx b/resources/js/pages/welcome.tsx index ab38fe134..cd9fd7a83 100644 --- a/resources/js/pages/welcome.tsx +++ b/resources/js/pages/welcome.tsx @@ -14,8 +14,8 @@ export default function Welcome() { return ( <> - - + +
@@ -96,8 +96,8 @@ export default function Welcome() { stroke="currentColor" > diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index baadf2973..c78922736 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -6,8 +6,8 @@ {{ config('app.name', 'Laravel') }} - - + + @routes @viteReactRefresh From bdba7389598c98faad6929ba455ad11c6c842d21 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:47:03 +0100 Subject: [PATCH 02/47] Sentence case all the things --- resources/js/pages/auth/confirm-password.tsx | 4 ++-- resources/js/pages/auth/forgot-password.tsx | 4 ++-- resources/js/pages/auth/login.tsx | 2 +- resources/js/pages/auth/register.tsx | 2 +- resources/js/pages/auth/reset-password.tsx | 6 +++--- resources/js/pages/auth/verify-email.tsx | 2 +- resources/js/pages/settings/password.tsx | 4 ++-- resources/js/pages/settings/profile.tsx | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/js/pages/auth/confirm-password.tsx b/resources/js/pages/auth/confirm-password.tsx index 50929bf1d..39372a5ed 100644 --- a/resources/js/pages/auth/confirm-password.tsx +++ b/resources/js/pages/auth/confirm-password.tsx @@ -26,7 +26,7 @@ export default function ConfirmPassword() { title="Confirm Your Password" description="This is a secure area of the application. Please confirm your password before continuing" > - +
@@ -48,7 +48,7 @@ export default function ConfirmPassword() {
diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index fd68e33bb..5d447a1fe 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -30,7 +30,7 @@ export default function ForgotPassword({ status }: { status?: string }) {
- +
diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index d0ff67302..1cd27a512 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -44,7 +44,7 @@ export default function Login({ status, canResetPassword }: LoginProps) {
- + {processing && } - Create Account + Create account
diff --git a/resources/js/pages/auth/reset-password.tsx b/resources/js/pages/auth/reset-password.tsx index f40c5381e..3ac87aadc 100644 --- a/resources/js/pages/auth/reset-password.tsx +++ b/resources/js/pages/auth/reset-password.tsx @@ -36,8 +36,8 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) { }; return ( - - + +
@@ -87,7 +87,7 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) {
diff --git a/resources/js/pages/auth/verify-email.tsx b/resources/js/pages/auth/verify-email.tsx index 86e0a6cdd..756e97699 100644 --- a/resources/js/pages/auth/verify-email.tsx +++ b/resources/js/pages/auth/verify-email.tsx @@ -32,7 +32,7 @@ export default function VerifyEmail({ status }: { status?: string }) {
- +
diff --git a/resources/js/pages/settings/profile.tsx b/resources/js/pages/settings/profile.tsx index fa60d17c2..9df1626eb 100644 --- a/resources/js/pages/settings/profile.tsx +++ b/resources/js/pages/settings/profile.tsx @@ -14,7 +14,7 @@ import SettingsLayout from '@/layouts/settings/layout'; const breadcrumbs: BreadcrumbItem[] = [ { - title: 'Profile Settings', + title: 'Profile settings', href: '/settings/profile', }, ]; @@ -35,11 +35,11 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: return ( - +
- +
@@ -58,7 +58,7 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail:
- + Date: Thu, 20 Feb 2025 19:51:03 +0100 Subject: [PATCH 03/47] Add placeholders --- resources/js/pages/auth/forgot-password.tsx | 1 + resources/js/pages/auth/login.tsx | 2 ++ resources/js/pages/auth/register.tsx | 4 ++++ resources/js/pages/auth/reset-password.tsx | 2 ++ resources/js/pages/settings/password.tsx | 3 +++ resources/js/pages/settings/profile.tsx | 2 ++ 6 files changed, 14 insertions(+) diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index 5d447a1fe..7e9a2d6b3 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -39,6 +39,7 @@ export default function ForgotPassword({ status }: { status?: string }) { value={data.email} autoFocus onChange={(e) => setData('email', e.target.value)} + placeholder="email@example.com" /> diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index 1cd27a512..8148011aa 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -54,6 +54,7 @@ export default function Login({ status, canResetPassword }: LoginProps) { autoComplete="email" value={data.email} onChange={(e) => setData('email', e.target.value)} + placeholder="email@example.com" />
@@ -75,6 +76,7 @@ export default function Login({ status, canResetPassword }: LoginProps) { autoComplete="current-password" value={data.password} onChange={(e) => setData('password', e.target.value)} + placeholder="Password" />
diff --git a/resources/js/pages/auth/register.tsx b/resources/js/pages/auth/register.tsx index 63f4ad9b3..c8464356f 100644 --- a/resources/js/pages/auth/register.tsx +++ b/resources/js/pages/auth/register.tsx @@ -48,6 +48,7 @@ export default function Register() { value={data.name} onChange={(e) => setData('name', e.target.value)} disabled={processing} + placeholder="Full name" />
@@ -63,6 +64,7 @@ export default function Register() { value={data.email} onChange={(e) => setData('email', e.target.value)} disabled={processing} + placeholder="email@example.com" />
@@ -78,6 +80,7 @@ export default function Register() { value={data.password} onChange={(e) => setData('password', e.target.value)} disabled={processing} + placeholder="Password" />
@@ -93,6 +96,7 @@ export default function Register() { value={data.password_confirmation} onChange={(e) => setData('password_confirmation', e.target.value)} disabled={processing} + placeholder="Confirm password" />
diff --git a/resources/js/pages/auth/reset-password.tsx b/resources/js/pages/auth/reset-password.tsx index 3ac87aadc..a059bd7d6 100644 --- a/resources/js/pages/auth/reset-password.tsx +++ b/resources/js/pages/auth/reset-password.tsx @@ -67,6 +67,7 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) { className="mt-1 block w-full" autoFocus onChange={(e) => setData('password', e.target.value)} + placeholder="Password" />
@@ -81,6 +82,7 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) { value={data.password_confirmation} className="mt-1 block w-full" onChange={(e) => setData('password_confirmation', e.target.value)} + placeholder="Confirm password" /> diff --git a/resources/js/pages/settings/password.tsx b/resources/js/pages/settings/password.tsx index e0f65d132..c0edd7041 100644 --- a/resources/js/pages/settings/password.tsx +++ b/resources/js/pages/settings/password.tsx @@ -68,6 +68,7 @@ export default function Password() { type="password" className="mt-1 block w-full" autoComplete="current-password" + placeholder="Current password" /> @@ -84,6 +85,7 @@ export default function Password() { type="password" className="mt-1 block w-full" autoComplete="new-password" + placeholder="New password" /> @@ -99,6 +101,7 @@ export default function Password() { type="password" className="mt-1 block w-full" autoComplete="new-password" + placeholder="Confirm password" /> diff --git a/resources/js/pages/settings/profile.tsx b/resources/js/pages/settings/profile.tsx index 9df1626eb..deeee9632 100644 --- a/resources/js/pages/settings/profile.tsx +++ b/resources/js/pages/settings/profile.tsx @@ -52,6 +52,7 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: onChange={(e) => setData('name', e.target.value)} required autoComplete="name" + placeholder="Full name" /> @@ -68,6 +69,7 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: onChange={(e) => setData('email', e.target.value)} required autoComplete="username" + placeholder="Email address" /> From 60de696445d877fe66368d47bcd206e2dcb82cbd Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:51:18 +0100 Subject: [PATCH 04/47] Remove period in "Saved" status --- resources/js/pages/settings/password.tsx | 2 +- resources/js/pages/settings/profile.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/pages/settings/password.tsx b/resources/js/pages/settings/password.tsx index c0edd7041..43206216e 100644 --- a/resources/js/pages/settings/password.tsx +++ b/resources/js/pages/settings/password.tsx @@ -117,7 +117,7 @@ export default function Password() { leave="transition ease-in-out" leaveTo="opacity-0" > -

Saved.

+

Saved

diff --git a/resources/js/pages/settings/profile.tsx b/resources/js/pages/settings/profile.tsx index deeee9632..0304ace20 100644 --- a/resources/js/pages/settings/profile.tsx +++ b/resources/js/pages/settings/profile.tsx @@ -107,7 +107,7 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: leave="transition ease-in-out" leaveTo="opacity-0" > -

Saved.

+

Saved

From 40ac2369c0bae0bf82057e99178ede87c4880cf2 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:52:41 +0100 Subject: [PATCH 05/47] Tweak reset password copy --- app/Http/Controllers/Auth/PasswordResetLinkController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/PasswordResetLinkController.php b/app/Http/Controllers/Auth/PasswordResetLinkController.php index 41ca281a8..9fcfe49d0 100644 --- a/app/Http/Controllers/Auth/PasswordResetLinkController.php +++ b/app/Http/Controllers/Auth/PasswordResetLinkController.php @@ -36,6 +36,6 @@ public function store(Request $request): RedirectResponse $request->only('email') ); - return back()->with('status', __('If an account exists with that email, you’ll receive a reset link shortly.')); + return back()->with('status', __('A reset link will be sent if the account exists.')); } } From cb13f3c0ff4c0bf7d32d44e32ee7ba9a213f14e7 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:53:39 +0100 Subject: [PATCH 06/47] Tweak register page copy --- resources/js/pages/auth/register.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/pages/auth/register.tsx b/resources/js/pages/auth/register.tsx index c8464356f..d0bae0f56 100644 --- a/resources/js/pages/auth/register.tsx +++ b/resources/js/pages/auth/register.tsx @@ -32,7 +32,7 @@ export default function Register() { }; return ( - +
From e79c996ea3b1ba3055835ceb646b21450ba0568d Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:55:11 +0100 Subject: [PATCH 07/47] Tweak auth pages spacing --- resources/js/pages/auth/forgot-password.tsx | 2 +- resources/js/pages/auth/login.tsx | 4 ++-- resources/js/pages/auth/register.tsx | 2 +- resources/js/pages/auth/reset-password.tsx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index 7e9a2d6b3..4cc9223cf 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -42,7 +42,7 @@ export default function ForgotPassword({ status }: { status?: string }) { placeholder="email@example.com" /> - +
diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index 8148011aa..f1f2a6861 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -81,12 +81,12 @@ export default function Login({ status, canResetPassword }: LoginProps) {
-
+
- diff --git a/resources/js/pages/auth/register.tsx b/resources/js/pages/auth/register.tsx index d0bae0f56..5391bc8a7 100644 --- a/resources/js/pages/auth/register.tsx +++ b/resources/js/pages/auth/register.tsx @@ -101,7 +101,7 @@ export default function Register() {
- diff --git a/resources/js/pages/auth/reset-password.tsx b/resources/js/pages/auth/reset-password.tsx index a059bd7d6..220d2ff9f 100644 --- a/resources/js/pages/auth/reset-password.tsx +++ b/resources/js/pages/auth/reset-password.tsx @@ -69,7 +69,7 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) { onChange={(e) => setData('password', e.target.value)} placeholder="Password" /> - +
@@ -87,7 +87,7 @@ export default function ResetPassword({ token, email }: ResetPasswordProps) {
- From 0dfb502210117e4d30dbbd10897a401b2f005678 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:57:27 +0100 Subject: [PATCH 08/47] Tweak colors in auth pages --- resources/js/layouts/auth/auth-simple-layout.tsx | 7 +++++-- resources/js/pages/auth/forgot-password.tsx | 7 ++++--- resources/js/pages/auth/login.tsx | 2 +- resources/js/pages/auth/register.tsx | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/resources/js/layouts/auth/auth-simple-layout.tsx b/resources/js/layouts/auth/auth-simple-layout.tsx index 021859c20..94e465cdf 100644 --- a/resources/js/layouts/auth/auth-simple-layout.tsx +++ b/resources/js/layouts/auth/auth-simple-layout.tsx @@ -20,8 +20,11 @@ export default function AuthSimpleLayout({ children, title, description }: AuthL {title} -

{title}

-

{description}

+ +
+

{title}

+

{description}

+
{children} diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index 4cc9223cf..05c50a05b 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -52,9 +52,10 @@ export default function ForgotPassword({ status }: { status?: string }) { -
- Or, return to the - login page + +
+ Or, return to + log in
diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index f1f2a6861..a1f7614c7 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -92,7 +92,7 @@ export default function Login({ status, canResetPassword }: LoginProps) { -
+
Don't have an account?{' '} Sign up diff --git a/resources/js/pages/auth/register.tsx b/resources/js/pages/auth/register.tsx index 5391bc8a7..39fd41178 100644 --- a/resources/js/pages/auth/register.tsx +++ b/resources/js/pages/auth/register.tsx @@ -107,7 +107,7 @@ export default function Register() {
-
+
Already have an account?{' '} Log in From ca6fefb79a3aa6d3943a9b2e9926cb3777f10d49 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:58:18 +0100 Subject: [PATCH 09/47] Tweak Laravel logo thickness and color --- resources/js/components/app-logo-icon.tsx | 8 ++++++-- resources/js/layouts/auth/auth-simple-layout.tsx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/js/components/app-logo-icon.tsx b/resources/js/components/app-logo-icon.tsx index b551714e7..9bd62ad84 100644 --- a/resources/js/components/app-logo-icon.tsx +++ b/resources/js/components/app-logo-icon.tsx @@ -2,8 +2,12 @@ import { SVGAttributes } from 'react'; export default function AppLogoIcon(props: SVGAttributes) { return ( - - + + ); } diff --git a/resources/js/layouts/auth/auth-simple-layout.tsx b/resources/js/layouts/auth/auth-simple-layout.tsx index 94e465cdf..a2817f2a0 100644 --- a/resources/js/layouts/auth/auth-simple-layout.tsx +++ b/resources/js/layouts/auth/auth-simple-layout.tsx @@ -16,7 +16,7 @@ export default function AuthSimpleLayout({ children, title, description }: AuthL
- +
{title} From 304fc32e2cf11e7b96bd06ab8137b815cd1629a6 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:58:46 +0100 Subject: [PATCH 10/47] Move status on forgot-password page --- resources/js/pages/auth/forgot-password.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index 05c50a05b..30a5f5598 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -22,10 +22,8 @@ export default function ForgotPassword({ status }: { status?: string }) { }; return ( - - - - {status &&
{status}
} + +
@@ -51,6 +49,8 @@ export default function ForgotPassword({ status }: { status?: string }) { Email password reset link
+ + {status &&
{status}
}
From 6e6e96b98822066b308d1a4d7a89baef6a4cfcda Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 19:59:12 +0100 Subject: [PATCH 11/47] Move status on login page --- resources/js/pages/auth/login.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index a1f7614c7..abe121925 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -39,8 +39,6 @@ export default function Login({ status, canResetPassword }: LoginProps) { - {status &&
{status}
} -
@@ -99,6 +97,8 @@ export default function Login({ status, canResetPassword }: LoginProps) {
+ + {status &&
{status}
} ); } From 4aff27f5884502c240dc2d4ad4aea67778ec39e2 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:00:03 +0100 Subject: [PATCH 12/47] Update verify-email copy --- resources/js/pages/auth/verify-email.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/resources/js/pages/auth/verify-email.tsx b/resources/js/pages/auth/verify-email.tsx index 756e97699..964a110ea 100644 --- a/resources/js/pages/auth/verify-email.tsx +++ b/resources/js/pages/auth/verify-email.tsx @@ -16,11 +16,8 @@ export default function VerifyEmail({ status }: { status?: string }) { }; return ( - - + + {status === 'verification-link-sent' && (
From 81693b6570662b32e85df7f91b5a06fc5ea8c5a5 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:00:42 +0100 Subject: [PATCH 13/47] Tweak verify-email layout Centered + secondary button + use TextLink --- resources/js/pages/auth/verify-email.tsx | 26 +++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/resources/js/pages/auth/verify-email.tsx b/resources/js/pages/auth/verify-email.tsx index 964a110ea..458f7cea6 100644 --- a/resources/js/pages/auth/verify-email.tsx +++ b/resources/js/pages/auth/verify-email.tsx @@ -1,8 +1,9 @@ // Components -import { Head, Link, useForm } from '@inertiajs/react'; +import { Head, useForm } from '@inertiajs/react'; import { LoaderCircle } from 'lucide-react'; import { FormEventHandler } from 'react'; +import TextLink from '@/components/text-link'; import { Button } from '@/components/ui/button'; import AuthLayout from '@/layouts/auth-layout'; @@ -25,22 +26,15 @@ export default function VerifyEmail({ status }: { status?: string }) {
)} -
-
- - - - Log Out - -
+ + + + Log out +
); From 9a5ec980098b5d92d4fdaa6b4872b0c221b7ce31 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:01:07 +0100 Subject: [PATCH 14/47] More sentence case + minor copy tweaks --- resources/js/pages/auth/confirm-password.tsx | 4 ++-- resources/js/pages/auth/login.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/js/pages/auth/confirm-password.tsx b/resources/js/pages/auth/confirm-password.tsx index 39372a5ed..141a181f8 100644 --- a/resources/js/pages/auth/confirm-password.tsx +++ b/resources/js/pages/auth/confirm-password.tsx @@ -23,8 +23,8 @@ export default function ConfirmPassword() { return ( diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index abe121925..0c329cd7b 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -62,7 +62,7 @@ export default function Login({ status, canResetPassword }: LoginProps) { {canResetPassword && ( - Forgot your password? + Forgot password? )}
@@ -86,7 +86,7 @@ export default function Login({ status, canResetPassword }: LoginProps) {
From eea45f4559ed05608c62fae8238f3487f3c17d56 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:04:26 +0100 Subject: [PATCH 15/47] Tweak + fix text-link for dark mode --- resources/js/components/text-link.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/js/components/text-link.tsx b/resources/js/components/text-link.tsx index db3617eee..1c2ddb8ce 100644 --- a/resources/js/components/text-link.tsx +++ b/resources/js/components/text-link.tsx @@ -7,7 +7,10 @@ type LinkProps = ComponentProps; export default function TextLink({ className = '', children, ...props }: LinkProps) { return ( {children} From 867a0f1822b44cdc4be8a737429313ab5dd9d107 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:04:43 +0100 Subject: [PATCH 16/47] Add label on confirm-password --- resources/js/pages/auth/confirm-password.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/js/pages/auth/confirm-password.tsx b/resources/js/pages/auth/confirm-password.tsx index 141a181f8..5b3e7dbe3 100644 --- a/resources/js/pages/auth/confirm-password.tsx +++ b/resources/js/pages/auth/confirm-password.tsx @@ -6,6 +6,7 @@ import { FormEventHandler } from 'react'; import InputError from '@/components/input-error'; import { Button } from '@/components/ui/button'; import { Input } from '@/components/ui/input'; +import { Label } from '@/components/ui/label'; import AuthLayout from '@/layouts/auth-layout'; export default function ConfirmPassword() { @@ -31,6 +32,7 @@ export default function ConfirmPassword() {
+ Date: Thu, 20 Feb 2025 20:05:54 +0100 Subject: [PATCH 17/47] Update icons for Repo and Docs --- resources/js/components/app-header.tsx | 6 +++--- resources/js/components/app-sidebar.tsx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx index 23cd59da6..a4dbee210 100644 --- a/resources/js/components/app-header.tsx +++ b/resources/js/components/app-header.tsx @@ -11,7 +11,7 @@ import { useInitials } from '@/hooks/use-initials'; import { cn } from '@/lib/utils'; import { type BreadcrumbItem, type NavItem, type SharedData } from '@/types'; import { Link, usePage } from '@inertiajs/react'; -import { BookOpenText, ChevronDown, FolderGit2, LayoutGrid, Menu, Search } from 'lucide-react'; +import { BookOpen, Folder, LayoutGrid, Menu, Search } from 'lucide-react'; import AppLogo from './app-logo'; import AppLogoIcon from './app-logo-icon'; @@ -27,12 +27,12 @@ const rightNavItems: NavItem[] = [ { title: 'Repository', url: 'https://github.com/laravel/react-starter-kit', - icon: FolderGit2, + icon: Folder, }, { title: 'Documentation', url: 'https://laravel.com/docs/starter-kits', - icon: BookOpenText, + icon: BookOpen, }, ]; diff --git a/resources/js/components/app-sidebar.tsx b/resources/js/components/app-sidebar.tsx index 6a0ac6c65..e6efd8fd9 100644 --- a/resources/js/components/app-sidebar.tsx +++ b/resources/js/components/app-sidebar.tsx @@ -4,7 +4,7 @@ import { NavUser } from '@/components/nav-user'; import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar'; import { type NavItem } from '@/types'; import { Link } from '@inertiajs/react'; -import { BookOpenText, FolderGit2, LayoutGrid } from 'lucide-react'; +import { BookOpen, Folder, LayoutGrid } from 'lucide-react'; import AppLogo from './app-logo'; const mainNavItems: NavItem[] = [ @@ -19,12 +19,12 @@ const footerNavItems: NavItem[] = [ { title: 'Repository', url: 'https://github.com/laravel/react-starter-kit', - icon: FolderGit2, + icon: Folder, }, { title: 'Documentation', url: 'https://laravel.com/docs/starter-kits', - icon: BookOpenText, + icon: BookOpen, }, ]; From 57aeb1d2297fbede640f131af8db9ed1ddb1714f Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:06:08 +0100 Subject: [PATCH 18/47] No bg on active item in header layout --- resources/js/components/app-header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx index a4dbee210..54523aef0 100644 --- a/resources/js/components/app-header.tsx +++ b/resources/js/components/app-header.tsx @@ -36,7 +36,7 @@ const rightNavItems: NavItem[] = [ }, ]; -const activeItemStyles = 'bg-neutral-100 text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100'; +const activeItemStyles = 'text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100'; interface AppHeaderProps { breadcrumbs?: BreadcrumbItem[]; From 77e31c99e3de854181e91ce7eabaee900e76fe0e Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:07:04 +0100 Subject: [PATCH 19/47] Bigger icons in app-header --- resources/js/components/app-header.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx index 54523aef0..fb93ef928 100644 --- a/resources/js/components/app-header.tsx +++ b/resources/js/components/app-header.tsx @@ -127,7 +127,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
{rightNavItems.map((item) => ( @@ -141,9 +141,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) { className="group text-accent-foreground ring-offset-background hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring ml-1 inline-flex h-9 w-9 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50" > {item.title} - {item.icon && ( - - )} + {item.icon && } From cfc58a118b9bbde995f0f13e1845c4ea331b5a97 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:07:14 +0100 Subject: [PATCH 20/47] Tweak user menu in app-header --- resources/js/components/app-header.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx index fb93ef928..cb8018819 100644 --- a/resources/js/components/app-header.tsx +++ b/resources/js/components/app-header.tsx @@ -154,14 +154,13 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
- From dfb581e4d8be581dc793e1a1786c5f077291260b Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:07:44 +0100 Subject: [PATCH 21/47] Tweak user menu, hide email in trigger --- resources/js/components/user-info.tsx | 8 ++++---- resources/js/components/user-menu-content.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/js/components/user-info.tsx b/resources/js/components/user-info.tsx index 6013fc544..4626dc5fb 100644 --- a/resources/js/components/user-info.tsx +++ b/resources/js/components/user-info.tsx @@ -2,20 +2,20 @@ import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'; import { useInitials } from '@/hooks/use-initials'; import { type User } from '@/types'; -export function UserInfo({ user }: { user: User }) { +export function UserInfo({ user, showEmail = false }: { user: User; showEmail?: boolean }) { const getInitials = useInitials(); return ( <> - + {getInitials(user.name)}
- {user.name} - {user.email} + {user.name} + {showEmail && {user.email}}
); diff --git a/resources/js/components/user-menu-content.tsx b/resources/js/components/user-menu-content.tsx index 52fee1f6e..a3d294784 100644 --- a/resources/js/components/user-menu-content.tsx +++ b/resources/js/components/user-menu-content.tsx @@ -16,7 +16,7 @@ export function UserMenuContent({ user }: UserMenuContentProps) { <>
- +
From 7152319959940b16293be1964dbbd453129cd831 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:07:52 +0100 Subject: [PATCH 22/47] Tweak app logo --- resources/js/components/app-logo.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/js/components/app-logo.tsx b/resources/js/components/app-logo.tsx index c908a1642..fd22d9093 100644 --- a/resources/js/components/app-logo.tsx +++ b/resources/js/components/app-logo.tsx @@ -4,11 +4,10 @@ export default function AppLogo() { return ( <>
- +
-
- Laravel - Starter Kit +
+ Laravel Starter Kit
); From 564fcb242554a84eb3538a078927c3b5033d0f0a Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:08:39 +0100 Subject: [PATCH 23/47] Update delete-user design --- resources/js/components/delete-user.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/js/components/delete-user.tsx b/resources/js/components/delete-user.tsx index 5aa82a6e0..52caed201 100644 --- a/resources/js/components/delete-user.tsx +++ b/resources/js/components/delete-user.tsx @@ -34,7 +34,12 @@ export default function DeleteUser() { return (
-
+
+
+

Warning

+

Please proceed with caution, this cannot be undone.

+
+ @@ -79,10 +84,6 @@ export default function DeleteUser() { -
-

Warning

-

Please proceed with caution, this cannot be undone.

-
); From 739201fbf8cbfbe40f3ddb9d1a4f737e0c80b495 Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:10:44 +0100 Subject: [PATCH 24/47] Bigger Laravel logo and no app name in split layout --- resources/js/layouts/auth/auth-split-layout.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/js/layouts/auth/auth-split-layout.tsx b/resources/js/layouts/auth/auth-split-layout.tsx index d891ab3b9..49e28659d 100644 --- a/resources/js/layouts/auth/auth-split-layout.tsx +++ b/resources/js/layouts/auth/auth-split-layout.tsx @@ -9,15 +9,14 @@ interface AuthLayoutProps { } export default function AuthSplitLayout({ children, title, description }: AuthLayoutProps) { - const { name, quote } = usePage().props; + const { quote } = usePage().props; return (
- - {name} + {quote && (
From 1fd31b756eac3e57e202b79b9c5f7b85aec3a91d Mon Sep 17 00:00:00 2001 From: Hugo Sainte-Marie Date: Thu, 20 Feb 2025 20:11:11 +0100 Subject: [PATCH 25/47] Responsive tweak (paddings and breakpoints) --- resources/js/components/app-sidebar-header.tsx | 2 +- resources/js/layouts/settings/layout.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/js/components/app-sidebar-header.tsx b/resources/js/components/app-sidebar-header.tsx index 5a90ac581..e31381e0d 100644 --- a/resources/js/components/app-sidebar-header.tsx +++ b/resources/js/components/app-sidebar-header.tsx @@ -4,7 +4,7 @@ import { type BreadcrumbItem as BreadcrumbItemType } from '@/types'; export function AppSidebarHeader({ breadcrumbs = [] }: { breadcrumbs?: BreadcrumbItemType[] }) { return ( -
+
diff --git a/resources/js/layouts/settings/layout.tsx b/resources/js/layouts/settings/layout.tsx index 5cdff7d06..b85dd4dc0 100644 --- a/resources/js/layouts/settings/layout.tsx +++ b/resources/js/layouts/settings/layout.tsx @@ -27,12 +27,12 @@ export default function SettingsLayout({ children }: { children: React.ReactNode const currentPath = window.location.pathname; return ( -
+
-
-