diff --git a/packages/client-core/src/admin/adminRoutes.tsx b/packages/client-core/src/admin/adminRoutes.tsx index 496aef8edc3..3656723f79c 100644 --- a/packages/client-core/src/admin/adminRoutes.tsx +++ b/packages/client-core/src/admin/adminRoutes.tsx @@ -40,7 +40,7 @@ import '@etherealengine/engine/src/EngineModule' const $allowed = lazy(() => import('@etherealengine/client-core/src/admin/allowedRoutes')) const AdminRoutes = () => { - const location = useLocation() + const _location = useLocation() const admin = useHookstate(getMutableState(AuthState)).user const allowedRoutes = useHookstate(getMutableState(AllowedAdminRoutesState)) @@ -70,7 +70,7 @@ const AdminRoutes = () => { return ( - }> + }> } /> {} />} diff --git a/packages/client-core/src/admin/components/Analytics/index.tsx b/packages/client-core/src/admin/components/Analytics/index.tsx index eb29cb85847..155cfa3f1de 100755 --- a/packages/client-core/src/admin/components/Analytics/index.tsx +++ b/packages/client-core/src/admin/components/Analytics/index.tsx @@ -95,8 +95,13 @@ const Analytics = () => { return ( <>
- {analyticsServiceQueries.map((query) => ( - + {analyticsServiceQueries.map((query, index) => ( + ))}
diff --git a/packages/client/src/engine.tsx b/packages/client/src/engine.tsx index 914ce4ac255..aa6ac3f3dd3 100755 --- a/packages/client/src/engine.tsx +++ b/packages/client/src/engine.tsx @@ -48,12 +48,14 @@ initializeBrowser() API.createAPI() pipeLogs(Engine.instance.api) -export default function ({ children }) { +export default function ({ children, tailwind = false }) { const ref = createRef() const { t } = useTranslation() - return ( + return !tailwind ? ( }>{children} + ) : ( + children ) } diff --git a/packages/client/src/engine_tw.tsx b/packages/client/src/engine_tw.tsx deleted file mode 100644 index 999ea7e7b41..00000000000 --- a/packages/client/src/engine_tw.tsx +++ /dev/null @@ -1,48 +0,0 @@ -/* -CPAL-1.0 License - -The contents of this file are subject to the Common Public Attribution License -Version 1.0. (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -https://github.com/EtherealEngine/etherealengine/blob/dev/LICENSE. -The License is based on the Mozilla Public License Version 1.1, but Sections 14 -and 15 have been added to cover use of software over a computer network and -provide for limited attribution for the Original Developer. In addition, -Exhibit A has been modified to be consistent with Exhibit B. - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the -specific language governing rights and limitations under the License. - -The Original Code is Ethereal Engine. - -The Original Developer is the Initial Developer. The Initial Developer of the -Original Code is the Ethereal Engine team. - -All portions of the code written by the Ethereal Engine team are Copyright © 2021-2023 -Ethereal Engine. All Rights Reserved. -*/ - -import { API } from '@etherealengine/client-core/src/API' -import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' -import { EngineState } from '@etherealengine/engine/src/ecs/classes/EngineState' -import { initializeBrowser } from '@etherealengine/engine/src/initializeBrowser' -import { createEngine } from '@etherealengine/engine/src/initializeEngine' -import { getMutableState } from '@etherealengine/hyperflux' - -import { pipeLogs } from '@etherealengine/engine/src/common/functions/logger' -import { initializei18n } from './util' - -createEngine() -getMutableState(EngineState).publicPath.set( - // @ts-ignore - import.meta.env.BASE_URL === '/client/' ? location.origin : import.meta.env.BASE_URL!.slice(0, -1) // remove trailing '/' -) -initializei18n() -initializeBrowser() -API.createAPI() -pipeLogs(Engine.instance.api) - -export default function ({ children }) { - return children -} diff --git a/packages/client/src/main.tsx b/packages/client/src/main.tsx index 72b895b518a..5dc91b17a36 100755 --- a/packages/client/src/main.tsx +++ b/packages/client/src/main.tsx @@ -49,8 +49,8 @@ const App = () => { {/* @todo - these are for backwards compatibility with non tailwind pages - they will be removed eventually */} }> @@ -60,8 +60,8 @@ const App = () => { } /> }> @@ -71,8 +71,8 @@ const App = () => { } /> }> @@ -82,8 +82,8 @@ const App = () => { } /> }> @@ -94,11 +94,13 @@ const App = () => { /> {/* This will become redundant and we can embed the TailwindPage directly */} - + + + } /> diff --git a/packages/client/src/pages/_app_tw.tsx b/packages/client/src/pages/_app_tw.tsx index ff7c026904b..27268f940f6 100755 --- a/packages/client/src/pages/_app_tw.tsx +++ b/packages/client/src/pages/_app_tw.tsx @@ -38,13 +38,10 @@ import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine' import { getMutableState, useHookstate } from '@etherealengine/hyperflux' import { loadWebappInjection } from '@etherealengine/projects/loadWebappInjection' -import EngineTW from '../engine_tw' import PublicRouter, { CenteredLoadingCircle } from '../route/public_tw' import { ThemeContextProvider } from '../themes/themeContext' -import 'daisyui/dist/full.css' import { useTranslation } from 'react-i18next' -import 'tailwindcss/tailwind.css' import '../themes/base.css' import '../themes/components.css' import '../themes/utilities.css' @@ -101,19 +98,17 @@ const TailwindPage = () => { }, [notistackRef.current]) return ( - - - - - - - - + + + + + + ) } diff --git a/packages/ui/.storybook/preview.tsx b/packages/ui/.storybook/preview.tsx index e35a7bfe9f6..5cb0bca624d 100644 --- a/packages/ui/.storybook/preview.tsx +++ b/packages/ui/.storybook/preview.tsx @@ -28,18 +28,15 @@ import { Preview } from '@storybook/react' import React from 'react' import { withRouter } from 'storybook-addon-react-router-v6' -import Engine_tw from '@etherealengine/client/src/engine_tw' import { ThemeContextProvider } from '@etherealengine/client/src/themes/themeContext' export const decorators = [ withRouter, (Story) => { return ( - - - - - + + + ) } ]