Skip to content

Commit

Permalink
Merge pull request #166 from Studio-Yandex-Practicum/fix/patch_for_de…
Browse files Browse the repository at this point in the history
…ad_master_001

fixes import and layout errors, adds axios in package.json
  • Loading branch information
Dormeh authored Dec 21, 2023
2 parents 436ba3b + 05af81e commit 8e57cec
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 33 deletions.
57 changes: 29 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
},
"dependencies": {
"@reduxjs/toolkit": "1.9.5",
"axios": "^1.6.2",
"classnames": "^2.3.2",
"focus-trap": "^7.5.4",
"formik": "^2.4.5",
Expand Down
1 change: 0 additions & 1 deletion src/components/BlogMainItem/BlogMainItem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import styles from './blog-main-item.module.scss'
import { blogMainItemData } from '@/mockData/blogMainItemData'
import { useEffect, useMemo } from 'react'
import ViewIcon from '@/assets/images/blogMainItem/icon-views.svg'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FC } from 'react'
import classnames from 'classnames'

import { ECardView } from '@/shared/model/types/common'
import IconCompare from '@/assets/icons/IconCompare'
import IconCompare from '@/assets/icons/IconCompare.svg'
import IconLike from '@/assets/icons/IconLike'
import { Button, ButtonSize, ButtonTheme } from '@/shared/ui/Button/Button'
import { getStylesForCurrentLayout } from '../ProductCard/utils/utils'
Expand Down
4 changes: 1 addition & 3 deletions src/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Logo from '../logo/Logo'
import Search from '../search/search'
import ArrowIcon from '@/assets/icons/arrow.svg'
import LightningIcon from '@/assets/images/header/lightning.svg'
import AllCategoriesIcon from '@/assets/images/header/all-categories.svg'
import ContextMenuElement from '../ContextMenuElement/ContextMenuElement'
import HeaderAccount from '../HeaderAccount/HeaderAccount'
import { PHONE_NUMBER } from '@/shared/constants/constants'
Expand Down Expand Up @@ -159,12 +158,11 @@ function Header() {

<div className={styles['header__row-three']}>
<ContextMenuElement content={catalogNode}>

{/* @TODO: вставить путь когда будет роут */}
<CatalogLink to="" className={styles['header__catalog-link_main']}>
<div className={styles['header__catalog-wrapper']}>
<IconCategories className={styles['header__svg']} />
<p className={styles['header__catalog-text']}>Все категории</p
<p className={styles['header__catalog-text']}>Все категории</p>
</div>
</CatalogLink>
</ContextMenuElement>
Expand Down

0 comments on commit 8e57cec

Please sign in to comment.