{selectedExpertise.sub_expertise.map((item) => (
@@ -81,10 +80,8 @@ export default function ExpertisePicker({
key={item._id}
type="button"
className={cn(
- "p-2 min-h-10 rounded-3xl border-2 text-xs leading-tight transition-colors",
- subExpertise.includes(item.name)
- ? "bg-pink-500 text-white border-pink-500"
- : "bg-white text-black border-gray-400 dark:bg-white dark:text-black"
+ toggleBtnClass(subExpertise.includes(item.name)),
+ "min-h-10 p-2 text-xs leading-tight"
)}
onClick={() => onSubExpertiseToggle(item.name)}
>
diff --git a/src/components/auth/RegisterRouteGuard.tsx b/src/components/auth/RegisterRouteGuard.tsx
new file mode 100644
index 0000000..977e2a7
--- /dev/null
+++ b/src/components/auth/RegisterRouteGuard.tsx
@@ -0,0 +1,120 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { usePathname, useRouter } from "next/navigation";
+import {
+ buildLoginRedirect,
+ isRegistrationPath,
+ REGISTRATION_ENTRY_PATH,
+ REGISTRATION_OTP_PATH,
+ requiresRegistrationToken,
+ resolveRegistrationRedirect,
+ getRegistrationRoute,
+} from "@/lib/auth/registrationRoutes";
+import { fetchRegisterStatus } from "@/lib/auth/fetchRegisterStatus";
+import { getAuthToken } from "@/lib/auth/session";
+
+export default function RegisterRouteGuard({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const pathname = usePathname();
+ const router = useRouter();
+ const [ready, setReady] = useState(false);
+
+ useEffect(() => {
+ let cancelled = false;
+
+ async function guard() {
+ if (!pathname || !isRegistrationPath(pathname)) {
+ if (!cancelled) setReady(true);
+ return;
+ }
+
+ const normalized = pathname.split("?")[0];
+
+ if (normalized === REGISTRATION_ENTRY_PATH) {
+ const token = getAuthToken();
+ if (token) {
+ const status = await fetchRegisterStatus();
+ if (cancelled) return;
+
+ if (status?.page === "home" || status?.registrationComplete) {
+ router.replace("/");
+ return;
+ }
+
+ if (status?.step) {
+ router.replace(getRegistrationRoute(status.step));
+ return;
+ }
+ }
+
+ if (!cancelled) setReady(true);
+ return;
+ }
+
+ if (normalized === REGISTRATION_OTP_PATH) {
+ const mobile =
+ typeof window !== "undefined"
+ ? localStorage.getItem("mobile")
+ : null;
+
+ if (!mobile) {
+ router.replace(REGISTRATION_ENTRY_PATH);
+ return;
+ }
+
+ if (!cancelled) setReady(true);
+ return;
+ }
+
+ if (requiresRegistrationToken(normalized)) {
+ const token = getAuthToken();
+ if (!token) {
+ router.replace(buildLoginRedirect(normalized));
+ return;
+ }
+
+ const status = await fetchRegisterStatus();
+ if (cancelled) return;
+
+ if (!status) {
+ router.replace(buildLoginRedirect(normalized));
+ return;
+ }
+
+ if (status.page === "home" || status.registrationComplete) {
+ router.replace("/");
+ return;
+ }
+
+ const redirect = resolveRegistrationRedirect(normalized, status.step);
+ if (redirect) {
+ router.replace(redirect);
+ return;
+ }
+ }
+
+ if (!cancelled) setReady(true);
+ }
+
+ setReady(false);
+ void guard();
+
+ return () => {
+ cancelled = true;
+ };
+ }, [pathname, router]);
+
+ if (!ready && pathname && isRegistrationPath(pathname)) {
+ return (
+
+ در حال بررسی وضعیت ثبتنام…
+
+ );
+ }
+
+ return children;
+}
diff --git a/src/components/auth/UsernameSuggestions.tsx b/src/components/auth/UsernameSuggestions.tsx
index 70be598..b8671df 100644
--- a/src/components/auth/UsernameSuggestions.tsx
+++ b/src/components/auth/UsernameSuggestions.tsx
@@ -1,7 +1,7 @@
"use client";
import React from "react";
-
+import { filterChipClass } from "@/lib/ui/buttonStyles";
interface UsernameSuggestionsProps {
suggestions: string[];
onSelect: (username: string) => void;
@@ -20,7 +20,7 @@ export default function UsernameSuggestions({
key={username}
type="button"
onClick={() => onSelect(username)}
- className="px-3 py-1.5 text-sm font-medium rounded-full border border-[#387E65] text-[#387E65] bg-white hover:bg-[#387E65]/10 transition-colors dir-ltr"
+ className={filterChipClass(false, "dir-ltr px-3 py-1.5 text-sm")}
>
{username}
diff --git a/src/components/billboards/BillboardPage/FilterModal.tsx b/src/components/billboards/BillboardPage/FilterModal.tsx
index 48e8d52..c92710e 100644
--- a/src/components/billboards/BillboardPage/FilterModal.tsx
+++ b/src/components/billboards/BillboardPage/FilterModal.tsx
@@ -4,6 +4,8 @@ import useAxios from "@/hooks/useAxios";
import Modal from "@/components/elements/Modal";
import SelectBox from "@/components/elements/SelectBox";
import RoundedButton from "@/components/elements/RoundedButton";
+import { btnHeightMd, btnHeightSm, toggleBtnClass } from "@/lib/ui/buttonStyles";
+import { cn } from "@/lib/utils";
interface IFilterProps {
setShowFilterModal: (e: boolean) => void;
@@ -77,6 +79,8 @@ function FilterModal({
}
}, [stateId]);
+ const discountActive = sort === "mostDiscount";
+
return (
- مرتب سازی
+ مرتب سازی
{
- if (sort !== "mostDiscount") {
- setSort("mostDiscount");
- } else {
+ if (discountActive) {
setSort("");
+ } else {
+ setSort("mostDiscount");
}
}}
- className={`h-9 w-40 mt-4 ${
- sort && sort == "mostDiscount" ? "bg-[#23bace]" : ""
- }`}
+ className={cn(toggleBtnClass(discountActive), btnHeightSm, "mt-4 w-40")}
>
بیشترین تخفیف
-
-
+
);
diff --git a/src/components/billboards/MainBillboardCard/BillboardLocationModal.tsx b/src/components/billboards/MainBillboardCard/BillboardLocationModal.tsx
index 283c33e..e7f80c6 100644
--- a/src/components/billboards/MainBillboardCard/BillboardLocationModal.tsx
+++ b/src/components/billboards/MainBillboardCard/BillboardLocationModal.tsx
@@ -1,4 +1,5 @@
-"use client";
+import { btnPrimary, btnDefault } from "@/lib/ui/buttonStyles";
+import { cn } from "@/lib/utils";
import React, { useMemo, useRef } from "react";
import dynamic from "next/dynamic";
@@ -42,12 +43,13 @@ function BillboardLocationModal({
if (!mapboxToken) {
return (
-
-
+
+
خطا
توکن Mapbox تنظیم نشده است.