add - loading spinner, administration, navbar modfications

This commit is contained in:
eric committed 2022-12-07 15:11:50 +01:00
1 parent 6a10740307
commit 27187c6c68
28 files changed
+886 -116

No files matched your search

+31 -9
View File
@@ -1,6 +1,8 @@
import { SessionProvider } from "next-auth/react";
import { AppProps } from "next/app";
import { useEffect } from "react";
import { useEffect, useState } from "react";
import Router from 'next/router'
import Loader from '../components/Loader';
import 'bootstrap/dist/css/bootstrap.css'
import "../styles/globals.css";
@@ -8,19 +10,39 @@ import 'react-toastify/dist/ReactToastify.css';
import { ToastContainer } from 'react-toastify';
import Layout from "../components/Layout";
import { GlobalContextProvider } from '../context/globalContext';
const App = ({ Component, pageProps }: AppProps) => {
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
import("bootstrap/dist/js/bootstrap");
}, []);
Router.events.on("routeChangeStart", (url) => {
setIsLoading(true)
});
Router.events.on("routeChangeComplete", (url) => {
setIsLoading(false)
});
Router.events.on("routeChangeError", (url) => {
setIsLoading(false)
});
}, [Router]);
return (
<SessionProvider session={pageProps.session}>
<Layout>
<Component {...pageProps} />
</Layout>
<ToastContainer />
</SessionProvider>
<>
{isLoading && <Loader />}
<SessionProvider session={pageProps.session}>
<GlobalContextProvider>
<Layout>
<Component {...pageProps} />
</Layout>
<ToastContainer />
</GlobalContextProvider>
</SessionProvider>
</>
);
};
+354
View File
@@ -0,0 +1,354 @@
import React, { useEffect, useState, useSyncExternalStore } from "react";
import prisma from '../lib/prisma'
import Image from 'next/image';
import * as Yup from 'yup';
import Head from "next/head";
import { getCsrfToken, getSession, signIn, useSession } from "next-auth/react";
import { yupResolver } from "@hookform/resolvers/yup";
import "yup-phone";
import { SubmitHandler, 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 { TfiInfoAlt } from 'react-icons/tfi'
import { TfiGift } from 'react-icons/tfi'
import { toast } from "react-toastify";
import { Token } from "nodemailer/lib/xoauth2";
import { isGeneratorFunction } from "util/types";
import { UserProps } from "../types/user";
import { UserGainProps } from "../types/userGain";
import { Gain, Produit, Role, User } from "@prisma/client";
type FormData = {
email: string;
name: string;
surname: string;
address: string;
zipCode: number;
phoneNumber: number;
};
export async function getServerSideProps(context) {
const session = await getSession(context)
const isAdmin = ['SELLER', 'ADMIN', 'SUPERADMIN'].includes(session?.user['role']);
if (!session || !isAdmin) {
return {
redirect: {
destination: '/',
permanent: false
}
}
}
const users = await prisma.user.findMany({
include: {
gains: true
}
});
const user = await prisma.user.findUnique({
where: {
email: session?.user.email
}
});
const produits = await prisma.produit.findMany({})
return {
props: {
user: JSON.parse(JSON.stringify(user)),
produits: JSON.parse(JSON.stringify(produits)),
users: JSON.parse(JSON.stringify(users))
},
}
}
type Props = {
user: User;
produits: Produit[];
users: User[]
}
const Admin = (props: Props) => {
const { data: session, status } = useSession();
const [response, setResponse] = useState(null)
const [currentUser, setCurrentUser] = useState(null)
const [users, setUsers] = useState(props.users)
const { register, setValue, handleSubmit, formState: { errors } } = useForm<FormData>({
});
const fetcher = async (url, method, body = {}) => {
try {
await fetch(url, {
method,
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
})
.then((res) => res.json())
.then(async (data) => {
setResponse(data);
setUsers(data.res)
if (data.err) {
toast.error(data.err, {
position: "top-center",
autoClose: 2000,
hideProgressBar: false,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
progress: undefined,
theme: "light",
});
return;
}
toast.success(data.message, {
position: "top-center",
autoClose: 5000,
hideProgressBar: false,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
progress: undefined,
theme: "light",
});
})
}
catch (error) {
console.error('ERROR :', error);
}
}
const onSubmit = async ({
email,
name,
surname,
address,
zipCode,
phoneNumber }: FormData) => {
const body = {
selectedUserEmail: email,
selectedUserName: name,
selectedUserSurname: surname,
selectedUserAddress: address,
selectedUserZipCode: Number(zipCode),
selectedUserPhoneNumber: Number(phoneNumber),
};
fetcher('/api/user/update', 'POST', body)
};
const onChangeRole = async (e: React.ChangeEvent<HTMLSelectElement>, user: User) => {
const body = { selectedUserEmail: user.email, selectedUserRole: e.target.value }
fetcher('/api/user/update', 'PUT', body)
};
const onDeleteUser = async (userEmail: string) => {
const body = { selectedUserEmail: userEmail }
if (props.user.email === userEmail) {
toast.error('Vous devez être déconnecté pour supprimer votre compte', {
position: "top-center",
autoClose: 2000,
hideProgressBar: false,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
progress: undefined,
theme: "light",
});
return;
}
fetcher('/api/user/delete', 'DELETE', body)
};
const selectUser = (user: User) => {
setCurrentUser(user);
setValue("name", user.name)
setValue("email", user.email)
setValue("surname", user.surname)
setValue("address", user.address)
setValue("zipCode", user.zipCode)
setValue("phoneNumber", user.phoneNumber)
}
return (
<>
<Head>
<title>Administration</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
</Head>
<div className={`${style['masthead']} d-flex justify-content-center align-items-center text-center`}>
<div className="container align-items-center d-flex flex-column">
<div className={`${style['bloc-content']} col-12 col-md-12`}>
<div className="row">
<div className="col-md-12 col-sm-12">
<hr />
<h1 className="fw-light">Utilisateurs <TfiInfoAlt size={40} /></h1>
<hr />
{users.length <= 0 && <p>Pas encore d'utilisateur</p>}
{users.length >= 1 &&
<table className={`table table-hover`}>
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Nom</th>
<th scope="col">Prénom</th>
<th scope="col">Email</th>
<th scope="col">Types</th>
</tr>
</thead>
<tbody>
{users.map((info: User, index: number) => {
return <tr key={index} className={`${style.cursor}`} onClick={() => selectUser(info)}>
<th scope="row">{++index}</th>
<td>{info.surname}</td>
<td>{info.name}</td>
<td>{info.email}</td>
<td>
<select className="custom-select" defaultValue={info.role} onChange={(e) => onChangeRole(e, info)}>
<option value="USER">Client</option>
<option value="SELLER">Vendeur</option>
<option value="ADMIN">Administrateur</option>
</select>
</td>
<td><button className="btn btn-primary" onClick={() => onDeleteUser(info.email)}>Supprimer</button></td>
</tr>
})}
</tbody>
</table>
}
</div>
</div>
<div className="row">
<div className="col-md-6 col-sm-12">
<hr />
<h1 className="fw-light">{currentUser?.email || 'utilisateur'} <TfiInfoAlt size={40} /></h1>
<hr />
{currentUser && <form onSubmit={handleSubmit(onSubmit)}>
<div className="form-group">
<div className="form-group row">
<label htmlFor="staticEmail" className="col-sm-3 col-form-label">Email :</label>
<div className="col-sm-9">
<input type="text" readOnly className="form-control-plaintext text-sm-center" id="staticEmail" value={currentUser?.email || ''} />
</div>
</div>
<div className="form-group row">
<label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label>
<div className="col-sm-9">
<input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={currentUser?.name || ''} id="inputName" placeholder="John..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.name?.message}</div>
</div>
</div>
<div className="form-group row">
<label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label>
<div className="col-sm-9">
<input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={currentUser?.surname || ''} id="surname" placeholder="Doe..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.surname?.message}</div>
</div>
</div>
<div className="form-group row">
<label htmlFor="address" className="col-sm-3 col-form-label">Adresse :</label>
<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..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.address?.message}</div>
</div>
</div>
<div className="form-group row">
<label htmlFor="zipCode" className="col-sm-3 col-form-label">Code postale :</label>
<div className="col-sm-9">
<input {...register("zipCode")} className={`form-control ${errors.zipCode ? 'is-invalid' : ''}`} defaultValue={currentUser?.zipCode || ''} id="zipCode" placeholder="95000..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.zipCode?.message}</div>
</div>
</div>
<div className="form-group row">
<label htmlFor="phoneNumber" className="col-sm-3 col-form-label">Téléphone :</label>
<div className="col-sm-9">
<input {...register("phoneNumber")} className={`form-control ${errors.phoneNumber ? 'is-invalid' : ''}`} defaultValue={currentUser?.phoneNumber || ''} id="phoneNumber" placeholder="0123456789..." />
<div className="invalid-feedback alert alert-danger mt-2">{errors.phoneNumber?.message}</div>
</div>
</div>
<div className="form-group">
<button
type="submit"
className="btn btn-primary mt-2"
>
Sauvegarder mes changements
</button>
</div>
</div>
</form>}
{!currentUser && <p>Séléctionner un utilisateur</p>}
</div>
<div className="col-md-6 col-sm-12">
<hr />
<h1 className="fw-light">Cadeaux de {currentUser?.email || "l'utilisateur"} <TfiGift size={40} /></h1>
<hr />
{currentUser?.gains?.length <= 0 && <p>Pas encore de cadeaux gagné</p>}
{currentUser?.gains?.length >= 1 &&
<table className="table">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Codes joués</th>
<th scope="col">Cadeaux</th>
<th scope="col">Retiré en magasin</th>
<th scope="col">Retrait</th>
<th scope="col">Date Retrait</th>
</tr>
</thead>
<tbody>
{currentUser?.gains.map((gain: Gain, index: number) => {
return <tr key={index}>
<th scope="row">{++index}</th>
<td>{gain?.codeCadeau}</td>
<td>{props.produits[gain.produitId - 1].nomProduit}</td>
<td>{gain?.retrait ? '❌ déja récupéré' : '✔️ disponible'}</td>
<td>
<button className="btn btn-primary">OUI</button>
</td>
</tr>
})}
</tbody>
</table>
}
</div>
</div>
</div>
</div >
</div>
</>)
};
export default Admin;
+6 -2
View File
@@ -5,6 +5,7 @@ import { PrismaAdapter } from '@next-auth/prisma-adapter'
import GoogleProvider from "next-auth/providers/google";
import EmailProvider from 'next-auth/providers/email'
import prisma from '../../../lib/prisma'
import { Session } from "@prisma/client";
const authHandler: NextApiHandler = (req, res) => NextAuth(req, res, options);
@@ -32,14 +33,17 @@ const options = {
adapter: PrismaAdapter(prisma),
secret: process.env.SECRET,
callbacks: {
async session({ session, user }) {
async session({ session, user }: {
session: any,
user: any
}) {
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
return session;
}
},
pages: {
-36
View File
@@ -1,36 +0,0 @@
import { NextApiRequest, NextApiResponse } from 'next';
import { getSession } from 'next-auth/react';
import { Role } from '../../../enum/role.enum';
import prisma from '../../../lib/prisma';
//api qui va rendre un utilisateur super admin (pour les developpeurs)
//--> http://localhost:3000/api/superadmin?pass=1234 (a effacer)
export default async function makeMeSuper(req: NextApiRequest, res: NextApiResponse) {
const { pass } = req.query;
const session = await getSession({ req })
const goodPassword = pass === '1234';
//si utilisateur connecté et que le parametre 'pass' est '1234'
if (session && goodPassword) {
//MAJ de l'utilisateur en superadmin
await prisma.user.update({
where: { email: session.user.email },
data: {
role: Role.SUPERADMIN,
},
})
return res.status(200).send({ message: 'Profiled updated welcome SUPERADMIN !' });
} else {
res.status(401).send({ message: 'Unauthorized' })
}
}
+2 -5
View File
@@ -38,7 +38,7 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
})
//check si le code a déja été utilisé
if (!codeCadeauInfo.actif) {
if (!codeCadeauInfo.codeActif) {
res.status(401).json({ err: 'Ce code a déja été utilisé' });
return;
}
@@ -57,9 +57,6 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
}
})
//mise à jour de la date ou le ticket est utilisé
//retire un ticket du total de ticket restant
const ticketUpdate = await prisma.ticketsRestants.update({
where: {
@@ -78,7 +75,7 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
id: codeCadeauInfo.id
},
data: {
actif: false,
codeActif: false,
}
})
+74
View File
@@ -0,0 +1,74 @@
import prisma from '../../../lib/prisma';
import chance from 'chance'
import cryptoRandomString from 'crypto-random-string';
import { NextApiRequest, NextApiResponse } from 'next';
import { getSession } from 'next-auth/react';
import { Cadeaux } from '../../../enum/cadeaux.enum';
import { Role } from '../../../enum/role.enum';
//API gain qui va generer un code cadeau qui sera sur la facture du client
//On part du principe qu'une 'API caisse'(qu'on ne gere pas) déclenche l'appel à l'API gain
export default async function deleteUser(req: NextApiRequest, res: NextApiResponse) {
const session = await getSession({ req })
const { selectedUserEmail } = req.body;
// est-ce la méthode est DELETE ?
if (req.method !== ("DELETE")) {
throw new Error(
`The HTTP ${req.method} method is not supported at this route.`
);
}
// est-ce que utilisateur est connecté ?
if (!session) {
res.status(401).json({ err: "Vous devez être connecté" });
return;
}
//supprime l'utilisateur connecté
const user = await prisma.user.delete({
where: { email: selectedUserEmail },
})
// est-ce que utilisateur est un client classique ? Donc interdit pour lui de faire des updates
// A ACTIVER EN PRODUCTION
// if (user.role === 'USER') {
// res.status(401).json({ err: "Vous n'avez pas l'autorisation" });
// return;
// }
////////////////////////////////////////////////
//renvoi la liste des users mis à jour
const users = await prisma.user.findMany({})
res.status(200).send({ message: `L'utilisateur ${user.name} a été supprimé !`, res: users });
}
+102
View File
@@ -0,0 +1,102 @@
import prisma from '../../../lib/prisma';
import chance from 'chance'
import cryptoRandomString from 'crypto-random-string';
import { NextApiRequest, NextApiResponse } from 'next';
import { getSession } from 'next-auth/react';
import { Cadeaux } from '../../../enum/cadeaux.enum';
import { Role } from '../../../enum/role.enum';
//API gain qui va generer un code cadeau qui sera sur la facture du client
//On part du principe qu'une 'API caisse'(qu'on ne gere pas) déclenche l'appel à l'API gain
export default async function getCurrent(req: NextApiRequest, res: NextApiResponse) {
const session = await getSession({ req })
const { selectedUserRole, selectedUserEmail, selectedUserName,
selectedUserSurname,
selectedUserAddress,
selectedUserZipCode,
selectedUserPhoneNumber, } = req.body;
// est-ce la méthode est un POST ou PUT?
if (req.method !== ("POST" || "PUT")) {
throw new Error(
`The HTTP ${req.method} method is not supported at this route.`
);
}
// est-ce que utilisateur est connecté ?
if (!session) {
res.status(401).json({ err: "Vous devez être connecté" });
return;
}
//récupération des informations de l'utilisateur connecté
const user = await prisma.user.findFirst({
where: { email: session.user.email },
})
// est-ce que utilisateur est un client classique ? Donc interdit pour lui de faire des updates
// A ACTIVER EN PRODUCTION
// if (user.role === 'USER') {
// res.status(401).json({ err: "Vous n'avez pas l'autorisation" });
// return;
// }
////////////////////////////////////////////////
//récupération des informations de l'utilisateur selectionné
const selectedUser = await prisma.user.findFirst({
where: { email: selectedUserEmail },
})
console.log('selectedUser', selectedUser);
//mise a jour des données pour l'utilisateur
const updatedUser = await prisma.user.update({
where: {
email: selectedUserEmail,
},
data: {
name: selectedUserName || undefined,
surname: selectedUserSurname || undefined,
address: selectedUserAddress || undefined,
zipCode: selectedUserZipCode || undefined,
phoneNumber: selectedUserPhoneNumber || undefined,
email: selectedUserEmail || undefined,
role: selectedUserRole || undefined
},
})
res.status(200).send({ message: `Les informations de ${selectedUserName} ont été mise à jours !`, res: updatedUser });
}
+96
View File
@@ -0,0 +1,96 @@
import prisma from '../../../lib/prisma';
import chance from 'chance'
import cryptoRandomString from 'crypto-random-string';
import { NextApiRequest, NextApiResponse } from 'next';
import { getSession } from 'next-auth/react';
import { Cadeaux } from '../../../enum/cadeaux.enum';
import { Role } from '../../../enum/role.enum';
//API gain qui va generer un code cadeau qui sera sur la facture du client
//On part du principe qu'une 'API caisse'(qu'on ne gere pas) déclenche l'appel à l'API gain
export default async function updateUser(req: NextApiRequest, res: NextApiResponse) {
const session = await getSession({ req })
const { selectedUserRole, selectedUserEmail, selectedUserName,
selectedUserSurname,
selectedUserAddress,
selectedUserZipCode,
selectedUserPhoneNumber } = req.body;
// est-ce la méthode est un POST ou PUT?
// if (req.method !== ("POST" || 'PUT')) {
// throw new Error(
// `The HTTP ${req.method} method is not supported at this route.`
// );
// }
// est-ce que utilisateur est connecté ?
if (!session) {
res.status(401).json({ err: "Vous devez être connecté" });
return;
}
//récupération des informations de l'utilisateur connecté
const user = await prisma.user.findFirst({
where: { email: session.user.email },
})
// est-ce que utilisateur est un client classique ? Donc interdit pour lui de faire des updates
// A ACTIVER EN PRODUCTION
// if (user.role === 'USER') {
// res.status(401).json({ err: "Vous n'avez pas l'autorisation" });
// return;
// }
////////////////////////////////////////////////
//mise a jour des données de l'utilisateur séléctionné
const updatedUser = await prisma.user.update({
where: {
email: selectedUserEmail,
},
data: {
name: selectedUserName || undefined,
surname: selectedUserSurname || undefined,
address: selectedUserAddress || undefined,
zipCode: selectedUserZipCode || undefined,
phoneNumber: selectedUserPhoneNumber || undefined,
role: Role[selectedUserRole] || Role.USER
},
})
//renvoi la liste des users mis à jour
const users = await prisma.user.findMany({})
console.log(updatedUser);
res.status(200).send({ message: `Les informations de ${selectedUserEmail} ont été mise à jours !`, res: users });
}
+1 -1
View File
@@ -76,7 +76,7 @@ const MainPage = ({ csrfToken }: Props) => {
const onMailSubmit = async (data: LoginSubmitForm) => {
if (onCheckTerms()) {
signIn("email", { email: data.email, callbackUrl: `${window.location.origin}/create` })
signIn("email", { email: data.email, callbackUrl: `${window.location.origin}/mon-compte` })
}
await trigger("acceptTerms");
await trigger("email");
+1 -1
View File
@@ -217,7 +217,7 @@ const MainPage = () => {
<div className={`${style['cadeau-bloc-content']} col-12 col-md-6`} onClick={() => setWinAnimation(false)}
>
<div className={`${style['cadeau-bloc']}`}>
<h1>Vous avez gagnez : un {response.winProduct.nomProduit} !</h1>
<h1>Vous avez gagnez : un {response.winProduct.nomProduit.toLowerCase()} !</h1>
</div>
</div>
+9 -7
View File
@@ -82,7 +82,7 @@ export async function getServerSideProps(context) {
type Props = {
user: User;
userGains: any;
userGains: Gain[];
}
const MonCompte = (props: Props) => {
@@ -196,7 +196,7 @@ const MonCompte = (props: Props) => {
<div className="form-group row">
<label htmlFor="inputName" className="col-sm-3 col-form-label">Nom :</label>
<div className="col-sm-9">
<input {...register("name")} className={`form-control ${errors.name ? 'is-invalid' : ''}`} defaultValue={props.user?.name[1]} 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>
</div>
@@ -204,7 +204,7 @@ const MonCompte = (props: Props) => {
<div className="form-group row">
<label htmlFor="surname" className="col-sm-3 col-form-label">Prenom :</label>
<div className="col-sm-9">
<input {...register("surname")} className={`form-control ${errors.surname ? 'is-invalid' : ''}`} defaultValue={props.user.surname || props.user?.name[0]} 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>
</div>
@@ -233,12 +233,12 @@ const MonCompte = (props: Props) => {
</div>
</div>
<div className="form-group row">
<div className="form-group">
<button
type="submit"
className="btn btn-primary mt-2"
>
Sauvegarder les changements
Sauvegarder mes changements
</button>
</div>
</div>
@@ -257,14 +257,16 @@ const MonCompte = (props: Props) => {
<th scope="col">#</th>
<th scope="col">Mes codes joué</th>
<th scope="col">Mes cadeaux</th>
<th scope="col">Statut</th>
</tr>
</thead>
<tbody>
{props.userGains.map((info: any) => {
{props.userGains.map((info: any, index: number) => {
return <tr>
<th scope="row"></th>
<th scope="row">{++index}</th>
<td>{info.codeCadeau}</td>
<td>{info.produit.nomProduit}</td>
<td>{info.produit.retrait ? '❌ déja récupéré' : '✔️ venir me chercher !'}</td>
</tr>
})}
</tbody>