Explorar o código

Merge pull request #1096 from weseek/reactify-admin-importer

React is possible
Yuki Takei %!s(int64=6) %!d(string=hai) anos
pai
achega
6c6e70111a

+ 1 - 1
src/client/js/app.js

@@ -197,10 +197,10 @@ const adminImporterElem = document.getElementById('admin-importer');
 if (adminImporterElem != null) {
 if (adminImporterElem != null) {
   ReactDOM.render(
   ReactDOM.render(
     <Importer />,
     <Importer />,
+    adminImporterElem,
   );
   );
 }
 }
 
 
-
 const adminFullTextSearchManagementElem = document.getElementById('admin-full-text-search-management');
 const adminFullTextSearchManagementElem = document.getElementById('admin-full-text-search-management');
 if (adminFullTextSearchManagementElem != null) {
 if (adminFullTextSearchManagementElem != null) {
 
 

+ 1 - 0
src/client/js/components/Admin/Importer.jsx

@@ -9,6 +9,7 @@ class Importer extends React.Component {
   render() {
   render() {
     return (
     return (
       <Fragment>
       <Fragment>
+        <h1>連打</h1>
       </Fragment>
       </Fragment>
     );
     );
   }
   }

+ 19 - 11
src/server/views/admin/importer.html

@@ -1,11 +1,19 @@
-<div id ="admin-importer">
-<h1 style="background : linear-gradient(to right,
-red,
-orange,
-yellow,
-green,
-aqua,
-blue,
-purple);
-display: inline;
-color: white">HELLO REACT!</h1>
+
+{% extends '../layout/admin.html' %}
+
+{% block html_title %}{{ customizeService.generateCustomTitle(t('Import Data')) }}{% endblock %}
+
+{% block content_header %}
+<div class="header-wrap">
+  <header id="page-header">
+    <h1 id="admin-title" class="title">{{ t('Import Data') }}</h1>
+  </header>
+</div>
+{% endblock %}
+
+{% block content_main %}
+<div id ="admin-importer"></div>
+{% endblock content_main %}
+
+{% block content_footer %}
+{% endblock content_footer %}