Skip to content

Commit

Permalink
change the about content
Browse files Browse the repository at this point in the history
  • Loading branch information
@CloudLun
CloudLun committed Dec 13, 2023
1 parent 2485d3a commit e8bdde9
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 36 deletions.
2 changes: 1 addition & 1 deletion app/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Source_Sans_3 } from 'next/font/google'
const sourceSans = Source_Sans_3({ subsets: ['latin'] })

export const metadata: Metadata = {
title: 'RTC Map Tool',
title: 'Housing Courts Must Change! Map',
icons: "/app/BetaNYC-favicon.svg",
}

Expand Down
8 changes: 4 additions & 4 deletions components/Geopanel/Geopanel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,20 @@ const Geopanel = () => {
<div className='text-[10px] text-regular text-grey_1'>HCMC Campaign Support</div>
<div className="flex flex-col gap-[5px] mt-[6px] text-rtc_navy">
<div className="flex items-start gap-[8px] ">
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Statewide RTC") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Statewide Right to Counsel") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div className="font-bold text-label">Statewide Right to Counsel</div>
</div>
<div className="flex items-start gap-[5px]">
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Winter Eviction Moratorium") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div className="font-bold text-label">Winter Eviction Moratorium</div>
</div>
<div className="flex items-start gap-[5px]">
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Defend RTC") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Defend Right to Counsel") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div className="font-bold text-label">Defend Right to Counsel</div>
</div>
<div className="flex items-start gap-[5px]">
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Fund Local Law 53") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div className="font-bold text-label">Power to Organize:<br /> Fund Local Law 53</div>
<img src={selectedDistrictFeatures?.properties!["HCMC support"].includes("Clean Hands") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div className="font-bold text-label">Clean Hands</div>
</div>
</div>
<div className='my-[12px] w-full h-[1px] bg-grey_1'></div>
Expand Down
50 changes: 24 additions & 26 deletions components/Map/Map.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,25 @@ const Map = () => {
})
patternDemoImg.src = pattern_blue.src


m.addLayer({
id: "pattern",
type: "fill",
source: 'districts',
paint: {
"fill-pattern": [
"case",
["all", ["==", ["get", "Party_x"], "Democratic"]],
"pattern_demo", "pattern_rep"
],
'fill-opacity': [
"case",
["all", ["!", ["in", legislations, ["get", "HCMC support"]]]],
1, 0
]
}
})

m.addLayer({
id: "background",
type: "fill",
Expand Down Expand Up @@ -177,23 +196,7 @@ const Map = () => {
},
});

m.addLayer({
id: "pattern",
type: "fill",
source: 'districts',
paint: {
"fill-pattern": [
"case",
["all", ["==", ["get", "Party_x"], "Democratic"]],
"pattern_demo", "pattern_rep"
],
'fill-opacity': [
"case",
["all", ["!", ["in", legislations, ["get", "HCMC support"]]]],
1, 0
]
}
})


