merge master into feat/layout

This commit is contained in:
QiShaoXuan
2022-10-20 16:29:39 +08:00
20 changed files with 411 additions and 44 deletions
+11 -7
View File
@@ -5,6 +5,7 @@ import '../../public/variable.css';
import './temporary.css';
import { EditorProvider } from '@/components/editor-provider';
import { ModalProvider } from '@/components/global-modal-provider';
import { Logger } from '@toeverything/pathfinder-logger';
const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), {
ssr: false,
@@ -12,13 +13,16 @@ const ThemeProvider = dynamic(() => import('@/styles/themeProvider'), {
function MyApp({ Component, pageProps }: AppProps) {
return (
<ThemeProvider>
<ModalProvider>
<EditorProvider>
<Component {...pageProps} />
</EditorProvider>
</ModalProvider>
</ThemeProvider>
<>
<Logger />
<ThemeProvider>
<ModalProvider>
<EditorProvider>
<Component {...pageProps} />
</EditorProvider>
</ModalProvider>
</ThemeProvider>
</>
);
}