Преглед изворни кода

Revert "Create TrashPageViewLayout"

This reverts commit 137619acba5d569e2554f59f59b4195ac49fbbfd.
satof3 пре 2 година
родитељ
комит
6c914ec946
2 измењених фајлова са 2 додато и 34 уклоњено
  1. 0 30
      apps/app/src/components/TrashPageViewLayout.tsx
  2. 2 4
      apps/app/src/pages/trash.page.tsx

+ 0 - 30
apps/app/src/components/TrashPageViewLayout.tsx

@@ -1,30 +0,0 @@
-import type { IPagePopulatedToShowRevision } from '@growi/core';
-
-
-import { PagePathNavSticky } from './Common/PagePathNav';
-
-import styles from './common/PageViewLayout.module.scss';
-
-type Props = {
-  pagePath: string,
-  page?: IPagePopulatedToShowRevision,
-  expandContentWidth?: boolean,
-}
-
-export const TrashPageViewLayout = (props: Props): JSX.Element => {
-  const {
-    pagePath, expandContentWidth,
-  } = props;
-
-  const pageViewLayoutClass = styles['page-view-layout'] ?? '';
-  const _fluidLayoutClass = styles['fluid-layout'] ?? '';
-  const fluidLayoutClass = expandContentWidth ? _fluidLayoutClass : '';
-
-  return (
-    <div id="main" className={`main ${pageViewLayoutClass} ${fluidLayoutClass} flex-expand-vert`}>
-      <div id="content-main" className="content-main container-lg grw-container-convertible flex-expand-vert">
-        <PagePathNavSticky pagePath={pagePath} />
-      </div>
-    </div>
-  );
-};

+ 2 - 4
apps/app/src/pages/trash.page.tsx

@@ -7,13 +7,13 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
+import { PagePathNavSticky } from '~/components/Common/PagePathNav';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import { useCurrentPageId, useSWRxCurrentPage } from '~/stores/page';
 
 import { BasicLayout } from '../components/Layout/BasicLayout';
 import GrowiContextualSubNavigationSubstance from '../components/Navbar/GrowiContextualSubNavigation';
-import { TrashPageViewLayout } from '../components/TrashPageViewLayout';
 import {
   useCurrentUser, useCurrentPathname, useGrowiCloudUri,
   useIsSearchServiceConfigured, useIsSearchServiceReachable,
@@ -75,9 +75,7 @@ const TrashPage: NextPageWithLayout<CommonProps> = (props: Props) => {
         </nav>
 
         <div className="content-main container-lg mb-5 pb-5">
-          <TrashPageViewLayout
-            pagePath="/trash"
-          />
+          <PagePathNavSticky pagePath="/trash" />
           <TrashPageList />
         </div>