random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Sidebar, NavigationBar components, Added layouts

Browse Source 
• Updated:
- Sidebar, NavigationBar components
- file structures for both

• Added:
- layouts for compnents
This commit is contained in:
mgabdev
2020-09-01 18:13:11 -05:00
parent 147f7ed878
commit d7cd258977
15 changed files with 481 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/gabsocial/layouts/about_layout.js
View File

@@ -5,8 +5,8 @@ import {
BREAKPOINT_EXTRA_SMALL,
} from '../constants'
import { me } from '../initial_state'
import NavigationBar from '../components/navigation_bar'
import LoggedOutNavigationBar from '../components/logged_out_navigation_bar'
import DefaultNavigationBar from '../components/navigation_bar/default_navigation_bar'
import LoggedOutNavigationBar from '../components/navigation_bar/logged_out_navigation_bar'
import FooterBar from '../components/footer_bar'
import Responsive from '../features/ui/util/responsive_component'
import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
@@ -79,7 +79,7 @@ class SettingsLayout extends React.PureComponent {
{
me &&
<NavigationBar title={title} noSearch />
<DefaultNavigationBar title={title} noSearch />
}
{
!me &&

12
app/javascript/gabsocial/layouts/layout.js
View File

@@ -6,11 +6,11 @@ import {
BREAKPOINT_EXTRA_SMALL,
} from '../constants'
import { me } from '../initial_state'
import LoggedOutSidebar from '../components/logged_out_sidebar'
import Sidebar from '../components/sidebar'
import LoggedOutSidebar from '../components/sidebar/logged_out_sidebar'
import DefaultSidebar from '../components/sidebar/default_sidebar'
import SidebarPanelGroup from '../components/sidebar_panel_group'
import NavigationBar from '../components/navigation_bar'
import LoggedOutNavigationBar from '../components/logged_out_navigation_bar'
import DefaultNavigationBar from '../components/navigation_bar/default_navigation_bar'
import LoggedOutNavigationBar from '../components/navigation_bar/logged_out_navigation_bar'
import FooterBar from '../components/footer_bar'
import FloatingActionButton from '../components/floating_action_button'
import Responsive from '../features/ui/util/responsive_component'
@@ -58,7 +58,7 @@ class Layout extends React.PureComponent {
{
me &&
<NavigationBar
<DefaultNavigationBar
actions={actions}
tabs={tabs}
title={title}
@@ -76,7 +76,7 @@ class Layout extends React.PureComponent {
<Responsive min={BREAKPOINT_EXTRA_SMALL}>
{
!!me &&
<Sidebar
<DefaultSidebar
actions={actions}
showBackBtn={showBackBtn}
tabs={tabs}

8
app/javascript/gabsocial/layouts/profile_layout.js
View File

@@ -6,12 +6,12 @@ import { BREAKPOINT_EXTRA_SMALL } from '../constants'
import Sticky from 'react-stickynode'
import { me } from '../initial_state'
import { CX } from '../constants'
import NavigationBar from '../components/navigation_bar'
import DefaultNavigationBar from '../components/navigation_bar/default_navigation_bar'
import FooterBar from '../components/footer_bar'
import ProfileHeader from '../components/profile_header'
import FloatingActionButton from '../components/floating_action_button'
import ProfileNavigationBar from '../components/profile_navigation_bar'
import LoggedOutNavigationBar from '../components/logged_out_navigation_bar'
import ProfileNavigationBar from '../components/navigation_bar/profile_navigation_bar'
import LoggedOutNavigationBar from '../components/navigation_bar/logged_out_navigation_bar'
import Responsive from '../features/ui/util/responsive_component'
import Divider from '../components/divider'
import WrappedBundle from '../features/ui/util/wrapped_bundle'
@@ -91,7 +91,7 @@ class ProfileLayout extends ImmutablePureComponent {
<Responsive min={BREAKPOINT_EXTRA_SMALL}>
{
me &&
<NavigationBar />
<DefaultNavigationBar />
}
{
!me &&

6
app/javascript/gabsocial/layouts/settings_layout.js
View File

@@ -5,11 +5,11 @@ import {
BREAKPOINT_EXTRA_SMALL,
} from '../constants'
import { me } from '../initial_state'
import NavigationBar from '../components/navigation_bar'
import DefaultNavigationBar from '../components/navigation_bar/default_navigation_bar'
import FooterBar from '../components/footer_bar'
import Responsive from '../features/ui/util/responsive_component'
import ResponsiveClassesComponent from '../features/ui/util/responsive_classes_component'
import SettingsSidebar from '../components/settings_sidebar'
import SettingsSidebar from '../components/sidebar/settings_sidebar'
import WrappedBundle from '../features/ui/util/wrapped_bundle'
import {
SidebarXS,
@@ -37,7 +37,7 @@ class SettingsLayout extends React.PureComponent {
<WrappedBundle component={SidebarXS} />
</Responsive>
<NavigationBar
<DefaultNavigationBar
title={title}
noSearch
/>