diff --git a/client/src/containers/Ask.jsx b/client/src/containers/Ask.jsx
index 615b63a..54bb1e5 100644
--- a/client/src/containers/Ask.jsx
+++ b/client/src/containers/Ask.jsx
@@ -2,16 +2,15 @@ import { Card, CardContent } from '@mui/material';
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
-import { useUser } from 'contexts';
import { AskForm } from 'controllers/FormControllers';
import { MdPreview } from 'components';
+import Cookies from 'js-cookie';
export default function Ask() {
const navigate = useNavigate();
- const { userData } = useUser();
useEffect(() => {
- if (!userData.username) {
+ if (!Cookies.get('token')) {
navigate('/users/login', {
state: {
name: 'dashboard',
@@ -21,7 +20,7 @@ export default function Ask() {
});
}
}, [navigate]);
-
+
return (
diff --git a/client/src/containers/Mail.jsx b/client/src/containers/Mail.jsx
index 0d899fc..89ef0e9 100644
--- a/client/src/containers/Mail.jsx
+++ b/client/src/containers/Mail.jsx
@@ -1,18 +1,16 @@
import { Card, CardContent } from '@mui/material';
import React, { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
-
-import { useUser } from 'contexts';
import { Inbox } from 'controllers';
import { SendMail } from 'controllers/FormControllers';
import { MdPreview } from 'components';
+import Cookies from 'js-cookie';
export default function Mail() {
const navigate = useNavigate();
- const { userData} = useUser();
useEffect(() => {
- if (!userData.username) {
+ if (!Cookies.get('token')) {
navigate('/users/login', {
state: {
name: 'dashboard',
diff --git a/client/src/containers/Update.jsx b/client/src/containers/Update.jsx
index 5befb86..3cccfe3 100644
--- a/client/src/containers/Update.jsx
+++ b/client/src/containers/Update.jsx
@@ -3,13 +3,13 @@ import { UpdateForm } from 'controllers/FormControllers';
import { useNavigate } from 'react-router-dom';
import { useEffect } from 'react';
import { useUser } from 'contexts';
+import Cookies from 'js-cookie';
export default function Register() {
const navigate = useNavigate();
- const { userData: loading } = useUser();
useEffect(() => {
- if (loading === false) {
+ if (Cookies.get('token')) {
navigate('/users/login', {
state: {
name: 'dashboard',
@@ -18,7 +18,7 @@ export default function Register() {
},
});
}
- }, [loading, navigate]);
+ }, [navigate]);
return (
{
- if (checkAuth()) {
+ if (!Cookies.get('token')) {
navigate('/users/login', {
state: {
name: 'ask',
@@ -22,15 +20,9 @@ export default function SendMailController() {
}
}, []);
- function checkAuth() {
- if (!userData.username) {
- return true;
- }
- }
-
return Form({
fields: composeMailFields,
- onSubmit: postMail,
+ onSubmit: sendMail,
validationSchema: mailSchema,
});
}