From 20f4523bb4ad3acbd3dca297c25d79030da33e61 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Mon, 19 Jan 2026 09:05:51 +0100 Subject: [PATCH] Move adminPage components --- src/pages/Admin/AdminPage.jsx | 6 +++--- .../components/IncompleteEvent/IncompleteEvent.jsx | 2 +- .../IncompleteEvent/IncompleteEvent.module.css | 0 .../Admin}/components/chart/ParticipationChart.jsx | 2 +- .../components/chart/ParticipationChart.module.css | 0 .../components/pendingMembers}/PendingMembers.jsx | 10 +++++----- .../pendingMembers}/PendingMembers.module.css | 0 7 files changed, 10 insertions(+), 10 deletions(-) rename src/{ => pages/Admin}/components/IncompleteEvent/IncompleteEvent.jsx (96%) rename src/{ => pages/Admin}/components/IncompleteEvent/IncompleteEvent.module.css (100%) rename src/{ => pages/Admin}/components/chart/ParticipationChart.jsx (97%) rename src/{ => pages/Admin}/components/chart/ParticipationChart.module.css (100%) rename src/{components/PendingMembers => pages/Admin/components/pendingMembers}/PendingMembers.jsx (89%) rename src/{components/PendingMembers => pages/Admin/components/pendingMembers}/PendingMembers.module.css (100%) diff --git a/src/pages/Admin/AdminPage.jsx b/src/pages/Admin/AdminPage.jsx index 54f9478..b8cf562 100644 --- a/src/pages/Admin/AdminPage.jsx +++ b/src/pages/Admin/AdminPage.jsx @@ -1,8 +1,8 @@ import { useState, useContext } from "react"; import styles from "./AdminPage.module.css"; -import ParticipationChart from "../../components/chart/ParticipationChart.jsx"; -import IncompleteEvents from "../../components/IncompleteEvent/IncompleteEvent.jsx"; -import PendingMembers from "../../components/PendingMembers/PendingMembers.jsx"; +import ParticipationChart from "./components/chart/ParticipationChart.jsx"; +import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent.jsx"; +import PendingMembers from "./components/pendingMembers/PendingMembers.jsx"; import { AuthContext } from "../../contexts/auth/AuthContext.js"; import { useNavigate } from "react-router"; diff --git a/src/components/IncompleteEvent/IncompleteEvent.jsx b/src/pages/Admin/components/IncompleteEvent/IncompleteEvent.jsx similarity index 96% rename from src/components/IncompleteEvent/IncompleteEvent.jsx rename to src/pages/Admin/components/IncompleteEvent/IncompleteEvent.jsx index ed4ac34..40f3a69 100644 --- a/src/components/IncompleteEvent/IncompleteEvent.jsx +++ b/src/pages/Admin/components/IncompleteEvent/IncompleteEvent.jsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styles from "./IncompleteEvent.module.css"; -import getAllEvents from "../../utils/events/getAllEvents"; +import getAllEvents from "../../../../utils/events/getAllEvents.js"; function IncompleteEvent() { const [events, setEvents] = useState([]); diff --git a/src/components/IncompleteEvent/IncompleteEvent.module.css b/src/pages/Admin/components/IncompleteEvent/IncompleteEvent.module.css similarity index 100% rename from src/components/IncompleteEvent/IncompleteEvent.module.css rename to src/pages/Admin/components/IncompleteEvent/IncompleteEvent.module.css diff --git a/src/components/chart/ParticipationChart.jsx b/src/pages/Admin/components/chart/ParticipationChart.jsx similarity index 97% rename from src/components/chart/ParticipationChart.jsx rename to src/pages/Admin/components/chart/ParticipationChart.jsx index 18aac36..4927836 100644 --- a/src/components/chart/ParticipationChart.jsx +++ b/src/pages/Admin/components/chart/ParticipationChart.jsx @@ -3,7 +3,7 @@ import { Doughnut } from "react-chartjs-2"; import { Chart, ArcElement } from "chart.js"; import { MenuItem, Select, FormControl } from "@mui/material"; import styles from "./ParticipationChart.module.css"; -import getAllEvents from "../../utils/events/getAllEvents"; +import getAllEvents from "../../../../utils/events/getAllEvents.js"; Chart.register(ArcElement); diff --git a/src/components/chart/ParticipationChart.module.css b/src/pages/Admin/components/chart/ParticipationChart.module.css similarity index 100% rename from src/components/chart/ParticipationChart.module.css rename to src/pages/Admin/components/chart/ParticipationChart.module.css diff --git a/src/components/PendingMembers/PendingMembers.jsx b/src/pages/Admin/components/pendingMembers/PendingMembers.jsx similarity index 89% rename from src/components/PendingMembers/PendingMembers.jsx rename to src/pages/Admin/components/pendingMembers/PendingMembers.jsx index 44accc9..4d1d68f 100644 --- a/src/components/PendingMembers/PendingMembers.jsx +++ b/src/pages/Admin/components/pendingMembers/PendingMembers.jsx @@ -1,11 +1,11 @@ import React, { useState, useEffect } from "react"; -import Button from "../ui/button/button"; +import Button from "../../../../components/ui/button/button.jsx"; import styles from "./PendingMembers.module.css"; -import getUserToValidate from "../../utils/users/getUserToValidate"; -import getUserById from "../../utils/users/getUserById"; -import validateUser from "../../utils/users/validateUser"; -import deleteOtherUser from "../../utils/users/deleteOtherUser.js"; +import getUserToValidate from "../../../../utils/users/getUserToValidate.js"; +import getUserById from "../../../../utils/users/getUserById.js"; +import validateUser from "../../../../utils/users/validateUser.js"; +import deleteOtherUser from "../../../../utils/users/deleteOtherUser.js"; function PendingMembers() { const [pendingMembers, setPendingMembers] = useState([]); diff --git a/src/components/PendingMembers/PendingMembers.module.css b/src/pages/Admin/components/pendingMembers/PendingMembers.module.css similarity index 100% rename from src/components/PendingMembers/PendingMembers.module.css rename to src/pages/Admin/components/pendingMembers/PendingMembers.module.css