Merge branch 'develop'
This commit is contained in:
commit
60d701ac07
14 files changed
+241
-297
No files matched your search
Vendored
-5
@@ -1,7 +1,2 @@
|
|||||||
{
|
{
|
||||||
"workbench.colorCustomizations": {
|
|
||||||
"activityBar.background": "#4C1F25",
|
|
||||||
"titleBar.activeBackground": "#6A2C34",
|
|
||||||
"titleBar.activeForeground": "#FEFCFC"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,10 @@ const NavBar = () => {
|
|||||||
|
|
||||||
const checkRole = () => {
|
const checkRole = () => {
|
||||||
const isAdmin = ['SELLER', 'ADMIN', 'SUPERADMIN'].includes(session?.user['role']);
|
const isAdmin = ['SELLER', 'ADMIN', 'SUPERADMIN'].includes(session?.user['role']);
|
||||||
|
console.log('isAdmin', isAdmin);
|
||||||
|
console.log('role', session?.user['role']);
|
||||||
|
|
||||||
|
|
||||||
return isAdmin ? setIsAdmin(true) : setIsAdmin(false);
|
return isAdmin ? setIsAdmin(true) : setIsAdmin(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Generated
+13
@@ -43,6 +43,7 @@
|
|||||||
"@testing-library/user-event": "^14.4.3",
|
"@testing-library/user-event": "^14.4.3",
|
||||||
"@tomfreudenberg/next-auth-mock": "^0.5.5",
|
"@tomfreudenberg/next-auth-mock": "^0.5.5",
|
||||||
"@types/chance": "^1.1.3",
|
"@types/chance": "^1.1.3",
|
||||||
|
"@types/dateformat": "^5.0.0",
|
||||||
"@types/jest": "^29.2.4",
|
"@types/jest": "^29.2.4",
|
||||||
"@types/next-auth": "3.13.0",
|
"@types/next-auth": "3.13.0",
|
||||||
"@types/node": "^18.11.9",
|
"@types/node": "^18.11.9",
|
||||||
@@ -1960,6 +1961,12 @@
|
|||||||
"integrity": "sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw==",
|
"integrity": "sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/dateformat": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/dateformat/-/dateformat-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-SZg4JdHIWHQGEokbYGZSDvo5wA4TLYPXaqhigs/wH+REDOejcJzgH+qyY+HtEUtWOZxEUkbhbdYPqQDiEgrXeA==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"node_modules/@types/debug": {
|
"node_modules/@types/debug": {
|
||||||
"version": "4.1.7",
|
"version": "4.1.7",
|
||||||
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
|
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
|
||||||
@@ -10355,6 +10362,12 @@
|
|||||||
"integrity": "sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw==",
|
"integrity": "sha512-X6c6ghhe4/sQh4XzcZWSFaTAUOda38GQHmq9BUanYkOE/EO7ZrkazwKmtsj3xzTjkLWmwULE++23g3d3CCWaWw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"@types/dateformat": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/dateformat/-/dateformat-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-SZg4JdHIWHQGEokbYGZSDvo5wA4TLYPXaqhigs/wH+REDOejcJzgH+qyY+HtEUtWOZxEUkbhbdYPqQDiEgrXeA==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"@types/debug": {
|
"@types/debug": {
|
||||||
"version": "4.1.7",
|
"version": "4.1.7",
|
||||||
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
|
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
"@testing-library/user-event": "^14.4.3",
|
"@testing-library/user-event": "^14.4.3",
|
||||||
"@tomfreudenberg/next-auth-mock": "^0.5.5",
|
"@tomfreudenberg/next-auth-mock": "^0.5.5",
|
||||||
"@types/chance": "^1.1.3",
|
"@types/chance": "^1.1.3",
|
||||||
|
"@types/dateformat": "^5.0.0",
|
||||||
"@types/jest": "^29.2.4",
|
"@types/jest": "^29.2.4",
|
||||||
"@types/next-auth": "3.13.0",
|
"@types/next-auth": "3.13.0",
|
||||||
"@types/node": "^18.11.9",
|
"@types/node": "^18.11.9",
|
||||||
|
|||||||
+105
-96
@@ -21,11 +21,18 @@ import { Token } from "nodemailer/lib/xoauth2";
|
|||||||
import { isGeneratorFunction } from "util/types";
|
import { isGeneratorFunction } from "util/types";
|
||||||
import { UserProps } from "../types/user";
|
import { UserProps } from "../types/user";
|
||||||
import { UserGainProps } from "../types/userGain";
|
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 { Doughnut } from "react-chartjs-2";
|
||||||
import { Chart as ChartJS, ArcElement, Tooltip, Legend, RadialLinearScale } from 'chart.js';
|
import {
|
||||||
import { PolarArea } from 'react-chartjs-2';
|
Chart as ChartJS,
|
||||||
|
CategoryScale,
|
||||||
|
LinearScale,
|
||||||
|
BarElement,
|
||||||
|
Title,
|
||||||
|
Tooltip,
|
||||||
|
Legend,
|
||||||
|
} from 'chart.js';
|
||||||
|
import { Bar } from 'react-chartjs-2';
|
||||||
|
|
||||||
type FormData = {
|
type FormData = {
|
||||||
email: string;
|
email: string;
|
||||||
@@ -52,7 +59,8 @@ export async function getServerSideProps(context) {
|
|||||||
const users = await prisma.user.findMany({
|
const users = await prisma.user.findMany({
|
||||||
include: {
|
include: {
|
||||||
gains: true
|
gains: true
|
||||||
}
|
},
|
||||||
|
take: 5
|
||||||
});
|
});
|
||||||
|
|
||||||
const user = await prisma.user.findUnique({
|
const user = await prisma.user.findUnique({
|
||||||
@@ -61,8 +69,29 @@ export async function getServerSideProps(context) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const tickets = await prisma.gain.findMany({})
|
const ticketRestants = await prisma.gain.count({
|
||||||
const totalTirageRestant = await prisma.ticketsRestants.findFirst({})
|
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({})
|
const produits = await prisma.produit.findMany({})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -70,8 +99,9 @@ export async function getServerSideProps(context) {
|
|||||||
user: JSON.parse(JSON.stringify(user)),
|
user: JSON.parse(JSON.stringify(user)),
|
||||||
produits: JSON.parse(JSON.stringify(produits)),
|
produits: JSON.parse(JSON.stringify(produits)),
|
||||||
users: JSON.parse(JSON.stringify(users)),
|
users: JSON.parse(JSON.stringify(users)),
|
||||||
tickets: JSON.parse(JSON.stringify(tickets)),
|
ticketRestants: JSON.parse(JSON.stringify(ticketRestants)),
|
||||||
totalTirageRestant: JSON.parse(JSON.stringify(totalTirageRestant))
|
ticketsSaisis: JSON.parse(JSON.stringify(ticketsSaisis)),
|
||||||
|
gainsRetires: JSON.parse(JSON.stringify(gainsRetires)),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,10 +110,12 @@ type Props = {
|
|||||||
user: User;
|
user: User;
|
||||||
produits: Produit[];
|
produits: Produit[];
|
||||||
users: any,
|
users: any,
|
||||||
tickets: Gain[]
|
ticketRestants: number,
|
||||||
totalTirageRestant: TicketsRestants
|
ticketsSaisis: number,
|
||||||
|
gainsRetires: number,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const Admin = (props: Props) => {
|
const Admin = (props: Props) => {
|
||||||
const { data: session, status } = useSession();
|
const { data: session, status } = useSession();
|
||||||
const [response, setResponse] = useState(null)
|
const [response, setResponse] = useState(null)
|
||||||
@@ -93,58 +125,56 @@ const Admin = (props: Props) => {
|
|||||||
const [query, setQuery] = useState("");
|
const [query, setQuery] = useState("");
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
|
||||||
const isAdmin = session?.user['role'] === Role.ADMIN
|
const isAdmin = session?.user['role'] === Role.ADMIN
|
||||||
const isSuperAdmin = session?.user['role'] === Role.SUPERADMIN
|
const isSuperAdmin = session?.user['role'] === Role.SUPERADMIN
|
||||||
const bigWinner = users?.find((user) => user?.isBigWinner)
|
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
|
const labels = ['Tickets générés', 'Codes saisis', 'Cadeaux récupérés'];
|
||||||
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 data = {
|
||||||
|
labels: labels,
|
||||||
const TotalTirageRestant = props.totalTirageRestant?.total;
|
datasets: [{
|
||||||
|
data: [props.ticketRestants, props.ticketsSaisis, props.gainsRetires],
|
||||||
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: [
|
backgroundColor: [
|
||||||
'rgba(255, 99, 132, 0.2)',
|
'rgba(255, 99, 132, 0.2)',
|
||||||
'rgba(54, 162, 235, 0.2)',
|
'rgba(255, 159, 64, 0.2)',
|
||||||
|
'rgba(255, 205, 86, 0.2)',
|
||||||
],
|
],
|
||||||
borderColor: [
|
borderColor: [
|
||||||
'rgba(255, 99, 132, 1)',
|
'rgb(255, 99, 132)',
|
||||||
'rgba(54, 162, 235, 1)',
|
'rgb(255, 159, 64)',
|
||||||
],
|
'rgb(255, 205, 86)',
|
||||||
borderWidth: 1,
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
|
borderWidth: 1
|
||||||
|
}]
|
||||||
};
|
};
|
||||||
|
|
||||||
const TotalTirageRestantData = {
|
const options = {
|
||||||
labels: ['Total tirage restant'],
|
responsive: true,
|
||||||
datasets: [
|
plugins: {
|
||||||
{
|
legend: {
|
||||||
label: 'Tirage de ticket',
|
display: false
|
||||||
data: [TotalTirageRestant],
|
|
||||||
backgroundColor: [
|
|
||||||
'rgba(54, 162, 235, 0.5)',
|
|
||||||
],
|
|
||||||
borderWidth: 1,
|
|
||||||
},
|
},
|
||||||
],
|
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>({
|
const { register, setValue, handleSubmit, formState: { errors } } = useForm<FormData>({
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -160,7 +190,19 @@ const Admin = (props: Props) => {
|
|||||||
setResponse(data);
|
setResponse(data);
|
||||||
callback;
|
callback;
|
||||||
if (data.err) {
|
if (data.err) {
|
||||||
toast.error(data.err, {
|
toastError(data.err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
toastSuccess(data.message);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
catch (error) {
|
||||||
|
console.error('ERROR :', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const toastError = (text: string) => {
|
||||||
|
toast.error(text, {
|
||||||
position: "top-center",
|
position: "top-center",
|
||||||
autoClose: 2000,
|
autoClose: 2000,
|
||||||
hideProgressBar: false,
|
hideProgressBar: false,
|
||||||
@@ -170,9 +212,10 @@ const Admin = (props: Props) => {
|
|||||||
progress: undefined,
|
progress: undefined,
|
||||||
theme: "light",
|
theme: "light",
|
||||||
});
|
});
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
toast.success(data.message, {
|
|
||||||
|
const toastSuccess = (text: string) => {
|
||||||
|
toast.success(text, {
|
||||||
position: "top-center",
|
position: "top-center",
|
||||||
autoClose: 5000,
|
autoClose: 5000,
|
||||||
hideProgressBar: false,
|
hideProgressBar: false,
|
||||||
@@ -182,11 +225,6 @@ const Admin = (props: Props) => {
|
|||||||
progress: undefined,
|
progress: undefined,
|
||||||
theme: "light",
|
theme: "light",
|
||||||
});
|
});
|
||||||
})
|
|
||||||
}
|
|
||||||
catch (error) {
|
|
||||||
console.error('ERROR :', error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const onSubmit = async ({
|
const onSubmit = async ({
|
||||||
@@ -218,19 +256,13 @@ const Admin = (props: Props) => {
|
|||||||
const onDeleteUser = async (userEmail: string) => {
|
const onDeleteUser = async (userEmail: string) => {
|
||||||
const body = { selectedUserEmail: userEmail }
|
const body = { selectedUserEmail: userEmail }
|
||||||
if (props.user.email === userEmail) {
|
if (props.user.email === userEmail) {
|
||||||
toast.error('Vous devez être déconnecté pour supprimer votre compte', {
|
toastError('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;
|
return;
|
||||||
}
|
}
|
||||||
fetcher('/api/user/delete', 'DELETE', body)
|
fetcher('/api/user/delete', 'DELETE', body)
|
||||||
|
setTimeout(() => {
|
||||||
|
router.refresh();
|
||||||
|
}, 2000)
|
||||||
};
|
};
|
||||||
|
|
||||||
const selectUser = (user: any) => {
|
const selectUser = (user: any) => {
|
||||||
@@ -256,38 +288,19 @@ const Admin = (props: Props) => {
|
|||||||
const customers = users.filter((user) => user.role === 'USER')
|
const customers = users.filter((user) => user.role === 'USER')
|
||||||
|
|
||||||
if (users.length <= 0) {
|
if (users.length <= 0) {
|
||||||
toast.error("Il n'y a pas encore d'utilisateur", {
|
toastError("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",
|
|
||||||
});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const customersWithTicket = customers.filter((user) => user.gains.length >= 1)
|
const customersWithTicket = customers.filter((user) => user.gains.length >= 1)
|
||||||
|
|
||||||
if (customersWithTicket.length <= 0) {
|
if (customersWithTicket.length <= 0) {
|
||||||
toast.error("Il n'y a pas encore d'utilisateurs ayant joué", {
|
toastError("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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const winUser = customersWithTicket[Math.floor(Math.random() * customersWithTicket.length)]
|
const winUser = customersWithTicket[Math.floor(Math.random() * customersWithTicket.length)]
|
||||||
const body = { selectedUserEmail: winUser.email }
|
const body = { selectedUserEmail: winUser.email }
|
||||||
console.log(body)
|
|
||||||
fetcher('/api/user/bigwinner', 'PUT', body)
|
fetcher('/api/user/bigwinner', 'PUT', body)
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
router.refresh();
|
router.refresh();
|
||||||
@@ -306,7 +319,7 @@ const Admin = (props: Props) => {
|
|||||||
const filtered = searchFilter(props.users)
|
const filtered = searchFilter(props.users)
|
||||||
|
|
||||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setQuery(e.target.value)
|
setQuery(e.target.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -324,17 +337,13 @@ const Admin = (props: Props) => {
|
|||||||
<hr />
|
<hr />
|
||||||
<h1 className="fw-light">Dashboard Administration</h1>
|
<h1 className="fw-light">Dashboard Administration</h1>
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
|
|
||||||
<div className="container" style={{ width: '30vw' }}>
|
<div className="container" style={{ width: '30vw' }}>
|
||||||
<div className="row">
|
<div className="row">
|
||||||
<div className="col-12 justify-content-center">
|
<div className="col-12 justify-content-center">
|
||||||
<p>Total tirages restant 📈 {props.totalTirageRestant?.total?.toString()}</p>
|
<p>Total tirages restant 📈 {numberWithSpaces(props.ticketRestants).toString()}</p>
|
||||||
<Doughnut
|
<Bar options={options} data={data} />
|
||||||
data={ticketDataChart} />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@@ -361,7 +370,7 @@ const Admin = (props: Props) => {
|
|||||||
<th scope="col">Nom</th>
|
<th scope="col">Nom</th>
|
||||||
<th scope="col">Prénom</th>
|
<th scope="col">Prénom</th>
|
||||||
<th scope="col">Email</th>
|
<th scope="col">Email</th>
|
||||||
<th scope="col">Types</th>
|
{session?.user['role'] !== Role.SELLER && <th scope="col">Types</th>}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -371,7 +380,7 @@ const Admin = (props: Props) => {
|
|||||||
<td>{info.surname}</td>
|
<td>{info.surname}</td>
|
||||||
<td>{info.name}</td>
|
<td>{info.name}</td>
|
||||||
<td>{info.isBigWinner && '🎁'}{info.email}</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)}>
|
<select className="custom-select" defaultValue={info.role} onChange={(e) => onChangeRole(e, info)}>
|
||||||
<option value="USER">Client</option>
|
<option value="USER">Client</option>
|
||||||
<option value="SELLER">Vendeur</option>
|
<option value="SELLER">Vendeur</option>
|
||||||
@@ -379,7 +388,7 @@ const Admin = (props: Props) => {
|
|||||||
{isSuperAdmin && <option value="SUPERADMIN">SuperAdmin</option>}
|
{isSuperAdmin && <option value="SUPERADMIN">SuperAdmin</option>}
|
||||||
</select>
|
</select>
|
||||||
</td>}
|
</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>;
|
</tr>;
|
||||||
})}
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -1,99 +0,0 @@
|
|||||||
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';
|
|
||||||
import process from 'process';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//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
|
|
||||||
|
|
||||||
//--> http://localhost:3000/api/apiGain?pass=... (a effacer)
|
|
||||||
|
|
||||||
export default async function apiGain(req: NextApiRequest, res: NextApiResponse) {
|
|
||||||
const { pass } = req.query;
|
|
||||||
const goodPassword = pass === 'P9RDK2b47x1XQV5s3fSaW6erGpzTNudk8jZwCycJYtMHAqhEnm';
|
|
||||||
|
|
||||||
if (!process.env.ACTION_API) {
|
|
||||||
return res.status(401).send({ message: 'Unauthorized' })
|
|
||||||
}
|
|
||||||
|
|
||||||
//récuperation des tickets disponible
|
|
||||||
const getTickets = await prisma.ticketsRestants.findFirst({
|
|
||||||
where: {
|
|
||||||
id: 1
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const { total } = getTickets;
|
|
||||||
const isTicketsAvaible = total > 0;
|
|
||||||
|
|
||||||
if (isTicketsAvaible && goodPassword) {
|
|
||||||
|
|
||||||
//creation d'un numéro de gain aléatoire
|
|
||||||
const gainNumber = cryptoRandomString({ length: 10, type: 'distinguishable' });
|
|
||||||
|
|
||||||
|
|
||||||
//création d'un id de produit de façon pondérée
|
|
||||||
let weightedRandomGainId = chance().weighted([
|
|
||||||
Cadeaux.GrandCoffretDecouverte,
|
|
||||||
Cadeaux.CoffretDecouverte,
|
|
||||||
Cadeaux.TheSignature,
|
|
||||||
Cadeaux.TheDetox,
|
|
||||||
Cadeaux.Infuseur],
|
|
||||||
[4, 6, 10, 20, 60]);
|
|
||||||
|
|
||||||
//création d'un gain
|
|
||||||
const gainCreated = await prisma.gain.create({
|
|
||||||
data: {
|
|
||||||
codeCadeau: gainNumber,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
//mise à jour du gain avec l'id de produit pondéré
|
|
||||||
const gainResult = await prisma.gain.update({
|
|
||||||
where: { id: gainCreated.id },
|
|
||||||
data: {
|
|
||||||
produitId: weightedRandomGainId,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
//on retire 1 ticket
|
|
||||||
await prisma.ticketsRestants.update({
|
|
||||||
where: {
|
|
||||||
id: getTickets.id
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
total: {
|
|
||||||
decrement: 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return res.status(200).send({ message: 'Gain has been generated !', result: gainResult });
|
|
||||||
} else {
|
|
||||||
return res.status(401).send({ message: 'Unauthorized' })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+10
-15
@@ -23,7 +23,7 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
|
|||||||
//est-ce que le code tapé par l'utilisateur est valide ?
|
//est-ce que le code tapé par l'utilisateur est valide ?
|
||||||
const isValidCodeCadeau = codeCadeau.match(regex);
|
const isValidCodeCadeau = codeCadeau.match(regex);
|
||||||
if (!isValidCodeCadeau) {
|
if (!isValidCodeCadeau) {
|
||||||
res.status(401).json({ err: 'Ce code est invalide' });
|
res.status(406).json({ err: 'Ce code est invalide' });
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,9 +32,15 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
|
|||||||
where: { codeCadeau }
|
where: { codeCadeau }
|
||||||
})
|
})
|
||||||
|
|
||||||
|
//si l'API gain n'a pas instancié une date pour ce gain
|
||||||
|
if (!codeCadeauInfo.dateAchat) {
|
||||||
|
res.status(406).json({ err: 'Ce code est invalide' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
//check si le code a déja été utilisé
|
//check si le code a déja été utilisé
|
||||||
if (!codeCadeauInfo.codeActif) {
|
if (!codeCadeauInfo.codeActif) {
|
||||||
res.status(401).json({ err: 'Ce code a déja été utilisé' });
|
res.status(406).json({ err: 'Ce code a déja été utilisé' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,27 +51,16 @@ export default async function testCode(req: NextApiRequest, res: NextApiResponse
|
|||||||
})
|
})
|
||||||
|
|
||||||
//ajout du gain au profil de l'utilisateur
|
//ajout du gain au profil de l'utilisateur
|
||||||
const joinGain = await prisma.gain.update({
|
await prisma.gain.update({
|
||||||
where: { codeCadeau: codeCadeauInfo.codeCadeau },
|
where: { codeCadeau: codeCadeauInfo.codeCadeau },
|
||||||
data: {
|
data: {
|
||||||
userId: getCurrentUser[0].id
|
userId: getCurrentUser[0].id
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
//retire un ticket du total de ticket restant
|
|
||||||
const ticketUpdate = await prisma.ticketsRestants.update({
|
|
||||||
where: {
|
|
||||||
id: 1
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
total: {
|
|
||||||
decrement: 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
//passage du code en non-actif
|
//passage du code en non-actif
|
||||||
const codeUpdate = await prisma.gain.update({
|
await prisma.gain.update({
|
||||||
where: {
|
where: {
|
||||||
id: codeCadeauInfo.id
|
id: codeCadeauInfo.id
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import prisma from '../../../lib/prisma';
|
||||||
|
import { NextApiRequest, NextApiResponse } from 'next';
|
||||||
|
import { getSession } from 'next-auth/react';
|
||||||
|
|
||||||
|
export default async function updateOrCreate(req: NextApiRequest, res: NextApiResponse) {
|
||||||
|
const session = await getSession({ req })
|
||||||
|
const { targetUserMail } = req.body;
|
||||||
|
|
||||||
|
// est-ce la méthode est un POST ou PUT?
|
||||||
|
if (!(['POST'].indexOf(req.method) > -1)) {
|
||||||
|
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: targetUserMail },
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
res.status(200).send({ message: 'user :', res: user });
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ export default async function updtateGift(req: NextApiRequest, res: NextApiRespo
|
|||||||
include: { gains: true }
|
include: { gains: true }
|
||||||
})
|
})
|
||||||
|
|
||||||
return res.status(200).send({ message: `Le gain a ont été mis à jour !`, res: updatedCurrentUser });
|
return res.status(200).send({ message: `Le gain a été mis à jour !`, res: updatedCurrentUser });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-9
@@ -45,14 +45,6 @@ const Index = () => {
|
|||||||
} = useForm<CodeSubmitForm>();
|
} = useForm<CodeSubmitForm>();
|
||||||
|
|
||||||
const onSubmit = async (data: CodeSubmitForm) => {
|
const onSubmit = async (data: CodeSubmitForm) => {
|
||||||
if (!errors) {
|
|
||||||
if (!session) {
|
|
||||||
return <Layout>
|
|
||||||
<p>Vous devez vous connecter pour tester votre code cadeau!</p>
|
|
||||||
</Layout>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const body = { codeCadeau: data.codeCadeau };
|
const body = { codeCadeau: data.codeCadeau };
|
||||||
await fetch(`/api/testcode`, {
|
await fetch(`/api/testcode`, {
|
||||||
@@ -83,7 +75,7 @@ const Index = () => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('ERROR :', error);
|
console.error('ERROR :', error);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
const confettiTime = async (): Promise<void> => {
|
const confettiTime = async (): Promise<void> => {
|
||||||
const JSConfetti = (await import('js-confetti')).default
|
const JSConfetti = (await import('js-confetti')).default
|
||||||
|
|||||||
@@ -60,14 +60,10 @@ model User {
|
|||||||
@@map(name: "users")
|
@@map(name: "users")
|
||||||
}
|
}
|
||||||
|
|
||||||
model TicketsRestants {
|
|
||||||
id Int @id @default(autoincrement())
|
|
||||||
total Int
|
|
||||||
}
|
|
||||||
|
|
||||||
model Gain {
|
model Gain {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
codeCadeau String @unique
|
codeCadeau String @unique
|
||||||
|
dateAchat DateTime?
|
||||||
dateRetrait DateTime?
|
dateRetrait DateTime?
|
||||||
produit Produit? @relation(fields: [produitId], references: [id])
|
produit Produit? @relation(fields: [produitId], references: [id])
|
||||||
produitId Int?
|
produitId Int?
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { PrismaClient } from '@prisma/client';
|
import { PrismaClient } from '@prisma/client';
|
||||||
// import prisma from '../lib/prisma'
|
// import prisma from '../lib/prisma'
|
||||||
|
|
||||||
import { generateGains } from './seed/gains'
|
|
||||||
import { produitsData } from './seed/produits'
|
import { produitsData } from './seed/produits'
|
||||||
import { userData } from './seed/user'
|
import { userData } from './seed/user'
|
||||||
|
|
||||||
@@ -10,14 +9,6 @@ const prisma = new PrismaClient();
|
|||||||
async function main() {
|
async function main() {
|
||||||
console.log(`Start seeding ...`)
|
console.log(`Start seeding ...`)
|
||||||
|
|
||||||
//création des tickets restants
|
|
||||||
const tickets = await prisma.ticketsRestants.create({
|
|
||||||
data: {
|
|
||||||
total: 1500000
|
|
||||||
},
|
|
||||||
})
|
|
||||||
console.log(`Created ticket: ${tickets.total}`)
|
|
||||||
|
|
||||||
|
|
||||||
//création des produits
|
//création des produits
|
||||||
for (const p of produitsData) {
|
for (const p of produitsData) {
|
||||||
@@ -37,11 +28,6 @@ async function main() {
|
|||||||
console.log(`Created user with id: ${user.id}`)
|
console.log(`Created user with id: ${user.id}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
//création de gains
|
|
||||||
for (let i = 1; i <= (50); i++) {
|
|
||||||
await generateGains();
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`Seeding finished.`)
|
console.log(`Seeding finished.`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
// import { produits } from './produits';
|
|
||||||
import prisma from '../../lib/prisma'
|
|
||||||
import { Chance } from 'chance'
|
|
||||||
import { Cadeaux } from '../../enum/cadeaux.enum';
|
|
||||||
import cryptoRandomString from 'crypto-random-string';
|
|
||||||
let chance = new Chance();
|
|
||||||
|
|
||||||
export const generateGains = async () => {
|
|
||||||
//génération d'un code cadeau
|
|
||||||
const randomNoGain = cryptoRandomString({ length: 10, type: 'distinguishable' });
|
|
||||||
|
|
||||||
//création d'un gain
|
|
||||||
const gainCreated = await prisma.gain.create({
|
|
||||||
data: {
|
|
||||||
codeCadeau: randomNoGain,
|
|
||||||
codeActif: true,
|
|
||||||
retrait: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
//crétion d'un id de produit de façon pondérée
|
|
||||||
let weightedRandomGain = chance.weighted([
|
|
||||||
Cadeaux.GrandCoffretDecouverte,
|
|
||||||
Cadeaux.CoffretDecouverte,
|
|
||||||
Cadeaux.TheSignature,
|
|
||||||
Cadeaux.TheDetox,
|
|
||||||
Cadeaux.Infuseur],
|
|
||||||
[4, 6, 10, 20, 60]);
|
|
||||||
|
|
||||||
//mise à jour du gain avec l'id de produit pondéré
|
|
||||||
const gainUpdated = await prisma.gain.update({
|
|
||||||
where: { id: gainCreated.id },
|
|
||||||
data: {
|
|
||||||
produitId: weightedRandomGain,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
//on retire 1 ticket
|
|
||||||
await prisma.ticketsRestants.update({
|
|
||||||
where: {
|
|
||||||
id: 1
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
total: {
|
|
||||||
decrement: 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
console.log(`Created gain ! : ${gainUpdated.codeCadeau}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+56
-1
@@ -11,7 +11,7 @@ export const userData: Prisma.UserCreateInput[] = [
|
|||||||
name: 'John',
|
name: 'John',
|
||||||
email: 'john@prisma.io',
|
email: 'john@prisma.io',
|
||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
role: 'SELLER'
|
role: 'USER'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'Mosse',
|
name: 'Mosse',
|
||||||
@@ -19,4 +19,59 @@ export const userData: Prisma.UserCreateInput[] = [
|
|||||||
createdAt: new Date(),
|
createdAt: new Date(),
|
||||||
role: 'USER'
|
role: 'USER'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'doug',
|
||||||
|
email: 'doug@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'molda',
|
||||||
|
email: 'molda@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'pierro',
|
||||||
|
email: 'pierro@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'brian',
|
||||||
|
email: 'brian@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'benji',
|
||||||
|
email: 'benji@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'abdel',
|
||||||
|
email: 'abdel@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'guillaume',
|
||||||
|
email: 'guillaume@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'roger',
|
||||||
|
email: 'roger@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'jacko',
|
||||||
|
email: 'jacko@prisma.io',
|
||||||
|
createdAt: new Date(),
|
||||||
|
role: 'USER'
|
||||||
|
},
|
||||||
|
|
||||||
]
|
]
|
||||||
Reference in new issue
Block a user