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

Develop #276

Merged
merged 146 commits into from
Jan 11, 2024
Merged

Develop #276

merged 146 commits into from
Jan 11, 2024

Conversation

jsapro
Copy link
Collaborator

@jsapro jsapro commented Jan 11, 2024

⭐🙂
release

nocTKpunTyM and others added 30 commits December 20, 2023 00:14
@nocTKpunTyM
Доверстал соглашение, сверстал условия доставки, активировал ссылку н…
48a6768 
…а них в футере
@jsapro
feat: change workflow file
914dabe
@jsapro
Merge pull request #157 from healthy-food-and-dietary-products/featur…
3372b3c 
…e/workflow-file

feat: change workflow file
@jsapro
fix: values in counter
b546aa9
@jsapro
docs: add template for pull-requests
b8b9c44
@jsapro
feat: change updateCart to receive array of products
19151a5
@jsapro
feat: implement adding products from recipe to cart by click
501ea69
@jsapro
feat: implement button adding recipe products to cart
d0427fb
@jsapro
fix: fix error in case of empty response when deleting
49012e2
@jsapro
fix: padding in category
9b1f1e4
@jsapro
fix: delete package name from counters
4e75d4b
@jsapro
fix: error when response body is empty (status 205)
9a68fb9
@jsapro
fix: make order button disabled in case cart is empty
f2bd617
@jsapro
fix: interface for MakingOrderBtn props
de8d3e1
@jsapro
fix: add all className variants to type ButtonProps
c623293
@jsapro
feat: implement button adding favourites to cart
bfa90c1
@jsapro
feat: add price near cart icon in header
d2fc67f
@jsapro
feat: add price near cart icon in header for not-auth user
a1bb4e7
@jsapro
feat: add CatalogPromo component
3679dc9
@jsapro
feat: change old catalog component on main page to new one
45ed214
@jsapro
refactor: delete unused code
fa76d54
@jsapro
feat: add title-link for catalog on main page
0b7fdea
@jsapro
feat: add component TitleArrowLink
0d42085
@jsapro
feat: change Recipe title to new TitleArrowLink component
1fee0b1
@jsapro
feat: change Catalog title to new TitleArrowLink component
138cb73
@jsapro
fix: change recipe fields according to new responce from server
0e6f26d
@jsapro
fix: display energy value
d65e95d
@jsapro
fix: padding in category
ededa47
@jsapro
fix: delete package name from counters
7116471
@jsapro
fix: error when response body is empty (status 205)
507778c
jsapro and others added 23 commits January 11, 2024 15:47
@jsapro
feat: add cursor pointer
f190fd1
@jsapro
refactor: put types in separate file
838dfc7
@jsapro
feat: (after rebase) add correct statuses to orders list in profile
7bc1009
@jsapro
feat: add ScrollToAnchorHash component
636713e
@jsapro
feat: add id to top-selling section
d6fb2ad
@jsapro
feat: add function to close burger on links click
a9ed03c
@jsapro
fix: styles on burger
234ebe0
@jsapro
refactor: delete comments
9a62b61
@jsapro
feat: make NavLink work with anchor id
9d7295a
@jsapro
fix: corrected styles
e9c9fc7
@jsapro
feat: add link to cart in burger menu
d6b868b
@jsapro
feat: closing burger by clicking outside or by Escape
09a5f4a
@jsapro
feat: add new components
b24053d
@jsapro
feat: add route for bad payment page
d1b5b00
@jsapro
fix: improve button style
3daf5e6
@jsapro
feat: add PaymentGood component
9e89f93
@jsapro
feat: add route for PaymentGood page
d5231c1
@jsapro
feat: add payment api request
6136e31
@jsapro
feat: add PaymentResults page
7fd4600
@jsapro
fix: wrapping text on button
a63d1e0
@jsapro
feat: (rebase) add 404 route
144ef39
@jsapro
fix: put description under image
a198d6c
@kavabunga
fix: fix error handling in shopping-cart
a4ae0c8 
Добавил проверки на наличие ожидаемой структуры ответа сервера для кейсов ошибок. В каких-то редких
случаях приложение не загружалось при 500-ой ошибке api коризны пользователя.

closes #232
@jsapro jsapro self-assigned this Jan 11, 2024
@jsapro jsapro requested a review from kavabunga January 11, 2024 15:48
kavabunga
kavabunga approved these changes Jan 11, 2024
View reviewed changes
Copy link
Member

@kavabunga kavabunga left a comment

Choose a reason for hiding this comment

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

🥂

@jsapro jsapro merged commit 99ada5d into main Jan 11, 2024
4 checks passed
@jsapro
Copy link
Collaborator Author

jsapro commented Jan 11, 2024

🥂

поехали))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kavabunga kavabunga kavabunga approved these changes

@Karmyshkov Karmyshkov Karmyshkov approved these changes

Assignees

@jsapro jsapro

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jsapro @kavabunga @Karmyshkov @nocTKpunTyM