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.

Sign up for GitHub

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

Jump to bottom

Feature/product filter labels #169

Merged
merged 34 commits into from
Apr 23, 2024
Merged

Feature/product filter labels #169

merged 34 commits into from
Apr 23, 2024

Conversation

anksuunamun
Copy link
Contributor

@anksuunamun anksuunamun commented Apr 22, 2024 •
edited
Loading

double of #158

  • implemented badges/labels for illustrating product filtering (src/components/Product/ProductsFilterLabels/ProductsFilterLabels.tsx)
  • new component added on products page
  • fixed problems with sonar, linting and types

result:
image

MikeSaburov and others added 28 commits April 17, 2024 07:39
@MikeSaburov
create component file
be30070
@MikeSaburov
imported the component onto the page and aligned the position of the …
ac06d72 
…elements
@MikeSaburov
create file component Label
f842e88
@MikeSaburov
made up label
d62a9e1
@MikeSaburov
add props 'name'
b668c30
@MikeSaburov
button click event was transferred to a function
96f1b44
@MikeSaburov
described the props and clicked on the cross
d27d467
@MikeSaburov
create component Label
2d6469e
@MikeSaburov
made labels with buttons
80468fa
@MikeSaburov
event handler function renamed
47e97be
@MikeSaburov
LabelProps renamed to Ilabel
d5ba485
@MikeSaburov
to display the label the label property is used
34f5807
@MikeSaburov
moved all functions to the root component
45fd153
@MikeSaburov
all comments have been corrected
fc6587e
@anksuunamun
refactor: add changes for product filter label
d35ea98
@anksuunamun
fix: add ids for filter labels and default filter btn
df13ceb
@anksuunamun
fix: fix sonar issues
f84c21b
@anksuunamun
Merge branch 'development' into ProductsFilterLabels
bb9da30 
# Conflicts:
#	src/components/Review/CommentsList/CommentsList.tsx
#	src/components/Review/ReviewComponent/ReviewComponent.tsx
#	src/components/UI/Dropdown/Dropdown.tsx
#	src/services/reviewService.ts
#	src/types/Button.ts
@anksuunamun
Merge branch 'development' into ProductsFilterLabels
ead419b 
# Conflicts:
#	src/components/Review/CommentsList/CommentsList.tsx
#	src/components/Review/ReviewComponent/ReviewComponent.tsx
#	src/components/UI/Dropdown/Dropdown.tsx
#	src/services/reviewService.ts
#	src/types/Button.ts
@anksuunamun
Merge branch 'development' into ProductsFilterLabels
5e55188 
# Conflicts:
#	src/components/Review/CommentsList/CommentsList.tsx
#	src/components/Review/ReviewComponent/ReviewComponent.tsx
#	src/components/UI/Dropdown/Dropdown.tsx
#	src/services/reviewService.ts
#	src/types/Button.ts
@anksuunamun
fix: fix indents
d513182
@anksuunamun
refactor: refactor comment
c9f8be4
@anksuunamun
refactor: refactor comment
d74a525
@anksuunamun
refactor: refactor comment
f59896a
@anksuunamun
refactor: refactor comment
e2697a4
@anksuunamun
fix: undo changes in jest.config.js
c5c1f9b
@anksuunamun
refactor: return handleError in ReviewComponent.tsx
e1c5cfe
@anksuunamun
Merge pull request #168 from MikeSaburov/ProductsFilterLabels
ff42d3e 
Products filter labels
@anksuunamun anksuunamun mentioned this pull request Apr 23, 2024
Closed
@anksuunamun
Copy link
Contributor Author

Fix tsconfig for correct type definition for react-testing-library
(testing-library/jest-dom#559)
image

@Sunagatov Sunagatov merged commit 8617437 into development Apr 23, 2024
4 checks passed
@Sunagatov Sunagatov deleted the feature/product-filter-labels branch April 23, 2024 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sunagatov Sunagatov Sunagatov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@anksuunamun @Sunagatov @MikeSaburov