add : connexion et deconnection en cours

feature/page-admin
Eric 4 years ago
parent cb847b8ed9
commit c84194b7b9

@ -9,10 +9,13 @@ GITHUB_SECRET=YOUR_GITHUB_CLIENT_SECRET
GOOGLE_CLIENT_ID=5572607706-p6dftn0ss3m2qnvqbhk4khqte8lk7kt3.apps.googleusercontent.com
GOOGLE_CLIENT_SECRET=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
DATABASE_URL="postgres://postgres:postgrespwd@localhost:5432/thetiptop"
# Email (magic link)
EMAIL_SERVER=smtp://2bfdbee5372880:af828174d7f2ad@smtp.mailtrap.io:2525
EMAIL_SERVER_USER=2bfdbee5372880
EMAIL_SERVER_PASSWORD=af828174d7f2ad
EMAIL_SERVER_HOST=smtp.mailtrap.io
EMAIL_SERVER_PORT=2525
EMAIL_FROM=thetiptop@test.com
DATABASE_URL="postgres://postgres:postgrespwd@localhost:5432/thetiptop"

@ -6,6 +6,8 @@ import { signOut, useSession } from "next-auth/react";
import style from '../styles/NavBar.module.css';
import Image from 'next/image';
import { FiArrowRight } from 'react-icons/fi';
const NavBar = () => {
const navRef = useRef<HTMLInputElement>();
@ -33,12 +35,20 @@ const NavBar = () => {
width={250}
height={100}
/>
</div>
<div className={`justify-content-center text-center ${style['hidden-mobile']}`}>
<Link href="/" legacyBehavior><a className={style.link} >Accueil</a></Link> |
<Link href="/contact" legacyBehavior><a className={style.link} >Nos produits</a></Link> |
<Link href="/" legacyBehavior><a className={style.link} >Contactez-nous</a></Link> |
<Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>
{!session && <Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>}
{session && <Link href="/connexion" legacyBehavior><a className={style.link} >Mon compte</a></Link>}
{session && <Link href="/" legacyBehavior><a onClick={() => signOut()} className={style.link} >Se déconnecter</a></Link>}
{session && <span className={`${style.connexion} badge rounded-pill bg-light text-dark`}><FiArrowRight />{session.user.email}</span>}
</div>
@ -46,6 +56,9 @@ const NavBar = () => {
<span className={`${style.burgerButton}`} onClick={openNav}>&#9776;</span>
</div>
<div className="d-flex justify-content-center">
</div>
<div ref={navRef} className={style.overlay} onClick={closeNav}>
@ -54,8 +67,11 @@ const NavBar = () => {
<div className="overlay-content">
<Link href="/" legacyBehavior><a className={style.link} >Accueil</a></Link> |
<Link href="/contact" legacyBehavior><a className={style.link} >Nos produits</a></Link> |
<Link href="/" legacyBehavior><a className={style.link} >Contactez-nous</a></Link> |
<Link href="/user" legacyBehavior><a className={style.link} >Connexion</a></Link>
<Link href="/connexion" legacyBehavior><a className={style.link} >Connexion</a></Link>
{session && <span className={`${style.connexion} badge rounded-pill bg-light text-dark`}><FiArrowRight />{session.user.email}</span>}
</div>
</div>

@ -18,8 +18,15 @@ const options = {
authorization: 'https://accounts.google.com/o/oauth2/v2/auth?prompt=consent&access_type=offline&response_type=code',
}),
EmailProvider({
server: process.env.EMAIL_SERVER,
from: process.env.EMAIL_FROM,
server: {
host: process.env.EMAIL_SERVER_HOST,
port: parseInt(process.env.EMAIL_SERVER_PORT),
auth: {
user: process.env.EMAIL_SERVER_USER,
pass: process.env.EMAIL_SERVER_PASSWORD
}
},
from: process.env.EMAIL_FROM
}),
],
adapter: PrismaAdapter(prisma),
@ -32,14 +39,9 @@ const options = {
})
//récupération du role
const { role } = getCurrentUser[0];
session.user.role = role
return session
}
},
error: '/error',
}

