From 278a879fce99a714d82ca15f8f3218b340f05eb7 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Thu, 12 Mar 2026 11:38:50 +0100 Subject: [PATCH] Rename Button ui component files --- src/components/Filter/Filter.tsx | 2 +- src/components/Footer/Footer.jsx | 2 +- src/components/ToolBar/tools/CreateEventBtn/CreateEventBtn.jsx | 2 +- src/components/ToolBar/tools/FilterBtn.tsx | 2 +- src/components/ToolBar/tools/SearchBtn.tsx | 2 +- .../ui/{button/button.module.css => Button/Button.module.css} | 0 src/components/ui/{button/button.tsx => Button/Button.tsx} | 0 src/components/ui/modal/modal.tsx | 2 +- src/components/ui/themeSwitcher/ThemeSwitcher.tsx | 2 +- src/pages/Admin/components/pendingMembers/PendingMembers.jsx | 2 +- src/pages/Admin/components/registerMember/registerMember.tsx | 2 +- src/pages/Events/components/Event/Event.jsx | 2 +- src/pages/Home/components/Calendar/calendar.jsx | 2 +- src/pages/Login/components/loginform/loginForm.tsx | 2 +- src/pages/Profile/components/SettingsModal/SettingsModal.tsx | 2 +- src/pages/Profile/components/manageMember/ManageMember.jsx | 2 +- .../manageMember/deactivateMember/deactivateMemberBtn.jsx | 2 +- .../Profile/components/manageMember/modifyrole/ModifyRole.jsx | 2 +- src/pages/Register/RegisterPage.jsx | 2 +- .../Volunteers/components/VolunteersCard/VolunteerCard.tsx | 2 +- src/pages/eventDetail/components/EventTask/EventTask.jsx | 2 +- .../eventDetail/components/createTaskBtn/createTaskBtn.jsx | 2 +- .../eventDetail/components/deleteEventBtn/deleteEventBtn.jsx | 2 +- .../eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx | 2 +- src/pages/waitValidationPage/ValidationErrorPage.jsx | 2 +- src/stories/Button.stories.jsx | 2 +- src/stories/Modal.stories.jsx | 2 +- 27 files changed, 25 insertions(+), 25 deletions(-) rename src/components/ui/{button/button.module.css => Button/Button.module.css} (100%) rename src/components/ui/{button/button.tsx => Button/Button.tsx} (100%) diff --git a/src/components/Filter/Filter.tsx b/src/components/Filter/Filter.tsx index d917928..6f8fa62 100644 --- a/src/components/Filter/Filter.tsx +++ b/src/components/Filter/Filter.tsx @@ -1,5 +1,5 @@ import styles from "./Filter.module.css"; -import Button from "../ui/button/button"; +import Button from "../ui/Button/button"; import React from "react"; type FiltersType = { diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index d5ded57..ad60daf 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -2,7 +2,7 @@ import styles from "./Footer.module.css" import {Link} from "react-router"; import {useState} from "react"; import Modal from "../ui/modal/modal.tsx"; -import Button from "../ui/button/button.tsx"; +import Button from "../ui/Button/button.tsx"; import scrollToTop from "../../utils/scrollToTop.js"; export default function Footer(){ diff --git a/src/components/ToolBar/tools/CreateEventBtn/CreateEventBtn.jsx b/src/components/ToolBar/tools/CreateEventBtn/CreateEventBtn.jsx index 11b96d6..0eb39e9 100644 --- a/src/components/ToolBar/tools/CreateEventBtn/CreateEventBtn.jsx +++ b/src/components/ToolBar/tools/CreateEventBtn/CreateEventBtn.jsx @@ -1,7 +1,7 @@ import styles from "./createEventBtn.module.css" import { useState, useContext } from "react"; import Modal from "../../../ui/modal/modal.tsx"; -import Button from "../../../ui/button/button.tsx"; +import Button from "../../../ui/Button/button.tsx"; import TextInput from "../../../ui/input/input.tsx"; import { EventContext } from "../../../../contexts/events/EventContext.js"; import {AuthContext} from "../../../../contexts/auth/AuthContext.ts"; diff --git a/src/components/ToolBar/tools/FilterBtn.tsx b/src/components/ToolBar/tools/FilterBtn.tsx index 0f87ae9..c9a0bc4 100644 --- a/src/components/ToolBar/tools/FilterBtn.tsx +++ b/src/components/ToolBar/tools/FilterBtn.tsx @@ -1,5 +1,5 @@ import styles from "../ToolBar.module.css" -import Button from "../../ui/button/button"; +import Button from "../../ui/Button/button"; import { useState } from "react"; import Filter from "../../Filter/Filter"; diff --git a/src/components/ToolBar/tools/SearchBtn.tsx b/src/components/ToolBar/tools/SearchBtn.tsx index 316db18..deb81fb 100644 --- a/src/components/ToolBar/tools/SearchBtn.tsx +++ b/src/components/ToolBar/tools/SearchBtn.tsx @@ -1,5 +1,5 @@ import styles from "../ToolBar.module.css" -import Button from "../../ui/button/button"; +import Button from "../../ui/Button/button"; import { useEffect, useState } from "react"; import SearchBar from "../../SearchBar/SearchBar"; diff --git a/src/components/ui/button/button.module.css b/src/components/ui/Button/Button.module.css similarity index 100% rename from src/components/ui/button/button.module.css rename to src/components/ui/Button/Button.module.css diff --git a/src/components/ui/button/button.tsx b/src/components/ui/Button/Button.tsx similarity index 100% rename from src/components/ui/button/button.tsx rename to src/components/ui/Button/Button.tsx diff --git a/src/components/ui/modal/modal.tsx b/src/components/ui/modal/modal.tsx index e8ba5db..b56a278 100644 --- a/src/components/ui/modal/modal.tsx +++ b/src/components/ui/modal/modal.tsx @@ -32,7 +32,7 @@ export default Modal;*/ import { createPortal } from "react-dom"; import styles from "./modal.module.css"; -import Button from "../button/button"; +import Button from "../Button/button"; import { ReactNode, MouseEvent } from "react"; interface ModalProps { diff --git a/src/components/ui/themeSwitcher/ThemeSwitcher.tsx b/src/components/ui/themeSwitcher/ThemeSwitcher.tsx index 4062bb8..3da3e68 100644 --- a/src/components/ui/themeSwitcher/ThemeSwitcher.tsx +++ b/src/components/ui/themeSwitcher/ThemeSwitcher.tsx @@ -31,7 +31,7 @@ export default function ThemeSwitcher() { }*/ -import Button from "../button/button"; +import Button from "../Button/button"; import { useState, useEffect } from "react"; import styles from "./ThemeSwitcher.module.css"; diff --git a/src/pages/Admin/components/pendingMembers/PendingMembers.jsx b/src/pages/Admin/components/pendingMembers/PendingMembers.jsx index f8280f6..f7d5d7a 100644 --- a/src/pages/Admin/components/pendingMembers/PendingMembers.jsx +++ b/src/pages/Admin/components/pendingMembers/PendingMembers.jsx @@ -1,5 +1,5 @@ import React, {useState, useEffect, useContext} from "react"; -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import styles from "./PendingMembers.module.css"; import Modal from "../../../../components/ui/modal/modal.tsx"; import validateUser from "../../../../utils/users/validateUser.js"; diff --git a/src/pages/Admin/components/registerMember/registerMember.tsx b/src/pages/Admin/components/registerMember/registerMember.tsx index e233176..cc732c2 100644 --- a/src/pages/Admin/components/registerMember/registerMember.tsx +++ b/src/pages/Admin/components/registerMember/registerMember.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react" import styles from "./registerMember.module.css" import TextInput from "../../../../components/ui/input/input" -import Button from "../../../../components/ui/button/button"; +import Button from "../../../../components/ui/Button/button"; import Response from "../../../../interfaces/response.interface"; import ResponseData from "./responseData.inteface"; import adminCreateUser from "../../../../utils/users/adminCreateUser"; diff --git a/src/pages/Events/components/Event/Event.jsx b/src/pages/Events/components/Event/Event.jsx index 41181d3..ab4f08c 100644 --- a/src/pages/Events/components/Event/Event.jsx +++ b/src/pages/Events/components/Event/Event.jsx @@ -1,7 +1,7 @@ import styles from "./Event.module.css"; import { useState, useEffect } from "react"; import { useNavigate } from "react-router"; -import Button from "/src/components/ui/button/button" +import Button from "/src/components/ui/Button/button" function Event({event}){ diff --git a/src/pages/Home/components/Calendar/calendar.jsx b/src/pages/Home/components/Calendar/calendar.jsx index 8129bf7..2e04d27 100644 --- a/src/pages/Home/components/Calendar/calendar.jsx +++ b/src/pages/Home/components/Calendar/calendar.jsx @@ -2,7 +2,7 @@ import {useState, useMemo, useEffect, useContext} from "react"; import styles from "./calendar.module.css"; import {formatDateLetterJS} from "../../../../utils/date/formatDateLetter.js"; import {EventContext} from "../../../../contexts/events/EventContext.js"; -import Button from "../../../../components/ui/button/button.jsx"; +import Button from "../../../../components/ui/Button/button.jsx"; import {AuthContext} from "../../../../contexts/auth/AuthContext.ts"; function Calendar() { diff --git a/src/pages/Login/components/loginform/loginForm.tsx b/src/pages/Login/components/loginform/loginForm.tsx index 6569d60..4ae03d9 100644 --- a/src/pages/Login/components/loginform/loginForm.tsx +++ b/src/pages/Login/components/loginform/loginForm.tsx @@ -1,6 +1,6 @@ import { useState, useContext, FormEvent } from "react"; import styles from "./loginForm.module.css"; -import Button from "../../../../components/ui/button/button"; +import Button from "../../../../components/ui/Button/button"; import Input from "../../../../components/ui/input/input"; import Modal from "../../../../components/ui/modal/modal"; import { useNavigate } from "react-router-dom"; diff --git a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx index e028735..15f98fd 100644 --- a/src/pages/Profile/components/SettingsModal/SettingsModal.tsx +++ b/src/pages/Profile/components/SettingsModal/SettingsModal.tsx @@ -1,6 +1,6 @@ import {useContext, useState, ChangeEvent} from "react"; import Modal from "../../../../components/ui/modal/modal"; -import Button from "../../../../components/ui/button/button"; +import Button from "../../../../components/ui/Button/button"; import styles from "./SettingsModal.module.css"; import ThemeSwitcher from "../../../../components/ui/themeSwitcher/ThemeSwitcher.jsx"; import {AuthContext} from "../../../../contexts/auth/AuthContext"; diff --git a/src/pages/Profile/components/manageMember/ManageMember.jsx b/src/pages/Profile/components/manageMember/ManageMember.jsx index 46f8ac2..a604ed3 100644 --- a/src/pages/Profile/components/manageMember/ManageMember.jsx +++ b/src/pages/Profile/components/manageMember/ManageMember.jsx @@ -1,4 +1,4 @@ -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import Modal from "../../../../components/ui/modal/modal.tsx"; import {useContext, useState} from "react"; import styles from "./manageMember.module.css" diff --git a/src/pages/Profile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx b/src/pages/Profile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx index 2f586f6..1fe5461 100644 --- a/src/pages/Profile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx +++ b/src/pages/Profile/components/manageMember/deactivateMember/deactivateMemberBtn.jsx @@ -1,4 +1,4 @@ -import Button from "../../../../../components/ui/button/button.tsx"; +import Button from "../../../../../components/ui/Button/button.tsx"; import Modal from "../../../../../components/ui/modal/modal.tsx"; import { useState } from "react"; import deactivateUser from "../../../../../utils/users/deactivateUser.js" diff --git a/src/pages/Profile/components/manageMember/modifyrole/ModifyRole.jsx b/src/pages/Profile/components/manageMember/modifyrole/ModifyRole.jsx index 9f847f4..d4cb0f1 100644 --- a/src/pages/Profile/components/manageMember/modifyrole/ModifyRole.jsx +++ b/src/pages/Profile/components/manageMember/modifyrole/ModifyRole.jsx @@ -1,5 +1,5 @@ import styles from "../manageMember.module.css"; -import Button from "../../../../../components/ui/button/button.tsx"; +import Button from "../../../../../components/ui/Button/button.tsx"; import modifyRole from "../../../../../utils/users/modifyRole.js"; import { useState, useEffect } from "react"; import getRoles from "../../../../../utils/getRoles.js"; diff --git a/src/pages/Register/RegisterPage.jsx b/src/pages/Register/RegisterPage.jsx index 0186af2..bfd9a33 100644 --- a/src/pages/Register/RegisterPage.jsx +++ b/src/pages/Register/RegisterPage.jsx @@ -1,7 +1,7 @@ import styles from "./RegisterPage.module.css"; import Background from "../../components/Background/background.jsx"; import Input from "../../components/ui/input/input.tsx"; -import Button from "../../components/ui/button/button.tsx"; +import Button from "../../components/ui/Button/button.tsx"; import {useContext, useEffect, useState} from "react"; import register from "../../utils/register.js"; import { useNavigate } from "react-router"; diff --git a/src/pages/Volunteers/components/VolunteersCard/VolunteerCard.tsx b/src/pages/Volunteers/components/VolunteersCard/VolunteerCard.tsx index 5d3c2e8..8151636 100644 --- a/src/pages/Volunteers/components/VolunteersCard/VolunteerCard.tsx +++ b/src/pages/Volunteers/components/VolunteersCard/VolunteerCard.tsx @@ -1,6 +1,6 @@ import styles from "./VolunteersCard.module.css"; import { useNavigate } from "react-router"; -import Button from "../../../../components/ui/button/button"; +import Button from "../../../../components/ui/Button/button"; import User from "../../interfaces/user.interface" interface VolunteersCardProps { diff --git a/src/pages/eventDetail/components/EventTask/EventTask.jsx b/src/pages/eventDetail/components/EventTask/EventTask.jsx index 6bea6e0..9008bb2 100644 --- a/src/pages/eventDetail/components/EventTask/EventTask.jsx +++ b/src/pages/eventDetail/components/EventTask/EventTask.jsx @@ -1,6 +1,6 @@ import styles from "./eventTask.module.css"; import { formatDateLetter } from "../../../../utils/date/formatDateLetter.js"; -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import assign from "../../../../utils/tasks/assign.js"; import unAssign from "../../../../utils/tasks/unAssign.js"; import { useContext, useEffect, useState } from "react"; diff --git a/src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx b/src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx index 6ad9d4b..ef75587 100644 --- a/src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx +++ b/src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx @@ -1,5 +1,5 @@ import styles from "../../eventDetail.module.css"; -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import {useContext, useState} from "react"; import TextInput from "../../../../components/ui/input/input.tsx"; import Modal from "../../../../components/ui/modal/modal.tsx"; diff --git a/src/pages/eventDetail/components/deleteEventBtn/deleteEventBtn.jsx b/src/pages/eventDetail/components/deleteEventBtn/deleteEventBtn.jsx index c3b4383..7192289 100644 --- a/src/pages/eventDetail/components/deleteEventBtn/deleteEventBtn.jsx +++ b/src/pages/eventDetail/components/deleteEventBtn/deleteEventBtn.jsx @@ -1,5 +1,5 @@ import styles from "../../eventDetail.module.css"; -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import Modal from "../../../../components/ui/modal/modal.tsx"; import { useContext, useState } from "react"; import { EventDetailContext } from "../../../../contexts/eventDetail/eventDetail.js"; diff --git a/src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx b/src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx index 90a749b..329f494 100644 --- a/src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx +++ b/src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx @@ -1,7 +1,7 @@ import { useContext } from "react"; import { AuthContext } from "../../../../contexts/auth/AuthContext.js"; import { EventDetailContext } from "../../../../contexts/eventDetail/eventDetail.js"; -import Button from "../../../../components/ui/button/button.tsx"; +import Button from "../../../../components/ui/Button/button.tsx"; import { useState } from "react"; import Modal from "../../../../components/ui/modal/modal.tsx"; import styles from "../../eventDetail.module.css"; diff --git a/src/pages/waitValidationPage/ValidationErrorPage.jsx b/src/pages/waitValidationPage/ValidationErrorPage.jsx index 456afb6..ceab908 100644 --- a/src/pages/waitValidationPage/ValidationErrorPage.jsx +++ b/src/pages/waitValidationPage/ValidationErrorPage.jsx @@ -1,6 +1,6 @@ import styles from "./validationErrorPage.module.css" import Background from "../../components/Background/background.jsx"; -import Button from "../../components/ui/button/button.tsx"; +import Button from "../../components/ui/Button/button.tsx"; import { useContext } from "react"; import { AuthContext } from "../../contexts/auth/AuthContext.js"; import { Navigate, useNavigate, Link } from "react-router"; diff --git a/src/stories/Button.stories.jsx b/src/stories/Button.stories.jsx index 3179067..f8993e9 100644 --- a/src/stories/Button.stories.jsx +++ b/src/stories/Button.stories.jsx @@ -1,6 +1,6 @@ import { fn } from 'storybook/test'; -import Button from '../components/ui/button/button.tsx'; +import Button from '../components/ui/Button/button.tsx'; export default { diff --git a/src/stories/Modal.stories.jsx b/src/stories/Modal.stories.jsx index 0983105..a47a546 100644 --- a/src/stories/Modal.stories.jsx +++ b/src/stories/Modal.stories.jsx @@ -1,5 +1,5 @@ import Modal from "../components/ui/modal/modal.tsx"; -import Button from "../components/ui/button/button.tsx"; +import Button from "../components/ui/Button/button.tsx"; import { useState } from "react"; export default {