diff --git a/src/components/Layout.js b/src/components/Layout.js index 695814497..60b01642c 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -3,9 +3,8 @@ import { makeStyles } from 'models/makeStyles'; import dynamic from 'next/dynamic'; import React from 'react'; -import Navbar from './Navbar'; - const App = dynamic(() => import('./App'), { ssr: false }); +const Navbar = dynamic(() => import('./Navbar'), { ssr: false }); const useStyles = makeStyles()((theme) => ({ root: { diff --git a/src/components/LayoutMobile.js b/src/components/LayoutMobile.js index d7d0233f6..d9c3940ea 100644 --- a/src/components/LayoutMobile.js +++ b/src/components/LayoutMobile.js @@ -1,13 +1,13 @@ import Box from '@mui/material/Box'; +import log from 'loglevel'; import { makeStyles } from 'models/makeStyles'; import dynamic from 'next/dynamic'; import React from 'react'; -import Navbar from './Navbar'; -import log from 'loglevel'; import Drawer from './Drawer'; const App = dynamic(() => import('./App'), { ssr: false }); +const Navbar = dynamic(() => import('./Navbar'), { ssr: false }); const useStyles = makeStyles()((theme) => ({ root: { diff --git a/src/components/LayoutMobileB.js b/src/components/LayoutMobileB.js index 2918a0a62..9329a1eba 100644 --- a/src/components/LayoutMobileB.js +++ b/src/components/LayoutMobileB.js @@ -1,13 +1,12 @@ import Box from '@mui/material/Box'; +import log from 'loglevel'; import { makeStyles } from 'models/makeStyles'; import dynamic from 'next/dynamic'; import React from 'react'; -import Navbar from './Navbar'; -import log from 'loglevel'; import Drawer from './Drawer'; -const App = dynamic(() => import('./App'), { ssr: false }); +const Navbar = dynamic(() => import('./Navbar'), { ssr: false }); const useStyles = makeStyles()((theme) => ({ root: { diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 9a9504642..98db8a1d3 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -110,7 +110,7 @@ function Navbar() { - diff --git a/src/components/common/DataTag.js b/src/components/common/DataTag.js index 04ea015bf..4910e58ec 100644 --- a/src/components/common/DataTag.js +++ b/src/components/common/DataTag.js @@ -20,7 +20,7 @@ function DataTag({ data, location }) { )} - {location || `Planter since`} {data} + {!location && `Planter since`} {data} ); diff --git a/src/pages/planters/[planterid].js b/src/pages/planters/[planterid].js index 5f7fa1d5c..cc71483df 100644 --- a/src/pages/planters/[planterid].js +++ b/src/pages/planters/[planterid].js @@ -71,7 +71,7 @@ export default function Planter({ planter }) { map.setFilters({ userid: planter.id, }); - await map.loadInitialView(); + await map?.loadInitialView(); map.rerender(); } else { log.warn('no data:', map, planter); @@ -86,7 +86,7 @@ export default function Planter({ planter }) { return ( - + {planter.first_name} {planter.last_name} @@ -183,22 +183,22 @@ export default function Planter({ planter }) { About - + {planter.about} Mission - + {planter.mission}