-
- {formik.touched.name && formik.errors.name && (
-
- {formik.errors.name}
-
- )}
+
+
+
-
+
+
+
+ {!nameSaved ? (
+
+ {t("auth.saveAndContinue")}
+
+ ) : (
+
+
finishRegistration("continue")}
+ className=" w-full sm:w-auto"
+ disabled={Boolean(choiceLoading)}
+ loading={choiceLoading === "continue"}
+ >
+ {t("auth.continueRegistration")}
+
+
finishRegistration("app")}
+ className="!border-[#FF0000] !text-[#FF0000] w-full sm:w-auto"
+ disabled={Boolean(choiceLoading)}
+ loading={choiceLoading === "app"}
+ >
+ {t("auth.enterApp")}
+
+
);
}
diff --git a/src/app/(auth)/(register)/register/loading.tsx b/src/app/(auth)/(register)/register/loading.tsx
new file mode 100644
index 0000000..b2ac385
--- /dev/null
+++ b/src/app/(auth)/(register)/register/loading.tsx
@@ -0,0 +1,15 @@
+"use client";
+
+import IOSSpinner from "@/components/ui/IOSSpinner";
+import { useTranslation } from "react-i18next";
+
+export default function RegisterLoading() {
+ const { t } = useTranslation("common");
+
+ return (
+
+
+ {t("auth.pageLoading")}
+
+ );
+}
diff --git a/src/app/(auth)/(register)/register/page.tsx b/src/app/(auth)/(register)/register/page.tsx
index d0fed7f..25d3c11 100644
--- a/src/app/(auth)/(register)/register/page.tsx
+++ b/src/app/(auth)/(register)/register/page.tsx
@@ -5,28 +5,34 @@ import AuthHead from "@/components/auth/AuthHead";
import AuthInput from "@/components/auth/AuthInput";
import Container from "@/components/elements/Container";
import AuthRules from "@/components/auth/AuthRules";
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
import * as yup from "yup";
import { useRouter } from "next/navigation";
import { markOtpSent } from "@/lib/auth/otpTimer";
-import GoogleSignInButton from "@/components/auth/GoogleSignInButton";
+import { GoogleSignInButton } from "@/app/(auth)/AuthProviders";
import { MOBILE_NUMERIC_INPUT_PROPS } from "@/lib/auth/inputProps";
-
-// Validation schema using Yup
-const schema = yup.object({
- mobile: yup
- .string()
- .matches(/^(09\d{9})$/, "شماره موبایل معتبر نیست")
- .required("شماره موبایل الزامی است"),
-});
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function Register() {
+ const { t } = useTranslation("common");
const router = useRouter();
const [isModalOpen, setModalOpen] = useState(false);
const { request, loading } = useAxios();
+ const schema = useMemo(
+ () =>
+ yup.object({
+ mobile: yup
+ .string()
+ .matches(/^(09\d{9})$/, t("auth.mobileInvalid"))
+ .required(t("auth.mobileRequired")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
mobile: "",
@@ -45,46 +51,53 @@ function Register() {
});
return (
-
-
+
+
);
}
diff --git a/src/app/(auth)/(register)/register/password/page.tsx b/src/app/(auth)/(register)/register/password/page.tsx
index 5309c1e..f2be62a 100644
--- a/src/app/(auth)/(register)/register/password/page.tsx
+++ b/src/app/(auth)/(register)/register/password/page.tsx
@@ -7,7 +7,7 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React from "react";
+import React, { useMemo } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
import * as yup from "yup";
@@ -15,29 +15,33 @@ import { useRouter } from "next/navigation";
import { IVerifyOtp } from "@/types/types";
import AuthNextButton from "@/components/auth/AuthNextButton";
import toast from "react-hot-toast";
-
-const schema = yup.object().shape({
- password: yup
- .string()
- .required("کلمه عبور نمی\u200Cتواند خالی باشد")
- .min(8, "کلمه عبور نباید کوتاه تر از 8 کاراکتر باشد")
- .matches(
- /^(?=.*[a-zA-Zآ-ی])(?=.*\d).{8,}$/,
- "کلمه عبور باید شامل حروف و اعداد باشد"
- ),
- confirmPassword: yup
- .string()
- .required("تکرار کلمه عبور نمی\u200Cتواند خالی باشد")
- .oneOf(
- [yup.ref("password")],
- "تکرار کلمه عبور باید با کلمه عبور مطابقت داشته باشد"
- ),
-});
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function PasswordPage() {
+ const { t } = useTranslation("common");
const router = useRouter();
const { request, loading } = useAxios();
+ const schema = useMemo(
+ () =>
+ yup.object().shape({
+ password: yup
+ .string()
+ .required(t("auth.passwordRequired"))
+ .min(8, t("auth.passwordMin"))
+ .matches(
+ /^(?=.*[a-zA-Zآ-ی])(?=.*\d).{8,}$/,
+ t("auth.passwordLettersNumbers")
+ ),
+ confirmPassword: yup
+ .string()
+ .required(t("auth.confirmPasswordRequired"))
+ .oneOf([yup.ref("password")], t("auth.confirmPasswordMismatch")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
password: "",
@@ -52,68 +56,71 @@ function PasswordPage() {
router.push("/register/fullname");
} catch (err: any) {
const message =
- err?.response?.data?.message || "ذخیره کلمه عبور ناموفق بود";
+ err?.response?.data?.message || t("auth.savePasswordFailed");
toast.error(message);
}
},
});
return (
-
-
-
+
+
+ {t("auth.saveAndContinue")}
+
+
+
+
+
);
}
diff --git a/src/app/(auth)/(register)/register/username/page.tsx b/src/app/(auth)/(register)/register/username/page.tsx
index b78d2d3..a478ac5 100644
--- a/src/app/(auth)/(register)/register/username/page.tsx
+++ b/src/app/(auth)/(register)/register/username/page.tsx
@@ -7,21 +7,25 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
+import * as yup from "yup";
import { useRouter } from "next/navigation";
import { IVerifyOtp } from "@/types/types";
import AuthNextButton from "@/components/auth/AuthNextButton";
import UsernameSuggestions from "@/components/auth/UsernameSuggestions";
-import { usernameFormSchema } from "@/lib/validation/usernameSchema";
import {
sanitizeUsernameInput,
USERNAME_MIN_LENGTH,
- USERNAME_VALIDATION_MESSAGE,
+ USERNAME_MAX_LENGTH,
+ USERNAME_REGEX,
} from "@/lib/validation/username";
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function UsernamePage() {
+ const { t } = useTranslation("common");
const router = useRouter();
const { request, loading } = useAxios();
const [isDuplicate, setIsDuplicate] = useState(false);
@@ -29,11 +33,31 @@ function UsernamePage() {
const mobile =
typeof window !== "undefined" ? localStorage.getItem("mobile") : null;
+ const schema = useMemo(
+ () =>
+ yup.object({
+ username: yup
+ .string()
+ .required(t("auth.usernameRequired"))
+ .min(
+ USERNAME_MIN_LENGTH,
+ t("auth.usernameMinLength", { min: USERNAME_MIN_LENGTH })
+ )
+ .max(
+ USERNAME_MAX_LENGTH,
+ t("auth.usernameMaxLength", { max: USERNAME_MAX_LENGTH })
+ )
+ .matches(/^[a-zA-Z0-9]/, t("auth.usernameStartRule"))
+ .matches(USERNAME_REGEX, t("auth.usernameCharsRule")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
username: "",
},
- validationSchema: usernameFormSchema,
+ validationSchema: schema,
onSubmit: async (values) => {
setIsDuplicate(false);
setSuggestions([]);
@@ -45,7 +69,13 @@ function UsernamePage() {
}) as IVerifyOtp;
localStorage.setItem("username", values.username.trim().toLowerCase());
- router.push("/register/password");
+ const authProvider =
+ typeof window !== "undefined"
+ ? localStorage.getItem("auth_provider")
+ : null;
+ router.push(
+ authProvider === "google" ? "/register/fullname" : "/register/password"
+ );
} catch (err: any) {
const data = err?.response?.data;
if (data?.message?.includes("تکراری")) {
@@ -72,73 +102,81 @@ function UsernamePage() {
};
return (
-
-
-
+
+
+ {t("auth.saveAndContinue")}
+
+
+
+
+
);
}
diff --git a/src/app/(auth)/AuthProviders.tsx b/src/app/(auth)/AuthProviders.tsx
index 7ff1ce2..7e82c7f 100644
--- a/src/app/(auth)/AuthProviders.tsx
+++ b/src/app/(auth)/AuthProviders.tsx
@@ -1,16 +1,72 @@
"use client";
-import { GoogleAuthRootProvider } from "@/components/auth/GoogleSignInButton";
+import GoogleSignInButtonBase, {
+ GoogleAuthRootProvider,
+} from "@/components/auth/GoogleSignInButton";
import RegisterRouteGuard from "@/components/auth/RegisterRouteGuard";
+import { GOOGLE_OAUTH_CLIENT_ID } from "@/config/googleAuth";
+import { createContext, useContext, useEffect, useState } from "react";
+
+const GoogleClientIdContext = createContext("");
+
+export function useGoogleClientId(): string {
+ return useContext(GoogleClientIdContext);
+}
+
+export function GoogleSignInButton(
+ props: Omit
, "clientId">
+) {
+ const clientId = useGoogleClientId();
+ return (
+
+ );
+}
export default function AuthProviders({
children,
+ googleClientId = "",
}: {
children: React.ReactNode;
+ googleClientId?: string;
}) {
+ const [resolvedClientId, setResolvedClientId] = useState(
+ googleClientId || GOOGLE_OAUTH_CLIENT_ID
+ );
+
+ useEffect(() => {
+ let cancelled = false;
+
+ async function loadClientId() {
+ const fallback = googleClientId || GOOGLE_OAUTH_CLIENT_ID;
+ setResolvedClientId(fallback);
+
+ try {
+ const res = await fetch("/api/auth/config", { cache: "no-store" });
+ if (!res.ok) return;
+ const data = (await res.json()) as { googleClientId?: string };
+ if (!cancelled) {
+ setResolvedClientId(data?.googleClientId || fallback);
+ }
+ } catch {
+ // keep fallback
+ }
+ }
+
+ void loadClientId();
+
+ return () => {
+ cancelled = true;
+ };
+ }, [googleClientId]);
+
return (
-
- {children}
-
+
+
+ {children}
+
+
);
}
diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
index d9a1192..7594a1b 100644
--- a/src/app/(auth)/layout.tsx
+++ b/src/app/(auth)/layout.tsx
@@ -1,18 +1,22 @@
import type { Metadata } from "next";
import AuthProviders from "./AuthProviders";
+import { getGoogleClientId } from "@/lib/auth/googleClientId";
+import { generateSeoPageMetadata } from "@/lib/i18n/server";
-export const metadata: Metadata = {
- title: {
- default: "ورود و ثبتنام | مدستاگرام",
- },
- description: "ورود یا ثبتنام در مدستاگرام",
- robots: { index: false, follow: false },
-};
+export const dynamic = "force-dynamic";
+
+export async function generateMetadata(): Promise {
+ return generateSeoPageMetadata("auth", { index: false });
+}
export default function AuthLayout({
children,
}: {
children: React.ReactNode;
}) {
- return {children};
+ const googleClientId = getGoogleClientId();
+
+ return (
+ {children}
+ );
}
diff --git a/src/app/(auth)/verify/auth/page.tsx b/src/app/(auth)/verify/auth/page.tsx
index cfb56a1..dcbff1a 100644
--- a/src/app/(auth)/verify/auth/page.tsx
+++ b/src/app/(auth)/verify/auth/page.tsx
@@ -5,7 +5,7 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React from "react";
+import React, { useMemo } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
import * as yup from "yup";
@@ -19,30 +19,38 @@ import persian from "react-date-object/calendars/persian";
import persian_fa from "react-date-object/locales/persian_fa";
import Image from "next/image";
import moment from "jalali-moment";
-
-// Validation schema using Yup
-const schema = yup.object().shape({
- birthDate: yup.string().required(" انتخاب تاریخ تولد الزامی است"),
- shaba: yup
- .string()
- .matches(/^(?=.{24}$)[0-9]*$/, "شماره شبا باید ۲۴ رقم باشد")
- .required("شماره شبا الزامی است"),
- nationalCode: yup
- .string()
- .matches(/^\d{10}$/, "کد ملی باید ۱۰ رقم باشد")
- .required("کد ملی الزامی است"),
-});
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function AuthPage() {
+ const { t } = useTranslation("common");
const router = useRouter();
const { request, loading } = useAxios();
-
+
const p2e = (es: string): string =>
- es.replace(/[۰-۹]/g, (d) => String.fromCharCode("۰۱۲۳۴۵۶۷۸۹".indexOf(d) + 48));
-
+ es.replace(/[۰-۹]/g, (d) =>
+ String.fromCharCode("۰۱۲۳۴۵۶۷۸۹".indexOf(d) + 48)
+ );
+
const mobile =
typeof window !== "undefined" ? localStorage.getItem("mobile") : null;
+ const schema = useMemo(
+ () =>
+ yup.object().shape({
+ birthDate: yup.string().required(t("auth.birthDateRequired")),
+ shaba: yup
+ .string()
+ .matches(/^(?=.{24}$)[0-9]*$/, t("auth.shabaInvalid"))
+ .required(t("auth.shabaRequired")),
+ nationalCode: yup
+ .string()
+ .matches(/^\d{10}$/, t("auth.nationalCodeInvalid"))
+ .required(t("auth.nationalCodeRequired")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
nationalCode: "",
@@ -56,129 +64,128 @@ function AuthPage() {
mobile: mobile,
birthday: moment(p2e(values.birthDate), "jYYYY/jMM/jDD").format(
"YYYY/MM/DD"
- ), // تبدیل به میلادی
+ ),
national_code: values.nationalCode,
shaba: values.shaba,
});
router.push("/verify/location");
} catch (err: any) {
- toast.error(err?.message || "خطای نامشخصی رخ داد.");
+ toast.error(err?.response?.data?.message || t("auth.unknownError"));
} finally {
setSubmitting(false);
}
},
});
- console.log(formik.values);
-
return (
-
-
+
+
+ {t("auth.saveAndContinue")}
+
+
+
+
);
}
-export default AvatarPage;
\ No newline at end of file
+export default AvatarPage;
diff --git a/src/app/(auth)/verify/colors/page.tsx b/src/app/(auth)/verify/colors/page.tsx
index f71d675..4c5888d 100644
--- a/src/app/(auth)/verify/colors/page.tsx
+++ b/src/app/(auth)/verify/colors/page.tsx
@@ -5,7 +5,7 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
import useAxios from "@/hooks/useAxios";
import * as yup from "yup";
import { useRouter } from "next/navigation";
@@ -13,15 +13,12 @@ import AuthNextButton from "@/components/auth/AuthNextButton";
import toast from "react-hot-toast";
import AuthUserDetails from "@/components/auth/AuthUserDetails";
import Image from "next/image";
-
-// Validation schema using Yup
-const schema = yup.object().shape({
- selectedHairImage: yup.string().required("رنگ مو الزامی است"),
- selectedEyeImage: yup.string().required(" رنگ چشم الزامی است"),
-});
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function Colors() {
- const [selectedButton, setSelectedButton] = useState(1); // Default: 1 for "قد"
+ const { t } = useTranslation("common");
+ const [selectedButton, setSelectedButton] = useState(1);
const [selectedHairImage, setSelectedHairImage] = useState("");
const [selectedEyeImage, setSelectedEyeImage] = useState("");
const router = useRouter();
@@ -32,6 +29,15 @@ function Colors() {
typeof window !== "undefined" ? localStorage.getItem("expertise") || "" : ""
);
+ const schema = useMemo(
+ () =>
+ yup.object().shape({
+ selectedHairImage: yup.string().required(t("auth.hairColorRequired")),
+ selectedEyeImage: yup.string().required(t("auth.eyeColorRequired")),
+ }),
+ [t]
+ );
+
useEffect(() => {
if (expertise && expertise !== "مدل") {
router.replace("/verify/public-relations");
@@ -49,8 +55,6 @@ function Colors() {
}
};
- console.log(selectedHairImage, selectedEyeImage);
-
const sendSizesHandler = async () => {
try {
const data = {
@@ -69,7 +73,6 @@ function Colors() {
setSelectedButton(buttonIndex);
};
- // تصاویر رنگ چشم و رنگ مو
const eyeImages = Array.from(
{ length: 26 },
(_, i) => `/images/eyes/${String(i + 1).padStart(2, "0")}.png`
@@ -79,9 +82,8 @@ function Colors() {
(_, i) => `/images/hairs/${String(i + 1).padStart(2, "0")}.png`
);
- // تابع برای ذخیره نام فایل انتخاب شده
const handleImageSelect = (image: string, type: "eye" | "hair") => {
- const fileName = image.split("/").pop(); // استخراج فقط نام فایل
+ const fileName = image.split("/").pop();
if (type === "eye") {
setSelectedEyeImage(fileName || "");
} else if (type === "hair") {
@@ -89,98 +91,97 @@ function Colors() {
}
};
-
-
-
return (
-
-
- سایز
-
+
+
+
+ {t("auth.sizesTitle")}
+
- مشخصات ظاهری
+
+ {t("auth.appearanceDetails")}
+
- {/* Buttons for categories */}
-
-
-
-
- {selectedButton === 1 && (
-
- {eyeImages.map((image) => (
- handleImageSelect(image, "eye")}
- />
- ))}
-
- )}
-
- {selectedButton === 2 && (
-
- {hairImages.map((image) => (
- handleImageSelect(image, "hair")}
- />
- ))}
-
- )}
-
-
- ثبت نام شما تکمیل شد
-
-
- ورود شما به خانواده مدستاگرام را تبریک می گوییم{" "}
-
-
-
-
-
{formatFullName(user?.first_name, user?.last_name)}
-
-
- {user?.user_name}
-
-
+
+
+
+
+ {t("auth.registrationComplete")}
+
+
+ {t("auth.welcomeMessage")}
+
+
+
+
+
{formatFullName(user?.first_name, user?.last_name)}
+
+
+ {user?.user_name}
+
+
+
-
-
-
-
+
+
+ {t("auth.saveAndContinue")}
+
+
+ {t("auth.verificationTimeOffice")}
+
+
+ {t("auth.verificationTimeOffHours")}
+
+
setShowModal(false)}
+ height="200px"
+ >
+
+ {t("auth.shareWorkHint")}
+
+
+
+ {t("auth.createPost")}
+
+
+ {t("auth.later")}
+
+
+
- {/* */}
-
- ثبت و ادامه
-
-
- زمان تایید مدارک 5 دقیقه تا 1 ساعت در ساعات اداری و
-
-
- 3 تا 8 ساعت در ساعات غیر اداری
-
-
setShowModal(false)}
- height="200px"
- >
-
- .برای بهتر دیده شدن نمونه کارهای خود را به اشتراگ بگذراید
-
-
-
- ثبت پست
-
-
- بعدا
-
-
-
-
);
}
diff --git a/src/app/(auth)/verify/cooperation-type/page.tsx b/src/app/(auth)/verify/cooperation-type/page.tsx
index 99663dc..a772a24 100644
--- a/src/app/(auth)/verify/cooperation-type/page.tsx
+++ b/src/app/(auth)/verify/cooperation-type/page.tsx
@@ -5,7 +5,7 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React from "react";
+import React, { useMemo } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
import * as yup from "yup";
@@ -13,18 +13,24 @@ import { useRouter } from "next/navigation";
import AuthNextButton from "@/components/auth/AuthNextButton";
import toast from "react-hot-toast";
import AuthUserDetails from "@/components/auth/AuthUserDetails";
-
-// Validation schema using Yup
-const schema = yup.object().shape({
- selectedButton: yup.boolean().required("انتخاب نوع همکاری الزامی است"),
-});
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function CooperationType() {
+ const { t } = useTranslation("common");
const router = useRouter();
const { request, loading } = useAxios();
const mobile =
typeof window !== "undefined" ? localStorage.getItem("mobile") : null;
+ const schema = useMemo(
+ () =>
+ yup.object().shape({
+ selectedButton: yup.boolean().required(t("auth.cooperationRequired")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
selectedButton: null,
@@ -39,7 +45,7 @@ function CooperationType() {
});
router.push("/verify/public-relations");
} catch (err: any) {
- toast.error(err?.message || "خطای نامشخصی رخ داد.");
+ toast.error(err?.response?.data?.message || t("auth.unknownError"));
} finally {
setSubmitting(false);
}
@@ -47,62 +53,66 @@ function CooperationType() {
});
return (
-
-
+ {t("auth.saveAndContinue")}
+
+
+
+
);
}
diff --git a/src/app/(auth)/verify/public-relations/page.tsx b/src/app/(auth)/verify/public-relations/page.tsx
index 4cf115e..d5c7f70 100644
--- a/src/app/(auth)/verify/public-relations/page.tsx
+++ b/src/app/(auth)/verify/public-relations/page.tsx
@@ -5,7 +5,7 @@ import AuthPageLayout, {
AuthFormFooter,
AuthPageContent,
} from "@/components/auth/AuthPageLayout";
-import React from "react";
+import React, { useMemo } from "react";
import useAxios from "@/hooks/useAxios";
import { useFormik } from "formik";
import * as yup from "yup";
@@ -13,19 +13,24 @@ import { useRouter } from "next/navigation";
import AuthNextButton from "@/components/auth/AuthNextButton";
import toast from "react-hot-toast";
import AuthUserDetails from "@/components/auth/AuthUserDetails";
-
-// Validation schema using Yup
-const schema = yup.object().shape({
- bio: yup.string().required("نوشتن bio الزامی است"),
-});
-
+import { useTranslation } from "react-i18next";
+import LocalePageShell from "@/components/i18n/LocalePageShell";
function PublicRelations() {
+ const { t } = useTranslation("common");
const router = useRouter();
const { request, loading } = useAxios();
const mobile =
typeof window !== "undefined" ? localStorage.getItem("mobile") : null;
+ const schema = useMemo(
+ () =>
+ yup.object().shape({
+ bio: yup.string().required(t("auth.bioRequired")),
+ }),
+ [t]
+ );
+
const formik = useFormik({
initialValues: {
selectedButton: null,
@@ -41,7 +46,7 @@ function PublicRelations() {
});
router.push("/verify/location");
} catch (err: any) {
- toast.error(err?.message || "خطای نامشخصی رخ داد.");
+ toast.error(err?.response?.data?.message || t("auth.unknownError"));
} finally {
setSubmitting(false);
}
@@ -49,55 +54,61 @@ function PublicRelations() {
});
return (
-
-