m.addLayer({
'id': 'districts_outline',
Expand All @@ -213,11 +216,6 @@ const Map = () => {








m.addLayer({
'id': 'members',
'type': 'circle',
Expand Down Expand Up @@ -309,7 +307,7 @@ const Map = () => {
'layout': {},
'paint': {
'fill-color': "black",
'fill-opacity': 1
'fill-opacity': .7
},
});

Expand Down Expand Up @@ -459,19 +457,19 @@ const Map = () => {
<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 RTC") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<img src=${properties["Legislation"].includes("Statewide Right to Counsel") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div class="font-bold text-rtc_navy text-[12px]">Statewide Right to Counsel</div>
</div>
<div class="flex items-start gap-[5px]">
<img src=${properties["Legislation"].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="flex items-start gap-[5px]">
<img src=${properties["Legislation"].includes("Defend RTC") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<img src=${properties["Legislation"].includes("Defend Right to Counsel") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div class="font-bold text-rtc_navy text-[12px]">Defend Right to Counsel</div>
</div>
<div class="flex items-start gap-[5px]">
<img src=${properties["Legislation"].includes("Fund Local Law 53") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<img src=${properties["Legislation"].includes("Clean Hands") ? "/icons/checked.svg" : "/icons/empty.svg"} alt="" className="w-[16px] h-[16px]" />
<div class="font-bold text-rtc_navy text-[12px]">Power to Organize:<br /> Fund Local Law 53</div>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions components/SidePanel/About.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const About = ({ expand, legislationsClickHandler }: Props) => {
}
</div>
<div className="flex justify-between items-start my-[16px] px-[20px]">
<h2 className={`pb-[3px] mr-12 font-semibold text-[13px] lg:text-title border-b-2 leading-[1.2] ${selectedContent === "intro" ? "text-rtc_navy border-rtc_navy" : "text-grey_1 border-white "} cursor-pointer`} onClick={() => contentClickHandler("intro")}>the HCMC! Campaign Legislation Map</h2>
<h2 className={`pb-[3px] mr-12 font-semibold text-[13px] lg:text-title border-b-2 leading-[1.2] ${selectedContent === "intro" ? "text-rtc_navy border-rtc_navy" : "text-grey_1 border-white "} cursor-pointer`} onClick={() => contentClickHandler("intro")}>HCMC! Campaign Legislation Map</h2>
<h2 className={`font-semibold text-[13px] lg:text-title border-b-2 ${selectedContent === "credits" ? "text-rtc_navy border-rtc_navy" : "text-grey_1 border-white "} cursor-pointer`} onClick={() => contentClickHandler("credits")}>Credits</h2>
</div>
{
Expand All @@ -57,7 +57,7 @@ const About = ({ expand, legislationsClickHandler }: Props) => {
</p>
</div>
<div className="mx-[20px] mt-[20px] mb-[60px] font-semibold text-title text-rtc_purple">
Click on each tab below to start using the map.
Click on the map to begin exploring!
</div>
</div>
)
Expand All @@ -74,11 +74,11 @@ const About = ({ expand, legislationsClickHandler }: Props) => {
</div>
<div className="m-[20px]">
<p className='font-semibold text-title'><a className='underline' target='_blank' href="https://beta.nyc/">BetaNYC</a></p>
<p>BetaNYC is a civic organization dedicated to improving lives in New York through civic design, technology, and data. With an aim to improve access to public interest technology, the Civic Innovation Lab at BetaNYC provides assistance with research, data analysis, and data visualization. The Civic Innovation Lab at BetaNYC created this project in response to a Research and Data Assistance Request (RADAR) submitted by the Right to Counsel NYC Coalition.
<a className='underline' target='_blank' href={"https://beta.nyc/products/research-and-data-assistance-requests/"}> Follow this link to learn more about RADARs and how to submit a request!</a></p>
<p>BetaNYC is a civic organization dedicated to improving lives in New York through civic design, technology, and data. With an aim to improve access to public interest technology, the Civic Innovation Lab at BetaNYC provides assistance with research, data analysis, and data visualization. The Civic Innovation Lab at BetaNYC created this project in response to a Research and Data Assistance Request (RADAR) submitted by the Right to Counsel NYC Coalition.Follow this link
<a className='underline' target='_blank' href={"https://beta.nyc/products/research-and-data-assistance-requests/"}>to learn more about RADARs and how to submit a request!</a></p>
</div>
<div className="m-[20px] mb-[40px] ">
<p className='font-semibold text-body'>Civic Innovation Lab at BetaNYC:</p>
<p className='font-semibold text-body'>BetaNYC Civic Innovation Lab Team</p>
<p>Ashley Louie (Director), Hao Lun Hung (Project Lead), Erik Brown, Hailee Luong</p>

</div>
Expand Down

0 comments on commit e8bdde9

Please sign in to comment.