@ -4,7 +4,7 @@ import prisma from '../lib/prisma'
import Image from 'next/image';
import * as Yup from 'yup';
import Head from "next/head";
import { signIn, useSession } from "next-auth/react";
import { getCsrfToken, signIn, useSession } from "next-auth/react";
import { yupResolver } from "@hookform/resolvers/yup";
import { useForm } from "react-hook-form";
@ -21,31 +21,43 @@ import imageConnexion from '../public/images/connexion_image.png'
import Link from "next/link";
import { SiGnuprivacyguard } from 'react-icons/si'
import { toast } from "react-toastify";
import { Token } from "nodemailer/lib/xoauth2";
export async function getServerSideProps(context) {
const csrfToken = await getCsrfToken(context)
return {
props: { csrfToken },
}
}
type LoginSubmitForm = {
email: string,
acceptTerms: boolean
};
type Props = {
csrfToken: Token
}
const MainPage = () => {
const MainPage = ({ csrfToken }: Props) => {
const { data: session } = useSession();
const validationSchema = Yup.object().shape({
email: Yup.string().email(),
email: Yup.string().email(
"Veuillez rentrer une adresse mail valide"
),
acceptTerms: Yup.bool().oneOf(
[true],
"Accepter les conditions est obligatoire"
"Vous devez accepter les conditions obligatoire"
)
})
const {
register,
clearErrors,
handleSubmit,
watch,
trigger,
@ -56,36 +68,68 @@ const MainPage = () => {
const term = watch("acceptTerms")
const connexionWithGoogle = async () => {
clearErrors("acceptTerms")
if (term) {
signIn("google");
} else {
toast.error('Vous devez accepter les conditions obligatoire', {
position: "top-center",
autoClose: 5000,
hideProgressBar: false,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
progress: undefined,
theme: "light",
});
//relance une vérification de la checkbox
// await trigger("acceptTerms");
}
//relance une vérification de la checkbox
await trigger("acceptTerms");
}
const onSubmit = async (data: LoginSubmitForm) => {
if (term && !errors.email?.message) {
console.log("email", data.email);
signIn("email", { email: data.email, callbackUrl: `${window.location.origin}/create` })
} else {
toast.error('Vous devez accepter les conditions obligatoire', {
position: "top-center",
autoClose: 5000,
hideProgressBar: false,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
progress: undefined,
theme: "light",
});
}
}
// try {
// const body = { bioValue: data.bio };
// await fetch(`/api/profile`, {
// method: "POST",
// headers: { "Content-Type": "application/json" },
// body: JSON.stringify(body),
// })
// .then((res) => res.json())
// .then((data) => {
// setResponse(data);
// console.log('response', data);
// })
// await Router.push("/profile");
// } catch (error) {
// console.error(error);
// }
};
// try {
// const body = { bioValue: data.bio };
// await fetch(`/api/profile`, {
// method: "POST",
// headers: { "Content-Type": "application/json" },
// body: JSON.stringify(body),
// })
// .then((res) => res.json())
// .then((data) => {
// setResponse(data);
// console.log('response', data);
// })
// await Router.push("/profile");
// } catch (error) {
// console.error(error);
// }
return (
<>
<Head>
@ -93,70 +137,48 @@ const MainPage = () => {
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
</Head>
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
<h1 className="fw-light">Connexion</h1>
<SiGnuprivacyguard size={50} />
<form onSubmit={handleSubmit(onSubmit)}>
<div className="form-group mx-auto my-3 w-100">
<div className="mb-3">
<input
type="email"
className={`form-control ${errors.email ? 'is-invalid' : ''}`}
placeholder="Email..."
{...register("email")}
/>
</div>
<input
type="email" id="email" name="email"
className={`mb-3 form-control ${errors.email ? 'is-invalid' : ''}`}
placeholder="Email..."
{...register("email")}
/>
<div className="d-grid">
<button type="submit" className="btn btn-primary">
<button type="submit" className="btn d-grid btn-primary">
Se connecter avec mon email
</button>
</div>
<hr />
<div className="d-grid">
<button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}>
<span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google
</button>
</div>
<div className="form-check">
<label
htmlFor="acceptTerms"
className="form-check-label"
>
J'ai lu et j'accepte les
conditions
</label>
<input
type="checkbox"
className="form-check-input"
{...register("acceptTerms")}
name="acceptTerms"
/>
</div>
<div className="invalid-feedback alert alert-danger">{errors.email?.message}</div>
</div>
<hr />
<div className="d-grid">
<button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}>
<span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google
</button>
</div>
<div className="form-group">
<label
htmlFor="acceptTerms"
className="form-check-label"
>
J'ai lu et j'accepte les
conditions
</label>
<input
type="checkbox"
className={`form-check-input ${errors.acceptTerms ? 'is-invalid' : ''}`}
{...register("acceptTerms")}
name="acceptTerms"
/>
{/* <div className="invalid-feedback alert alert-danger">{errors.acceptTerms?.message}</div> */}
</div>
</form>
<div className="invalid-feedback alert alert-danger">{errors.acceptTerms?.message}</div>
<div className="invalid-feedback alert alert-danger">{errors.email?.message}</div>
</div>
</div >
</>)
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

@ -11,4 +11,10 @@
.imageWrapper {
display: block;
}
.connexion {
position: absolute;
top: 0;
right: 0;
}

@ -5,7 +5,7 @@
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: contain;
animation: zoomInOut 4s ease-in-out infinite;
/* animation: zoomInOut 4s ease-in-out infinite; */
z-index: 9000;
}

@ -9,6 +9,12 @@
text-decoration: underline;
}
.connexion {
position: absolute;
top: 0;
right: 0;
}
/**************************/
.overlay {

Loading…
Cancel
Save