From d01089a5b22dd23508e792d88a117d7d135fa2ce Mon Sep 17 00:00:00 2001
From: viown <48097677+viown@users.noreply.github.com>
Date: Tue, 10 Jun 2025 21:46:49 +0300
Subject: [PATCH] Update grid layout

---
 .../dashboard/components/widgets/Widget.tsx   | 28 ++++++++-----------
 src/apps/dashboard/routes/index.tsx           | 15 +++++-----
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/apps/dashboard/components/widgets/Widget.tsx b/src/apps/dashboard/components/widgets/Widget.tsx
index a413f1081..eac1e56a5 100644
--- a/src/apps/dashboard/components/widgets/Widget.tsx
+++ b/src/apps/dashboard/components/widgets/Widget.tsx
@@ -4,7 +4,6 @@ import Typography from '@mui/material/Typography';
 import ChevronRight from '@mui/icons-material/ChevronRight';
 import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import Link from '@mui/material/Link';
 
 type IProps = {
     title: string;
@@ -15,26 +14,21 @@ type IProps = {
 const Widget = ({ title, href, children }: IProps) => {
     return (
         <Box>
-            <Link
+            <Button
                 component={RouterLink}
                 to={href}
+                variant='text'
                 color='inherit'
+                endIcon={<ChevronRight />}
+                sx={{
+                    marginTop: 1,
+                    marginBottom: 1
+                }}
             >
-                <Button
-                    LinkComponent={RouterLink}
-                    variant='text'
-                    color='inherit'
-                    endIcon={<ChevronRight />}
-                    sx={{
-                        marginTop: 1,
-                        marginBottom: 1
-                    }}
-                >
-                    <Typography variant='h3' component='span'>
-                        {title}
-                    </Typography>
-                </Button>
-            </Link>
+                <Typography variant='h3' component='span'>
+                    {title}
+                </Typography>
+            </Button>
 
             {children}
         </Box>
diff --git a/src/apps/dashboard/routes/index.tsx b/src/apps/dashboard/routes/index.tsx
index 61eed6ed6..85c9e532c 100644
--- a/src/apps/dashboard/routes/index.tsx
+++ b/src/apps/dashboard/routes/index.tsx
@@ -28,6 +28,7 @@ import Link from '@mui/material/Link';
 export const Component = () => {
     const theme = useTheme();
     const isMedium = useMediaQuery(theme.breakpoints.only('md'));
+    const isExtraLarge = useMediaQuery(theme.breakpoints.only('xl'));
     const [ isRestartConfirmDialogOpen, setIsRestartConfirmDialogOpen ] = useState(false);
     const [ isShutdownConfirmDialogOpen, setIsShutdownConfirmDialogOpen ] = useState(false);
     const startTask = useStartTask();
@@ -134,8 +135,8 @@ export const Component = () => {
                 confirmButtonColor='error'
             />
             <Box className='content-primary'>
-                <Grid container spacing={3} columns={{ xs: 1, md: 12 }}>
-                    <Grid size={{ xs: 1, md: 12, lg: 8 }}>
+                <Grid container spacing={3}>
+                    <Grid size={{ xs: 12, md: 12, xl: 6 }}>
                         <Stack spacing={3}>
                             <ServerInfoWidget
                                 systemInfo={systemInfo}
@@ -147,11 +148,11 @@ export const Component = () => {
                             <DevicesWidget devices={devices} />
                         </Stack>
                     </Grid>
-                    <Grid size={{ xs: 1, md: 6, lg: 4 }}>
+                    <Grid size={{ xs: 12, md: 6, lg: 12, xl: 3 }}>
                         <ActivityLogWidget logs={logs?.Items} />
                     </Grid>
-                    {isMedium ? (
-                        <Grid size={6}>
+                    {isMedium || isExtraLarge ? (
+                        <Grid size={{ md: 6, xl: 3 }}>
                             <Stack spacing={3}>
                                 <AlertsLogWidget alerts={alerts?.Items} />
                                 <ServerPathWidget systemStorage={systemStorage} />
@@ -159,10 +160,10 @@ export const Component = () => {
                         </Grid>
                     ) : (
                         <>
-                            <Grid size={{ xs: 1, lg: 12 }}>
+                            <Grid size={{ xs: 12, lg: 12 }}>
                                 <AlertsLogWidget alerts={alerts?.Items} />
                             </Grid>
-                            <Grid size={{ xs: 1, lg: 12 }}>
+                            <Grid size={{ xs: 12, lg: 12 }}>
                                 <ServerPathWidget systemStorage={systemStorage} />
                             </Grid>
                         </>