amd/masto-fe-standalone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove /deck prefix

Browse source
This commit is contained in:
Laura Hausmann 2023-10-12 19:54:26 +02:00
parent d7254bd332
commit d35cbe4473
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/javascript/flavours/glitch/components/router.tsx
View file

@ -21,11 +21,7 @@ browserHistory.push = (path: string, state?: MastodonLocationState) => {
state = state ?? {}; state = state ?? {};
state.fromMastodon = true; state.fromMastodon = true;
if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) { originalPush(path, state);
originalPush(`/deck${path}`, state);
} else {
originalPush(path, state);
}
}; };
browserHistory.replace = (path: string, state?: MastodonLocationState) => { browserHistory.replace = (path: string, state?: MastodonLocationState) => {
@ -34,11 +30,7 @@ browserHistory.replace = (path: string, state?: MastodonLocationState) => {
state.fromMastodon = true; state.fromMastodon = true;
} }
if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) { originalReplace(path, state);
originalReplace(`/deck${path}`, state);
} else {
originalReplace(path, state);
}
}; };
export const Router: React.FC<PropsWithChildren> = ({ children }) => { export const Router: React.FC<PropsWithChildren> = ({ children }) => {

7
app/javascript/flavours/glitch/features/ui/index.jsx
View file

@ -174,7 +174,7 @@ class SwitchingColumnsArea extends PureComponent {
if (singleColumn) { if (singleColumn) {
redirect = <Redirect from='/' to='/home' exact />; redirect = <Redirect from='/' to='/home' exact />;
} else { } else {
redirect = <Redirect from='/' to='/deck/getting-started' exact />; redirect = <Redirect from='/' to='/getting-started' exact />;
} }
} else if (singleUserMode && owner && initialState?.accounts[owner]) { } else if (singleUserMode && owner && initialState?.accounts[owner]) {
redirect = <Redirect from='/' to={`/@${initialState.accounts[owner].username}`} exact />; redirect = <Redirect from='/' to={`/@${initialState.accounts[owner].username}`} exact />;
@ -189,9 +189,8 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedSwitch> <WrappedSwitch>
{redirect} {redirect}
{singleColumn ? <Redirect from='/deck' to='/home' exact /> : null} {singleColumn ? <Redirect from='/getting-started' to='/home' exact /> : null}
{singleColumn && pathName.startsWith('/deck/') ? <Redirect from={pathName} to={pathName.slice(5)} /> : null} {pathName.startsWith('/deck/') ? <Redirect from={pathName} to={pathName.slice(5)} /> : null}
{!singleColumn && pathName === '/getting-started' ? <Redirect from='/getting-started' to='/deck/getting-started' exact /> : null}
<WrappedRoute path='/getting-started' component={GettingStarted} content={children} /> <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
<WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} /> <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />

2
public/index.html
View file

@ -7,7 +7,7 @@
<link rel="manifest" type="applicaton/manifest+json" href="/manifest.json" /> <link rel="manifest" type="applicaton/manifest+json" href="/manifest.json" />
<meta name="theme-color" content="#282c37" /> <meta name="theme-color" content="#282c37" />
<meta content='/deck/getting-started' name='initialPath' /> <meta content='/getting-started' name='initialPath' />
<link rel='preload' as='script' href='/packs/js/locales/glitch/en-json.js' /> <link rel='preload' as='script' href='/packs/js/locales/glitch/en-json.js' />
<link rel='preload' as='script' href='/packs/js/flavours/glitch/async/getting_started.js' /> <link rel='preload' as='script' href='/packs/js/flavours/glitch/async/getting_started.js' />