diff --git a/jsx/src/App.jsx b/jsx/src/App.jsx index 3dd99642..6a989bf2 100644 --- a/jsx/src/App.jsx +++ b/jsx/src/App.jsx @@ -1,4 +1,4 @@ -import React, { useEffect } from "react"; +import React from "react"; import ReactDOM from "react-dom"; import { Provider } from "react-redux"; import { createStore } from "redux"; @@ -19,33 +19,33 @@ import "./style/root.css"; const store = createStore(reducers, initialState); const App = () => { - useEffect(() => { - let { limit, user_page, groups_page } = initialState; - let api = withAPI()().props; - api - .updateUsers(user_page * limit, limit) - .then((data) => { - console.log(data); - let { _pagination, items } = data; - store.dispatch({ - type: "USER_PAGE", - value: { data: items, page: _pagination }, - }); - }) - .catch((err) => console.log(err)); + // useEffect(() => { + // let { limit, user_page, groups_page } = initialState; + // let api = withAPI()().props; + // api + // .updateUsers(user_page * limit, limit) + // .then((data) => { + // console.log(data); + // let { _pagination, items } = data; + // store.dispatch({ + // type: "USER_PAGE", + // value: { data: items, page: _pagination }, + // }); + // }) + // .catch((err) => console.log(err)); - api - .updateGroups(groups_page * limit, limit) - .then((data) => { - console.log(data); - let { _pagination, items } = data; - store.dispatch({ - type: "GROUPS_PAGE", - value: { data: items, page: _pagination }, - }); - }) - .catch((err) => console.log(err)); - }); + // api + // .updateGroups(groups_page * limit, limit) + // .then((data) => { + // console.log(data); + // let { _pagination, items } = data; + // store.dispatch({ + // type: "GROUPS_PAGE", + // value: { data: items, page: _pagination }, + // }); + // }) + // .catch((err) => console.log(err)); + // }); return (
diff --git a/jsx/src/components/Groups/Groups.jsx b/jsx/src/components/Groups/Groups.jsx index 934e27a1..07a58e84 100644 --- a/jsx/src/components/Groups/Groups.jsx +++ b/jsx/src/components/Groups/Groups.jsx @@ -6,8 +6,7 @@ import { Link } from "react-router-dom"; import PaginationFooter from "../PaginationFooter/PaginationFooter"; const Groups = (props) => { - var user_data = useSelector((state) => state.user_data), - groups_data = useSelector((state) => state.groups_data), + var groups_data = useSelector((state) => state.groups_data), groups_page = useSelector((state) => state.groups_page), dispatch = useDispatch(); @@ -19,16 +18,6 @@ const Groups = (props) => { console.log(groups_data, groups_page); - useEffect(() => { - updateGroups(offset, limit).then((data) => - dispatchPageUpdate(data.items, data._pagination) - ); - }, [offset, limit]); - - if (!groups_data || !user_data || !groups_page) { - return
; - } - const dispatchPageUpdate = (data, page) => { dispatch({ type: "GROUPS_PAGE", @@ -39,6 +28,16 @@ const Groups = (props) => { }); }; + useEffect(() => { + updateGroups(offset, limit).then((data) => + dispatchPageUpdate(data.items, data._pagination) + ); + }, [offset, limit]); + + if (!groups_data || !groups_page) { + return
; + } + return (
@@ -60,7 +59,6 @@ const Groups = (props) => { pathname: "/group-edit", state: { group_data: e, - user_data: user_data, }, }} > @@ -104,8 +102,6 @@ const Groups = (props) => { }; Groups.propTypes = { - user_data: PropTypes.array, - groups_data: PropTypes.array, updateUsers: PropTypes.func, updateGroups: PropTypes.func, history: PropTypes.shape({