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

Develop #506

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4f08158
first commit
arthurfujii Aug 22, 2024
9ac4a32
bannerSlide v1 implemented
arthurfujii Aug 23, 2024
304e18f
refactored bannerSlide
arthurfujii Aug 23, 2024
0a7fca2
bannerSlide without swipe feature
arthurfujii Aug 26, 2024
cce005d
product slider implementation - states problem
arthurfujii Aug 27, 2024
5a041b1
bannerSlider with touch swipe
arthurfujii Aug 27, 2024
45689f1
productslider initial implementation
arthurfujii Aug 27, 2024
c6c8cd4
productSlider implemented
arthurfujii Aug 30, 2024
211eaf9
favorites and cart states button implemented
arthurfujii Sep 2, 2024
99fc2e4
category and hot price components implemented
arthurfujii Sep 2, 2024
8d35deb
catalog page implemented
arthurfujii Sep 5, 2024
2cf5851
icon style fixed
arthurfujii Sep 6, 2024
0a39d6f
pagination product grid initial implementation
arthurfujii Sep 7, 2024
3fcc8ec
pagination implemented
arthurfujii Sep 10, 2024
ff99ac5
menu page implemented
arthurfujii Sep 10, 2024
6764343
searchParams & constantly load to be fixed
arthurfujii Sep 11, 2024
3191767
buggy category fetch
arthurfujii Sep 16, 2024
1b2267c
categories fixed, favorite page localstorage buggy
arthurfujii Sep 17, 2024
7a7ea2f
favorites page implemented
arthurfujii Sep 17, 2024
8e141c5
cart page initial implementation
arthurfujii Sep 18, 2024
f53d60e
cart page styled
arthurfujii Sep 18, 2024
b15d21a
cart with checkout--still button func needed
arthurfujii Sep 18, 2024
bce8c47
save products fetch
arthurfujii Sep 20, 2024
558eec9
rollback modifications/corrections
arthurfujii Sep 20, 2024
982627b
product details without youmayalsolike
arthurfujii Sep 21, 2024
a4def39
suggestions section implemented
arthurfujii Sep 22, 2024
3a77084
scss deprecation fixed
arthurfujii Sep 23, 2024
05ce061
media queries details page
arthurfujii Sep 23, 2024
655bf17
h1 app hidden
arthurfujii Sep 23, 2024
a845553
transitions added, hashRouter
arthurfujii Sep 23, 2024
da1556d
img path fixed
arthurfujii Sep 23, 2024
b2355e0
img fixed, footer console removed
arthurfujii Sep 23, 2024
4456a14
fixed back to top problem
arthurfujii Sep 23, 2024
c6e4e98
api fix
arthurfujii Sep 23, 2024
341ab59
fix api
arthurfujii Sep 23, 2024
f82a0de
try fix fetch loop
arthurfujii Sep 23, 2024
17d0d12
implemented touchscroll at productslider
arthurfujii Sep 23, 2024
d08dd77
fix suggested products
arthurfujii Sep 23, 2024
eb1f363
fixed mentor suggestions
arthurfujii Sep 23, 2024
4dfafd3
fixed color link at shopcategories
arthurfujii Sep 24, 2024
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
7,064 changes: 2,782 additions & 4,282 deletions package-lock.json

Large diffs are not rendered by default.

44 changes: 25 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,44 @@
"author": "Mate Academy",
"license": "GPL-3.0",
"dependencies": {
"@cypress/react18": "^2.0.0",
"@fortawesome/fontawesome-free": "^6.2.0",
"@types/react-transition-group": "^4.4.5",
"@cypress/react18": "^2.0.1",
"@fortawesome/fontawesome-free": "^6.6.0",
"@octokit/core": "^3.6.0",
"@types/react-transition-group": "^4.4.11",
"ajv": "^8.17.1",
"ajv-keywords": "^5.1.0",
"bulma": "^0.9.4",
"classnames": "^2.5.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3",
"react-scripts": "5.0.1",
"react-transition-group": "^4.4.5"
"mocha": "^10.7.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.1",
"react-scripts": "^5.0.1",
"react-transition-group": "^4.4.5",
"uuid": "^10.0.0"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@mate-academy/eslint-config-react-typescript": "latest",
"@mate-academy/scripts": "^1.7.9",
"@mate-academy/eslint-config-react-typescript": "^1.0.20",
"@mate-academy/scripts": "^1.9.3",
"@mate-academy/students-ts-config": "latest",
"@mate-academy/stylelint-config": "latest",
"@types/node": "^16.18.80",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@types/node": "^16.18.105",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"cypress": "^12.17.4",
"eslint": "^7.32.0",
"eslint-plugin-cypress": "^2.11.2",
"eslint": "^8.57.0",
"eslint-plugin-cypress": "^2.15.2",
"gh-pages": "^6.1.1",
"mochawesome": "^7.1.3",
"mochawesome-merge": "^4.2.0",
"mochawesome-report-generator": "^6.2.0",
"postcss": "^8.4.12",
"prettier": "^3.2.5",
"sass": "^1.72.0",
"postcss": "^8.4.41",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"stylelint": "^15.11.0",
"typescript": "5.1.6"
"typescript": "5.1.6",
"webpack": "^5.93.0"
},
"scripts": {
"start": "mate-scripts start -l",
Expand Down
Binary file added public/img/category-accessories-sqr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/category-phones-sqr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/category-tablets-sqr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/img/icons/cart-counter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/img/icons/cart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-down-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-left-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-right-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-up-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/chevron-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/dot-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/dot-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/img/icons/heart-counter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/heart-filled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/img/icons/home-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/img/icons/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/img/icons/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/minus-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/minus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/icons/plus-disabled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading