From eb207b98d9c2bcbd0d9993fdda6e796004c21dd7 Mon Sep 17 00:00:00 2001 From: ct Date: Tue, 15 Jul 2025 03:11:43 +0800 Subject: [PATCH] Update --- app/Http/Middleware/HandleInertiaRequests.php | 11 ----------- resources/js/components/app-shell.tsx | 4 ++-- resources/js/layouts/auth/auth-split-layout.tsx | 12 ++---------- resources/js/modules/flash/flash-messages.jsx | 6 +++--- resources/js/pages/FrontPages/Privacy.tsx | 2 -- resources/js/pages/FrontPages/Terms.tsx | 2 -- resources/js/pages/home/home.tsx | 2 -- resources/js/types/index.d.ts | 2 -- 8 files changed, 7 insertions(+), 34 deletions(-) diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index 61f2564..7389f4a 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -2,7 +2,6 @@ namespace App\Http\Middleware; -use Illuminate\Foundation\Inspiring; use Illuminate\Http\Request; use Inertia\Middleware; use Tighten\Ziggy\Ziggy; @@ -37,12 +36,8 @@ public function version(Request $request): ?string */ public function share(Request $request): array { - [$message, $author] = str(Inspiring::quotes()->random())->explode('-'); - return [ ...parent::share($request), - 'name' => config('app.name'), - 'quote' => ['message' => trim($message), 'author' => trim($author)], 'auth' => [ 'user' => $request->user(), 'user_is_admin' => user_is_master_admin($request->user()), @@ -51,12 +46,6 @@ public function share(Request $request): array ...(new Ziggy)->toArray(), 'location' => $request->url(), ], - 'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true', - 'flash' => [ - 'message' => fn () => $request->session()->get('message'), - 'error' => fn () => $request->session()->get('error'), - 'success' => fn () => $request->session()->get('success'), - ], ]; } } diff --git a/resources/js/components/app-shell.tsx b/resources/js/components/app-shell.tsx index 0d5cdb9..d1035ac 100644 --- a/resources/js/components/app-shell.tsx +++ b/resources/js/components/app-shell.tsx @@ -8,11 +8,11 @@ interface AppShellProps { } export function AppShell({ children, variant = 'header' }: AppShellProps) { - const isOpen = usePage().props.sidebarOpen; + const defaultSidebarOpen = true; if (variant === 'header') { return
{children}
; } - return {children}; + return {children}; } diff --git a/resources/js/layouts/auth/auth-split-layout.tsx b/resources/js/layouts/auth/auth-split-layout.tsx index ddced1c..c2e029d 100644 --- a/resources/js/layouts/auth/auth-split-layout.tsx +++ b/resources/js/layouts/auth/auth-split-layout.tsx @@ -9,7 +9,7 @@ interface AuthLayoutProps { } export default function AuthSplitLayout({ children, title, description }: PropsWithChildren) { - const { name, quote } = usePage().props; + const appName = 'MEMEFAST'; return (
@@ -17,16 +17,8 @@ export default function AuthSplitLayout({ children, title, description }: PropsW
- {name} + {appName} - {quote && ( -
-
-

“{quote.message}”

-
{quote.author}
-
-
- )}
diff --git a/resources/js/modules/flash/flash-messages.jsx b/resources/js/modules/flash/flash-messages.jsx index 2bf5c80..07eaa48 100644 --- a/resources/js/modules/flash/flash-messages.jsx +++ b/resources/js/modules/flash/flash-messages.jsx @@ -6,15 +6,15 @@ const FlashMessages = () => { const { flash } = usePage().props; useEffect(() => { - if (flash.message) { + if (flash?.message) { toast.success(flash.message); } - if (flash.error) { + if (flash?.error) { toast.error(flash.error); } - if (flash.success) { + if (flash?.success) { toast.success(flash.success); } }, [flash]); diff --git a/resources/js/pages/FrontPages/Privacy.tsx b/resources/js/pages/FrontPages/Privacy.tsx index a3e8376..be930fd 100644 --- a/resources/js/pages/FrontPages/Privacy.tsx +++ b/resources/js/pages/FrontPages/Privacy.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { Head } from '@inertiajs/react'; import AuthUser from '@/modules/auth/auth-user'; -import FlashMessages from '@/modules/flash/flash-messages'; import Footer from '@/pages/home/partials/Footer.jsx'; interface PrivacyProps { @@ -26,7 +25,6 @@ const Privacy: React.FC = ({ content, title }) => {
-
); diff --git a/resources/js/pages/FrontPages/Terms.tsx b/resources/js/pages/FrontPages/Terms.tsx index 95b010b..72b6d61 100644 --- a/resources/js/pages/FrontPages/Terms.tsx +++ b/resources/js/pages/FrontPages/Terms.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { Head } from '@inertiajs/react'; import AuthUser from '@/modules/auth/auth-user'; -import FlashMessages from '@/modules/flash/flash-messages'; import Footer from '@/pages/home/partials/Footer.jsx'; interface TermsProps { @@ -26,7 +25,6 @@ const Terms: React.FC = ({ content, title }) => {