Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2071 from Sir3lit/serverviewchanges

Browse source 
Change to BytesToHuman on server view for limits, to match index page. Changes to CPU/Memory Graph
This commit is contained in:
Dane Everitt 2020-05-28 19:04:19 -07:00 • committed by GitHub
commit 1f943d957a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ export default () => {
className={'mr-1'} className={'mr-1'}
/> />
 {bytesToHuman(memory)}  {bytesToHuman(memory)}
<span className={'text-neutral-500'}> / {server.limits.memory} MB</span> <span className={'text-neutral-500'}> / {bytesToHuman(server.limits.memory * 1000 * 1000)}</span>
</p> </p>
<p className={'text-xs mt-2'}> <p className={'text-xs mt-2'}>
<FontAwesomeIcon <FontAwesomeIcon
@ -121,7 +121,7 @@ export default () => {
className={'mr-1'} className={'mr-1'}
/> />
&nbsp;{bytesToHuman(disk)} &nbsp;{bytesToHuman(disk)}
<span className={'text-neutral-500'}> / {server.limits.disk} MB</span> <span className={'text-neutral-500'}> / {bytesToHuman(server.limits.disk * 1000 * 1000)}</span>
</p> </p>
</TitledGreyBox> </TitledGreyBox>
{!server.isInstalling ? {!server.isInstalling ?

4
resources/scripts/components/server/StatGraphs.tsx
View file

@ -17,14 +17,14 @@ const chartDefaults: ChartConfiguration = {
enabled: false, enabled: false,
}, },
animation: { animation: {
duration: 250, duration: 0,
}, },
elements: { elements: {
point: { point: {
radius: 0, radius: 0,
}, },
line: { line: {
tension: 0.1, tension: 0.3,
backgroundColor: 'rgba(15, 178, 184, 0.45)', backgroundColor: 'rgba(15, 178, 184, 0.45)',
borderColor: '#32D0D9', borderColor: '#32D0D9',
}, },