Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
37bfafc
feat: add gitignore file
Ritter1111 Aug 1, 2023
d596749
feat: configure webpack with eslint, prettier, typescript and react
Ritter1111 Aug 1, 2023
6535f65
feat: add script for eslint
Ritter1111 Aug 2, 2023
0217928
feat: add husky to project
Ritter1111 Aug 2, 2023
bed43e8
fix: change configuration husky
Ritter1111 Aug 2, 2023
e53a302
feat: add jest testing to project
Ritter1111 Aug 2, 2023
9878c85
fix: fix tsconfig
Ritter1111 Aug 2, 2023
b95ff91
Merge pull request #1 from Anna-Mamedova/feat/dev_config
Ritter1111 Aug 3, 2023
dbf1589
feat: add file pull_request_template.md
Anna-Mamedova Aug 3, 2023
c55e3e7
fix: add folder for pull_request_template.md file
Anna-Mamedova Aug 3, 2023
8d8cb09
feat: add basic folders structure
Anna-Mamedova Aug 3, 2023
2db50b5
feat: add basic folders structure
Anna-Mamedova Aug 3, 2023
2f78279
Merge pull request #8 from Anna-Mamedova/feat/pull-request-template
Anna-Mamedova Aug 4, 2023
405b8e6
docs: update readme
ElizabethVasilenko13 Aug 4, 2023
a833973
Merge branch 'develop' of https://github.com/Anna-Mamedova/ECommerce-…
ElizabethVasilenko13 Aug 5, 2023
e0a1f42
docs: remove one emoji
ElizabethVasilenko13 Aug 5, 2023
3e1f864
Merge pull request #9 from Anna-Mamedova/feat/readme
ElizabethVasilenko13 Aug 5, 2023
bd75899
feat: add material ui
Ritter1111 Aug 8, 2023
273c198
feat: add react-router-dom, clear ts.config
ElizabethVasilenko13 Aug 8, 2023
ce6a712
feat: implement log in page
Ritter1111 Aug 9, 2023
88e84fb
receive token and customer data from api and add error handling
Ritter1111 Aug 9, 2023
976bc22
Merge pull request #25 from Anna-Mamedova/feat/Integration-with-authe…
Ritter1111 Aug 9, 2023
c458be6
feat: implement routing for navigation between login, registration, a…
ElizabethVasilenko13 Aug 9, 2023
93d768b
feat: add basic sign up template
Anna-Mamedova Aug 9, 2023
0fa0ed7
feat: add validation for inputs
Anna-Mamedova Aug 9, 2023
149b1cd
feat: implement notFound page
ElizabethVasilenko13 Aug 9, 2023
b9b0cb2
feat: implement base redirect and redirect users who already login
Ritter1111 Aug 9, 2023
f5908b3
Merge pull request #26 from Anna-Mamedova/feat/routing-implementation
ElizabethVasilenko13 Aug 9, 2023
042add4
Merge branch 'release/login-registration-main' into feat/redirection-…
Ritter1111 Aug 9, 2023
7ab23e8
Merge pull request #27 from Anna-Mamedova/feat/redirection-and-nav-to…
Ritter1111 Aug 9, 2023
5701e67
feat: add adress field template and validation
Anna-Mamedova Aug 9, 2023
534c2cc
fix: fix login routing
ElizabethVasilenko13 Aug 9, 2023
199f603
docs: merge documentation updates from release/login-registration-main
Anna-Mamedova Aug 9, 2023
fc2f45a
Merge pull request #28 from Anna-Mamedova/fix/fix-routing
ElizabethVasilenko13 Aug 9, 2023
5a115c2
Merge pull request #29 from Anna-Mamedova/feat/registration-page-inpu…
Anna-Mamedova Aug 10, 2023
901513a
feat: save refresh token to local storage
Ritter1111 Aug 10, 2023
d316cea
feat: add navigation to login page and new style for form inputs
Anna-Mamedova Aug 10, 2023
cfb9ec0
Merge pull request #30 from Anna-Mamedova/feat/navigation-to-Login-Page
Anna-Mamedova Aug 10, 2023
22a83d8
feat: add links to all functional pages, add navbar
ElizabethVasilenko13 Aug 10, 2023
47c0be4
feat: implement refresh token after expiration
Ritter1111 Aug 10, 2023
6b19b52
Merge pull request #31 from Anna-Mamedova/feat/centralized-navigation
ElizabethVasilenko13 Aug 10, 2023
3a52a8a
feat: add error pop up
Ritter1111 Aug 11, 2023
4580ba5
Merge branch 'release/login-registration-main' into feat/authenticati…
Ritter1111 Aug 11, 2023
ca443fd
Merge pull request #32 from Anna-Mamedova/feat/authentication-token
Ritter1111 Aug 11, 2023
fbbd6e7
feat add template for shipping and billing address and validation
Anna-Mamedova Aug 12, 2023
4b3bde7
feat: add signup logic
Anna-Mamedova Aug 12, 2023
572ffe9
feat: add logic for add address
Anna-Mamedova Aug 13, 2023
d74eea3
feat: add logic for add set billing, shipping address and set default…
Anna-Mamedova Aug 13, 2023
09afc60
feat: implement burger menu, add btns styling
ElizabethVasilenko13 Aug 13, 2023
1a915f8
feat: update burger menu, add vars.css, update styles
ElizabethVasilenko13 Aug 14, 2023
987b6b1
feat: implement logout
ElizabethVasilenko13 Aug 14, 2023
58e10dd
refactor: refactor SignUp.tsx file
Anna-Mamedova Aug 14, 2023
add10cb
refactor: update link font size
ElizabethVasilenko13 Aug 15, 2023
99e4a5a
feat: add error toste notify and make pull from release/login-registr…
Anna-Mamedova Aug 15, 2023
a9f84eb
Merge pull request #34 from Anna-Mamedova/feat/integration-with-authe…
Anna-Mamedova Aug 15, 2023
32adbf2
Merge pull request #33 from Anna-Mamedova/feat/evaluation-criteria-fo…
ElizabethVasilenko13 Aug 15, 2023
907c76f
feat: add logic for automatic login and redirect to main
Anna-Mamedova Aug 15, 2023
e1e234d
feat: add success popup
Anna-Mamedova Aug 15, 2023
51247a2
Merge pull request #35 from Anna-Mamedova/feat/Redirect-to-the-main-p…
Anna-Mamedova Aug 15, 2023
24e3046
fix: change design submit button and input field
Ritter1111 Aug 15, 2023
2134d05
docs: add settings for netlify
Anna-Mamedova Aug 15, 2023
21b4e3b
docs: add more settings for netlify
Anna-Mamedova Aug 15, 2023
185f9f2
refactor: change .env const name
Anna-Mamedova Aug 16, 2023
2ab3b26
feat: add validation for email
Ritter1111 Aug 16, 2023
ae7a567
fix: fix webpack sctipt
Anna-Mamedova Aug 16, 2023
765a22d
fix: fix webpack sctipt
Anna-Mamedova Aug 16, 2023
61bd916
feat: implement validation password
Ritter1111 Aug 16, 2023
f346b39
Merge pull request #36 from Anna-Mamedova/fix/fix-netlify-deploy
Anna-Mamedova Aug 16, 2023
2711ac3
fix: fix validation
Anna-Mamedova Aug 17, 2023
68fed30
Merge pull request #37 from Anna-Mamedova/fix/fix-signup-validate
Ritter1111 Aug 17, 2023
0792a6a
feat: implement show and hide password
Ritter1111 Aug 17, 2023
3160916
Merge branch 'release/login-registration-main' into feat/login-valida…
Ritter1111 Aug 17, 2023
22d67c6
fex: change env variables
Ritter1111 Aug 17, 2023
053935c
Merge branch 'feat/login-validation' of https://github.com/Anna-Mamed…
Ritter1111 Aug 17, 2023
d308188
fix: fix conflicts
Ritter1111 Aug 17, 2023
0a91da2
fix: add pop up for not correct email and assword
Ritter1111 Aug 17, 2023
ba9982a
Merge pull request #38 from Anna-Mamedova/feat/login-validation
Ritter1111 Aug 17, 2023
3169e28
feat: implement tests
ElizabethVasilenko13 Aug 18, 2023
90849ee
Merge branch 'release/login-registration-main' into feat/routing-navb…
ElizabethVasilenko13 Aug 18, 2023
fbf5b0a
Merge pull request #39 from Anna-Mamedova/feat/routing-navbar-test
ElizabethVasilenko13 Aug 18, 2023
ca77ca2
fix: fix design
Ritter1111 Aug 19, 2023
1c83fd8
Merge pull request #40 from Anna-Mamedova/feat/login-page-test
Ritter1111 Aug 19, 2023
a5d06bf
fix: fix design
Ritter1111 Aug 19, 2023
a90bf73
feat: update burger menu
ElizabethVasilenko13 Aug 19, 2023
92f5054
feat: implement about us page
ElizabethVasilenko13 Aug 19, 2023
ddb59c2
fix: fix test
ElizabethVasilenko13 Aug 19, 2023
18d9714
feat: implement main page
ElizabethVasilenko13 Aug 19, 2023
1ebdc34
refactor: changle main page links flex direction
ElizabethVasilenko13 Aug 20, 2023
2787070
Merge pull request #41 from Anna-Mamedova/fix/main-page-fix
ElizabethVasilenko13 Aug 20, 2023
47cb996
feat: implement tests for login page
Ritter1111 Aug 20, 2023
e4dce01
feat: add password visibility for sign up
Ritter1111 Aug 20, 2023
66c0a59
feat: add test for passwordVisibility component
Ritter1111 Aug 20, 2023
ed22d36
Merge branch 'release/login-registration-main' into feat/login-test
Ritter1111 Aug 20, 2023
84d5b9c
Merge pull request #42 from Anna-Mamedova/feat/login-test
Ritter1111 Aug 20, 2023
08525d4
Merge pull request #43 from Anna-Mamedova/release/login-registration-…
Anna-Mamedova Aug 23, 2023
d58dad7
fix: fix burger menu
ElizabethVasilenko13 Aug 24, 2023
8c9dc8c
feat: add basic template for user profile
Anna-Mamedova Aug 24, 2023
62aaf91
feat: add clear edit mode toggle
Anna-Mamedova Aug 25, 2023
d6a7627
feat: add default address mark and reset user info if it doesnt save
Anna-Mamedova Aug 25, 2023
2912ed0
Merge pull request #54 from Anna-Mamedova/feat/display-user-profile-i…
Anna-Mamedova Aug 26, 2023
75dd4a4
feat: implement cards render
ElizabethVasilenko13 Aug 26, 2023
747d243
feat: add logic for set first name
Anna-Mamedova Aug 27, 2023
d4eb754
feat: add set last name and date of birth logics
Anna-Mamedova Aug 27, 2023
c46ae36
feat: add validation for personal user info
Anna-Mamedova Aug 27, 2023
9e0b9b9
feat: add validation and logic for change email
Anna-Mamedova Aug 27, 2023
5de3612
feat: show prices (with/without discount), clear interface
ElizabethVasilenko13 Aug 27, 2023
7bca7cf
feat: add validation and logic for reset password
Anna-Mamedova Aug 27, 2023
8f74db5
refactor: update code, use prettier, fix fetching issue
ElizabethVasilenko13 Aug 28, 2023
cb3e25a
Merge branch 'release/catalog-product-profile' into feat/display-prod…
ElizabethVasilenko13 Aug 28, 2023
27a7e4a
feat: implement redirect to the detail product page
ElizabethVasilenko13 Aug 28, 2023
c93dab3
feat: add card hover
ElizabethVasilenko13 Aug 28, 2023
8d67e7d
refactor: refactor code
ElizabethVasilenko13 Aug 28, 2023
32b33bc
refactor: remove reduntant files
ElizabethVasilenko13 Aug 28, 2023
72bbd72
refactor: run prettier
ElizabethVasilenko13 Aug 28, 2023
3b01494
Merge pull request #55 from Anna-Mamedova/feat/display-product-list
ElizabethVasilenko13 Aug 28, 2023
0380909
Merge pull request #56 from Anna-Mamedova/feat/interactive-product-cards
ElizabethVasilenko13 Aug 28, 2023
f8bdb66
feat: add logic for change address
Anna-Mamedova Aug 28, 2023
8e7f1b3
feat: add logic for add billing and shipping address
Anna-Mamedova Aug 29, 2023
7a2cdf7
feat: add logic for remove address
Anna-Mamedova Aug 29, 2023
b33291e
fix: fix
Anna-Mamedova Aug 29, 2023
d424105
feat: implement display images and description on detailed product page
Ritter1111 Aug 29, 2023
c31d549
feat: add logic for set defualt adresses
Anna-Mamedova Aug 29, 2023
7035cbe
refactor: remove magic numbers
Anna-Mamedova Aug 29, 2023
90be743
feat: add slider for images
Ritter1111 Aug 29, 2023
b41723d
feat: replace price from catalog to new component
Ritter1111 Aug 29, 2023
09ea3b8
feat: display size
Ritter1111 Aug 29, 2023
e7317c8
fix: fix slider
Ritter1111 Aug 30, 2023
0e3089e
Merge pull request #57 from Anna-Mamedova/feat/edit-user-profile-info…
Anna-Mamedova Aug 30, 2023
3a25f2f
fix: with prettier
Ritter1111 Aug 30, 2023
9254a96
Merge pull request #58 from Anna-Mamedova/feat/detailed-product-page
Ritter1111 Aug 30, 2023
71f2488
feat: add modal window
Ritter1111 Aug 30, 2023
baf64fc
feat: add routing implementation
Anna-Mamedova Aug 30, 2023
cf1df04
feat: add slider for modal window and divided into small components
Ritter1111 Aug 31, 2023
24afc29
feat: add button for close modal
Ritter1111 Aug 31, 2023
51196f1
Merge pull request #59 from Anna-Mamedova/feat/routing-implementation
Anna-Mamedova Aug 31, 2023
e72f535
fix: add "I" char for interfaces
Ritter1111 Aug 31, 2023
1e8bdf9
Merge pull request #60 from Anna-Mamedova/feat/modal-slider
Ritter1111 Aug 31, 2023
634dba8
fix: delete material ui core
Ritter1111 Aug 31, 2023
61309ed
fix: fix catalog routing
ElizabethVasilenko13 Aug 31, 2023
4423310
Merge pull request #61 from Anna-Mamedova/fix/fix-detail-page-routing
ElizabethVasilenko13 Aug 31, 2023
5d882d9
fix: fix routing on user and detailed pages
Ritter1111 Aug 31, 2023
26176a5
Merge branch 'release/catalog-product-profile' into fix/fix-routing-a…
Ritter1111 Aug 31, 2023
923979e
Merge pull request #62 from Anna-Mamedova/fix/fix-routing-and-detaile…
Ritter1111 Aug 31, 2023
f380d4c
feat: implement category switcher
ElizabethVasilenko13 Sep 1, 2023
e943ab7
feat: run prettier, implement cards array generating acctording to ca…
ElizabethVasilenko13 Sep 2, 2023
ae5b729
refacrot: interfaces refactor
ElizabethVasilenko13 Sep 2, 2023
053ea67
feat: implement category title handler
ElizabethVasilenko13 Sep 2, 2023
2c00f8e
feat: implement breadcrumb array generating
ElizabethVasilenko13 Sep 2, 2023
20072dd
feat: implement breadcrumb navigation
ElizabethVasilenko13 Sep 3, 2023
7d93624
refactor: update catalog cards mapping
ElizabethVasilenko13 Sep 3, 2023
5d546b6
fix: fix main categories toggle
ElizabethVasilenko13 Sep 3, 2023
e8e101a
refactor: fix comments
ElizabethVasilenko13 Sep 3, 2023
6f075e3
Merge pull request #63 from Anna-Mamedova/feat/category-navigation
ElizabethVasilenko13 Sep 3, 2023
fe8003d
fix: fix user profile logic
Anna-Mamedova Sep 3, 2023
2bdfb80
Merge pull request #64 from Anna-Mamedova/fix/fix-user-prifile-logic
Anna-Mamedova Sep 3, 2023
83b9db3
fix: fix display images in catalog page and change save refresh token
Ritter1111 Sep 3, 2023
22f74ba
feat: implment all products sorting
ElizabethVasilenko13 Sep 4, 2023
259ad63
Merge pull request #65 from Anna-Mamedova/fix/fix-display-image
Ritter1111 Sep 4, 2023
8a53adb
fix: fix react toasity error
Ritter1111 Sep 4, 2023
2dac85a
feat: implement sorting
ElizabethVasilenko13 Sep 4, 2023
25f85fe
Merge branch 'release/catalog-product-profile' of https://github.com/…
ElizabethVasilenko13 Sep 4, 2023
1813385
feat: implement searh functionaluty
ElizabethVasilenko13 Sep 4, 2023
551e533
Merge pull request #67 from Anna-Mamedova/feat/product-filtering-sort…
ElizabethVasilenko13 Sep 4, 2023
db65eda
refactort: remove console.log
ElizabethVasilenko13 Sep 4, 2023
d45823f
feat: implment price filtering
ElizabethVasilenko13 Sep 5, 2023
e86b2ca
feat: implement price in dollars for price range
ElizabethVasilenko13 Sep 5, 2023
b38551b
refactor: run prettier, move interface into folder
ElizabethVasilenko13 Sep 5, 2023
a53f0de
feat: add reset filters
ElizabethVasilenko13 Sep 5, 2023
e639453
refactor: remove console.log
ElizabethVasilenko13 Sep 5, 2023
74c2db2
Merge branch 'release/catalog-product-profile' into feat/product-filt…
ElizabethVasilenko13 Sep 5, 2023
0a109fe
Merge pull request #68 from Anna-Mamedova/feat/product-filtering-sort…
ElizabethVasilenko13 Sep 5, 2023
4a0efa2
fix: fix api url
ElizabethVasilenko13 Sep 5, 2023
a54f6ca
feat: implement folters styiling
ElizabethVasilenko13 Sep 5, 2023
96cd001
Merge branch 'feat/product-filtering-sorting-searching' of https://gi…
ElizabethVasilenko13 Sep 5, 2023
95e5a2f
refactor: update design
ElizabethVasilenko13 Sep 5, 2023
a67231c
refactor: refactor code
ElizabethVasilenko13 Sep 5, 2023
aa28edf
refactor: cange function order
ElizabethVasilenko13 Sep 5, 2023
31e2fb5
Merge pull request #69 from Anna-Mamedova/feat/product-filtering-sort…
ElizabethVasilenko13 Sep 6, 2023
63e18ce
Merge pull request #66 from Anna-Mamedova/release/catalog-product-pro…
Ritter1111 Sep 6, 2023
c69e72e
fix: add formik for login and add use callback for navbar
Ritter1111 Sep 6, 2023
3b4ff5a
Merge pull request #70 from Anna-Mamedova/fix/fix-validation
Ritter1111 Sep 7, 2023
edec40e
refactort: create productsList component
ElizabethVasilenko13 Sep 8, 2023
3401f2a
refactor: change fetchCards endpoint, remove convert function
ElizabethVasilenko13 Sep 8, 2023
dd445bd
refactor: remove fetch category
ElizabethVasilenko13 Sep 8, 2023
66a0ab5
refactor: divide product categories into compoments
ElizabethVasilenko13 Sep 8, 2023
4e7d80c
fix: fix fethCards arguments bug
ElizabethVasilenko13 Sep 8, 2023
5da1e32
feat: add botton for add to cart from catalog
Anna-Mamedova Sep 9, 2023
baea3b8
feat: add disabled style
Anna-Mamedova Sep 9, 2023
6837f24
Merge pull request #71 from Anna-Mamedova/feat/interactive-product-cards
Anna-Mamedova Sep 9, 2023
ec97eea
feat: add logic for create and update cart for auth customers
Anna-Mamedova Sep 9, 2023
7b908c5
feat: add creation cart when user logins
Anna-Mamedova Sep 10, 2023
fe91a3b
fix: fix modal window
Ritter1111 Sep 10, 2023
7ab4791
refactor: code refactor
ElizabethVasilenko13 Sep 10, 2023
14a7ddf
refactor: add I to interfaces name
ElizabethVasilenko13 Sep 10, 2023
b715335
Merge pull request #87 from Anna-Mamedova/fix/calog-fix
ElizabethVasilenko13 Sep 10, 2023
fdac1dd
feat: implement cart route, refactor header icons
ElizabethVasilenko13 Sep 10, 2023
6334942
fix: fix cart name display
ElizabethVasilenko13 Sep 10, 2023
a195350
feat: add logic for anon user
Anna-Mamedova Sep 10, 2023
8c07010
Merge pull request #88 from Anna-Mamedova/feat/shopping-cart-integration
Anna-Mamedova Sep 10, 2023
5ebfc8c
Merge branch 'feat/shopping-cart-integration' of https://github.com/A…
ElizabethVasilenko13 Sep 10, 2023
d787fa4
feat: add busket page
Ritter1111 Sep 10, 2023
a8bbd34
Merge branch 'release/basket-about_us' of https://github.com/Anna-Mam…
Ritter1111 Sep 10, 2023
eaad5d0
fix: add masterdata
Ritter1111 Sep 10, 2023
e6f1c52
feat: implement display items for basket page
Ritter1111 Sep 11, 2023
5ee5121
feat: implement quantity of items in the cart display
ElizabethVasilenko13 Sep 11, 2023
1eddc02
feat: add component basket info
Ritter1111 Sep 11, 2023
753cf62
Merge branch 'release/basket-about_us' into feat/routing-implementati…
ElizabethVasilenko13 Sep 11, 2023
ba5341f
Merge pull request #89 from Anna-Mamedova/feat/routing-implementation…
ElizabethVasilenko13 Sep 11, 2023
75879bf
Merge branch 'release/basket-about_us' of https://github.com/Anna-Mam…
Ritter1111 Sep 11, 2023
905cda2
fix: remove const
Ritter1111 Sep 11, 2023
5a42f06
Merge pull request #90 from Anna-Mamedova/feat/basket-items
Ritter1111 Sep 11, 2023
cf761f9
feat: add disabled for card in cart
Anna-Mamedova Sep 11, 2023
acc9ed0
fix: add message for empty cart
Ritter1111 Sep 11, 2023
93baaed
Merge pull request #91 from Anna-Mamedova/feat/performance-optimization
Ritter1111 Sep 11, 2023
9b6ab9f
fix: add data
Ritter1111 Sep 11, 2023
f06e97e
feat: add image for empty cart
Ritter1111 Sep 11, 2023
c6db705
feat: add remove item from basket
Ritter1111 Sep 11, 2023
e08fdb1
fix: fix all category filers error
ElizabethVasilenko13 Sep 11, 2023
3aab37e
feat: add api quantity
Ritter1111 Sep 11, 2023
05bb8ec
Merge pull request #92 from Anna-Mamedova/fix/catlog-all-fix
ElizabethVasilenko13 Sep 11, 2023
1c68910
fix: remove file
Ritter1111 Sep 11, 2023
d3fa694
fix: fix remove product and add folder for basket components
Ritter1111 Sep 11, 2023
2c677b3
Merge pull request #93 from Anna-Mamedova/feat/product-quantity
Ritter1111 Sep 12, 2023
a206b2f
feat: add button
Ritter1111 Sep 12, 2023
9021a38
feat: implement remove cart
Ritter1111 Sep 12, 2023
0584657
feat: add alert prompt
Ritter1111 Sep 12, 2023
7935202
feat: move functions into utils
ElizabethVasilenko13 Sep 12, 2023
e4abedb
feat: implement add/remove item from the detail product page
ElizabethVasilenko13 Sep 12, 2023
17c813c
refactor: run prettier
ElizabethVasilenko13 Sep 12, 2023
3dd65d6
fix: fix cart items quantity after sign up
ElizabethVasilenko13 Sep 12, 2023
f64bade
feat: add promocode to basket items
Ritter1111 Sep 14, 2023
6f9fc09
feat: implement team members deskription
ElizabethVasilenko13 Sep 14, 2023
57c09df
feat: implement display original and discounted prices after promo code
Ritter1111 Sep 14, 2023
db7968f
fix: remove commented code
Ritter1111 Sep 14, 2023
24c2f1b
feat: display promocodes on main page
Ritter1111 Sep 14, 2023
4e675a8
feat: implement footer
ElizabethVasilenko13 Sep 15, 2023
1f5449b
Merge branch 'release/basket-about_us' of https://github.com/Anna-Mam…
Ritter1111 Sep 15, 2023
085a132
fix: resolve conflicts
Ritter1111 Sep 15, 2023
4f269e1
fix: remove brackets
Ritter1111 Sep 15, 2023
1956d42
Merge pull request #94 from Anna-Mamedova/feat/about-us-sprint-4
ElizabethVasilenko13 Sep 15, 2023
20b5842
Merge pull request #95 from Anna-Mamedova/feat/promo-codes
Ritter1111 Sep 15, 2023
1820f68
feat: add Infinite Scroll to the catalog page
Anna-Mamedova Sep 17, 2023
9b5682b
fix: fix display discounted price
Ritter1111 Sep 17, 2023
258df56
fix: resolve conflicts
Anna-Mamedova Sep 17, 2023
454c7ec
refactor: fix reviewers issues
Anna-Mamedova Sep 17, 2023
35bf961
Merge pull request #96 from Anna-Mamedova/feat/performance-optimization
Anna-Mamedova Sep 17, 2023
c1ce51c
fix: fix 0 items display after all items removing
ElizabethVasilenko13 Sep 18, 2023
acbf647
Merge pull request #97 from Anna-Mamedova/feat/add-message
ElizabethVasilenko13 Sep 18, 2023
f0c55cd
Merge pull request #98 from Anna-Mamedova/release/basket-about_us
Ritter1111 Sep 22, 2023
3d998b5
Update README.md
Ritter1111 Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-react",
"@babel/preset-typescript"
]
}
33 changes: 33 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint",
"react",
"prettier"
],
"rules": {
"no-debugger": "off",
"no-console": 0,
"class-methods-use-this": "off",
"@typescript-eslint/no-explicit-any": "error",
"import/extensions": "off"
}
}
21 changes: 21 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Implement #

