Merge pull request #44 from exortme1ster/websockets-fix

Fixed bugs, added responsive profile
nmashchenko · Jul 1, 2023 · 05412ec · 05412ec
2 parents d8531d6 + 6e73d56
commit 05412ec
Show file tree

Hide file tree

Showing 154 changed files with 4,273 additions and 2,354 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -4,11 +4,14 @@ import { Toaster } from 'react-hot-toast'
 import { BrowserRouter as Router } from 'react-router-dom'
 import { GoogleOAuthProvider } from '@react-oauth/google'
 
+import { useLoadSocket } from './api/hooks/socket/useLoadSocket'
 import { useRoutes } from './routes/routes'
 
 function App() {
   const routes = useRoutes()
 
+  useLoadSocket()
+
   return (
     <>
       <GoogleOAuthProvider clientId={process.env.REACT_APP_GOOGLE_API_OAUTH_TOKEN}>

diff --git a/client/src/api/endpoints/registration-auth.js b/client/src/api/endpoints/registration-auth.js
diff --git a/client/src/api/endpoints/submission.js b/client/src/api/endpoints/submission.js
diff --git a/client/src/api/endpoints/team.js b/client/src/api/endpoints/team.js
diff --git a/client/src/api/endpoints/tournament.js b/client/src/api/endpoints/tournament.js
diff --git a/client/src/api/endpoints/users.js b/client/src/api/endpoints/users.js
diff --git a/client/src/api/hooks/auth/useCheckAuth.js b/client/src/api/hooks/auth/useCheckAuth.js
@@ -20,6 +20,8 @@ export const useCheckAuth = () => {
     onSuccess: (data) => {
       if (data && data.isRegistered) {
         dispatch(userAuth.actions.authUserSuccess())
+        dispatch(userAuth.actions.setUserNotifications(data?.notifications))
+        dispatch(userAuth.actions.setUserId(data?._id))
       }
     },
     onError: (error) => {

diff --git a/client/src/api/hooks/auth/useLoginUser.js b/client/src/api/hooks/auth/useLoginUser.js
@@ -36,6 +36,8 @@ export const useLoginUser = (type) => {
       if (user.isRegistered) {
         // save accessToken
         dispatch(userAuth.actions.authUserSuccess())
+        dispatch(userAuth.actions.setUserNotifications(user?.notifications))
+        dispatch(userAuth.actions.setUserId(data?._id))
         navigate('/', { replace: true })
       } else {
         // navigate user to finish registration

diff --git a/client/src/api/hooks/auth/useUpdateAvatar.js → ...t/src/api/hooks/shared/useUpdateAvatar.js b/client/src/api/hooks/auth/useUpdateAvatar.js → ...t/src/api/hooks/shared/useUpdateAvatar.js
@@ -6,7 +6,7 @@ import { errorToaster } from '../../../shared/components/Toasters/Error.toaster'
 
 const { api } = http
 
-export const useUpdateAvatar = (type) => {
+export const useUpdateAvatar = (type, successHandler) => {
   const queryClient = useQueryClient()
 
   const updateUserAvatar = async (userData) => {
@@ -18,6 +18,12 @@ export const useUpdateAvatar = (type) => {
     onSuccess: async () => {
       if (type === 'teams') {
         await queryClient.invalidateQueries('getTeamById', { refetchInactive: true })
+      } else if (type === 'users') {
+        await queryClient.invalidateQueries('getUserById', { refetchInactive: true })
+      }
+
+      if (successHandler) {
+        successHandler()
       }
 
       await queryClient.invalidateQueries('checkAuth', { refetchInactive: true })

diff --git a/client/src/api/hooks/sidebar/useReadMessages.js b/client/src/api/hooks/sidebar/useReadMessages.js
@@ -1,15 +1,11 @@
-import { useMutation, useQueryClient } from 'react-query'
-import { useDispatch } from 'react-redux'
+import { useMutation } from 'react-query'
 
 import http from '../../../http'
-import { registrationAuth } from '../../../store/reducers/RegistrationAuth'
+import { errorToaster } from '../../../shared/components/Toasters/Error.toaster'
 
 const { api } = http
 
 export const useReadMessages = () => {
-  const dispatch = useDispatch()
-  const queryClient = useQueryClient()
-
   const readMessages = async (idsArr) => {
     return await api.put('notifications/read', { notifications: idsArr })
   }
@@ -21,7 +17,7 @@ export const useReadMessages = () => {
     },
     onError: (error) => {
       // set error message
-      dispatch(registrationAuth.actions.finishRegistrationError(error.response?.data?.message))
+      errorToaster(error)
     },
   })
 }