Progress

app/javascript/gabsocial/features/compose/components/upload_form/index.js

@@ -0,0 +1 @@
+export { default } from './upload_form';

app/javascript/gabsocial/features/status/components/detailed_status/detailed_status.js

@@ -203,9 +203,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
 
           {media}
 
-          {status.get('quote') && <StatusQuote
+          { /* status.get('quote') && <StatusQuote
             id={status.get('quote')}
-          />}
+          /> */ }
 
           <div className='detailed-status__meta'>
             <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener'>

app/javascript/gabsocial/features/ui/ui.js

@@ -20,12 +20,10 @@ import NotificationsContainer from '../../containers/notifications_container';
 import LoadingBarContainer from '../../containers/loading_bar_container';
 import ModalContainer from '../../containers/modal_container';
 import UploadArea from '../../components/upload_area';
-import TabsBar from '../../components/tabs_bar';
 import FooterBar from '../../components/footer_bar';
 // import TrendsPanel from './components/trends_panel';
 import { WhoToFollowPanel } from '../../components/panel';
 import LinkFooter from '../../components/link_footer';
-import SidebarMenu from '../../components/sidebar_menu';
 import ProfilePage from '../../pages/profile_page';
 // import GroupsPage from 'gabsocial/pages/groups_page';
 import GroupPage from '../../pages/group_page';
@@ -534,19 +532,19 @@ class UI extends PureComponent {
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
-          <TabsBar />
           <SwitchingColumnsArea location={location} onLayoutChange={this.handleLayoutChange}>
             {children}
           </SwitchingColumnsArea>
-          <FooterBar />
+          { /* <FooterBar /> */ }
 
-          {me && floatingActionButton}
+          { /* me && floatingActionButton */ }
 
+          { /*
           <NotificationsContainer />
           <LoadingBarContainer className='loading-bar' />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
-          {me && <SidebarMenu />}
+          */ }
         </div>
       </HotKeys>
     );

app/javascript/gabsocial/features/ui/util/wrapped_route.js

@@ -1,5 +1,5 @@
 import { Route } from 'react-router-dom';
-import ColumnsArea from '../../../components/columns_area';
+import PageLayout from '../../../components/page_layout';
 import BundleColumnError from '../../../components/bundle_column_error';
 import Bundle from './bundle';
 import { me } from '../../../initial_state';
@@ -42,11 +42,11 @@ export default class WrappedRoute extends Component {
       <Bundle fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
         {Component =>
           (
-            <ColumnsArea layout={layout}>
+            <PageLayout layout={layout}>
               <Component params={match.params} {...componentParams}>
                 {content}
               </Component>
-            </ColumnsArea>
+            </PageLayout>
           )
         }
       </Bundle>