resolve 1 parent and delete EditorNavbarBottom

src/client/js/app.jsx

@@ -9,7 +9,7 @@ import ErrorBoundary from './components/ErrorBoudary';
 import SearchPage from './components/SearchPage';
 import TagsList from './components/TagsList';
 import DisplaySwitcher from './components/Page/DisplaySwitcher';
-import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
+// import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
 import PageEditorByHackmd from './components/PageEditorByHackmd';
 import Page from './components/Page';
@@ -111,7 +111,6 @@ if (pageContainer.state.path != null) {
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
     'display-switcher': <DisplaySwitcher />,
-    'page-editor-navbar-bottom-container': <EditorNavbarBottom />,
   });
   if (pageContainer.state.pageId != null) {
     Object.assign(componentMappings, {

src/client/js/components/Page/DisplaySwitcher.jsx

@@ -2,9 +2,10 @@ import React from 'react';
 import propTypes from 'prop-types';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import NavigationContainer from '../../services/NavigationContainer';
-import Editor from '../PageEditor/Editor';
+import Editor from '../PageEditor';
 import Page from '../Page';
 import PageEditorByHackmd from '../PageEditorByHackmd';
+import EditorNavbarBottom from '../PageEditor/EditorNavbarBottom';
 
 
 const DisplaySwitcher = (props) => {
@@ -13,7 +14,12 @@ const DisplaySwitcher = (props) => {
   return (
     <div className="">
       {navigationContainer.state.editorMode === 'view' && <Page />}
-      {/* {navigationContainer.state.editorMode === 'edit' && <Editor />} */}
+      {navigationContainer.state.editorMode === 'edit' && (
+      <>
+        <Editor />
+        <EditorNavbarBottom />
+      </>
+        )}
       {navigationContainer.state.editorMode === 'hackmd' && <PageEditorByHackmd />}
     </div>
   );