2 Commits
Author SHA1 Message Date
C 10e415e53e add - cookie consent 2022-12-13 10:20:27 +01:00
C deb3cc922b add - vertical margin des input admin et mon compte 2022-12-13 09:49:27 +01:00
6 changed files with 54 additions and 13 deletions

No files matched your search

+7
View File
@@ -2,6 +2,8 @@ import React, { ReactNode } from "react";
import NavBar from "./NavBar"; import NavBar from "./NavBar";
import Footer from "./Footer"; import Footer from "./Footer";
import CookieConsent from "react-cookie-consent";
type Props = { type Props = {
children?: React.ReactNode; children?: React.ReactNode;
}; };
@@ -10,6 +12,11 @@ const Layout = ({ children }: Props) =>
<div className="layout-container"> <div className="layout-container">
<NavBar /> <NavBar />
{children} {children}
<CookieConsent
buttonText="Je comprends"
style={{ zIndex: "100000", justifyContent:"center" }}
buttonStyle={{color:"white",background:"#76AE0D"}}>
Ce site web utilise des cookies pour améliorer l'expérience de l'utilisateur.</CookieConsent>
<Footer /> <Footer />
</div> </div>
+33
View File
@@ -25,6 +25,7 @@
"nodemailer": "^6.8.0", "nodemailer": "^6.8.0",
"react": "18.2.0", "react": "18.2.0",
"react-chartjs-2": "^5.0.1", "react-chartjs-2": "^5.0.1",
"react-cookie-consent": "^8.0.1",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-hook-form": "^7.39.2", "react-hook-form": "^7.39.2",
"react-icons": "^4.6.0", "react-icons": "^4.6.0",
@@ -5574,6 +5575,11 @@
"resolved": "https://registry.npmjs.org/js-confetti/-/js-confetti-0.11.0.tgz", "resolved": "https://registry.npmjs.org/js-confetti/-/js-confetti-0.11.0.tgz",
"integrity": "sha512-Hc7I3VI4r4H0nq5q/oQK+JJwGoYRYVHK72fGk8E9Ay1dbh+aiZ9yl0yFp1K4oYeq7YFDQAndYChwqLPA3QWQuA==" "integrity": "sha512-Hc7I3VI4r4H0nq5q/oQK+JJwGoYRYVHK72fGk8E9Ay1dbh+aiZ9yl0yFp1K4oYeq7YFDQAndYChwqLPA3QWQuA=="
}, },
"node_modules/js-cookie": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
"integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
},
"node_modules/js-tokens": { "node_modules/js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -7272,6 +7278,20 @@
"react": "^16.8.0 || ^17.0.0 || ^18.0.0" "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
} }
}, },
"node_modules/react-cookie-consent": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/react-cookie-consent/-/react-cookie-consent-8.0.1.tgz",
"integrity": "sha512-4A2jzPQDFfBhtxIz4hYX+vJ0QnOknGdOXpEoetXzgwUrMtxVJVow8YgBsGerNt5rJI7WhKkHwr8LmxekxgVejg==",
"dependencies": {
"js-cookie": "^2.2.1"
},
"engines": {
"node": ">=10"
},
"peerDependencies": {
"react": ">=16"
}
},
"node_modules/react-dom": { "node_modules/react-dom": {
"version": "18.2.0", "version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
@@ -13024,6 +13044,11 @@
"resolved": "https://registry.npmjs.org/js-confetti/-/js-confetti-0.11.0.tgz", "resolved": "https://registry.npmjs.org/js-confetti/-/js-confetti-0.11.0.tgz",
"integrity": "sha512-Hc7I3VI4r4H0nq5q/oQK+JJwGoYRYVHK72fGk8E9Ay1dbh+aiZ9yl0yFp1K4oYeq7YFDQAndYChwqLPA3QWQuA==" "integrity": "sha512-Hc7I3VI4r4H0nq5q/oQK+JJwGoYRYVHK72fGk8E9Ay1dbh+aiZ9yl0yFp1K4oYeq7YFDQAndYChwqLPA3QWQuA=="
}, },
"js-cookie": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
"integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
},
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -14162,6 +14187,14 @@
"integrity": "sha512-u38C9OxynlNCBp+79grgXRs7DSJ9w8FuQ5/HO5FbYBbri8HSZW+9SWgjVshLkbXBfXnMGWakbHEtvN0nL2UG7Q==", "integrity": "sha512-u38C9OxynlNCBp+79grgXRs7DSJ9w8FuQ5/HO5FbYBbri8HSZW+9SWgjVshLkbXBfXnMGWakbHEtvN0nL2UG7Q==",
"requires": {} "requires": {}
}, },
"react-cookie-consent": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/react-cookie-consent/-/react-cookie-consent-8.0.1.tgz",
"integrity": "sha512-4A2jzPQDFfBhtxIz4hYX+vJ0QnOknGdOXpEoetXzgwUrMtxVJVow8YgBsGerNt5rJI7WhKkHwr8LmxekxgVejg==",
"requires": {
"js-cookie": "^2.2.1"
}
},
"react-dom": { "react-dom": {
"version": "18.2.0", "version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+1
View File
@@ -29,6 +29,7 @@
"nodemailer": "^6.8.0", "nodemailer": "^6.8.0",
"react": "18.2.0", "react": "18.2.0",
"react-chartjs-2": "^5.0.1", "react-chartjs-2": "^5.0.1",
"react-cookie-consent": "^8.0.1",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-hook-form": "^7.39.2", "react-hook-form": "^7.39.2",
"react-icons": "^4.6.0", "react-icons": "^4.6.0",
+6 -6
View File
@@ -397,14 +397,14 @@ const Admin = (props: Props) => {
{currentUser && <form onSubmit={handleSubmit(onSubmit)}> {currentUser && <form onSubmit={handleSubmit(onSubmit)}>
<div className="form-group"> <div className="form-group">
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="staticEmail" className="col-sm-3 col-form-label">Email :</label> <label htmlFor="staticEmail" className="col-sm-3 col-form-label">Email :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input type="text" readOnly className="form-control-plaintext text-sm-center" id="staticEmail" value={currentUser?.email || ''} /> <input type="text" readOnly className="form-control-plaintext text-sm-center" id="staticEmail" value={currentUser?.email || ''} />
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label> <label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={currentUser?.name || ''} id="inputName" placeholder="John..." /> <input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={currentUser?.name || ''} id="inputName" placeholder="John..." />
@@ -412,7 +412,7 @@ const Admin = (props: Props) => {
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label> <label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={currentUser?.surname || ''} id="surname" placeholder="Doe..." /> <input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={currentUser?.surname || ''} id="surname" placeholder="Doe..." />
@@ -420,7 +420,7 @@ const Admin = (props: Props) => {
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="address" className="col-sm-3 col-form-label">Adresse :</label> <label htmlFor="address" className="col-sm-3 col-form-label">Adresse :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("address")} className={`form-control ${errors.address ? 'is-invalid' : ''}`} defaultValue={currentUser?.address || ''} id="address" placeholder="1 rue de la paix..." /> <input {...register("address")} className={`form-control ${errors.address ? 'is-invalid' : ''}`} defaultValue={currentUser?.address || ''} id="address" placeholder="1 rue de la paix..." />
@@ -428,7 +428,7 @@ const Admin = (props: Props) => {
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="zipCode" className="col-sm-3 col-form-label">Code postale :</label> <label htmlFor="zipCode" className="col-sm-3 col-form-label">Code postale :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("zipCode")} className={`form-control ${errors.zipCode ? 'is-invalid' : ''}`} defaultValue={currentUser?.zipCode || ''} id="zipCode" placeholder="95000..." /> <input {...register("zipCode")} className={`form-control ${errors.zipCode ? 'is-invalid' : ''}`} defaultValue={currentUser?.zipCode || ''} id="zipCode" placeholder="95000..." />
@@ -436,7 +436,7 @@ const Admin = (props: Props) => {
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="phoneNumber" className="col-sm-3 col-form-label">Téléphone :</label> <label htmlFor="phoneNumber" className="col-sm-3 col-form-label">Téléphone :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("phoneNumber")} className={`form-control ${errors.phoneNumber ? 'is-invalid' : ''}`} defaultValue={currentUser?.phoneNumber || ''} id="phoneNumber" placeholder="0123456789..." /> <input {...register("phoneNumber")} className={`form-control ${errors.phoneNumber ? 'is-invalid' : ''}`} defaultValue={currentUser?.phoneNumber || ''} id="phoneNumber" placeholder="0123456789..." />
+1 -1
View File
@@ -80,7 +80,7 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
id: codeCadeauInfo.produitId id: codeCadeauInfo.produitId
} }
}) })
return res.status(200).send({ success: 'Vous avez gagner un gain !', winProduct }); return res.status(200).send({ success: 'Vous avez gagné un gain !', winProduct });
} }
+6 -6
View File
@@ -167,41 +167,41 @@ const MonCompte = (props: Props) => {
<hr /> <hr />
<form onSubmit={handleSubmit(onSubmit)}> <form onSubmit={handleSubmit(onSubmit)}>
<div className="form-group"> <div className="form-group">
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="staticEmail" className="col-sm-3 col-form-label">Email :</label> <label htmlFor="staticEmail" className="col-sm-3 col-form-label">Email :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input type="text" readOnly className="form-control-plaintext text-sm-center" id="staticEmail" value={session?.user.email || ''} /> <input type="text" readOnly className="form-control-plaintext text-sm-center" id="staticEmail" value={session?.user.email || ''} />
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label> <label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={props.user?.name || ''} id="inputName" placeholder="John..." /> <input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={props.user?.name || ''} id="inputName" placeholder="John..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.name?.message}</div> <div className="invalid-feedback alert alert-danger mt-2">{errors.name?.message}</div>
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label> <label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={props.user.surname || ''} id="surname" placeholder="Doe..." /> <input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={props.user.surname || ''} id="surname" placeholder="Doe..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.surname?.message}</div> <div className="invalid-feedback alert alert-danger mt-2">{errors.surname?.message}</div>
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="address" className="col-sm-3 col-form-label">Adresse :</label> <label htmlFor="address" className="col-sm-3 col-form-label">Adresse :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("address")} className={`form-control ${errors.address ? 'is-invalid' : ''}`} defaultValue={props.user.address} id="address" placeholder="1 rue de la paix..." /> <input {...register("address")} className={`form-control ${errors.address ? 'is-invalid' : ''}`} defaultValue={props.user.address} id="address" placeholder="1 rue de la paix..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.address?.message}</div> <div className="invalid-feedback alert alert-danger mt-2">{errors.address?.message}</div>
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="zipCode" className="col-sm-3 col-form-label">Code postale :</label> <label htmlFor="zipCode" className="col-sm-3 col-form-label">Code postale :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("zipCode")} className={`form-control ${errors.zipCode ? 'is-invalid' : ''}`} defaultValue={props.user.zipCode} id="zipCode" placeholder="95000..." /> <input {...register("zipCode")} className={`form-control ${errors.zipCode ? 'is-invalid' : ''}`} defaultValue={props.user.zipCode} id="zipCode" placeholder="95000..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.zipCode?.message}</div> <div className="invalid-feedback alert alert-danger mt-2">{errors.zipCode?.message}</div>
</div> </div>
</div> </div>
<div className="form-group row"> <div className="form-group row my-1">
<label htmlFor="phoneNumber" className="col-sm-3 col-form-label">Téléphone :</label> <label htmlFor="phoneNumber" className="col-sm-3 col-form-label">Téléphone :</label>
<div className="col-sm-9"> <div className="col-sm-9">
<input {...register("phoneNumber")} className={`form-control ${errors.phoneNumber ? 'is-invalid' : ''}`} defaultValue={props.user.phoneNumber} id="phoneNumber" placeholder="0123456789..." /> <input {...register("phoneNumber")} className={`form-control ${errors.phoneNumber ? 'is-invalid' : ''}`} defaultValue={props.user.phoneNumber} id="phoneNumber" placeholder="0123456789..." />