MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 06:13:45 +02:00
Code Issues Packages Projects Releases 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
parent e903d4cc2a 7b75e7a648
commit e4d141fa6f
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 ?