Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
4e2040b
feat: create environment setup
Buffik Dec 26, 2022
dad1e53
feat: add page 404
dinara-n Jan 2, 2023
88624fa
Merge pull request #1 from Buffik/404-page
Buffik Jan 2, 2023
6327043
feat: add template of cart, add rendering products from server, add +…
Buffik Jan 3, 2023
d4b92d5
Merge branch 'develop' into feat-shopping-cart
Buffik Jan 3, 2023
b4c6248
Merge pull request #2 from Buffik/feat-shopping-cart
Buffik Jan 3, 2023
46a3e0c
feat: add fetching and displaying products on main page
dinara-n Jan 4, 2023
d4047d3
feat: move cart logic to upper component
dinara-n Jan 4, 2023
c404091
feat: add ProductAddDropButton component
dinara-n Jan 4, 2023
45bf014
refactor: remove redundant code in comments
dinara-n Jan 4, 2023
ce7c1a4
refactor: temporarily remove tests for main page
dinara-n Jan 4, 2023
c892baf
feat: add header functionality
dinara-n Jan 4, 2023
872a500
refactor: change a property name in ProductAddDropButton
dinara-n Jan 4, 2023
fd0a8bd
refactor: remove redundant code in comments from Cart
dinara-n Jan 4, 2023
80cd902
Merge pull request #3 from Buffik/temp
dinara-n Jan 4, 2023
bfeee5b
feat: add total sum of products and its costs, add discount component
Buffik Jan 4, 2023
e2093f0
refactor: delete console.logs
Buffik Jan 4, 2023
34638db
Merge branch 'develop' into feat-cart-discount
Buffik Jan 4, 2023
12c5d44
fix: resolve conflicts
Buffik Jan 5, 2023
3cf8383
Merge pull request #4 from Buffik/feat-cart-discount
dinara-n Jan 5, 2023
f00b463
feat: add pagination
Buffik Jan 5, 2023
d07c9f5
feat: add search params
Buffik Jan 5, 2023
d8ca321
fix: logic of deleting product from cart
Buffik Jan 5, 2023
08025bd
Merge pull request #5 from Buffik/feat-cart-pagination
Buffik Jan 5, 2023
3d54355
feat: make custom hook useSearchParamsObject
dinara-n Jan 5, 2023
b7c938a
feat: add category and brand filters to main page
dinara-n Jan 6, 2023
bc0d24b
refactor: format price in header
dinara-n Jan 6, 2023
f029bb4
feat: add products filtering by category and brand
dinara-n Jan 6, 2023
a98d231
feat: add product searching to main page
dinara-n Jan 6, 2023
30e4c52
feat: add copy and reset buttons
dinara-n Jan 6, 2023
9b72a61
feat: add product sorting on main page
dinara-n Jan 6, 2023
664bf91
Merge pull request #6 from Buffik/main-page-filters
dinara-n Jan 7, 2023
ced51d2
Feat purchase form (#7)
Buffik Jan 7, 2023
9db476c
feat: add loading spinner component
dinara-n Jan 7, 2023
248e64b
Feat product page (#8)
Buffik Jan 8, 2023
28bf0be
fix: fix total price in header
dinara-n Jan 8, 2023
a9c3ff0
feat: add price and stock filters to main page
dinara-n Jan 8, 2023
34922ae
Merge remote-tracking branch 'origin/develop' into main-page-filters
dinara-n Jan 8, 2023
64b53a5
Merge pull request #9 from Buffik/main-page-filters
dinara-n Jan 8, 2023
58dbaa1
feat: add footer
dinara-n Jan 8, 2023
dd36595
Merge pull request #11 from Buffik/footer
dinara-n Jan 8, 2023
30c7bb6
Feat product page styling buy now logic (#13)
Buffik Jan 9, 2023
e925e21
Main, 404 and Cart Styles (#12)
dinara-n Jan 9, 2023
32254bd
fix: empty lines after merge
Buffik Jan 9, 2023
108d61e
Styling product page (#14)
Buffik Jan 9, 2023
8d8faaa
feat: add styles to empty cart
Buffik Jan 9, 2023
022e26e
Fix form bugs (#15)
Buffik Jan 9, 2023
e480e2f
feat: add some styles and icons
dinara-n Jan 9, 2023
28e325d
Merge pull request #16 from Buffik/bug-fixes
dinara-n Jan 9, 2023
dd3af76
Fix val phone number (#17)
Buffik Jan 9, 2023
2f42391
fix: fix filters on main page
dinara-n Jan 10, 2023
4cebfa4
Merge pull request #18 from Buffik/bug-fixes
dinara-n Jan 10, 2023
f814686
fix: upgrade footer
dinara-n Jan 10, 2023
059b753
feat: add styles to products view options on main page
dinara-n Jan 10, 2023
9d80223
fix: adjust header styles and margins
dinara-n Jan 10, 2023
a3c5860
fix: card number validation (#20)
Buffik Jan 10, 2023
0fe4e98
fix: adjust product page styles
dinara-n Jan 10, 2023
324ffc9
Merge remote-tracking branch 'origin/develop' into bug-fixes
dinara-n Jan 10, 2023
708625a
fix: adjust links in footer styles
dinara-n Jan 10, 2023
3679f69
Merge pull request #21 from Buffik/bug-fixes
dinara-n Jan 10, 2023
c18e4ec
fix: fix bug with currency signs on wrong filter
dinara-n Jan 10, 2023
0f61c20
fix: format prices in cart with Intl.NumberFormat
dinara-n Jan 11, 2023
317a56d
change breadcrumbs into links
dinara-n Jan 11, 2023
763d35e
Merge pull request #22 from Buffik/bug-fixes
dinara-n Jan 11, 2023
82ea218
feat: make site keyboard-accessible
dinara-n Jan 14, 2023
968f050
refactor: clean up and refactor the code
dinara-n Jan 14, 2023
5653fc7
fix: remove enum type and change back no-shadow eslint rule
dinara-n Jan 14, 2023
6d91bc7
fix: fix header and 404
dinara-n Jan 14, 2023
645ba03
feat: add tests
dinara-n Jan 14, 2023
1a29c84
Merge pull request #23 from Buffik/refactoring
dinara-n Jan 15, 2023
b83538b
Merge remote-tracking branch 'origin/develop' into tests
dinara-n Jan 15, 2023
ea4d52f
Merge pull request #24 from Buffik/tests
dinara-n Jan 15, 2023
1c1b63f
fix: delete type any from custom hook useFetching. feat: add react te…
Buffik Jan 17, 2023
3394fe2
fix: restructure 'view' radio-buttons code to stop eslint error
dinara-n Jan 17, 2023
fa58153
fix: change card expiration date placeholder fontsize
dinara-n Jan 17, 2023
3a22e85
fix: remove eslint errors
dinara-n Jan 17, 2023
e77c110
fix: fix styles for 'view' radio-buttons
dinara-n Jan 17, 2023
75fcfe1
fix: fix breadcrumbs link
dinara-n Jan 17, 2023
0b3632c
Merge pull request #26 from Buffik/refactoring
dinara-n Jan 17, 2023
bd949a4
refactor: delete console.log
Buffik Jan 18, 2023
c8755e7
fix: revert old logic with two states of cart to prevent plural fetch…
Buffik Jan 18, 2023
649de18
Fix lint errors (#28)
Buffik Jan 18, 2023
566ff8b
fix: response types at API services (#29)
Buffik Jan 30, 2023
2fefa8b
fix: fix mistakes
dinara-n Jan 31, 2023
ebfd9aa
Merge pull request #30 from Buffik/fix-pointed-by-mentor
dinara-n Jan 31, 2023
a499502
Fix utils types (#31)
Buffik Jan 31, 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
47 changes: 47 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"env": {
"browser": true,
"es2021": true,
"jest": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"airbnb"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2022,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"import/extensions": [
1,
"ignorePackages",
{
"ts": "never",
"tsx": "never"
}
],
"react/react-in-jsx-scope": "off",
"react/jsx-filename-extension": [
1,
{ "extensions": [".js", ".jsx", "ts", "tsx"] }
],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-explicit-any": "error"
},
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
}
}
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 80,
"endOfLine": "auto",
"bracketSpacing": true
}
Loading