From 8118f181f9ce3ba326669c3639fa5eb9779dc23c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 4 Jul 2024 14:17:58 -0700 Subject: [PATCH] Moved announcements components to Toast component as that's the only place they should be used --- Client/src/Components/TabPanels/Account/PasswordPanel.jsx | 3 ++- .../AnnouncementUpdateSubscription.jsx | 0 .../announcementUpdateSubscription.css | 0 .../AnnouncementsDualButton/AnnouncementsDualButton.jsx | 0 .../AnnouncementsDualButton/announcementsDualButton.css | 0 .../AnnouncementsDualButtonWithIcon.jsx | 0 .../announcementsDualButtonWithIcon.css | 0 .../AnnouncementsMessageBar/AnnouncementsMessageBar.jsx | 0 .../AnnouncementsMessageBar/announcementsMessageBar.css | 0 Client/src/Components/Toast/index.jsx | 2 +- Client/src/Pages/PlayGround/PlayGround.jsx | 8 ++++---- 11 files changed, 7 insertions(+), 6 deletions(-) rename Client/src/Components/{Announcements => Toast}/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription.jsx (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementUpdateSubscription/announcementUpdateSubscription.css (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsDualButton/AnnouncementsDualButton.jsx (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsDualButton/announcementsDualButton.css (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsDualButtonWithIcon/announcementsDualButtonWithIcon.css (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsMessageBar/AnnouncementsMessageBar.jsx (100%) rename Client/src/Components/{Announcements => Toast}/AnnouncementsMessageBar/announcementsMessageBar.css (100%) diff --git a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx index 14b9a016f..1e04ecaea 100644 --- a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx +++ b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx @@ -1,6 +1,7 @@ import TabPanel from "@mui/lab/TabPanel"; import React, { useState } from "react"; -import AnnouncementsDualButtonWithIcon from "../../Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; +// import AnnouncementsDualButtonWithIcon from "../../Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; +import AnnouncementsDualButtonWithIcon from "../../Toast/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; import { useTheme } from "@emotion/react"; import { Box, Divider, Stack, Typography } from "@mui/material"; import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined"; diff --git a/Client/src/Components/Announcements/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription.jsx b/Client/src/Components/Toast/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription.jsx similarity index 100% rename from Client/src/Components/Announcements/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription.jsx rename to Client/src/Components/Toast/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription.jsx diff --git a/Client/src/Components/Announcements/AnnouncementUpdateSubscription/announcementUpdateSubscription.css b/Client/src/Components/Toast/AnnouncementUpdateSubscription/announcementUpdateSubscription.css similarity index 100% rename from Client/src/Components/Announcements/AnnouncementUpdateSubscription/announcementUpdateSubscription.css rename to Client/src/Components/Toast/AnnouncementUpdateSubscription/announcementUpdateSubscription.css diff --git a/Client/src/Components/Announcements/AnnouncementsDualButton/AnnouncementsDualButton.jsx b/Client/src/Components/Toast/AnnouncementsDualButton/AnnouncementsDualButton.jsx similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsDualButton/AnnouncementsDualButton.jsx rename to Client/src/Components/Toast/AnnouncementsDualButton/AnnouncementsDualButton.jsx diff --git a/Client/src/Components/Announcements/AnnouncementsDualButton/announcementsDualButton.css b/Client/src/Components/Toast/AnnouncementsDualButton/announcementsDualButton.css similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsDualButton/announcementsDualButton.css rename to Client/src/Components/Toast/AnnouncementsDualButton/announcementsDualButton.css diff --git a/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx b/Client/src/Components/Toast/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx rename to Client/src/Components/Toast/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon.jsx diff --git a/Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/announcementsDualButtonWithIcon.css b/Client/src/Components/Toast/AnnouncementsDualButtonWithIcon/announcementsDualButtonWithIcon.css similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsDualButtonWithIcon/announcementsDualButtonWithIcon.css rename to Client/src/Components/Toast/AnnouncementsDualButtonWithIcon/announcementsDualButtonWithIcon.css diff --git a/Client/src/Components/Announcements/AnnouncementsMessageBar/AnnouncementsMessageBar.jsx b/Client/src/Components/Toast/AnnouncementsMessageBar/AnnouncementsMessageBar.jsx similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsMessageBar/AnnouncementsMessageBar.jsx rename to Client/src/Components/Toast/AnnouncementsMessageBar/AnnouncementsMessageBar.jsx diff --git a/Client/src/Components/Announcements/AnnouncementsMessageBar/announcementsMessageBar.css b/Client/src/Components/Toast/AnnouncementsMessageBar/announcementsMessageBar.css similarity index 100% rename from Client/src/Components/Announcements/AnnouncementsMessageBar/announcementsMessageBar.css rename to Client/src/Components/Toast/AnnouncementsMessageBar/announcementsMessageBar.css diff --git a/Client/src/Components/Toast/index.jsx b/Client/src/Components/Toast/index.jsx index 87e6c2ea9..41367ec11 100644 --- a/Client/src/Components/Toast/index.jsx +++ b/Client/src/Components/Toast/index.jsx @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import ComplexAlert from "../../Components/Icons/ComplexAlert/ComplexAlert"; -import AnnouncementsDualButtonWithIcon from "../../Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; +import AnnouncementsDualButtonWithIcon from "./AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; import "react-toastify/dist/ReactToastify.css"; import { toast, ToastContainer } from "react-toastify"; import "./index.css"; diff --git a/Client/src/Pages/PlayGround/PlayGround.jsx b/Client/src/Pages/PlayGround/PlayGround.jsx index 5f46af08d..bde0b6761 100644 --- a/Client/src/Pages/PlayGround/PlayGround.jsx +++ b/Client/src/Pages/PlayGround/PlayGround.jsx @@ -4,12 +4,12 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline"; import HelpOutlineIcon from "@mui/icons-material/HelpOutline"; import WebsiteTextField from "../../Components/TextFields/Website/WebsiteTextField"; import DescriptionTextField from "../../Components/TextFields/Description/DescriptionTextField"; -import AnnouncementsDualButton from "../../Components/Announcements/AnnouncementsDualButton/AnnouncementsDualButton"; -import AnnouncementsDualButtonWithIcon from "../../Components/Announcements/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; +import AnnouncementsDualButton from "../../Components/Toast/AnnouncementsDualButton/AnnouncementsDualButton"; +import AnnouncementsDualButtonWithIcon from "../../Components/Toast/AnnouncementsDualButtonWithIcon/AnnouncementsDualButtonWithIcon"; import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined"; import ComplexAlert from "../../Components/Icons/ComplexAlert/ComplexAlert"; -import AnnouncementsMessageBar from "../../Components/Announcements/AnnouncementsMessageBar/AnnouncementsMessageBar"; -import AnnouncementUpdateSubscription from "../../Components/Announcements/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription"; +import AnnouncementsMessageBar from "../../Components/Toast/AnnouncementsMessageBar/AnnouncementsMessageBar"; +import AnnouncementUpdateSubscription from "../../Components/Toast/AnnouncementUpdateSubscription/AnnouncementUpdateSubscription"; import PlayGroundCharts from "./PlayGround-Charts"; import PlayGroundPopupModals from "./PlayGround-Popup-Modals"; import PlayGroundTooltips from "./PlayGround-Tooltips";