diff --git a/app/Data/Server/Eloquent/ServerUsagesData.php b/app/Data/Server/Eloquent/ServerUsagesData.php
index 228f8825..e044f11a 100644
--- a/app/Data/Server/Eloquent/ServerUsagesData.php
+++ b/app/Data/Server/Eloquent/ServerUsagesData.php
@@ -7,6 +7,6 @@ use Spatie\LaravelData\Data;
class ServerUsagesData extends Data
{
public function __construct(
- public int $bandwidth_usage
+ public int $bandwidth
) {}
}
diff --git a/app/Services/Servers/ServerDetailService.php b/app/Services/Servers/ServerDetailService.php
index 91f52695..2b808f85 100644
--- a/app/Services/Servers/ServerDetailService.php
+++ b/app/Services/Servers/ServerDetailService.php
@@ -27,7 +27,7 @@ class ServerDetailService
'description' => $server->description,
'status' => $server->status,
'usages' => [
- 'bandwidth_usage' => $server->bandwidth_usage,
+ 'bandwidth' => $server->bandwidth_usage,
],
'limits' => [
'cpu' => $server->cpu,
diff --git a/app/Transformers/Client/ServerTransformer.php b/app/Transformers/Client/ServerTransformer.php
index d4d5cae6..676509c0 100644
--- a/app/Transformers/Client/ServerTransformer.php
+++ b/app/Transformers/Client/ServerTransformer.php
@@ -25,7 +25,7 @@ class ServerTransformer extends TransformerAbstract
'status' => $server->status,
'node_id' => $server->node_id,
'usages' => [
- 'bandwidth_usage' => $server->usages->bandwidth_usage,
+ 'bandwidth' => $server->usages->bandwidth,
],
'limits' => [
'cpu' => $server->limits->cpu,
diff --git a/resources/scripts/api/server/getServer.ts b/resources/scripts/api/server/getServer.ts
index b30595b8..b5aa72a7 100644
--- a/resources/scripts/api/server/getServer.ts
+++ b/resources/scripts/api/server/getServer.ts
@@ -18,7 +18,7 @@ export interface Server {
status: EloquentStatus
node_id: number
usages: {
- bandwidthUsage: number // bytes
+ bandwidth: number // bytes
}
limits: {
cpu: number
@@ -56,7 +56,7 @@ export const rawDataToServerObject = (data: FractalResponseData): Server => ({
: null
: null,
usages: {
- bandwidthUsage: data.usages.bandwidth_usage,
+ bandwidth: data.usages.bandwidth,
},
limits: {
cpu: data.limits.cpu,
diff --git a/resources/scripts/assets/css/tailwind.css b/resources/scripts/assets/css/tailwind.css
index 751c3f7b..dfc18bce 100644
--- a/resources/scripts/assets/css/tailwind.css
+++ b/resources/scripts/assets/css/tailwind.css
@@ -3,7 +3,7 @@
@tailwind utilities;
body {
- @apply bg-stone-100 dark:bg-primary dark:text-stone-400;
+ @apply bg-[#fafafa] dark:bg-primary dark:text-stone-400;
}
.description {
@@ -38,6 +38,10 @@ body {
@apply border-[#eaeaea] dark:border-[#333333] hover:dark:border-white;
}
+.h5 {
+ @apply text-base font-semibold text-black dark:text-white;
+}
+
.fade-enter,
.fade-exit,
.fade-appear {
diff --git a/resources/scripts/components/ThemeProvider.tsx b/resources/scripts/components/ThemeProvider.tsx
index 4daa6f61..c4e7b7b2 100644
--- a/resources/scripts/components/ThemeProvider.tsx
+++ b/resources/scripts/components/ThemeProvider.tsx
@@ -1,9 +1,7 @@
import { useStoreState } from '@/state'
-import {
- createEmotionCache,
- MantineProvider,
-} from '@mantine/core'
+import { createEmotionCache, MantineProvider } from '@mantine/core'
import { ReactNode, useEffect } from 'react'
+import { NotificationsProvider } from '@mantine/notifications'
const emotionCache = createEmotionCache({
key: 'mantine',
@@ -32,7 +30,7 @@ const ThemeProvider = ({ children }: Props) => {
colorScheme: theme === 'dark' ? 'dark' : 'light',
}}
>
- {children}
+
Server State
-Server State
++ {capitalize(status.state)} +
- {capitalize(status.state)} -
CPU Usage
-{Math.floor(status.cpu * 100)}%
-Memory Usage
-- {memory.used.size} {memory.used.unit} -
-- / {memory.total.size} {memory.total.unit} -
+CPU Usage
+{Math.floor(status.cpu * 100)}%
Uptime
-- {Math.floor(uptime.time)} -
-- {uptime.unit} -
+Memory Usage
++ {memory.used.size} {memory.used.unit} +
++ / {memory.total.size} {memory.total.unit} +
+Uptime
++ {Math.floor(uptime.time)} +
++ {uptime.unit} +
+