From caffe2c1b896cc7004ae2f12965d3c7379cd9619 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 11 Dec 2022 22:05:29 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20version=201.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/admin.tsx | 52 +++++++++++++++++++++++++++++--------------- pages/mon-compte.tsx | 5 ++--- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/pages/admin.tsx b/pages/admin.tsx index d7338f8..8dfd54b 100644 --- a/pages/admin.tsx +++ b/pages/admin.tsx @@ -88,7 +88,7 @@ export async function getServerSideProps(context) { type Props = { user: User; produits: Produit[]; - users: User[] + users: any } const Admin = (props: Props) => { @@ -99,6 +99,10 @@ const Admin = (props: Props) => { const [currentUserGain, setCurrentUserGain] = useState(null) const router = useRouter() + const isAdmin = session?.user['role'] === Role.ADMIN + const isSuperAdmin = session?.user['role'] === Role.SUPERADMIN + const bigWinner = users?.find((user) => user?.isBigWinner) + const { register, setValue, handleSubmit, formState: { errors } } = useForm({ }); @@ -206,8 +210,8 @@ const Admin = (props: Props) => { const selectWinUser = async () => { const customers = users.filter((user) => user.role === 'USER') - console.log('custo', customers) - if (customers.length <= 0) { + + if (users.length <= 0) { toast.error("Il n'y a pas encore d'utilisateur", { position: "top-center", autoClose: 2000, @@ -220,8 +224,26 @@ const Admin = (props: Props) => { }); return; } - const winUser = customers[Math.floor(Math.random() * customers.length)] + + const customersWithTicket = customers.filter((user) => user.gains.length >= 1) + + if (customersWithTicket.length <= 0) { + toast.error("Il n'y a pas encore d'utilisateurs ayant joué", { + position: "top-center", + autoClose: 2000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: true, + draggable: true, + progress: undefined, + theme: "light", + }); + return; + } + + const winUser = customersWithTicket[Math.floor(Math.random() * customersWithTicket.length)] const body = { selectedUserEmail: winUser.email } + console.log(body) fetcher('/api/user/bigwinner', 'PUT', body) setTimeout(() => { router.refresh(); @@ -244,13 +266,14 @@ const Admin = (props: Props) => {

Utilisateurs


- {(session?.user['role'] === 'ADMIN' || - session?.user['role'] === 'SUPERADMIN') &&
+ {(isAdmin || + isSuperAdmin) &&

Grand jeu concours séléction l'utilisateur gagnant pour les 1 an de thé

- +
} - + {bigWinner ?

Grand gagnant 📢

:

Pas encore de gagnant tiré au sort 🤫

} +

{bigWinner && bigWinner.email}

{users.length <= 0 &&

Pas encore d'utilisateur

} {users.length >= 1 && @@ -265,23 +288,16 @@ const Admin = (props: Props) => { {users.map((info: User, index: number) => { - - console.log('user role', users); - - const isAdmin = ['SELLER', 'ADMIN'].includes(info.role); - const isSuperAdmin = ['SELLER', 'ADMIN', 'SUPERADMIN'].includes(info.role); - - return selectUser(info)}> - + {props.userGains.map((info: any, index: number) => { - console.log('ii', info); - - return + return
{++index} {info.surname} {info.name}{info.isBigWinner && '🌟'} {info.email}{info.isBigWinner && '🌟🌟🌟'}{info.email} diff --git a/pages/mon-compte.tsx b/pages/mon-compte.tsx index 184baf1..a250931 100644 --- a/pages/mon-compte.tsx +++ b/pages/mon-compte.tsx @@ -148,6 +148,7 @@ const MonCompte = (props: Props) => {
+

Vous avez été séléctionner pour gagner 1 an de thé !


Mes informations

@@ -223,9 +224,7 @@ const MonCompte = (props: Props) => {
{++index} {info.codeCadeau} {info.produit.nomProduit}