Feature/search

src/containers/Layout/index.jsx

@@ -5,7 +5,7 @@ import { Box, CircularProgress, makeStyles } from '@material-ui/core';
 
 import Footer from './Footer';
 import Header, { HEADERS_HEIGHT } from './Header';
-import SmallHeader from './SmallHeader';
+
 
 const useStyles = makeStyles({
     scrim: {
@@ -26,24 +26,10 @@ type Props = {
     extraMainClasses: string;
     children: React.Node;
     hasFooter: boolean;
-    stickyFooter: boolean;
 }
 
-const Layout = ({ isLoading, children, extraMainClasses, hasFooter, stickyFooter }: Props) => {
+const Layout = ({ isLoading, children, extraMainClasses, hasFooter }: Props) => {
     const classes = useStyles();
-
-    // Handle screen resizing
-    const [windowWidth, setWindowWidth] = React.useState(window.innerWidth);
-    const widthBreakpoint = 1340;
-    React.useEffect(() => {
-        const handleResizeWindow = () => setWindowWidth(window.innerWidth);
-        window.addEventListener('resize',handleResizeWindow);
-        return () => {
-            window.removeEventListener('resize',handleResizeWindow);
-        };
-    },[]);
-
-
     return (
         <>
             {isLoading ?
@@ -56,13 +42,10 @@ const Layout = ({ isLoading, children, extraMainClasses, hasFooter, stickyFooter
                     <CircularProgress />
                 </Box> :
                 null}
-            {(windowWidth > widthBreakpoint) ?
-                <Header /> :
-                <SmallHeader />
-            }
+            <Header />
             <main className={`${classes.main} ${extraMainClasses}`}>
                 {children}
-                {hasFooter ? <Footer sticky={stickyFooter} /> : null}
+                {hasFooter ? <Footer /> : null}
             </main>
         </>
     );
@@ -71,12 +54,11 @@ const Layout = ({ isLoading, children, extraMainClasses, hasFooter, stickyFooter
 Layout.defaultProps = {
     extraMainClasses: '',
     children: null,
-    hasFooter: false,
-    stickyFooter: false
+    hasFooter: false
 };
 
 const mapStateToProps = (state) => ({
     isLoading: state.page.isLoading
 });
 
-export default connect(mapStateToProps)(Layout);
+export default connect(mapStateToProps)(Layout);

src/index.jsx

@@ -6,7 +6,7 @@ const __old_config = require('@geostreams/gltg__old/config');
 window.configruntime = __old_config;
 
 // $FlowFixMe
-import { addEndpoints, fetchSensors as __old_fetchSensors } from '@geostreams/core__old/app/actions';
+// import { addEndpoints, fetchSensors as __old_fetchSensors } from '@geostreams/core__old/app/actions';
 
 import render from '@geostreams/core/src/render';
 import { updateGeoStreamingConfig } from '@geostreams/geostreaming/src/actions/config';
@@ -23,8 +23,8 @@ render(
     routes,
     (store) => {
         store.dispatch(updateGeoStreamingConfig(config));
-        store.dispatch(addEndpoints());
-        store.dispatch(__old_fetchSensors(config.geostreamingEndpoint));
+//         store.dispatch(addEndpoints());
+//         store.dispatch(__old_fetchSensors(config.geostreamingEndpoint));geostreamingEndpoint
         store.dispatch(fetchParameters());
         store.dispatch(fetchSensors());
     }

src/reducers/index.js

@@ -2,9 +2,9 @@
 import geostreamingReducers from '@geostreams/geostreaming/src/reducers';
 
 // $FlowFixMe
-import __old_reducers from '@geostreams/gltg__old/app/reducers';
+//import __old_reducers from '@geostreams/gltg__old/app/reducers';
 
 export default {
-    ...__old_reducers,
+//    ...__old_reducers,
     ...geostreamingReducers
 };

src/routes.js

@@ -6,7 +6,7 @@ import GeoStreamingSearch from '@geostreams/geostreaming/src/containers/Search';
 import GeoStreamingSensorDetail from '@geostreams/geostreaming/src/containers/Sensor/Detail';
 
 // $FlowFixMe
-import __old_Search from '@geostreams/gltg__old/app/pages/Search';
+// import __old_Search from '@geostreams/gltg__old/app/pages/Search';
 // $FlowFixMe
 import __old_Analysis from '@geostreams/gltg__old/app/pages/Analysis';
 
@@ -32,7 +32,7 @@ const routes = Object.assign(
         '/:parent(explore|search|analysis)/detail/location/:name/:category': { component: hocs.withLayout(GLTGLayout, GeoStreamingSensorDetail) },
         // Routes pointing to the __old code
         '/explore/:stations': { component: hocs.withLayout(GLTGLayout, GeoStreamingExplore), exact: true },
-        '/search': { component: hocs.withLayout(GLTGLayout, __old_Search), exact: true },
+        '/search': { component: hocs.withLayout(GLTGLayout, GeoStreamingSearch), exact: true },
         '/analysis': { component: hocs.withLayout(GLTGLayout, __old_Analysis), exact: true },
         '/bmp': { component: hocs.withLayout(GLTGLayout, BMP), exact: true }
     }

webpack.common.js

@@ -16,7 +16,7 @@ module.exports = {
         olStyle: 'ol/ol.css',
         olLayerSwitcherStyle: 'ol-layerswitcher/src/ol-layerswitcher.css',
         mcw__old: 'material-components-web/dist/material-components-web.min.css',
-        mdc__old: '@geostreams/gltg__old/app/styles_custom/react-mdc-web.css',
+//        mdc__old: '@geostreams/gltg__old/app/styles_custom/react-mdc-web.css',
         coreStyle: '@geostreams/core/src/styles/core.less',
         gltgStyle: './src/styles/gltg.less'
     },