stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Change order of onboarding steps

Browse Source 
Port 51894ac247 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko
2026-03-11 22:07:31 +01:00
committed by Claire
parent 3833eadfbf
commit 263615b74f
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/flavours/glitch/features/onboarding/follows.tsx
View File

@@ -121,7 +121,6 @@ export const Follows: React.FC<{
icon='person' icon='person'
iconComponent={PersonIcon} iconComponent={PersonIcon}
multiColumn={multiColumn} multiColumn={multiColumn}
showBackButton
/> />
<ColumnSearchHeader <ColumnSearchHeader
@@ -146,10 +145,10 @@ export const Follows: React.FC<{
{displayedAccountIds.length > 0 && <div className='spacer' />} {displayedAccountIds.length > 0 && <div className='spacer' />}
<div className='column-footer'> <div className='column-footer'>
<Link className='button button--block' to='/home'> <Link className='button button--block' to='/start/profile'>
<FormattedMessage <FormattedMessage
id='onboarding.follows.done' id='onboarding.follows.next'
defaultMessage='Done' defaultMessage='Next: Setup your profile'
/> />
</Link> </Link>
</div> </div>

7
app/javascript/flavours/glitch/features/onboarding/profile.tsx
View File

@@ -136,7 +136,7 @@ export const Profile: React.FC<{
}), }),
) )
.then(() => { .then(() => {
history.push('/start/follows'); history.push('/home');
dispatch(closeOnboarding()); dispatch(closeOnboarding());
return ''; return '';
}) })
@@ -163,6 +163,7 @@ export const Profile: React.FC<{
icon='person' icon='person'
iconComponent={PersonIcon} iconComponent={PersonIcon}
multiColumn={multiColumn} multiColumn={multiColumn}
showBackButton
/> />
<div className='scrollable scrollable--flex'> <div className='scrollable scrollable--flex'>
@@ -300,8 +301,8 @@ export const Profile: React.FC<{
<LoadingIndicator /> <LoadingIndicator />
) : ( ) : (
<FormattedMessage <FormattedMessage
id='onboarding.profile.save_and_continue' id='onboarding.profile.finish'
defaultMessage='Save and continue' defaultMessage='Finish'
/> />
)} )}
</Button> </Button>

4
app/javascript/flavours/glitch/features/ui/index.jsx
View File

@@ -238,8 +238,8 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} /> <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} /> <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
<WrappedRoute path={['/start', '/start/profile']} exact component={OnboardingProfile} content={children} /> <WrappedRoute path='/start/profile' exact component={OnboardingProfile} content={children} />
<WrappedRoute path='/start/follows' component={OnboardingFollows} content={children} /> <WrappedRoute path={['/start', '/start/follows']} exact component={OnboardingFollows} content={children} />
<WrappedRoute path='/directory' component={Directory} content={children} /> <WrappedRoute path='/directory' component={Directory} content={children} />
<WrappedRoute path='/explore' component={Explore} content={children} /> <WrappedRoute path='/explore' component={Explore} content={children} />
<WrappedRoute path='/search' component={Search} content={children} /> <WrappedRoute path='/search' component={Search} content={children} />

3
app/javascript/flavours/glitch/styles/mastodon/components.scss
View File

@@ -11813,6 +11813,9 @@ noscript {
.column-footer { .column-footer {
padding: 16px; padding: 16px;
position: sticky;
bottom: 0;
background: var(--color-bg-primary);
} }
.lists-scrollable { .lists-scrollable {