diff --git a/src/components/forms/user_auth/userLogin.js b/src/components/forms/user_auth/userLogin.js index 77fd589..e53b006 100644 --- a/src/components/forms/user_auth/userLogin.js +++ b/src/components/forms/user_auth/userLogin.js @@ -14,6 +14,7 @@ const UserLoginForm = () => { const passwordInput = React.createRef() const dispatch = useDispatch() + const { info } = useSelector( userAuthSelector ) let refList = [ usernameInput, @@ -58,6 +59,7 @@ const UserLoginForm = () => { refList={ refList } action={ login } /> + { info } > ) diff --git a/src/components/forms/user_auth/userRegister.js b/src/components/forms/user_auth/userRegister.js index eadeedd..5b3599e 100644 --- a/src/components/forms/user_auth/userRegister.js +++ b/src/components/forms/user_auth/userRegister.js @@ -15,6 +15,7 @@ const UserRegisterForm = () => { const emailInput = React.createRef() const dispatch = useDispatch() + const { info } = useSelector( userCrudSelector ) let refList = [ usernameInput, @@ -27,7 +28,7 @@ const UserRegisterForm = () => { type: 'info', action: 'Create', endpint: 'user/auth/login', - button_value: 'Sign In' + button_value: 'Sign Up' }, { type: 'text', @@ -66,6 +67,7 @@ const UserRegisterForm = () => { refList={ refList } action={ register } /> + { info } > ) diff --git a/src/pages/func_group/navigationBar.js b/src/pages/func_group/navigationBar.js index e1f359f..215f20f 100644 --- a/src/pages/func_group/navigationBar.js +++ b/src/pages/func_group/navigationBar.js @@ -5,6 +5,7 @@ import { userAuthSelector } from '../../redux/slices/userAuthSlice' import { userCrudSelector } from '../../redux/slices/userCrudSlice' import userCrudAsyncThunk from '../../redux/asyncThunks/userCrudAsyncThunk' +import userAuthAsyncThunk from '../../redux/asyncThunks/userAuthAsyncThunk' const __setShowGeneral = ( view, key, movements ) => { @@ -43,7 +44,7 @@ const __setShowGeneral = ( view, key, movements ) => { new_move ) } else if (view === 'model_view') { - let new_move = movements.user_view.modelCrudView + let new_move = movements.model_view.modelCrudView new_move[key] = true movements.model_view.setModelCrudView( new_move @@ -86,7 +87,7 @@ const NavigationBar = ({ movements }) => { const dispatch = useDispatch() useEffect( () => { - if ( user_get !== {} && token !== '' && user.id > 0) + if ( user_get === {} && token !== '' && user.id > 0) dispatch( userCrudAsyncThunk.fetchGetOneUser( { @@ -100,7 +101,15 @@ const NavigationBar = ({ movements }) => { const [showAccount, setShowAccount] = useState(false) const [showModels, setShowModels] = useState(false) const [showRender, setShowRender] = useState(false) - const [showRenderFunc, setShowRenderFunc] = useState(false) + const [showRenderFunc, setShowRenderFunc] = useState(false) + + const logout = async () => { + dispatch( + userAuthAsyncThunk.fetchLogout( + token + ) + ) + } return( <> @@ -175,8 +184,8 @@ const NavigationBar = ({ movements }) => { -