diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json index 9de95263f4134f0914d4330d89a826029bff1a16..1faa05cb11306c1fb80e54653d83303d32b00148 100644 --- a/app/assets/locales/en.json +++ b/app/assets/locales/en.json @@ -344,78 +344,77 @@ } }, "toast": { + "success": "Success", "success": { "user": { - "user_created": "User created.", - "user_updated": "User updated.", - "user_deleted": "User deleted.", - "avatar_updated": "Avatar updated.", - "password_updated": "Password updated.", - "account_activated": "Account successfully activated. Please sign in to your account.", - "activation_email_sent": "Activation email has been sent", - "reset_pwd_email_sent": "Reset password email should be sent, kindly check your inbox", - "challenge_passed": "Challenge Passed" + "user_created": "A new user has been created.", + "user_updated": "The user has been updated.", + "user_deleted": "The user has been deleted.", + "avatar_updated": "The avatar has been updated.", + "password_updated": "The password has been updated.", + "account_activated": "Your account has been activated.", + "activation_email_sent": "An email that contains the instructions to activate your account has been sent.", + "reset_pwd_email_sent": "An email that contains the instructions to reset your password has been sent." }, "session": { - "signed_out": "You have successfully signed out." + "signed_out": "You have been signed out." }, "room": { - "room_created": "Room created.", - "room_updated": "Room updated.", - "room_deleted": "Room deleted.", - "room_shared": "Room shared", - "room_unshared": "Room unshared", - "recordings_synced": "Room recordings are now synchronized", - "server_room_deleted": "Server room deleted.", - "room_configuration_updated": "Room configuration updated.", - "room_setting_updated": "Room setting updated.", - "presentation_updated": "Presentation updated.", - "presentation_deleted": "Presentation deleted.", + "room_created": "A new room has been created.", + "room_updated": "The room has been updated.", + "room_deleted": "The room has been deleted.", + "room_shared": "The room has been shared.", + "room_unshared": "The room has been unshare.d", + "recordings_synced": "The room recordings have been synchronized.", + "room_configuration_updated": "The room configuration have been updated.", + "room_setting_updated": "The room setting has been updated.", + "presentation_updated": "The presentation has been updated.", + "presentation_deleted": "The presentation has been deleted.", "joining_meeting": "Joining the meeting...", "meeting_started": "Meeting started.", - "access_code_copied": "Access code copied.", - "access_code_generated": "Access code generated.", - "access_code_removed": "Access code removed." + "access_code_copied": "The access code has been copied.", + "access_code_generated": "A new access code has been generated.", + "access_code_removed": "The access code has been removed." }, "site_settings": { - "site_setting_updated": "Site setting updated." + "site_setting_updated": "The site setting has been updated." }, "recording": { - "recording_visibility_updated": "Recording visibility updated.", - "recording_name_updated": "Recording name updated.", - "recording_deleted": "Recording deleted." + "recording_visibility_updated": "The recording visibility has been updated.", + "recording_name_updated": "The recording name has been updated.", + "recording_deleted": "The recording has been deleted." }, "role": { - "role_created": "Role created.", - "role_updated": "Role updated.", - "role_deleted": "Role deleted.", - "role_permission_updated": "Role permission updated." + "role_created": "A new role has been created.", + "role_updated": "The role has been updated.", + "role_deleted": "The role has been deleted.", + "role_permission_updated": "The role permission has been updated." }, "invitations": { - "invitation_sent": "Invitation sent" + "invitation_sent": "An invitation has been sent." } }, "error": { - "problem_completing_action": "There was a problem completing that action. \n Please try again.", - "file_type_not_supported": "File type is not supported.", - "file_size_too_large": "File size is too large.", - "signin_required": "You must be signed in to access this page", + "problem_completing_action": "The action can't be completed. \n Please try again.", + "file_type_not_supported": "The file type is not supported.", + "file_size_too_large": "The file size is too large.", + "signin_required": "You must be signed in to access this page.", "roles": { - "role_assigned": "This role can't be deleted as it is assigned to at least one user." + "role_assigned": "This role can't be deleted because it is assigned to at least one user." }, "users": { - "signup_error": "There was an error signing you in. Please contact your administrator.", - "invalid_invite": "Your invitation token is either invalid or incorrect. Please contact your administrator to receive a new one", - "email_exists": "An account under this email already exists. Please try again with another email", - "old_password": "The current password you have entered is incorrect", - "pending": "Your registration is pending approval from your administrator", - "banned": "You do not have access to this application. Please contact your administrator if you believe this is a mistake" + "signup_error": "You can't be authenticated. Please contact your administrator.", + "invalid_invite": "Your invitation token is either invalid or incorrect. Please contact your administrator to receive a new token.", + "email_exists": "An account under this email already exists. Please try again with another email.", + "old_password": "The password you have entered is incorrect.", + "pending": "Your registration is pending approval from the administrator. Please try again later.", + "banned": "You do not have access to this application. Please contact your administrator if you believe this is a mistake." }, "rooms": { - "room_limit": "Room can not be created due to room limit being reached" + "room_limit": "The room can't be created due to reaching the room limit." }, "session": { - "invalid_credentials": "Invalid username or password. Please check your credentials and try again." + "invalid_credentials": "The username or password is invalid. Please verify your credentials and try again." } } }, @@ -430,8 +429,8 @@ "account_activation_page": { "title": "Account Activation", "account_unverified": "Your account has not been verified yet.", - "message": "In order to use Greenlight, please verify your account by following the instructions in the activation email that was sent to you.", - "resend_activation_link": "If you haven't received an activation email or if you are having a problem using it, click the resend button below to request a new activation email.", + "message": "In order to use Greenlight, please verify your account by following the instructions in the activation email that has been sent to you.", + "resend_activation_link": "If you haven't received an activation email or if you are having a problem using it, click on the button below to request a new activation email.", "resend_btn_lbl": "Resend Verification" }, "forms": { diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss index 1e32287f6aefb51453eb0cf2e1bd52bb0596c5d9..a6f90e8e50b0b4f177c64e6583247dff8816f519 100644 --- a/app/assets/stylesheets/application.bootstrap.scss +++ b/app/assets/stylesheets/application.bootstrap.scss @@ -1,5 +1,7 @@ + @import 'variables'; @import 'bootstrap/scss/bootstrap'; +@import 'react-toastify/dist/ReactToastify'; @import 'helpers'; @import 'rooms'; @@ -11,6 +13,8 @@ @import 'pagination'; @import 'fonts'; + + html, body { overflow-x: hidden; diff --git a/app/javascript/App.jsx b/app/javascript/App.jsx index 2d58ede4c04bd0d0e194cf85e5e99ee4ca176c5c..73bcead8cecffbe829525cd2031442b22e6accc9 100644 --- a/app/javascript/App.jsx +++ b/app/javascript/App.jsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react'; import { Container } from 'react-bootstrap'; import { Outlet, useLocation } from 'react-router-dom'; -import { Toaster } from 'react-hot-toast'; import { useTranslation } from 'react-i18next'; +import { ToastContainer } from 'react-toastify'; import Header from './components/shared_components/Header'; import { useAuth } from './contexts/auth/AuthProvider'; import Footer from './components/shared_components/Footer'; @@ -36,11 +36,9 @@ export default function App() { <Container className={pageHeight}> <Outlet /> </Container> - <Toaster + <ToastContainer position="bottom-right" - toastOptions={{ - duration: 4000, - }} + newestOnTop /> <Footer /> </> diff --git a/app/javascript/components/home/HomePage.jsx b/app/javascript/components/home/HomePage.jsx index dae0f8d18360e510f735a88704fe54cccc9dd664..d7bc131dca78836c539bf51cba1389b353efd100 100644 --- a/app/javascript/components/home/HomePage.jsx +++ b/app/javascript/components/home/HomePage.jsx @@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'; import { ArrowRightIcon, Cog8ToothIcon, ComputerDesktopIcon, VideoCameraIcon, WrenchScrewdriverIcon, } from '@heroicons/react/24/outline'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useAuth } from '../../contexts/auth/AuthProvider'; import HomepageFeatureCard from './HomepageFeatureCard'; diff --git a/app/javascript/components/recordings/RecordingRow.jsx b/app/javascript/components/recordings/RecordingRow.jsx index 2cfadf4bf492c90eade5c015917bf23a407842a9..e13511fe55416ed35779cdd90a1ce7dbc47f755d 100644 --- a/app/javascript/components/recordings/RecordingRow.jsx +++ b/app/javascript/components/recordings/RecordingRow.jsx @@ -7,7 +7,7 @@ import PropTypes from 'prop-types'; import { Button, Stack, Dropdown, } from 'react-bootstrap'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import Spinner from '../shared_components/utilities/Spinner'; import UpdateRecordingForm from './forms/UpdateRecordingForm'; diff --git a/app/javascript/components/rooms/RoomCard.jsx b/app/javascript/components/rooms/RoomCard.jsx index ad751ae247f73e7ab1826170be9502899740aea7..7375016abfbdac9ebf93b5c07d2cb70075856570 100644 --- a/app/javascript/components/rooms/RoomCard.jsx +++ b/app/javascript/components/rooms/RoomCard.jsx @@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom'; import { Button, Card, Stack } from 'react-bootstrap'; import PropTypes from 'prop-types'; import { DocumentDuplicateIcon, LinkIcon } from '@heroicons/react/24/outline'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import Spinner from '../shared_components/utilities/Spinner'; import useStartMeeting from '../../hooks/mutations/rooms/useStartMeeting'; diff --git a/app/javascript/components/rooms/room/Room.jsx b/app/javascript/components/rooms/room/Room.jsx index ed5e636ca3ac7d6087789f8429b918633758cf6c..a6510a874519db80dc566954404644dccfaa74da 100644 --- a/app/javascript/components/rooms/room/Room.jsx +++ b/app/javascript/components/rooms/room/Room.jsx @@ -6,7 +6,7 @@ import { Link, Navigate, useLocation, useParams, } from 'react-router-dom'; import { HomeIcon, Square2StackIcon } from '@heroicons/react/24/outline'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import FeatureTabs from './FeatureTabs'; import Spinner from '../../shared_components/utilities/Spinner'; diff --git a/app/javascript/components/rooms/room/join/RoomJoin.jsx b/app/javascript/components/rooms/room/join/RoomJoin.jsx index df2c6c3064c2367771dee852a870d15adaac35db..2472d9d8cea797129835be548af954237a0e850a 100644 --- a/app/javascript/components/rooms/room/join/RoomJoin.jsx +++ b/app/javascript/components/rooms/room/join/RoomJoin.jsx @@ -7,7 +7,7 @@ import { import { Button, Col, Row, Spinner, Stack, Form as RegularForm, } from 'react-bootstrap'; -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import { useForm } from 'react-hook-form'; import usePublicRoom from '../../../../hooks/queries/rooms/usePublicRoom'; diff --git a/app/javascript/components/rooms/room/room_settings/AccessCodeRow.jsx b/app/javascript/components/rooms/room/room_settings/AccessCodeRow.jsx index 75c20e6c1f13a6af4fe90f7c7a44f28095877f41..50e5d0388725fbf2b4a9c107c15a3f34d963beda 100644 --- a/app/javascript/components/rooms/room/room_settings/AccessCodeRow.jsx +++ b/app/javascript/components/rooms/room/room_settings/AccessCodeRow.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Button, Row, Stack } from 'react-bootstrap'; import { TrashIcon, Square2StackIcon, ArrowPathIcon } from '@heroicons/react/24/outline'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; export default function AccessCodeRow({ diff --git a/app/javascript/components/shared_components/utilities/FilesDragAndDrop.jsx b/app/javascript/components/shared_components/utilities/FilesDragAndDrop.jsx index c278590f618e124ae4a97b45d85bb0ebc114c432..18eccbf7ffe584766e903af5f37035ac5dc48899 100644 --- a/app/javascript/components/shared_components/utilities/FilesDragAndDrop.jsx +++ b/app/javascript/components/shared_components/utilities/FilesDragAndDrop.jsx @@ -1,6 +1,6 @@ import React, { useRef, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; export default function FilesDragAndDrop({ onDrop, children, numOfFiles, formats, diff --git a/app/javascript/components/shared_components/utilities/HCaptcha.jsx b/app/javascript/components/shared_components/utilities/HCaptcha.jsx index 89d1f64ddd9987991d0e9ac2d9308a069e8bebf1..7aba39af6201fa5261981e9c7c253c16eeb74d66 100644 --- a/app/javascript/components/shared_components/utilities/HCaptcha.jsx +++ b/app/javascript/components/shared_components/utilities/HCaptcha.jsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react'; import { Container } from 'react-bootstrap'; import OriginHCaptcha from '@hcaptcha/react-hcaptcha'; -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import useEnv from '../../../hooks/queries/env/useEnv'; @@ -26,7 +26,7 @@ function HCaptcha(_props, ref) { }, handleVerified: () => { - toast.success(t('toast.success.user.challenge_passed')); + toast.success(t('toast.success.success')); }, }), [i18n.resolvedLanguage]); diff --git a/app/javascript/components/users/authentication/Signup.jsx b/app/javascript/components/users/authentication/Signup.jsx index 26916e97c476afe173c950cdb571cc3174ed5761..808a822fc2db6bfc5b5a93904c4f9083a1849b77 100644 --- a/app/javascript/components/users/authentication/Signup.jsx +++ b/app/javascript/components/users/authentication/Signup.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { Card } from 'react-bootstrap'; import { Navigate, Link, useSearchParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import SignupForm from './forms/SignupForm'; import Logo from '../../shared_components/Logo'; import useSiteSetting from '../../../hooks/queries/site_settings/useSiteSetting'; diff --git a/app/javascript/hooks/mutations/account_activation/useCreateActivationLink.jsx b/app/javascript/hooks/mutations/account_activation/useCreateActivationLink.jsx index 0ac7b2727839eed7fd5a7be2c109ce90354594bc..8228f1fa34077b136f6b540de6883c2c11da2637 100644 --- a/app/javascript/hooks/mutations/account_activation/useCreateActivationLink.jsx +++ b/app/javascript/hooks/mutations/account_activation/useCreateActivationLink.jsx @@ -1,4 +1,4 @@ -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import { useMutation } from 'react-query'; import { useNavigate } from 'react-router-dom'; diff --git a/app/javascript/hooks/mutations/admin/manage_users/useAdminCreateUser.jsx b/app/javascript/hooks/mutations/admin/manage_users/useAdminCreateUser.jsx index f12c541c00f587ae6afa5971a5b2990efe9778fc..f68d84362f176fb332d6cc1cfb8fe9a5d2da86df 100644 --- a/app/javascript/hooks/mutations/admin/manage_users/useAdminCreateUser.jsx +++ b/app/javascript/hooks/mutations/admin/manage_users/useAdminCreateUser.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/manage_users/useCreateInvitation.jsx b/app/javascript/hooks/mutations/admin/manage_users/useCreateInvitation.jsx index ac6c6a8871286b45bed43f7bceb07a3351c11760..be4470df16eb783ca7e5eec8668f51c037673271 100644 --- a/app/javascript/hooks/mutations/admin/manage_users/useCreateInvitation.jsx +++ b/app/javascript/hooks/mutations/admin/manage_users/useCreateInvitation.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/manage_users/useCreateServerRoom.jsx b/app/javascript/hooks/mutations/admin/manage_users/useCreateServerRoom.jsx index ef701871e8254975840f1e88019b6fd158c8ca4a..dea2fe2d3840aee4d3f3fe069148aec50bc0a921 100644 --- a/app/javascript/hooks/mutations/admin/manage_users/useCreateServerRoom.jsx +++ b/app/javascript/hooks/mutations/admin/manage_users/useCreateServerRoom.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/manage_users/useDeleteUser.jsx b/app/javascript/hooks/mutations/admin/manage_users/useDeleteUser.jsx index 53eaae535e3b5655529fb9541a0e60b9a2d28b6e..3d607bd9fccac55a215837dd52b0ce9507b7ac90 100644 --- a/app/javascript/hooks/mutations/admin/manage_users/useDeleteUser.jsx +++ b/app/javascript/hooks/mutations/admin/manage_users/useDeleteUser.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/manage_users/useUpdateUserStatus.jsx b/app/javascript/hooks/mutations/admin/manage_users/useUpdateUserStatus.jsx index 7f2b5daecb9bc6da0889b96819b08adbd0d81a33..52e0b285a6e0fc425fa3ff7243786b27f6a70377 100644 --- a/app/javascript/hooks/mutations/admin/manage_users/useUpdateUserStatus.jsx +++ b/app/javascript/hooks/mutations/admin/manage_users/useUpdateUserStatus.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/role_permissions/useUpdateRolePermissions.jsx b/app/javascript/hooks/mutations/admin/role_permissions/useUpdateRolePermissions.jsx index 9325dcd2a68cb436254b4cffd800e9fe1fb94bf7..0df0404a4ecfee98dab33a198ee70b26890d2208 100644 --- a/app/javascript/hooks/mutations/admin/role_permissions/useUpdateRolePermissions.jsx +++ b/app/javascript/hooks/mutations/admin/role_permissions/useUpdateRolePermissions.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/roles/useCreateRole.jsx b/app/javascript/hooks/mutations/admin/roles/useCreateRole.jsx index b9a008c530cdf2ca0e6e0831bf9e06eaec9c58ff..e530cca469810239dc3ce2e13e3929d629cf1795 100644 --- a/app/javascript/hooks/mutations/admin/roles/useCreateRole.jsx +++ b/app/javascript/hooks/mutations/admin/roles/useCreateRole.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/roles/useDeleteRole.jsx b/app/javascript/hooks/mutations/admin/roles/useDeleteRole.jsx index fc6432cfb65ef1f7700de4fbb906b10375785317..b7b3c767bf6559ffe729b57fa252c96cc6debdad 100644 --- a/app/javascript/hooks/mutations/admin/roles/useDeleteRole.jsx +++ b/app/javascript/hooks/mutations/admin/roles/useDeleteRole.jsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/roles/useUpdateRole.jsx b/app/javascript/hooks/mutations/admin/roles/useUpdateRole.jsx index 815efaa40f7cf995763ae25812aa6096042b7d96..493fcaa5231eab967945af70793041e4d009bab4 100644 --- a/app/javascript/hooks/mutations/admin/roles/useUpdateRole.jsx +++ b/app/javascript/hooks/mutations/admin/roles/useUpdateRole.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/room_configuration/useUpdateRoomConfig.jsx b/app/javascript/hooks/mutations/admin/room_configuration/useUpdateRoomConfig.jsx index 544d6d46e65ed2c09dc4e436f36cfe08ca8d3773..0710f658e5a4117c7563a34a5fe5d72fb3d76e22 100644 --- a/app/javascript/hooks/mutations/admin/room_configuration/useUpdateRoomConfig.jsx +++ b/app/javascript/hooks/mutations/admin/room_configuration/useUpdateRoomConfig.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/server_recordings/useRecordingsReSync.jsx b/app/javascript/hooks/mutations/admin/server_recordings/useRecordingsReSync.jsx index 58d96481e037a64754ee509b59e6735c75078427..87fe0e4526bc69b021bed6bbf3efbcec534c9a38 100644 --- a/app/javascript/hooks/mutations/admin/server_recordings/useRecordingsReSync.jsx +++ b/app/javascript/hooks/mutations/admin/server_recordings/useRecordingsReSync.jsx @@ -1,5 +1,5 @@ import { t } from 'i18next'; -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useMutation, useQueryClient } from 'react-query'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/server_rooms/useDeleteServerRoom.jsx b/app/javascript/hooks/mutations/admin/server_rooms/useDeleteServerRoom.jsx index 3e43030cb6d3fa661bcbaee88aa181d05da911ad..f86cbe7a368fa8cc166639d41d9ca52aa32d6074 100644 --- a/app/javascript/hooks/mutations/admin/server_rooms/useDeleteServerRoom.jsx +++ b/app/javascript/hooks/mutations/admin/server_rooms/useDeleteServerRoom.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; @@ -12,7 +12,7 @@ export default function useDeleteServerRoom({ friendlyId, onSettled }) { { onSuccess: () => { queryClient.invalidateQueries('getServerRooms'); - toast.success(t('toast.success.room.server_room_deleted')); + toast.success(t('toast.success.room.room_deleted')); }, onError: () => { toast.error(t('toast.error.problem_completing_action')); diff --git a/app/javascript/hooks/mutations/admin/site_settings/useDeleteBrandingImage.jsx b/app/javascript/hooks/mutations/admin/site_settings/useDeleteBrandingImage.jsx index 5ca960f0d126a532cc4ec03bce2c45b2012083aa..a1839fe46bf4b0961004df832563fa66ee6612ab 100644 --- a/app/javascript/hooks/mutations/admin/site_settings/useDeleteBrandingImage.jsx +++ b/app/javascript/hooks/mutations/admin/site_settings/useDeleteBrandingImage.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx b/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx index 5a4a7244dccb29b9683475a45dcfbf8bab43db8f..cfc0237cfb25012c6f3f462a9bdeb95c3ea17251 100644 --- a/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx +++ b/app/javascript/hooks/mutations/admin/site_settings/useUpdateSiteSetting.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/recordings/useDeleteRecording.jsx b/app/javascript/hooks/mutations/recordings/useDeleteRecording.jsx index 370467969eafa86594468891f104ddb13125110d..3782eb7becb00c8402f2ba35df16a73cc78d390e 100644 --- a/app/javascript/hooks/mutations/recordings/useDeleteRecording.jsx +++ b/app/javascript/hooks/mutations/recordings/useDeleteRecording.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/recordings/useUpdateRecording.jsx b/app/javascript/hooks/mutations/recordings/useUpdateRecording.jsx index 0bc4418ab0352eb2b3b9d88e5d885f18eaf40914..a7aec61c5f59b80ac97213c2f549510419a010a8 100644 --- a/app/javascript/hooks/mutations/recordings/useUpdateRecording.jsx +++ b/app/javascript/hooks/mutations/recordings/useUpdateRecording.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/recordings/useUpdateRecordingVisibility.jsx b/app/javascript/hooks/mutations/recordings/useUpdateRecordingVisibility.jsx index e8039b37586905b845ea3e6f3b536a6e064500f6..ec871f3fb4c9228bedda85dff644ea17b91342e2 100644 --- a/app/javascript/hooks/mutations/recordings/useUpdateRecordingVisibility.jsx +++ b/app/javascript/hooks/mutations/recordings/useUpdateRecordingVisibility.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/room_settings/useUpdateRoomSetting.jsx b/app/javascript/hooks/mutations/room_settings/useUpdateRoomSetting.jsx index 0a7fe2d7b3fe49c79996742de79256613d4dda95..787b460139e3580b1d96f2bc5eb6006799681723 100644 --- a/app/javascript/hooks/mutations/room_settings/useUpdateRoomSetting.jsx +++ b/app/javascript/hooks/mutations/room_settings/useUpdateRoomSetting.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useCreateRoom.jsx b/app/javascript/hooks/mutations/rooms/useCreateRoom.jsx index 3a8a63daadfc1e419ea0a4c75bad3e219e576972..3812a50c97b64dfc0fa17f7b281221452e21829f 100644 --- a/app/javascript/hooks/mutations/rooms/useCreateRoom.jsx +++ b/app/javascript/hooks/mutations/rooms/useCreateRoom.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useDeleteAccessCode.jsx b/app/javascript/hooks/mutations/rooms/useDeleteAccessCode.jsx index 4c32f3c6f4a347e7bafbb6ba7945ac89d259d95b..2098fcaabf548693b8f79b2c8876563125fcfd83 100644 --- a/app/javascript/hooks/mutations/rooms/useDeleteAccessCode.jsx +++ b/app/javascript/hooks/mutations/rooms/useDeleteAccessCode.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useDeletePresentation.jsx b/app/javascript/hooks/mutations/rooms/useDeletePresentation.jsx index 1ca2af5cc29aa98df927dc1d1d54131b6aeba155..577117cffb85fae5719b51c6b844196858e1f2d1 100644 --- a/app/javascript/hooks/mutations/rooms/useDeletePresentation.jsx +++ b/app/javascript/hooks/mutations/rooms/useDeletePresentation.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useDeleteRoom.jsx b/app/javascript/hooks/mutations/rooms/useDeleteRoom.jsx index a4c204235c6108344fba179726cbd3568c2cc7b0..2a6f01b22ce30ab76109db634c087b261a75c6c9 100644 --- a/app/javascript/hooks/mutations/rooms/useDeleteRoom.jsx +++ b/app/javascript/hooks/mutations/rooms/useDeleteRoom.jsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useGenerateAccessCode.jsx b/app/javascript/hooks/mutations/rooms/useGenerateAccessCode.jsx index 2d069b96dd3b5ac6a48e8642303cc0f630203c05..cbdb9351637f6f08c438997f7f2ffa482925444d 100644 --- a/app/javascript/hooks/mutations/rooms/useGenerateAccessCode.jsx +++ b/app/javascript/hooks/mutations/rooms/useGenerateAccessCode.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useRoomStatus.jsx b/app/javascript/hooks/mutations/rooms/useRoomStatus.jsx index 722625360dbf32088c9c4693d9f5244705d9383c..5b76266d887e4b442cf047a393d5ef9dc15d7ec7 100644 --- a/app/javascript/hooks/mutations/rooms/useRoomStatus.jsx +++ b/app/javascript/hooks/mutations/rooms/useRoomStatus.jsx @@ -1,4 +1,4 @@ -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useMutation } from 'react-query'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useStartMeeting.jsx b/app/javascript/hooks/mutations/rooms/useStartMeeting.jsx index 2ab058e3d1809c6b71c384f76bd6b85dd1bcd5e9..eb37321f5fec2dd9fa9fea25c69b9239ef18b6d5 100644 --- a/app/javascript/hooks/mutations/rooms/useStartMeeting.jsx +++ b/app/javascript/hooks/mutations/rooms/useStartMeeting.jsx @@ -1,5 +1,5 @@ import { useMutation } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useUpdateRoom.jsx b/app/javascript/hooks/mutations/rooms/useUpdateRoom.jsx index 3f15ed2bfd65ff45758d980084185fcbaee8bc1a..10cba20ab11c2e69950604d88d8220a3691d7e70 100644 --- a/app/javascript/hooks/mutations/rooms/useUpdateRoom.jsx +++ b/app/javascript/hooks/mutations/rooms/useUpdateRoom.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/rooms/useUploadPresentation.jsx b/app/javascript/hooks/mutations/rooms/useUploadPresentation.jsx index b157a3c344240083a77f8447074a72bc40277d7a..f82a86c01c550e5b8a771b438228fb5bba6b43f2 100644 --- a/app/javascript/hooks/mutations/rooms/useUploadPresentation.jsx +++ b/app/javascript/hooks/mutations/rooms/useUploadPresentation.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/sessions/useCreateSession.jsx b/app/javascript/hooks/mutations/sessions/useCreateSession.jsx index eb920c826620fe041ca19aa716a6261beeb59658..1a39babc414392de9f2a52b00fb75ca979dfca57 100644 --- a/app/javascript/hooks/mutations/sessions/useCreateSession.jsx +++ b/app/javascript/hooks/mutations/sessions/useCreateSession.jsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate, useSearchParams } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/sessions/useDeleteSession.jsx b/app/javascript/hooks/mutations/sessions/useDeleteSession.jsx index e23bb7ce7f27f2a3060dcc4f451d562d72e56368..7ebf800d92e8cbdc2420464f31a9d47853e058c9 100644 --- a/app/javascript/hooks/mutations/sessions/useDeleteSession.jsx +++ b/app/javascript/hooks/mutations/sessions/useDeleteSession.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useNavigate } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/shared_accesses/useDeleteSharedAccess.jsx b/app/javascript/hooks/mutations/shared_accesses/useDeleteSharedAccess.jsx index f3a5306f7103eb4af4240c1e83e9f8c9a34a54aa..936786990302fd6584f9e826867411506ab294dc 100644 --- a/app/javascript/hooks/mutations/shared_accesses/useDeleteSharedAccess.jsx +++ b/app/javascript/hooks/mutations/shared_accesses/useDeleteSharedAccess.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/shared_accesses/useShareAccess.jsx b/app/javascript/hooks/mutations/shared_accesses/useShareAccess.jsx index d04b27f1a17c0f9dfc2add1c31d9b78f6fb12c01..2c7e0e8165372e113f0950d80d6a17f5948d26e2 100644 --- a/app/javascript/hooks/mutations/shared_accesses/useShareAccess.jsx +++ b/app/javascript/hooks/mutations/shared_accesses/useShareAccess.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useActivateAccount.jsx b/app/javascript/hooks/mutations/users/useActivateAccount.jsx index a92a4db1d06dd5df048b84499b22a51f90749a83..dbf1416a063af5e9559737cc71f410ee7e1c6ef3 100644 --- a/app/javascript/hooks/mutations/users/useActivateAccount.jsx +++ b/app/javascript/hooks/mutations/users/useActivateAccount.jsx @@ -1,4 +1,4 @@ -import toast from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; diff --git a/app/javascript/hooks/mutations/users/useChangePwd.jsx b/app/javascript/hooks/mutations/users/useChangePwd.jsx index b21f8b2fe8967870443661c08b921dc447ab9604..2b575e6d05be49b1674706b07e0c31761c4392a8 100644 --- a/app/javascript/hooks/mutations/users/useChangePwd.jsx +++ b/app/javascript/hooks/mutations/users/useChangePwd.jsx @@ -1,5 +1,5 @@ import { useMutation } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useCreateAvatar.jsx b/app/javascript/hooks/mutations/users/useCreateAvatar.jsx index a7258fbb15323ca7a9c7df5352d8e58f3c506a2c..ab246861282e3a81a875e51c06ad89d97e40434a 100644 --- a/app/javascript/hooks/mutations/users/useCreateAvatar.jsx +++ b/app/javascript/hooks/mutations/users/useCreateAvatar.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useCreateResetPwd.jsx b/app/javascript/hooks/mutations/users/useCreateResetPwd.jsx index 089e31d388b4f9f2de0f781f82a2e33ffa839835..98297bac5d71146d9c143ffa6834742f5b831dce 100644 --- a/app/javascript/hooks/mutations/users/useCreateResetPwd.jsx +++ b/app/javascript/hooks/mutations/users/useCreateResetPwd.jsx @@ -1,6 +1,6 @@ import { useMutation } from 'react-query'; import { useNavigate } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useCreateUser.jsx b/app/javascript/hooks/mutations/users/useCreateUser.jsx index 85be46140471aecd62d39aa1f8041cea02b30dbb..c43984a5dfbf5ca7f80e69917c33029bbea7eea8 100644 --- a/app/javascript/hooks/mutations/users/useCreateUser.jsx +++ b/app/javascript/hooks/mutations/users/useCreateUser.jsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate, useSearchParams } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useDeleteAvatar.jsx b/app/javascript/hooks/mutations/users/useDeleteAvatar.jsx index 5bd96ab3fc03324d63cfea90c21e0f1b669f912a..f84a2f22c061c02aa9026034bb7ed2bf548291da 100644 --- a/app/javascript/hooks/mutations/users/useDeleteAvatar.jsx +++ b/app/javascript/hooks/mutations/users/useDeleteAvatar.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useDeleteUser.jsx b/app/javascript/hooks/mutations/users/useDeleteUser.jsx index cfd925259f4a15067c8565be58e6e6518379f3f0..9b88a03e5774e8faeb3c66a3242eaa664c0bb97c 100644 --- a/app/javascript/hooks/mutations/users/useDeleteUser.jsx +++ b/app/javascript/hooks/mutations/users/useDeleteUser.jsx @@ -1,6 +1,6 @@ import { useMutation, useQueryClient } from 'react-query'; import { useNavigate } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useResetPwd.jsx b/app/javascript/hooks/mutations/users/useResetPwd.jsx index f8b08aa8293a1937a8c310ccfb7c9d70128adb1d..266ef81ad851318146aae16d773d99c36dfad641 100644 --- a/app/javascript/hooks/mutations/users/useResetPwd.jsx +++ b/app/javascript/hooks/mutations/users/useResetPwd.jsx @@ -1,6 +1,6 @@ import { useMutation } from 'react-query'; import { useNavigate } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/hooks/mutations/users/useUpdateUser.jsx b/app/javascript/hooks/mutations/users/useUpdateUser.jsx index 2ba65dd6b241218f2b857b3477648136536e72c4..87bbdec691ab379e2b7baf6a0248be626050318f 100644 --- a/app/javascript/hooks/mutations/users/useUpdateUser.jsx +++ b/app/javascript/hooks/mutations/users/useUpdateUser.jsx @@ -1,5 +1,5 @@ import { useMutation, useQueryClient } from 'react-query'; -import { toast } from 'react-hot-toast'; +import { toast } from 'react-toastify'; import { useTranslation } from 'react-i18next'; import axios from '../../../helpers/Axios'; diff --git a/app/javascript/routes/AuthenticatedOnly.jsx b/app/javascript/routes/AuthenticatedOnly.jsx index faf4b2262aaba1a893c4135a4d0f257f9585ace1..368b57ccc17d8a1f6dd62c2f12506b0f36abcd3d 100644 --- a/app/javascript/routes/AuthenticatedOnly.jsx +++ b/app/javascript/routes/AuthenticatedOnly.jsx @@ -2,8 +2,8 @@ import React from 'react'; import { Navigate, Outlet, useLocation, useMatch, } from 'react-router-dom'; -import { toast } from 'react-hot-toast'; import { useTranslation } from 'react-i18next'; +import { toast } from 'react-toastify'; import { useAuth } from '../contexts/auth/AuthProvider'; import useDeleteSession from '../hooks/mutations/sessions/useDeleteSession'; diff --git a/package.json b/package.json index b04242a526e23bc07b8131d7dbf7c7c3cb38b2d0..a666ef24da91d9740a97f0329fc1315436188359 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ "react-colorful": "^5.6.1", "react-dom": "^17.0.2", "react-hook-form": "^7.28.0", - "react-hot-toast": "^2.2.0", "react-i18next": "^11.18.5", "react-query": "^3.34.16", "react-router-dom": "^6.4.3", "react-test-renderer": "^17.0.2", + "react-toastify": "^9.1.1", "sass": "^1.52.1", "semantic-ui-css": "^2.4.1", "semantic-ui-react": "^2.1.3", diff --git a/yarn.lock b/yarn.lock index d7d2a10824c2b93bb8f6b38ddba59a7599c33a00..745cf24ca9461d09367ca6a4bb34f940f6bd79a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -994,7 +994,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.18.3" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz" integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== @@ -1370,6 +1370,11 @@ dependencies: "@babel/runtime" "^7.6.2" +"@remix-run/router@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.3.1.tgz#3bb0b6ddc0a276e8dc1138d08f63035e4e23e8bf" + integrity sha512-+eun1Wtf72RNRSqgU7qM2AMX/oHp+dnx7BHk1qhK5ZHzdHTUU4LA1mGG1vT+jMc8sbhG3orvsfOmryjzx2PzQw== + "@restart/hooks@^0.4.0", "@restart/hooks@^0.4.5": version "0.4.5" resolved "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz" @@ -3045,11 +3050,6 @@ globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" -goober@^2.1.1: - version "2.1.10" - resolved "https://registry.npmjs.org/goober/-/goober-2.1.10.tgz" - integrity sha512-7PpuQMH10jaTWm33sQgBQvz45pHR8N4l3Cu3WMGEWmHShAcTuuP7I+5/DwKo39fwti5A80WAjvqgz6SSlgWmGA== - graceful-fs@^4.2.9: version "4.2.9" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz" @@ -3089,13 +3089,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -history@^5.2.0: - version "5.3.0" - resolved "https://registry.npmjs.org/history/-/history-5.3.0.tgz" - integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== - dependencies: - "@babel/runtime" "^7.7.6" - html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz" @@ -4485,13 +4478,6 @@ react-hook-form@^7.28.0: resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.28.0.tgz" integrity sha512-mmLpT86BkMGPr0r6ca8zxV0WH4Y1FW5MKs7Rq1+uHLVeeg5pSWbF5Z/qLCnM5vPVblHNM6lRBRRotnfEAf0ALA== -react-hot-toast@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.2.0.tgz" - integrity sha512-248rXw13uhf/6TNDVzagX+y7R8J183rp7MwUMNkcrBRyHj/jWOggfXTGlM8zAOuh701WyVW+eUaWG2LeSufX9g== - dependencies: - goober "^2.1.1" - react-i18next@^11.18.5: version "11.18.5" resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.5.tgz#985e87bc66ed1316381b464a4ecfd35a2c951357" @@ -4532,20 +4518,20 @@ react-query@^3.34.16: broadcast-channel "^3.4.1" match-sorter "^6.0.2" -react-router-dom@^6.2.2: - version "6.2.2" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.2.2.tgz" - integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ== +react-router-dom@^6.4.3: + version "6.8.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.8.0.tgz#5e5f4c4b15fdec3965d2ad9d7460d0c61971e744" + integrity sha512-hQouduSTywGJndE86CXJ2h7YEy4HYC6C/uh19etM+79FfQ6cFFFHnHyDlzO4Pq0eBUI96E4qVE5yUjA00yJZGQ== dependencies: - history "^5.2.0" - react-router "6.2.2" + "@remix-run/router" "1.3.1" + react-router "6.8.0" -react-router@6.2.2: - version "6.2.2" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.2.2.tgz" - integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ== +react-router@6.8.0: + version "6.8.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.8.0.tgz#dd61fd1ec44daa2cceaef8e6baa00f99a01a650f" + integrity sha512-760bk7y3QwabduExtudhWbd88IBbuD1YfwzpuDUAlJUJ7laIIcqhMvdhSVh1Fur1PE8cGl84L0dxhR3/gvHF7A== dependencies: - history "^5.2.0" + "@remix-run/router" "1.3.1" react-shallow-renderer@^16.13.1: version "16.15.0" @@ -4565,6 +4551,13 @@ react-test-renderer@^17.0.2: react-shallow-renderer "^16.13.1" scheduler "^0.20.2" +react-toastify@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-9.1.1.tgz#9280caea4a13dc1739c350d90660a630807bf10b" + integrity sha512-pkFCla1z3ve045qvjEmn2xOJOy4ZciwRXm1oMPULVkELi5aJdHCN/FHnuqXq8IwGDLB7PPk2/J6uP9D8ejuiRw== + dependencies: + clsx "^1.1.1" + react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz"