Merge pull request mastodon#774 from pixiv/form

Fix intent

app/javascript/pawoo_music/components/timeline/timeline.js

@@ -15,7 +15,7 @@ export default class Timeline extends PureComponent {
   static propTypes = {
     target: PropTypes.string.isRequired,
     children: PropTypes.node,
-    gallery: PropTypes.node.isRequired,
+    gallery: PropTypes.node,
     galleryStyle: PropTypes.object,
   }
 
@@ -28,12 +28,14 @@ export default class Timeline extends PureComponent {
         <div className='navigation-column'>
           <GlobalNaviContainer />
         </div>
-        <div className='lobby-column'>
+        <div className={classNames('lobby-column', { 'with-gallery': gallery })}>
           {children}
         </div>
-        <div className='gallery-column' style={galleryStyle}>
-          {gallery}
-        </div>
+        {gallery && (
+          <div className='gallery-column' style={galleryStyle}>
+            {gallery}
+          </div>
+        )}
       </div>
     );
   }

app/javascript/pawoo_music/components/timeline/timeline.scss

@@ -73,7 +73,7 @@
 
   .lobby-column {
     flex-shrink: 0;
-    flex-grow: 0;
+    flex-grow: 1;
     width: var(--width-lobby);
 
     display: flex;
@@ -107,6 +107,10 @@
         }
       }
     }
+
+    &.with-gallery {
+      flex-grow: 0;
+    }
   }
 
   .gallery-column {

app/javascript/pawoo_music/containers/app/app.js

@@ -14,7 +14,7 @@ import PublicTimelineContainer from '../public_timeline';
 import HashtagTimelineContainer from '../hashtag_timeline';
 import AccountGalleryContainer from '../account_gallery';
 import FavouritedStatusesContainer from '../favourited_statuses';
-import Intent from '../../components/intent';
+import IntentContainer from '../../containers/intent';
 import LoadingBarContainer from '../../../mastodon/features/ui/containers/loading_bar_container';
 import NotificationsContainer from '../../../mastodon/features/ui/containers/notifications_container';
 import AccountFollowersContainer from '../account_followers';
@@ -144,7 +144,7 @@ export default class App extends PureComponent {
     const routes = (
       <Switch>
         <Route path='/' exact component={HomeTimelineContainer} />
-        <Route path='/share' exact component={Intent} />
+        <Route path='/share' exact component={IntentContainer} />
         <Route path='/notifications' component={NotificationTimelineContainer} />
         <Route path='/timelines/public/local' component={CommunityTimelineContainer} />
         <Route path='/timelines/public' exact component={PublicTimelineContainer} />

app/javascript/pawoo_music/containers/intent/index.js

@@ -0,0 +1,4 @@
+import IntentContainer from './intent';
+import './intent.scss';
+
+export default IntentContainer;

app/javascript/pawoo_music/containers/intent/intent.js

@@ -0,0 +1,30 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { connect } from 'react-redux';
+import AccountContainer from '../account';
+import StatusFormContainer from '../status_form';
+import Timeline from '../../components/timeline';
+
+const mapStateToProps = (state) => ({
+  me: state.getIn(['meta', 'me']),
+});
+
+@connect(mapStateToProps)
+export default class IntentContainer extends React.PureComponent {
+
+  static propTypes = {
+    me: PropTypes.number,
+  };
+
+  render () {
+    return (
+      <Timeline>
+        <div className='intent'>
+          <AccountContainer id={this.props.me} />
+          <StatusFormContainer />
+        </div>
+      </Timeline>
+    );
+  }
+
+}

app/javascript/pawoo_music/containers/intent/intent.scss

@@ -0,0 +1,4 @@
+.intent {
+  margin: auto;
+  width: var(--width-gallery);
+}

config/routes.rb

@@ -121,7 +121,7 @@
 
   # Remote follow
   resource :authorize_follow, only: [:show, :create]
-  resource :share, only: [:show, :create]
+  get '/share', to: 'timelines#index'
 
   namespace :admin do
     resources :subscriptions, only: [:index]