Updated some pages and layouts for navigation noSearch and showBackBtn

• Updated:
- some pages and layouts for navigation noSearch and showBackBtn
This commit is contained in:
mgabdev 2020-10-30 12:57:20 -05:00
parent 04cf1ad7ce
commit 73e1584d43
8 changed files with 5 additions and 23 deletions

View File

@ -79,7 +79,7 @@ class AboutLayout extends React.PureComponent {
{ {
me && me &&
<DefaultNavigationBar title={title} noSearch /> <DefaultNavigationBar title={title} />
} }
{ {
!me && !me &&

View File

@ -15,7 +15,6 @@ class DefaultLayout extends React.PureComponent {
showBackBtn, showBackBtn,
tabs, tabs,
title, title,
noSearch,
} = this.props } = this.props
return ( return (
@ -28,7 +27,6 @@ class DefaultLayout extends React.PureComponent {
showBackBtn={showBackBtn} showBackBtn={showBackBtn}
tabs={tabs} tabs={tabs}
title={title} title={title}
noSearch={noSearch}
> >
{children} {children}
</Layout> </Layout>
@ -45,7 +43,6 @@ DefaultLayout.propTypes = {
noRightSidebar: PropTypes.bool, noRightSidebar: PropTypes.bool,
page: PropTypes.string, page: PropTypes.string,
showBackBtn: PropTypes.bool, showBackBtn: PropTypes.bool,
noSearch: PropTypes.bool,
tabs: PropTypes.array, tabs: PropTypes.array,
title: PropTypes.string.isRequired, title: PropTypes.string.isRequired,
} }

View File

@ -38,7 +38,6 @@ class Layout extends React.PureComponent {
showGlobalFooter, showGlobalFooter,
tabs, tabs,
title, title,
noSearch,
} = this.props } = this.props
const mainBlockClasses = CX({ const mainBlockClasses = CX({
@ -64,7 +63,6 @@ class Layout extends React.PureComponent {
tabs={tabs} tabs={tabs}
title={title} title={title}
showBackBtn={showBackBtn} showBackBtn={showBackBtn}
noSearch={noSearch}
/> />
} }
{ {
@ -177,7 +175,6 @@ Layout.propTypes = {
showBackBtn: PropTypes.bool, showBackBtn: PropTypes.bool,
showLinkFooterInSidebar: PropTypes.bool, showLinkFooterInSidebar: PropTypes.bool,
showGlobalFooter: PropTypes.bool, showGlobalFooter: PropTypes.bool,
noSearch: PropTypes.bool,
tabs: PropTypes.array, tabs: PropTypes.array,
title: PropTypes.string, title: PropTypes.string,
} }

View File

@ -37,10 +37,7 @@ class SettingsLayout extends React.PureComponent {
<WrappedBundle component={SidebarXS} /> <WrappedBundle component={SidebarXS} />
</Responsive> </Responsive>
<DefaultNavigationBar <DefaultNavigationBar title={title} showBackBtn />
title={title}
noSearch
/>
<div className={[_s.d, _s.flexRow, _s.w100PC].join(' ')}> <div className={[_s.d, _s.flexRow, _s.w100PC].join(' ')}>

View File

@ -71,7 +71,6 @@ class GroupsPage extends React.PureComponent {
return ( return (
<DefaultLayout <DefaultLayout
noSearch
title={title} title={title}
actions={[ actions={[
{ {

View File

@ -52,7 +52,6 @@ class NotificationsPage extends React.PureComponent {
return ( return (
<DefaultLayout <DefaultLayout
noSearch
title={title} title={title}
page='notifications' page='notifications'
layout={[ layout={[

View File

@ -5,17 +5,10 @@ import SettingsLayout from '../layouts/settings_layout'
class SettingsPage extends React.PureComponent { class SettingsPage extends React.PureComponent {
render() { render() {
const { const { children, title } = this.props
children,
tabs,
title,
} = this.props
return ( return (
<SettingsLayout <SettingsLayout title={title}>
title={title}
tabs={tabs}
>
{children} {children}
</SettingsLayout> </SettingsLayout>
) )
@ -25,7 +18,6 @@ class SettingsPage extends React.PureComponent {
SettingsPage.propTypes = { SettingsPage.propTypes = {
children: PropTypes.node.isRequired, children: PropTypes.node.isRequired,
tabs: PropTypes.array,
title: PropTypes.string, title: PropTypes.string,
} }

View File

@ -25,6 +25,7 @@ class ShortcutsPage extends React.PureComponent {
return ( return (
<DefaultLayout <DefaultLayout
showBackBtn
title={title} title={title}
page='shortcuts' page='shortcuts'
actions={[ actions={[