Merge remote-tracking branch 'origin/feature-frontend-lei' into feature-frontend-bug-fix

feature-frontend-bug-fix
Masaharu.Kato 4 months ago
commit 2e072c9c00
  1. 6
      frontend/src/components/DeleteStuffDialog.tsx
  2. 13
      frontend/src/pages/TaskListPage.tsx

@ -26,11 +26,11 @@ const DeleteStuffDialog = ({
sx={{ overflow: "hidden" }} sx={{ overflow: "hidden" }}
> >
<DialogTitle></DialogTitle> <DialogTitle></DialogTitle>
<DialogContent> <DialogContent sx={{ wordBreak: 'break-word' }}>
<Typography sx={{ fontSize: '1.6rem' }}>{stuffName} </Typography> <Typography sx={{ fontSize: '1.4rem', fontWeight: 'bold' }}>{stuffName} </Typography>
<Typography variant="body1" color="error"> 注意: 削除すると復元できません</Typography> <Typography variant="body1" color="error"> 注意: 削除すると復元できません</Typography>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions sx={{ display: 'flex', justifyContent: 'flex-end', gap: 2 }}>
<Button onClick={() => setOpenDialog(false)} ></Button> <Button onClick={() => setOpenDialog(false)} ></Button>
<Button variant="contained" color="error" onClick={() => { <Button variant="contained" color="error" onClick={() => {
onSubmit(); onSubmit();

@ -272,20 +272,27 @@ const TaskListPage: React.FC = () => {
<ListItem <ListItem
key={tobuy.tobuyId} key={tobuy.tobuyId}
sx={{ sx={{
bgcolor: "background.paper", bgcolor: 'background.paper',
mb: 1, mb: 1,
borderRadius: 1, borderRadius: 1,
boxShadow: 1, boxShadow: 1,
display: 'flex',
flexDirection: 'row',
flexWrap: 'wrap',
alignItems: 'center',
justifyContent: 'space-between',
// px: 1,
}} }}
> >
{/* 食材名 */} {/* 食材名 */}
<ListItemText <ListItemText
sx={{maxWidth: '60%', wordBreak: 'break-word', flexGrow: 1}}
primary={tobuy.stuffName} primary={tobuy.stuffName}
onClick={() => handleShowHistories(tobuy)} onClick={() => handleShowHistories(tobuy)}
/> />
{/* 買い物リスト:食材情報記入ボタン */} {/* 買い物リスト:食材情報記入ボタン */}
<ListItemSecondaryAction> <ListItemSecondaryAction sx={{ display: 'flex', alignItems: 'center', flexShrink: 0, gap: 0.5 }}>
<Typography variant="body1" component="span" sx={{ marginRight: '1em' }}> <Typography variant="body1" component="span" sx={{ marginRight: '4px' }}>
{`× ${tobuy.amount}`} {`× ${tobuy.amount}`}
</Typography> </Typography>
{/* 買い物リスト:数量変更ボタン */} {/* 買い物リスト:数量変更ボタン */}

Loading…
Cancel
Save