diff --git a/CHANGELOG.md b/CHANGELOG.md index 05d72dad..132ce9ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ 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). +## [0.12.0] - 2023-11-17 + +### Added + +- Add the issue release/white paper page [#210](https://github.com/policy-design-lab/pdl-frontend/issues/210) +- Add iFrame component to the release/white paper page [#214](https://github.com/policy-design-lab/pdl-frontend/issues/214) + ## [0.11.0] - 2023-11-08 ### Added diff --git a/package-lock.json b/package-lock.json index 791a712b..8a5b9383 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "policy-design-lab", - "version": "0.11.0", + "version": "0.12.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 6924fbdb..96e73da8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "policy-design-lab", - "version": "0.11.0", + "version": "0.12.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/NavBar.tsx b/src/components/NavBar.tsx index edf3b1bb..71627bb0 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -16,7 +16,11 @@ import { Link } from "react-router-dom"; import PDLLogo from "./PDLLogo"; const drawerWidth = 240; -const navItems = ["HOME", "EXPLORE FARM BILL DATA", "ABOUT PDL"]; +const navItems = [ + { title: "HOME", link: "/" }, + { title: "ISSUES & WHITE PAPERS", link: "/issue_whitepaper" }, + { title: "ABOUT PDL" } +]; export default function NavBar({ bkColor = "rgba(255, 255, 255, 1)", ftColor = "rgba(255, 255, 255, 1)", @@ -47,9 +51,15 @@ export default function NavBar({ {navItems.map((item) => ( - + - + {item.link ? ( + // + + ) : ( + // + + )} ))} @@ -92,16 +102,21 @@ export default function NavBar({ {navItems.map((item) => { - if (item === "HOME") { + if (item.link) { return ( - ); } return ( - ); })} diff --git a/src/components/issueWhitePaper/cardIframe.tsx b/src/components/issueWhitePaper/cardIframe.tsx new file mode 100644 index 00000000..d474d22e --- /dev/null +++ b/src/components/issueWhitePaper/cardIframe.tsx @@ -0,0 +1,102 @@ +import { Button, Grid, Typography } from "@mui/material"; +import { makeStyles } from "@mui/styles"; +import * as React from "react"; +import DownloadIcon from "@mui/icons-material/Download"; + +export default function CardIFrame({ + title, + author, + date, + link, + iframeTitle, + iframeLink, + iframeWidth, + iframeHeight +}): JSX.Element { + const useStyles = makeStyles(() => ({ + downloadButton: { + "&:hover": { + backgroundColor: "transparent" + } + } + })); + const classes = useStyles(); + + return ( + + + + + + + {title} + + + + + + + + + + + + + Author: {author} + + + + + Date: {date} + + + + + + As Congress considers reauthorizing the Farm Bill, vital resources that are available to farmers + and ranchers today are at risk — specifically the $18 billion investment from the Inflation + Reduction Act (IRA) for the U.S. Department of Agriculture’s (USDA) popular conservation + programs. This issue brief provides a first look at what farmers stand to lose in each state if + these investments are eliminated by Congress. + + + +