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 diff --git a/src/pages/Events/EventsPage.jsx b/src/pages/Events/EventsPage.jsx index 4c56864..670f9b5 100644 --- a/src/pages/Events/EventsPage.jsx +++ b/src/pages/Events/EventsPage.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import Event from "../../components/Event/Event.jsx"; +import Event from "./components/Event/Event.jsx"; import styles from "./EventsPage.module.css"; import ToolBar from "../../components/ToolBar/ToolBar.jsx"; import getAllEvents from "../../utils/events/getAllEvents.js"; diff --git a/src/components/Event/Event.jsx b/src/pages/Events/components/Event/Event.jsx similarity index 100% rename from src/components/Event/Event.jsx rename to src/pages/Events/components/Event/Event.jsx diff --git a/src/components/Event/Event.module.css b/src/pages/Events/components/Event/Event.module.css similarity index 100% rename from src/components/Event/Event.module.css rename to src/pages/Events/components/Event/Event.module.css diff --git a/src/pages/Home/HomePage.jsx b/src/pages/Home/HomePage.jsx index e1c9849..2afe88c 100644 --- a/src/pages/Home/HomePage.jsx +++ b/src/pages/Home/HomePage.jsx @@ -1,6 +1,6 @@ import styles from "./HomePage.module.css"; -import Calendar from "../../components/homePage/calendar.jsx"; -import EventList from "../../components/homePage/eventList.jsx"; +import Calendar from "./components/Calendar/calendar.jsx"; +import EventList from "./components/EventList/eventList.jsx"; import { useState, useEffect } from "react"; import getAllEvents from "../../utils/events/getAllEvents.js"; diff --git a/src/components/homePage/calendar.jsx b/src/pages/Home/components/Calendar/calendar.jsx similarity index 98% rename from src/components/homePage/calendar.jsx rename to src/pages/Home/components/Calendar/calendar.jsx index faab865..2f6411e 100644 --- a/src/components/homePage/calendar.jsx +++ b/src/pages/Home/components/Calendar/calendar.jsx @@ -1,6 +1,6 @@ import { useState, useMemo, useEffect } from "react"; import styles from "./calendar.module.css"; -import { formatDateLetterJS } from "../../utils/date/formatDateLetter.js"; +import { formatDateLetterJS } from "../../../../utils/date/formatDateLetter.js"; function Calendar({ events = [] }) { diff --git a/src/components/homePage/calendar.module.css b/src/pages/Home/components/Calendar/calendar.module.css similarity index 100% rename from src/components/homePage/calendar.module.css rename to src/pages/Home/components/Calendar/calendar.module.css diff --git a/src/components/homePage/eventItem.jsx b/src/pages/Home/components/EventList/eventItem.jsx similarity index 92% rename from src/components/homePage/eventItem.jsx rename to src/pages/Home/components/EventList/eventItem.jsx index 3540857..a65f3ee 100644 --- a/src/components/homePage/eventItem.jsx +++ b/src/pages/Home/components/EventList/eventItem.jsx @@ -1,5 +1,5 @@ import styles from "./eventList.module.css"; -import { formatDateLetter } from "../../utils/date/formatDateLetter.js"; +import { formatDateLetter } from "../../../../utils/date/formatDateLetter.js"; import { useState } from "react"; export default function EventItem({ eventGroup }) { diff --git a/src/components/homePage/eventList.jsx b/src/pages/Home/components/EventList/eventList.jsx similarity index 95% rename from src/components/homePage/eventList.jsx rename to src/pages/Home/components/EventList/eventList.jsx index 66ff366..c03ccdd 100644 --- a/src/components/homePage/eventList.jsx +++ b/src/pages/Home/components/EventList/eventList.jsx @@ -1,6 +1,6 @@ import { useMemo } from "react"; import styles from "./eventList.module.css"; -import EventItem from "./eventItem"; +import EventItem from "./eventItem.jsx"; function EventList({ events }) { diff --git a/src/components/homePage/eventList.module.css b/src/pages/Home/components/EventList/eventList.module.css similarity index 100% rename from src/components/homePage/eventList.module.css rename to src/pages/Home/components/EventList/eventList.module.css diff --git a/src/pages/Login/LoginPage.jsx b/src/pages/Login/LoginPage.jsx index 65d1d12..1b267cd 100644 --- a/src/pages/Login/LoginPage.jsx +++ b/src/pages/Login/LoginPage.jsx @@ -1,5 +1,5 @@ import styles from "./LoginPage.module.css"; -import LoginForm from "../../components/loginform/loginForm.jsx"; +import LoginForm from "./components/loginform/loginForm.jsx"; import Background from "../../components/background/background.jsx"; import { useEffect, useContext } from "react"; import { AuthContext } from "../../contexts/auth/AuthContext.js"; diff --git a/src/components/loginform/loginForm.jsx b/src/pages/Login/components/loginform/loginForm.jsx similarity index 86% rename from src/components/loginform/loginForm.jsx rename to src/pages/Login/components/loginform/loginForm.jsx index 74eb1ee..ee2ee6b 100644 --- a/src/components/loginform/loginForm.jsx +++ b/src/pages/Login/components/loginform/loginForm.jsx @@ -1,10 +1,10 @@ import { useState, useContext } from "react"; import styles from "./loginForm.module.css"; -import Button from "../ui/button/button.jsx"; -import Input from "../ui/input/input.jsx"; -import Modal from "../ui/modal/modal.jsx"; +import Button from "../../../../components/ui/button/button.jsx"; +import Input from "../../../../components/ui/input/input.jsx"; +import Modal from "../../../../components/ui/modal/modal.jsx"; import { useNavigate } from "react-router"; -import { AuthContext } from "../../contexts/auth/AuthContext.js"; +import { AuthContext } from "../../../../contexts/auth/AuthContext.js"; function LoginForm({ className }) { diff --git a/src/components/loginform/loginForm.module.css b/src/pages/Login/components/loginform/loginForm.module.css similarity index 100% rename from src/components/loginform/loginForm.module.css rename to src/pages/Login/components/loginform/loginForm.module.css diff --git a/src/pages/Profile/ProfilePage.jsx b/src/pages/Profile/ProfilePage.jsx index a56450b..ec45c5d 100644 --- a/src/pages/Profile/ProfilePage.jsx +++ b/src/pages/Profile/ProfilePage.jsx @@ -3,7 +3,7 @@ import styles from "./ProfilePage.module.css"; import { AuthContext } from "../../contexts/auth/AuthContext.js"; import formatDate from "../../utils/date/formatDate.js"; import Task from "../../components/Task/Task"; -import SettingsModal from "../../components/SettingsModal/SettingsModal.jsx"; +import SettingsModal from "./components/SettingsModal/SettingsModal.jsx"; function ProfilePage() { diff --git a/src/components/SettingsModal/SettingsModal.jsx b/src/pages/Profile/components/SettingsModal/SettingsModal.jsx similarity index 86% rename from src/components/SettingsModal/SettingsModal.jsx rename to src/pages/Profile/components/SettingsModal/SettingsModal.jsx index 739da76..4283559 100644 --- a/src/components/SettingsModal/SettingsModal.jsx +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.jsx @@ -1,12 +1,12 @@ -import Modal from "../ui/modal/modal.jsx"; -import Button from "../ui/button/button.jsx"; +import Modal from "../../../../components/ui/modal/modal.jsx"; +import Button from "../../../../components/ui/button/button.jsx"; import styles from "./SettingsModal.module.css" import { useContext, useState } from "react"; -import ThemeSwitcher from "../ui/themeSwitcher/ThemeSwitcher.jsx"; -import { AuthContext } from "../../contexts/auth/AuthContext.js"; -import TextInput from "../ui/input/input.jsx"; -import updateUser from "../../utils/users/updateUser.js"; -import deleteUser from "../../utils/users/deleteUser.js"; +import ThemeSwitcher from "../../../../components/ui/themeSwitcher/ThemeSwitcher.jsx"; +import { AuthContext } from "../../../../contexts/auth/AuthContext.js"; +import TextInput from "../../../../components/ui/input/input.jsx"; +import updateUser from "../../../../utils/users/updateUser.js"; +import deleteUser from "../../../../utils/users/deleteUser.js"; export default function SettingsModal() { diff --git a/src/components/SettingsModal/SettingsModal.module.css b/src/pages/Profile/components/SettingsModal/SettingsModal.module.css similarity index 100% rename from src/components/SettingsModal/SettingsModal.module.css rename to src/pages/Profile/components/SettingsModal/SettingsModal.module.css diff --git a/src/pages/VolunteerProfile/VolunteerProfilePage.jsx b/src/pages/VolunteerProfile/VolunteerProfilePage.jsx index f44d566..62d467a 100644 --- a/src/pages/VolunteerProfile/VolunteerProfilePage.jsx +++ b/src/pages/VolunteerProfile/VolunteerProfilePage.jsx @@ -5,7 +5,7 @@ import getUserById from "../../utils/users/getUserById.js"; import formatDate from "../../utils/date/formatDate.js"; import Task from "../../components/Task/Task.jsx"; import { useNavigate } from "react-router"; -import ManageMember from "../../components/manageMember/ManageMember.jsx"; +import ManageMember from "./components/manageMember/ManageMember.jsx"; import { AuthContext } from "../../contexts/auth/AuthContext.js"; export default function VolunteerProfilePage() { diff --git a/src/components/manageMember/ManageMember.jsx b/src/pages/VolunteerProfile/components/manageMember/ManageMember.jsx similarity index 86% rename from src/components/manageMember/ManageMember.jsx rename to src/pages/VolunteerProfile/components/manageMember/ManageMember.jsx index cc695fb..6266501 100644 --- a/src/components/manageMember/ManageMember.jsx +++ b/src/pages/VolunteerProfile/components/manageMember/ManageMember.jsx @@ -1,10 +1,10 @@ -import Button from "../ui/button/button.jsx"; -import Modal from "../ui/modal/modal.jsx"; +import Button from "../../../../components/ui/button/button.jsx"; +import Modal from "../../../../components/ui/modal/modal.jsx"; import {useContext, useState} from "react"; import styles from "./manageMember.module.css" import DeactivateMemberBtn from "./deactivateMember/deactivateMemberBtn.jsx"; import ModifyRole from "./modifyrole/ModifyRole.jsx"; -import {AuthContext} from "../../contexts/auth/AuthContext.js"; +import {AuthContext} from "../../../../contexts/auth/AuthContext.js"; export default function ManageMember({ userToManage }) { diff --git a/src/components/manageMember/deactivateMember/deactivateMemberBtn.jsx b/src/pages/VolunteerProfile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx similarity index 82% rename from src/components/manageMember/deactivateMember/deactivateMemberBtn.jsx rename to src/pages/VolunteerProfile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx index 1368668..ccb8390 100644 --- a/src/components/manageMember/deactivateMember/deactivateMemberBtn.jsx +++ b/src/pages/VolunteerProfile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx @@ -1,7 +1,7 @@ -import Button from "../../ui/button/button.jsx"; -import Modal from "../../ui/modal/modal.jsx"; +import Button from "../../../../../components/ui/button/button.jsx"; +import Modal from "../../../../../components/ui/modal/modal.jsx"; import { useState } from "react"; -import deactivateUser from "../../../utils/users/deactivateUser.js" +import deactivateUser from "../../../../../utils/users/deactivateUser.js" import { useNavigate } from "react-router"; export default function DeactivateMemberBtn({ name, id, ...props }) { diff --git a/src/components/manageMember/manageMember.module.css b/src/pages/VolunteerProfile/components/manageMember/manageMember.module.css similarity index 100% rename from src/components/manageMember/manageMember.module.css rename to src/pages/VolunteerProfile/components/manageMember/manageMember.module.css diff --git a/src/components/manageMember/modifyrole/ModifyRole.jsx b/src/pages/VolunteerProfile/components/manageMember/modifyrole/ModifyRole.jsx similarity index 86% rename from src/components/manageMember/modifyrole/ModifyRole.jsx rename to src/pages/VolunteerProfile/components/manageMember/modifyrole/ModifyRole.jsx index 11ecdf3..8dc7f73 100644 --- a/src/components/manageMember/modifyrole/ModifyRole.jsx +++ b/src/pages/VolunteerProfile/components/manageMember/modifyrole/ModifyRole.jsx @@ -1,9 +1,9 @@ import styles from "../manageMember.module.css"; -import Button from "../../ui/button/button.jsx"; -import modifyRole from "../../../utils/users/modifyRole.js"; +import Button from "../../../../../components/ui/button/button.jsx"; +import modifyRole from "../../../../../utils/users/modifyRole.js"; import { useState, useEffect } from "react"; -import getRoles from "../../../utils/getRoles.js"; -import Modal from "../../ui/modal/modal.jsx"; +import getRoles from "../../../../../utils/getRoles.js"; +import Modal from "../../../../../components/ui/modal/modal.jsx"; export default function ModifyRole({ user }) { diff --git a/src/components/eventTask/EventTask.jsx b/src/pages/eventDetail/components/EventTask/EventTask.jsx similarity index 87% rename from src/components/eventTask/EventTask.jsx rename to src/pages/eventDetail/components/EventTask/EventTask.jsx index fd75379..6c61165 100644 --- a/src/components/eventTask/EventTask.jsx +++ b/src/pages/eventDetail/components/EventTask/EventTask.jsx @@ -1,11 +1,11 @@ import styles from "./eventTask.module.css"; -import { formatDateLetter } from "../../utils/date/formatDateLetter.js"; -import Button from "../ui/button/button.jsx"; -import assign from "../../utils/tasks/assign.js"; -import unAssign from "../../utils/tasks/unAssign.js"; +import { formatDateLetter } from "../../../../utils/date/formatDateLetter.js"; +import Button from "../../../../components/ui/button/button.jsx"; +import assign from "../../../../utils/tasks/assign.js"; +import unAssign from "../../../../utils/tasks/unAssign.js"; import { useEffect, useState } from "react"; -import isAssigned from "../../utils/tasks/isAssigned.js"; -import Modal from "../ui/modal/modal.jsx"; +import isAssigned from "../../../../utils/tasks/isAssigned.js"; +import Modal from "../../../../components/ui/modal/modal.jsx"; export default function EventTask({ task, index }) { diff --git a/src/components/eventTask/eventTask.module.css b/src/pages/eventDetail/components/EventTask/eventTask.module.css similarity index 100% rename from src/components/eventTask/eventTask.module.css rename to src/pages/eventDetail/components/EventTask/eventTask.module.css diff --git a/src/pages/eventDetail/eventDetail.jsx b/src/pages/eventDetail/eventDetail.jsx index 0d1d5f1..3f0356a 100644 --- a/src/pages/eventDetail/eventDetail.jsx +++ b/src/pages/eventDetail/eventDetail.jsx @@ -3,7 +3,7 @@ import styles from "./eventDetail.module.css"; import { useParams } from "react-router"; import getEventById from "../../utils/events/getEventById.js"; import { formatDateLetter } from "../../utils/date/formatDateLetter.js"; -import EventTask from "../../components/eventTask/EventTask.jsx"; +import EventTask from "./components/EventTask/EventTask.jsx"; import Button from "../../components/ui/button/button.jsx"; import Modal from "../../components/ui/modal/modal.jsx"; import { AuthContext } from "../../contexts/auth/AuthContext.js";