fix adminOrdersSroll

src/actions/actionCategoryDeleteFull.js

@@ -1,7 +0,0 @@
-import { gql } from "../helpers";
-
-import { actionPromise } from "../reducers";
-
-export const actionCategoryDelete =
-    ({ category, promiseName = "categoryDelete" } = {}) =>
-    async (dispatch, getState) => {};

src/actions/actionCategoryUpdate.js

@@ -2,6 +2,7 @@ import { call, put } from "redux-saga/effects";
 import { promiseWorker } from "../reducers/promiseReducer";
 import { actionCatAll } from "./actionCatAll";
 import { actionCategoryUpsert } from "./actionCategoryUpsert";
+import { actionRootCats } from "./actionRootCats";
 
 export const actionCategoryUpdate = (category) => ({ type: "CATEGORY_UPDATE", payload: category });
 
@@ -9,4 +10,5 @@ export function* categoryUpdateWorker(action) {
     const category = action.payload || {};
     yield call(promiseWorker, actionCategoryUpsert(category));
     yield put(actionCatAll());
+    yield put(actionRootCats());
 }

src/actions/actionGoodsPage.js

@@ -12,5 +12,6 @@ export function* goodsPageWorker(action) {
     yield take("GOODS_PAGE_CLEAR");
 
     yield put(actionFeedClear());
+
     yield put(actionPromisesClear(["goodUpsert", "feedGoodsAll"]));
 }

src/actions/actionOrdersPage.js

