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

Phone catalog #565

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ad4f621
Update README.md for Team project (#559)
YuriiHoliuk Jan 6, 2025
5091a9c
Update README.md
YuriiHoliuk Jan 6, 2025
1d4c373
task solution
olshum8 Jan 18, 2025
386407e
add public
olshum8 Jan 18, 2025
59a47b4
icons fix
olshum8 Jan 18, 2025
d5d5498
icons fix ver2
olshum8 Jan 18, 2025
7de9e80
icons fix ver3
olshum8 Jan 18, 2025
b164822
icons fix
olshum8 Jan 21, 2025
bb75fe6
icons fix2
olshum8 Jan 21, 2025
b6a8f5a
icons fix3
olshum8 Jan 21, 2025
5d1d45f
ProductSlider icons fix
olshum8 Jan 22, 2025
acc7073
Logos fix
olshum8 Jan 22, 2025
2b6524a
navbar + footer fix
olshum8 Jan 22, 2025
3b9280e
navbar + footer fix
olshum8 Jan 22, 2025
c3d2a63
navbar + footer fix
olshum8 Jan 22, 2025
e3e8f7c
navbar + footer fix
olshum8 Jan 22, 2025
622f88f
not found pages fix
olshum8 Jan 22, 2025
47f2a9b
carusel fix
olshum8 Jan 22, 2025
1762d6e
cursor fix
olshum8 Jan 22, 2025
8bf437d
fix burger menu
olshum8 Jan 22, 2025
99ea2ef
fix navbar items color
olshum8 Jan 27, 2025
8d0dfea
add favicon and title
olshum8 Jan 27, 2025
85e22b6
fix cart icon
olshum8 Jan 27, 2025
c72adcf
fix scroll to top
olshum8 Jan 27, 2025
c8c5c8e
add footer links + open on new tab
olshum8 Jan 27, 2025
75f275e
fix categories links
olshum8 Jan 27, 2025
acde73b
fix prices in productDetailsPage
olshum8 Jan 27, 2025
56e954a
add top shadow at NavBar to improve visibility on phones
olshum8 Jan 27, 2025
8a0daca
fix pages titles
olshum8 Jan 27, 2025
bc093ad
fix nav bar font
olshum8 Jan 28, 2025
59dff23
change favicon
olshum8 Jan 28, 2025
8e51a32
fix delete button in cart item
olshum8 Jan 28, 2025
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
521 changes: 378 additions & 143 deletions README.md

Large diffs are not rendered by default.

130 changes: 123 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
"license": "GPL-3.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^6.5.2",
"@reduxjs/toolkit": "^2.5.0",
"bulma": "^1.0.1",
"classnames": "^2.5.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^9.2.0",
"react-router-dom": "^6.25.1",
"react-transition-group": "^4.4.5"
"react-transition-group": "^4.4.5",
"swiper": "^11.2.1"
},
"devDependencies": {
"@cypress/react18": "^2.0.1",
"@mate-academy/scripts": "^1.8.5",
"@mate-academy/scripts": "^1.9.12",
"@mate-academy/students-ts-config": "*",
"@mate-academy/stylelint-config": "*",
"@types/node": "^20.14.10",
Expand Down
Binary file added public/Icons/Close.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/Icons/Home.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/Icons/Menu.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/Icons/Minus.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/Icons/Plus.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/Icons/Search.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/Icons/arrow_down.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/Icons/arrow_left.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/Icons/arrow_left_black.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/Icons/arrow_right.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/Icons/arrow_right_black.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/Icons/arrow_up.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/Icons/cart.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/Icons/favourites.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/Icons/favourites_filled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 1 addition & 57 deletions public/api/products.json
Original file line number Diff line number Diff line change
Expand Up @@ -1119,62 +1119,6 @@
"year": 2022,
"image": "img/phones/apple-iphone-14/purple/00.webp"
},
{
"id": 81,
"category": "phones",
"itemId": "apple-iphone-14-pro-128gb-spaceblack",
"name": "Apple iPhone 14 Pro 128GB Space Black",
"fullPrice": 1156,
"price": 1068,
"screen": "6.1' OLED",
"capacity": "128GB",
"color": "spaceblack",
"ram": "6GB",
"year": 2022,
"image": "img/phones/apple-iphone-14-pro/spaceblack/00.webp"
},
{
"id": 82,
"category": "phones",
"itemId": "apple-iphone-14-pro-256gb-spaceblack",
"name": "Apple iPhone 14 Pro 256GB Space Black",
"fullPrice": 1300,
"price": 1220,
"screen": "6.1' OLED",
"capacity": "256GB",
"color": "spaceblack",
"ram": "6GB",
"year": 2022,
"image": "img/phones/apple-iphone-14-pro/spaceblack/00.webp"
},
{
"id": 83,
"category": "phones",
"itemId": "apple-iphone-14-pro-512gb-spaceblack",
"name": "Apple iPhone 14 Pro 512GB Space Black",
"fullPrice": 1600,
"price": 1530,
"screen": "6.1' OLED",
"capacity": "512GB",
"color": "spaceblack",
"ram": "6GB",
"year": 2022,
"image": "img/phones/apple-iphone-14-pro/spaceblack/00.webp"
},
{
"id": 84,
"category": "phones",
"itemId": "apple-iphone-14-pro-1tb-spaceblack",
"name": "Apple iPhone 14 Pro 1TB Space Black",
"fullPrice": 1740,
"price": 1520,
"screen": "6.1' OLED",
"capacity": "1TB",
"color": "spaceblack",
"ram": "6GB",
"year": 2022,
"image": "img/phones/apple-iphone-14-pro/spaceblack/00.webp"
},
{
"id": 85,
"category": "phones",
Expand Down Expand Up @@ -2715,4 +2659,4 @@
"year": 2022,
"image": "img/phones/apple-iphone-14-pro/gold/00.webp"
}
]
]
Binary file added public/img/Logo.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/accessories-category.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/big_banner.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/little_banner.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/phones-category.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/tablets-category.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 75 additions & 1 deletion src/App.scss
Original file line number Diff line number Diff line change
@@ -1 +1,75 @@
// not empty
@font-face {
font-family: Mont-Regular;
src: url(/public/fonts/Mont-Regular.otf);
font-weight: 600;
}
@font-face {
font-family: Mont-SemiBold;
src: url(/public/fonts/Mont-SemiBold.otf);
font-weight: 700;
}
@font-face {
font-family: Mont-Bold;
src: url(/public/fonts/Mont-Bold.otf);
font-weight: 800;
}

:root {
--primary: #0f0f11;
--secondary: #89939a;
text-transform: uppercase;
}

header {
position: sticky;
top: 0;
z-index: 1000;
background-color: white;
}

.layout {
display: flex;
flex-direction: column;
min-height: 100vh;
}

.layout__content {
flex-grow: 1; /* Розтягуємо головний контент */
}

h1 {
font-family: Mont-bold;
font-size: 48px;
font-weight: 800;
line-height: 56px;
}

h2 {
font-family: Mont-bold;
font-size: 32px;
font-weight: 800;
line-height: 41px;
}

h3 {
font-family: Mont-Bold;
font-size: 22px;
font-weight: 800;
line-height: 30.8px;
}

h4 {
font-family: Mont-SemiBold;
font-size: 20px;
font-weight: 700;
line-height: 25.56px;

}

button:disabled, .disabled {
cursor: not-allowed;
}

a, button {
cursor: pointer;
}
Loading
Loading