make nologin pages universal

apps/app/src/components/Layout/NoLoginLayout.tsx → apps/app/src/components-universal/Layout/NoLoginLayout.tsx

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

apps/app/src/components/CompleteUserRegistrationForm.tsx

@@ -25,7 +25,7 @@ interface Props {
   isEmailAuthenticationEnabled: boolean,
 }
 
-const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
+export const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
 
   const { t } = useTranslation();
   const {
@@ -206,5 +206,3 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
   );
 
 };
-
-export default CompleteUserRegistrationForm;

apps/app/src/components/InvitedForm.tsx

@@ -9,7 +9,7 @@ import { apiv3Post } from '~/client/util/apiv3-client';
 import { useCurrentUser } from '../stores/context';
 
 
-export type InvitedFormProps = {
+type InvitedFormProps = {
   invitedFormUsername: string,
   invitedFormName: string,
 }

apps/app/src/pages/installer.page.tsx

@@ -9,9 +9,8 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
-import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
+import { NoLoginLayout } from '~/components-universal/Layout/NoLoginLayout';
 
-import InstallerForm from '../components/InstallerForm';
 import {
   useCsrfToken, useAppTitle, useSiteUrl, useConfidential,
 } from '../stores/context';
@@ -20,6 +19,7 @@ import type { CommonProps } from './utils/commons';
 import { getNextI18NextConfig, getServerSideCommonProps, generateCustomTitle } from './utils/commons';
 
 
+const InstallerForm = dynamic(() => import('../components/InstallerForm'), { ssr: false });
 const DataTransferForm = dynamic(() => import('../components/DataTransferForm'), { ssr: false });
 const CustomNavAndContents = dynamic(() => import('../components/CustomNavigation/CustomNavAndContents'), { ssr: false });
 

apps/app/src/pages/invited.page.tsx

@@ -1,24 +1,22 @@
 import React from 'react';
 
-import type { IUserHasId, IUser } from '@growi/core';
+import type { IUser } from '@growi/core';
 import { USER_STATUS } from '@growi/core';
-import { NextPage, GetServerSideProps, GetServerSidePropsContext } from 'next';
+import type { NextPage, GetServerSideProps, GetServerSidePropsContext } from 'next';
 import { useTranslation } from 'next-i18next';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
-import { InvitedFormProps } from '~/components/InvitedForm';
-import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
+import { NoLoginLayout } from '~/components-universal/Layout/NoLoginLayout';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 
 import { useCsrfToken, useCurrentPathname, useCurrentUser } from '../stores/context';
 
-import {
-  CommonProps, getServerSideCommonProps, generateCustomTitle, getNextI18NextConfig,
-} from './utils/commons';
+import type { CommonProps } from './utils/commons';
+import { getServerSideCommonProps, generateCustomTitle, getNextI18NextConfig } from './utils/commons';
 
-const InvitedForm = dynamic<InvitedFormProps>(() => import('~/components/InvitedForm').then(mod => mod.InvitedForm), { ssr: false });
+const InvitedForm = dynamic(() => import('~/components/InvitedForm').then(mod => mod.InvitedForm), { ssr: false });
 
 type Props = CommonProps & {
   currentUser: IUser,

apps/app/src/pages/login/error/[message].page.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'next-i18next';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import { useRouter } from 'next/router';
 
-import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
+import { NoLoginLayout } from '~/components-universal/Layout/NoLoginLayout';
 import type { CommonProps } from '~/pages/utils/commons';
 import { getServerSideCommonProps, getNextI18NextConfig } from '~/pages/utils/commons';
 

apps/app/src/pages/login/index.page.tsx

@@ -6,10 +6,10 @@ import type {
 } from 'next';
 import { useTranslation } from 'next-i18next';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
+import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
-import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
-import { LoginForm } from '~/components/LoginForm';
+import { NoLoginLayout } from '~/components-universal/Layout/NoLoginLayout';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { IExternalAccountLoginError } from '~/interfaces/errors/external-account-login-error';
 import { isExternalAccountLoginError } from '~/interfaces/errors/external-account-login-error';
@@ -24,6 +24,9 @@ import {
 import styles from './index.module.scss';
 
 
+const LoginForm = dynamic(() => import('~/components/LoginForm').then(mod => mod.LoginForm), { ssr: false });
+
+
 type Props = CommonProps & {
   registrationMode: RegistrationMode,
   pageWithMetaStr: string,

apps/app/src/pages/user-activation.page.tsx

@@ -1,20 +1,26 @@
 import type { NextPage, GetServerSideProps, GetServerSidePropsContext } from 'next';
 import { useTranslation } from 'next-i18next';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
+import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
-import CompleteUserRegistrationForm from '~/components/CompleteUserRegistrationForm';
-import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
+import { NoLoginLayout } from '~/components-universal/Layout/NoLoginLayout';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { UserActivationErrorCode } from '~/interfaces/errors/user-activation';
 import type { RegistrationMode } from '~/interfaces/registration-mode';
 import type { ReqWithUserRegistrationOrder } from '~/server/middlewares/inject-user-registration-order-by-token-middleware';
 
+
 import type { CommonProps } from './utils/commons';
 import {
   getServerSideCommonProps, getNextI18NextConfig, generateCustomTitle,
 } from './utils/commons';
 
+
+const CompleteUserRegistrationForm = dynamic(() => import('~/components/CompleteUserRegistrationForm')
+  .then(mod => mod.CompleteUserRegistrationForm), { ssr: false });
+
+
 type Props = CommonProps & {
   token: string
   email: string