diff --git a/pairent_frontend_react/public/images/apartment.png b/pairent_frontend_react/public/images/apartment.png
new file mode 100644
index 0000000..707d1bf
Binary files /dev/null and b/pairent_frontend_react/public/images/apartment.png differ
diff --git a/pairent_frontend_react/src/App.js b/pairent_frontend_react/src/App.js
index de151da..38725c4 100644
--- a/pairent_frontend_react/src/App.js
+++ b/pairent_frontend_react/src/App.js
@@ -1,17 +1,22 @@
import React from 'react';
+import { BrowserRouter } from 'react-router-dom';
+
import Header from './components/Header/Header';
+import AppRouter from './components/AppRouter/AppRouter';
import Footer from './components/Footer/Footer';
-import Favorites from './components/Favorites/Favorites';
+
import './App.css';
function App() {
return (
<>
-
{props.results.address}, {props.results.floor} этаж из {props.results.floorHouse}
в месяц
diff --git a/pairent_frontend_react/src/components/Favorites/FavoritesApartamentsList.jsx b/pairent_frontend_react/src/components/FavoritesApartamentsList/FavoritesApartamentsList.jsx similarity index 67% rename from pairent_frontend_react/src/components/Favorites/FavoritesApartamentsList.jsx rename to pairent_frontend_react/src/components/FavoritesApartamentsList/FavoritesApartamentsList.jsx index 91277a1..31e1536 100644 --- a/pairent_frontend_react/src/components/Favorites/FavoritesApartamentsList.jsx +++ b/pairent_frontend_react/src/components/FavoritesApartamentsList/FavoritesApartamentsList.jsx @@ -3,33 +3,38 @@ import ApartamentService from '../../API/ApartamentService'; import {useFetching} from '../../hooks/useFetching'; import {getPageCount} from '../../utils/Pages'; -import CardApartament from '../../components/CardApartament/CardApartament'; -import Pagination from '../../components/UI/Pagination/Pagination'; +import CardApartament from '../CardApartament/CardApartament'; +import Pagination from '../UI/Pagination/Pagination'; const FavoritesApartamentsList = () => { - const [apartaments, setApartaments] = useState([]) + const [apartamentsFavorites, setApartamentsFavorites] = useState([]) const [totalPages, setTotalPages] = useState(0); - const limit = 1; const [page, setPage] = useState(1); + const [limit, setLimit] = useState(1); const [fetchApartaments, isApartamentsLoading, apartamentsError] = useFetching(async (limit) => { let offset = (page - 1) * limit; const response = await ApartamentService.getAll(limit, offset); - setApartaments(response.data.results) - const totalCount = response.data.count + setApartamentsFavorites(response.data.results) + let totalCount = response.data.count; setTotalPages(getPageCount(totalCount, limit)) }) useEffect(() => { fetchApartaments(limit) - }, [page]) + }, [page, limit]) const changePage = (page) => { setPage(page) } + const viewAll = () => { + setLimit(totalPages * limit) + setPage(1) + } + // TODO: Переделать, сейчас сделанно для MVP (то есть заглушки) - if (!apartaments.length && !isApartamentsLoading && !apartamentsError) { + if (!apartamentsFavorites.length && !isApartamentsLoading && !apartamentsError) { return (