From 09f638d3aaf761bcddee53222cf40f20ef89a06f Mon Sep 17 00:00:00 2001 From: TBS093A Date: Wed, 17 Feb 2021 16:29:15 +0100 Subject: [PATCH] Redux / React -> add movements --- src/pages/func_group/root.js | 10 +++--- src/pages/func_group/rootUtils.js | 55 +++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 src/pages/func_group/rootUtils.js diff --git a/src/pages/func_group/root.js b/src/pages/func_group/root.js index d2c2f99..92585b7 100644 --- a/src/pages/func_group/root.js +++ b/src/pages/func_group/root.js @@ -1,21 +1,19 @@ import React, { useState, useEffect } from 'react' +import VerifyUserSession from './rootUtils' + import UserAuthIndex from './user_auth/userAuthIndex' import UserCrudIndex from './user_crud/userCrudIndex' import ModelCrudIndex from './model_crud/modelCrudIndex' import RenderCrudIndex from './render_crud/renderCrudIndex' import RenderWebsocketIndex from './render_websocket/renderWebsocketIndex' -const Root = () => { - const [userAuthView, setUserAuthView] = useState(true) - const [userCrudView, setUserCrudView] = useState(false) - const [modelCrudView, setModelCrudView] = useState(false) - const [renderCrudView, setRenderCrudView] = useState(false) - const [renderWebsocketView, setRenderWebsocketView] = useState(false) +const Root = () => { return (
+
) } diff --git a/src/pages/func_group/rootUtils.js b/src/pages/func_group/rootUtils.js new file mode 100644 index 0000000..8e36a83 --- /dev/null +++ b/src/pages/func_group/rootUtils.js @@ -0,0 +1,55 @@ +import React, { useState, useEffect } from 'react' +import { useSelector } from 'react-redux' +import { userAuthSelector } from '../../redux/slices/userAuthSlice' + +import UserAuthIndex from './user_auth/userAuthIndex' +import UserCrudIndex from './user_crud/userCrudIndex' +import ModelCrudIndex from './model_crud/modelCrudIndex' +import RenderCrudIndex from './render_crud/renderCrudIndex' +import RenderWebsocketIndex from './render_websocket/renderWebsocketIndex' + + +const GeneralView = () => { + + const [userAuthView, setUserAuthView] = useState(true) + const [userCrudView, setUserCrudView] = useState(false) + const [modelCrudView, setModelCrudView] = useState(false) + const [renderCrudView, setRenderCrudView] = useState(false) + const [renderWebsocketView, setRenderWebsocketView] = useState(false) + + return ( + <> + + + + + + + ) +} + +const __verifyUserSession = (token, user) => { + + if ( user.id > 0 && user.username !== '' && user.email !== '' && token !== '') + return false + else + return true + +} + +const VerifyUserSession = () => { + + const { token, user } = useSelector(userAuthSelector) + + return ( + <> + { + __verifyUserSession(token, user) + ? + : + } + + ) +} + +export default VerifyUserSession \ No newline at end of file