fix - modifications importantes
This commit is contained in:
1 parent
10e415e53e
commit
34700a46d9
14 files changed
+265
-321
No files matched your search
+122
-113
@@ -21,11 +21,18 @@ 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, TicketsRestants, User } from "@prisma/client";
|
||||
import { Gain, Produit, Role, User } from "@prisma/client";
|
||||
import { Doughnut } from "react-chartjs-2";
|
||||
import { Chart as ChartJS, ArcElement, Tooltip, Legend, RadialLinearScale } from 'chart.js';
|
||||
import { PolarArea } from 'react-chartjs-2';
|
||||
|
||||
import {
|
||||
Chart as ChartJS,
|
||||
CategoryScale,
|
||||
LinearScale,
|
||||
BarElement,
|
||||
Title,
|
||||
Tooltip,
|
||||
Legend,
|
||||
} from 'chart.js';
|
||||
import { Bar } from 'react-chartjs-2';
|
||||
|
||||
type FormData = {
|
||||
email: string;
|
||||
@@ -52,7 +59,8 @@ export async function getServerSideProps(context) {
|
||||
const users = await prisma.user.findMany({
|
||||
include: {
|
||||
gains: true
|
||||
}
|
||||
},
|
||||
take: 5
|
||||
});
|
||||
|
||||
const user = await prisma.user.findUnique({
|
||||
@@ -61,8 +69,29 @@ export async function getServerSideProps(context) {
|
||||
}
|
||||
});
|
||||
|
||||
const tickets = await prisma.gain.findMany({})
|
||||
const totalTirageRestant = await prisma.ticketsRestants.findFirst({})
|
||||
const ticketRestants = await prisma.gain.count({
|
||||
where: {
|
||||
codeActif: true,
|
||||
dateAchat: {
|
||||
not: null,
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const ticketsSaisis = await prisma.gain.count({
|
||||
where: {
|
||||
codeActif: false,
|
||||
},
|
||||
})
|
||||
|
||||
const gainsRetires = await prisma.gain.count({
|
||||
where: {
|
||||
retrait: true
|
||||
},
|
||||
})
|
||||
|
||||
console.log("🚀 ~ file: admin.tsx:87 ~ getServerSideProps ~ gainsRetires", gainsRetires)
|
||||
|
||||
const produits = await prisma.produit.findMany({})
|
||||
|
||||
return {
|
||||
@@ -70,8 +99,9 @@ export async function getServerSideProps(context) {
|
||||
user: JSON.parse(JSON.stringify(user)),
|
||||
produits: JSON.parse(JSON.stringify(produits)),
|
||||
users: JSON.parse(JSON.stringify(users)),
|
||||
tickets: JSON.parse(JSON.stringify(tickets)),
|
||||
totalTirageRestant: JSON.parse(JSON.stringify(totalTirageRestant))
|
||||
ticketRestants: JSON.parse(JSON.stringify(ticketRestants)),
|
||||
ticketsSaisis: JSON.parse(JSON.stringify(ticketsSaisis)),
|
||||
gainsRetires: JSON.parse(JSON.stringify(gainsRetires)),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -80,10 +110,12 @@ type Props = {
|
||||
user: User;
|
||||
produits: Produit[];
|
||||
users: any,
|
||||
tickets: Gain[]
|
||||
totalTirageRestant: TicketsRestants
|
||||
ticketRestants: number,
|
||||
ticketsSaisis: number,
|
||||
gainsRetires: number,
|
||||
}
|
||||
|
||||
|
||||
const Admin = (props: Props) => {
|
||||
const { data: session, status } = useSession();
|
||||
const [response, setResponse] = useState(null)
|
||||
@@ -93,58 +125,56 @@ const Admin = (props: Props) => {
|
||||
const [query, setQuery] = useState("");
|
||||
const router = useRouter()
|
||||
|
||||
|
||||
const isAdmin = session?.user['role'] === Role.ADMIN
|
||||
const isSuperAdmin = session?.user['role'] === Role.SUPERADMIN
|
||||
const bigWinner = users?.find((user) => user?.isBigWinner)
|
||||
|
||||
ChartJS.register(RadialLinearScale, ArcElement, Tooltip, Legend);
|
||||
ChartJS.register(
|
||||
CategoryScale,
|
||||
LinearScale,
|
||||
BarElement,
|
||||
Title,
|
||||
Tooltip,
|
||||
Legend
|
||||
);
|
||||
|
||||
const TicketRestants = props.tickets?.filter(ticket => ticket.codeActif === true).length
|
||||
console.log("🚀 ~ file: admin.tsx:103 ~ Admin ~ TicketRestants", TicketRestants)
|
||||
const TicketUtilise = props.tickets?.filter(ticket => ticket.codeActif === false).length
|
||||
console.log("🚀 ~ file: admin.tsx:104 ~ Admin ~ TicketUtilise", TicketUtilise)
|
||||
const TicketTotal = props.totalTirageRestant.total;
|
||||
console.log("🚀 ~ file: admin.tsx:107 ~ Admin ~ TicketTotal", TicketTotal)
|
||||
const labels = ['Tickets générés', 'Codes saisis', 'Cadeaux récupérés'];
|
||||
|
||||
|
||||
|
||||
const TotalTirageRestant = props.totalTirageRestant?.total;
|
||||
|
||||
const ticketDataChart = {
|
||||
labels: ['Tickets généré utlisés', 'Tickets généré restants'],
|
||||
datasets: [
|
||||
{
|
||||
label: 'Tickets restants généré',
|
||||
data: [TicketUtilise, TicketRestants],
|
||||
backgroundColor: [
|
||||
'rgba(255, 99, 132, 0.2)',
|
||||
'rgba(54, 162, 235, 0.2)',
|
||||
],
|
||||
borderColor: [
|
||||
'rgba(255, 99, 132, 1)',
|
||||
'rgba(54, 162, 235, 1)',
|
||||
],
|
||||
borderWidth: 1,
|
||||
},
|
||||
],
|
||||
const data = {
|
||||
labels: labels,
|
||||
datasets: [{
|
||||
data: [props.ticketRestants, props.ticketsSaisis, props.gainsRetires],
|
||||
backgroundColor: [
|
||||
'rgba(255, 99, 132, 0.2)',
|
||||
'rgba(255, 159, 64, 0.2)',
|
||||
'rgba(255, 205, 86, 0.2)',
|
||||
],
|
||||
borderColor: [
|
||||
'rgb(255, 99, 132)',
|
||||
'rgb(255, 159, 64)',
|
||||
'rgb(255, 205, 86)',
|
||||
],
|
||||
borderWidth: 1
|
||||
}]
|
||||
};
|
||||
|
||||
const TotalTirageRestantData = {
|
||||
labels: ['Total tirage restant'],
|
||||
datasets: [
|
||||
{
|
||||
label: 'Tirage de ticket',
|
||||
data: [TotalTirageRestant],
|
||||
backgroundColor: [
|
||||
'rgba(54, 162, 235, 0.5)',
|
||||
],
|
||||
borderWidth: 1,
|
||||
const options = {
|
||||
responsive: true,
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
},
|
||||
],
|
||||
title: {
|
||||
display: false,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const numberWithSpaces = (x: number): string => {
|
||||
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
|
||||
}
|
||||
|
||||
|
||||
|
||||
const { register, setValue, handleSubmit, formState: { errors } } = useForm<FormData>({
|
||||
});
|
||||
|
||||
@@ -160,28 +190,10 @@ const Admin = (props: Props) => {
|
||||
setResponse(data);
|
||||
callback;
|
||||
if (data.err) {
|
||||
toast.error(data.err, {
|
||||
position: "top-center",
|
||||
autoClose: 2000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
toastError(data.err);
|
||||
return;
|
||||
}
|
||||
toast.success(data.message, {
|
||||
position: "top-center",
|
||||
autoClose: 5000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
toastSuccess(data.message);
|
||||
})
|
||||
}
|
||||
catch (error) {
|
||||
@@ -189,6 +201,32 @@ const Admin = (props: Props) => {
|
||||
}
|
||||
}
|
||||
|
||||
const toastError = (text: string) => {
|
||||
toast.error(text, {
|
||||
position: "top-center",
|
||||
autoClose: 2000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
}
|
||||
|
||||
const toastSuccess = (text: string) => {
|
||||
toast.success(text, {
|
||||
position: "top-center",
|
||||
autoClose: 5000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
}
|
||||
|
||||
const onSubmit = async ({
|
||||
email,
|
||||
name,
|
||||
@@ -218,19 +256,13 @@ const Admin = (props: Props) => {
|
||||
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",
|
||||
});
|
||||
toastError('Vous devez être déconnecté pour supprimer votre compte')
|
||||
return;
|
||||
}
|
||||
fetcher('/api/user/delete', 'DELETE', body)
|
||||
setTimeout(() => {
|
||||
router.refresh();
|
||||
}, 2000)
|
||||
};
|
||||
|
||||
const selectUser = (user: any) => {
|
||||
@@ -256,38 +288,19 @@ const Admin = (props: Props) => {
|
||||
const customers = users.filter((user) => user.role === 'USER')
|
||||
|
||||
if (users.length <= 0) {
|
||||
toast.error("Il n'y a pas encore d'utilisateur", {
|
||||
position: "top-center",
|
||||
autoClose: 2000,
|
||||
hideProgressBar: false,
|
||||
closeOnClick: true,
|
||||
pauseOnHover: true,
|
||||
draggable: true,
|
||||
progress: undefined,
|
||||
theme: "light",
|
||||
});
|
||||
toastError("Il n'y a pas encore d'utilisateur")
|
||||
return;
|
||||
}
|
||||
|
||||
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",
|
||||
});
|
||||
toastError("Il n'y a pas encore d'utilisateurs ayant joué");
|
||||
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();
|
||||
@@ -306,7 +319,7 @@ const Admin = (props: Props) => {
|
||||
const filtered = searchFilter(props.users)
|
||||
|
||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
setQuery(e.target.value)
|
||||
setQuery(e.target.value);
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -324,17 +337,13 @@ const Admin = (props: Props) => {
|
||||
<hr />
|
||||
<h1 className="fw-light">Dashboard Administration</h1>
|
||||
<hr />
|
||||
|
||||
|
||||
<div className="container" style={{ width: '30vw' }}>
|
||||
<div className="row">
|
||||
<div className="col-12 justify-content-center">
|
||||
<p>Total tirages restant 📈 {props.totalTirageRestant?.total?.toString()}</p>
|
||||
<Doughnut
|
||||
data={ticketDataChart} />
|
||||
<p>Total tirages restant 📈 {numberWithSpaces(props.ticketRestants).toString()}</p>
|
||||
<Bar options={options} data={data} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -361,7 +370,7 @@ const Admin = (props: Props) => {
|
||||
<th scope="col">Nom</th>
|
||||
<th scope="col">Prénom</th>
|
||||
<th scope="col">Email</th>
|
||||
<th scope="col">Types</th>
|
||||
{session?.user['role'] !== Role.SELLER && <th scope="col">Types</th>}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -371,7 +380,7 @@ const Admin = (props: Props) => {
|
||||
<td>{info.surname}</td>
|
||||
<td>{info.name}</td>
|
||||
<td>{info.isBigWinner && '🎁'}{info.email}</td>
|
||||
{info.role !== Role.SELLER && <td>
|
||||
{session?.user['role'] !== Role.SELLER && <td>
|
||||
<select className="custom-select" defaultValue={info.role} onChange={(e) => onChangeRole(e, info)}>
|
||||
<option value="USER">Client</option>
|
||||
<option value="SELLER">Vendeur</option>
|
||||
@@ -379,7 +388,7 @@ const Admin = (props: Props) => {
|
||||
{isSuperAdmin && <option value="SUPERADMIN">SuperAdmin</option>}
|
||||
</select>
|
||||
</td>}
|
||||
{info.role !== Role.SELLER && <td><button className="btn btn-primary" onClick={() => onDeleteUser(info.email)}>Supprimer</button></td>}
|
||||
{session?.user['role'] !== Role.SELLER && <td><button className="btn btn-primary" onClick={() => onDeleteUser(info.email)}>Supprimer</button></td>}
|
||||
</tr>;
|
||||
})}
|
||||
</tbody>
|
||||
|
||||
Reference in new issue
Block a user