diff --git a/packages/concordia-app/public/locales/en/translation.json b/packages/concordia-app/public/locales/en/translation.json index e288c36..78f816d 100644 --- a/packages/concordia-app/public/locales/en/translation.json +++ b/packages/concordia-app/public/locales/en/translation.json @@ -9,5 +9,6 @@ "register.form.username.field.label": "Username", "register.form.username.field.placeholder": "Username", "register.p.account.address": "Account address:", + "topbar.button.profile": "Profile", "topbar.button.register": "Sign Up" } \ No newline at end of file diff --git a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx index e017c4f..7edbf43 100644 --- a/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx +++ b/packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx @@ -1,12 +1,14 @@ import React from 'react'; -import { withRouter } from 'react-router'; import { Menu } from 'semantic-ui-react'; import { useTranslation } from 'react-i18next'; +import { useHistory } from 'react-router'; +import { connect } from 'react-redux'; import AppContext from '../../../components/AppContext'; import appLogo from '../../../assets/images/app_logo.png'; const MainLayoutMenu = (props) => { - const { history: { push } } = props; + const { user: { hasSignedUp } } = props; + const history = useHistory(); const { t } = useTranslation(); return ( @@ -18,19 +20,33 @@ const MainLayoutMenu = (props) => { link name="home" key="home" - onClick={() => { push('/'); }} + onClick={() => { history.push('/'); }} > -