Explorar el Código

Finished feature 660

feature/670
jovan.cirkovic hace 3 años
padre
commit
f46ccbe037

+ 43
- 43
src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.js Ver fichero

import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import CategoryCard from "../../components/Cards/CategoryCard/CategoryCard";
import CategoryCard from "../../../components/Cards/CategoryCard/CategoryCard";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useEffect } from "react"; import { useEffect } from "react";
import { fetchCategories } from "../../store/actions/categories/categoriesActions";
import { selectCategories } from "../../store/selectors/categoriesSelectors";
import { fetchCategories } from "../../../store/actions/categories/categoriesActions";
import { selectCategories } from "../../../store/selectors/categoriesSelectors";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { import {
AdminCategoriesHeader, AdminCategoriesHeader,
AdminCategoriesSearchField, AdminCategoriesSearchField,
NewCategoryButton, NewCategoryButton,
} from "./AdminCategoriesPage.styled"; } from "./AdminCategoriesPage.styled";
import { selectManualSearchString } from "../../store/selectors/filtersSelectors";
import { selectManualSearchString } from "../../../store/selectors/filtersSelectors";
import { useMemo } from "react"; import { useMemo } from "react";
import { setManualSearchString } from "../../store/actions/filters/filtersActions";
import selectedTheme from "../../themes";
import { setManualSearchString } from "../../../store/actions/filters/filtersActions";
import selectedTheme from "../../../themes";
import { useState } from "react"; import { useState } from "react";
import EditCategory from "../../components/Modals/EditCategory/EditCategory";
import EditCategory from "../../../components/Modals/EditCategory/EditCategory";


const AdminCategoriesPage = () => { const AdminCategoriesPage = () => {
const { t } = useTranslation(); const { t } = useTranslation();
}, [categories, manualSearchString]); }, [categories, manualSearchString]);
return ( return (
<> <>
<AdminCategoriesPageContainer>
<AdminCategoriesSearchField
isAdmin
handleSearch={handleSearch}
placeholder={t("admin.categories.placeholder")}
/>
<AdminCategoriesHeader
myOffers
categories
hideGrid
isAdmin
hideBackButton
/>
{categoriesToShow.map((category) => (
<CategoryCard
key={category._id}
category={category}
type="categories"
secondLabel={t("admin.categories.noOfSubcategories")}
<AdminCategoriesPageContainer>
<AdminCategoriesSearchField
isAdmin
handleSearch={handleSearch}
placeholder={t("admin.categories.placeholder")}
/> />
))}
<NewCategoryButton
variant="contained"
buttoncolor={selectedTheme.colors.iconYellowColor}
textcolor={selectedTheme.colors.messageText}
onClick={() => setOpenedAddModal(true)}
>
{t("admin.categories.addCategory")}
</NewCategoryButton>
</AdminCategoriesPageContainer>
{openedAddModal && (
<EditCategory
setOpenedEditModal={setOpenedAddModal}
type={"categories"}
method="add"
/>
)}
<AdminCategoriesHeader
myOffers
categories
hideGrid
isAdmin
hideBackButton
/>
{categoriesToShow.map((category) => (
<CategoryCard
key={category._id}
category={category}
type="categories"
secondLabel={t("admin.categories.noOfSubcategories")}
/>
))}
<NewCategoryButton
variant="contained"
buttoncolor={selectedTheme.colors.iconYellowColor}
textcolor={selectedTheme.colors.messageText}
onClick={() => setOpenedAddModal(true)}
>
{t("admin.categories.addCategory")}
</NewCategoryButton>
</AdminCategoriesPageContainer>
{openedAddModal && (
<EditCategory
setOpenedEditModal={setOpenedAddModal}
type={"categories"}
method="add"
/>
)}
</> </>
); );
}; };

+ 4
- 4
src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.styled.js Ver fichero

import { Box } from "@mui/material"; import { Box } from "@mui/material";
import styled from "styled-components"; import styled from "styled-components";
import { PrimaryButton } from "../../components/Buttons/PrimaryButton/PrimaryButton";
import Header from "../../components/MarketPlace/Header/Header";
import SearchField from "../../components/TextFields/SearchField/SearchField";
import { PrimaryButton } from "../../../components/Buttons/PrimaryButton/PrimaryButton";
import Header from "../../../components/MarketPlace/Header/Header";
import SearchField from "../../../components/TextFields/SearchField/SearchField";


export const AdminCategoriesPageContainer = styled(Box)` export const AdminCategoriesPageContainer = styled(Box)`
padding: 60px; padding: 60px;
bottom: 18px; bottom: 18px;
right: 16px; right: 16px;
} }
`
`;

+ 2
- 2
src/pages/AdminHomePage/AdminHomePage.js Ver fichero

import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
// import { selectIsLoadingByActionType } from "../../store/selectors/loadingSelectors"; // import { selectIsLoadingByActionType } from "../../store/selectors/loadingSelectors";
// import { OFFERS_SCOPE } from "../../store/actions/offers/offersActionConstants"; // import { OFFERS_SCOPE } from "../../store/actions/offers/offersActionConstants";
import AdminUsersPage from "../AdminUsersPage/AdminUsersPage";
import AdminUsersPage from "./AdminUsersPage/AdminUsersPage";
import { selectMineProfile } from "../../store/selectors/profileSelectors"; import { selectMineProfile } from "../../store/selectors/profileSelectors";
import { Switch, useHistory } from "react-router-dom"; import { Switch, useHistory } from "react-router-dom";
import { import {
HOME_PAGE, HOME_PAGE,
} from "../../constants/pages"; } from "../../constants/pages";
import { selectUserId } from "../../store/selectors/loginSelectors"; import { selectUserId } from "../../store/selectors/loginSelectors";
import AdminCategoriesPage from "../AdminCategoriesPage/AdminCategoriesPage";
import AdminCategoriesPage from "./AdminCategoriesPage/AdminCategoriesPage";
import AdminRoute from "../../components/Router/AdminRoute"; import AdminRoute from "../../components/Router/AdminRoute";
import AdminSubcategoriesPage from "./AdminSubcategoriesPage/AdminSubcategoriesPage"; import AdminSubcategoriesPage from "./AdminSubcategoriesPage/AdminSubcategoriesPage";
import AdminLocationsPage from "./AdminLocationsPage/AdminLocationsPage"; import AdminLocationsPage from "./AdminLocationsPage/AdminLocationsPage";

+ 3
- 3
src/pages/AdminHomePage/AdminUsersPage/AdminUsersPage.js Ver fichero

import React, { useEffect } from "react"; import React, { useEffect } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import MarketPlace from "../../components/MarketPlace/MarketPlace";
import MarketPlace from "../../../components/MarketPlace/MarketPlace";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { selectAllProfiles } from "../../store/selectors/profileSelectors";
import { fetchAllProfiles } from "../../store/actions/profile/profileActions";
import { selectAllProfiles } from "../../../store/selectors/profileSelectors";
import { fetchAllProfiles } from "../../../store/actions/profile/profileActions";


const AdminUsersPage = () => { const AdminUsersPage = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();

Cargando…
Cancelar
Guardar