diff --git a/.prettierrc b/.prettierrc index f2264ac45..5a33bc890 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,6 +6,7 @@ "printWidth": 150, "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"], "tailwindFunctions": ["clsx", "cn"], + "tailwindStylesheet": "resources/css/app.css", "tabWidth": 4, "overrides": [ { diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx index 46542ecdf..831f2c363 100644 --- a/resources/js/components/app-header.tsx +++ b/resources/js/components/app-header.tsx @@ -48,7 +48,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) { const getInitials = useInitials(); return ( <> -
+
{/* Mobile Menu */}
@@ -58,7 +58,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) { - + Navigation Menu @@ -138,7 +138,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) { href={item.href} target="_blank" rel="noopener noreferrer" - 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" + className="group ml-1 inline-flex h-9 w-9 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium text-accent-foreground ring-offset-background transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50" > {item.title} {item.icon && } @@ -171,7 +171,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
{breadcrumbs.length > 1 && ( -
+
diff --git a/resources/js/components/app-logo.tsx b/resources/js/components/app-logo.tsx index 8a2ac0ea9..69bdcb84d 100644 --- a/resources/js/components/app-logo.tsx +++ b/resources/js/components/app-logo.tsx @@ -3,7 +3,7 @@ import AppLogoIcon from './app-logo-icon'; export default function AppLogo() { return ( <> -
+
diff --git a/resources/js/components/app-sidebar-header.tsx b/resources/js/components/app-sidebar-header.tsx index e31381e0d..6a3128b18 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/components/heading-small.tsx b/resources/js/components/heading-small.tsx index b71a16eb3..cbd365835 100644 --- a/resources/js/components/heading-small.tsx +++ b/resources/js/components/heading-small.tsx @@ -2,7 +2,7 @@ export default function HeadingSmall({ title, description }: { title: string; de return (

{title}

- {description &&

{description}

} + {description &&

{description}

}
); } diff --git a/resources/js/components/heading.tsx b/resources/js/components/heading.tsx index d59163ea7..6384e4b9b 100644 --- a/resources/js/components/heading.tsx +++ b/resources/js/components/heading.tsx @@ -2,7 +2,7 @@ export default function Heading({ title, description }: { title: string; descrip return (

{title}

- {description &&

{description}

} + {description &&

{description}

}
); } diff --git a/resources/js/components/nav-main.tsx b/resources/js/components/nav-main.tsx index 9b22f6cf3..0dc62c6de 100644 --- a/resources/js/components/nav-main.tsx +++ b/resources/js/components/nav-main.tsx @@ -10,11 +10,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) { {items.map((item) => ( - + {item.icon && } {item.title} diff --git a/resources/js/components/nav-user.tsx b/resources/js/components/nav-user.tsx index 12102500b..386be8fa5 100644 --- a/resources/js/components/nav-user.tsx +++ b/resources/js/components/nav-user.tsx @@ -17,7 +17,7 @@ export function NavUser() { - + diff --git a/resources/js/components/user-info.tsx b/resources/js/components/user-info.tsx index 4626dc5fb..042e38a50 100644 --- a/resources/js/components/user-info.tsx +++ b/resources/js/components/user-info.tsx @@ -15,7 +15,7 @@ export function UserInfo({ user, showEmail = false }: { user: User; showEmail?:
{user.name} - {showEmail && {user.email}} + {showEmail && {user.email}}
); diff --git a/resources/js/layouts/auth/auth-card-layout.tsx b/resources/js/layouts/auth/auth-card-layout.tsx index 9884423d5..d0bfc4e08 100644 --- a/resources/js/layouts/auth/auth-card-layout.tsx +++ b/resources/js/layouts/auth/auth-card-layout.tsx @@ -13,7 +13,7 @@ export default function AuthCardLayout({ description?: string; }>) { return ( -
+
diff --git a/resources/js/layouts/auth/auth-simple-layout.tsx b/resources/js/layouts/auth/auth-simple-layout.tsx index 428fd9cc7..6de3efcd8 100644 --- a/resources/js/layouts/auth/auth-simple-layout.tsx +++ b/resources/js/layouts/auth/auth-simple-layout.tsx @@ -10,7 +10,7 @@ interface AuthLayoutProps { export default function AuthSimpleLayout({ children, title, description }: PropsWithChildren) { return ( -
+
@@ -23,7 +23,7 @@ export default function AuthSimpleLayout({ children, title, description }: Props

{title}

-

{description}

+

{description}

{children} diff --git a/resources/js/layouts/auth/auth-split-layout.tsx b/resources/js/layouts/auth/auth-split-layout.tsx index ddced1cde..03daf1c0d 100644 --- a/resources/js/layouts/auth/auth-split-layout.tsx +++ b/resources/js/layouts/auth/auth-split-layout.tsx @@ -13,7 +13,7 @@ export default function AuthSplitLayout({ children, title, description }: PropsW return (
-
+
@@ -35,7 +35,7 @@ export default function AuthSplitLayout({ children, title, description }: PropsW

{title}

-

{description}

+

{description}

{children}
diff --git a/resources/js/pages/auth/forgot-password.tsx b/resources/js/pages/auth/forgot-password.tsx index 51d4aa787..86d1b3069 100644 --- a/resources/js/pages/auth/forgot-password.tsx +++ b/resources/js/pages/auth/forgot-password.tsx @@ -53,7 +53,7 @@ export default function ForgotPassword({ status }: { status?: string }) {
-
+
Or, return to log in
diff --git a/resources/js/pages/auth/login.tsx b/resources/js/pages/auth/login.tsx index f0705e725..28f76f08b 100644 --- a/resources/js/pages/auth/login.tsx +++ b/resources/js/pages/auth/login.tsx @@ -96,7 +96,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 34d6801c1..6b0faa8c1 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 diff --git a/resources/js/pages/dashboard.tsx b/resources/js/pages/dashboard.tsx index 083954a43..d0168287e 100644 --- a/resources/js/pages/dashboard.tsx +++ b/resources/js/pages/dashboard.tsx @@ -16,17 +16,17 @@ export default function Dashboard() {
-
+
-
+
-
+
-
+
diff --git a/resources/js/pages/settings/profile.tsx b/resources/js/pages/settings/profile.tsx index 7be605f06..3aeed3a7b 100644 --- a/resources/js/pages/settings/profile.tsx +++ b/resources/js/pages/settings/profile.tsx @@ -22,7 +22,7 @@ const breadcrumbs: BreadcrumbItem[] = [ type ProfileForm = { name: string; email: string; -} +}; export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: boolean; status?: string }) { const { auth } = usePage().props; @@ -84,7 +84,7 @@ export default function Profile({ mustVerifyEmail, status }: { mustVerifyEmail: {mustVerifyEmail && auth.user.email_verified_at === null && (
-

+

Your email address is unverified.{' '}