diff --git a/src/pages/Profile/components/Task/Task.jsx b/src/components/Task/Task.jsx similarity index 85% rename from src/pages/Profile/components/Task/Task.jsx rename to src/components/Task/Task.jsx index 05a9e9f..1be1990 100644 --- a/src/pages/Profile/components/Task/Task.jsx +++ b/src/components/Task/Task.jsx @@ -1,7 +1,7 @@ import React, {useEffect, useState} from "react"; -import getEventById from "../../../../utils/events/getEventById.js"; +import getEventById from "../../utils/events/getEventById.js"; import styles from "./Task.module.css"; -import formatDate from "../../../../utils/date/formatDate.js"; +import formatDate from "../../utils/date/formatDate.js"; const Task = ({ task }) => { const [event, setEvent] = useState(null); diff --git a/src/pages/Profile/components/Task/Task.module.css b/src/components/Task/Task.module.css similarity index 100% rename from src/pages/Profile/components/Task/Task.module.css rename to src/components/Task/Task.module.css diff --git a/src/pages/Profile/ProfilePage.jsx b/src/pages/Profile/ProfilePage.jsx index 1bc6e70..ec45c5d 100644 --- a/src/pages/Profile/ProfilePage.jsx +++ b/src/pages/Profile/ProfilePage.jsx @@ -2,7 +2,7 @@ import React, { useContext } from "react"; 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 Task from "../../components/Task/Task"; import SettingsModal from "./components/SettingsModal/SettingsModal.jsx"; function ProfilePage() { diff --git a/src/pages/VolunteerProfile/VolunteerProfilePage.jsx b/src/pages/VolunteerProfile/VolunteerProfilePage.jsx index 8e4b5f6..62d467a 100644 --- a/src/pages/VolunteerProfile/VolunteerProfilePage.jsx +++ b/src/pages/VolunteerProfile/VolunteerProfilePage.jsx @@ -3,9 +3,9 @@ import { useParams } from "react-router"; import { useEffect, useState, useContext } from "react"; import getUserById from "../../utils/users/getUserById.js"; import formatDate from "../../utils/date/formatDate.js"; -import Task from "../Profile/components/Task/Task.jsx"; +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 }) {