feat: universal navbar (#36744)

* feat: add universal nav

* fix: add portfolio redirect
This commit is contained in:
Ahmad Abdolsaheb
2019-09-19 19:45:01 +03:00
committed by mrugesh
parent 5d946f3d77
commit e653235d94
24 changed files with 562 additions and 370 deletions

View File

@@ -27,13 +27,13 @@ import Portfolio from '../components/settings/Portfolio';
import Honesty from '../components/settings/Honesty';
import Certification from '../components/settings/Certification';
import DangerZone from '../components/settings/DangerZone';
import RedirectHome from '../components/RedirectHome';
const propTypes = {
createFlashMessage: PropTypes.func.isRequired,
hardGoTo: PropTypes.func.isRequired,
isSignedIn: PropTypes.bool,
showLoading: PropTypes.bool,
isSignedIn: PropTypes.bool.isRequired,
navigate: PropTypes.func.isRequired,
showLoading: PropTypes.bool.isRequired,
submitNewAbout: PropTypes.func.isRequired,
toggleNightMode: PropTypes.func.isRequired,
updateInternetSettings: PropTypes.func.isRequired,
@@ -105,6 +105,7 @@ const mapDispatchToProps = dispatch =>
{
createFlashMessage,
hardGoTo,
navigate: location => dispatch(hardGoTo(location)),
submitNewAbout,
toggleNightMode: theme => updateUserFlag({ theme }),
updateInternetSettings: updateUserFlag,
@@ -121,7 +122,7 @@ const createHandleSignoutClick = hardGoTo => e => {
return hardGoTo(`${apiLocation}/signout`);
};
function ShowSettings(props) {
export function ShowSettings(props) {
const {
createFlashMessage,
hardGoTo,
@@ -157,6 +158,7 @@ function ShowSettings(props) {
website,
portfolio
},
navigate,
showLoading,
updateQuincyEmail,
updateInternetSettings,
@@ -170,7 +172,7 @@ function ShowSettings(props) {
}
if (!showLoading && !isSignedIn) {
return <RedirectHome />;
return navigate(`${apiLocation}/signin`);
}
return (