Merge branch 'develop' of https://github.com/kokofixcomputers/Jexactyl …

…into develop
kokofixcomputers · Oct 30, 2024 · f95278e · f95278e
2 parents 5f40a47 + 672ec2e
commit f95278e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,5 +1,5 @@
 
-name: "Release 1.5.2"
+name: "Release 1.5.4"
 
 on:
   workflow_dispatch:  # Allows manual triggering of the workflow
@@ -56,11 +56,11 @@ jobs:
           name: release-artifact
           path: release/kokofixcomputers/panel.tar.gz
 
-      - name: "Release 1.5.2"
+      - name: "Release 1.5.4"
         uses: softprops/action-gh-release@v1
         with:
-          tag_name: "1.5.2"
-          name: "Release 1.5.2"
+          tag_name: "1.5.4"
+          name: "Release 1.5.4"
           files: release/kokofixcomputers/panel.tar.gz  # Specify the file to attach
           draft: false  # Set to true if you want to create a draft release
           prerelease: false  # Set to true if this is a pre-release

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### Version 1.5.4
+- Center everything??????? (by kokodev)
+
+### Version 1.5.3
+- Update index.blade.php (by kokodev)
+- Update index.blade.php (by kokodev)
+- Update FileEditContainer.tsx (by kokodev)
+- Update FileEditContainer.tsx (by kokodev)
+- Use icon (by kokofixcomputers koko)
+
 ### Version 1.5.2
 - Update index.blade.php (by kokodev)
 - Update index.blade.php (by kokodev)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.2
+1.5.4
diff --git a/resources/scripts/components/dashboard/ServerRow.tsx b/resources/scripts/components/dashboard/ServerRow.tsx
@@ -129,34 +129,36 @@ export default ({ server, className }: { server: Server; className?: string }) =
                 </div>
             </div>
             {stats && (
-                <div css={tw`flex flex-col sm:flex-row items-center justify-between col-span-full`}>
-                    {/* CPU Indicator */}
-                    <div css={tw`flex flex-col items-center w-full sm:w-auto mb-4 sm:mb-0`}>
-                        <div css={tw`flex justify-center text-neutral-500`}>
-                            <Icon.Cpu size={20} />
-                            <IconDescription $alarm={alarms.cpu}>{stats.cpuUsagePercent.toFixed(2)}%</IconDescription>
-                        </div>
+                <div css={tw`flex flex-col sm:flex-row items-center justify-center sm:justify-between col-span-full`}>
+                 {/* CPU Indicator */}
+                <div css={tw`flex flex-col items-center w-full sm:w-auto mb-4 sm:mb-0`}>
+                    <div css={tw`flex justify-center text-neutral-500`}>
+                        <Icon.Cpu size={20} />
+                        <IconDescription $alarm={alarms.cpu}>
+                            {stats.cpuUsagePercent.toFixed(2)}%
+                        </IconDescription>
                     </div>
+                </div>
 
-                    {/* Memory Indicator */}
-                    <div css={tw`flex flex-col items-center w-full sm:w-auto mb-4 sm:mb-0`}>
-                        <div css={tw`flex justify-center text-gray-500`}>
-                            <Icon.PieChart size={20} />
-                            <IconDescription $alarm={alarms.memory}>
-                                {bytesToString(stats.memoryUsageInBytes)}
-                            </IconDescription>
-                        </div>
+                {/* Memory Indicator */}
+                <div css={tw`flex flex-col items-center w-full sm:w-auto mb-4 sm:mb-0`}>
+                    <div css={tw`flex justify-center text-gray-500`}>
+                        <Icon.PieChart size={20} />
+                        <IconDescription $alarm={alarms.memory}>
+                            {bytesToString(stats.memoryUsageInBytes)}
+                        </IconDescription>
                     </div>
+                </div>
 
-                    {/* Disk Indicator */}
-                    <div css={tw`flex flex-col items-center w-full sm:w-auto`}>
-                        <div css={tw`flex justify-center text-gray-500`}>
-                            <Icon.HardDrive size={20} />
-                            <IconDescription>{bytesToString(stats?.diskUsageInBytes)}</IconDescription>
-                        </div>
+                {/* Disk Indicator */}
+                <div css={tw`flex flex-col items-center w-full sm:w-auto`}>
+                    <div css={tw`flex justify-center text-gray-500`}>
+                        <Icon.HardDrive size={20} />
+                        <IconDescription>{bytesToString(stats?.diskUsageInBytes)}</IconDescription>
                     </div>
                 </div>
-            )}
+            </div>
+        )}
             <div className={'status-bar'} />
         </StatusIndicatorBox>
     );