Merge pull request #246 from Studio-Yandex-Practicum/enhancement-143-…

…categoryGridToFSD категории под FSD
Studio-Yandex-Practicum · Mar 4, 2024 · 91e8f44 · 91e8f44
2 parents 508d84e + 1374870
commit 91e8f44
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 64 deletions.
diff --git a/src/entities/SearchResult/SearchResult.tsx b/src/entities/SearchResult/SearchResult.tsx
@@ -1,9 +1,9 @@
 import { forwardRef } from 'react'
 
 import SearchItem from '@/entities/SearchItem/SearchItem'
-import { TCategory } from '@/models/CategoryModel'
 import { Routes } from '@/shared/config/routerConfig/routes'
 import { SEARCH_CATEGORY, SEARCH_PRODUCT } from '@/shared/constants/constants'
+import { TCategory } from '@/shared/model/CategoryModel'
 import type { TProduct } from '@/shared/model/types/common'
 import Link from '@/shared/ui/Link/Link'
 

diff --git a/src/mockData/catalogListData.ts b/src/mockData/catalogListData.ts
diff --git a/src/shared/config/catalogLinks/catalogLinks.ts b/src/shared/config/catalogLinks/catalogLinks.ts
diff --git a/src/shared/mockData/catalogListData.ts b/src/shared/mockData/catalogListData.ts
@@ -0,0 +1,42 @@
+import { Routes } from '@/shared/config/routerConfig/routes'
+
+export const linkItems = [
+  { index: 0, label: 'Блог', to: Routes.BLOG },
+  { index: 1, label: 'Новости', to: Routes.NEWS },
+  { index: 2, label: 'Отзывы о магазине', to: Routes.REVIEWS },
+  { index: 3, label: 'Контакты', to: Routes.CONTACTS }
+]
+
+export const catalogListData = [
+  {
+    id: 15,
+    name: 'Браслеты',
+    slug: 'brasletyi1',
+    branches: [],
+    root: 'Бижутерия',
+    is_prohibited: false,
+    is_visible_on_main: true,
+    image:
+      'http://gealit.ru/media/category-images/brasletyi/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2023-11-29_163851.jpg'
+  },
+  {
+    id: 1,
+    name: 'Машинки',
+    slug: 'mashinki',
+    branches: [],
+    root: 'Игрушки',
+    is_prohibited: false,
+    is_visible_on_main: true,
+    image: 'http://gealit.ru/media/category-images/mashinki/170734.jpg'
+  },
+  {
+    id: 22,
+    name: 'Медиаплееры',
+    slug: 'mediapleeryi1',
+    branches: [],
+    root: 'Телевизоры и аудиотехника',
+    is_prohibited: false,
+    is_visible_on_main: true,
+    image: null
+  }
+]
diff --git a/src/mockData/coreBaseData.ts → src/shared/mockData/coreBaseData.ts b/src/mockData/coreBaseData.ts → src/shared/mockData/coreBaseData.ts
diff --git a/src/mockData/headerAccountData.ts → src/shared/mockData/headerAccountData.ts b/src/mockData/headerAccountData.ts → src/shared/mockData/headerAccountData.ts
diff --git a/src/models/CategoryModel.ts → src/shared/model/CategoryModel.ts b/src/models/CategoryModel.ts → src/shared/model/CategoryModel.ts
@@ -3,9 +3,9 @@ export type TCategory = {
   name: string
   slug: string
   branches?: TCategory[]
-  root?: TCategory
+  root?: string
   is_prohibited?: boolean
   is_visible_on_main?: boolean
-  image?: string
+  image?: string | null
   type?: 'category'
 }
diff --git a/src/shared/model/types/common.ts b/src/shared/model/types/common.ts
@@ -1,4 +1,4 @@
-import { TCategory } from '@/models/CategoryModel'
+import { TCategory } from '@/shared/model/CategoryModel'
 
 export type TProduct = {
   name: string

diff --git a/src/shared/ui/CategoryCard/ui/CategoryCard.tsx b/src/shared/ui/CategoryCard/ui/CategoryCard.tsx
@@ -1,7 +1,7 @@
 import { type FC } from 'react'
 
-import { TCategory } from '@/models/CategoryModel'
 import { Routes } from '@/shared/config/routerConfig/routes'
+import { TCategory } from '@/shared/model/CategoryModel'
 import Link from '@/shared/ui/Link/Link'
 
 import Subheading from '../../Subheading/Subheading'

diff --git a/src/widgets/CategoryGrid/CategoryGrid.tsx b/src/widgets/CategoryGrid/CategoryGrid.tsx
@@ -1,5 +1,5 @@
-import { catalogListData } from '@/mockData/catalogListData'
 import { TEXT_POPULAR_CATEGORIES } from '@/shared/constants/constants'
+import { catalogListData } from '@/shared/mockData/catalogListData'
 import CategoryCard from '@/shared/ui/CategoryCard/ui/CategoryCard'
 import Heading from '@/shared/ui/Heading/Heading'
 
@@ -8,6 +8,7 @@ import styles from './CategoryGrid.module.scss'
 /**
  * Компонент сетки с карточками популярных категорий для главной страницы.
  */
+
 const CategoryGrid = () => {
   return (
     <section className={styles.section}>

diff --git a/src/widgets/Header/Header.tsx b/src/widgets/Header/Header.tsx
@@ -8,11 +8,11 @@ import { fetchCategories } from '@/entities/Category/slice/categorySlice'
 import HeaderAccount from '@/entities/HeaderAccount/HeaderAccount'
 import CallBack from '@/features/CallBack'
 import SearchProduct from '@/features/SearchProduct'
-import { linkItems } from '@/mockData/catalogListData'
-import { headerAccountData } from '@/mockData/headerAccountData'
 import { Routes } from '@/shared/config/routerConfig/routes'
 import ArrowIcon from '@/shared/icons/arrow.svg'
 import IconCategories from '@/shared/icons/IconCategories.svg'
+import { linkItems } from '@/shared/mockData/catalogListData'
+import { headerAccountData } from '@/shared/mockData/headerAccountData'
 import CatalogLink from '@/shared/ui/CatalogLink/CatalogLink'
 import ContextMenuElement from '@/shared/ui/ContextMenuElement/ContextMenuElement'
 import Link from '@/shared/ui/Link/Link'