Yuki Takei 5 лет назад
Родитель
Сommit
182d1774f3

+ 24 - 10
src/client/js/components/Admin/App/AppSetting.jsx

@@ -26,7 +26,8 @@ class AppSetting extends React.Component {
     try {
       await adminAppContainer.updateAppSettingHandler();
       toastSuccess(t('toaster.update_successed', { target: t('App Settings') }));
-    } catch (err) {
+    }
+    catch (err) {
       toastError(err);
       logger.error(err);
     }
@@ -56,7 +57,10 @@ class AppSetting extends React.Component {
 
         <div className="row form-group mb-5">
           <label
-            className="text-left text-md-right col-md-3 col-form-label">{t('admin:app_setting.confidential_name')}</label>
+            className="text-left text-md-right col-md-3 col-form-label"
+          >
+            {t('admin:app_setting.confidential_name')}
+          </label>
           <div className="col-md-6">
             <input
               className="form-control"
@@ -73,14 +77,17 @@ class AppSetting extends React.Component {
 
         <div className="row form-group mb-5">
           <label
-            className="text-left text-md-right col-md-3 col-form-label">{t('admin:app_setting.default_language')}</label>
+            className="text-left text-md-right col-md-3 col-form-label"
+          >
+            {t('admin:app_setting.default_language')}
+          </label>
           <div className="col-md-6">
             {
-              languages.map((lan)=>(
+              languages.map(lan => (
                 <div key={lan} className="custom-control custom-radio custom-control-inline">
                   <input
                     type="radio"
-                    id={'radioLang' + lan}
+                    id={`radioLang${lan}`}
                     className="custom-control-input"
                     name="globalLang"
                     value={lan}
@@ -89,7 +96,7 @@ class AppSetting extends React.Component {
                       adminAppContainer.changeGlobalLang(e.target.value);
                     }}
                   />
-                  <label className="custom-control-label" htmlFor={'radioLang' + lan}>{locales[lan]["_conf"]["name"]}</label>
+                  <label className="custom-control-label" htmlFor={`radioLang${lan}`}>{locales[lan]._conf.name}</label>
                 </div>
               ))
             }
@@ -98,7 +105,10 @@ class AppSetting extends React.Component {
 
         <div className="row form-group mb-5">
           <label
-            className="text-left text-md-right col-md-3 col-form-label">{t('admin:app_setting.file_uploading')}</label>
+            className="text-left text-md-right col-md-3 col-form-label"
+          >
+            {t('admin:app_setting.file_uploading')}
+          </label>
           <div className="col-md-6">
             <div className="custom-control custom-checkbox custom-checkbox-info">
               <input
@@ -111,8 +121,12 @@ class AppSetting extends React.Component {
                   adminAppContainer.changeFileUpload(e.target.checked);
                 }}
               />
-              <label className="custom-control-label"
-                     htmlFor="cbFileUpload">{t('admin:app_setting.enable_files_except_image')}</label>
+              <label
+                className="custom-control-label"
+                htmlFor="cbFileUpload"
+              >
+                {t('admin:app_setting.enable_files_except_image')}
+              </label>
             </div>
 
             <p className="form-text text-muted">
@@ -121,7 +135,7 @@ class AppSetting extends React.Component {
           </div>
         </div>
 
-        <AdminUpdateButtonRow onClick={this.submitHandler} disabled={adminAppContainer.state.retrieveError != null}/>
+        <AdminUpdateButtonRow onClick={this.submitHandler} disabled={adminAppContainer.state.retrieveError != null} />
       </React.Fragment>
     );
   }

+ 5 - 5
src/client/js/components/InstallerForm.jsx

@@ -44,7 +44,7 @@ class InstallerForm extends React.Component {
       : <span><i className="icon-fw icon-ban" />{ this.props.t('installer.unavaliable_user_id') }</span>;
 
     const checkedBtn = this.state.checkedBtn;
-    const {i18n}=this.props;
+    const { i18n } = this.props;
     const locales = i18n.options.resources;
     const languages = Object.keys(locales);
 
@@ -62,19 +62,19 @@ class InstallerForm extends React.Component {
           <form role="form" action="/installer" method="post" id="register-form" className="col-md-12">
             <div className="form-group text-center">
               {
-                languages.map(lan=>(
+                languages.map(lan => (
                   <div key={lan} className="custom-control custom-radio custom-control-inline">
                     <input
                       type="radio"
                       className="custom-control-input"
-                      id={'register-form-check-'+lan}
+                      id={`register-form-check-${lan}`}
                       name="registerForm[app:globalLang]"
                       value={lan}
                       checked={checkedBtn === lan}
                       onChange={(e) => { if (e.target.checked) { this.changeLanguage(lan) } }}
                     />
-                    <label className="custom-control-label" htmlFor={'register-form-check-'+lan}>
-                      {locales[lan]["_conf"]["name"]}
+                    <label className="custom-control-label" htmlFor={`register-form-check-${lan}`}>
+                      {locales[lan]._conf.name}
                     </label>
                   </div>
                 ))

+ 3 - 3
src/client/js/components/Me/BasicInfoSettings.jsx

@@ -113,17 +113,17 @@ class BasicInfoSettings extends React.Component {
           <label className="text-left text-md-right col-md-3 col-form-label">{t('Language')}</label>
           <div className="col-md-6">
             {
-              languages.map(lan=>(
+              languages.map(lan => (
                 <div key={lan} className="custom-control custom-radio custom-control-inline">
                   <input
                     type="radio"
-                    id={'radioLang'+lan}
+                    id={`radioLang${lan}`}
                     className="custom-control-input"
                     name="userForm[lang]"
                     checked={personalContainer.state.lang === lan}
                     onChange={() => { personalContainer.changeLang(lan) }}
                   />
-                  <label className="custom-control-label" htmlFor={'radioLang'+lan}>{locales[lan]["_conf"]['name']}</label>
+                  <label className="custom-control-label" htmlFor={`radioLang${lan}`}>{locales[lan]._conf.name}</label>
                 </div>
               ))
             }

+ 22 - 15
src/server/routes/apiv3/personal-setting.js

@@ -122,7 +122,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: personal params
    */
-  router.get('/', accessTokenParser, loginRequiredStrictly, async (req, res) => {
+  router.get('/', accessTokenParser, loginRequiredStrictly, async(req, res) => {
     const currentUser = await User.findUserByUsername(req.user.username);
     return res.apiv3({ currentUser });
   });
@@ -153,7 +153,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: personal params
    */
-  router.put('/', accessTokenParser, loginRequiredStrictly, csrf, validator.personal, ApiV3FormValidator, async (req, res) => {
+  router.put('/', accessTokenParser, loginRequiredStrictly, csrf, validator.personal, ApiV3FormValidator, async(req, res) => {
 
     try {
       const user = await User.findOne({ _id: req.user.id });
@@ -165,7 +165,8 @@ module.exports = (crowi) => {
       const updatedUser = await user.save();
       req.i18n.changeLanguage(req.body.lang);
       return res.apiv3({ updatedUser });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('update-personal-settings-failed');
     }
@@ -192,13 +193,14 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: user data
    */
-  router.put('/image-type', accessTokenParser, loginRequiredStrictly, csrf, validator.imageType, ApiV3FormValidator, async (req, res) => {
+  router.put('/image-type', accessTokenParser, loginRequiredStrictly, csrf, validator.imageType, ApiV3FormValidator, async(req, res) => {
     const { isGravatarEnabled } = req.body;
 
     try {
       const userData = await req.user.updateIsGravatarEnabled(isGravatarEnabled);
       return res.apiv3({ userData });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('update-personal-settings-failed');
     }
@@ -224,13 +226,14 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: array of external accounts
    */
-  router.get('/external-accounts', accessTokenParser, loginRequiredStrictly, async (req, res) => {
+  router.get('/external-accounts', accessTokenParser, loginRequiredStrictly, async(req, res) => {
     const userData = req.user;
 
     try {
       const externalAccounts = await ExternalAccount.find({ user: userData });
       return res.apiv3({ externalAccounts });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('get-external-accounts-failed');
     }
@@ -263,7 +266,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: user data updated
    */
-  router.put('/password', accessTokenParser, loginRequiredStrictly, csrf, validator.password, ApiV3FormValidator, async (req, res) => {
+  router.put('/password', accessTokenParser, loginRequiredStrictly, csrf, validator.password, ApiV3FormValidator, async(req, res) => {
     const { body, user } = req;
     const { oldPassword, newPassword } = body;
 
@@ -273,7 +276,8 @@ module.exports = (crowi) => {
     try {
       const userData = await user.updatePassword(newPassword);
       return res.apiv3({ userData });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('update-password-failed');
     }
@@ -300,13 +304,14 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: user data
    */
-  router.put('/api-token', loginRequiredStrictly, csrf, async (req, res) => {
+  router.put('/api-token', loginRequiredStrictly, csrf, async(req, res) => {
     const { user } = req;
 
     try {
       const userData = await user.updateApiToken();
       return res.apiv3({ userData });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('update-api-token-failed');
     }
@@ -339,7 +344,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: Ldap account associate to me
    */
-  router.put('/associate-ldap', accessTokenParser, loginRequiredStrictly, csrf, validator.associateLdap, ApiV3FormValidator, async (req, res) => {
+  router.put('/associate-ldap', accessTokenParser, loginRequiredStrictly, csrf, validator.associateLdap, ApiV3FormValidator, async(req, res) => {
     const { passportService } = crowi;
     const { user, body } = req;
     const { username } = body;
@@ -353,7 +358,8 @@ module.exports = (crowi) => {
       await passport.authenticate('ldapauth');
       const associateUser = await ExternalAccount.associate('ldap', username, user);
       return res.apiv3({ associateUser });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('associate-ldap-account-failed');
     }
@@ -386,7 +392,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: Ldap account disassociate to me
    */
-  router.put('/disassociate-ldap', accessTokenParser, loginRequiredStrictly, csrf, validator.disassociateLdap, ApiV3FormValidator, async (req, res) => {
+  router.put('/disassociate-ldap', accessTokenParser, loginRequiredStrictly, csrf, validator.disassociateLdap, ApiV3FormValidator, async(req, res) => {
     const { user, body } = req;
     const { providerType, accountId } = body;
 
@@ -398,7 +404,8 @@ module.exports = (crowi) => {
       }
       const disassociateUser = await ExternalAccount.findOneAndRemove({ providerType, accountId, user });
       return res.apiv3({ disassociateUser });
-    } catch (err) {
+    }
+    catch (err) {
       logger.error(err);
       return res.apiv3Err('disassociate-ldap-account-failed');
     }