diff --git a/.gitignore b/.gitignore index e679955..c25534b 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,5 @@ sonar.properties **/*.copy.ts **/*.copy.scss **/*.copy.html + +certificates \ No newline at end of file diff --git a/package.json b/package.json index 3d5bde6..a536fb4 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ }, "scripts": { "dev": "next dev", + "secure": "next dev --experimental-https", "build": "next build", "start": "next start", "lint": "next lint", diff --git a/src/app/login/_components/loginForm/presentation.tsx b/src/app/login/_components/loginForm/presentation.tsx index 7fe5898..82c04f9 100644 --- a/src/app/login/_components/loginForm/presentation.tsx +++ b/src/app/login/_components/loginForm/presentation.tsx @@ -1,4 +1,4 @@ -import { Button } from "@/modules/common/components/button"; +import { Button, Form } from "react-bootstrap"; import { ErrorMessage } from "@/modules/common/components/errorMessage"; import { SubmissionResult, useForm } from "@conform-to/react"; import { parseWithZod } from "@conform-to/zod"; @@ -32,33 +32,36 @@ export const LoginForm = ({ result, action, isPending }: Props) => { return ( <> -
-
- + + Adresse email + -
-
- + + Mot de passe + -
- -
+ +
+ +
+ ); }; diff --git a/src/app/register/_components/registrationForm/presentation.tsx b/src/app/register/_components/registrationForm/presentation.tsx index 16eab5b..0dfde8a 100644 --- a/src/app/register/_components/registrationForm/presentation.tsx +++ b/src/app/register/_components/registrationForm/presentation.tsx @@ -1,4 +1,4 @@ -import { Button, Form } from 'react-bootstrap'; +import { Button, Form } from "react-bootstrap"; //import { Button } from "@/modules/common/components/button"; import { ErrorMessage } from "@/modules/common/components/errorMessage"; import { SubmissionResult, useForm } from "@conform-to/react"; @@ -7,96 +7,95 @@ import { startTransition } from "react"; import { inputsSchema } from "./types"; type Props = { - action?: (formData: FormData) => void; - isPending?: boolean; - result?: SubmissionResult; + action?: (formData: FormData) => void; + isPending?: boolean; + result?: SubmissionResult; }; export const RegistrationForm = ({ result, action, isPending }: Props) => { - const [form, fields] = useForm({ - lastResult: result, - onValidate({ formData }) { - return parseWithZod(formData, { schema: inputsSchema }); - }, - // onSubmit is defined to avoid resetting form after successful submission - // see https://github.com/edmundhung/conform/discussions/606 - onSubmit(event, { formData }) { - event.preventDefault(); - startTransition(() => { - action?.(formData); - }); - }, - shouldValidate: "onBlur", - shouldRevalidate: "onBlur", - }); + const [form, fields] = useForm({ + lastResult: result, + onValidate({ formData }) { + return parseWithZod(formData, { schema: inputsSchema }); + }, + // onSubmit is defined to avoid resetting form after successful submission + // see https://github.com/edmundhung/conform/discussions/606 + onSubmit(event, { formData }) { + event.preventDefault(); + startTransition(() => { + action?.(formData); + }); + }, + shouldValidate: "onBlur", + shouldRevalidate: "onBlur", + }); - return ( - <> - -
- - Nom - - - - - Prénom - - - - - Pseudo - - - - - Adresse email - - - - Nous ne partagerons jamais votre email avec qui que ce soit. - - - - Mot de passe - - - - -
- - ); + return ( + <> + +
+ + Nom + + + + + Prénom + + + + + Pseudo + + + + + Adresse email + + + + + Mot de passe + + + +
+ +
+
+ + ); }; diff --git a/src/modules/common/components/footer/footer.tsx b/src/modules/common/components/footer/footer.tsx index c93ae70..fb250c7 100644 --- a/src/modules/common/components/footer/footer.tsx +++ b/src/modules/common/components/footer/footer.tsx @@ -18,8 +18,8 @@ export const Footer = () => (
  • - L'équipe de passionnés Ad Astra est réactive et à l'écoute de vos demandes afin de vous - accompagner au mieux et satisfaire vos besoins en fleurs et hashes CBD de qualité. + L'équipe Ad Astra est réactive et à l'écoute de vos demandes afin de vous accompagner au mieux + et satisfaire vos besoins en fleurs et hashes CBD de qualité.
  • Exigez la qualité Ad Astra, vous la méritez.
@@ -124,7 +124,7 @@ export const Footer = () => ( -
-

Copyright © 2025 Ad Astra

+
+

Copyright © 2025 Ad Astra

); diff --git a/src/styles/styles.scss b/src/styles/styles.scss index 7a5b176..99f8f52 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -5,7 +5,7 @@ $success: #7952b3; $dark-blue: #141d5e; /*#171f50;*/ $dark-grey: #222222; $gold: #d7c067; -$orange: #FF8300; +$orange: #ff8300; $time-grey: #b7b2aa; $time-grey-dark: #474747; $dark-grey: #222222; @@ -34,6 +34,13 @@ body { } } +.error-messages { + width: 100%; + margin-top: 0.25rem; + font-size: 0.875em; + color: var(--bs-form-invalid-color); +} + .clock { height: 100px; .divider {