beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into release

Browse source
This commit is contained in:
Abhinav-grd 2021-05-24 09:42:07 +05:30
parent 9b1b8b619e 90e586dded
commit 961c41ce30
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/Sidebar.tsx
View file

@ -158,9 +158,7 @@ export default function Sidebar(props: Props) {
{usage ? ( {usage ? (
constants.USAGE_INFO( constants.USAGE_INFO(
usage, usage,
Math.ceil( Number(convertBytesToGBs(subscription?.storage))
Number(convertBytesToGBs(subscription?.storage))
)
) )
) : ( ) : (
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
@ -182,11 +180,17 @@ export default function Sidebar(props: Props) {
background: '#242424', background: '#242424',
width: '100%', width: '100%',
}} }}
></div> />
<LinkButton style={{ marginTop: '30px' }} onClick={openFeedbackURL}> <LinkButton
style={{ marginTop: '30px' }}
onClick={openFeedbackURL}
>
{constants.REQUEST_FEATURE} {constants.REQUEST_FEATURE}
</LinkButton> </LinkButton>
<LinkButton style={{ marginTop: '30px' }} onClick={openSupportMail}> <LinkButton
style={{ marginTop: '30px' }}
onClick={openSupportMail}
>
{constants.SUPPORT} {constants.SUPPORT}
</LinkButton> </LinkButton>
<> <>
@ -226,7 +230,7 @@ export default function Sidebar(props: Props) {
background: '#242424', background: '#242424',
width: '100%', width: '100%',
}} }}
></div> />
<LinkButton <LinkButton
variant="danger" variant="danger"
style={{ marginTop: '30px' }} style={{ marginTop: '30px' }}
@ -246,6 +250,12 @@ export default function Sidebar(props: Props) {
> >
logout logout
</LinkButton> </LinkButton>
<div
style={{
marginTop: '40px',
width: '100%',
}}
/>
</div> </div>
</Menu> </Menu>
); );

2
src/pages/gallery/components/Upload.tsx
View file

@ -169,7 +169,6 @@ export default function Upload(props: Props) {
await uploadFiles(filesWithCollectionToUpload); await uploadFiles(filesWithCollectionToUpload);
} catch (e) { } catch (e) {
console.error('Failed to upload files to new collections', e); console.error('Failed to upload files to new collections', e);
setProgressView(false);
} }
}; };
@ -192,6 +191,7 @@ export default function Upload(props: Props) {
props.setBannerMessage(err.message); props.setBannerMessage(err.message);
throw err; throw err;
} finally { } finally {
setProgressView(false);
props.syncWithRemote(); props.syncWithRemote();
} }
}; };

2
src/utils/strings/englishConstants.tsx
View file

@ -90,7 +90,7 @@ const englishConstants = {
SUBSCRIPTION_EXPIRED: 'your subscription has expired, please renew it', SUBSCRIPTION_EXPIRED: 'your subscription has expired, please renew it',
STORAGE_QUOTA_EXCEEDED: STORAGE_QUOTA_EXCEEDED:
'you have exceeded your storage quota, please upgrade your plan from the mobile app', 'you have exceeded your storage quota, please upgrade your plan',
INITIAL_LOAD_DELAY_WARNING: 'the first load may take some time', INITIAL_LOAD_DELAY_WARNING: 'the first load may take some time',
USER_DOES_NOT_EXIST: 'sorry, could not find a user with that email', USER_DOES_NOT_EXIST: 'sorry, could not find a user with that email',
UPLOAD_BUTTON_TEXT: 'upload', UPLOAD_BUTTON_TEXT: 'upload',