bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'loading' into 'develop'

Browse source 
Pageload improvements

Closes #976

See merge request soapbox-pub/soapbox-fe!1441
This commit is contained in:
Alex Gleason 2022-05-24 18:17:39 +00:00
commit 2c69cc5de4
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/soapbox/actions/auth.js
View file

@ -207,9 +207,12 @@ export function rememberAuthAccount(accountUrl) {
export function loadCredentials(token, accountUrl) { export function loadCredentials(token, accountUrl) {
return (dispatch, getState) => { return (dispatch, getState) => {
return dispatch(rememberAuthAccount(accountUrl)).finally(() => { return dispatch(rememberAuthAccount(accountUrl))
return dispatch(verifyCredentials(token, accountUrl)); .then(account => account)
}); .then(() => {
dispatch(verifyCredentials(token, accountUrl));
})
.catch(error => dispatch(verifyCredentials(token, accountUrl)));
}; };
} }

3
app/soapbox/components/loading-screen.tsx
View file

@ -9,7 +9,8 @@ const LoadingScreen: React.FC = () => {
<div className='fixed h-screen w-screen'> <div className='fixed h-screen w-screen'>
<LandingGradient /> <LandingGradient />
<div className='fixed h-screen w-screen flex items-center justify-center z-10'> <div className='fixed d-screen w-screen flex items-center justify-center z-10'>
{/* Bump up spinner vertically to counteract optical illusion. */}
<Spinner size={40} withText={false} /> <Spinner size={40} withText={false} />
</div> </div>
</div> </div>

4
app/styles/application.scss
View file

@ -102,6 +102,10 @@
.shadow-inset { .shadow-inset {
box-shadow: inset 0 0 0 1px rgb(255 255 255 / 10%); box-shadow: inset 0 0 0 1px rgb(255 255 255 / 10%);
} }
.d-screen {
height: 100dvh;
}
} }
@import 'forms'; @import 'forms';