Browse Source

Grid组件替换为Grid2

zhangzl 3 months ago
parent
commit
600d2184ba

+ 7 - 2
new-react-admin-ui/src/locales/ja.ts

@@ -34,7 +34,8 @@ const customJapaneseMessages: TranslationMessages = {
       deleted: '削除されました',
       bad_item: '不正なアイテム',
       item_doesnt_exist: 'アイテムが存在しません',
-      http_error: 'サーバー通信エラー'
+      http_error: 'サーバー通信エラー',
+      logged_in: 'ログインに成功しました'
     },
     page: {
        ...japaneseMessages.ra?.page,
@@ -157,7 +158,7 @@ const customJapaneseMessages: TranslationMessages = {
       pleaseLogin: '管理システムへようこそ',
       loginButton: 'ログイン',
       loggingIn: 'ログイン中...',
-      defaultAccount: 'デフォルトアカウント: {username} / {password}'
+      defaultAccount: 'デフォルトアカウント: {admin} / {admin123}'
     },
   },
   
@@ -205,6 +206,10 @@ const customJapaneseMessages: TranslationMessages = {
     deleteSuccess: '削除に成功しました',
     updateSuccess: '更新に成功しました',
   },
+
+
+  
+
   
   dashboard: {
     overview: 'システム概要',

+ 11 - 11
new-react-admin-ui/src/pages/Dashboard.tsx

@@ -2,10 +2,10 @@ import {
   Card,
   CardContent,
   Typography,
-  Grid,
   Box,
   Paper,
 } from '@mui/material';
+import Grid2 from '@mui/material/Grid2';
 import { useTranslate } from 'react-admin';
 import {
   People as PeopleIcon,
@@ -22,8 +22,8 @@ export const Dashboard = () => {
         {translate('dashboard.overview')}
       </Typography>
       
-      <Grid container spacing={3}>
-        <Grid item xs={12} sm={6} md={3}>
+      <Grid2 container spacing={3}>
+        <Grid2 size={{ xs: 12, sm: 6, md: 3 }}>
           <Card>
             <CardContent>
               <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
@@ -37,9 +37,9 @@ export const Dashboard = () => {
               </Typography>
             </CardContent>
           </Card>
-        </Grid>
+        </Grid2>
         
-        <Grid item xs={12} sm={6} md={3}>
+        <Grid2 size={{ xs: 12, sm: 6, md: 3 }}>
           <Card>
             <CardContent>
               <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
@@ -53,9 +53,9 @@ export const Dashboard = () => {
               </Typography>
             </CardContent>
           </Card>
-        </Grid>
+        </Grid2>
         
-        <Grid item xs={12} sm={6} md={3}>
+        <Grid2 size={{ xs: 12, sm: 6, md: 3 }}>
           <Card>
             <CardContent>
               <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
@@ -69,9 +69,9 @@ export const Dashboard = () => {
               </Typography>
             </CardContent>
           </Card>
-        </Grid>
+        </Grid2>
         
-        <Grid item xs={12} sm={6} md={3}>
+        <Grid2 size={{ xs: 12, sm: 6, md: 3 }}>
           <Card>
             <CardContent>
               <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
@@ -85,8 +85,8 @@ export const Dashboard = () => {
               </Typography>
             </CardContent>
           </Card>
-        </Grid>
-      </Grid>
+        </Grid2>
+      </Grid2>
       
       <Paper sx={{ mt: 3, p: 3 }}>
         <Typography variant="h6" gutterBottom>

+ 1 - 1
new-react-admin-ui/src/pages/LoginPage.tsx

@@ -30,7 +30,7 @@ export const LoginPage = () => {
     
     try {
       await login({ username, password });
-      notify(translate('success.loginSuccess'), { type: 'success' });
+      // React AdminのuseLoginフックが自動的に成功メッセージを表示する
     } catch (error) {
       notify(error instanceof Error ? error.message : translate('error.loginFailed'), { type: 'error' });
     } finally {

+ 7 - 7
new-react-admin-ui/src/pages/menus/MenuForm.tsx

@@ -13,11 +13,11 @@ import {
 } from 'react-admin';
 import {
   Box,
-  Grid,
   Typography,
   Card,
   CardContent,
 } from '@mui/material';
+import Grid2 from '@mui/material/Grid2';
 
 // カスタムツールバー、保存と削除ボタンを含む
 const MenuFormToolbar = () => (
@@ -86,8 +86,8 @@ const MenuForm = () => {
       </Typography>
       
       <SimpleForm toolbar={<MenuFormToolbar />}>
-        <Grid container spacing={2}>
-          <Grid item xs={12} md={6}>
+        <Grid2 container spacing={2}>
+          <Grid2 size={{ xs: 12, md: 6 }}>
             <Card>
               <CardContent>
                 <Typography variant="h6" gutterBottom>
@@ -146,9 +146,9 @@ const MenuForm = () => {
                 />
               </CardContent>
             </Card>
-          </Grid>
+          </Grid2>
           
-          <Grid item xs={12} md={6}>
+          <Grid2 size={{ xs: 12, md: 6 }}>
             <Card>
               <CardContent>
                 <Typography variant="h6" gutterBottom>
@@ -235,8 +235,8 @@ const MenuForm = () => {
                 />
               </CardContent>
             </Card>
-          </Grid>
-        </Grid>
+          </Grid2>
+        </Grid2>
       </SimpleForm>
     </Box>
   );