From 98e1cb2eff4fc76d7ff1f8aa2bd37448267bfb21 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Wed, 10 Sep 2025 00:53:16 +0200
Subject: [PATCH] Reuse SplashScreen on LoginPage

---
 .../components/SplashScreen.tsx               | 27 ++++++++--
 .../authentication/screens/LoginPage.tsx      | 49 +++++++++----------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/features/authentication/components/SplashScreen.tsx b/src/features/authentication/components/SplashScreen.tsx
index 20ac60d9..7cdd66e4 100644
--- a/src/features/authentication/components/SplashScreen.tsx
+++ b/src/features/authentication/components/SplashScreen.tsx
@@ -7,16 +7,26 @@
  */
 
 import { useTheme } from '@mui/material/styles';
-import Stack from '@mui/material/Stack';
+import Stack, { StackProps } from '@mui/material/Stack';
+import { ComponentProps } from 'react';
 import { SuwayomiLogo } from '@/assets/SuwayomiLogo.tsx';
 import { ServerAddressSetting } from '@/features/settings/components/ServerAddressSetting.tsx';
 import { ThemeMode } from '@/features/theme/AppThemeContext.tsx';
 
-export const SplashScreen = () => {
+export const SplashScreen = ({
+    slots,
+}: {
+    slots?: {
+        stackProps?: StackProps;
+        logoProps?: ComponentProps<typeof SuwayomiLogo>;
+        serverAddressProps?: StackProps;
+    };
+}) => {
     const theme = useTheme();
 
     return (
         <Stack
+            {...slots?.stackProps}
             sx={{
                 position: 'relative',
                 minWidth: '100vw',
@@ -27,20 +37,31 @@ export const SplashScreen = () => {
                 ...theme.applyStyles('dark', {
                     backgroundColor: 'primary.dark',
                 }),
+                ...slots?.stackProps?.sx,
             }}
         >
             <SuwayomiLogo
                 circleRingColor={
                     theme.palette.mode === ThemeMode.DARK ? theme.palette.primary.light : theme.palette.primary.dark
                 }
+                {...slots?.logoProps}
                 sx={{
                     fontSize: 250,
                     [theme.breakpoints.up('lg')]: {
                         fontSize: 350,
                     },
+                    ...slots?.logoProps?.sx,
                 }}
             />
-            <Stack sx={{ position: 'absolute', left: 0, bottom: 0 }}>
+            <Stack
+                {...slots?.serverAddressProps}
+                sx={{
+                    position: 'absolute',
+                    left: 0,
+                    bottom: 0,
+                    ...slots?.serverAddressProps?.sx,
+                }}
+            >
                 <ServerAddressSetting />
             </Stack>
         </Stack>
diff --git a/src/features/authentication/screens/LoginPage.tsx b/src/features/authentication/screens/LoginPage.tsx
index cc4f2a91..dc3e7f80 100644
--- a/src/features/authentication/screens/LoginPage.tsx
+++ b/src/features/authentication/screens/LoginPage.tsx
@@ -19,11 +19,11 @@ import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/base/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { AuthManager } from '@/features/authentication/AuthManager.ts';
-import { SuwayomiLogo } from '@/assets/SuwayomiLogo.tsx';
 import { useSessionContext } from '@/features/authentication/SessionContext.tsx';
 import { AppRoutes } from '@/base/AppRoute.constants.ts';
 import { useNavBarContext } from '@/features/navigation-bar/NavbarContext.tsx';
 import { SearchParam } from '@/base/Base.types.ts';
+import { SplashScreen } from '@/features/authentication/components/SplashScreen.tsx';
 import { ServerAddressSetting } from '@/features/settings/components/ServerAddressSetting.tsx';
 
 export const LoginPage = () => {
@@ -60,7 +60,7 @@ export const LoginPage = () => {
         return () => setOverride({ status: false, value: null });
     }, []);
 
-    if (isAuthenticated) {
+    if (false && isAuthenticated) {
         return <Navigate to={AppRoutes.root.path} replace />;
     }
 
@@ -72,33 +72,28 @@ export const LoginPage = () => {
                 },
             }}
         >
-            <Stack
-                sx={{
-                    minHeight: '50vh',
-                    flexBasis: '60%',
-                    p: 4,
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                    backgroundColor: 'primary.light',
-                    ...theme.applyStyles('dark', {
-                        backgroundColor: 'primary.dark',
-                    }),
-                    [theme.breakpoints.up('lg')]: {
-                        minHeight: '0vh',
-                        height: '100vh',
+            <SplashScreen
+                slots={{
+                    stackProps: {
+                        sx: {
+                            position: 'unset',
+                            minWidth: 'auto',
+                            minHeight: '50vh',
+                            flexBasis: '60%',
+                            p: 4,
+                            [theme.breakpoints.up('lg')]: {
+                                minHeight: '0vh',
+                                height: '100vh',
+                            },
+                        },
+                    },
+                    serverAddressProps: {
+                        sx: {
+                            display: 'none',
+                        },
                     },
                 }}
-            >
-                <SuwayomiLogo
-                    sx={{
-                        fontSize: 250,
-                        [theme.breakpoints.up('lg')]: {
-                            fontSize: 350,
-                        },
-                    }}
-                    circleRingColor={theme.palette.primary.light}
-                />
-            </Stack>
+            />
             <Stack
                 sx={{
                     position: 'relative',