Merge branch 'pleroma_url_redirect' into 'master'

Redirect default Pleroma URLs Fixes #39, #61, #64, #68, #69 and #81

Closes #81, #69, #68, #64, #61, and #39

See merge request soapbox-pub/soapbox-fe!16
merge-requests/10/merge
Alex Gleason 2020-05-19 16:23:53 +00:00
commit 0431feb22a
1 zmienionych plików z 10 dodań i 0 usunięć

Wyświetl plik

@ -32,6 +32,7 @@ import SearchPage from 'gabsocial/pages/search_page';
import HomePage from 'gabsocial/pages/home_page';
import SidebarMenu from '../../components/sidebar_menu';
import { connectUserStream } from '../../actions/streaming';
import { Redirect } from 'react-router-dom';
import {
Status,
@ -209,6 +210,15 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/groups/:id' page={GroupPage} component={GroupTimeline} content={children} />
*/}
{/* Redirects for non-static Pleroma FE config*/}
<Redirect from='/main/all' to='/timeline/fediverse' />
<Redirect from='/main/public' to='/timeline/local' />
<Redirect from='/main/friends' to='/' />
<Redirect from='/tag/:id' to='/tags/:id' />
<WrappedRoute path='/notice/:statusId' publicRoute exact layout={LAYOUT.STATUS} component={Status} content={children} />
<Redirect from='/users/:username' to='/@:username' />
<Redirect from='/home' to='/' />
<WrappedRoute path='/tags/:id' publicRoute component={HashtagTimeline} content={children} />
<WrappedRoute path='/lists' layout={LAYOUT.DEFAULT} component={Lists} content={children} />