Task: task 1 (1000 points / 1000 points)

- [x] feature 1 (200 points / 200 points)
- [x] feature 2 (100 points / 100 points)
- [x] feature ...
- [x] feature n (300 points / 300 points)


This is a:

- [x] πŸ• Feature
- [x] πŸ› Bug Fix
- [x] πŸ“ Documentation Update
- [x] 🎨 Style
- [x] πŸ§‘β€πŸ’» Code Refactor
- [x] πŸ”₯ Performance Improvements
- [x] βœ… Test
- [x] πŸ€– Build
- [x] Other
104 changes: 104 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# Logs

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

make sure there is nothing extra (what is not used)

logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
# dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and *not* Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
3 changes: 3 additions & 0 deletions .lintstagedrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"src/**/*.+(ts|tsx|js|jsx)": ["prettier --write", "eslint --fix"]
}
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "es5"
}
53 changes: 52 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,52 @@
# ECommerce-Application
# ECommerce-Application
Welcome to our eCommerce application! This platform replicates real-world shopping experiences in a digital environment πŸͺ. It's a comprehensive online shopping portal that provides an interactive and seamless experience to users. From product discovery to checkout, the application ensures a smooth journey for the user, enhancing their engagement and boosting their purchasing confidence.

Users can browse through a vast range of products, view detailed descriptions, add their favorite items to the basket πŸ›’, and proceed to checkout πŸ’³. It includes features such as user registration and login πŸ“πŸ”, product search πŸ”, product categorization, and sorting to make the shopping experience more streamlined and convenient.

