diff --git a/pairent_frontend_react/src/components/BlockApartment/index.jsx b/pairent_frontend_react/src/components/BlockApartment/index.jsx index 928a7f8..230b093 100644 --- a/pairent_frontend_react/src/components/BlockApartment/index.jsx +++ b/pairent_frontend_react/src/components/BlockApartment/index.jsx @@ -26,24 +26,23 @@ const ApartmentAddress = styled.p` const TransportSection = styled.div` display: flex; margin-top: 9px; + & p { + font-weight: 500; + font-size: 15px; + color: #A9A9A9; + } ` const TransportIcon = styled.div` display: flex; justify-content: space-around; align-items: center; - width: 96px; - height: 32px; - border: 2px solid #A9A9A9; - border-radius: 20px; - - margin-left: 9px; -` - -const TransportTime = styled.p` - font-weight: 500; - font-size: 15px; - color: #A9A9A9; + width: fit-content; + height: 38px; + border: 1px solid #A9A9A9; + border-radius: 16px; + margin-right: 8px; + padding-right: 8px; ` const ButtonContact = styled.button` @@ -66,11 +65,11 @@ const BlockApartment = function (props) { - {props.results.timeToBus} мин +

{props.results.timeToBus} мин

- {props.results.timeToTrain} мин +

{props.results.timeToTrain} мин

Показать контакты diff --git a/pairent_frontend_react/src/components/ComparisonsApartamentsList/index.jsx b/pairent_frontend_react/src/components/ComparisonsApartamentsList/index.jsx index bc8c041..212add8 100644 --- a/pairent_frontend_react/src/components/ComparisonsApartamentsList/index.jsx +++ b/pairent_frontend_react/src/components/ComparisonsApartamentsList/index.jsx @@ -64,6 +64,11 @@ const Indicator = styled.p` font-size: 16px; ` +const ColumnAbout = styled.div` + width: 20%; + text-align: center; +` + const ComparisonsApartmentsList = () => { const [apartmentsComparisons, setApartmentsComparisons] = useState([]) const [totalPages, setTotalPages] = useState(0); @@ -115,12 +120,12 @@ const ComparisonsApartmentsList = () => { Санузел {apartmentsComparisons.map((apartament, index) => -
- {apartament.rooms} + + {apartament.rooms === 0 ? "Гостинка" : (apartament.rooms)} {apartament.floor} из {apartament.floorHouse} {apartament.perimetrs} м² {apartament.isBathroom ? '✓' : '—'} -
+ )} @@ -142,7 +147,7 @@ const ComparisonsApartmentsList = () => { Свежий ремонт {apartmentsComparisons.map((apartament, index) => -
+ {apartament.isFurniture ? '✓' : '—'} {apartament.isInternet ? '✓' : '—'} {apartament.isTelevision ? '✓' : '—'} @@ -152,7 +157,7 @@ const ComparisonsApartmentsList = () => { {apartament.isChild ? '✓' : '—'} {apartament.isAnimal ? '✓' : '—'} {apartament.isFreshRepair ? '✓' : '—'} -
+ )} @@ -171,14 +176,14 @@ const ComparisonsApartmentsList = () => { Охрана или консьерж {apartmentsComparisons.map((apartament, index) => -
+ {apartament.ceilingHeight} м {apartament.floorHouse} {apartament.isElevator ? '✓' : '—'} {apartament.isGarbageChute ? '✓' : '—'} {apartament.isParking ? '✓' : '—'} {apartament.isConcierge ? '✓' : '—'} -
+ )} diff --git a/pairent_frontend_react/src/components/UI/PaginatedTitle/index.jsx b/pairent_frontend_react/src/components/UI/PaginatedTitle/index.jsx index c7c6b4e..575a5c7 100644 --- a/pairent_frontend_react/src/components/UI/PaginatedTitle/index.jsx +++ b/pairent_frontend_react/src/components/UI/PaginatedTitle/index.jsx @@ -14,6 +14,13 @@ const TitleSection = styled.section` const TitleSectionLeftAndRight = styled.div` display: flex; align-items: center; + & h2 { + margin: 0px; + padding: 0px; + margin-left: 31px; + font-size: 24px; + color: #222; + } `; const ButtonBack = styled.button` @@ -29,12 +36,6 @@ const ButtonBack = styled.button` font-size: 15px; `; -const Title = styled.h2` - margin-left: 31px; - font-size: 24px; - color: #222; -`; - const ButtonPreviousAndNext = styled.button` display: flex; align-items: center; @@ -59,7 +60,7 @@ const PaginatedTitle = function ({title, totalPages, page, changePage}) { Вернуться назад - {title} +

{title}