Skip to content

Commit

Permalink
revise the tooltip and geopanle legis
Browse files Browse the repository at this point in the history
  • Loading branch information
CloudLun committed Dec 13, 2023
1 parent 9b50f45 commit 49efe91
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 48 deletions.
2 changes: 2 additions & 0 deletions components/Map/Legend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const Legend = () => {
width={16}
height={16}
alt="No Support, Democrat"
className='border-[1px] border-demo'
/>
<div className='text-label'>No Support, Democrat</div>
</div>
Expand All @@ -73,6 +74,7 @@ const Legend = () => {
width={16}
height={16}
alt="No Support, Republican"
className='border-[1px] border-rep'
/>
<div className='text-label '>No Support, Republican</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions components/Map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ const Map = () => {
});



m.moveLayer("background", "districts")
m.moveLayer("background", "zipcodes")
m.moveLayer('districts_outline', 'districts_hovered')
Expand All @@ -338,7 +337,7 @@ const Map = () => {
"#812948",
"white"
],)

m.setPaintProperty("members", "circle-stroke-color", "#812948")

})
Expand Down Expand Up @@ -413,13 +412,13 @@ const Map = () => {
</div>
<div class="flex items-center gap-[5px]">
<img src=${properties["HCMC support"].includes("Winter Eviction Moratorium") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div class="font-bold text-rtc_navy text-[12px]">Winter Eviction Moratorium</div>
</div>
<div class="font-bold text-rtc_navy text-[12px]">Winter Eviction Moratorium</div>
</div>
</div>
<div class="font-regular text-[12px] text-grey_2 underline">
Click the map for further details
</div>
</div></div>`)
</div>`)
}


Expand Down Expand Up @@ -461,7 +460,7 @@ const Map = () => {
</div>
</div>
<div class="px-[17px] pt-[8px] pb-[12px] text-navy bg-white rounded-b-[20px]">
<div class="font-regular text-[8px] text-[#7F7F7F]">Housing Courts Must Change! Campaign Support</div>
<div class="font-regular text-[8px] text-[#7F7F7F]">Housing Courts Must Change! Campaign Support</div>
<div class="flex flex-col gap-[5px] mt-[6px] mb-[8px]">
<div class="flex items-start gap-[5px]">
<img src=${properties["Legislation"].includes("Statewide Right to Counsel") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
Expand Down Expand Up @@ -512,6 +511,7 @@ const Map = () => {
<MapLayers districtsClickHandler={districtsClickHandler} />
<Geopanel />
<Membershippanel selectedMemberFeatures={selectedMemberFeatures} setSelectedMemberFeatures={setSelectedMemberFeatures} />

</>
)

Expand Down
2 changes: 1 addition & 1 deletion components/SidePanel/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const About = ({ expand, legislationsClickHandler }: Props) => {
<div className='flex-1 flex flex-col justify-between overflow-y-scroll'>
<div className="text-[12px] lg:text-body mx-[20px]">
<p>
<a className='underline' target='_blank' href='https://www.righttocounselnyc.org/hcmc'>Housing Courts Must Change! (HCMC)</a> is a statewide campaign launched by the Right to Counsel NYC Coalition in 2020 to transform the courts across New York State (NYS) from an “eviction machine” to a place that holds landlords accountable, upholds tenants’ rights, and enables tenants to remain in their homes.
<a className='hover:underline' target='_blank' href='https://www.righttocounselnyc.org/hcmc'>Housing Courts Must Change! (HCMC)</a> is a statewide campaign launched by the Right to Counsel NYC Coalition in 2020 to transform the courts across New York State (NYS) from an “eviction machine” to a place that holds landlords accountable, upholds tenants’ rights, and enables tenants to remain in their homes.
</p>
<div className="my-[20px]">
NYS legislative support for the HCMC campaign platform is shown on the map through Senate and Assembly districts. The HCMC campaign focuses on our legislative demands:
Expand Down
3 changes: 2 additions & 1 deletion components/SidePanel/LegislationColumns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ const LegislationColumns = ({ legislation, name, number, content, expand, calula
<div className='mx-[20px] mb-[40px]'>
<h2 className='font-semibold text-[13px] lg:text-title'>{name}</h2>
<h2 className='mb-[14px] font-semibold text-[13px] lg:text-title'>({number})</h2>
<p className='font-regular text-[12px] lg:text-body'>{content}</p>
<p className='mb-[14px] font-regular text-[12px] lg:text-body'>{content}</p>
<p className='font-regular text-[12px] lg:text-body'>A simple majority, more than half of the votes, is required to pass legislation in New York State. If legislation is passed with a supermajority, a two-thirds vote, the governor cannot override the legislation with a veto.</p>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 49efe91

Please sign in to comment.