[#1584] Update conditional layout by adding array of string: newLayou…

…tRoutes
akvo · Sep 4, 2023 · c8088db · c8088db
1 parent 5dddc97
commit c8088db
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/frontend/src/pages/_app.jsx b/frontend/src/pages/_app.jsx
@@ -66,7 +66,8 @@ UIStore.update((s) => {
 
 function MyApp({ Component, pageProps }) {
  const router = useRouter()
- if (router.pathname !== '/landing') {
+ const newLayoutRoutes = ['/landing', '/onboarding']
+ if (!newLayoutRoutes.includes(router.pathname)) {
  import('../main.scss')
  import('../buttons.scss')
  } else {
@@ -225,7 +226,7 @@ function MyApp({ Component, pageProps }) {
  typeof window !== 'undefined' ? window.location.origin : ''
  }
  >
- {router.pathname !== '/landing' && (
+ {!newLayoutRoutes.includes(router.pathname) && (
  <Layout
  {...pageProps}
  {...{
@@ -235,7 +236,7 @@ function MyApp({ Component, pageProps }) {
  }}
  />
  )}
- {router.pathname === '/landing' && (
+ {newLayoutRoutes.includes(router.pathname) && (
  <NewLayout
  {...pageProps}
  {...{