From 722e45ce9decb7fa88672628e68ac2b20670d6ca Mon Sep 17 00:00:00 2001 From: Nat Hillard Date: Thu, 17 Jun 2021 23:32:58 -0400 Subject: [PATCH] remove controls, add padding, change check --- client/src/components/layout.tsx | 2 +- client/src/components/map.module.scss | 1 + client/src/pages/cejst.tsx | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/components/layout.tsx b/client/src/components/layout.tsx index ed9c991b..b315e8b8 100644 --- a/client/src/components/layout.tsx +++ b/client/src/components/layout.tsx @@ -11,7 +11,7 @@ interface ILayoutProps { } const Layout = ({children, location}: ILayoutProps) => { - const isWidthFullPage = location.pathname.endsWith('/cejst'); + const isWidthFullPage = location.pathname.match(/cejst\/?/); const conditionalAside = isWidthFullPage ? <> : ; const gridCssClass = isWidthFullPage ? ' desktop:grid-col-12' : 'desktop:grid-col-9'; diff --git a/client/src/components/map.module.scss b/client/src/components/map.module.scss index afd75306..d81b910c 100644 --- a/client/src/components/map.module.scss +++ b/client/src/components/map.module.scss @@ -2,4 +2,5 @@ height: 676px; margin-bottom: 29px; max-width: revert; + margin-top: 50px; } diff --git a/client/src/pages/cejst.tsx b/client/src/pages/cejst.tsx index 1d77b2db..cad5d461 100644 --- a/client/src/pages/cejst.tsx +++ b/client/src/pages/cejst.tsx @@ -1,7 +1,7 @@ import React, {useState} from 'react'; import Layout from '../components/layout'; import MapWrapper from '../components/map'; -import MapControls from '../components/mapControls'; +// import MapControls from '../components/mapControls'; import HowYouCanHelp from '../components/HowYouCanHelp'; import Feature from 'ol/Feature'; import Geometry from 'ol/geom/Geometry'; @@ -13,7 +13,7 @@ interface IMapPageProps { } const CEJSTPage = ({location}: IMapPageProps) => { - const [features, setFeatures] = useState[]>([]); + const [features] = useState[]>([]); return ( @@ -48,7 +48,7 @@ const CEJSTPage = ({location}: IMapPageProps) => { are investigating on our data roadmap.

- + {/* */}