+
@@ -128,7 +138,10 @@ const LinkMenuItem: React.FC{title}
+ {subtitle && ( +
+
+
+ )}
+ {subtitle}
+
+
{title}
+{subtitle}
+لطفا حساب کاربری خود را تکمیل نمایید
-
-
-
- ) : (
- <>
- )}
-
-
- {profileCompletionPercentage}%
- -
diff --git a/src/hooks/useMenu.tsx b/src/hooks/useMenu.tsx
index 28df130..587458f 100644
--- a/src/hooks/useMenu.tsx
+++ b/src/hooks/useMenu.tsx
@@ -4,20 +4,35 @@ import {
ExternalLinkMenuItemProps,
LinkMenuItemProps,
} from '@/components/DrawerMenu/SidebarItems';
-import {
- Building2Icon,
- ContactIcon,
- LayoutDashboardIcon,
-} from 'lucide-react';
+import { Building2Icon, ContactIcon, LayoutDashboardIcon } from 'lucide-react';
import ROUTES_OBJECT from '@/routes/RoutesObject';
+import { useGetUserInfo } from '@/services/User';
export const useMenu = (): Record<
string,
(LinkMenuItemProps | ExternalLinkMenuItemProps | ClickableMenuItemProps)[]
> => {
+ const { data: userInfo } = useGetUserInfo();
+ const showProfileCompletion = useMemo(() => {
+ if (
+ !userInfo?.current_user.date_of_birth ||
+ !userInfo?.current_user.gender ||
+ !userInfo?.current_user.province ||
+ !userInfo?.current_user.city
+ )
+ return true;
+ return false;
+ }, [userInfo]);
const menuItems = useMemo(
() => ({
first: [
- { title: 'پروفایل', url: ROUTES_OBJECT.profile, icon: ContactIcon },
+ {
+ title: 'پروفایل',
+ subtitle: showProfileCompletion
+ ? 'لطفا اطلاعات خود را تکمیل نمایید'
+ : undefined,
+ url: ROUTES_OBJECT.profile,
+ icon: ContactIcon,
+ },
{
title: 'صفحه اصلی',
url: ROUTES_OBJECT.explore,
@@ -32,7 +47,7 @@ export const useMenu = (): Record<
},
],
}),
- [],
+ [showProfileCompletion],
);
return menuItems;
};
diff --git a/src/pages/explore/index.tsx b/src/pages/explore/index.tsx
index 909e5ad..694862d 100644
--- a/src/pages/explore/index.tsx
+++ b/src/pages/explore/index.tsx
@@ -6,6 +6,8 @@ import { Grid, Pagination, Navigation } from 'swiper/modules';
import { useIsMobile } from '@/hooks/useIsMobile';
import ExploreCard from './+components/ExploreCard';
import ROUTES_OBJECT from '@/routes/RoutesObject';
+import TopSlider from './+components/TopSlider';
+import { useGetAllSurveyForms } from '@/services/SurveyForm';
import deliveryListVector from '@/assets/images/delivery-list.svg';
import mobileVector from '@/assets/images/mobile.svg';
import formVector from '@/assets/images/form.svg';
@@ -14,9 +16,7 @@ import discountVector from '@/assets/images/discount.svg';
import puzzleVector from '@/assets/images/puzzle.svg';
import walletVector from '@/assets/images/wallet.svg';
import customerSupportVector from '@/assets/images/customer-support.svg';
-import globalLocationVector from '@/assets/images/global-location.svg';
-import TopSlider from './+components/TopSlider';
-import { useGetAllSurveyForms } from '@/services/SurveyForm';
+import shopVector from '@/assets/images/shop.svg';
const sliderProps: SwiperOptions = {
slidesPerView: 1,
@@ -33,13 +33,6 @@ const Explore = () => {
const itemsPerSlide = isMobile ? 9 : 12;
const exploreCardsData = useMemo(
() => [
- {
- label: 'نوبت های من',
- icon:
-
-
+
+
{groupedCards.map((slideGroup, index) => (
-
+
{slideGroup.map((card, cardIndex) => (
) : (
-
+
{data.predicted_number_of_visits - data.number_of_visits}{' '}
حضور دیگر مانده تا
diff --git a/src/pages/loyalty-cards/+components/Enchant.tsx b/src/pages/loyalty-cards/+components/Enchant.tsx
index 8ebb6c1..53db4e3 100644
--- a/src/pages/loyalty-cards/+components/Enchant.tsx
+++ b/src/pages/loyalty-cards/+components/Enchant.tsx
@@ -22,7 +22,7 @@ const Enchant = (data: ILoyaltyCard) => {
) : (
-
+
{data.predicted_number_of_visits - data.number_of_visits}{' '}
حضور دیگر مانده تا
diff --git a/src/pages/loyalty-cards/+components/LoyaltyCardListItem.tsx b/src/pages/loyalty-cards/+components/LoyaltyCardListItem.tsx
index 11abedb..eac2143 100644
--- a/src/pages/loyalty-cards/+components/LoyaltyCardListItem.tsx
+++ b/src/pages/loyalty-cards/+components/LoyaltyCardListItem.tsx
@@ -20,7 +20,7 @@ const LoyaltyCardListItem = ({ data }: Props) => {
return (
کارت وفاداری
diff --git a/src/pages/loyalty-cards/+components/Radiance.tsx b/src/pages/loyalty-cards/+components/Radiance.tsx
index 82315a6..e619230 100644
--- a/src/pages/loyalty-cards/+components/Radiance.tsx
+++ b/src/pages/loyalty-cards/+components/Radiance.tsx
@@ -22,7 +22,7 @@ const Radiance = (data: ILoyaltyCard) => {
) : (
-
+
{data.predicted_number_of_visits - data.number_of_visits}{' '}
حضور دیگر مانده تا
diff --git a/src/pages/loyalty-cards/+components/Whisper.tsx b/src/pages/loyalty-cards/+components/Whisper.tsx
index b44a8cc..5f98a84 100644
--- a/src/pages/loyalty-cards/+components/Whisper.tsx
+++ b/src/pages/loyalty-cards/+components/Whisper.tsx
@@ -24,7 +24,7 @@ const Whisper = (data: ILoyaltyCard) => {
) : (
-
+
{data.predicted_number_of_visits - data.number_of_visits}{' '}
حضور دیگر مانده تا
diff --git a/src/pages/survey-form/response.tsx b/src/pages/survey-form/response.tsx
index 3d5c6b7..03f15ff 100644
--- a/src/pages/survey-form/response.tsx
+++ b/src/pages/survey-form/response.tsx
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
import { ErrorComponentFallback } from '@/components/ErrorComponentFallback';
import { Skeleton } from '@/components/ui/skeleton';
import {
@@ -25,6 +25,7 @@ import toast from 'react-hot-toast';
import { Alert } from '@/components/ui/alert-dialog';
import { useMultiAccounts } from '@/hooks/useMultipleAccounts';
import ROUTES_OBJECT from '@/routes/RoutesObject';
+import BackBtn from '@/components/BackBtn';
const initialAnswers: ISurveyAnswers = {
question_1: null,
@@ -41,6 +42,7 @@ const initialAnswers: ISurveyAnswers = {
};
const ResponseToSurveyForm = () => {
const { id = '' } = useParams();
+ const navigate = useNavigate();
const { currectAccount } = useMultiAccounts();
const [questionPointer, setQuestionPointer] = useState(0);
const [fakeAnimation, setFakeAnimation] = useState(false);
@@ -132,6 +134,11 @@ const ResponseToSurveyForm = () => {
return (
+ navigate(ROUTES_OBJECT.loyaltyCards)} />
+
+ )}
{isError ? (
-
+
{questionPointer < 10 ? (
<>
diff --git a/tailwind.config.js b/tailwind.config.js
index 62ebeaf..a7ac404 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -12,10 +12,10 @@ export default {
'h-xl': { 'raw': '(min-height: 1280px) and (max-width: 768px)' },
},
fontFamily: {
- iranYekan: ['IRANYekan', 'tahoma', 'sans-serif'],
- boblious: ['Boblious', 'IRANYekan', 'tahoma', 'sans-serif'],
- hayat: ['Hayat', 'IRANYekan', 'tahoma', 'sans-serif'],
- digiMadasi: ['DigiMadasi', 'IRANYekan', 'tahoma', 'sans-serif'],
+ vazirmatn: ['Vazirmatn', 'tahoma', 'sans-serif'],
+ boblious: ['Boblious', 'Vazirmatn', 'tahoma', 'sans-serif'],
+ hayat: ['Hayat', 'Vazirmatn', 'tahoma', 'sans-serif'],
+ digiMadasi: ['DigiMadasi', 'Vazirmatn', 'tahoma', 'sans-serif'],
},
borderRadius: {
lg: 'var(--radius)',