Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#211-product-card-in-fsd #232

Merged
merged 3 commits into from
Feb 19, 2024

Conversation

MargaritaShumilina
Copy link
Collaborator

Компонент товара из каталога был переведен по FSD

@MargaritaShumilina MargaritaShumilina added this to the Каталог milestone Feb 9, 2024
@MargaritaShumilina MargaritaShumilina added the enhancement New feature or request label Feb 9, 2024
@aimenin
Copy link
Collaborator

aimenin commented Feb 11, 2024

В development ссылку на решаемый issue
В assignee назначем себя
В milestone пул реквесты не назначаем

Copy link
Collaborator

@aimenin aimenin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. В переделанных компонентах использовать типографику.
  2. В компоненте ProductLabels, насколько я понял, не прописан storybook

import { getStylesForCurrentLayout } from '../ProductCard/utils/utils'
import styles from '../ProductCard/ProductCard.module.scss'
import { getStylesForCurrentLayout } from '@/shared/ui/ProductLabels/utils/utils'
// import styles from '../ProductCard/ProductCard.module.scss'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нужен комментарий?

@@ -84,7 +84,8 @@ export const ProductsPage = () => {
/>
<section className={styles['content-products']}>
{Array.from({ length: 8 }, (_, index) => (
<ProductCard key={index} layout={cardView} onEyeClick={changeModalState} />
// <ProductCard key={index} layout={cardView} onEyeClick={changeModalState} />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нужен комментарий?

@MargaritaShumilina MargaritaShumilina self-assigned this Feb 12, 2024
@MargaritaShumilina MargaritaShumilina linked an issue Feb 12, 2024 that may be closed by this pull request
@MargaritaShumilina MargaritaShumilina removed this from the Каталог milestone Feb 12, 2024
@MargaritaShumilina
Copy link
Collaborator Author

  • Добавлены storybook для ProductLabels, WidgetButtonsFunctions и WidgetButtonsPurchase;
  • Убраны лишние комментарии;
  • Использована типографика в ProductItem

@aimenin aimenin self-requested a review February 16, 2024 11:58
Copy link
Collaborator

@aimenin aimenin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно порешать конфликты в остальном можно мержить

@MargaritaShumilina MargaritaShumilina merged commit 282454e into master Feb 19, 2024
1 check passed
@MargaritaShumilina MargaritaShumilina deleted the enhancement-211-product-card-in-fsd branch February 19, 2024 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Сверстать компонент товара по fsd
3 participants