From 7d1e66f910dea1ecd2fc8503f1d5ff28016103f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Dec 2021 02:05:53 +0000
Subject: [PATCH 1/2] Bump react-app-rewired from 2.1.6 to 2.1.9

Bumps [react-app-rewired](https://github.com/timarney/react-app-rewired) from 2.1.6 to 2.1.9.
- [Release notes](https://github.com/timarney/react-app-rewired/releases)
- [Commits](https://github.com/timarney/react-app-rewired/compare/2.1.6...v2.1.9)

---
updated-dependencies:
- dependency-name: react-app-rewired
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 50ea207..455c39d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "less-loader": "^6.2.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
-    "react-app-rewired": "^2.1.6",
+    "react-app-rewired": "^2.1.9",
     "react-dom": "^16.13.1",
     "react-helmet": "^6.1.0",
     "react-router": "^5.2.0",
diff --git a/yarn.lock b/yarn.lock
index 1d2644a..847fc83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10606,10 +10606,10 @@ react-app-polyfill@^1.0.6:
     regenerator-runtime "^0.13.3"
     whatwg-fetch "^3.0.0"
 
-react-app-rewired@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-2.1.6.tgz#33ee3076a7f34d6a7c94e649cac67e7c8c580de8"
-  integrity sha512-06flj0kK5tf/RN4naRv/sn6j3sQd7rsURoRLKLpffXDzJeNiAaTNic+0I8Basojy5WDwREkTqrMLewSAjcb13w==
+react-app-rewired@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-2.1.9.tgz#20c432c6414d354547e232c4fa1ac1112615ca3e"
+  integrity sha512-eOIRsDXbRCA9x+vIABS+VFBXO78bUbZ1pIyOuAkbP0Y6NEfbr4v9lHAyGsix4DxNcKpPqKYtvDKKlbOxMUCxlw==
   dependencies:
     semver "^5.6.0"
 

From 42ffeb8ddac59dee3c023639395e9c6b9f155211 Mon Sep 17 00:00:00 2001
From: codefactor-io <support@codefactor.io>
Date: Thu, 23 Dec 2021 02:06:41 +0000
Subject: [PATCH 2/2] [CodeFactor] Apply fixes to commit 7d1e66f

---
 src/App.js                                 | 12 ++++----
 src/components/skeleton/content/Content.js | 34 ++++++++++++----------
 src/components/skeleton/footer/Footer.js   |  6 ++--
 src/components/skeleton/header/Header.js   | 34 ++++++++++++----------
 src/components/skeleton/layout/Layout.js   |  2 +-
 src/components/skeleton/sider/Sider.js     |  2 +-
 src/pages/Home.js                          |  8 ++---
 src/pages/UserSettings.js                  |  4 +--
 src/routes/withHelmet.js                   |  5 +---
 9 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/App.js b/src/App.js
index d1ee5b1..68e684b 100755
--- a/src/App.js
+++ b/src/App.js
@@ -3,10 +3,12 @@ import { renderRoutes } from 'react-router-config';
 import { Switch, BrowserRouter } from 'react-router-dom';
 import getRoutes from './routes';
 
-const App = () => (
-  <BrowserRouter>
-    <Switch>{renderRoutes(getRoutes({ isLoggedUser: true }))}</Switch>
-  </BrowserRouter>
-);
+const App = function () {
+  return (
+    <BrowserRouter>
+      <Switch>{renderRoutes(getRoutes({ isLoggedUser: true }))}</Switch>
+    </BrowserRouter>
+  );
+};
 
 export default App;
diff --git a/src/components/skeleton/content/Content.js b/src/components/skeleton/content/Content.js
index 1397033..f71c30b 100644
--- a/src/components/skeleton/content/Content.js
+++ b/src/components/skeleton/content/Content.js
@@ -5,22 +5,24 @@ import PropTypes from 'prop-types';
 
 const { Content: AntContent } = Layout;
 
-const Content = ({ children, matchedRoutes }) => (
-  <AntContent style={{ margin: '0 16px' }}>
-    <Breadcrumb style={{ margin: '16px 16px 0px 16px' }}>
-      {matchedRoutes.map(({ route }, idx) => (
-        <Breadcrumb.Item key={route.path}>
-          {idx === matchedRoutes.length - 1 ? (
-            route.title
-          ) : (
-            <Link to={route.path}>{route.title}</Link>
-          )}
-        </Breadcrumb.Item>
-      ))}
-    </Breadcrumb>
-    <div style={{ padding: 16 }}>{children}</div>
-  </AntContent>
-);
+const Content = function ({ children, matchedRoutes }) {
+  return (
+    <AntContent style={{ margin: '0 16px' }}>
+      <Breadcrumb style={{ margin: '16px 16px 0px 16px' }}>
+        {matchedRoutes.map(({ route }, idx) => (
+          <Breadcrumb.Item key={route.path}>
+            {idx === matchedRoutes.length - 1 ? (
+              route.title
+            ) : (
+              <Link to={route.path}>{route.title}</Link>
+            )}
+          </Breadcrumb.Item>
+        ))}
+      </Breadcrumb>
+      <div style={{ padding: 16 }}>{children}</div>
+    </AntContent>
+  );
+};
 
 Content.propTypes = {
   children: PropTypes.oneOfType([
diff --git a/src/components/skeleton/footer/Footer.js b/src/components/skeleton/footer/Footer.js
index 15c56fa..4d353a0 100644
--- a/src/components/skeleton/footer/Footer.js
+++ b/src/components/skeleton/footer/Footer.js
@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
 
 const { Footer: AntFooter } = Layout;
 
-const Footer = ({ footer }) => (
-  <AntFooter style={{ textAlign: 'center' }}>{footer}</AntFooter>
-);
+const Footer = function ({ footer }) {
+  return <AntFooter style={{ textAlign: 'center' }}>{footer}</AntFooter>;
+};
 
 Footer.propTypes = {
   footer: PropTypes.string.isRequired,
diff --git a/src/components/skeleton/header/Header.js b/src/components/skeleton/header/Header.js
index fcd23a5..e2884e6 100644
--- a/src/components/skeleton/header/Header.js
+++ b/src/components/skeleton/header/Header.js
@@ -21,23 +21,25 @@ const avatarMenu = (
   </Menu>
 );
 
-const Header = ({ isSiderCollapsed, onToggleSider }) => (
-  <AntHeader style={{ background: '#fff', padding: 0 }}>
-    <LegacyIcon
-      className="trigger"
-      type={isSiderCollapsed ? 'menu-unfold' : 'menu-fold'}
-      onClick={onToggleSider}
-    />
-    <Dropdown overlay={avatarMenu} trigger={['click']}>
-      <Avatar
-        size="large"
-        shape="square"
-        className="avatar"
-        icon={<UserOutlined />}
+const Header = function ({ isSiderCollapsed, onToggleSider }) {
+  return (
+    <AntHeader style={{ background: '#fff', padding: 0 }}>
+      <LegacyIcon
+        className="trigger"
+        type={isSiderCollapsed ? 'menu-unfold' : 'menu-fold'}
+        onClick={onToggleSider}
       />
-    </Dropdown>
-  </AntHeader>
-);
+      <Dropdown overlay={avatarMenu} trigger={['click']}>
+        <Avatar
+          size="large"
+          shape="square"
+          className="avatar"
+          icon={<UserOutlined />}
+        />
+      </Dropdown>
+    </AntHeader>
+  );
+};
 
 Header.propTypes = {
   isSiderCollapsed: PropTypes.bool.isRequired,
diff --git a/src/components/skeleton/layout/Layout.js b/src/components/skeleton/layout/Layout.js
index 471f5f7..52b491b 100755
--- a/src/components/skeleton/layout/Layout.js
+++ b/src/components/skeleton/layout/Layout.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import { Footer, Sider, Header, Content } from '..';
 import * as menuTypes from '../../../routes/menuTypes';
 
-const Layout = ({ route, location }) => {
+const Layout = function ({ route, location }) {
   const { routes } = route;
   const { pathname } = location;
   const children = renderRoutes(routes);
diff --git a/src/components/skeleton/sider/Sider.js b/src/components/skeleton/sider/Sider.js
index c46e110..3c4eb74 100644
--- a/src/components/skeleton/sider/Sider.js
+++ b/src/components/skeleton/sider/Sider.js
@@ -8,7 +8,7 @@ import './Sider.css';
 const { Sider: AntSider } = Layout;
 const { SubMenu, Item } = Menu;
 
-const Sider = ({ isCollapsed, mainMenuRoutes, matchedRoutes }) => {
+const Sider = function ({ isCollapsed, mainMenuRoutes, matchedRoutes }) {
   const activeKeys = matchedRoutes.map((item) => item.route.name);
 
   return (
diff --git a/src/pages/Home.js b/src/pages/Home.js
index e611434..bd5850b 100644
--- a/src/pages/Home.js
+++ b/src/pages/Home.js
@@ -9,8 +9,8 @@ import { Statistic, Card, Row, Col, Avatar, Button, Calendar } from 'antd';
 
 const { Meta } = Card;
 
-export default () => (
-  <>
+export default function () {
+  return (
     <Row gutter={16} style={{ marginBottom: 20 }}>
       <Col span={4}>
         <Card
@@ -68,5 +68,5 @@ export default () => (
         </Card>
       </Col>
     </Row>
-  </>
-);
+  );
+}
diff --git a/src/pages/UserSettings.js b/src/pages/UserSettings.js
index 1c68ebd..3e93236 100644
--- a/src/pages/UserSettings.js
+++ b/src/pages/UserSettings.js
@@ -7,7 +7,7 @@ import Security from './user-configs/Security';
 
 const { TabPane } = Tabs;
 
-export default () => {
+export default function () {
   return (
     <Card bodyStyle={{ paddingLeft: 0 }}>
       <Tabs defaultActiveKey="1" tabPosition="left">
@@ -23,4 +23,4 @@ export default () => {
       </Tabs>
     </Card>
   );
-};
+}
diff --git a/src/routes/withHelmet.js b/src/routes/withHelmet.js
index f98d77c..8202e05 100644
--- a/src/routes/withHelmet.js
+++ b/src/routes/withHelmet.js
@@ -6,10 +6,7 @@ const withHelmet = (Component) => {
   const routeComponent = ({ route, ...props }) => (
     <>
       <Helmet>
-        <link
-          rel="shortcut icon"
-          href={route.title || 'favicons/favicon-32x32.png'}
-        />
+        <link rel="icon" href={route.title || 'favicons/favicon-32x32.png'} />
         <title>{route.title}</title>
       </Helmet>
       <Component {...props} route={route} />