This commit is contained in:
mgabdev 2020-03-27 20:09:11 -04:00
parent 392e42f820
commit 2f7eda1081
3 changed files with 1763 additions and 1702 deletions

View File

@ -16,10 +16,6 @@ const mapStateToProps = state => {
} }
} }
bin/rails db:migrate
bin/rails assets:precompile
export default export default
@connect(mapStateToProps) @connect(mapStateToProps)
class SidebarHeader extends ImmutablePureComponent { class SidebarHeader extends ImmutablePureComponent {

View File

@ -40,8 +40,8 @@ import {
Blocks, Blocks,
CommunityTimeline, CommunityTimeline,
DomainBlocks, DomainBlocks,
Favorites, // Favorites,
Filters, // Filters,
Followers, Followers,
Following, Following,
FollowRequests, FollowRequests,
@ -63,7 +63,7 @@ import {
Notifications, Notifications,
Reposts, Reposts,
Search, Search,
Shortcuts, // Shortcuts,
Status, Status,
} from './util/async_components' } from './util/async_components'
import { me, meUsername } from '../../initial_state' import { me, meUsername } from '../../initial_state'
@ -160,7 +160,7 @@ class SwitchingArea extends PureComponent {
<WrappedRoute path='/tags/:id' publicRoute page={HashtagPage} component={HashtagTimeline} content={children} componentParams={{ title: 'Hashtag' }} /> <WrappedRoute path='/tags/:id' publicRoute page={HashtagPage} component={HashtagTimeline} content={children} componentParams={{ title: 'Hashtag' }} />
<WrappedRoute path='/shortcuts' publicRoute page={ShortcutsPage} component={Shortcuts} content={children} /> { /* <WrappedRoute path='/shortcuts' publicRoute page={ShortcutsPage} component={Shortcuts} content={children} /> */ }
<WrappedRoute path='/lists' exact page={ListsPage} component={ListsDirectory} content={children} /> <WrappedRoute path='/lists' exact page={ListsPage} component={ListsDirectory} content={children} />
<WrappedRoute path='/lists/create' exact page={ModalPage} component={ListCreate} content={children} componentParams={{ title: 'Create List' }} /> <WrappedRoute path='/lists/create' exact page={ModalPage} component={ListCreate} content={children} componentParams={{ title: 'Create List' }} />
@ -184,7 +184,7 @@ class SwitchingArea extends PureComponent {
<WrappedRoute path='/settings/blocks' exact page={SettingsPage} component={Blocks} content={children} componentParams={{ title: 'Blocked Accounts' }} /> <WrappedRoute path='/settings/blocks' exact page={SettingsPage} component={Blocks} content={children} componentParams={{ title: 'Blocked Accounts' }} />
<WrappedRoute path='/settings/domain-blocks' exact page={SettingsPage} component={DomainBlocks} content={children} componentParams={{ title: 'Domain Blocks' }} /> <WrappedRoute path='/settings/domain-blocks' exact page={SettingsPage} component={DomainBlocks} content={children} componentParams={{ title: 'Domain Blocks' }} />
<WrappedRoute path='/settings/filters' exact page={SettingsPage} component={Filters} content={children} componentParams={{ title: 'Muted Words' }} /> { /* <WrappedRoute path='/settings/filters' exact page={SettingsPage} component={Filters} content={children} componentParams={{ title: 'Muted Words' }} /> */ }
<WrappedRoute path='/settings/mutes' exact page={SettingsPage} component={Mutes} content={children} componentParams={{ title: 'Muted Accounts' }} /> <WrappedRoute path='/settings/mutes' exact page={SettingsPage} component={Mutes} content={children} componentParams={{ title: 'Muted Accounts' }} />
<Redirect from='/@:username' to='/:username' exact /> <Redirect from='/@:username' to='/:username' exact />
@ -211,8 +211,8 @@ class SwitchingArea extends PureComponent {
<Redirect from='/@:username/posts/:statusId/reposts' to='/:username/posts/:statusId/reposts' /> <Redirect from='/@:username/posts/:statusId/reposts' to='/:username/posts/:statusId/reposts' />
<WrappedRoute path='/:username/posts/:statusId/reposts' page={BasicPage} component={Reposts} content={children} componentParams={{ title: 'Reposts' }} /> <WrappedRoute path='/:username/posts/:statusId/reposts' page={BasicPage} component={Reposts} content={children} componentParams={{ title: 'Reposts' }} />
<Redirect from='/@:username/posts/:statusId/favorites' to='/:username/posts/:statusId/favorites' /> { /* <Redirect from='/@:username/posts/:statusId/favorites' to='/:username/posts/:statusId/favorites' />
<WrappedRoute path='/:username/posts/:statusId/favorites' page={BasicPage} component={Favorites} content={children} componentParams={{ title: 'Favorites' }} /> <WrappedRoute path='/:username/posts/:statusId/favorites' page={BasicPage} component={Favorites} content={children} componentParams={{ title: 'Favorites' }} /> */ }
<WrappedRoute page={ErrorPage} component={GenericNotFound} content={children} /> <WrappedRoute page={ErrorPage} component={GenericNotFound} content={children} />
</Switch> </Switch>

3447
yarn.lock

File diff suppressed because it is too large Load Diff