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

Merge branch 'develop' into dane/restore-backups

Browse source
This commit is contained in:
Dane Everitt 2021-01-30 10:10:29 -08:00
commit be26921fcc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 440 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en/admin/server.php
View file

@ -29,6 +29,6 @@ return [
'node_required' => 'You must have at least one node configured before you can add a server to this panel.',
'transfer_nodes_required' => 'You must have at least two nodes configured before you can transfer servers.',
'transfer_started' => 'Server transfer has been started.',
'transfer_not_viable' => 'The node you selected is not viable for this transfer.',
'transfer_not_viable' => 'The node you selected does not have the required disk space or memory available to accommodate this server.',
],
];

24
resources/scripts/components/server/settings/SettingsContainer.tsx
View file

@ -30,19 +30,23 @@ export default () => {
<TitledGreyBox title={'SFTP Details'} css={tw`mb-6 md:mb-10`}>
<div>
<Label>Server Address</Label>
<Input
type={'text'}
value={`sftp://${sftp.ip}:${sftp.port}`}
readOnly
/>
<CopyOnClick text={`sftp://${sftp.ip}:${sftp.port}`}>
<Input
type={'text'}
value={`sftp://${sftp.ip}:${sftp.port}`}
readOnly
/>
</CopyOnClick>
</div>
<div css={tw`mt-6`}>
<Label>Username</Label>
<Input
type={'text'}
value={`${username}.${id}`}
readOnly
/>
<CopyOnClick text={`${username}.${id}`}>
<Input
type={'text'}
value={`${username}.${id}`}
readOnly
/>
</CopyOnClick>
</div>
<div css={tw`mt-6 flex items-center`}>
<div css={tw`flex-1`}>