The application is powered by CommerceTools 🌐, a leading provider of commerce solutions for B2C and B2B enterprises. CommerceTools offers a cloud-native, microservices-based commerce platform that enables brands to create unique and engaging digital commerce experiences.

Key pages in the application include
- Login and Registration pages πŸ–₯️
- Main page 🏠
- Catalog Product page πŸ“‹
- Detailed Product page πŸ”Ž
- User Profile page πŸ‘€
- Basket page πŸ›’
- About Us page πŸ™‹β€β™‚οΈ

## Technology stack used
### Build with:
<img src="https://img.shields.io/badge/TypeScript-3178c6?logo=typescript&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/React-4FACDF?logo=react&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/HTML-E34F26?logo=html5&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/CSS-2971A3?logo=css3&logoColor=ColorName&style=ShieldStyle" /> <img src="https://img.shields.io/badge/Node.js-38883D?logo=node.js&logoColor=white&style=ShieldStyle" />
<img src="https://img.shields.io/badge/WebPack-3178c6?logo=webpack&logoColor=ColorName&style=ShieldStyle" />
### Version Control and Development Tools used:
<img src="https://img.shields.io/badge/Git-DC4936?logo=git&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/GitHub-1A1C1E?logo=github&logoColor=white&style=ShieldStyle" /> <img src="https://img.shields.io/badge/Visual Studio Code-0C72C5?logo=visual studio code&logoColor=white&style=ShieldStyle" />

