Răsfoiți Sursa

change file name

yohei0125 4 ani în urmă
părinte
comite
64f66f4a9d

+ 2 - 2
packages/app/src/client/app.jsx

@@ -42,6 +42,7 @@ import Fab from '../components/Fab';
 import PersonalSettings from '../components/Me/PersonalSettings';
 import GrowiSubNavigation from '../components/Navbar/GrowiSubNavigation';
 import GrowiSubNavigationSwitcher from '../components/Navbar/GrowiSubNavigationSwitcher';
+import IdenticalPathPage from '~/components/IdenticalPathPage';
 
 import ContextExtractor from '~/client/services/ContextExtractor';
 import PageContainer from '~/client/services/PageContainer';
@@ -54,7 +55,6 @@ import PersonalContainer from '~/client/services/PersonalContainer';
 import PageAccessoriesContainer from '~/client/services/PageAccessoriesContainer';
 
 import { appContainer, componentMappings } from './base';
-import DuplicatePage from '~/components/DuplicatePage';
 
 const logger = loggerFactory('growi:cli:app');
 
@@ -89,7 +89,7 @@ Object.assign(componentMappings, {
 
   'search-page': <SearchPage crowi={appContainer} />,
   'all-in-app-notifications': <InAppNotificationPage />,
-  'duplicate-page-list': <DuplicatePage />,
+  'identical-path-page-list': <IdenticalPathPage />,
 
   // 'revision-history': <PageHistory pageId={pageId} />,
   'tags-page': <TagsList crowi={appContainer} />,

+ 0 - 10
packages/app/src/components/DuplicatePage.tsx

@@ -1,10 +0,0 @@
-import React, { FC } from 'react';
-
-type DuplicatePageProps= {
-
-}
-const DuplicatePage:FC<DuplicatePageProps> = (props:DuplicatePageProps) => {
-  return <div></div>;
-};
-
-export default DuplicatePage;

+ 16 - 0
packages/app/src/components/IdenticalPathPage.tsx

@@ -0,0 +1,16 @@
+import React, { FC } from 'react';
+
+type IdenticalPathPageProps= {
+  // add props and types here
+}
+const IdenticalPathPage:FC<IdenticalPathPageProps> = (props:IdenticalPathPageProps) => {
+  return (
+    <div>
+      {/* Todo: show alert */}
+      {/* Todo: show identical path page list */}
+      IdenticalPathPageList
+    </div>
+  );
+};
+
+export default IdenticalPathPage;

+ 1 - 1
packages/app/src/server/routes/page.js

@@ -613,7 +613,7 @@ module.exports = function(crowi, app) {
     const { redirectFrom } = req.query;
 
     if (pages.length >= 2) {
-      return res.render('layout-growi/duplicate-page-list', {
+      return res.render('layout-growi/identical-path-page-list', {
         pages, redirectFrom,
       });
     }

+ 1 - 5
packages/app/src/server/views/layout-growi/duplicate-page-list.html → packages/app/src/server/views/layout-growi/identical-path-page-list.html

@@ -2,9 +2,5 @@
 
 {% block content_main %}
 <div id="grw-fav-sticky-trigger" class="sticky-top"></div>
-<div>
-  {% for page in pages %}
-    <li>{{page._id.toString()}}: {{page.path}}</li>
-  {% endfor %}
-</div>
+<div id="identical-path-page-list"></div>
 {% endblock %}

+ 0 - 22
packages/app/src/server/views/layout-growi/select-go-to-page.html

@@ -1,22 +0,0 @@
-{% extends 'base/layout.html' %}
-
-<!-- WIP -->
-
-{% block content_main %}
-  <div>ContentMain</div>
-  <div>
-    {% for page in pages %}
-      <li>{{page._id.toString()}}: {{page.path}}</li>
-    {% endfor %}
-  </div>
-  <br>
-  <div>redirectFrom: {{redirectFrom}}</div>
-{% endblock %}
-
-{% block content_footer %}
-  <div>Footer</div>
-{% endblock %}
-
-{% block body_end %}
-  <div>BodyEnd</div>
-{% endblock %}