Added tagging to the UI and fixed the back end.

This commit is contained in:
Steve White 2024-10-31 11:57:33 -05:00
parent c400ccc400
commit 74502b1077
9 changed files with 596 additions and 154 deletions

10
package-lock.json generated
View File

@ -16,6 +16,7 @@
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"axios": "^1.7.7", "axios": "^1.7.7",
"lucide-react": "^0.454.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-router-dom": "^6.26.2", "react-router-dom": "^6.26.2",
@ -13981,6 +13982,15 @@
"yallist": "^3.0.2" "yallist": "^3.0.2"
} }
}, },
"node_modules/lucide-react": {
"version": "0.454.0",
"resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.454.0.tgz",
"integrity": "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ==",
"license": "ISC",
"peerDependencies": {
"react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
}
},
"node_modules/lz-string": { "node_modules/lz-string": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",

View File

@ -11,6 +11,7 @@
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"axios": "^1.7.7", "axios": "^1.7.7",
"lucide-react": "^0.454.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-router-dom": "^6.26.2", "react-router-dom": "^6.26.2",

View File

@ -10,6 +10,7 @@ import Admin from './components/Admin'; // Correct import here
import { createContext } from 'react'; import { createContext } from 'react';
import ErrorBoundary from './components/ErrorBoundary'; import ErrorBoundary from './components/ErrorBoundary';
import './styles.css' import './styles.css'
import { EnhancedThemeProvider } from './components/themeProvider';
export const AppContext = createContext(); export const AppContext = createContext();
export const PRIMARY_COLOR = '#333'; export const PRIMARY_COLOR = '#333';
@ -26,6 +27,7 @@ function App() {
}, [token]); }, [token]);
return ( return (
<EnhancedThemeProvider>
<AppContext.Provider value={{ token, setToken }}> <AppContext.Provider value={{ token, setToken }}>
<ErrorBoundary> <ErrorBoundary>
<Router> <Router>
@ -34,6 +36,7 @@ function App() {
</Router> </Router>
</ErrorBoundary> </ErrorBoundary>
</AppContext.Provider> </AppContext.Provider>
</EnhancedThemeProvider>
); );
} }

View File

