diff --git a/next-env.d.ts b/next-env.d.ts index c4b7818..9edff1c 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,6 @@ /// /// -import "./.next/dev/types/routes.d.ts"; +import "./.next/types/routes.d.ts"; // NOTE: This file should not be edited // see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/src/app/[locale]/(auth)/signin/page.tsx b/src/app/[locale]/(auth)/signin/page.tsx index ccf3b27..bc60df9 100644 --- a/src/app/[locale]/(auth)/signin/page.tsx +++ b/src/app/[locale]/(auth)/signin/page.tsx @@ -1,43 +1,15 @@ -"use client"; - -import { - Box, - Flex, - Heading, - Input, - Link as ChakraLink, - Text, - ClientOnly, -} from "@chakra-ui/react"; -import { Button } from "@/components/ui/buttons/button"; -import { Switch } from "@/components/ui/forms/switch"; -import { Field } from "@/components/ui/forms/field"; -import { useTranslations } from "next-intl"; -import signInImage from "../../../../../public/assets/img/sign-in-image.png"; -import { InputGroup } from "@/components/ui/forms/input-group"; -import { BiLock } from "react-icons/bi"; -import { useForm } from "react-hook-form"; -import { yupResolver } from "@hookform/resolvers/yup"; -import * as yup from "yup"; -import { Link, useRouter } from "@/i18n/navigation"; -import { MdMail } from "react-icons/md"; -import { PasswordInput } from "@/components/ui/forms/password-input"; -import { Skeleton } from "@/components/ui/feedback/skeleton"; -import { signIn } from "next-auth/react"; -import { toaster } from "@/components/ui/feedback/toaster"; -import { useState } from "react"; - import { Metadata } from "next"; +import { getTranslations } from "next-intl/server"; +import SignInForm from "./signin-form"; -export async function generateMetadata(props: { params: Promise<{ locale: string }> }): Promise { +export async function generateMetadata(props: { + params: Promise<{ locale: string }>; +}): Promise { const params = await props.params; const { locale } = params; const t = await getTranslations({ locale, namespace: "seo" }); const siteUrl = process.env.NEXT_PUBLIC_APP_URL || "https://iddaai.com"; - - // Next.js parses route variables automatically, but for canonical we'll just use a clean relative base if available, - // or let next.js construct it implicitly from metadataBase if not explicitly specified. - // We'll set alternates just for languages based on current path segment as a best effort + const pathSegment = "signin"; return { @@ -53,205 +25,6 @@ export async function generateMetadata(props: { params: Promise<{ locale: string }; } -const schema = yup.object({ - email: yup.string().email().required(), - password: yup.string().required(), -}); - -type SignInForm = yup.InferType; - -const defaultValues = { - email: "test@test.com.tr", - password: "test1234", -}; - -function SignInPage() { - const t = useTranslations(); - const router = useRouter(); - - const [loading, setLoading] = useState(false); - - const { - handleSubmit, - register, - formState: { errors }, - } = useForm({ - resolver: yupResolver(schema), - mode: "onChange", - defaultValues, - }); - - const onSubmit = async (formData: SignInForm) => { - try { - setLoading(true); - const res = await signIn("credentials", { - redirect: false, - email: formData.email, - password: formData.password, - }); - - if (res?.error) { - throw new Error(res.error); - } - - router.replace("/home"); - } catch (error) { - toaster.error({ - title: (error as Error).message || "Giriş yaparken hata oluştu!", - type: "error", - }); - } finally { - setLoading(false); - } - }; - - return ( - - - - - - {t("auth.welcome-back")} - - - {t("auth.subtitle")} - - - }> - - - - - }> - - - - - - {t("auth.remember-me")} - - - - }> - - - - - - {t("auth.dont-have-account")} - - {t("auth.sign-up")} - - - - - - - - - - - ); +export default function SignInPage() { + return ; } - -export default SignInPage; diff --git a/src/app/[locale]/(auth)/signin/signin-form.tsx b/src/app/[locale]/(auth)/signin/signin-form.tsx new file mode 100644 index 0000000..0ca3c44 --- /dev/null +++ b/src/app/[locale]/(auth)/signin/signin-form.tsx @@ -0,0 +1,229 @@ +"use client"; + +import { + Box, + Flex, + Heading, + Input, + Link as ChakraLink, + Text, + ClientOnly, +} from "@chakra-ui/react"; +import { Button } from "@/components/ui/buttons/button"; +import { Switch } from "@/components/ui/forms/switch"; +import { Field } from "@/components/ui/forms/field"; +import { useTranslations } from "next-intl"; +import signInImage from "../../../../../public/assets/img/sign-in-image.png"; +import { InputGroup } from "@/components/ui/forms/input-group"; +import { BiLock } from "react-icons/bi"; +import { useForm } from "react-hook-form"; +import { yupResolver } from "@hookform/resolvers/yup"; +import * as yup from "yup"; +import { Link, useRouter } from "@/i18n/navigation"; +import { MdMail } from "react-icons/md"; +import { PasswordInput } from "@/components/ui/forms/password-input"; +import { Skeleton } from "@/components/ui/feedback/skeleton"; +import { signIn } from "next-auth/react"; +import { toaster } from "@/components/ui/feedback/toaster"; +import { useState } from "react"; + +const schema = yup.object({ + email: yup.string().email().required(), + password: yup.string().required(), +}); + +type SignInForm = yup.InferType; + +const defaultValues = { + email: "test@test.com.tr", + password: "test1234", +}; + +export default function SignInForm() { + const t = useTranslations(); + const router = useRouter(); + + const [loading, setLoading] = useState(false); + + const { + handleSubmit, + register, + formState: { errors }, + } = useForm({ + resolver: yupResolver(schema), + mode: "onChange", + defaultValues, + }); + + const onSubmit = async (formData: SignInForm) => { + try { + setLoading(true); + const res = await signIn("credentials", { + redirect: false, + email: formData.email, + password: formData.password, + }); + + if (res?.error) { + throw new Error(res.error); + } + + router.replace("/home"); + } catch (error) { + toaster.error({ + title: (error as Error).message || "Giriş yaparken hata oluştu!", + type: "error", + }); + } finally { + setLoading(false); + } + }; + + return ( + + + + + + {t("auth.welcome-back")} + + + {t("auth.subtitle")} + + + }> + + + + + }> + + + + + + {t("auth.remember-me")} + + + + }> + + + + + + {t("auth.dont-have-account")} + + {t("auth.sign-up")} + + + + + + + + + + + ); +} diff --git a/src/app/[locale]/(auth)/signup/page.tsx b/src/app/[locale]/(auth)/signup/page.tsx index 354b912..61c3c5f 100644 --- a/src/app/[locale]/(auth)/signup/page.tsx +++ b/src/app/[locale]/(auth)/signup/page.tsx @@ -1,43 +1,15 @@ -"use client"; - -import { - Box, - Flex, - Input, - Link as ChakraLink, - Text, - ClientOnly, -} from "@chakra-ui/react"; -import signUpImage from "../../../../../public/assets/img/sign-up-image.png"; -import { Button } from "@/components/ui/buttons/button"; -import { Field } from "@/components/ui/forms/field"; -import { useTranslations } from "next-intl"; -import { useForm } from "react-hook-form"; -import * as yup from "yup"; -import { yupResolver } from "@hookform/resolvers/yup"; -import { InputGroup } from "@/components/ui/forms/input-group"; -import { BiLock, BiUser } from "react-icons/bi"; -import { Link } from "@/i18n/navigation"; -import { MdMail } from "react-icons/md"; -import { useRouter } from "next/navigation"; -import { PasswordInput } from "@/components/ui/forms/password-input"; -import { Skeleton } from "@/components/ui/feedback/skeleton"; -import { authService } from "@/lib/api/auth/service"; -import { useState } from "react"; -import { signIn } from "next-auth/react"; -import { toaster } from "@/components/ui/feedback/toaster"; - import { Metadata } from "next"; +import { getTranslations } from "next-intl/server"; +import SignUpForm from "./signup-form"; -export async function generateMetadata(props: { params: Promise<{ locale: string }> }): Promise { +export async function generateMetadata(props: { + params: Promise<{ locale: string }>; +}): Promise { const params = await props.params; const { locale } = params; const t = await getTranslations({ locale, namespace: "seo" }); const siteUrl = process.env.NEXT_PUBLIC_APP_URL || "https://iddaai.com"; - - // Next.js parses route variables automatically, but for canonical we'll just use a clean relative base if available, - // or let next.js construct it implicitly from metadataBase if not explicitly specified. - // We'll set alternates just for languages based on current path segment as a best effort + const pathSegment = "signup"; return { @@ -53,212 +25,6 @@ export async function generateMetadata(props: { params: Promise<{ locale: string }; } -const schema = yup.object({ - name: yup.string().required(), - email: yup.string().email().required(), - password: yup.string().min(8).required(), -}); - -type SignUpForm = yup.InferType; - -function SignUpPage() { - const t = useTranslations(); - const router = useRouter(); - const [isSubmitting, setIsSubmitting] = useState(false); - - const { - handleSubmit, - register, - formState: { errors }, - } = useForm({ resolver: yupResolver(schema), mode: "onChange" }); - - const onSubmit = async (formData: SignUpForm) => { - setIsSubmitting(true); - try { - await authService.register({ - email: formData.email, - password: formData.password, - firstName: formData.name, - lastName: "", - }); - - const res = await signIn("credentials", { - redirect: false, - email: formData.email, - password: formData.password, - }); - - if (res?.error) { - throw new Error(res.error); - } - - router.replace("/home"); - } catch (error) { - if (error instanceof Error && error.message) { - toaster.error({ - title: error.message, - type: "error", - }); - } - // other errors are handled by api-service interceptor (toast + 422 display) - } finally { - setIsSubmitting(false); - } - return formData; - }; - - return ( - - - - - {t("auth.create-an-account-now")} - - - - - }> - - - - - }> - - - - - }> - - - - - }> - - - - - - - {t("auth.already-have-an-account")} - - {t("auth.sign-in")} - - - - - - - ); +export default function SignUpPage() { + return ; } - -export default SignUpPage; diff --git a/src/app/[locale]/(auth)/signup/signup-form.tsx b/src/app/[locale]/(auth)/signup/signup-form.tsx new file mode 100644 index 0000000..57f164f --- /dev/null +++ b/src/app/[locale]/(auth)/signup/signup-form.tsx @@ -0,0 +1,236 @@ +"use client"; + +import { + Box, + Flex, + Input, + Link as ChakraLink, + Text, + ClientOnly, +} from "@chakra-ui/react"; +import signUpImage from "../../../../../public/assets/img/sign-up-image.png"; +import { Button } from "@/components/ui/buttons/button"; +import { Field } from "@/components/ui/forms/field"; +import { useTranslations } from "next-intl"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { InputGroup } from "@/components/ui/forms/input-group"; +import { BiLock, BiUser } from "react-icons/bi"; +import { Link } from "@/i18n/navigation"; +import { MdMail } from "react-icons/md"; +import { useRouter } from "next/navigation"; +import { PasswordInput } from "@/components/ui/forms/password-input"; +import { Skeleton } from "@/components/ui/feedback/skeleton"; +import { authService } from "@/lib/api/auth/service"; +import { useState } from "react"; +import { signIn } from "next-auth/react"; +import { toaster } from "@/components/ui/feedback/toaster"; + +const schema = yup.object({ + name: yup.string().required(), + email: yup.string().email().required(), + password: yup.string().min(8).required(), +}); + +type SignUpForm = yup.InferType; + +export default function SignUpForm() { + const t = useTranslations(); + const router = useRouter(); + const [isSubmitting, setIsSubmitting] = useState(false); + + const { + handleSubmit, + register, + formState: { errors }, + } = useForm({ resolver: yupResolver(schema), mode: "onChange" }); + + const onSubmit = async (formData: SignUpForm) => { + setIsSubmitting(true); + try { + await authService.register({ + email: formData.email, + password: formData.password, + firstName: formData.name, + lastName: "", + }); + + const res = await signIn("credentials", { + redirect: false, + email: formData.email, + password: formData.password, + }); + + if (res?.error) { + throw new Error(res.error); + } + + router.replace("/home"); + } catch (error) { + if (error instanceof Error && error.message) { + toaster.error({ + title: error.message, + type: "error", + }); + } + // other errors are handled by api-service interceptor (toast + 422 display) + } finally { + setIsSubmitting(false); + } + return formData; + }; + + return ( + + + + + {t("auth.create-an-account-now")} + + + + + }> + + + + + }> + + + + + }> + + + + + }> + + + + + + + {t("auth.already-have-an-account")} + + {t("auth.sign-in")} + + + + + + + ); +} diff --git a/src/app/[locale]/(site)/about/page.tsx b/src/app/[locale]/(site)/about/page.tsx index 8c61549..04e1af1 100644 --- a/src/app/[locale]/(site)/about/page.tsx +++ b/src/app/[locale]/(site)/about/page.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import { getTranslations } from "next-intl/server"; import { Metadata } from "next";