Kaynağa Gözat

merge login page component and installer page component

yusuketk 6 yıl önce
ebeveyn
işleme
0d2c7cafe7

+ 1 - 2
config/webpack.common.js

@@ -22,8 +22,7 @@ module.exports = (options) => {
     entry: Object.assign({
       'js/app':                       './src/client/js/app',
       'js/admin':                     './src/client/js/admin',
-      'js/installer':                 './src/client/js/installer',
-      'js/login':                     './src/client/js/login',
+      'js/nologin':                   './src/client/js/nologin',
       'js/legacy':                    './src/client/js/legacy/crowi',
       'js/legacy-presentation':       './src/client/js/legacy/crowi-presentation',
       'js/plugin':                    './src/client/js/plugin',

+ 0 - 20
src/client/js/login.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { I18nextProvider } from 'react-i18next';
-
-import i18nFactory from './util/i18n';
-
-import LoginForm from './components/LoginForm';
-
-const i18n = i18nFactory();
-
-// render loginForm
-const loginFormElem = document.getElementById('login-form');
-if (loginFormElem) {
-  ReactDOM.render(
-    <I18nextProvider i18n={i18n}>
-      <LoginForm />
-    </I18nextProvider>,
-    loginFormElem,
-  );
-}

+ 12 - 0
src/client/js/installer.jsx → src/client/js/nologin.jsx

@@ -5,6 +5,7 @@ import { I18nextProvider } from 'react-i18next';
 import i18nFactory from './util/i18n';
 
 import InstallerForm from './components/InstallerForm';
+import LoginForm from './components/LoginForm';
 
 const i18n = i18nFactory();
 
@@ -22,3 +23,14 @@ if (installerFormElem) {
     installerFormElem,
   );
 }
+
+// render loginForm
+const loginFormElem = document.getElementById('login-form');
+if (loginFormElem) {
+  ReactDOM.render(
+    <I18nextProvider i18n={i18n}>
+      <LoginForm />
+    </I18nextProvider>,
+    loginFormElem,
+  );
+}

+ 1 - 1
src/server/views/installer.html

@@ -30,7 +30,7 @@
 
   {{ cdnStyleTagsByGroup('basis') }}
 
-  <script src="{{ webpack_asset('js/installer.js') }}" defer></script>
+  <script src="{{ webpack_asset('js/nologin.js') }}" defer></script>
 
 </head>
 {% endblock %}