#339-pagination(conflict)

package.json

@@ -48,6 +48,7 @@
     "react-redux": "8.1.2",
     "react-router": "6.15.0",
     "react-router-dom": "6.15.0",
+    "react-virtuoso": "^4.7.10",
     "yup": "^1.3.2"
   },
   "devDependencies": {

src/app/providers/StoreProvider/config/StateSchema.ts

@@ -4,28 +4,26 @@ import { LoginSchema } from '@/features/login/model/types/types'
 import { BrandSchema } from '@/widgets/BrandBlock/types/types'
 import { ApiInstance } from '@/shared/api/api'
 import { ShopNewsSchema } from '@/widgets/NewsBlock/model/types/types'
-import { StoreReviewsSchema } from '@/widgets/ReviewsBlock/model/types/types'
 import { IBlogPostsSchema } from '@/widgets/BlogBlock/model/types/types'
 import { CoreBaseFooterSchema } from '@/widgets/Footer/model/types/types'
 import { IStoriesSchema } from '@/widgets/StoriesBlock/model/types/types'
 import { CoreBaseHeaderSchema } from '@/widgets/Header/model/types/types'
 import { TProductSchema } from '@/pages/ProductPage/model/types/productTypes'
 import { CategoryListSchema } from '@/widgets/CategoryGrid/model/types/types'
 import { ICategoryProductsSchema } from '@/pages/ProductsPage/types/types'
-import { IFeedbackSchema } from '@/pages/FeedbackPage/model/types/types'
 import { ICategorySchema, IMainCategorySchema } from '@/widgets/CategoryList/types/types'
 import { ICategoryFiltersSchema } from '@/components/Dropdown/types/types'
 import type { IFeedbackFormSchema } from '@/widgets/FeedbackForm/model/scheme/feedbackFormSliceSchema'
 import { ICartEntitySchema } from '@/entities/CartEntity/model/types/types'
 import { IAboutUsSchema } from '@/pages/AboutUsPage/model/types/types'
 import { ICartSchema } from '@/pages/CartPage/model/types'
 import { IProductAmountStateSchema } from '@/features/CartEdit/model/types'
+import { IFeedbackSchema } from '@/features/Reviews/model/types/types'
 import { TNumberOfPageSchema } from '@/components/Pagination/types/types'
 
 export interface StateSchema {
   aboutUs: IAboutUsSchema
   login: LoginSchema
-  storeReviews: StoreReviewsSchema
   category: CategorySchema
   categoryList: CategoryListSchema
   coreBaseFooter: CoreBaseFooterSchema
@@ -37,7 +35,6 @@ export interface StateSchema {
   blogPosts: IBlogPostsSchema
   product: TProductSchema
   categoryProduct: ICategoryProductsSchema
-  feedback: IFeedbackSchema
   feedbackForm: IFeedbackFormSchema
   categoryId: CategoryId
   categorySlug: CategorySlug
@@ -47,6 +44,7 @@ export interface StateSchema {
   cartEntity: ICartEntitySchema
   categoryFilters: ICategoryFiltersSchema
   productAmount: IProductAmountStateSchema
+  feedbacks: IFeedbackSchema
   pagination: TNumberOfPageSchema
 }
 

src/app/providers/StoreProvider/config/store.ts

@@ -4,7 +4,6 @@ import { $api } from '@/shared/api/api'
 import categorySlice from '@/entities/Category/slice/categorySlice'
 import brandSlice from '@/widgets/BrandBlock/slice/brandSlice'
 import searchProductSlice from '@/features/SearchProduct/slice/searchProductSlice'
-import { storeReviewsReducer } from '@/widgets/ReviewsBlock/model/slice/reviewsSlice'
 import footerSlice from '@/widgets/Footer/model/slice/footerSlice'
 import { shopNewsReducer } from '@/widgets/NewsBlock/model/slice/shopNewsSlice'
 import { storiesReducer } from '@/widgets/StoriesBlock/model/slice/storiesSlice'
@@ -18,13 +17,13 @@ import { categoryIdSliceReducer } from '@/entities/Category/slice/categoryIdSlic
 import { categorySlugSliceReducer } from '@/entities/Category/slice/categorySlugSlice'
 import { categoryBranchesReducer } from '@/widgets/CategoryList/slice/pageCategoryBranchesSlice'
 import { getCategoriesReducer } from '@/widgets/CategoryList/slice/pageCategoriesSlice'
-import { feedbackReducer } from '@/pages/FeedbackPage/model/slice/feedbackSlice'
 import { categoryFiltersSliceReducer } from '@/components/Dropdown/slice/filtersSlice'
 import { feedbackFormReducer } from '@/widgets/FeedbackForm/model/slice/feedbackFormSlice'
 import { aboutUsReducer } from '@/pages/AboutUsPage/model/slice/aboutUsSlice'
 import { cartReducer } from '@/pages/CartPage/model/slice'
 import { cartEntityReducer } from '@/entities/CartEntity/model/slice/cartEntitySlice'
 import { productAmountReducer } from '@/features/CartEdit/model/slice/productAmountSlice'
+import { feedbacksReducer } from '@/features/Reviews/model/slice/feedbacksSlice'
 import { paginationSliceReducer } from '@/components/Pagination/slice/paginationSlice'
 
 export type RootState = StateSchema
@@ -37,14 +36,13 @@ const rootReducer: ReducersMapObject<RootState> = {
   coreBaseFooter: footerSlice,
   brand: brandSlice,
   searchResult: searchProductSlice,
-  storeReviews: storeReviewsReducer,
   shopNews: shopNewsReducer,
   stories: storiesReducer,
   blogPosts: blogPostsReducer,
   product: productSliceReducer,
   categoryProduct: categoriesProductsReducer,
   categoryList: categoryGridSlice,
-  feedback: feedbackReducer,
+  feedbacks: feedbacksReducer,
   feedbackForm: feedbackFormReducer,
   categoryId: categoryIdSliceReducer,
   categorySlug: categorySlugSliceReducer,

src/app/router/AppRouter/ui/AppRouter.tsx

@@ -8,7 +8,7 @@ import ComparePage from '@/pages/ComparePage/ComparePage'
 import ContactsPage from '@/pages/ContactsPage/ContactsPage'
 import DeliveryPage from '@/pages/DeliveryPage/DeliveryPage'
 import ErrorPage from '@/pages/ErrorPage/ErrorPage'
-import FavoritesPage from '@/pages/FavoritesPage/FavoritesPage'
+import { FavoritesPage } from '@/pages/FavoritesPage/FavoritesPage'
 import { FeedbackPage } from '@/pages/FeedbackPage/FeedbackPage'
 import FormReturnPage from '@/pages/FormReturnPage/FormReturnPage'
 import HelpPage from '@/pages/HelpPage/HelpPage'
@@ -44,7 +44,7 @@ export const AppRouter = createBrowserRouter([
         element: <ProductsPage /> // временная заглушка нужна страница со всеми брендами
       },
       {
-        path: Routes.CATEGORIES + '/all',
+        path: Routes.CATEGORIES,
         element: <CategoryPage />
       },
       {
@@ -88,7 +88,7 @@ export const AppRouter = createBrowserRouter([
         element: <ProductsPage />
       },
       {
-        path: Routes.REVIEWS,
+        path: Routes.REVIEWS + '/:index',
         element: <FeedbackPage />
       },
       {
@@ -99,10 +99,6 @@ export const AppRouter = createBrowserRouter([
         path: Routes.HELP,
         element: <HelpPage />
       },
-      {
-        path: Routes.STORE_REVIEWS,
-        element: <ProductsPage /> // временная заглушка нужна страница с отзывами о магазине
-      },
       {
         path: Routes.TERMS,
         element: <ProductsPage /> // временная заглушка нужна страница с условиями соглашения