Merge branch 'master' into enhancement-411-create-ShopNewsPage

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

@@ -12,12 +12,12 @@ import type { TProductSchema } from '@/pages/ProductPage/model/types/productType
 import type { CategoryListSchema } from '@/widgets/CategoryGrid/model/types/types'
 import type { ICategoryProductsSchema } from '@/pages/ProductsPage/types/types'
 import type { ICategorySchema, IMainCategorySchema } from '@/widgets/CategoryList/types/types'
-import type { ICategoryFiltersSchema } from '@/components/Dropdown/types/types'
+import type { ICategoryFiltersSchema } from '@/shared/ui/Dropdown/types/types'
 import type { IFeedbackFormSchema } from '@/widgets/FeedbackForm/model/scheme/feedbackFormSliceSchema'
 import type { ICartEntitySchema } from '@/entities/CartEntity/model/types/types'
 import type { IAboutUsSchema } from '@/pages/AboutUsPage/model/types/types'
 import type { IFeedbackSchema } from '@/features/Reviews/model/types/types'
-import type { TNumberOfPageSchema } from '@/components/Pagination/types/types'
+import type { TNumberOfPageSchema } from '@/widgets/Pagination/types/types'
 
 export interface StateSchema {
   aboutUs: IAboutUsSchema

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

@@ -17,12 +17,12 @@ 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 { categoryFiltersSliceReducer } from '@/components/Dropdown/slice/filtersSlice'
+import { categoryFiltersSliceReducer } from '@/shared/ui/Dropdown/slice/filtersSlice'
 import { feedbackFormReducer } from '@/widgets/FeedbackForm/model/slice/feedbackFormSlice'
 import { aboutUsReducer } from '@/pages/AboutUsPage/model/slice/aboutUsSlice'
 import { cartEntityReducer } from '@/entities/CartEntity/model/slice/cartEntitySlice'
 import { feedbacksReducer } from '@/features/Reviews/model/slice/feedbacksSlice'
-import { paginationSliceReducer } from '@/components/Pagination/slice/paginationSlice'
+import { paginationSliceReducer } from '@/widgets/Pagination/slice/paginationSlice'
 
 export type RootState = StateSchema
 

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

@@ -17,11 +17,14 @@ import HelpPage from '@/pages/HelpPage/HelpPage'
 import LoginPage from '@/pages/LoginPage/LoginPage'
 import { LogoutPage } from '@/pages/LogoutPage/LogoutPage'
 import MainPage from '@/pages/MainPage/MainPage'
+import { PrivacyPage } from '@/pages/PrivacyPage/PrivacyPage'
 import { ProductPage } from '@/pages/ProductPage/ProductPage'
 import { ProductsPage } from '@/pages/ProductsPage/ProductsPage'
+import { ReviewsPage } from '@/pages/ReviewsPage/ReviewsPage'
 import RootPage from '@/pages/RootPage/RootPage'
 import SearchResultsPage from '@/pages/SearchResultsPage/SearchResultsPage'
 import ShopNewsPage from '@/pages/ShopNewsPage/ShopNewsPage'
+import { TermsPage } from '@/pages/TermsPage/TermsPage'
 import VouchersPage from '@/pages/VouchersPage/VouchersPage'
 import { Routes } from '@/shared/config/routerConfig/routes'
 
@@ -83,7 +86,7 @@ export const AppRouter = createBrowserRouter([
       },
       {
         path: Routes.PRIVACY,
-        element: <ProductsPage /> // временная заглушка нужна страница с политикой безопасности
+        element: <PrivacyPage />
       },
       {
         path: Routes.PRODUCTS,
@@ -94,9 +97,13 @@ export const AppRouter = createBrowserRouter([
         element: <ProductsPage />
       },
       {
-        path: Routes.REVIEWS + '/:index',
+        path: Routes.FEEDBACKS + '/:index',
         element: <FeedbackPage />
       },
+      {
+        path: Routes.REVIEWS,
+        element: <ReviewsPage />
+      },
       {
         path: Routes.SEARCH,
         element: <SearchResultsPage />
@@ -107,7 +114,7 @@ export const AppRouter = createBrowserRouter([
       },
       {
         path: Routes.TERMS,
-        element: <ProductsPage /> // временная заглушка нужна страница с условиями соглашения
+        element: <TermsPage />
       },
       {
         path: Routes.ADD_RETURN,