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

Merge branch 'release/v1.11.7' of https://github.com/pterodactyl/panel into release/v1.11.5

Browse source
This commit is contained in:
Angelillo15 2024-05-11 17:11:39 +02:00
commit c332151c9a
29 changed files with 203 additions and 242 deletions
resources/scripts
api
server
types.d.ts
transformers.ts
components/server
features/eula
EulaModalFeature.tsx
startup
VariableBox.tsx

2
resources/scripts/api/server/types.d.ts vendored
View file

@ -23,7 +23,7 @@ export interface ServerEggVariable {
description: string;
envVariable: string;
defaultValue: string;
serverValue: string;
serverValue: string | null;
isEditable: boolean;
rules: string[];
}

1
resources/scripts/api/transformers.ts
View file

@ -40,6 +40,7 @@ export const rawDataToFileObject = (data: FractalResponseData): FileObject => ({
'application/x-xz', // .tar.xz, .xz
'application/zstd', // .tar.zst, .zst
'application/zip', // .zip
'application/x-7z-compressed', // .7z
].indexOf(this.mimetype) >= 0
);
},

2
resources/scripts/components/server/features/eula/EulaModalFeature.tsx
View file

@ -72,7 +72,7 @@ const EulaModalFeature = () => {
target={'_blank'}
css={tw`text-primary-300 underline transition-colors duration-150 hover:text-primary-400`}
rel={'noreferrer noopener'}
href='https://account.mojang.com/documents/minecraft_eula'
href='https://www.minecraft.net/eula'
>
Minecraft® EULA
</a>

16
resources/scripts/components/server/startup/VariableBox.tsx
View file

@ -5,7 +5,6 @@ import { usePermissions } from '@/plugins/usePermissions';
import InputSpinner from '@/components/elements/InputSpinner';
import Input from '@/components/elements/Input';
import Switch from '@/components/elements/Switch';
import tw from 'twin.macro';
import { debounce } from 'debounce';
import updateStartupVariable from '@/api/server/updateStartupVariable';
import useFlash from '@/plugins/useFlash';
@ -61,15 +60,15 @@ const VariableBox = ({ variable }: Props) => {
return (
<TitledGreyBox
title={
<p css={tw`text-sm uppercase`}>
<p className="text-sm uppercase">
{!variable.isEditable && (
<span css={tw`bg-neutral-700 text-xs py-1 px-2 rounded-full mr-2 mb-1`}>Read Only</span>
<span className="bg-neutral-700 text-xs py-1 px-2 rounded-full mr-2 mb-1">Read Only</span>
)}
{variable.name}
</p>
}
>
<FlashMessageRender byKey={FLASH_KEY} css={tw`mb-2 md:mb-4`} />
<FlashMessageRender byKey={FLASH_KEY} className="mb-2 md:mb-4" />
<InputSpinner visible={loading}>
{useSwitch ? (
<>
@ -97,7 +96,7 @@ const VariableBox = ({ variable }: Props) => {
<Select
onChange={(e) => setVariableValue(e.target.value)}
name={variable.envVariable}
defaultValue={variable.serverValue}
defaultValue={variable.serverValue ?? variable.defaultValue}
disabled={!canEdit || !variable.isEditable}
>
{selectValues.map((selectValue) => (
@ -120,7 +119,7 @@ const VariableBox = ({ variable }: Props) => {
}}
readOnly={!canEdit || !variable.isEditable}
name={variable.envVariable}
defaultValue={variable.serverValue}
defaultValue={variable.serverValue ?? ''}
placeholder={variable.defaultValue}
/>
</>
@ -128,7 +127,10 @@ const VariableBox = ({ variable }: Props) => {
</>
)}
</InputSpinner>
<p css={tw`mt-1 text-xs text-neutral-300`}>{variable.description}</p>
<p className="mt-1 text-xs text-neutral-300">
{variable.description}
</p>
</TitledGreyBox>
);
};