فهرست منبع

WIP: relocate layout modules

Yuki Takei 1 سال پیش
والد
کامیت
0babdaf447

+ 3 - 1
apps/app/src/components-universal/Layout/AdminLayout.tsx

@@ -5,10 +5,12 @@ import dynamic from 'next/dynamic';
 import Link from 'next/link';
 
 import GrowiLogo from '~/components-universal/Common/GrowiLogo';
-import { RawLayout } from '~/components/Layout/RawLayout';
 
 import { AdminNavigation } from '../Admin/Common/AdminNavigation';
 
+import { RawLayout } from './RawLayout';
+
+
 import styles from './Admin.module.scss';
 
 

+ 0 - 0
apps/app/src/components/Layout/BasicLayout.module.scss → apps/app/src/components-universal/Layout/BasicLayout.module.scss


+ 0 - 0
apps/app/src/components/Layout/BasicLayout.tsx → apps/app/src/components-universal/Layout/BasicLayout.tsx


+ 2 - 1
apps/app/src/components-universal/Layout/NoLoginLayout.tsx

@@ -3,9 +3,10 @@ import React from 'react';
 
 import { useAppTitle } from '~/stores/context';
 
-import { RawLayout } from '../../components/Layout/RawLayout';
 import GrowiLogo from '../Common/GrowiLogo';
 
+import { RawLayout } from './RawLayout';
+
 
 import commonStyles from './NoLoginLayout.module.scss';
 

+ 0 - 0
apps/app/src/components/Layout/RawLayout.module.scss → apps/app/src/components-universal/Layout/RawLayout.module.scss


+ 5 - 2
apps/app/src/components/Layout/RawLayout.tsx → apps/app/src/components-universal/Layout/RawLayout.tsx

@@ -2,11 +2,11 @@ import type { ReactNode } from 'react';
 import React, { useState } from 'react';
 
 import type { ColorScheme } from '@growi/core';
+import dynamic from 'next/dynamic';
 import Head from 'next/head';
-import { ToastContainer } from 'react-toastify';
 import { useIsomorphicLayoutEffect } from 'usehooks-ts';
 
-import { useNextThemes, NextThemesProvider } from '~/stores/use-next-themes';
+import { useNextThemes, NextThemesProvider } from '~/stores-universal/use-next-themes';
 import loggerFactory from '~/utils/logger';
 
 
@@ -17,6 +17,9 @@ const toastContainerClass = styles['grw-toast-container'] ?? '';
 const logger = loggerFactory('growi:cli:RawLayout');
 
 
+const ToastContainer = dynamic(() => import('react-toastify').then(mod => mod.ToastContainer), { ssr: false });
+
+
 type Props = {
   className?: string,
   children?: ReactNode,

+ 1 - 1
apps/app/src/components-universal/Layout/SearchResultLayout.tsx

@@ -1,6 +1,6 @@
 import React, { type ReactNode } from 'react';
 
-import { BasicLayout } from '~/components/Layout/BasicLayout';
+import { BasicLayout } from './BasicLayout';
 
 import commonStyles from './SearchResultLayout.module.scss';
 

+ 2 - 1
apps/app/src/components/Layout/ShareLinkLayout.tsx → apps/app/src/components-universal/Layout/ShareLinkLayout.tsx

@@ -1,4 +1,5 @@
-import React, { ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import React from 'react';
 
 import dynamic from 'next/dynamic';