diff --git a/package.json b/package.json
index 50ea207..4f1c277 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"customize-cra": "^1.0.0",
"less": "^3.12.2",
"less-loader": "^6.2.0",
- "prop-types": "^15.7.2",
+ "prop-types": "^15.8.0",
"react": "^16.13.1",
"react-app-rewired": "^2.1.6",
"react-dom": "^16.13.1",
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 = () => (
-
- {renderRoutes(getRoutes({ isLoggedUser: true }))}
-
-);
+const App = function () {
+ return (
+
+ {renderRoutes(getRoutes({ isLoggedUser: true }))}
+
+ );
+};
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 }) => (
-
-
- {matchedRoutes.map(({ route }, idx) => (
-
- {idx === matchedRoutes.length - 1 ? (
- route.title
- ) : (
- {route.title}
- )}
-
- ))}
-
- {children}
-
-);
+const Content = function ({ children, matchedRoutes }) {
+ return (
+
+
+ {matchedRoutes.map(({ route }, idx) => (
+
+ {idx === matchedRoutes.length - 1 ? (
+ route.title
+ ) : (
+ {route.title}
+ )}
+
+ ))}
+
+ {children}
+
+ );
+};
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 }) => (
- {footer}
-);
+const Footer = function ({ footer }) {
+ return {footer};
+};
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 = (
);
-const Header = ({ isSiderCollapsed, onToggleSider }) => (
-
-
-
- }
+const Header = function ({ isSiderCollapsed, onToggleSider }) {
+ return (
+
+
-
-
-);
+
+ }
+ />
+
+
+ );
+};
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 (
(
- >
-);
+ );
+}
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 (
@@ -23,4 +23,4 @@ export default () => {
);
-};
+}
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 }) => (
<>
-
+
{route.title}
diff --git a/yarn.lock b/yarn.lock
index 1d2644a..bc88ef5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9993,14 +9993,14 @@ prop-types-exact@^1.2.0:
object.assign "^4.1.0"
reflect.ownkeys "^0.2.0"
-prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
- version "15.7.2"
- resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
- integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.0:
+ version "15.8.0"
+ resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588"
+ integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g==
dependencies:
loose-envify "^1.4.0"
object-assign "^4.1.1"
- react-is "^16.8.1"
+ react-is "^16.13.1"
proxy-addr@~2.0.5:
version "2.0.6"
@@ -10744,7 +10744,7 @@ react-icons@^3.8.0:
dependencies:
camelcase "^5.0.0"
-react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.4, react-is@^16.8.6:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==