diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ee368e6416..c13b47baf8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,11 +18,6 @@ repos: args: - --fix - id: ruff-format - - repo: https://github.com/biomejs/pre-commit - rev: v0.1.0 - hooks: - - id: biome-check - additional_dependencies: ["@biomejs/biome@1.4.1"] ci: autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks diff --git a/frontend/src/components/Admin/AddUser.tsx b/frontend/src/components/Admin/AddUser.tsx index 2fa91d513a..c275df67a7 100644 --- a/frontend/src/components/Admin/AddUser.tsx +++ b/frontend/src/components/Admin/AddUser.tsx @@ -21,6 +21,7 @@ import { useMutation, useQueryClient } from "react-query" import { type UserCreate, UsersService } from "../../client" import type { ApiError } from "../../client/core/ApiError" import useCustomToast from "../../hooks/useCustomToast" +import { emailPattern } from "../../utils" interface AddUserProps { isOpen: boolean @@ -95,10 +96,7 @@ const AddUser: React.FC = ({ isOpen, onClose }) => { id="email" {...register("email", { required: "Email is required", - pattern: { - value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, - message: "Invalid email address", - }, + pattern: emailPattern, })} placeholder="Email" type="email" diff --git a/frontend/src/components/Admin/EditUser.tsx b/frontend/src/components/Admin/EditUser.tsx index f852972d44..aa4ee59d3e 100644 --- a/frontend/src/components/Admin/EditUser.tsx +++ b/frontend/src/components/Admin/EditUser.tsx @@ -25,6 +25,7 @@ import { UsersService, } from "../../client" import useCustomToast from "../../hooks/useCustomToast" +import { emailPattern } from "../../utils" interface EditUserProps { user: UserOut @@ -101,10 +102,7 @@ const EditUser: React.FC = ({ user, isOpen, onClose }) => { id="email" {...register("email", { required: "Email is required", - pattern: { - value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, - message: "Invalid email address", - }, + pattern: emailPattern, })} placeholder="Email" type="email" diff --git a/frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx index 6be3b0515d..8466d6cf93 100644 --- a/frontend/src/components/UserSettings/UserInformation.tsx +++ b/frontend/src/components/UserSettings/UserInformation.tsx @@ -24,6 +24,7 @@ import { } from "../../client" import useAuth from "../../hooks/useAuth" import useCustomToast from "../../hooks/useCustomToast" +import { emailPattern } from "../../utils" const UserInformation: React.FC = () => { const queryClient = useQueryClient() @@ -114,10 +115,7 @@ const UserInformation: React.FC = () => { id="email" {...register("email", { required: "Email is required", - pattern: { - value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, - message: "Invalid email address", - }, + pattern: emailPattern, })} type="email" size="md" diff --git a/frontend/src/routes/login.tsx b/frontend/src/routes/login.tsx index ca8d295c2b..4443e7f498 100644 --- a/frontend/src/routes/login.tsx +++ b/frontend/src/routes/login.tsx @@ -25,6 +25,7 @@ import Logo from "../assets/images/fastapi-logo.svg" import type { ApiError } from "../client" import type { Body_login_login_access_token as AccessToken } from "../client/models/Body_login_login_access_token" import useAuth, { isLoggedIn } from "../hooks/useAuth" +import { emailPattern } from "../utils" export const Route = createFileRoute("/login")({ component: Login, @@ -87,10 +88,7 @@ function Login() {