Merge branch 'main' of github.com:FlorianSpeicher04/webshop

This commit is contained in:
FlorianSpeicher
2025-06-22 13:40:00 +02:00
3 changed files with 11 additions and 8 deletions

View File

@@ -152,5 +152,6 @@
"imageUploadNoticeFs": "Die Auflösung der Farming Station beträgt 720 x 960 px",
"itemCreatedSuccessfully": "Artikel erfolgreich erstellt",
"createNewItem": "Neuen Artikel erstellen",
"stockExpected": "Erwarteter Bestand"
"stockExpected": "Erwarteter Bestand",
"addProduct": "Artikel Hinzufügen"
}

View File

@@ -38,7 +38,7 @@
"hoverToSeeDetails": "Hover over the components list to see more details!",
"inStock": "In stock",
"item": "Item",
"items": "items",
"items": "Items",
"lastName": "Last name",
"lightMode": "Zu hellem Modus wechseln",
"logout": "Logout",
@@ -152,5 +152,6 @@
"imageUploadNoticeFs": "The Resolution of the Farming Station is 720 x 960 px",
"itemCreatedSuccessfully": "Item created successfully",
"createNewItem": "Create New Item",
"stockExpected": "Expected Stock"
"stockExpected": "Expected Stock",
"addProduct": "Add Product"
}

View File

@@ -47,7 +47,9 @@ const OrderCard: React.FC<{ order: OrderType; onClick: () => void }> = ({order,
return (
<div ref={drag} style={{opacity: isDragging ? 0.5 : 1, marginBottom: 8}}>
<Card elevation={4}>
<Card elevation={4} sx={{
m: 1
}}>
<CardContent onClick={onClick}>
<Typography gutterBottom variant="h5" component="div">
Order: {order.id}
@@ -84,7 +86,6 @@ const Column: React.FC<PropsWithChildren<{
<div ref={drop} style={{
flex: 1,
backgroundColor: isOver ? theme.palette.background.paper : 'transparent',
padding: 1,
minWidth: 300,
maxWidth: 400
}}>
@@ -95,14 +96,13 @@ const Column: React.FC<PropsWithChildren<{
height: '80vh',
display: 'flex',
flexDirection: 'column'
}} elevation={4}>
}} elevation={1}>
<CardContent sx={{
flex: 1,
display: 'flex',
flexDirection: 'column',
overflowY: 'auto',
height: '100%',
padding: 2
}}>
<Typography variant="h6">{t(status)}</Typography>
<div style={{flex: 1, overflowY: 'auto'}}>
@@ -190,7 +190,8 @@ export default function OrdersInfo() {
}
try {
await patchOrderMutation.mutateAsync({id: obj.id, status: status});
refetch();
await refetch();
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (error) {
setOpenSnackbar(true);
}