Compare commits

..

No commits in common. "56c3c16f6d6fc51aa287b7fb82086d9fe93d2d4a" and "2afa7dbebfeee9f3810865e031272e95964d3095" have entirely different histories.

3 changed files with 18 additions and 37 deletions

View File

@ -108,6 +108,18 @@ function Navigation({ onImportExportClick, onAboutClick }: { onImportExportClick
{/* Mobile Action Buttons */} {/* Mobile Action Buttons */}
<div className="border-t border-gray-200 pt-3 mt-3 space-y-1"> <div className="border-t border-gray-200 pt-3 mt-3 space-y-1">
<button
onClick={() => {
onImportExportClick();
setIsMobileMenuOpen(false);
}}
className="block w-full text-left px-3 py-2 text-base font-medium text-gray-600 hover:text-blue-600 hover:bg-gray-50"
>
<svg className="w-4 h-4 inline mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10" />
</svg>
Import / Export
</button>
<button <button
onClick={() => { onClick={() => {
onAboutClick(); onAboutClick();

View File

@ -8,7 +8,6 @@ interface AddProductModalProps {
onClose: () => void; onClose: () => void;
onProductAdded: () => void; onProductAdded: () => void;
editProduct?: Product | null; editProduct?: Product | null;
duplicateProduct?: Product | null;
} }
interface ProductFormData { interface ProductFormData {
@ -20,7 +19,7 @@ interface ProductFormData {
weight_unit: string; weight_unit: string;
} }
const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onProductAdded, editProduct, duplicateProduct }) => { const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onProductAdded, editProduct }) => {
const [formData, setFormData] = useState<ProductFormData>({ const [formData, setFormData] = useState<ProductFormData>({
name: '', name: '',
category_id: undefined, category_id: undefined,
@ -65,7 +64,7 @@ const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onPr
} }
}; };
// Populate form when editing or duplicating // Populate form when editing
useEffect(() => { useEffect(() => {
if (editProduct) { if (editProduct) {
setFormData({ setFormData({
@ -76,15 +75,6 @@ const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onPr
weight: editProduct.weight, weight: editProduct.weight,
weight_unit: editProduct.weight_unit weight_unit: editProduct.weight_unit
}); });
} else if (duplicateProduct) {
setFormData({
name: duplicateProduct.name,
category_id: duplicateProduct.category_id,
brand_id: duplicateProduct.brand_id,
organic: duplicateProduct.organic,
weight: duplicateProduct.weight,
weight_unit: duplicateProduct.weight_unit
});
} else { } else {
// Reset form for adding new product // Reset form for adding new product
setFormData({ setFormData({
@ -97,7 +87,7 @@ const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onPr
}); });
} }
setError(''); setError('');
}, [editProduct, duplicateProduct, isOpen]); }, [editProduct, isOpen]);
const handleSubmit = useCallback(async (e: React.FormEvent) => { const handleSubmit = useCallback(async (e: React.FormEvent) => {
e.preventDefault(); e.preventDefault();
@ -197,7 +187,7 @@ const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onPr
<div className="mt-3"> <div className="mt-3">
<div className="flex justify-between items-center mb-4"> <div className="flex justify-between items-center mb-4">
<h3 className="text-lg font-medium text-gray-900"> <h3 className="text-lg font-medium text-gray-900">
{editProduct ? 'Edit Product' : duplicateProduct ? 'Duplicate Product' : 'Add New Product'} {editProduct ? 'Edit Product' : 'Add New Product'}
</h3> </h3>
<button <button
onClick={onClose} onClick={onClose}
@ -334,8 +324,8 @@ const AddProductModal: React.FC<AddProductModalProps> = ({ isOpen, onClose, onPr
className="px-4 py-2 text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 rounded-md disabled:opacity-50 disabled:cursor-not-allowed" className="px-4 py-2 text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 rounded-md disabled:opacity-50 disabled:cursor-not-allowed"
> >
{loading {loading
? (editProduct ? 'Updating...' : duplicateProduct ? 'Duplicating...' : 'Adding...') ? (editProduct ? 'Updating...' : 'Adding...')
: (editProduct ? 'Update Product' : duplicateProduct ? 'Duplicate Product' : 'Add Product') : (editProduct ? 'Update Product' : 'Add Product')
} }
</button> </button>
</div> </div>

View File

@ -14,7 +14,6 @@ const ProductList: React.FC = () => {
const [editingProduct, setEditingProduct] = useState<Product | null>(null); const [editingProduct, setEditingProduct] = useState<Product | null>(null);
const [deletingProduct, setDeletingProduct] = useState<Product | null>(null); const [deletingProduct, setDeletingProduct] = useState<Product | null>(null);
const [deleteLoading, setDeleteLoading] = useState(false); const [deleteLoading, setDeleteLoading] = useState(false);
const [duplicatingProduct, setDuplicatingProduct] = useState<Product | null>(null);
const [sortField, setSortField] = useState<string>('name'); const [sortField, setSortField] = useState<string>('name');
const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc'); const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc');
@ -47,11 +46,6 @@ const ProductList: React.FC = () => {
setIsModalOpen(true); setIsModalOpen(true);
}; };
const handleDuplicate = (product: Product) => {
setDuplicatingProduct(product);
setIsModalOpen(true);
};
const handleDelete = (product: Product) => { const handleDelete = (product: Product) => {
setDeletingProduct(product); setDeletingProduct(product);
}; };
@ -79,7 +73,6 @@ const ProductList: React.FC = () => {
const handleCloseModal = () => { const handleCloseModal = () => {
setIsModalOpen(false); setIsModalOpen(false);
setEditingProduct(null); setEditingProduct(null);
setDuplicatingProduct(null);
}; };
const handleCloseDeleteModal = () => { const handleCloseDeleteModal = () => {
@ -183,7 +176,6 @@ const ProductList: React.FC = () => {
<button <button
onClick={() => { onClick={() => {
setEditingProduct(null); setEditingProduct(null);
setDuplicatingProduct(null);
setIsModalOpen(true); setIsModalOpen(true);
}} }}
className="w-full sm:w-auto bg-blue-500 hover:bg-blue-700 text-white font-bold py-3 sm:py-2 px-4 rounded text-base sm:text-sm" className="w-full sm:w-auto bg-blue-500 hover:bg-blue-700 text-white font-bold py-3 sm:py-2 px-4 rounded text-base sm:text-sm"
@ -279,12 +271,6 @@ const ProductList: React.FC = () => {
> >
Edit Edit
</button> </button>
<button
onClick={() => handleDuplicate(product)}
className="text-green-600 hover:text-green-900 mr-3"
>
Duplicate
</button>
<button <button
onClick={() => handleDelete(product)} onClick={() => handleDelete(product)}
className="text-red-600 hover:text-red-900" className="text-red-600 hover:text-red-900"
@ -331,12 +317,6 @@ const ProductList: React.FC = () => {
> >
Edit Edit
</button> </button>
<button
onClick={() => handleDuplicate(product)}
className="flex-1 text-center py-2 px-4 border border-green-300 text-green-600 hover:bg-green-50 rounded-md text-sm font-medium"
>
Duplicate
</button>
<button <button
onClick={() => handleDelete(product)} onClick={() => handleDelete(product)}
className="flex-1 text-center py-2 px-4 border border-red-300 text-red-600 hover:bg-red-50 rounded-md text-sm font-medium" className="flex-1 text-center py-2 px-4 border border-red-300 text-red-600 hover:bg-red-50 rounded-md text-sm font-medium"
@ -356,7 +336,6 @@ const ProductList: React.FC = () => {
onClose={handleCloseModal} onClose={handleCloseModal}
onProductAdded={handleProductAdded} onProductAdded={handleProductAdded}
editProduct={editingProduct} editProduct={editingProduct}
duplicateProduct={duplicatingProduct}
/> />
<ConfirmDeleteModal <ConfirmDeleteModal