Finished feature 660

src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.js

@@ -1,10 +1,10 @@
 import React from "react";
 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 { 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 {
   AdminCategoriesHeader,
@@ -12,12 +12,12 @@ import {
   AdminCategoriesSearchField,
   NewCategoryButton,
 } from "./AdminCategoriesPage.styled";
-import { selectManualSearchString } from "../../store/selectors/filtersSelectors";
+import { selectManualSearchString } from "../../../store/selectors/filtersSelectors";
 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 EditCategory from "../../components/Modals/EditCategory/EditCategory";
+import EditCategory from "../../../components/Modals/EditCategory/EditCategory";
 
 const AdminCategoriesPage = () => {
   const { t } = useTranslation();
@@ -46,43 +46,43 @@ const AdminCategoriesPage = () => {
   }, [categories, manualSearchString]);
   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"
+        />
+      )}
     </>
   );
 };

src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.styled.js

@@ -1,8 +1,8 @@
 import { Box } from "@mui/material";
 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)`
   padding: 60px;
@@ -48,4 +48,4 @@ export const NewCategoryButton = styled(PrimaryButton)`
     bottom: 18px;
     right: 16px;
   }
-`
+`;

src/pages/AdminHomePage/AdminHomePage.js

@@ -7,7 +7,7 @@ import { MainLayoutAdminHomePage } from "./AdminHomePage.styled";
 import { useSelector } from "react-redux";
 // import { selectIsLoadingByActionType } from "../../store/selectors/loadingSelectors";
 // 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 { Switch, useHistory } from "react-router-dom";
 import {
@@ -19,7 +19,7 @@ import {
   HOME_PAGE,
 } from "../../constants/pages";
 import { selectUserId } from "../../store/selectors/loginSelectors";
-import AdminCategoriesPage from "../AdminCategoriesPage/AdminCategoriesPage";
+import AdminCategoriesPage from "./AdminCategoriesPage/AdminCategoriesPage";
 import AdminRoute from "../../components/Router/AdminRoute";
 import AdminSubcategoriesPage from "./AdminSubcategoriesPage/AdminSubcategoriesPage";
 import AdminLocationsPage from "./AdminLocationsPage/AdminLocationsPage";

src/pages/AdminHomePage/AdminUsersPage/AdminUsersPage.js

@@ -1,9 +1,9 @@
 import React, { useEffect } from "react";
 import PropTypes from "prop-types";
-import MarketPlace from "../../components/MarketPlace/MarketPlace";
+import MarketPlace from "../../../components/MarketPlace/MarketPlace";
 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 dispatch = useDispatch();