sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix allocation display when a description is present

This commit is contained in:
DaneEveritt 2022-06-25 21:41:52 -04:00
parent 47d6235ea0
commit 82d8713b5d
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resources/scripts/components/dashboard/ServerRow.tsx
View File

@ -4,7 +4,7 @@ import { faEthernet, faHdd, faMemory, faMicrochip, faServer } from '@fortawesome
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Server } from '@/api/server/getServer'; import { Server } from '@/api/server/getServer';
import getServerResourceUsage, { ServerPowerState, ServerStats } from '@/api/server/getServerResourceUsage'; import getServerResourceUsage, { ServerPowerState, ServerStats } from '@/api/server/getServerResourceUsage';
import { bytesToHuman, megabytesToHuman, formatIp } from '@/helpers'; import { bytesToHuman, formatIp, megabytesToHuman } from '@/helpers';
import tw from 'twin.macro'; import tw from 'twin.macro';
import GreyRowBox from '@/components/elements/GreyRowBox'; import GreyRowBox from '@/components/elements/GreyRowBox';
import Spinner from '@/components/elements/Spinner'; import Spinner from '@/components/elements/Spinner';
@ -87,21 +87,23 @@ export default ({ server, className }: { server: Server; className?: string }) =
<div> <div>
<p css={tw`text-lg break-words`}>{server.name}</p> <p css={tw`text-lg break-words`}>{server.name}</p>
{!!server.description && {!!server.description &&
<p css={tw`text-sm text-neutral-300 break-words`}>{server.description}</p> <p css={tw`text-sm text-neutral-300 break-words line-clamp-2`}>{server.description}</p>
} }
</div> </div>
</div> </div>
<div css={tw`hidden lg:col-span-2 lg:flex ml-4 justify-end h-full`}> <div css={tw`flex-1 ml-4 lg:block lg:col-span-2 hidden`}>
<FontAwesomeIcon icon={faEthernet} css={tw`text-neutral-500`}/> <div css={tw`flex justify-center`}>
<p css={tw`text-sm text-neutral-400 ml-2`}> <FontAwesomeIcon icon={faEthernet} css={tw`text-neutral-500`}/>
{ <p css={tw`text-sm text-neutral-400 ml-2`}>
server.allocations.filter(alloc => alloc.isDefault).map(allocation => ( {
<React.Fragment key={allocation.ip + allocation.port.toString()}> server.allocations.filter(alloc => alloc.isDefault).map(allocation => (
{allocation.alias || formatIp(allocation.ip)}:{allocation.port} <React.Fragment key={allocation.ip + allocation.port.toString()}>
</React.Fragment> {allocation.alias || formatIp(allocation.ip)}:{allocation.port}
)) </React.Fragment>
} ))
</p> }
</p>
</div>
</div> </div>
<div css={tw`hidden col-span-7 lg:col-span-4 sm:flex items-baseline justify-center`}> <div css={tw`hidden col-span-7 lg:col-span-4 sm:flex items-baseline justify-center`}>
{(!stats || isSuspended) ? {(!stats || isSuspended) ?