diff --git a/.env b/.env index b43a446..17d807f 100644 --- a/.env +++ b/.env @@ -9,8 +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@127.0.0.1:5454/thetiptop" diff --git a/components/Layout.tsx b/components/Layout.tsx index 22bc998..ce22eb0 100644 --- a/components/Layout.tsx +++ b/components/Layout.tsx @@ -7,8 +7,13 @@ type Props = { children?: React.ReactNode; }; + +const layoutStyle = { + height: "100vh" +} + const Layout = ({ children }: Props) => -
+
diff --git a/components/NavBar.tsx b/components/NavBar.tsx index 2e7622f..0e1c67c 100644 --- a/components/NavBar.tsx +++ b/components/NavBar.tsx @@ -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(); @@ -33,12 +35,20 @@ const NavBar = () => { width={250} height={100} /> +
+ +
Accueil | Nos produits | Contactez-nous | - Connexion + {!session && Connexion} + {session && Mon compte} + {session && signOut()} className={style.link} >Se déconnecter} + + + {session && {session.user.email}}
@@ -46,6 +56,9 @@ const NavBar = () => { ☰
+
+
+
@@ -54,8 +67,11 @@ const NavBar = () => {
Accueil | Nos produits | + + Contactez-nous | - Connexion + Connexion + {session && {session.user.email}}
diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index 452f9c6..51b5e7f 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -18,28 +18,35 @@ 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), secret: process.env.SECRET, callbacks: { async session({ session, user }) { - const getCurrentUser = await prisma.user.findMany({ where: { email: session.user.email }, }) //récupération du role const { role } = getCurrentUser[0]; - session.user.role = role - - - return session } }, - error: '/error', - + pages: { + // signIn: '/auth/signin', + // signOut: '/auth/signout', + // error: '/auth/error', // Error code passed in query string as ?error= + verifyRequest: '/verify-request', // (used for check email message) + // newUser: '/auth/new-user' // New users will be directed here on first sign in (leave the property out if not of interest) + } } diff --git a/pages/connexion.tsx b/pages/connexion.tsx index 284aa84..2d22ed2 100644 --- a/pages/connexion.tsx +++ b/pages/connexion.tsx @@ -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,42 @@ 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"; +import { isGeneratorFunction } from "util/types"; + +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(), - acceptTerms: Yup.bool().oneOf( - [true], - "Accepter les conditions est obligatoire" - ) + // email: Yup.string().email( + // "Veuillez rentrer une adresse mail valide" + // ), + // acceptTerms: Yup.bool().oneOf( + // [true], + // "Vous devez accepter les conditions obligatoire" + // ) }) const { register, + clearErrors, handleSubmit, watch, trigger, @@ -55,37 +66,63 @@ const MainPage = () => { }); - const term = watch("acceptTerms") + const acceptTermCheckBox = watch("acceptTerms") + + const connexionWithGoogle = async () => { - if (term) { - signIn("google"); + if (onCheckTerms()) { + signIn("google") } - //relance une vérification de la checkbox await trigger("acceptTerms"); } - const onSubmit = async (data: LoginSubmitForm) => { + const onMailSubmit = async (data: LoginSubmitForm) => { + if (onCheckTerms()) { + signIn("email", { email: data.email, callbackUrl: `${window.location.origin}/create` }) + } + await trigger("acceptTerms"); + await trigger("email"); + } - // 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); - // } - }; + const onCheckTerms = (): any => { + if (acceptTermCheckBox) { + return true; + } else { + toast.error('Vous devez accepter les conditions obligatoires', { + position: "top-center", + autoClose: 2000, + 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); + // } return ( <> @@ -93,70 +130,47 @@ const MainPage = () => { -
- -

Connexion

- -
+ +
- -
- - -
+
-
- - - - -
- -
- -
- -
- - - -
-
- +
+
+ +
+
+ + +
-
{errors.acceptTerms?.message}
-
{errors.email?.message}
-
- - - - + ) }; diff --git a/pages/verify-request.tsx b/pages/verify-request.tsx new file mode 100644 index 0000000..f304887 --- /dev/null +++ b/pages/verify-request.tsx @@ -0,0 +1,61 @@ +import React, { useEffect } from "react"; +import prisma from '../lib/prisma' + + +import Image from 'next/image'; +import * as Yup from 'yup'; +import Head from "next/head"; +import { getCsrfToken, signIn, useSession } from "next-auth/react"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { useForm } from "react-hook-form"; + +import { AiOutlineCheck } from 'react-icons/ai' + +import Router from "next/router"; + + +import style from '../styles/Connexion.module.css'; + +import imageConnexion from '../public/images/connexion_image.png' + + +import Link from "next/link"; + +import { GrValidate } from 'react-icons/gr' +import { toast } from "react-toastify"; +import { Token } from "nodemailer/lib/xoauth2"; +import { isGeneratorFunction } from "util/types"; + + + +const VerifyRequest = () => { + + //va rediriger après 3 seconde + useEffect(() => { + setTimeout(() => { + Router.push("/") + }, 3000) + }, []) + + return ( + <> + + Page Confirmation email + + + +
+

Un email a été envoyé

+ +
+ +
+
+ ) +}; + +export default VerifyRequest; + + diff --git a/public/images/jeuconcours.png b/public/images/jeuconcours.png index bd972f0..57a6fde 100644 Binary files a/public/images/jeuconcours.png and b/public/images/jeuconcours.png differ diff --git a/public/images/rearrow.png b/public/images/rearrow.png new file mode 100644 index 0000000..959f539 Binary files /dev/null and b/public/images/rearrow.png differ diff --git a/styles/Index.module.css b/styles/Index.module.css index d1823f4..ec09fc0 100644 --- a/styles/Index.module.css +++ b/styles/Index.module.css @@ -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; } diff --git a/styles/NavBar.module.css b/styles/NavBar.module.css index 04c7f68..b11a4ee 100644 --- a/styles/NavBar.module.css +++ b/styles/NavBar.module.css @@ -9,6 +9,12 @@ text-decoration: underline; } +.connexion { + position: absolute; + top: 0; + right: 0; +} + /**************************/ .overlay { diff --git a/styles/globals.css b/styles/globals.css index ac515ed..0a0828c 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -5,6 +5,7 @@ body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; + font-size: small; } a,