@ -10,9 +10,11 @@ import {
TableHead, TableHead,
TableRow, TableRow,
Alert, Alert,
CircularProgress CircularProgress,
Avatar,
Box
} from '@mui/material'; } from '@mui/material';
import { Delete as DeleteIcon } from '@mui/icons-material'; import { Delete as DeleteIcon, Inventory as InventoryIcon } from '@mui/icons-material';
import { Link as RouterLink } from 'react-router-dom'; import { Link as RouterLink } from 'react-router-dom';
import { PRIMARY_COLOR, SECONDARY_COLOR } from '../App'; import { PRIMARY_COLOR, SECONDARY_COLOR } from '../App';
import { useApiCall } from './hooks/useApiCall'; import { useApiCall } from './hooks/useApiCall';
@ -36,7 +38,7 @@ export default function Boxes({ token }) {
} catch (err) {} } catch (err) {}
}; };
getBoxes(); getBoxes();
}, [token]); // Remove fetchBoxes from dependencies }, [token]);
const handleCreateBox = async () => { const handleCreateBox = async () => {
if (!newBoxName.trim()) return; if (!newBoxName.trim()) return;
@ -74,23 +76,50 @@ export default function Boxes({ token }) {
<Table size="small"> <Table size="small">
<TableHead> <TableHead>
<TableRow> <TableRow>
<TableCell width="48px"></TableCell>
<TableCell>Box Name</TableCell> <TableCell>Box Name</TableCell>
<TableCell>Actions</TableCell> <TableCell align="right">Actions</TableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{boxes.map((box) => ( {boxes.map((box) => (
<TableRow key={box.ID}> <TableRow key={box.ID}>
<TableCell> <TableCell>
<RouterLink to={`/api/v1/boxes/${box.ID}/items`} state={{ boxName: box.name, boxID: box.ID }}> <Avatar
{box.name} sx={{
</RouterLink> bgcolor: PRIMARY_COLOR,
width: 32,
height: 32
}}
>
<InventoryIcon sx={{ color: SECONDARY_COLOR, fontSize: 20 }} />
</Avatar>
</TableCell> </TableCell>
<TableCell> <TableCell>
<Box
component={RouterLink}
to={`/api/v1/boxes/${box.ID}/items`}
state={{ boxName: box.name, boxID: box.ID }}
sx={{
textDecoration: 'none',
color: 'inherit',
display: 'flex',
alignItems: 'center',
'&:hover': {
textDecoration: 'underline'
}
}}
>
{box.name}
</Box>
</TableCell>
<TableCell align="right">
<Button <Button
onClick={() => handleDeleteBox(box.ID)} onClick={() => handleDeleteBox(box.ID)}
startIcon={<DeleteIcon />} startIcon={<DeleteIcon />}
disabled={deletingBox} disabled={deletingBox}
color="error"
size="small"
> >
{deletingBox ? <CircularProgress size={20} /> : 'Delete'} {deletingBox ? <CircularProgress size={20} /> : 'Delete'}
</Button> </Button>
@ -102,6 +131,7 @@ export default function Boxes({ token }) {
</TableContainer> </TableContainer>
)} )}
<Box sx={{ mt: 2 }}>
<TextField <TextField
label="New Box" label="New Box"
variant="outlined" variant="outlined"
@ -109,15 +139,23 @@ export default function Boxes({ token }) {
value={newBoxName} value={newBoxName}
onChange={(e) => setNewBoxName(e.target.value)} onChange={(e) => setNewBoxName(e.target.value)}
disabled={creatingBox} disabled={creatingBox}
sx={{ mb: 1 }}
/> />
<Button <Button
sx={{ backgroundColor: PRIMARY_COLOR, borderBottom: '1px solid', borderColor: '#444', color: SECONDARY_COLOR }} sx={{
backgroundColor: PRIMARY_COLOR,
borderBottom: '1px solid',
borderColor: '#444',
color: SECONDARY_COLOR
}}
variant="contained" variant="contained"
onClick={handleCreateBox} onClick={handleCreateBox}
disabled={creatingBox || !newBoxName.trim()} disabled={creatingBox || !newBoxName.trim()}
fullWidth
> >
{creatingBox ? <CircularProgress size={24} /> : 'Add Box'} {creatingBox ? <CircularProgress size={24} /> : 'Add Box'}
</Button> </Button>
</Box>
</Container> </Container>
); );
} }

View File

@ -1,55 +1,76 @@
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { TextField, Button, Container, Avatar, Tooltip, Alert, CircularProgress } from '@mui/material'; import {
TextField,
Button,
Container,
Avatar,
Tooltip,
Alert,
CircularProgress,
Box,
Typography
} from '@mui/material';
import { PRIMARY_COLOR, SECONDARY_COLOR } from '../App'; import { PRIMARY_COLOR, SECONDARY_COLOR } from '../App';
import { useApiCall } from './hooks/useApiCall'; import { useApiCall } from './hooks/useApiCall';
import { api } from '../services/api'; import { api } from '../services/api';
import TagManager from './tagManager';
export default function ItemDetails({ item, token, onSave, onClose }) { export default function ItemDetails({ item: initialItem, token, onSave, onClose }) {
const [name, setName] = useState(item.name); const [item, setItem] = useState(initialItem);
const [description, setDescription] = useState(item.description); const [name, setName] = useState(initialItem.name);
const [imagePath, setImagePath] = useState(item.image_path || ''); const [description, setDescription] = useState(initialItem.description);
const [imagePath, setImagePath] = useState(initialItem.image_path || '');
const [imageSrc, setImageSrc] = useState('/images/default.jpg'); const [imageSrc, setImageSrc] = useState('/images/default.jpg');
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(null); const [error, setError] = useState(null);
const fileInputRef = useRef(null); const fileInputRef = useRef(null);
const [imageOverlayVisible, setImageOverlayVisible] = useState(false); const [imageOverlayVisible, setImageOverlayVisible] = useState(false);
const [boxes, setBoxes] = useState([]); const [boxes, setBoxes] = useState([]);
const [selectedBoxId, setSelectedBoxId] = useState(item.box_id); const [selectedBoxId, setSelectedBoxId] = useState(initialItem.box_id);
const { execute: fetchBoxes, loading: loadingBoxes, error: boxesError } = useApiCall(); const { execute: fetchBoxes, loading: loadingBoxes, error: boxesError } = useApiCall();
const { execute: fetchItem, loading: loadingItem } = useApiCall();
const { execute: updateItem, loading: savingItem, error: saveError } = useApiCall(); const { execute: updateItem, loading: savingItem, error: saveError } = useApiCall();
const { execute: uploadImage, loading: uploadingImage, error: uploadError } = useApiCall(); const { execute: uploadImage, loading: uploadingImage, error: uploadError } = useApiCall();
// Single effect to load initial data
useEffect(() => { useEffect(() => {
const getBoxes = async () => { const loadInitialData = async () => {
try { try {
const response = await fetchBoxes(() => api.boxes.getAll(token)); // Fetch item and boxes in parallel
setBoxes(response.data); const [itemResponse, boxesResponse] = await Promise.all([
} catch (err) {} fetchItem(() => api.items.getOne(token, initialItem.ID)),
}; fetchBoxes(() => api.boxes.getAll(token))
getBoxes(); ]);
}, [token]);
useEffect(() => { const updatedItem = itemResponse.data;
const loadImage = async () => { setItem(updatedItem);
setLoading(true); setName(updatedItem.name);
setError(null); setDescription(updatedItem.description);
setImagePath(updatedItem.image_path || '');
setBoxes(boxesResponse.data);
// Load image
try { try {
const response = await api.items.getImage(token, item.ID); const imageResponse = await api.items.getImage(token, initialItem.ID);
const reader = new FileReader(); const reader = new FileReader();
reader.onload = () => { reader.onload = () => {
setImageSrc(reader.result); setImageSrc(reader.result);
setLoading(false); setLoading(false);
}; };
reader.readAsDataURL(response.data); reader.readAsDataURL(imageResponse.data);
} catch (err) { } catch (err) {
setImageSrc('/default.jpg'); setImageSrc('/default.jpg');
setLoading(false);
}
} catch (err) {
setError(err); setError(err);
setLoading(false); setLoading(false);
} }
}; };
loadImage();
}, [item.ID, token]); loadInitialData();
}, []); // Empty dependency array - only run once on mount
const handleImageUpload = async () => { const handleImageUpload = async () => {
if (!fileInputRef.current?.files?.[0]) return null; if (!fileInputRef.current?.files?.[0]) return null;
@ -86,9 +107,13 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
setSelectedBoxId(event.target.value); setSelectedBoxId(event.target.value);
}; };
const handleTagsChange = (newTags) => {
setItem(prev => ({...prev, tags: newTags}));
};
return ( return (
<Container> <Container>
<h3>Edit Item: {item.name}</h3> <h3>Edit Item: {name}</h3>
{(error || boxesError || saveError || uploadError) && ( {(error || boxesError || saveError || uploadError) && (
<Alert severity="error" sx={{ mb: 2 }}> <Alert severity="error" sx={{ mb: 2 }}>
@ -99,6 +124,10 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
{loading ? ( {loading ? (
<CircularProgress /> <CircularProgress />
) : ( ) : (
/* Rest of your JSX remains the same */
// ... existing JSX code ...
<Box>
{/* Image section */}
<Tooltip title="Click to enlarge"> <Tooltip title="Click to enlarge">
<Avatar <Avatar
src={imageSrc} src={imageSrc}
@ -107,17 +136,8 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
onClick={() => setImageOverlayVisible(true)} onClick={() => setImageOverlayVisible(true)}
/> />
</Tooltip> </Tooltip>
)}
{imageOverlayVisible && (
<div className="image-overlay">
<img src={imageSrc} alt={name} />
<button className="close-button" onClick={() => setImageOverlayVisible(false)}>
Close
</button>
</div>
)}
{/* Form fields */}
<TextField <TextField
label="Item Name" label="Item Name"
variant="outlined" variant="outlined"
@ -127,6 +147,7 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
onChange={(e) => setName(e.target.value)} onChange={(e) => setName(e.target.value)}
disabled={savingItem} disabled={savingItem}
/> />
<TextField <TextField
label="Item Description" label="Item Description"
variant="outlined" variant="outlined"
@ -137,6 +158,7 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
disabled={savingItem} disabled={savingItem}
/> />
{/* Box selection */}
{loadingBoxes ? ( {loadingBoxes ? (
<CircularProgress size={24} /> <CircularProgress size={24} />
) : ( ) : (
@ -154,11 +176,21 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
</select> </select>
)} )}
<br /> {/* Tags section */}
<br /> <Box sx={{ my: 2 }}>
<Typography variant="subtitle1" gutterBottom>Tags</Typography>
<TagManager
token={token}
itemId={item.ID}
initialTags={item.tags || []}
onTagsChange={handleTagsChange}
/>
</Box>
{/* Buttons */}
<Box sx={{ mt: 2 }}>
<Button <Button
sx={{ backgroundColor: PRIMARY_COLOR, borderBottom: '1px solid', borderColor: '#444', color: SECONDARY_COLOR }} sx={{ backgroundColor: PRIMARY_COLOR, borderBottom: '1px solid', borderColor: '#444', color: SECONDARY_COLOR, mr: 1 }}
variant="contained" variant="contained"
component="label" component="label"
disabled={uploadingImage || savingItem} disabled={uploadingImage || savingItem}
@ -174,7 +206,7 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
</Button> </Button>
<Button <Button
sx={{ backgroundColor: PRIMARY_COLOR, borderBottom: '1px solid', borderColor: '#444', color: SECONDARY_COLOR }} sx={{ backgroundColor: PRIMARY_COLOR, borderBottom: '1px solid', borderColor: '#444', color: SECONDARY_COLOR, mr: 1 }}
variant="contained" variant="contained"
onClick={handleSave} onClick={handleSave}
disabled={savingItem} disabled={savingItem}
@ -190,6 +222,9 @@ export default function ItemDetails({ item, token, onSave, onClose }) {
> >
Close Close
</Button> </Button>
</Box>
</Box>
)}
</Container> </Container>
); );
} }

View File

@ -18,7 +18,8 @@ import {
DialogContent, DialogContent,
DialogActions, DialogActions,
Alert, Alert,
CircularProgress CircularProgress,
Chip
} from '@mui/material'; } from '@mui/material';
import { Delete as DeleteIcon, Edit as EditIcon } from '@mui/icons-material'; import { Delete as DeleteIcon, Edit as EditIcon } from '@mui/icons-material';
import { useParams, useLocation } from 'react-router-dom'; import { useParams, useLocation } from 'react-router-dom';
@ -26,7 +27,10 @@ import { PRIMARY_COLOR, SECONDARY_COLOR } from '../App';
import { useApiCall } from './hooks/useApiCall'; import { useApiCall } from './hooks/useApiCall';
import { api } from '../services/api'; import { api } from '../services/api';
import ItemDetails from './ItemDetails'; import ItemDetails from './ItemDetails';
import TagManager from './tagManager';
// In Items.js, modify the Item component
const Item = React.memo(({ item, onDelete, onEdit, itemImages }) => ( const Item = React.memo(({ item, onDelete, onEdit, itemImages }) => (
<TableRow> <TableRow>
<TableCell> <TableCell>
@ -34,6 +38,20 @@ const Item = React.memo(({ item, onDelete, onEdit, itemImages }) => (
</TableCell> </TableCell>
<TableCell>{item.name}</TableCell> <TableCell>{item.name}</TableCell>
<TableCell>{item.description}</TableCell> <TableCell>{item.description}</TableCell>
<TableCell> {/* Add this cell */}
{item.tags?.map(tag => (
<Chip
key={tag.ID}
label={tag.name}
size="small"
style={{
backgroundColor: tag.color,
color: '#fff',
margin: '0 2px'
}}
/>
))}
</TableCell>
<TableCell> <TableCell>
<Box display="flex" justifyContent="space-between" width="100%"> <Box display="flex" justifyContent="space-between" width="100%">
<Tooltip title="Edit Item"> <Tooltip title="Edit Item">
@ -190,10 +208,13 @@ export default function Items({ token }) {
const handleSaveEdit = async () => { const handleSaveEdit = async () => {
setEditingItem(null); setEditingItem(null);
// Refresh the items list after editing
try {
const response = await fetchItems(() => const response = await fetchItems(() =>
api.items.getAll(token, boxId) boxId ? api.items.getByBox(token, boxId) : api.items.getAll(token)
); );
setItems(response.data); setItems(response.data);
} catch (err) {}
}; };
const filteredItems = useMemo(() => const filteredItems = useMemo(() =>
@ -290,6 +311,7 @@ export default function Items({ token }) {
<TableCell style={{ width: '40px' }}>Image</TableCell> <TableCell style={{ width: '40px' }}>Image</TableCell>
<TableCell style={{ width: '100px' }}>Name</TableCell> <TableCell style={{ width: '100px' }}>Name</TableCell>
<TableCell>Description</TableCell> <TableCell>Description</TableCell>
<TableCell>Tags</TableCell>
<TableCell>Actions</TableCell> <TableCell>Actions</TableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>

View File

@ -0,0 +1,181 @@
import React, { useState, useEffect, useCallback } from 'react';
import {
Chip,
Dialog,
DialogTitle,
DialogContent,
DialogActions,
TextField,
Button,
Box,
CircularProgress,
Alert
} from '@mui/material';
import { LocalOffer as TagIcon } from '@mui/icons-material';
import { useApiCall } from './hooks/useApiCall';
import { api } from '../services/api';
const TagManager = React.memo(({ token, itemId, initialTags = [], onTagsChange }) => {
const [tags, setTags] = useState([]);
const [itemTags, setItemTags] = useState(initialTags);
const [openDialog, setOpenDialog] = useState(false);
const [newTagName, setNewTagName] = useState('');
const [newTagDescription, setNewTagDescription] = useState('');
const [newTagColor, setNewTagColor] = useState('#3366ff');
const { execute: fetchTags, loading: loadingTags, error: tagsError } = useApiCall();
const { execute: createTag, loading: creatingTag, error: createError } = useApiCall();
const { execute: addTags, loading: addingTags, error: addError } = useApiCall();
const { execute: removeTag, loading: removingTag, error: removeError } = useApiCall();
// Only fetch tags once when component mounts
useEffect(() => {
const getTags = async () => {
try {
const response = await fetchTags(() => api.tags.getAll(token));
setTags(response.data);
} catch (err) {}
};
getTags();
}, []); // Empty dependency array - only run once on mount
// Update itemTags when initialTags prop changes
useEffect(() => {
setItemTags(initialTags);
}, [initialTags]);
const handleCreateTag = async () => {
try {
const response = await createTag(() => api.tags.create(token, {
name: newTagName,
description: newTagDescription,
color: newTagColor
}));
setTags(prevTags => [...prevTags, response.data]);
setOpenDialog(false);
setNewTagName('');
setNewTagDescription('');
setNewTagColor('#3366ff');
} catch (err) {}
};
const handleAddTag = async (tagId) => {
if (!itemId) return;
try {
await addTags(() => api.items.addTags(token, itemId, [tagId]));
const newTag = tags.find(t => t.ID === tagId);
if (newTag) {
const updatedTags = [...itemTags, newTag];
setItemTags(updatedTags);
onTagsChange?.(updatedTags);
}
} catch (err) {}
};
const handleRemoveTag = async (tagId) => {
if (!itemId) return;
try {
await removeTag(() => api.items.removeTag(token, itemId, tagId));
const updatedTags = itemTags.filter(tag => tag.ID !== tagId);
setItemTags(updatedTags);
onTagsChange?.(updatedTags);
} catch (err) {}
};
return (
<Box>
{(tagsError || createError || addError || removeError) && (
<Alert severity="error" sx={{ mb: 2 }}>
{tagsError?.message || createError?.message ||
addError?.message || removeError?.message}
</Alert>
)}
<Box display="flex" alignItems="center" flexWrap="wrap" gap={1}>
{itemTags.map(tag => (
<Chip
key={tag.ID}
label={tag.name}
onDelete={() => handleRemoveTag(tag.ID)}
style={{
backgroundColor: tag.color,
color: '#fff'
}}
disabled={removingTag}
/>
))}
<Box sx={{ ml: 1 }}>
{loadingTags ? (
<CircularProgress size={24} />
) : (
tags
.filter(tag => !itemTags.find(it => it.ID === tag.ID))
.map(tag => (
<Chip
key={tag.ID}
label={tag.name}
onClick={() => handleAddTag(tag.ID)}
style={{
backgroundColor: tag.color,
color: '#fff',
margin: '0 4px'
}}
disabled={addingTags}
/>
))
)}
</Box>
<Button
startIcon={<TagIcon />}
variant="outlined"
size="small"
onClick={() => setOpenDialog(true)}
sx={{ ml: 1 }}
>
New Tag
</Button>
</Box>
<Dialog open={openDialog} onClose={() => setOpenDialog(false)}>
<DialogTitle>Create New Tag</DialogTitle>
<DialogContent>
<TextField
label="Name"
value={newTagName}
onChange={(e) => setNewTagName(e.target.value)}
fullWidth
margin="normal"
/>
<TextField
label="Description"
value={newTagDescription}
onChange={(e) => setNewTagDescription(e.target.value)}
fullWidth
margin="normal"
/>
<TextField
label="Color"
type="color"
value={newTagColor}
onChange={(e) => setNewTagColor(e.target.value)}
fullWidth
margin="normal"
/>
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenDialog(false)}>Cancel</Button>
<Button
onClick={handleCreateTag}
disabled={creatingTag || !newTagName.trim()}
>
{creatingTag ? <CircularProgress size={24} /> : 'Create'}
</Button>
</DialogActions>
</Dialog>
</Box>
);
});
export default TagManager;

View File

@ -0,0 +1,134 @@
import React from 'react';
import { createTheme, ThemeProvider, CssBaseline } from '@mui/material';
import { grey, blue } from '@mui/material/colors';
// Enhanced theme with better visual hierarchy and modern styling
const theme = createTheme({
palette: {
mode: 'light',
primary: {
main: blue[700],
dark: blue[900],
light: blue[500],
contrastText: '#fff'
},
background: {
default: grey[100],
paper: '#fff'
}
},
typography: {
h1: {
fontSize: '2.5rem',
fontWeight: 600,
marginBottom: '1.5rem'
},
h2: {
fontSize: '2rem',
fontWeight: 500,
marginBottom: '1.25rem'
},
h3: {
fontSize: '1.75rem',
fontWeight: 500,
marginBottom: '1rem'
}
},
components: {
MuiButton: {
styleOverrides: {
root: {
textTransform: 'none',
borderRadius: 8,
padding: '8px 16px',
fontWeight: 500
},
contained: {
boxShadow: 'none',
'&:hover': {
boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
}
}
}
},
MuiCard: {
styleOverrides: {
root: {
borderRadius: 12,
boxShadow: '0 2px 8px rgba(0,0,0,0.08)',
'&:hover': {
boxShadow: '0 4px 12px rgba(0,0,0,0.12)'
}
}
}
},
MuiTextField: {
styleOverrides: {
root: {
'& .MuiOutlinedInput-root': {
borderRadius: 8,
backgroundColor: '#fff',
'&:hover fieldset': {
borderColor: blue[400]
}
}
}
}
},
MuiTable: {
styleOverrides: {
root: {
backgroundColor: '#fff',
borderRadius: 12,
overflow: 'hidden'
}
}
},
MuiTableHead: {
styleOverrides: {
root: {
backgroundColor: grey[50]
}
}
},
MuiTableCell: {
styleOverrides: {
head: {
fontWeight: 600,
color: grey[900]
}
}
}
}
});
// Layout component for consistent padding and max-width
const Layout = ({ children }) => (
<div className="p-6 max-w-7xl mx-auto">
{children}
</div>
);
// Enhanced page container with proper spacing and background
const PageContainer = ({ children, title }) => (
<div className="min-h-screen bg-gray-100">
<Layout>
{title && <h1 className="text-3xl font-semibold mb-6">{title}</h1>}
<div className="bg-white rounded-xl shadow-sm p-6">
{children}
</div>
</Layout>
</div>
);
export function EnhancedThemeProvider({ children }) {
return (
<ThemeProvider theme={theme}>
<CssBaseline />
{children}
</ThemeProvider>
);
}
export { Layout, PageContainer };
export default EnhancedThemeProvider;

View File

@ -27,7 +27,11 @@ const createApiClient = () => {
client.delete(`/api/v1/items/${id}`, { headers: authHeader(token) }), client.delete(`/api/v1/items/${id}`, { headers: authHeader(token) }),
uploadImage: (token, id, formData) => uploadImage: (token, id, formData) =>
client.post(`/api/v1/items/${id}/upload`, formData, { client.post(`/api/v1/items/${id}/upload`, formData, {
headers: { ...authHeader(token), 'Content-Type': 'multipart/form-data' } headers: { ...authHeader(token), 'Content-Type': 'multipart/form-data' },
addTags: (token, id, tagIds) =>
client.post(`/api/v1/items/${id}/tags`, tagIds, { headers: authHeader(token) }),
removeTag: (token, id, tagId) =>
client.delete(`/api/v1/items/${id}/tags/${tagId}`, { headers: authHeader(token) }),
}), }),
getImage: (token, id) => getImage: (token, id) =>
client.get(`/api/v1/items/${id}/image`, { client.get(`/api/v1/items/${id}/image`, {
@ -48,6 +52,20 @@ const createApiClient = () => {
client.delete(`/api/v1/boxes/${id}`, { headers: authHeader(token) }), client.delete(`/api/v1/boxes/${id}`, { headers: authHeader(token) }),
}, },
tags: {
getAll: (token) =>
client.get('/api/v1/tags', { headers: authHeader(token) }),
create: (token, tagData) =>
client.post('/api/v1/tags', tagData, { headers: authHeader(token) }),
update: (token, id, tagData) =>
client.put(`/api/v1/tags/${id}`, tagData, { headers: authHeader(token) }),
delete: (token, id) =>
client.delete(`/api/v1/tags/${id}`, { headers: authHeader(token) }),
getItems: (token, id) =>
client.get(`/api/v1/tags/${id}/items`, { headers: authHeader(token) }),
},
// Admin // Admin
admin: { admin: {
getUsers: (token) => getUsers: (token) =>