Progress
added composer query string functionality for url, text. fixed issue with no user in base_controller, cleaned up video component, albums starting
This commit is contained in:
@@ -1,28 +1,27 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { me } from '../initial_state'
|
||||
import DefaultSidebar from '../components/sidebar/default_sidebar'
|
||||
import { CX } from '../constants'
|
||||
import ComposeNavigationBar from '../components/navigation_bar/compose_navigation_bar_xs'
|
||||
import Responsive from '../features/ui/util/responsive_component'
|
||||
import WrappedBundle from '../features/ui/util/wrapped_bundle'
|
||||
import {
|
||||
SidebarXS,
|
||||
} from '../features/ui/util/async_components'
|
||||
|
||||
class ComposeLayout extends React.PureComponent {
|
||||
|
||||
render() {
|
||||
const { children, isXS } = this.props
|
||||
|
||||
if (!isXS) return null
|
||||
|
||||
const mainClasses = CX({
|
||||
d: 1,
|
||||
w100PC: 1,
|
||||
flexGrow1: 1,
|
||||
borderRight1PX: !isXS,
|
||||
borderLeft1PX: !isXS,
|
||||
borderColorSecondary: !isXS,
|
||||
})
|
||||
|
||||
return (
|
||||
<div className={[_s.d, _s.w100PC, _s.minH100VH, _s.bgTertiary].join(' ')}>
|
||||
<WrappedBundle component={SidebarXS} />
|
||||
|
||||
<ComposeNavigationBar />
|
||||
|
||||
<main role='main' className={[_s.d, _s.w100PC, _s.flexGrow1].join(' ')}>
|
||||
<div className={[_s.d, _s.w100PC, _s.maxW640PX, _s.mlAuto, _s.mrAuto, _s.minH100VH, _s.bgTertiary].join(' ')}>
|
||||
<ComposeNavigationBar isXS={isXS} />
|
||||
<main role='main' className={mainClasses}>
|
||||
{ children }
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -88,7 +88,7 @@ class ProfileLayout extends ImmutablePureComponent {
|
||||
<Responsive max={BREAKPOINT_EXTRA_SMALL}>
|
||||
{
|
||||
!!me &&
|
||||
<ProfileNavigationBar titleHTML={titleHTML} />
|
||||
<ProfileNavigationBar titleHTML={titleHTML} account={account} />
|
||||
}
|
||||
{
|
||||
!me &&
|
||||
|
||||
Reference in New Issue
Block a user