From fcff58db8d21bff16bace2bd244199e2b2636559 Mon Sep 17 00:00:00 2001 From: RubenSmn Date: Mon, 10 Jul 2023 11:57:20 +0200 Subject: [PATCH] fix: ci test fail --- .env.development | 2 +- src/pages/_app.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.env.development b/.env.development index 37f674155..39847fed8 100644 --- a/.env.development +++ b/.env.development @@ -7,4 +7,4 @@ NEXT_PUBLIC_API_NEW=http://127.0.0.1:4010/mock NEXT_PUBLIC_BASE= NEXT_PUBLIC_CONFIG_API= NEXT_PUBLIC_COUNTRY_LEADER_BOARD_DISABLED=false -NEXT_PUBLIC_SERVER_CONFIG_DISABLED= +NEXT_PUBLIC_SERVER_CONFIG_DISABLED=true diff --git a/src/pages/_app.js b/src/pages/_app.js index f6b423509..b83296858 100644 --- a/src/pages/_app.js +++ b/src/pages/_app.js @@ -8,18 +8,18 @@ import { useRouter } from 'next/router'; import Script from 'next/script'; import { userAgentFromString } from 'next/server'; import React from 'react'; +import Layout from 'components/Layout'; +import LayoutDashboard from 'components/LayoutDashboard'; +import LayoutEmbed from 'components/LayoutEmbed'; +import LayoutMobile from 'components/LayoutMobile'; +import LayoutMobileB from 'components/LayoutMobileB'; +import LayoutMobileC from 'components/LayoutMobileC'; +import { DrawerProvider } from 'context/DrawerContext'; +import { ConfigProvider, defaultConfig } from 'context/configContext'; +import { CustomThemeProvider } from 'context/themeContext'; +import { useLocalStorage, useEmbed } from 'hooks/globalHooks'; +import { MapContextProvider } from 'mapContext'; import packageJson from '../../package.json'; -import Layout from '../components/Layout'; -import LayoutDashboard from '../components/LayoutDashboard'; -import LayoutEmbed from '../components/LayoutEmbed'; -import LayoutMobile from '../components/LayoutMobile'; -import LayoutMobileB from '../components/LayoutMobileB'; -import LayoutMobileC from '../components/LayoutMobileC'; -import { DrawerProvider } from '../context/DrawerContext'; -import { ConfigProvider, defaultConfig } from '../context/configContext'; -import { CustomThemeProvider } from '../context/themeContext'; -import { useLocalStorage, useEmbed } from '../hooks/globalHooks'; -import { MapContextProvider } from '../mapContext'; log.warn(`Web Map Client version ${packageJson.version}`); @@ -215,7 +215,7 @@ TreetrackerApp.getInitialProps = async (context) => { const device = userAgentFromString(userAgent)?.device.type || 'desktop'; let config = defaultConfig; - if (!process.env.NEXT_PUBLIC_SERVER_CONFIG_DISABLED) { + if (process.env.NEXT_PUBLIC_SERVER_CONFIG_DISABLED !== 'true') { const mapConfigRequest = await fetch( // TODO: use the ENV var, currently results in a bug with the theme editor // `${process.env.NEXT_PUBLIC_CONFIG_API}/config`,