{t("academy.profile.trainingPackages")}
diff --git a/src/app/(projects)/new-project/page.tsx b/src/app/(projects)/new-project/page.tsx
index fccbce4..94f3b57 100644
--- a/src/app/(projects)/new-project/page.tsx
+++ b/src/app/(projects)/new-project/page.tsx
@@ -3,13 +3,15 @@
import Container from "@/components/elements/Container";
import MultiStepForm from "@/components/projects/NewProject/MultiStepForm";
import { ProjectFormProvider } from "@/contexts/ProjectFormContext";
-import React from "react";
+import React, { Suspense } from "react";
function NewProject() {
return (
-
+
+
+
);
diff --git a/src/app/(projects)/projects/[id]/[title]/ProjectDetailClient.tsx b/src/app/(projects)/projects/[id]/[title]/ProjectDetailClient.tsx
index 3f278fb..869e4ab 100644
--- a/src/app/(projects)/projects/[id]/[title]/ProjectDetailClient.tsx
+++ b/src/app/(projects)/projects/[id]/[title]/ProjectDetailClient.tsx
@@ -6,8 +6,8 @@ import ProjectRequestForm from "@/components/projects/ProjectPage/ProjectRequest
import ProjectRequests from "@/components/projects/ProjectPage/ProjectRequests";
import PageLoader from "@/components/ui/PageLoader";
import useAxios from "@/hooks/useAxios";
-import { Project, IProjectRequest } from "@/types/types";
-import { useEffect, useState } from "react";
+import { Project, IProjectRequest, ProjectRole } from "@/types/types";
+import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
export default function ProjectDetailClient({ id }: { id: string }) {
@@ -17,6 +17,7 @@ export default function ProjectDetailClient({ id }: { id: string }) {
const [projectRequests, setProjectRequests] = useState
([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState(false);
+ const [selectedRoleId, setSelectedRoleId] = useState(null);
useEffect(() => {
let cancelled = false;
@@ -28,15 +29,14 @@ export default function ProjectDetailClient({ id }: { id: string }) {
const response = await request<{
project: Project;
projectRequests?: IProjectRequest[];
- }>(
- "GET",
- `/projects/get/web/${id}`,
- null,
- { noToast: true }
- );
+ }>("GET", `/projects/get/web/${id}`, null, { noToast: true });
if (!cancelled) {
- setProject(response?.project ?? null);
+ const loaded = response?.project ?? null;
+ setProject(loaded);
setProjectRequests(response?.projectRequests ?? []);
+ if (loaded?.roles?.length) {
+ setSelectedRoleId(loaded.roles[0]._id);
+ }
}
} catch {
if (!cancelled) setError(true);
@@ -51,6 +51,15 @@ export default function ProjectDetailClient({ id }: { id: string }) {
};
}, [id, request]);
+ const selectedRole: ProjectRole | null = useMemo(() => {
+ if (!project?.roles?.length) return null;
+ return (
+ project.roles.find((r) => r._id === selectedRoleId) ||
+ project.roles[0] ||
+ null
+ );
+ }, [project, selectedRoleId]);
+
if (loading) return ;
if (error || !project) {
@@ -65,22 +74,61 @@ export default function ProjectDetailClient({ id }: { id: string }) {
return (
-
- {projectRequests.length > 0 ? (
-
-
- {t("projects.requestUsersTitle")}
+
+
+ {selectedRole ? (
+
+
{selectedRole.expertise}
+ {selectedRole.sub_expertise?.length ? (
+
+ {selectedRole.sub_expertise.join(" _ ")}
-
-
- ) : null}
-
+ ) : null}
+ {(selectedRole.height_min != null ||
+ selectedRole.height_max != null) && (
+
+ {t("filters.heightCm")}: {selectedRole.height_min ?? "—"} -{" "}
+ {selectedRole.height_max ?? "—"}
+
+ )}
+ {(selectedRole.weight_min != null ||
+ selectedRole.weight_max != null) && (
+
+ {t("filters.weightKg")}: {selectedRole.weight_min ?? "—"} -{" "}
+ {selectedRole.weight_max ?? "—"}
+
+ )}
+
+ {t("projects.newProject.fields.headcount")}:{" "}
+ {selectedRole.number_of_person || 1}
+
+
+
+ {t("projects.requestUsersTitle")}
+
+
+
+ {t("projects.payment.title")}
+
+
+ {project &&
}
+
+
+ {getDisplayTypeLabel(project?.project_type)}:{" "}
+ {Number(price || 0).toLocaleString()} {t("settings.toman")}
+
+
+ {t("projects.payment.payableAmount", {
+ amount: Number(price || 0).toLocaleString(),
+ })}
+
+ void payHandler()}
+ disabled={paying || loading || !project}
+ className="h-9 w-32"
+ >
+ {paying
+ ? t("common.loading")
+ : t("projects.payment.title")}
+
+
+
+ {t("projects.payment.failed")}
+
+
+
+ {t("projects.payment.failedHint1")}
+ {t("projects.payment.failedHint2")}
+
+
+ {project &&
}
+
+
+ {getDisplayTypeLabel(project?.project_type)}:{" "}
+ {Number(price).toLocaleString()} {t("settings.toman")}
+
+
+ {t("projects.payment.payableAmount", {
+ amount: Number(price).toLocaleString(),
+ })}
+
+
+ {t("projects.payment.retry")}
+
+
+
+ {t("projects.payment.success")}
+
+
+
+
+
+ {project &&
}
+
+
+ {getDisplayTypeLabel(project?.project_type)}:{" "}
+ {Number(price).toLocaleString()} {t("settings.toman")}
+
+
{t("projects.payment.reviewNotice")}
+
+
+ {t("projects.payment.workroom")}
+
+
+
+
+ {previewUrl ? (
+ user.previewPost?.type === "video" ? (
+
+ ) : (
+
+ )
+ ) : (
+
+ )}
+
+
+
+ {isMain && onSkip ? (
+
+ ) : null}
+
+
+
+ {profileUrl ? (
+
+ ) : (
+
+ {displayName.charAt(0)}
+
+ )}
+
+
+ {isMain ? (
+ <>
+
+
{displayName}
+ {user.user_name ? (
+
@{user.user_name}
+ ) : null}
+
+ {user.expertise ? (
+
{user.expertise}
+ ) : null}
+
+ {viewProfileLabel}
+
+
+ ) : (
+
+ {displayName}
+
+ )}
+
+
+
+
+ {t("projects.specialists.title")}
+
+
+
+
+ {phase === "filter" || showFilter ? (
+ {
+ if (!open) {
+ if (applyingFilterRef.current) {
+ applyingFilterRef.current = false;
+ setShowFilter(false);
+ return;
+ }
+ if (phase === "results") {
+ setShowFilter(false);
+ } else {
+ router.push("/projects");
+ }
+ } else {
+ setShowFilter(true);
+ }
+ }}
+ showFilterModal={showFilter || phase === "filter"}
+ setStateId={setStateId}
+ setCityId={setCityId}
+ setRateFilter={setRateFilter}
+ setUserLevel={setUserLevel}
+ selectedExpertise={selectedExpertise}
+ setSelectedExpertise={setSelectedExpertise}
+ heightMin={heightMin}
+ setHeightMin={setHeightMin}
+ heightMax={heightMax}
+ setHeightMax={setHeightMax}
+ weightMin={weightMin}
+ setWeightMin={setWeightMin}
+ weightMax={weightMax}
+ setWeightMax={setWeightMax}
+ sizeMin={sizeMin}
+ setSizeMin={setSizeMin}
+ sizeMax={sizeMax}
+ setSizeMax={setSizeMax}
+ hairColor={hairColor}
+ setHairColor={setHairColor}
+ eyeColor={eyeColor}
+ setEyeColor={setEyeColor}
+ stateId={stateId}
+ cityId={cityId}
+ rateFilter={rateFilter}
+ userLevel={userLevel}
+ handleFilterChange={handleFilterChange}
+ clearFilters={clearFilters}
+ />
+ ) : null}
+
+ {phase === "results" && !showFilter ? (
+
+
+ {t("projects.specialists.resultsHint")}
+
+
+
+ {loading ? (
+
+ {t("projects.specialists.loading")}
+
+ ) : !users.length || !current ? (
+
+ {t("projects.specialists.empty")}
+
+ ) : (
+
+ {prevUser ? (
+
+ ) : null}
+ {nextUser ? (
+
+ ) : null}
+
+
+ paginate(1)}
+ userFallback={t("common.user")}
+ viewProfileLabel={t("projects.specialists.viewProfile")}
+ />
+
+
+
+ )}
+