zahmis 5 лет назад
Родитель
Сommit
4584496228

+ 2 - 0
src/client/js/app.jsx

@@ -8,6 +8,7 @@ import loggerFactory from '@alias/logger';
 import ErrorBoundary from './components/ErrorBoudary';
 import ErrorBoundary from './components/ErrorBoudary';
 import SearchPage from './components/SearchPage';
 import SearchPage from './components/SearchPage';
 import TagsList from './components/TagsList';
 import TagsList from './components/TagsList';
+import ViewEditHackmd from './components/Page/ViewEditHackmd';
 import PageEditor from './components/PageEditor';
 import PageEditor from './components/PageEditor';
 import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
@@ -110,6 +111,7 @@ if (pageContainer.state.path != null) {
 // additional definitions if user is logged in
 // additional definitions if user is logged in
 if (appContainer.currentUser != null) {
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
   Object.assign(componentMappings, {
+    'view-edit-hackmd': <ViewEditHackmd />,
     'page-editor': <PageEditor />,
     'page-editor': <PageEditor />,
     'page-editor-navbar-bottom-container': <EditorNavbarBottom />,
     'page-editor-navbar-bottom-container': <EditorNavbarBottom />,
   });
   });

+ 15 - 0
src/client/js/components/Page/ViewEditHackmd.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+import PageEditor from '../PageEditor';
+import PageEditorByHackmd from '../PageEditorByHackmd';
+
+
+function ViewEditHackmd() {
+
+  return (
+    <div>
+      <PageEditor />
+    </div>
+  );
+}
+
+export default ViewEditHackmd;

+ 11 - 11
src/server/views/widget/page_content.html

@@ -39,27 +39,27 @@
 
 
   {% include 'page_alerts.html' %}
   {% include 'page_alerts.html' %}
 
 
-  <div class="tab-content">
+  {% if page %}
+  <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
 
 
-    {% if page %}
-      <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
+  {# formatted text #}
+  <!-- <div class="tab-pane active" id="revision-body">
+    <div id="page" class="mt-4"></div>
+  </div> -->
+{% endif %}
 
 
-      {# formatted text #}
-      <div class="tab-pane active" id="revision-body">
-        <div id="page" class="mt-4"></div>
-      </div>
-    {% endif %}
+  <div class="tab-content" id="view-edit-hackmd">
 
 
     <!-- {% if !isTrashPage() %}
     <!-- {% if !isTrashPage() %}
       {# edit form #}
       {# edit form #}
       <div class="tab-pane" id="edit">
       <div class="tab-pane" id="edit">
-        <div id="page-editor">{% if pageForm.body %}{{ pageForm.body }}{% endif %}</div>
+        <div id="page-editor"></div>
       </div>
       </div>
       <div class="tab-pane" id="hackmd">
       <div class="tab-pane" id="hackmd">
         <div id="page-editor-with-hackmd"></div>
         <div id="page-editor-with-hackmd"></div>
-      </div>
+      </div> -->
       {% include '../_form.html' %}
       {% include '../_form.html' %}
-    {% endif %} -->
+    <!-- {% endif %} -->
 
 
   </div>
   </div>