-
+
+
{APP_NAME}
- {children}
+ {children}
);
diff --git a/apps/admin/src/app/(auth)/_layout/index.ts b/apps/admin/src/app/(auth)/_layout/index.ts
deleted file mode 100644
index b6da60e..0000000
--- a/apps/admin/src/app/(auth)/_layout/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./auth-layout";
diff --git a/apps/admin/src/app/(auth)/layout.tsx b/apps/admin/src/app/(auth)/layout.tsx
index 0a1e82b..e4ab0ab 100644
--- a/apps/admin/src/app/(auth)/layout.tsx
+++ b/apps/admin/src/app/(auth)/layout.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { AuthLayout as Layout } from "./_layout";
+import { AuthLayout as Layout } from "./_layout/auth-layout";
export default function AuthLayout({ children }: { children: React.ReactNode }) {
return
{children};
diff --git a/apps/admin/src/app/(auth)/signin/_components/signin.tsx b/apps/admin/src/app/(auth)/signin/_components/signin.tsx
new file mode 100644
index 0000000..23a010b
--- /dev/null
+++ b/apps/admin/src/app/(auth)/signin/_components/signin.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import Link from "next/link";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useForm } from "react-hook-form";
+import toast from "react-hot-toast";
+import { Button } from "@/components/buttons";
+import { TextInput } from "@/components/forms";
+import { Card, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
+import { Form } from "@/components/ui/form";
+import { signIn } from "@/lib/auth-client";
+import { ErrorMessages } from "../_lib/constants";
+
+type SignInForm = {
+ username: string;
+ password: string;
+};
+
+export const SignIn = () => {
+ const [toastShown, setToastShown] = useState(false);
+ const [errorType, setErrorType] = useState("");
+ const router = useRouter();
+ const searchParams = useSearchParams();
+ const errorCode = searchParams?.get("code") ?? "";
+
+ const form = useForm
({
+ mode: "onBlur",
+ defaultValues: {
+ username: "",
+ password: "",
+ },
+ });
+ const { errors, isSubmitting } = form.formState;
+
+ useEffect(() => {
+ if (errorCode === "E401" && !toastShown) {
+ // eslint-disable-next-line react-hooks/set-state-in-effect
+ setToastShown(true);
+ toast.error("認証が無効です。再度ログインしてください。", {
+ duration: 5000,
+ id: "session-invalid-toast",
+ });
+ }
+ if (errorCode === "SignOut" && !toastShown) {
+ setToastShown(true);
+ toast.success("ログアウトしました", {
+ duration: 5000,
+ id: "signout-toast",
+ });
+ }
+ }, [errorCode, toastShown]);
+
+ const signInSubmit = async (data: SignInForm) => {
+ const result = await signIn.email({
+ email: data.username,
+ password: data.password,
+ });
+
+ if (result.error) {
+ setErrorType(result.error.code || "CredentialsSignin");
+ } else if (result.data) {
+ router.refresh();
+ }
+ };
+
+ const error = errorType && (ErrorMessages[errorType] ?? ErrorMessages.default);
+
+ return (
+
+
+ Login to your account
+
+
+
+
+
+ Forgot password?
+
+
+
+ );
+};
diff --git a/apps/admin/src/app/(auth)/signin/_components/signin/index.ts b/apps/admin/src/app/(auth)/signin/_components/signin/index.ts
deleted file mode 100644
index 717070c..0000000
--- a/apps/admin/src/app/(auth)/signin/_components/signin/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./signin";
diff --git a/apps/admin/src/app/(auth)/signin/_components/signin/signin.module.scss b/apps/admin/src/app/(auth)/signin/_components/signin/signin.module.scss
deleted file mode 100644
index 65f523b..0000000
--- a/apps/admin/src/app/(auth)/signin/_components/signin/signin.module.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-@use "styles/utils" as utils;
-
-.container {
- width: 400px;
- background-color: #fff;
- border: 1px solid #d8dbe0;
- padding: 1rem 2rem 2rem;
-
- @include utils.sp {
- width: 90%;
- margin: 1rem auto 0;
- }
-}
-
-.title {
- font-size: 2rem;
- margin-bottom: 1rem;
- padding-bottom: 1rem;
-}
-
-.suspend {
- margin: 1rem 0;
-
- .message {
- font-weight: 500;
- font-size: 13px;
- line-height: 1.25rem;
- }
-}
-
-.form {
- margin-top: 2rem;
- display: flex;
- flex-direction: column;
- gap: 1.5rem;
-
- @include utils.sp {
- width: 100%;
- margin-bottom: 2rem;
- padding: 0;
- }
-}
-
-.login {
- width: 130px;
-}
-
-.box {
- padding-top: 1.5rem;
-
- @include utils.sp {
- width: 100%;
- display: flex;
- justify-content: center;
- }
-}
-
-.forget {
- font-weight: 500;
- font-size: 13px;
- line-height: 19px;
- color: utils.$accentColor;
-
- &:hover {
- color: utils.$subColor;
- }
-}
-
-.error {
- color: utils.$invalidColor;
-}
diff --git a/apps/admin/src/app/(auth)/signin/_components/signin/signin.tsx b/apps/admin/src/app/(auth)/signin/_components/signin/signin.tsx
deleted file mode 100644
index 527ae42..0000000
--- a/apps/admin/src/app/(auth)/signin/_components/signin/signin.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { useForm } from "react-hook-form";
-import { Button } from "@/components/buttons";
-import { TextInput } from "@/components/forms";
-import { signIn } from "@/lib/auth-client";
-import { ErrorMessages } from "../constants";
-import type { LoginUser } from "../types";
-import ss from "./signin.module.scss";
-
-type SignInForm = {
- username: string;
- password: string;
-};
-
-type Props = {
- user?: LoginUser;
-};
-
-export const SignIn = ({ user }: Props) => {
- const [errorType, setErrorType] = useState("");
- const router = useRouter();
- const {
- register,
- handleSubmit,
- formState: { errors, isSubmitting },
- } = useForm({
- mode: "onBlur",
- });
-
- const signInSubmit = handleSubmit(async (data: SignInForm) => {
- const result = await signIn.email({
- email: data.username,
- password: data.password,
- });
-
- if (result.error) {
- setErrorType(result.error.code || "CredentialsSignin");
- } else if (result.data) {
- router.refresh();
- }
- });
-
- const error = errorType && (ErrorMessages[errorType] ?? ErrorMessages.default);
-
- return (
-
-
Sign in
- {user?.status === "suspend" && (
-
-
Your account has been suspended for the following reasons:
-
f
-
- )}
-
-
-
- Forgot password?
-
-
-