diff --git a/src/components/CustomBottomSheet/RateBottomSheet.tsx b/src/components/CustomBottomSheet/RateBottomSheet.tsx index daa0cdb..7561459 100644 --- a/src/components/CustomBottomSheet/RateBottomSheet.tsx +++ b/src/components/CustomBottomSheet/RateBottomSheet.tsx @@ -18,7 +18,7 @@ export function RateBottomSheet({ }: { isOpen: boolean; onClose: () => void; - orderIdProp: string; + orderIdProp?: string | undefined; }) { const { t } = useTranslation(); const [rating, setRating] = useState(0); @@ -34,7 +34,7 @@ export function RateBottomSheet({ onClose(); if (getUserDetails?.id) { rateOrder({ - orderID: orderId || orderIdProp, + orderID: orderId || orderIdProp || "", rating: rating, comment: "This is a test comment", userID: getUserDetails?.id.toString() || "", diff --git a/src/components/Icons/DeliveryIcon.tsx b/src/components/Icons/DeliveryIcon.tsx index 956fb07..ae1e791 100644 --- a/src/components/Icons/DeliveryIcon.tsx +++ b/src/components/Icons/DeliveryIcon.tsx @@ -6,16 +6,18 @@ interface DeliveryIconType { const DeliveryIcon = ({ className, onClick }: DeliveryIconType) => { return ( - - - - + ); }; diff --git a/src/components/Icons/ScheduleOrderIcon copy.tsx b/src/components/Icons/ScheduleOrderIcon copy.tsx new file mode 100644 index 0000000..72e1586 --- /dev/null +++ b/src/components/Icons/ScheduleOrderIcon copy.tsx @@ -0,0 +1,83 @@ +interface ScheduleOrderIconType { + className?: string; + onClick?: () => void; +} + +const ScheduleOrderIcon = ({ className, onClick }: ScheduleOrderIconType) => { + return ( + + + + + + + + + + + + + + + + + + + + ); +}; + +export default ScheduleOrderIcon; diff --git a/src/components/Icons/ScheduleOrderIcon.tsx b/src/components/Icons/ScheduleOrderIcon.tsx new file mode 100644 index 0000000..72e1586 --- /dev/null +++ b/src/components/Icons/ScheduleOrderIcon.tsx @@ -0,0 +1,83 @@ +interface ScheduleOrderIconType { + className?: string; + onClick?: () => void; +} + +const ScheduleOrderIcon = ({ className, onClick }: ScheduleOrderIconType) => { + return ( + + + + + + + + + + + + + + + + + + + + ); +}; + +export default ScheduleOrderIcon; diff --git a/src/pages/orders/OrderDetails.module.css b/src/pages/orders/OrderDetails.module.css index 220d392..3220e6a 100644 --- a/src/pages/orders/OrderDetails.module.css +++ b/src/pages/orders/OrderDetails.module.css @@ -298,3 +298,9 @@ margin-bottom: 16px; box-shadow: none; } + +.profileImage { + border-radius: 50%; + width: 50px; + height: 50px; +} diff --git a/src/pages/orders/OrdersList.tsx b/src/pages/orders/OrdersList.tsx index 227428d..4e6284b 100644 --- a/src/pages/orders/OrdersList.tsx +++ b/src/pages/orders/OrdersList.tsx @@ -1,4 +1,4 @@ -import { Button, Card, Divider } from "antd"; +import { Button, Card, Divider, Image } from "antd"; import EmptyOrdersIcon from "components/Icons/EmptyOrdersIcon"; import RateIcon from "components/Icons/RateIcon"; import ReOrderIcon from "components/Icons/ReOrderIcon"; @@ -85,6 +85,8 @@ export default function OrdersList() { }; }; + console.log(orders); + return ( <> {orders.length === 0 ? ( @@ -124,15 +126,13 @@ export default function OrdersList() { gap: "1rem", }} > - +
diff --git a/src/pages/orders/orders.module.css b/src/pages/orders/orders.module.css index c737c0f..3b30557 100644 --- a/src/pages/orders/orders.module.css +++ b/src/pages/orders/orders.module.css @@ -81,3 +81,9 @@ margin-bottom: 16px; box-shadow: none; } + +.profileImage { + border-radius: 50%; + width: 50px; + height: 50px; +} diff --git a/src/pages/restaurant/RestaurantServices.tsx b/src/pages/restaurant/RestaurantServices.tsx index d806bfc..333a73b 100644 --- a/src/pages/restaurant/RestaurantServices.tsx +++ b/src/pages/restaurant/RestaurantServices.tsx @@ -16,6 +16,7 @@ import { Link, useParams } from "react-router-dom"; import { useGetRestaurantDetailsQuery } from "redux/api/others"; import { useAppDispatch, useAppSelector } from "redux/hooks"; import styles from "./restaurant.module.css"; +import ScheduleOrderIcon from "components/Icons/ScheduleOrderIcon"; export default function RestaurantServices() { const { t } = useTranslation(); @@ -149,7 +150,7 @@ export default function RestaurantServices() { title: t("common.scheduledOrder"), description: t("home.services.scheduledOrder"), icon: ( - ), @@ -220,9 +221,11 @@ export default function RestaurantServices() { {s?.title} diff --git a/src/pages/restaurant/page.tsx b/src/pages/restaurant/page.tsx index b5bffc3..cff7a1d 100644 --- a/src/pages/restaurant/page.tsx +++ b/src/pages/restaurant/page.tsx @@ -39,10 +39,9 @@ export default function RestaurantPage() { const dispatch = useAppDispatch(); const { t } = useTranslation(); const param = useParams(); - const { isMobile } = useBreakPoint(); const [searchParams] = useSearchParams(); const { pathname } = useLocation(); - const { orderType, items: cartItems } = useAppSelector( + const { orderType } = useAppSelector( (state) => state.order, ); const { isRTL } = useAppSelector((state) => state.locale); @@ -54,10 +53,10 @@ export default function RestaurantPage() { ); const [isOrderDetailsOpen, setIsOrderDetailsOpen] = useState(false); - const { containerRef, handleTouchEnd, handleTouchStart } = useSwipeUp({ - swipeAction: () => setIsOrderDetailsOpen(true), - isEnabled: isMobile && cartItems.length > 0, - }); + // const { containerRef, handleTouchEnd, handleTouchStart } = useSwipeUp({ + // swipeAction: () => setIsOrderDetailsOpen(true), + // isEnabled: isMobile && cartItems.length > 0, + // }); // Automatically load restaurant taxes when restaurant data is available useRestaurant(restaurant); @@ -107,7 +106,7 @@ export default function RestaurantPage() {
-
- + */}
diff --git a/src/pages/restaurant/restaurant.module.css b/src/pages/restaurant/restaurant.module.css index b080df6..c608175 100644 --- a/src/pages/restaurant/restaurant.module.css +++ b/src/pages/restaurant/restaurant.module.css @@ -50,7 +50,10 @@ row-gap: 10px; transition: all 0.3s ease; border-radius: 50px; - background-color: rgba(255, 183, 0, 0.12); + border: 1px solid #f5f5f6; + /* background-color: rgba(255, 183, 0, 0.12); */ + + box-shadow: 0px 70px 20px 0px #c9c9c900; } .logo { @@ -103,12 +106,12 @@ gap: 20px; width: 100%; z-index: 10; - margin-top: 8px; + margin-top: 19px; } .socialIcon { - width: 24px; - height: 24px; + width: 32px; + height: 32px; transition: all 0.3s ease; }