## Setup and Running
To clone and run this application, you'll need [Git](https://git-scm.com/) and [Node.js](https://nodejs.org/en) (which comes with [npm](https://www.npmjs.com/)) installed on your computer. From your command line:
Clone this repository
```
$ git clone https://github.com/Anna-Mamedova/ECommerce-Application.git
```
Go into repository folder
```
$ cd ECommerce-Application
```
Install dependencies
```
$ npm install
```
Run the app
```
$ npm start
```
Deploy: https://ethno-wear.netlify.app/

## Available Scripts
In the project directory, you can run the following scripts using npm:
- `npm start` will start the development server using Webpack. It will serve your application in development mode and open it in your default web browser.
- `npm run build` will build your application for production using Webpack. The output files will be optimized and ready for deployment.
- `npm run clear` will remove the dist folder, which typically contains the built files. Use this script to clean up the build output.
- `npm run prettier` will run Prettier to format your TypeScript files in the src folder. Prettier will automatically apply consistent code formatting to your codebase.
- `npm run lint` will run ESLint to check for coding errors and style issues in your TypeScript files. It will report any problems found.
- `npm run lint:fix` will run ESLint to check and fix issues in your TypeScript files. It will apply automatic fixes to as many issues as possible.
- `npm test` will run the test suite using Jest. Jest will execute your test cases and provide the test results.
10 changes: 10 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
testEnvironment: 'jsdom',
transform: {
'\\.[jt]sx?$': 'esbuild-jest',
},
moduleNameMapper: {
'\\.(css)$': 'identity-obj-proxy',
},
setupFiles: ["jest-canvas-mock"]
};
4 changes: 4 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[[redirects]]
from = "/*"
to = "/index.html"
status = 200
Loading