Merge pull request #76 from fs-jun24-team-3/fix/button

add button fix
fs-jun24-team-3 · Sep 25, 2024 · 6ce1604 · 6ce1604
2 parents c3888ee + 3af60eb
commit 6ce1604
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/CartPage/CartPage.tsx b/src/pages/CartPage/CartPage.tsx
@@ -13,15 +13,15 @@ import {
   selectTotalCost,
   selectTotalQuentity,
 } from '../../app/slices/cartSlise';
-import { addToOrder } from '../../app/slices/orderSlice';
+// import { addToOrder } from '../../app/slices/orderSlice';
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 type Props = {};
 
 export const CartPage: React.FC<Props> = () => {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
   const cartItems = useAppSelector((state: RootState) => state.cart.cartItems);
-  // const isCartEmpty = cartItems.length < 1;
+  const isCartEmpty = cartItems.length < 1;
   const totalCost = useAppSelector((state: RootState) =>
     selectTotalCost(state.cart),
   );
@@ -32,12 +32,10 @@ export const CartPage: React.FC<Props> = () => {
 
   const saveOrder = () => {
     if (cartItems.length !== 0) {
-      dispatch(addToOrder(cartItems));
       dispatch(clearCart());
       navigate('/user');
     }
   };
-
   return (
     <div className="cart">
       <BackButton />
@@ -62,6 +60,8 @@ export const CartPage: React.FC<Props> = () => {
             styleList={{
               height: 48,
             }}
+            useSucceessAnimation={true}
+            isError={isCartEmpty}
             onClick={saveOrder}
           />
         </div>

diff --git a/src/pages/UserPage/UserPage.tsx b/src/pages/UserPage/UserPage.tsx
@@ -35,7 +35,7 @@ export const UserPage: React.FC = () => {
   const onSubmit = (data: FormData) => {
     console.log(data);
     localStorage.setItem('userData', JSON.stringify(data));
-    alert('Data saved successfully!');
+    // alert('Data saved successfully!');
     reset();
   };