diff --git a/components/Layers/Houses/CardContent/CardContent.tsx b/components/Layers/Houses/CardContent/CardContent.tsx index b85af26d..5c25b720 100644 --- a/components/Layers/Houses/CardContent/CardContent.tsx +++ b/components/Layers/Houses/CardContent/CardContent.tsx @@ -101,7 +101,7 @@ export function HousesCardContent() { result.push({ name: 'Износ', text: `${placemark?.attributes?.WearAndTear}%`, - content: , + content: , }); } @@ -120,12 +120,7 @@ export function HousesCardContent() { } return result; - }, [ - placemark?.attributes?.Management_company, - placemark?.attributes?.WearAndTear, - placemark?.attributes?.Series, - placemark?.attributes?.Floors, - ]); + }, [placemark?.attributes?.Management_company, placemark?.attributes?.WearAndTear, placemark?.attributes?.Series, placemark?.attributes?.Floors, isEmergency]); if (loading) { return ( diff --git a/components/Layers/Houses/HealthProgress/HealthProgress.module.css b/components/Layers/Houses/HealthProgress/HealthProgress.module.css index 0769d875..b1f972c4 100644 --- a/components/Layers/Houses/HealthProgress/HealthProgress.module.css +++ b/components/Layers/Houses/HealthProgress/HealthProgress.module.css @@ -4,16 +4,17 @@ } .health_progress__track { - position: relative; width: 289px; display: grid; background-color: #38465f; border-radius: 5px; } .health_progress__thumb { - border-radius: 10px 0 0 10px; + position: relative; + border-radius: 10px; } .health_progressbar__icon { position: absolute; - top: -6px; + top: -7px; + right: -10px } diff --git a/components/Layers/Houses/HealthProgress/HealthProgress.tsx b/components/Layers/Houses/HealthProgress/HealthProgress.tsx index 2a100e9e..ccc7ab11 100644 --- a/components/Layers/Houses/HealthProgress/HealthProgress.tsx +++ b/components/Layers/Houses/HealthProgress/HealthProgress.tsx @@ -1,13 +1,15 @@ import { useMemo } from 'react'; +import BrokenHeart from 'components/UI/Icons/BrokenHeart'; import Heart from 'components/UI/Icons/Heart'; import { WEAR_TEAR_FILTERS_DATA } from '../Houses.constants'; import styles from './HealthProgress.module.css'; type Props = { percent: number; + isEmergency: boolean }; -function HealthProgress({ percent }: Props) { +function HealthProgress({ percent, isEmergency }: Props) { const healthColor = useMemo(() => WEAR_TEAR_FILTERS_DATA.find(({ from, to }) => percent >= from && percent <= to).color, [percent]); return ( @@ -20,14 +22,12 @@ function HealthProgress({ percent }: Props) { backgroundColor: healthColor, width: `${100 - percent}%`, }} - /> -
- +
+ {isEmergency ? : } +
); diff --git a/components/UI/Icons/BrokenHeart.tsx b/components/UI/Icons/BrokenHeart.tsx index 20370998..5fc90fed 100644 --- a/components/UI/Icons/BrokenHeart.tsx +++ b/components/UI/Icons/BrokenHeart.tsx @@ -4,9 +4,9 @@ type Props = { function BrokenHeart({ color }: Props) { return ( - - - + + + ); } diff --git a/components/UI/Icons/Heart.tsx b/components/UI/Icons/Heart.tsx index 52266711..2ff85238 100644 --- a/components/UI/Icons/Heart.tsx +++ b/components/UI/Icons/Heart.tsx @@ -4,10 +4,8 @@ type Props = { function Heart({ color }: Props) { return ( - - - - + + ); diff --git a/components/UI/LeftSidebar/map.code-workspace b/components/UI/LeftSidebar/map.code-workspace deleted file mode 100644 index 04616194..00000000 --- a/components/UI/LeftSidebar/map.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "../../.." - } - ], - "settings": {} -} \ No newline at end of file