StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix/2071

Browse source
This commit is contained in:
Matthew Penner 2020-07-04 15:22:25 -06:00 • committed by GitHub
commit e4d141fa6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
165 changed files with 5484 additions and 4129 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/scripts/components/server/ServerConsole.tsx
View file

@ -81,6 +81,9 @@ export default () => {
};
}, [ instance, connected ]);
const disklimit = server.limits.disk != 0 ? megabytesToHuman(server.limits.disk) : "Unlimited";
const memorylimit = server.limits.memory != 0 ? megabytesToHuman(server.limits.memory) : "Unlimited";
return (
<PageContentBlock className={'flex'}>
<div className={'w-1/4'}>
@ -112,7 +115,7 @@ export default () => {
className={'mr-1'}
/>
&nbsp;{bytesToHuman(memory)}
<span className={'text-neutral-500'}> / {megabytesToHuman(server.limits.memory)}</span>
<span className={'text-neutral-500'}> / {memorylimit}</span>
</p>
<p className={'text-xs mt-2'}>
<FontAwesomeIcon
@ -121,7 +124,8 @@ export default () => {
className={'mr-1'}
/>
&nbsp;{bytesToHuman(disk)}
<span className={'text-neutral-500'}> / {megabytesToHuman(server.limits.disk)}</span>
<span className={'text-neutral-500'}> / {disklimit}</span>
</p>
</TitledGreyBox>
{!server.isInstalling ?