Merge pull request #331 from policy-design-lab/release-1.2.0

Release 1.2.0
policy-design-lab · Oct 24, 2024 · dc9152c · dc9152c
2 parents 401c6c9 + b3839fa
commit dc9152c
Show file tree

Hide file tree

Showing 12 changed files with 523 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2024-10-24
+
+### Added
+- Add selector to the landing page total map for users to select the program they want to see and get the total amount of the selected programs in the map [#317](https://github.com/policy-design-lab/pdl-frontend/issues/317) 
+
 ## [1.1.0] - 2024-10-04
 
 ### Changed
@@ -294,6 +299,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Map data json [#12](https://github.com/policy-design-lab/pdl-frontend/issues/12)
 - Final landing page changes for initial milestone [#15](https://github.com/policy-design-lab/pdl-frontend/issues/15)
 
+[1.2.0]: https://github.com/policy-design-lab/pdl-frontend/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/policy-design-lab/pdl-frontend/compare/1.0.5...1.1.0
 [1.0.5]: https://github.com/policy-design-lab/pdl-frontend/compare/1.0.4...1.0.5
 [1.0.4]: https://github.com/policy-design-lab/pdl-frontend/compare/1.0.3...1.0.4

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "policy-design-lab",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "the front end of policy design lab",
   "repository": "https://github.com/policy-design-lab/pdl-frontend",
   "main": "src/app.tsx",

diff --git a/src/components/LandingPageMapTab.tsx b/src/components/LandingPageMapTab.tsx
@@ -4,7 +4,8 @@ import Tab from "@mui/material/Tab";
 import Box from "@mui/material/Box";
 import { createTheme, styled, Typography, ThemeProvider } from "@mui/material";
 import Divider from "@mui/material/Divider";
-import LandingPageMap from "./LandingPageMap";
+import LandingPageTotalMap from "./LandingPageTotalMap";
+import LandingPageProgramMap from "./LandingPageProgramMap";
 import LandingDisplay from "./LandingDisplay";
 
 const theme = createTheme({
@@ -43,13 +44,24 @@ function TabPanel({
                                 mx: "auto"
                             }}
                         >
-                            <LandingPageMap
-                                programTitle={title}
-                                allStates={allStates}
-                                stateCodes={stateCodes}
-                                allPrograms={allPrograms}
-                                summary={summary}
-                            />
+                            {title.includes("All Programs") && (
+                                <LandingPageTotalMap
+                                    programTitle={title}
+                                    allStates={allStates}
+                                    stateCodes={stateCodes}
+                                    allPrograms={allPrograms}
+                                    summary={summary}
+                                />
+                            )}
+                            {!title.includes("All Programs") && (
+                                <LandingPageProgramMap
+                                    programTitle={title}
+                                    allStates={allStates}
+                                    stateCodes={stateCodes}
+                                    allPrograms={allPrograms}
+                                    summary={summary}
+                                />
+                            )}
                         </Box>
                     )}
                 </Box>
@@ -62,13 +74,24 @@ function TabPanel({
                                 mx: "auto"
                             }}
                         >
-                            <LandingPageMap
-                                programTitle={title}
-                                allStates={allStates}
-                                stateCodes={stateCodes}
-                                allPrograms={allPrograms}
-                                summary={summary}
-                            />
+                            {title.includes("All Programs") && (
+                                <LandingPageTotalMap
+                                    programTitle={title}
+                                    allStates={allStates}
+                                    stateCodes={stateCodes}
+                                    allPrograms={allPrograms}
+                                    summary={summary}
+                                />
+                            )}
+                            {!title.includes("All Programs") && (
+                                <LandingPageProgramMap
+                                    programTitle={title}
+                                    allStates={allStates}
+                                    stateCodes={stateCodes}
+                                    allPrograms={allPrograms}
+                                    summary={summary}
+                                />
+                            )}
                         </Box>
                     )}
                 </Box>

diff --git a/src/components/LandingPageMap.tsx → src/components/LandingPageProgramMap.tsx b/src/components/LandingPageMap.tsx → src/components/LandingPageProgramMap.tsx
@@ -411,7 +411,7 @@ MapChart.propTypes = {
     title: PropTypes.string
 };
 
-const LandingPageMap = ({
+const LandingPageProgramMap = ({
     programTitle,
     allStates,
     stateCodes,
@@ -443,4 +443,4 @@ const LandingPageMap = ({
     );
 };
 
-export default LandingPageMap;
+export default LandingPageProgramMap;