diff --git a/package-lock.json b/package-lock.json
index 1e18c67..60e2455 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1315,11 +1315,6 @@
"resolved": "https://lab.code-rove.com/public-node-registry/@flare/js-utils/-/js-utils-1.0.3.tgz",
"integrity": "sha512-VgXQHoQEVZ/71B6YQHQP8/Yd/w1smGD+kCCiNvJKZ1xMD3nkN9mjoHxIqbOJMZ2q5PZlV6gXYT7eVol8Wm+D0A=="
},
- "@flare/react-hooks": {
- "version": "1.0.1",
- "resolved": "https://lab.code-rove.com/public-node-registry/@flare/react-hooks/-/react-hooks-1.0.1.tgz",
- "integrity": "sha512-mU6zkdETonWv0SnxT1qF/lch6ND1yph6bAw+BaYxl/jj8tasOune+KKfyGcLFR/Kso3q8PlVPT8x4CiLiO6woQ=="
- },
"@flare/tuitio-client": {
"version": "1.1.0",
"resolved": "https://lab.code-rove.com/public-node-registry/@flare/tuitio-client/-/tuitio-client-1.1.0.tgz",
diff --git a/package.json b/package.json
index 793212c..03c4b95 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
},
"private": true,
"dependencies": {
- "@flare/react-hooks": "^1.0.1",
"@flare/js-utils": "^1.0.3",
"@flare/tuitio-client-react": "^1.1.1",
"@material-ui/core": "^4.11.2",
diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json
index e57ec3a..611c4b7 100644
--- a/public/locales/en/translations.json
+++ b/public/locales/en/translations.json
@@ -22,7 +22,7 @@
"Dashboard": "Dashboard",
"Machines": "Machines",
"System": "System",
- "Trash": "Trash",
+ "Administration": "Administration",
"Settings": "Settings",
"About": "About"
},
@@ -43,6 +43,7 @@
"Description": "{{userName}}, authenticated on {{loginDate}}",
"OpenPortfolio": "Open portfolio"
},
+ "Settings": "Settings",
"Logout": "Logout"
},
"Machine": {
diff --git a/public/locales/ro/translations.json b/public/locales/ro/translations.json
index 625d0f4..357e813 100644
--- a/public/locales/ro/translations.json
+++ b/public/locales/ro/translations.json
@@ -13,7 +13,7 @@
"Dashboard": "Bord",
"Machines": "Mașini",
"System": "Sistem",
- "Trash": "Gunoi",
+ "Administration": "Administrare",
"Settings": "Setări",
"About": "Despre"
},
@@ -34,6 +34,7 @@
"Description": "{{userName}}, autentificat pe {{loginDate}}",
"OpenPortfolio": "Deschide portofoliu"
},
+ "Settings": "Setări",
"Logout": "Deconectare"
},
"Machine": {
diff --git a/src/components/common/PageTitle.js b/src/components/common/PageTitle.js
index c00ebc9..9a5646c 100644
--- a/src/components/common/PageTitle.js
+++ b/src/components/common/PageTitle.js
@@ -19,24 +19,26 @@ const useStyles = makeStyles(theme => ({
titleText: { textTransform: "uppercase" }
}));
-const PageTitle = ({ text, toolBar }) => {
+const PageTitle = ({ text, toolBar, navigation }) => {
const classes = useStyles();
return (
+ {navigation && navigation}
{text}
- {toolBar}
+ {toolBar && toolBar}
);
};
PageTitle.propTypes = {
text: PropTypes.string.isRequired,
- toolBar: PropTypes.node
+ toolBar: PropTypes.node,
+ navigation: PropTypes.node
};
export default PageTitle;
diff --git a/src/components/layout/AppRoutes.js b/src/components/layout/AppRoutes.js
index c841ae2..bba92cf 100644
--- a/src/components/layout/AppRoutes.js
+++ b/src/components/layout/AppRoutes.js
@@ -5,6 +5,7 @@ import NetworkContainer from "../../features/network/components/NetworkContainer
import SettingsContainer from "../../features/settings/components/SettingsContainer";
import DashboardContainer from "../../features/dashboard/components/DashboardContainer";
import UserProfileContainer from "../../features/user/profile/components/UserProfileContainer";
+import AboutContainer from "../../features/about/components/AboutContainer";
const AppRoutes = () => {
return (
@@ -13,6 +14,7 @@ const AppRoutes = () => {
+
);
diff --git a/src/components/layout/ProfileButton.js b/src/components/layout/ProfileButton.js
index 15a53d8..fbff053 100644
--- a/src/components/layout/ProfileButton.js
+++ b/src/components/layout/ProfileButton.js
@@ -9,6 +9,7 @@ import {
import AccountCircle from "@material-ui/icons/AccountCircle";
import ExitToAppIcon from "@material-ui/icons/ExitToApp";
import AccountBoxIcon from "@material-ui/icons/AccountBox";
+import SettingsIcon from "@material-ui/icons/Settings";
import { useHistory } from "react-router-dom";
import { useTuitioClient } from "@flare/tuitio-client-react";
import { useToast } from "../../hooks";
@@ -77,6 +78,17 @@ const ProfileButton = () => {
{t("User.Profile.Label")}
+