Przeglądaj źródła

organize entry point jsx for admin pages

Yuki Takei 6 lat temu
rodzic
commit
7acd1a1a2c
2 zmienionych plików z 4 dodań i 3 usunięć
  1. 2 0
      src/client/js/admin.jsx
  2. 2 3
      src/server/views/layout/admin.html

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

@@ -28,6 +28,8 @@ import AdminMarkDownContainer from './services/AdminMarkDownContainer';
 import AdminExternalAccountsContainer from './services/AdminExternalAccountsContainer';
 import AdminExternalAccountsContainer from './services/AdminExternalAccountsContainer';
 import AdminNotificationContainer from './services/AdminNotificationContainer';
 import AdminNotificationContainer from './services/AdminNotificationContainer';
 
 
+import './app';
+
 const logger = loggerFactory('growi:admin');
 const logger = loggerFactory('growi:admin');
 
 
 const appContainer = window.appContainer;
 const appContainer = window.appContainer;

+ 2 - 3
src/server/views/layout/admin.html

@@ -4,9 +4,8 @@
 {% block html_base_css %}admin-page{% endblock %}
 {% block html_base_css %}admin-page{% endblock %}
 
 
 
 
-{% block html_additional_headers %}
-  {% parent %}
-  <script src="{{ webpack_asset('js/admin.js') }}" defer></script>
+{% block html_head_loading_app %}
+<script src="{{ webpack_asset('js/admin.js') }}" defer></script>
 {% endblock %}
 {% endblock %}
 
 
 {# disable custom script in admin page #}
 {# disable custom script in admin page #}