menu: make back btn navigate to service page if token existed

This commit is contained in:
2026-01-14 15:28:39 +03:00
parent a337ee11e2
commit 41605781f4
2 changed files with 13 additions and 4 deletions

View File

@@ -1,15 +1,21 @@
import { Button } from "antd"; import { Button } from "antd";
import BackIcon from "components/Icons/BackIcon"; import BackIcon from "components/Icons/BackIcon";
import NextIcon from "components/Icons/NextIcon"; import NextIcon from "components/Icons/NextIcon";
import { useNavigate } from "react-router-dom";
import { useAppSelector } from "redux/hooks"; import { useAppSelector } from "redux/hooks";
interface BackButtonProps { interface BackButtonProps {
navigateBack?: boolean; // true = use router.back(), false = just clear state customRoute?: string;
} }
export default function BackButton({ navigateBack = true }: BackButtonProps) { export default function BackButton({ customRoute }: BackButtonProps) {
const router = useNavigate();
const handleBack = () => { const handleBack = () => {
if (navigateBack) window.history.back(); if (customRoute) {
router(customRoute);
} else {
router(-1);
}
}; };
const { isRTL } = useAppSelector((state) => state.locale); const { isRTL } = useAppSelector((state) => state.locale);

View File

@@ -38,6 +38,7 @@ function MenuPage() {
const { subdomain } = useParams(); const { subdomain } = useParams();
const { isRTL } = useAppSelector((state) => state.locale); const { isRTL } = useAppSelector((state) => state.locale);
const { orderType } = useAppSelector((state) => state.order); const { orderType } = useAppSelector((state) => state.order);
const { token } = useAppSelector((state) => state.auth);
const { t } = useTranslation(); const { t } = useTranslation();
const { data: restaurant, isLoading: isLoadingRestaurant } = const { data: restaurant, isLoading: isLoadingRestaurant } =
useGetRestaurantDetailsQuery(subdomain, { useGetRestaurantDetailsQuery(subdomain, {
@@ -91,7 +92,9 @@ function MenuPage() {
<div <div
className={`${styles.headerFloatingBtn} ${styles.backButtonContainer}`} className={`${styles.headerFloatingBtn} ${styles.backButtonContainer}`}
> >
<BackButton /> <BackButton
{...(token ? { customRoute: `/${subdomain}` } : {})}
/>
</div> </div>
<div <div
className={`${styles.headerFloatingBtn} ${styles.orderTypeSelectContainer} order-type-select-container`} className={`${styles.headerFloatingBtn} ${styles.orderTypeSelectContainer} order-type-select-container`}