@@ -4,9 +4,10 @@ import { actionFeedClear, actionFeedOrders, actionPromiseClear } from "../reduce
 export const actionOrdersPage = ({ orderBy = "_id", status = "0" } = {}) => ({ type: "ORDERS_PAGE", payload: { orderBy, status } });
 
 export function* ordersPageWorker(action) {
-    const { orderBy = "_id", status = "0" } = action.paylaod || {};
+    const { orderBy = "_id", status = "0" } = action.payload || {};
     yield put(actionFeedClear());
     yield put(actionPromiseClear("feedOrdersAll"));
+
     yield put(actionFeedOrders({ skip: 0, orderBy, status }));
 
     yield take("ORDERS_PAGE_CLEAR");

src/actions/actionPromisesClear.js

@@ -1,7 +1,7 @@
 import { all, put } from "redux-saga/effects";
 import { actionPromiseClear } from "../reducers";
 
-export const actionPromisesClear = ({ promises = [] } = {}) => ({ type: "PROMISES_CLEAR", payload: promises });
+export const actionPromisesClear = (promises = []) => ({ type: "PROMISES_CLEAR", payload: promises });
 
 export function* promisesClearWorker(action) {
     const promises = action.payload || [];

src/components/CartPage/index.js

@@ -48,7 +48,7 @@ export const CartPage = ({ onConfirm, promiseStatus, serverErrors, onDeleteClick
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/DashboardPage/ProfileForm/index.js

@@ -70,7 +70,7 @@ export const ProfileForm = ({ profile = {}, promiseStatus, onProfileSave, server
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/Root/index.js

@@ -2,7 +2,7 @@ import { Navigate, Route, Routes } from "react-router-dom";
 
 import { Box } from "@mui/material";
 import { actionPageStart } from "../../actions/actionPageStart";
-
+import "react-responsive-carousel/lib/styles/carousel.min.css";
 import { AuthPage } from "../AuthPage";
 import { LayoutPage } from "../LayoutPage";
 import { CProtectedRoute } from "../common/ProtectedRoute";

src/components/admin/AdminCategoryPage/CategoryForm.js

@@ -85,7 +85,7 @@ const CategoryForm = ({
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/admin/AdminGoodPage/GoodForm.js

@@ -92,7 +92,8 @@ export const GoodForm = ({
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            console.log(serverErrors);
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/admin/AdminLayoutPage/AdminGoodLayout/AdminGoodsPageContainer.js

@@ -12,8 +12,9 @@ const AdminGoodsPageContainer = ({ feed, goods, promiseStatus, onLoad, onUnmount
 
     useEffect(() => {
         onLoad({ orderBy });
+
         return () => {
-            onUnmount();
+            onUnmount && onUnmount();
         };
     }, [orderBy]);
 

src/components/admin/AdminLayoutPage/AdminOrderLayout/AdminOrdersPageContainer.js

@@ -23,7 +23,7 @@ const AdminOrdersPageContainer = ({ feed, orders, promiseStatus, onLoad, onUnmou
             items={orders}
             component={AdminOrdersPage}
             promiseStatus={promiseStatus}
-            onScroll={() => onScroll({ feed, orderBy })}
+            onScroll={() => onScroll({ feed, orderBy, status })}
             orderBy={orderBy}
         />
     );

src/components/admin/AdminLayoutPage/AdminOrderLayout/AdminOrdersSearchPageContainer.js

@@ -24,7 +24,7 @@ const AdminOrdersSearchPageContainer = ({ feed, orders, promiseStatus, onLoad, o
             items={orders}
             component={AdminOrdersPage}
             promiseStatus={promiseStatus}
-            onScroll={() => onScroll({ feed, orderBy })}
+            onScroll={() => onScroll({ feed, orderBy, status, text })}
             orderBy={orderBy}
         />
     );

src/components/admin/AdminOrderPage/OrderForm.js

@@ -1,6 +1,5 @@
-import { connect, useDispatch, useSelector } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { useState, useEffect, useContext } from "react";
-import { actionPromiseClear } from "../../../reducers";
 import Select from "react-select";
 import { actionOrderUpdate } from "../../../actions/actionOrderUpdate";
 import { UIContext } from "../../UIContext";
@@ -73,7 +72,7 @@ export const OrderForm = ({
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/admin/AdminUserPage.js/UserForm.js

@@ -82,7 +82,7 @@ export const UserForm = ({
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/common/AuthModal/LoginForm.js

@@ -58,7 +58,7 @@ export const LoginForm = ({
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors || []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/components/common/AuthModal/RegisterForm.js

@@ -56,7 +56,7 @@ export const RegisterForm = ({ serverErrors, promiseStatus, onRegister, onLoginB
             });
         }
         if (promiseStatus === "REJECTED") {
-            const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
+            const errorMessage = (serverErrors ? [].concat(serverErrors) : []).reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
             promiseTimeOut && clearTimeout(promiseTimeOut);
             setPromiseTimeOut(null);

src/helpers/index.js

@@ -4,7 +4,7 @@ import { getGQL } from "./GraphQL";
 import { statusNumber, statusOptions } from "./orderStatus";
 import { aclList } from "./aclList";
 
-export const backendURL = "";
+export const backendURL = "http://188.72.209.29/api";
 export const gql = getGQL(backendURL + "/graphql/");
 
 export const mediaURL = "";

src/reducers/feedReducer.js

@@ -24,29 +24,29 @@ function feedReducer(state = { payload: [] }, { type, payload = [] }) {
 
 const actionFeedAdd = (payload) => ({ type: "FEED_ADD", payload });
 const actionFeedClear = () => ({ type: "FEED_CLEAR" });
-const actionFeedGoods = ({ skip = 0, orderBy = "_id" }) => actionGoodsAll({ skip, limit: 1, promiseName: "feedGoodsAll", orderBy });
+const actionFeedGoods = ({ skip = 0, orderBy = "_id" }) => actionGoodsAll({ skip, limit: 10, promiseName: "feedGoodsAll", orderBy });
 
 const actionFeedCategoryGoods = ({ skip = 0, orderBy = "_id", category }) =>
-    actionCategoryGoods({ skip, limit: 1, promiseName: "feedCategoryGoods", orderBy, category });
+    actionCategoryGoods({ skip, limit: 10, promiseName: "feedCategoryGoods", orderBy, category });
 
 const actionFeedGoodsFind = ({ skip = 0, text = "", orderBy = "_id" }) =>
-    actionGoodsFind({ skip, limit: 1, promiseName: "feedGoodsFind", text, orderBy });
+    actionGoodsFind({ skip, limit: 10, promiseName: "feedGoodsFind", text, orderBy });
 
 const actionFeedCatsFind = ({ skip = 0, text = "", orderBy = "_id" }) =>
-    actionCatsFind({ skip, promiseName: "feedCatsFind", text, limit: 1, orderBy });
+    actionCatsFind({ skip, promiseName: "feedCatsFind", text, limit: 10, orderBy });
 
-const actionFeedCats = ({ skip = 0, orderBy = "_id" }) => actionCatAll({ promiseName: "feedCatAll", skip, limit: 1, orderBy });
+const actionFeedCats = ({ skip = 0, orderBy = "_id" }) => actionCatAll({ promiseName: "feedCatAll", skip, limit: 10, orderBy });
 
 const actionFeedOrders = ({ skip = 0, orderBy = "_id", status = 0 }) =>
-    actionOrdersAll({ skip, limit: 1, promiseName: "feedOrdersAll", orderBy, status });
+    actionOrdersAll({ skip, limit: 10, promiseName: "feedOrdersAll", orderBy, status });
 
 const actionFeedOrdersFind = ({ skip = 0, text = "", orderBy = "_id", status = "0" }) =>
-    actionOrdersFind({ skip, limit: 1, promiseName: "feedOrdersFind", text, orderBy, status });
+    actionOrdersFind({ skip, limit: 10, promiseName: "feedOrdersFind", text, orderBy, status });
 
 const actionFeedUsersFind = ({ skip = 0, text = "", orderBy = "_id" }) =>
-    actionUsersFind({ skip, promiseName: "feedUsersFind", text, limit: 1, orderBy });
+    actionUsersFind({ skip, promiseName: "feedUsersFind", text, limit: 10, orderBy });
 
-const actionFeedUsers = ({ skip = 0, orderBy = "_id" }) => actionUsersAll({ promiseName: "feedUsersAll", skip, limit: 1, orderBy });
+const actionFeedUsers = ({ skip = 0, orderBy = "_id" }) => actionUsersAll({ promiseName: "feedUsersAll", skip, limit: 10, orderBy });
 
 export {
     actionFeedCats,