{t.common.appName}
+{t.common.appName}
+
{t.intro.title}
-
+
{t.intro.description}
@@ -175,8 +175,8 @@ export default function Intro() { height={37} />120
-+
120
+{t.intro.userProfile}
14
-+
14
+{t.intro.matches}
14
-+
14
+{t.intro.marriage}
+
{item.title}
(
-
+
{selectedSection.title}
);
})
) : (
- No options found
+ No options found
)}
diff --git a/src/components/questions/question-file.tsx b/src/components/questions/question-file.tsx
index db58ffd..5580387 100644
--- a/src/components/questions/question-file.tsx
+++ b/src/components/questions/question-file.tsx
@@ -4,6 +4,7 @@ import Image from "next/image";
import { useCallback, useEffect, useState } from "react";
import type { QuestionField } from "@/data/question-data";
import { useUploadTmpMediaMutation } from "@/hooks/marriage/use-upload-tmp-media";
+import { getApiRequestUrl } from "@/lib/http";
import { isInFlutterWebView, uploadFile } from "@/lib/webview-actions";
import { useQuestionAnswers } from "./question-answer-storage";
import QuestionTitle from "./question-title";
@@ -37,23 +38,60 @@ function resolveMediaType(
return "file";
}
+function isImageFile(fileName?: string | null, fileUrl?: string | null): boolean {
+ if (fileUrl && (fileUrl.startsWith("data:image/") || fileUrl.startsWith("blob:"))) {
+ if (fileUrl.startsWith("data:application/pdf")) return false;
+ if (fileName && /\.(pdf|doc|docx|xls|xlsx|txt|zip|rar)$/i.test(fileName)) {
+ return false;
+ }
+ return true;
+ }
+ const nameToCheck = fileName || fileUrl || "";
+ return /\.(jpg|jpeg|png|webp|gif|svg|bmp|avif)$/i.test(nameToCheck);
+}
+
export function QuestionFile({
question,
questionIndex,
disabled,
}: QuestionFileProps) {
- const [selectedFileName, setSelectedFileName] = useState(null);
+ const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+ const storedValue = getAnswerValue(question, questionIndex);
+
+ const initialFileName =
+ typeof storedValue === "string" && storedValue.trim().length > 0
+ ? storedValue.split("/").pop() ?? storedValue
+ : null;
+
+ const initialFileUrl =
+ typeof storedValue === "string" && storedValue.trim().length > 0
+ ? storedValue.startsWith("http") ||
+ storedValue.startsWith("blob:") ||
+ storedValue.startsWith("data:")
+ ? storedValue
+ : getApiRequestUrl(storedValue)
+ : null;
+
+ const [selectedFileName, setSelectedFileName] = useState(
+ initialFileName,
+ );
+ const [filePreviewUrl, setFilePreviewUrl] = useState(
+ initialFileUrl,
+ );
const [isFlutterPicking, setIsFlutterPicking] = useState(false);
- const acceptedFiles = question.extras.options
+
+ const acceptedFiles = (question.extras?.options ?? [])
.map((option) => option.replace(/^\./, ""))
.join(", ");
- const { setAnswerValue } = useQuestionAnswers();
+
const uploadTmpMediaMutation = useUploadTmpMediaMutation({
onSuccess: (response) => {
- setAnswerValue(question, questionIndex, response.path);
+ if (response.path) {
+ setAnswerValue(question, questionIndex, response.path);
+ }
},
- onError: () => {
- setAnswerValue(question, questionIndex, null);
+ onError: (error) => {
+ console.error("File upload error:", error);
},
});
@@ -72,28 +110,32 @@ export function QuestionFile({
break;
case "picked":
if (event.data?.files?.[0]) {
- setSelectedFileName(event.data.files[0].name ?? null);
+ const fileName = event.data.files[0].name ?? null;
+ setSelectedFileName(fileName);
+ if (fileName) {
+ setAnswerValue(question, questionIndex, fileName);
+ }
}
break;
case "progress":
- // Could show progress bar – for now just keep pending state
break;
case "completed": {
setIsFlutterPicking(false);
const file = event.data?.files?.[0];
if (file?.url) {
- // Flutter uploaded the file – use the returned URL
setAnswerValue(question, questionIndex, file.url);
setSelectedFileName(file.name ?? "uploaded");
+ setFilePreviewUrl(file.url);
} else if (file?.base64) {
- // base64 mode – convert to File and use existing mutation
- fetch(file.base64)
+ const b64 = file.base64;
+ setSelectedFileName(file.name ?? "upload");
+ setFilePreviewUrl(b64);
+ fetch(b64)
.then((res) => res.blob())
.then((blob) => {
const f = new File([blob], file.name ?? "upload", {
type: blob.type,
});
- setSelectedFileName(f.name);
uploadTmpMediaMutation.mutate(f);
});
}
@@ -112,12 +154,11 @@ export function QuestionFile({
return () => {
unsubscribe?.();
};
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [question, questionIndex]);
+ }, [question, questionIndex, setAnswerValue, uploadTmpMediaMutation]);
/** Handle file pick in Flutter WebView via upload_file action. */
const handleFlutterPick = useCallback(() => {
- const extensions = question.extras.options.map((o) =>
+ const extensions = (question.extras?.options ?? []).map((o) =>
o.replace(/^\./, "").toLowerCase(),
);
const mediaType = resolveMediaType(extensions);
@@ -140,18 +181,52 @@ export function QuestionFile({
if (!file) {
setSelectedFileName(null);
+ setFilePreviewUrl(null);
setAnswerValue(question, questionIndex, null);
return;
}
setSelectedFileName(file.name);
+ setAnswerValue(question, questionIndex, file.name);
+
+ if (file.type.startsWith("image/")) {
+ const objectUrl = URL.createObjectURL(file);
+ setFilePreviewUrl(objectUrl);
+ } else {
+ setFilePreviewUrl(null);
+ }
+
uploadTmpMediaMutation.mutate(file);
}
+ const handleRemoveFile = (e: React.MouseEvent) => {
+ e.stopPropagation();
+ e.preventDefault();
+ setSelectedFileName(null);
+ setFilePreviewUrl(null);
+ setAnswerValue(question, questionIndex, null);
+ };
+
const inWebView = isInFlutterWebView();
+ const isUploaded = Boolean(selectedFileName || storedValue);
+ const currentFileName =
+ selectedFileName ??
+ (typeof storedValue === "string" ? storedValue.split("/").pop() : null);
+ const currentFileUrl =
+ filePreviewUrl ??
+ (typeof storedValue === "string" && storedValue.trim().length > 0
+ ? storedValue.startsWith("http") ||
+ storedValue.startsWith("blob:") ||
+ storedValue.startsWith("data:")
+ ? storedValue
+ : getApiRequestUrl(storedValue)
+ : null);
+
+ const isImg = isImageFile(currentFileName, currentFileUrl);
return (
+ ) : (
+ /* Document / PDF Preview (Right design in screenshot) */
+
+
+
+
+ PDF
+
+
+
+ {currentFileName ?? "document"}
+
+
+ )}
+
+ {/* Trash Button in Bottom-Right */}
+
+
+ {isPending && (
+
+
+
+ )}
+
+ ) : (
+ /* ────── DEFAULT EMPTY STATE ────── */
+ <>
+
{showInvalidState ? (
-
+
Enter a valid phone number with country code.
) : null}
diff --git a/src/components/questions/question-photo.tsx b/src/components/questions/question-photo.tsx
index c7374e6..9aa62b3 100644
--- a/src/components/questions/question-photo.tsx
+++ b/src/components/questions/question-photo.tsx
@@ -1,8 +1,11 @@
"use client";
import Image from "next/image";
-import type { ReactNode } from "react";
+import { useCallback, useEffect, useId, useState, type ReactNode } from "react";
import type { QuestionField } from "@/data/question-data";
+import { useUploadTmpMediaMutation } from "@/hooks/marriage/use-upload-tmp-media";
+import { getApiRequestUrl } from "@/lib/http";
+import { isInFlutterWebView, uploadFile } from "@/lib/webview-actions";
import { useQuestionAnswers } from "./question-answer-storage";
type QuestionPhotoProps = {
@@ -12,65 +15,231 @@ type QuestionPhotoProps = {
disabled?: boolean;
};
-function getFileInputValue(files: FileList | null) {
- const fileNames = Array.from(files ?? []).map((file) => file.name);
-
- return fileNames.length > 0 ? fileNames.join(", ") : null;
-}
-
export function QuestionPhoto({
question,
questionIndex,
description,
disabled,
}: QuestionPhotoProps) {
- const acceptedFiles = question.extras.options.join(",");
+ const inputId = useId();
+ const [localPreviewUrl, setLocalPreviewUrl] = useState(null);
+ const [isFlutterPicking, setIsFlutterPicking] = useState(false);
+
+ const acceptedFiles =
+ question.extras?.options && question.extras.options.length > 0
+ ? question.extras.options.join(",")
+ : "image/*";
+
const descriptionContent = description ?? question.description;
- const { setAnswerValue } = useQuestionAnswers();
+ const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+ const storedValue = getAnswerValue(question, questionIndex);
+
+ const uploadTmpMediaMutation = useUploadTmpMediaMutation({
+ onSuccess: (response) => {
+ if (response.path) {
+ setAnswerValue(question, questionIndex, response.path);
+ }
+ },
+ onError: (error) => {
+ console.error("Photo upload error:", error);
+ },
+ });
+
+ const isPending = uploadTmpMediaMutation.isPending || isFlutterPicking;
+
+ // Listen for upload_file responses from Flutter WebView if active
+ useEffect(() => {
+ if (!isInFlutterWebView()) return;
+
+ const unsubscribe = window.addFlutterResponseListener?.((event) => {
+ if (event.action !== "upload_file") return;
+
+ switch (event.status) {
+ case "picking":
+ setIsFlutterPicking(true);
+ break;
+ case "picked":
+ if (event.data?.files?.[0]?.base64) {
+ const b64 = event.data.files[0].base64;
+ setLocalPreviewUrl(b64);
+ setAnswerValue(question, questionIndex, b64);
+ }
+ break;
+ case "completed": {
+ setIsFlutterPicking(false);
+ const file = event.data?.files?.[0];
+ if (file?.url) {
+ setAnswerValue(question, questionIndex, file.url);
+ setLocalPreviewUrl(file.url);
+ } else if (file?.base64) {
+ const b64 = file.base64;
+ setLocalPreviewUrl(b64);
+ setAnswerValue(question, questionIndex, b64);
+ fetch(b64)
+ .then((res) => res.blob())
+ .then((blob) => {
+ const f = new File([blob], file.name ?? "photo.jpg", {
+ type: blob.type || "image/jpeg",
+ });
+ uploadTmpMediaMutation.mutate(f);
+ });
+ }
+ break;
+ }
+ case "cancelled":
+ case "failed":
+ setIsFlutterPicking(false);
+ break;
+ }
+ });
+
+ return () => {
+ unsubscribe?.();
+ };
+ }, [question, questionIndex, setAnswerValue, uploadTmpMediaMutation]);
+
+ const handleFlutterPick = useCallback(() => {
+ const extensions = (question.extras?.options ?? []).map((o) =>
+ o.replace(/^\./, "").toLowerCase(),
+ );
+
+ uploadFile({
+ mediaType: "image",
+ source: "gallery",
+ returnAs: "upload",
+ uploadUrl: `${process.env.NEXT_PUBLIC_API_BASE_URL ?? ""}/upload-tmp-media/`,
+ fieldName: "file",
+ allowedExtensions: extensions.length > 0 ? extensions : ["jpg", "jpeg", "png", "webp"],
+ maxBytes: 10_485_760, // 10 MB
+ title: typeof question.title === "string" ? question.title : "Upload Photo",
+ });
+ }, [question]);
+
+ const handleBrowserFileChange = (files: FileList | null) => {
+ const file = files?.[0];
+ if (!file) return;
+
+ // Create synchronous object URL for instant preview & immediate state update
+ const objectUrl = URL.createObjectURL(file);
+ setLocalPreviewUrl(objectUrl);
+ setAnswerValue(question, questionIndex, objectUrl);
+
+ // Trigger background upload
+ uploadTmpMediaMutation.mutate(file);
+ };
+
+ const handleLabelClick = (e: React.MouseEvent) => {
+ if (isInFlutterWebView()) {
+ e.preventDefault();
+ handleFlutterPick();
+ }
+ };
+
+ // Determine photo URL to display
+ let displayUrl: string | null = localPreviewUrl;
+
+ if (!displayUrl && typeof storedValue === "string" && storedValue.trim().length > 0) {
+ const val = storedValue.trim();
+ if (
+ val.startsWith("http://") ||
+ val.startsWith("https://") ||
+ val.startsWith("blob:") ||
+ val.startsWith("data:")
+ ) {
+ displayUrl = val;
+ } else {
+ displayUrl = getApiRequestUrl(val);
+ }
+ }
+
+ const hasAnswer = Boolean(displayUrl);
return (
setAnswerValue(question, questionIndex, getFileInputValue(event.target.files))}
+ onChange={(event) => handleBrowserFileChange(event.target.files)}
disabled={disabled}
className="sr-only"
- id={`photo-input-${questionIndex}`}
/>
);
}
export default QuestionPhoto;
+
+
+
diff --git a/src/components/questions/question-progress-tracker.tsx b/src/components/questions/question-progress-tracker.tsx
index 235f9d0..1b06432 100644
--- a/src/components/questions/question-progress-tracker.tsx
+++ b/src/components/questions/question-progress-tracker.tsx
@@ -93,7 +93,7 @@ export function QuestionProgressTracker({
>(() => new Set());
const safeTotal = Math.max(total, 0);
const progress = safeTotal > 0 ? (answered / safeTotal) * 100 : 0;
- const isCompleted = safeTotal > 0 && answered >= safeTotal;
+ const isCompleted = safeTotal === 0 || answered >= safeTotal;
const markQuestionPassed = useCallback((questionIndex: number) => {
setPassedQuestionIndexes((currentIndexes) => {
@@ -180,7 +180,7 @@ export function QuestionProgressTracker({
role="progressbar"
className="w-full bg-[#F7F1F0]"
>
-
+
fields to complete
{answered} /{safeTotal}
diff --git a/src/components/questions/question-radio.tsx b/src/components/questions/question-radio.tsx
index c83f60e..8a90784 100644
--- a/src/components/questions/question-radio.tsx
+++ b/src/components/questions/question-radio.tsx
@@ -45,7 +45,7 @@ export function QuestionRadio({
htmlFor={optionId}
className={[
"w-full cursor-pointer rounded-[12px] px-4 py-3.5",
- "text-start text-[13px] leading-tight font-semibold transition-all duration-200",
+ "text-start group-14 leading-tight font-semibold transition-all duration-200",
isSelected
? "bg-[#F0445B] text-white shadow-[0_8px_20px_rgba(240,68,91,0.25)]"
: "bg-[#F5F5F5] text-[#181818] hover:bg-[#EBEBEB]",
diff --git a/src/components/questions/question-slider.tsx b/src/components/questions/question-slider.tsx
index 138d4b3..8a1cb6f 100644
--- a/src/components/questions/question-slider.tsx
+++ b/src/components/questions/question-slider.tsx
@@ -77,7 +77,7 @@ export function QuestionSlider({
{value}
@@ -97,7 +97,7 @@ export function QuestionSlider({
}}
/>
-
+
{steps.map((step) => (
{step}
))}
diff --git a/src/components/questions/question-snap-list.tsx b/src/components/questions/question-snap-list.tsx
index 6e051b8..b42f7aa 100644
--- a/src/components/questions/question-snap-list.tsx
+++ b/src/components/questions/question-snap-list.tsx
@@ -242,9 +242,9 @@ export function QuestionSnapList({
let wrapperStyles = "w-full";
if (isActive) {
- containerStyles = "top-1/2 left-0 -translate-y-1/2 z-10 opacity-100 scale-100 pointer-events-auto";
+ containerStyles = "top-[35%] left-0 -translate-y-1/2 z-10 opacity-100 scale-100 pointer-events-auto";
} else if (isPrev) {
- containerStyles = "top-4 left-0 z-0 opacity-20 pointer-events-none scale-[0.98]";
+ containerStyles = "top-4 left-0 z-0 opacity-0 pointer-events-none scale-[0.98]";
wrapperStyles = "w-full max-h-[110px] overflow-hidden pointer-events-none";
} else if (isNext) {
containerStyles = "bottom-4 left-0 z-0 opacity-20 pointer-events-none scale-[0.98]";
diff --git a/src/components/questions/question-text.tsx b/src/components/questions/question-text.tsx
index e78d9fa..7328c2c 100644
--- a/src/components/questions/question-text.tsx
+++ b/src/components/questions/question-text.tsx
@@ -59,18 +59,18 @@ export default function QuestionText({
onChange={(e) => setAnswerValue(question, questionIndex, e.target.value)}
placeholder={question.extras.placeHolder}
disabled={disabled}
- className="h-full w-full border-0 bg-transparent px-[18px] text-[14px] leading-none text-[#181818] outline-none placeholder:text-[#9D8F8C]"
+ className="h-full w-full border-0 bg-transparent px-[18px] group-12 leading-none text-[#181818] outline-none placeholder:text-[#9D8F8C]"
/>
{showInvalidState ? (
-
+
{/[\u0600-\u06FF]/.test(question.title)
? "یک آدرس ایمیل معتبر وارد کنید."
: "Enter a valid email address."}
) : null}
{description ? (
-
+
{description}
) : null}
@@ -94,10 +94,10 @@ export default function QuestionText({
onChange={(e) => setAnswerValue(question, questionIndex, e.target.value)}
placeholder={question.extras.placeHolder}
disabled={disabled}
- className="h-[54px] w-full rounded-[15px] border border-[#E7D8D5] bg-white px-4 text-[14px] font-medium text-[#181818] outline-none transition-all placeholder:text-[#9D8F8C] focus:border-[#6F6F6F] disabled:bg-[#F5F2F1] disabled:text-[#7C7472]"
+ className="h-[54px] w-full rounded-[15px] border border-[#E7D8D5] bg-white px-4 group-12 font-medium text-[#181818] outline-none transition-all placeholder:text-[#9D8F8C] focus:border-[#6F6F6F] disabled:bg-[#F5F2F1] disabled:text-[#7C7472]"
/>
{description ? (
-
+
{description}
) : null}
diff --git a/src/components/questions/question-title.tsx b/src/components/questions/question-title.tsx
index 9b14e35..cf1ec5b 100644
--- a/src/components/questions/question-title.tsx
+++ b/src/components/questions/question-title.tsx
@@ -10,7 +10,7 @@ export function QuestionTitle({ question, className }: QuestionTitleProps) {
return (
{question.private ? (
-
+
diff --git a/src/components/questions/required-steps-card.tsx b/src/components/questions/required-steps-card.tsx
index b5e2bae..3da95d5 100644
--- a/src/components/questions/required-steps-card.tsx
+++ b/src/components/questions/required-steps-card.tsx
@@ -104,12 +104,12 @@ export default function RequiredStepsCard() {
)}
-
+
{t.questions.requiredSteps}
-
+
{isCompleted
? t.questions.requiredStepsDescriptionCompleted
: t.questions.requiredStepsDescription}
@@ -127,7 +127,7 @@ export default function RequiredStepsCard() {
}}
>
-
+
{completed}/{total}
diff --git a/src/components/sliders/slider-slide-four.tsx b/src/components/sliders/slider-slide-four.tsx
index 03edea6..d0641fd 100644
--- a/src/components/sliders/slider-slide-four.tsx
+++ b/src/components/sliders/slider-slide-four.tsx
@@ -27,13 +27,13 @@ export function SliderSlideFour({
>
- Submit Process
-
- {index + 1}/4 terms & conditions
+
Submit Process
+
+ {index + 1}/4 Registration Type
-
+
Read the terms and conditions carefully so that you don't run into
any problems in the next process - reading this section is
mandatory.
@@ -82,7 +82,7 @@ export function SliderSlideFour({
/>
-
+
{option.label}
diff --git a/src/components/sliders/slider-slide-one.tsx b/src/components/sliders/slider-slide-one.tsx
index cb12e27..680ed35 100644
--- a/src/components/sliders/slider-slide-one.tsx
+++ b/src/components/sliders/slider-slide-one.tsx
@@ -19,13 +19,13 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
}}
>
- Submit Process
-
+
Submit Process
+
{index + 1}/4 terms & conditions
-
+
Dear user, while welcoming you to the Habib Marij application,
please read the following rules and regulations carefully before
using the services of this platform. Your registration and use of
@@ -35,11 +35,11 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
1. Eligibility and Membership Requirements
-
+
Legal Age:{" "}
Users must meet the minimum legal age for independent
@@ -47,7 +47,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
Identity Verification:{" "}
Mandatory submission of valid government-issued ID upon
@@ -55,7 +55,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
Single Status Commitment:{" "}
Users must provide proof of being single, or documents
@@ -63,7 +63,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
Intent:{" "}
Commitment to monogamy and intention for permanent marriage
@@ -71,7 +71,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
General Health:{" "}
Self-declaration regarding mental health, absence of
@@ -81,11 +81,11 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
2. Privacy and Data Management
-
+
Content Security:{" "}
Technical prevention of screenshots from profiles and chat
@@ -93,7 +93,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
-
+
Progressive Disclosure:{" "}
Sensitive information (face, contact details) revealed
diff --git a/src/components/sliders/slider-slide-three.tsx b/src/components/sliders/slider-slide-three.tsx
index 9717000..f56b6ce 100644
--- a/src/components/sliders/slider-slide-three.tsx
+++ b/src/components/sliders/slider-slide-three.tsx
@@ -47,9 +47,9 @@ export function SliderSlideThree({
className="flex h-full min-h-0 w-full shrink-0 flex-col justify-between"
>
- Submit Process
-
- {index + 1}/4 terms & conditions
+
Submit Process
+
+ {index + 1}/4 Select Gender
@@ -90,7 +90,7 @@ export function SliderSlideThree({
diff --git a/src/components/sliders/slider-slide-two.tsx b/src/components/sliders/slider-slide-two.tsx
index 74475a5..5e08f7b 100644
--- a/src/components/sliders/slider-slide-two.tsx
+++ b/src/components/sliders/slider-slide-two.tsx
@@ -8,9 +8,9 @@ export function SliderSlideTwo({ index }: SliderSlideProps) {
className="flex h-full min-h-0 w-full shrink-0 flex-col"
>
- Submit Process
-
- {index + 1}/4 terms & conditions
+
Submit Process
+
+ {index + 1}/4 Watch Video
@@ -40,11 +40,11 @@ export function SliderSlideTwo({ index }: SliderSlideProps) {
height={20}
className="rounded-full"
/>
-
+
Dr. Hasti Masoudi
-
+
We have come together with the goal of creating a secure and
confidential path for "permanent marriage" among Muslims
diff --git a/src/components/ui/advisor-actions-card.tsx b/src/components/ui/advisor-actions-card.tsx
index c9b1f62..9834f83 100644
--- a/src/components/ui/advisor-actions-card.tsx
+++ b/src/components/ui/advisor-actions-card.tsx
@@ -30,10 +30,10 @@ export function AdvisorActionsCard({
return (
-
+
{title}
-
+
{description}
@@ -53,7 +53,7 @@ export function AdvisorActionsCard({
/>
))}
-
+
+{extraCount}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 7c65ede..c468783 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -152,13 +152,13 @@ export function Button({
{renderArrow("left")}
-
+
{children}
{description && !isOutlined ? (
{description}
@@ -219,7 +219,7 @@ function CountdownProgress({ value, progress }: CountdownProgressProps) {
strokeDashoffset={dashOffset}
/>
-
+
{value}
diff --git a/src/components/ui/info-progress-card.tsx b/src/components/ui/info-progress-card.tsx
index cbe80cc..6385c43 100644
--- a/src/components/ui/info-progress-card.tsx
+++ b/src/components/ui/info-progress-card.tsx
@@ -41,9 +41,9 @@ export function InfoProgressCard({
-
+
{title}{" "}
-
+
{requiredLabel && "(Required)"}
@@ -67,7 +67,7 @@ export function InfoProgressCard({
{tooltip}
@@ -76,7 +76,7 @@ export function InfoProgressCard({
-
+
Estimate time: {estimate}
@@ -117,7 +117,7 @@ export function InfoProgressCard({
className="mt-0.5"
/>
)}
-
+
{normalizedProgress}%
diff --git a/src/components/ui/information-sheet.tsx b/src/components/ui/information-sheet.tsx
index 92714ea..611db8a 100644
--- a/src/components/ui/information-sheet.tsx
+++ b/src/components/ui/information-sheet.tsx
@@ -259,14 +259,14 @@ export function InformationSheet({
{resolvedTitle}
{description ? (
- {description}
+ {description}
) : null}
{resolvedButtons ? (
diff --git a/src/components/ui/sticky-header.tsx b/src/components/ui/sticky-header.tsx
index 6ddd4f9..681deb3 100644
--- a/src/components/ui/sticky-header.tsx
+++ b/src/components/ui/sticky-header.tsx
@@ -3,7 +3,9 @@
import type { ReactNode } from "react";
import { useViewPaddings } from "@/hooks/use-view-paddings";
-const DESIGN_TOP_PADDING = 63;
+// پدینگ بالای طراحی هدر (معادل pt-7 = 28px). روی دستگاه، safe-area + 4px جایگزین
+// میشود (مثل صفحات بومی najm)، و طراحی اصلی بهعنوان کف برای مرورگر حفظ میشود.
+const DESIGN_TOP_PADDING = 28;
const SAFE_AREA_GAP = 4;
type StickyHeaderProps = {
@@ -29,10 +31,7 @@ export default function StickyHeader({
}
className={[
sticky ? "sticky z-30" : "relative z-30",
- "rounded-b-[32px] bg-[linear-gradient(135deg,#E03950_0%,#FE6F82_100%)] px-[29px] pb-[29px] text-[14px]",
- "[&_button]:size-[74px] [&_button]:shrink-0 [&_button]:rounded-[24px] [&_button]:p-0",
- "[&_button_img]:size-8 [&_button_svg]:size-8",
- "[&_h1]:min-w-0 [&_h1]:truncate [&_h1]:text-[14px] [&_h1]:font-semibold [&_h1]:leading-5",
+ "rounded-b-[15px] bg-[linear-gradient(135deg,#E03950_0%,#FE6F82_100%)] px-[17px] pb-5",
className,
]
.filter(Boolean)
diff --git a/src/hooks/marriage/use-upload-tmp-media.ts b/src/hooks/marriage/use-upload-tmp-media.ts
index 89f9054..78294ca 100644
--- a/src/hooks/marriage/use-upload-tmp-media.ts
+++ b/src/hooks/marriage/use-upload-tmp-media.ts
@@ -18,7 +18,6 @@ export async function uploadTmpMedia(file: File) {
{
headers: {
Accept: "application/json",
- "Content-Type": "multipart/form-data",
"X-CSRFToken": CSRF_TOKEN,
},
},
diff --git a/src/i18n/locales/en/questions.json b/src/i18n/locales/en/questions.json
index cc870c7..3890218 100644
--- a/src/i18n/locales/en/questions.json
+++ b/src/i18n/locales/en/questions.json
@@ -1406,92 +1406,26 @@
]
},
{
- "title": "Katel Test",
+ "title": "Personality Test",
"icon": "layout-grid",
- "slug": "katel_test",
+ "slug": "personality_test",
"required": false,
- "estimateTime": "30 minutes",
- "tooltip": "Katel test section.",
+ "estimateTime": "15 minutes",
+ "tooltip": "Personality Test",
"progress": 0,
- "description": "Captures Katel test responses.",
- "questions": [
- {
- "title": "Katel Test Step 1",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the first Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "Katel Test Step 2",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the second Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "Katel Test Step 3",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the third Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "Katel Test Step 4",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the fourth Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- }
- ]
+ "description": "Personality Test",
+ "questions": []
+ },
+ {
+ "title": "Glasser 5 Needs Test",
+ "icon": "layout-grid",
+ "slug": "glasser_5_needs_test",
+ "required": false,
+ "estimateTime": "15 minutes",
+ "tooltip": "Glasser 5 Needs Test",
+ "progress": 0,
+ "description": "Glasser 5 Needs Test",
+ "questions": []
},
{
"title": "Future Spouse Criteria and Red Lines",
diff --git a/src/i18n/locales/fa/questions.json b/src/i18n/locales/fa/questions.json
index 358da26..e29a171 100644
--- a/src/i18n/locales/fa/questions.json
+++ b/src/i18n/locales/fa/questions.json
@@ -1406,92 +1406,26 @@
]
},
{
- "title": "آزمون کتل",
+ "title": "تست شخصیت شناسی",
"icon": "layout-grid",
- "slug": "katel_test",
+ "slug": "personality_test",
"required": false,
- "estimateTime": "30 minutes",
- "tooltip": "Katel test section.",
+ "estimateTime": "15 دقیقه",
+ "tooltip": "تست شخصیت شناسی",
"progress": 0,
- "description": "Captures Katel test responses.",
- "questions": [
- {
- "title": "مرحله ۱ آزمون کتل",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the first Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "مرحله ۲ آزمون کتل",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the second Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "مرحله ۳ آزمون کتل",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the third Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- },
- {
- "title": "مرحله ۴ آزمون کتل",
- "type": "radio",
- "required": false,
- "description": "Select the option that applies.",
- "tooltip": "This is the fourth Katel test step.",
- "extras": {
- "placeHolder": "Select one option",
- "range": [
- 0,
- 0
- ],
- "options": [
- "Option A",
- "Option B",
- "Option C"
- ]
- }
- }
- ]
+ "description": "تست شخصیت شناسی",
+ "questions": []
+ },
+ {
+ "title": "تست ۵ نیاز گلاسر",
+ "icon": "layout-grid",
+ "slug": "glasser_5_needs_test",
+ "required": false,
+ "estimateTime": "15 دقیقه",
+ "tooltip": "تست ۵ نیاز گلاسر",
+ "progress": 0,
+ "description": "تست ۵ نیاز گلاسر",
+ "questions": []
},
{
"title": "بخش ۸: معیارها و خطوط قرمز همسر آینده",
+
{t.questions.requiredSteps}
+
{isCompleted ? t.questions.requiredStepsDescriptionCompleted : t.questions.requiredStepsDescription} @@ -127,7 +127,7 @@ export default function RequiredStepsCard() { }} >
- + {completed}/{total}Submit Process
-- {index + 1}/4 terms & conditions +
Submit Process
++ {index + 1}/4 Registration Type
+
Read the terms and conditions carefully so that you don't run into
any problems in the next process - reading this section is
mandatory.
@@ -82,7 +82,7 @@ export function SliderSlideFour({
/>
-
+
{option.label}
diff --git a/src/components/sliders/slider-slide-one.tsx b/src/components/sliders/slider-slide-one.tsx
index cb12e27..680ed35 100644
--- a/src/components/sliders/slider-slide-one.tsx
+++ b/src/components/sliders/slider-slide-one.tsx
@@ -19,13 +19,13 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
}}
>
Submit Process
+ Submit Process
{index + 1}/4 terms & conditions
+
Dear user, while welcoming you to the Habib Marij application,
please read the following rules and regulations carefully before
using the services of this platform. Your registration and use of
@@ -35,11 +35,11 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Legal Age:{" "}
Users must meet the minimum legal age for independent
@@ -47,7 +47,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Identity Verification:{" "}
Mandatory submission of valid government-issued ID upon
@@ -55,7 +55,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Single Status Commitment:{" "}
Users must provide proof of being single, or documents
@@ -63,7 +63,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Intent:{" "}
Commitment to monogamy and intention for permanent marriage
@@ -71,7 +71,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
General Health:{" "}
Self-declaration regarding mental health, absence of
@@ -81,11 +81,11 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Content Security:{" "}
Technical prevention of screenshots from profiles and chat
@@ -93,7 +93,7 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
+
Progressive Disclosure:{" "}
Sensitive information (face, contact details) revealed
diff --git a/src/components/sliders/slider-slide-three.tsx b/src/components/sliders/slider-slide-three.tsx
index 9717000..f56b6ce 100644
--- a/src/components/sliders/slider-slide-three.tsx
+++ b/src/components/sliders/slider-slide-three.tsx
@@ -47,9 +47,9 @@ export function SliderSlideThree({
className="flex h-full min-h-0 w-full shrink-0 flex-col justify-between"
>
Submit Process
- {index + 1}/4 terms & conditions
+ Submit Process
+ {index + 1}/4 Select Gender
diff --git a/src/components/sliders/slider-slide-two.tsx b/src/components/sliders/slider-slide-two.tsx
index 74475a5..5e08f7b 100644
--- a/src/components/sliders/slider-slide-two.tsx
+++ b/src/components/sliders/slider-slide-two.tsx
@@ -8,9 +8,9 @@ export function SliderSlideTwo({ index }: SliderSlideProps) {
className="flex h-full min-h-0 w-full shrink-0 flex-col"
>
Submit Process
- {index + 1}/4 terms & conditions
+ Submit Process
+ {index + 1}/4 Watch Video
+
Dr. Hasti Masoudi
+
We have come together with the goal of creating a secure and
confidential path for "permanent marriage" among Muslims
+
{description}
+
Estimate time: {estimate}
+
1. Eligibility and Membership Requirements
-
+
2. Privacy and Data Management
-
+
{title}
-
+
{title}{" "}
-
+
{requiredLabel && "(Required)"}
@@ -67,7 +67,7 @@ export function InfoProgressCard({
{resolvedTitle}
{description ? (
-