- {authenticated && (
+
+ {authenticated && (
<>
@@ -95,8 +80,7 @@ const SiteNav = ({
>
- )}
-
+ )}
);
};
@@ -107,7 +91,6 @@ SiteNav.propTypes = {
authenticated: PropTypes.bool,
logout: PropTypes.func,
user: PropTypes.shape({ name: PropTypes.string, email: PropTypes.string }),
- location: PropTypes.shape({ pathname: PropTypes.string }).isRequired,
};
SiteNav.defaultProps = {
@@ -120,4 +103,4 @@ SiteNav.defaultProps = {
},
};
-export default withRouter(SiteNav);
+export default SiteNav;
diff --git a/frontend/src/pages/Landing/index.css b/frontend/src/pages/Landing/index.css
index 1ddaf12d03..3f9d4816e5 100644
--- a/frontend/src/pages/Landing/index.css
+++ b/frontend/src/pages/Landing/index.css
@@ -2,10 +2,6 @@
font-family: 'Merriweather', serif;
}
-.fba-modal .fba-modal-dialog {
- margin-top: 120px;
-}
-
.pagination {
float: right;
white-space: nowrap;
diff --git a/src/app.js b/src/app.js
index ee19474a49..58c1f943aa 100644
--- a/src/app.js
+++ b/src/app.js
@@ -26,11 +26,8 @@ app.use(express.urlencoded({ extended: true }));
app.use(helmet({
contentSecurityPolicy: {
directives: {
- ...omit(helmet.contentSecurityPolicy.getDefaultDirectives(), 'upgrade-insecure-requests', 'block-all-mixed-content', 'script-src', 'img-src', 'default-src'),
+ ...omit(helmet.contentSecurityPolicy.getDefaultDirectives(), 'upgrade-insecure-requests', 'block-all-mixed-content'),
'form-action': ["'self'"],
- scriptSrc: ["'self'", 'https://touchpoints.app.cloud.gov/touchpoints/7d519b5e.js'],
- imgSrc: ["'self'", 'data:', 'https://touchpoints.app.cloud.gov'],
- defaultSrc: ["'self'", 'https://touchpoints.app.cloud.gov/touchpoints/7d519b5e/submissions.json'],
},
},
}));