diff --git a/package-lock.json b/package-lock.json index 38814508..c6547ece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "ma-fe-react-2024", "version": "0.0.0", "dependencies": { + "axios": "^1.7.2", "clsx": "^2.1.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -4104,6 +4105,11 @@ "node": ">=8" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -4128,6 +4134,16 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", @@ -4277,12 +4293,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -4513,6 +4529,17 @@ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", @@ -4842,6 +4869,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -6393,9 +6428,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -6440,6 +6475,25 @@ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -6449,6 +6503,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -7957,6 +8024,25 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -8563,6 +8649,11 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index 66516d10..f6432a0e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "prepare": "husky install" }, "dependencies": { + "axios": "^1.7.2", "clsx": "^2.1.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/App.tsx b/src/App.tsx index eb022431..3a78f7c7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,9 +3,8 @@ import { Route, Routes } from 'react-router-dom'; import { AboutMe } from '@/components/aboutMe/AboutMe.component.tsx'; import { LayoutPage } from '@/components/layoutComponent/Layout.component.tsx'; import { PageNotFound } from '@/components/pageNotFound/PageNotFound.component.tsx'; -import { ProductList } from '@/components/productList/ProductList.component.tsx'; import { ProductPage } from '@/components/productPage/ProductPage.component.tsx'; -import { products } from '@/data/ProductsData.ts'; +import { Products } from '@/components/products/Products.component.tsx'; import './App.css'; @@ -14,7 +13,7 @@ function App() { }> } /> - } /> + } /> } /> } /> diff --git a/src/components/filtersBar/FiltersBar.component.tsx b/src/components/filtersBar/FiltersBar.component.tsx index cf8becc3..9d97fcb3 100644 --- a/src/components/filtersBar/FiltersBar.component.tsx +++ b/src/components/filtersBar/FiltersBar.component.tsx @@ -2,29 +2,62 @@ import React from 'react'; import searchIcon from '@/assets/img/searchIcon.svg?url'; import { SortList } from '@/components/sortList/SortList.components.tsx'; -import type { FiltersBarProps } from '@/interface/interfaceProductFilters.ts'; +import type { FiltersBarProps, FiltersButtons } from '@/interface/interfaceProductFilters.ts'; import styles from './filtersBar.module.css'; -export const FiltersBar: React.FC = ({ onCategoryChange, onSortChange }) => ( -
-
- - -
-
- - - -
- -
-); +export const FiltersBar: React.FC = ({ + query, + handleQueryParameter, + setFilter, + setCurrentPage, + handleSearchButtonClick, + searchInput, + onSortChange, +}) => { + const filterButtonsObject: FiltersButtons[] = [ + { + name: 'Shoes', + categoryId: 3, + }, + { + name: 'Electronics', + categoryId: 2, + }, + { + name: 'Clothes', + categoryId: 1, + }, + ]; + return ( +
+
+ + +
+
+ {filterButtonsObject.map((filterButton: FiltersButtons) => ( + + ))} +
+ +
+ ); +}; diff --git a/src/components/filtersBar/filtersBar.module.css b/src/components/filtersBar/filtersBar.module.css index bf476f2a..9b771ab0 100644 --- a/src/components/filtersBar/filtersBar.module.css +++ b/src/components/filtersBar/filtersBar.module.css @@ -41,6 +41,10 @@ box-sizing: border-box; } +.searchInput:focus { + outline: none; +} + .searchButton { position: absolute; top: 0; @@ -51,6 +55,7 @@ height: 38px; border: none; padding: 0; + cursor: pointer; } /* filter buttons */ diff --git a/src/components/header/Header.component.tsx b/src/components/header/Header.component.tsx index 2b62a337..0969468b 100644 --- a/src/components/header/Header.component.tsx +++ b/src/components/header/Header.component.tsx @@ -18,14 +18,20 @@ export const HeaderComponent: React.FC = ({ changeTheme, ac
@@ -38,7 +44,7 @@ export const HeaderComponent: React.FC = ({ changeTheme, ac
  • - clsx(styles.menuBtn, { [styles.activePage]: isActive })} to="/product_list"> + clsx(styles.menuBtn, { [styles.activePage]: isActive })} to="/products"> Products
    • diff --git a/src/components/layoutComponent/Layout.component.tsx b/src/components/layoutComponent/Layout.component.tsx index 8da55fee..9655b0a0 100644 --- a/src/components/layoutComponent/Layout.component.tsx +++ b/src/components/layoutComponent/Layout.component.tsx @@ -1,4 +1,4 @@ -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import { Outlet } from 'react-router-dom'; import { clsx } from 'clsx'; @@ -8,8 +8,14 @@ import { HeaderComponent } from '@/components/header/Header.component.tsx'; export const LayoutPage = () => { const [theme, setTheme] = useState('light'); - const themeClass = clsx(`${theme}Theme`); + useEffect(() => { + const themeUser = localStorage.getItem('themeUser'); + if (themeUser) { + setTheme(themeUser); + } + }, []); + const themeClass = clsx(`${theme}Theme`); return (
    diff --git a/src/components/loading/Loading.component.tsx b/src/components/loading/Loading.component.tsx new file mode 100644 index 00000000..8d5d72ea --- /dev/null +++ b/src/components/loading/Loading.component.tsx @@ -0,0 +1,8 @@ +import styles from '@/components/loading/loading.module.css'; + +export const Loading = () => ( +
    + Loading... +
    +
    +); diff --git a/src/components/loading/loading.module.css b/src/components/loading/loading.module.css new file mode 100644 index 00000000..8553c721 --- /dev/null +++ b/src/components/loading/loading.module.css @@ -0,0 +1,29 @@ +.containerLoader { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + height: 80vh; +} + +.loader { + letter-spacing: 10px; + color: #EF4934; + font-weight: 400; + font-size: 40px; +} + +.loadingLine { + width: 290px; + border-radius: 5px; + height: 5px; + background-color: #EF4934; + box-sizing: border-box; + animation: animationLoader 3s ease-in-out infinite; +} + +@keyframes animationLoader { + 0% { width: 10px} + 50% { width: 290px} + 100% { width: 10px} +} diff --git a/src/components/pagination/Pagination.component.tsx b/src/components/pagination/Pagination.component.tsx new file mode 100644 index 00000000..b984245b --- /dev/null +++ b/src/components/pagination/Pagination.component.tsx @@ -0,0 +1,36 @@ +import styles from '@/components/pagination/pagination.module.css'; +import type { PaginationProps } from '@/interface/interfacePagination.ts'; + +export const Pagination: React.FC = ({ totalPage, currentPage, setCurrentPage }) => { + const pageNumber = []; + const handlePageChange = (page: number) => { + setCurrentPage(page); + }; + for (let index = 1; index <= totalPage; index++) { + pageNumber.push( + , + ); + } + return ( +
    + + {pageNumber} + +
    + ); +}; diff --git a/src/components/pagination/pagination.module.css b/src/components/pagination/pagination.module.css new file mode 100644 index 00000000..2d4083df --- /dev/null +++ b/src/components/pagination/pagination.module.css @@ -0,0 +1,29 @@ +.pagination { + display: flex; + margin: 60px; +} + +.pagination { + justify-content: center; + gap: 5px; +} + +.paginationButton { + width: 32px; + height: 32px; + border-radius: 8px; + border: 1px solid var(--color-border-button); + background-color: var(--bg-primary); + cursor: pointer; + color: var(--txt-secondary); +} + +.paginationButton:hover { + background-color: var(--background-button); + color: #FFF; +} + +.activeButtonPage { + background-color: var(--background-button); + color: #FFF; +} diff --git a/src/components/productList/ProductList.component.tsx b/src/components/productList/ProductList.component.tsx index 7393b3e2..74387a4b 100644 --- a/src/components/productList/ProductList.component.tsx +++ b/src/components/productList/ProductList.component.tsx @@ -1,77 +1,19 @@ -import React, { useState } from 'react'; - -import { FiltersBar } from '@/components/filtersBar/FiltersBar.component.tsx'; import { ProductCard } from '@/components/productCard/ProductCard.component.tsx'; -import type { ProductListProps } from '@/interface/interfaceProductFilters.ts'; +import type { Data, Product } from '@/interface/interfaceProductCategory.ts'; import styles from './productList.module.css'; -export const ProductList: React.FC = ({ products }) => { - const [currentPage, setCurrentPage] = useState(1); - const itemsPerPage = 8; - const [selectedCategory, setSelectedCategory] = useState(null); - const [sortCriteria, setSortCriteria] = useState('Price (High - Low)'); - - const filteredProducts = selectedCategory ? products.filter((product) => product.category.name === selectedCategory) : products; - - const sortedProducts = [...filteredProducts].sort((a, b) => { - switch (sortCriteria) { - case 'Price (High - Low)': { - return b.price - a.price; - } - case 'Price (Low - High)': { - return a.price - b.price; - } - case 'Newest': { - return new Date(b.creationAt).getTime() - new Date(a.creationAt).getTime(); - } - case 'Oldest': { - return new Date(a.creationAt).getTime() - new Date(b.creationAt).getTime(); - } - default: { - return 0; - } - } - }); - - const totalPages = Math.ceil(sortedProducts.length / itemsPerPage); - const indexOfLastItem = currentPage * itemsPerPage; - const indexOfFirstItem = indexOfLastItem - itemsPerPage; - const currentItems = sortedProducts.slice(indexOfFirstItem, indexOfLastItem); - - return ( - <> - -
    - {currentItems.map((product, index) => ( - - ))} -
    -
    - - {Array.from({ length: totalPages }, (_, index) => ( - - ))} - -
    - +export const ProductList: React.FC = ({ products }) => + products.length > 0 ? ( +
    + {products.map((product: Product) => ( + + ))} +
    + ) : ( +
    +

    Oops!

    +

    Unfortunately, such a product has not been found.

    + Please check the name of the product, but it is quite possible that it is not yet in our assortment +
    ); -}; diff --git a/src/components/productList/productList.module.css b/src/components/productList/productList.module.css index 5e6ac9d0..3c67a934 100644 --- a/src/components/productList/productList.module.css +++ b/src/components/productList/productList.module.css @@ -1,37 +1,18 @@ -.productList, .pagination { +.productList { display: flex; margin: 60px; -} - -.productList { - justify-content: space-around; - flex-wrap: wrap; - gap: 25px; -} - -.pagination { justify-content: center; - gap: 5px; -} - -.paginationButton { - width: 32px; - height: 32px; - border-radius: 8px; - border: 1px solid var(--color-border-button); - background-color: var(--bg-primary); - cursor: pointer; - color: var(--txt-secondary); -} - -.paginationButton:hover { - background-color: var(--background-button); - color: #FFF; + gap: 20px; + flex-wrap: wrap; } -.activePage { - background-color: var(--background-button); - color: #FFF; +.errorText { + display: flex; + flex-direction: column; + height: 100vh; + margin: 60px 20px auto; + text-align: center; + font-family: inherit; } @media (max-width: 768px) { diff --git a/src/components/products/Products.component.tsx b/src/components/products/Products.component.tsx new file mode 100644 index 00000000..6f9854b0 --- /dev/null +++ b/src/components/products/Products.component.tsx @@ -0,0 +1,119 @@ +import React, { useEffect, useState } from 'react'; + +import { FiltersBar } from '@/components/filtersBar/FiltersBar.component.tsx'; +import { Loading } from '@/components/loading/Loading.component.tsx'; +import { Pagination } from '@/components/pagination/Pagination.component.tsx'; +import { ProductList } from '@/components/productList/ProductList.component.tsx'; + +export const Products = () => { + const [data, setData] = useState([]); + const [query, setQuery] = useState(''); + const [searchInput, setSearchInput] = useState(''); + const [totalPage, setTotalPage] = useState(1); + const [currentPage, setCurrentPage] = useState(1); + const countProductsOnPage = 8; + const [isLoading, setLoading] = useState(true); + const [filter, setFilter] = useState(0); + // eslint-disable-next-line sonarjs/no-duplicate-string + const [sortOption, setSortOption] = useState('Price (High - Low)'); + + useEffect(() => { + const getAllProducts = async () => { + try { + const response = await fetch(`https://ma-backend-api.mocintra.com/api/v1/products`); + const result = await response.json(); + setTotalPage(Math.ceil(result.total / countProductsOnPage)); + } catch (error) { + console.error(`Error get all products:`, error); + } + }; + getAllProducts(); + }, []); + + useEffect(() => { + const fetchData = async () => { + try { + const offset = (currentPage - 1) * countProductsOnPage; + const sortField = getSortFieldFromOption(sortOption); + const sortOrder = getSortOrderFromOption(sortOption); + const response = await fetch( + `https://ma-backend-api.mocintra.com/api/v1/products?title=${query}&limit=${countProductsOnPage}&offset=${offset}&categoryId=${filter}&sortField=${sortField}&sortOrder=${sortOrder}`, + ); + const result = await response.json(); + setData(result.products); + setTimeout(() => setLoading(false), 1000); + } catch (error) { + console.error(`Error fetching data:`, error); + } + }; + fetchData(); + }, [currentPage, query, filter, sortOption]); + const handleQueryParameter = (event: React.ChangeEvent) => { + setSearchInput(event.target.value); + }; + + const handleSearchButtonClick = () => { + setQuery(searchInput); + setCurrentPage(1); + }; + const handleSortChange = (selectedOption: string) => { + setSortOption(selectedOption); + setCurrentPage(1); + }; + const getSortFieldFromOption = (option: string) => { + switch (option) { + case 'Price (High - Low)': + case 'Price (Low - High)': { + return 'price'; + } + case 'Newest': + case 'Oldest': { + return 'creationAt'; + } + default: { + return 'price'; + } + } + }; + const getSortOrderFromOption = (option: string) => { + switch (option) { + case 'Price (High - Low)': { + return 'desc'; + } + case 'Price (Low - High)': { + return 'asc'; + } + case 'Newest': { + return 'desc'; + } + case 'Oldest': { + return 'asc'; + } + default: { + return 'desc'; + } + } + }; + + return ( + <> + {isLoading ? ( + + ) : ( + <> + + + {data.length > 0 && } + + )} + + ); +}; diff --git a/src/interface/interfacePagination.ts b/src/interface/interfacePagination.ts new file mode 100644 index 00000000..22646fe9 --- /dev/null +++ b/src/interface/interfacePagination.ts @@ -0,0 +1,5 @@ +export interface PaginationProps { + totalPage: number; + currentPage: number; + setCurrentPage: (currentPage: number) => void; +} diff --git a/src/interface/interfaceProductCategory.ts b/src/interface/interfaceProductCategory.ts index d2f0ee71..7a5c10d4 100644 --- a/src/interface/interfaceProductCategory.ts +++ b/src/interface/interfaceProductCategory.ts @@ -16,3 +16,7 @@ export interface Product { updatedAt: Date; category: Category; } + +export interface Data { + products: Product[]; +} diff --git a/src/interface/interfaceProductFilters.ts b/src/interface/interfaceProductFilters.ts index c286c725..105b2d9a 100644 --- a/src/interface/interfaceProductFilters.ts +++ b/src/interface/interfaceProductFilters.ts @@ -1,14 +1,20 @@ -import type { Product } from '@/interface/interfaceProductCategory.ts'; - -export interface ProductListProps { - products: Product[]; -} +import type { ChangeEvent } from 'react'; export interface SortListProps { onSortChange: (sortCriteria: string) => void; } export interface FiltersBarProps { - onCategoryChange: (onCategoryChange: string) => void; - onSortChange: (sortCriteria: string) => void; + setCurrentPage: (currentPage: number) => void; + setFilter: (filter: number) => void; + handleQueryParameter: (event: ChangeEvent) => void; + query: string; + handleSearchButtonClick: () => void; + searchInput: string; + onSortChange: (selectedOption: string) => void; +} + +export interface FiltersButtons { + name: string; + categoryId: number; }