+ );
}
})}
diff --git a/src/components/pages/DataVisualizations/GraphsContainer.jsx b/src/components/pages/DataVisualizations/GraphsContainer.jsx
index 9dc39a163..4715a8979 100644
--- a/src/components/pages/DataVisualizations/GraphsContainer.jsx
+++ b/src/components/pages/DataVisualizations/GraphsContainer.jsx
@@ -26,17 +26,17 @@ function GraphsContainer() {
'New Orleans, LA',
];
function handle_office_select(value) {
- // if (view === 'office-heat-map') {
- // set_view('time-series');
- // }
- // if (value === 'All') {
- // history.push(
- // `/graphs/all/${view === 'office-heat-map' ? 'time-series' : view}`
- // );
- // }
- // history.push(
- // `/graphs/${value}/${view === 'office-heat-map' ? 'time-series' : view}`
- // );
+ if (view === 'office-heat-map') {
+ set_view('time-series');
+ }
+ if (value === 'All') {
+ history.push(
+ `/graphs/all/${view === 'office-heat-map' ? 'time-series' : view}`
+ );
+ }
+ history.push(
+ `/graphs/${value}/${view === 'office-heat-map' ? 'time-series' : view}`
+ );
switch (value) {
case 'All Offices':
@@ -152,7 +152,7 @@ function GraphsContainer() {
>
{offices.map((office, idx) =>
office === 'All' ? (
-
) : (
diff --git a/src/components/pages/Landing/RenderLandingPage.jsx b/src/components/pages/Landing/RenderLandingPage.jsx
index 6be6b69a4..11929150c 100644
--- a/src/components/pages/Landing/RenderLandingPage.jsx
+++ b/src/components/pages/Landing/RenderLandingPage.jsx
@@ -1,25 +1,31 @@
import React from 'react';
// ADD IMPORTS BACK FOR GRAPHS SECTION
-// import GrantRatesByOfficeImg from '../../../styles/Images/bar-graph-no-text.png';
-// import GrantRatesByNationalityImg from '../../../styles/Images/pie-chart-no-text.png';
-// import GrantRatesOverTimeImg from '../../../styles/Images/line-graph-no-text.png';
+
+// SR - imported styling images
+import GrantRatesByOfficeImg from '../../../styles/Images/bar-graph-no-text.png';
+import GrantRatesByNationalityImg from '../../../styles/Images/pie-chart-no-text.png';
+import GrantRatesOverTimeImg from '../../../styles/Images/line-graph-no-text.png';
import HrfPhoto from '../../../styles/Images/paper-stack.jpg';
import '../../../styles/RenderLandingPage.less';
import { Button } from 'antd';
import { useHistory } from 'react-router-dom';
+
// for the purposes of testing PageNav
-// import PageNav from '../../common/PageNav';
+//import PageNav from '../../common/PageNav';
function RenderLandingPage(props) {
+ // declare function for scroll back to top
const scrollToTop = () => {
document.body.scrollTop = 0;
document.documentElement.scrollTop = 0;
};
+ // declare history function for navigation
const history = useHistory();
return (
+ {/* Header Section */}
Asylum Office Grant Rate Tracker
@@ -31,18 +37,64 @@ function RenderLandingPage(props) {
- {/* Graphs Section: Add code here for the graphs section for your first ticket */}
- {/*
*/}
+ {/* Graphs Section (SR 3/3)*/}
+
+
+
+
Search Grant Rates By Office
+
+
+
+
Search Grant Rates By Nationality
+
+
+
+
Search Grant Rates Over Time
+
+
+
+ {/* Button container and buttons */}
+
+ {/* Download Data Button (SR 3/3) */}
+
+ {/* Middle Section (SR 3/3)*/}
@@ -55,13 +107,53 @@ function RenderLandingPage(props) {
through a Freedom of Information Act request. You can search for
information on asylum grant rates by year, nationality, and asylum
office, visualize the data with charts and heat maps, and download
- the data set
+ the data set.
- {/* Bottom Section: Add code here for the graphs section for your first ticket */}
- {/*
*/}
+ {/* Bottom Section (SR 3/3) */}
+
+
Systemic Disparity Insights
+
+
+
36%
+
+ By the end of the Trump administration, the average asylum
+ office grant rate had fallen 36 percent from an average of 44
+ percent in fiscal year 2016 to 28 percent in fiscal year 2020.
+
+
+
+
5%
+
+ The New York asylum office grant rate dropped to 5 percent in
+ fiscal year 2020.
+
+
+
+
6x Lower
+
+ Between fiscal year 2017 and 2020, the New York asylum office’s
+ average grant rate was six times lower than the San Francisco
+ asylum office.
+
+
+
+
+ {/* Read More button takes user to article on humanrightsfirst.org (SR 3/3) */}
+
+
scrollToTop()} className="back-to-top">
Back To Top ^
diff --git a/src/components/pages/profile-page.js b/src/components/pages/profile-page.js
new file mode 100644
index 000000000..a6370ed71
--- /dev/null
+++ b/src/components/pages/profile-page.js
@@ -0,0 +1,33 @@
+import { useAuth0 } from '@auth0/auth0-react';
+import React from 'react';
+// import { NavBar } from "../components/navigation/desktop/nav-bar";
+// import { MobileNavBar } from "../components/navigation/mobile/mobile-nav-bar";
+
+export const ProfilePage = () => {
+ const { user } = useAuth0();
+
+ if (!user) {
+ return null;
+ }
+
+ return (
+
+
+ Profile Page
+
+
+
+
+
+
+
+ Username: {user.name}
+
+
+ Email: {user.email}
+
+
+
+
+ );
+};
diff --git a/src/components/protected-route.js b/src/components/protected-route.js
new file mode 100644
index 000000000..4a14de930
--- /dev/null
+++ b/src/components/protected-route.js
@@ -0,0 +1,17 @@
+import { withAuthenticationRequired } from '@auth0/auth0-react';
+import React from 'react';
+import { Route } from 'react-router-dom';
+import LoadingComponent from './common/LoadingComponent';
+
+export const ProtectedRoute = ({ component, ...args }) => (
+ (
+
+
+
+ ),
+ })}
+ {...args}
+ />
+);
diff --git a/src/index.jsx b/src/index.jsx
index 73962baa5..80e594339 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -10,7 +10,7 @@ import {
import 'antd/dist/antd.less';
import { NotFoundPage } from './components/pages/NotFound';
import { LandingPage } from './components/pages/Landing';
-
+import { ProtectedRoute } from './components/protected-route';
import { FooterContent, SubFooter } from './components/Layout/Footer';
import { HeaderContent } from './components/Layout/Header';
@@ -22,6 +22,9 @@ import { Provider } from 'react-redux';
import { configureStore } from '@reduxjs/toolkit';
import reducer from './state/reducers';
import { colors } from './styles/data_vis_colors';
+import { CallbackPage } from './callback-page';
+import { ProfilePage } from './components/pages/profile-page';
+import { Auth0ProviderWithHistory } from './auth0-provider-with-history';
const { primary_accent_color } = colors;
@@ -29,9 +32,11 @@ const store = configureStore({ reducer: reducer });
ReactDOM.render(
-
-
-
+
+
+
+
+ ,
document.getElementById('root')
@@ -54,6 +59,8 @@ export function App() {
+
+
@@ -55,13 +107,53 @@ function RenderLandingPage(props) {
through a Freedom of Information Act request. You can search for
information on asylum grant rates by year, nationality, and asylum
office, visualize the data with charts and heat maps, and download
- the data set
+ the data set.
+ 
+ 
+ 
+