Merge pull request #3671 from Vizzuality/feature/module-maps

Feature/module maps

Author: edbrett

app/javascript/app/layouts/root/component.jsx

@@ -9,7 +9,7 @@ import cx from 'classnames';
 import Meta from 'components/meta';
 import Header from 'components/header';
 import Button from 'components/ui/button';
-import MapMenu from 'pages/map/components/menu';
+import MapMenu from 'components/maps/components/menu';
 import MyGFWProvider from 'providers/mygfw-provider';
 import gfwLogo from 'assets/logos/gfw.png';
 
@@ -33,7 +33,7 @@ class App extends PureComponent {
     const { component, embed } = route;
     const isMapPage = component === 'map';
     return (
-      <MediaQuery minDeviceWidth={SCREEN_M}>
+      <MediaQuery minWidth={SCREEN_M}>
         {isDesktop => (
           <div
             className={cx('l-root', { '-map': isMapPage }, { '-embed': embed })}
@@ -60,12 +60,7 @@ class App extends PureComponent {
               />
             )}
             <div className="page">
-              <PageComponent
-                embed={embed}
-                path={route.component}
-                sections={route.sections}
-                isDesktop={isDesktop}
-              />
+              <PageComponent path={route.component} sections={route.sections} />
             </div>
             {!embed && <MyGFWProvider />}
             {embed &&

app/javascript/app/reducers.js

@@ -8,19 +8,23 @@ import router from './router';
 
 // COMPONENTS
 
-// Map & Dashboards
-import { reduxModule as RecentImagery } from 'components/map-v2/components/recent-imagery';
-import { reduxModule as Analysis } from 'components/map-v2/components/analysis';
+// Dashboards
 import { reduxModule as Widgets } from 'components/widgets';
-import { reduxModule as Popup } from 'components/map-v2/components/popup';
-import { reduxModule as Draw } from 'components/map-v2/components/draw';
 import { reduxModule as Header } from 'pages/dashboards/header';
-import { reduxModule as MapNew } from 'components/map-v2';
-import { reduxModule as MapTour } from 'components/map-v2/components/map-tour';
+
+// Maps
 import { reduxModule as MapOld } from 'components/map';
-import { reduxModule as MapMenu } from 'pages/map/components/menu';
+import { reduxModule as MapNew } from 'components/maps/map';
+
+// Map components
+import { reduxModule as Analysis } from 'components/maps/components/analysis';
+import { reduxModule as RecentImagery } from 'components/maps/main-map/components/recent-imagery';
+import { reduxModule as Draw } from 'components/maps/map/components/draw';
+import { reduxModule as Popup } from 'components/maps/map/components/popup';
+import { reduxModule as MapTour } from 'components/maps/main-map/components/map-tour';
 
 // Projects (About and SGF)
+import { reduxModule as MapMenu } from 'components/maps/components/menu';
 import { reduxModule as Impacts } from 'pages/about/section-impacts';
 import { reduxModule as AboutProjects } from 'pages/about/section-projects';
 import { reduxModule as SGFProjects } from 'pages/sgf/section-projects';
@@ -58,8 +62,8 @@ const componentsReducers = {
   draw: handleModule(Draw),
   header: handleModule(Header),
   share: handleModule(Share),
-  map: handleModule(MapNew),
   mapOld: handleModule(MapOld),
+  map: handleModule(MapNew),
   mapMenu: handleModule(MapMenu),
   mapTour: handleModule(MapTour),
   // modals