[npm] Update dependencies #53

closes #53
openwisp · Jun 7, 2020 · 296b267 · 296b267
1 parent abeb289
commit 296b267
Show file tree

Hide file tree

Showing 21 changed files with 7,727 additions and 3,817 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -31,6 +31,7 @@
       {
         "extensions": [".js", ".jsx"]
       }
-    ]
+    ],
+    "react/jsx-props-no-spreading": 0
   }
 }
diff --git a/client/components/404/404.js b/client/components/404/404.js
@@ -11,7 +11,7 @@ export default class DoesNotExist extends React.Component {
   render() {
     const {orgSlug, language, page} = this.props;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-404-container">
           <div className="owisp-404-row-1">
             {page && page.heading ? getText(page.heading, language) : "Oops!"}
@@ -34,7 +34,7 @@ export default class DoesNotExist extends React.Component {
             </div>
           ) : null}
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/404/__snapshots__/404.test.js.snap b/client/components/404/__snapshots__/404.test.js.snap
@@ -23,11 +23,11 @@ exports[`<DoesNotExist /> rendering should render correctly custom 404 page with
     <div
       className="owisp-404-row-4"
     >
-      <ForwardRef
+      <Link
         to="/default"
       >
         Go back to homepage
-      </ForwardRef>
+      </Link>
     </div>
   </div>
 </React.Fragment>

diff --git a/client/components/contact-box/contact.js b/client/components/contact-box/contact.js
@@ -12,7 +12,7 @@ export default class Contact extends React.Component {
     const {contactPage, language, orgSlug} = this.props;
     const {email, helpdesk, social_links} = contactPage;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-contact-container">
           <div className="owisp-contact-inner">
             <div className="owisp-contact-row">
@@ -65,7 +65,7 @@ export default class Contact extends React.Component {
             <div className="owisp-contact-inner"/>
           </div>
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/footer/footer.js b/client/components/footer/footer.js
@@ -11,7 +11,7 @@ export default class Footer extends React.Component {
     const {links} = footer;
     const secondaryText = footer.secondary_text;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-footer-container">
           <div className="owisp-footer-row-1">
             <div className="owisp-footer-row-1-inner">
@@ -37,7 +37,7 @@ export default class Footer extends React.Component {
             </div>
           </div>
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/header/header.js b/client/components/header/header.js
@@ -52,7 +52,7 @@ export default class Header extends React.Component {
     const {logo, links} = header;
     const {pathname} = location;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-header-container owisp-header-desktop">
           <div className="owisp-header-row-1">
             <div className="owisp-header-row-1-inner">
@@ -206,7 +206,7 @@ export default class Header extends React.Component {
             </div>
           </div>
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/login/__snapshots__/login.test.js.snap b/client/components/login/__snapshots__/login.test.js.snap
@@ -107,19 +107,19 @@ exports[`<Login /> rendering should render correctly with social links 1`] = `
           className="owisp-login-add-info"
         >
           By logging in, you accept the 
-          <ForwardRef
+          <Link
             className="owisp-login-additional-link"
             to="/default/login/terms-and-conditions"
           >
             terms and conditions
-          </ForwardRef>
+          </Link>
            and the 
-          <ForwardRef
+          <Link
             className="owisp-login-additional-link"
             to="/default/login/privacy-policy"
           >
             privacy policy
-          </ForwardRef>
+          </Link>
            of this WiFi service. 
         </div>
         <React.Fragment>
@@ -144,23 +144,23 @@ exports[`<Login /> rendering should render correctly with social links 1`] = `
           <div
             className="owisp-login-form-register-btn-div"
           >
-            <ForwardRef
+            <Link
               className="owisp-login-form-btn owisp-login-register-btn"
               to="/default/registration"
             >
               Sign up
-            </ForwardRef>
+            </Link>
           </div>
         </React.Fragment>
         <div
           className="owisp-login-links-div"
         >
-          <ForwardRef
+          <Link
             className="owisp-login-link"
             to="/default/password/reset"
           >
             Forgot your password?
-          </ForwardRef>
+          </Link>
         </div>
       </form>
       <div
@@ -313,19 +313,19 @@ exports[`<Login /> rendering should render correctly without social links 1`] =
           className="owisp-login-add-info"
         >
           By logging in, you accept the 
-          <ForwardRef
+          <Link
             className="owisp-login-additional-link"
             to="/default/login/terms-and-conditions"
           >
             terms and conditions
-          </ForwardRef>
+          </Link>
            and the 
-          <ForwardRef
+          <Link
             className="owisp-login-additional-link"
             to="/default/login/privacy-policy"
           >
             privacy policy
-          </ForwardRef>
+          </Link>
            of this WiFi service. 
         </div>
         <React.Fragment>
@@ -350,23 +350,23 @@ exports[`<Login /> rendering should render correctly without social links 1`] =
           <div
             className="owisp-login-form-register-btn-div"
           >
-            <ForwardRef
+            <Link
               className="owisp-login-form-btn owisp-login-register-btn"
               to="/default/registration"
             >
               Sign up
-            </ForwardRef>
+            </Link>
           </div>
         </React.Fragment>
         <div
           className="owisp-login-links-div"
         >
-          <ForwardRef
+          <Link
             className="owisp-login-link"
             to="/default/password/reset"
           >
             Forgot your password?
-          </ForwardRef>
+          </Link>
         </div>
       </form>
       <div

diff --git a/client/components/login/login.js b/client/components/login/login.js
@@ -109,7 +109,7 @@ export default class Login extends React.Component {
       additional_info_text,
     } = loginForm;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-login-container">
           <div className="owisp-login-container-inner">
             <form className="owisp-login-form" onSubmit={this.handleSubmit}>
@@ -338,7 +338,7 @@ export default class Login extends React.Component {
             return <Modal {...props} prevPath={match.url} />;
           }}
         />
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/modal/__snapshots__/modal.test.js.snap b/client/components/modal/__snapshots__/modal.test.js.snap
@@ -8,12 +8,12 @@ exports[`<Modal /> rendering should render nothing on incorrect param name 1`] =
     <div
       className="owisp-modal-row-close"
     >
-      <ForwardRef
+      <Link
         className="owisp-modal-close-btn"
         to="/default/login"
       >
         X
-      </ForwardRef>
+      </Link>
     </div>
     <div
       className="owisp-modal-content"
@@ -35,12 +35,12 @@ exports[`<Modal /> rendering should render privacy-policy correctly 1`] = `
     <div
       className="owisp-modal-row-close"
     >
-      <ForwardRef
+      <Link
         className="owisp-modal-close-btn"
         to="/default/login"
       >
         X
-      </ForwardRef>
+      </Link>
     </div>
     <div
       className="owisp-modal-content"
@@ -79,12 +79,12 @@ exports[`<Modal /> rendering should render terms-and-conditions correctly 1`] =
     <div
       className="owisp-modal-row-close"
     >
-      <ForwardRef
+      <Link
         className="owisp-modal-close-btn"
         to="/default/login"
       >
         X
-      </ForwardRef>
+      </Link>
     </div>
     <div
       className="owisp-modal-content"

diff --git a/client/components/modal/modal.js b/client/components/modal/modal.js
@@ -40,7 +40,7 @@ export default class Modal extends React.Component {
   render() {
     const {prevPath} = this.props;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-modal-container">
           <div className="owisp-modal-row-close">
             <Link to={prevPath} className="owisp-modal-close-btn">
@@ -53,7 +53,7 @@ export default class Modal extends React.Component {
             dangerouslySetInnerHTML={this.renderContent()}
           />
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/organization-wrapper/organization-wrapper.js b/client/components/organization-wrapper/organization-wrapper.js
@@ -41,7 +41,7 @@ export default class OrganizationWrapper extends React.Component {
     const cssPath = organization.configuration.css_path;
     if (organization.exists === true) {
       return (
-        <React.Fragment>
+        <>
           <div className="owisp-app-container">
             <Route
               path={match.path}
@@ -130,19 +130,19 @@ export default class OrganizationWrapper extends React.Component {
               />
             </Helmet>
           ) : null}
-        </React.Fragment>
+        </>
       );
     }
     if (organization.exists === false) {
       return (
-        <React.Fragment>
+        <>
           <div className="owisp-org-wrapper-not-found">
             <DoesNotExist />
           </div>
           <Helmet>
             <title>Page not found</title>
           </Helmet>
-        </React.Fragment>
+        </>
       );
     }
     return (

diff --git a/client/components/password-change/password-change.js b/client/components/password-change/password-change.js
@@ -72,7 +72,7 @@ export default class PasswordChange extends React.Component {
     const { language, passwordChange } = this.props;
     const { errors, newPassword1, newPassword2 } = this.state;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-password-change-container">
           <form className="owisp-password-change-form" onSubmit={this.handleSubmit}>
             <div className="owisp-password-change-form-title">{getText(passwordChange.title, language)}</div>
@@ -181,7 +181,7 @@ export default class PasswordChange extends React.Component {
             />
           </form>
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/password-confirm/password-confirm.js b/client/components/password-confirm/password-confirm.js
@@ -90,7 +90,7 @@ export default class PasswordConfirm extends React.Component {
     const loginPageLink = passwordConfirm.login_page_link;
     const {buttons} = passwordConfirm;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-password-confirm-container">
           {success ? (
             <div className="owisp-password-confirm-form">
@@ -246,7 +246,7 @@ export default class PasswordConfirm extends React.Component {
             </form>
           )}
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }

diff --git a/client/components/password-reset/password-reset.js b/client/components/password-reset/password-reset.js
@@ -72,7 +72,7 @@ export default class PasswordReset extends React.Component {
     const loginPageLink = passwordReset.login_page_link;
     const {buttons} = passwordReset;
     return (
-      <React.Fragment>
+      <>
         <div className="owisp-password-reset-container">
           {success ? (
             <div className="owisp-password-reset-form">
@@ -170,7 +170,7 @@ export default class PasswordReset extends React.Component {
             </form>
           )}
         </div>
-      </React.Fragment>
+      </>
     );
   }
 }