From 3b99ae527f8078eff5579f8557aa6ae1b6f60e44 Mon Sep 17 00:00:00 2001 From: Ferks-FK Date: Sat, 28 Oct 2023 13:03:23 -0400 Subject: [PATCH] closes #684 --- .../views/admin/overview/index.blade.php | 308 +++++++++--------- 1 file changed, 159 insertions(+), 149 deletions(-) diff --git a/themes/default/views/admin/overview/index.blade.php b/themes/default/views/admin/overview/index.blade.php index 5a6fc1d5..e9c4debf 100644 --- a/themes/default/views/admin/overview/index.blade.php +++ b/themes/default/views/admin/overview/index.blade.php @@ -4,7 +4,7 @@
-
+

{{__('Admin Overview')}}

@@ -33,22 +33,22 @@
-
+
- {{__('Support server')}} + {{__('Support server')}}
- {{__('Documentation')}} + {{__('Documentation')}}
- {{__('Github')}} + {{__('Github')}}
- {{__('Support CtrlPanel')}} + {{__('Support CtrlPanel')}}
@@ -59,7 +59,7 @@
{{__('Servers')}} - @@ -77,7 +77,7 @@
{{__('Users')}} - @@ -92,7 +92,7 @@
+ class="text-white fas fa-coins">
{{__('Total')}} {{ $credits_display_name }} @@ -123,15 +123,15 @@
- {{__('Pterodactyl')}} + {{__('Pterodactyl')}}
{{__('Sync')}} + class="mr-2 fas fa-sync">{{__('Sync')}}
-
+
@if ($deletedNodesPresent) -
+
{{ __('Warning!') }}

{{ __('Some nodes got deleted on pterodactyl only. Please click the sync button above.') }} @@ -166,42 +166,44 @@

- {{__('Last updated :date', ['date' => $syncLastUpdate])}} + {{__('Last updated :date', ['date' => $syncLastUpdate])}}
- {{__('Latest tickets')}} + {{__('Latest tickets')}}
-
+
@if(!$tickets->count()){{__('There are no tickets')}}. @else - - - - - - - - - - +
+
{{__('Title')}}{{__('User')}}{{__('Status')}}{{__('Last updated')}}
+ + + + + + + + + - @foreach($tickets as $ticket_id => $ticket) - - - - - - - @endforeach + @foreach($tickets as $ticket_id => $ticket) + + + + + + + @endforeach - -
{{__('Title')}}{{__('User')}}{{__('Status')}}{{__('Last updated')}}
#{{$ticket_id}} - {{$ticket->title}}{{$ticket->user}}{{$ticket->status}}{{$ticket->last_updated}}
#{{$ticket_id}} - {{$ticket->title}}{{$ticket->user}}{{$ticket->status}}{{$ticket->last_updated}}
+ + +
@endif
@@ -209,14 +211,14 @@
- {{__('CtrlPanel.gg')}} + {{__('CtrlPanel.gg')}}
-
+
- {{__("Version")}} {{config("app.version")}} - {{config("BRANCHNAME")}} + {{__("Version")}} {{config("app.version")}} - {{config("BRANCHNAME")}}
@@ -226,13 +228,13 @@
- {{__('Individual nodes')}} + {{__('Individual nodes')}}
-
+
@if ($perPageLimit) -
+
{{ __('Error!') }}

{{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}
@@ -240,39 +242,41 @@ {{ __('Note') }}: {{ __('If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on CtrlPanel. Try clicking the button below.') }}

{{__('Sync servers')}} + class="mr-2 fas fa-sync">{{__('Sync servers')}}
@endif - - - - - - - - - - - - @foreach($nodes as $nodeID => $node) - - - - - - - - @endforeach - - - - - - - +
+
{{__('ID')}}{{__('Node')}}{{__('Server count')}}{{__('Resource usage')}}{{ $credits_display_name . ' ' . __('Usage') ." (".__('per month').")"}}
{{$nodeID}}{{$node->name}}{{$node->activeServers}}/{{$node->totalServers}}{{$node->usagePercent}}%{{$node->activeEarnings}}/{{$node->totalEarnings}}
{{__('Total')}} ({{__('active')}}/{{__('total')}}):{{$counters['servers']->active}}/{{$counters['servers']->total}}{{$counters['totalUsagePercent']}}%{{$counters['earnings']->active}}/{{$counters['earnings']->total}}
+ + + + + + + - -
{{__('ID')}}{{__('Node')}}{{__('Server count')}}{{__('Resource usage')}}{{ $credits_display_name . ' ' . __('Usage') ." (".__('per month').")"}}
+ + + @foreach($nodes as $nodeID => $node) + + {{$nodeID}} + {{$node->name}} + {{$node->activeServers}}/{{$node->totalServers}} + {{$node->usagePercent}}% + {{$node->activeEarnings}}/{{$node->totalEarnings}} + + @endforeach + + + + {{__('Total')}} ({{__('active')}}/{{__('total')}}): + {{$counters['servers']->active}}/{{$counters['servers']->total}} + {{$counters['totalUsagePercent']}}% + {{$counters['earnings']->active}}/{{$counters['earnings']->total}} + + + +
@@ -280,11 +284,11 @@
- {{__('Latest payments')}} + {{__('Latest payments')}}
-
+
@if($counters['payments']['lastMonth']->count())
@@ -293,25 +297,26 @@ data-content="{{ __('Payments in this time window') }}:
{{$counters['payments']['lastMonth']->timeStart}} - {{$counters['payments']['lastMonth']->timeEnd}}" class="fas fa-info-circle"> - - - - - - - - - - @foreach($counters['payments']['lastMonth'] as $currency => $income) - - - - - - @endforeach - -
{{__('Currency')}}{{__('Number of payments')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->total}}
-
+
+ + + + + + + + + + @foreach($counters['payments']['lastMonth'] as $currency => $income) + + + + + + @endforeach + +
{{__('Currency')}}{{__('Number of payments')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->total}}
+
@endif @if($counters['payments']['lastMonth']->count())
@@ -321,25 +326,26 @@ data-content="{{ __('Payments in this time window') }}:
{{$counters['payments']['thisMonth']->timeStart}} - {{$counters['payments']['thisMonth']->timeEnd}}" class="fas fa-info-circle"> - - - - - - - - - - @foreach($counters['payments']['thisMonth'] as $currency => $income) - - - - - - @endforeach - -
{{__('Currency')}}{{__('Number of payments')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->total}}
-
+
+ + + + + + + + + + @foreach($counters['payments']['thisMonth'] as $currency => $income) + + + + + + @endforeach + +
{{__('Currency')}}{{__('Number of payments')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->total}}
+
@@ -349,20 +355,52 @@
- {{__('Tax overview')}} + {{__('Tax overview')}}
-
+
@if($counters['taxPayments']['lastYear']->count()) {{__('Last year')}}: +
+ + + + + + + + + + + + @foreach($counters['taxPayments']['lastYear'] as $currency => $income) + + + + + + + + @endforeach + +
{{__('Currency')}}{{__('Number of payments')}}{{__('Base amount')}}{{__('Total taxes')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->price}}{{$income->taxes}}{{$income->total}}
+
+
+ @endif + {{__('This year')}}: + + +
- + @@ -371,7 +409,7 @@ - @foreach($counters['taxPayments']['lastYear'] as $currency => $income) + @foreach($counters['taxPayments']['thisYear'] as $currency => $income) @@ -382,35 +420,7 @@ @endforeach
{{__('Currency')}} {{__('Number of payments')}} {{__('Base amount')}}
{{$currency}} {{$income->count}}
-
- @endif - {{__('This year')}}: - - - - - - - - - - - - - - @foreach($counters['taxPayments']['thisYear'] as $currency => $income) - - - - - - - - @endforeach - -
{{__('Currency')}}{{__('Number of payments')}}{{__('Base amount')}}{{__('Total taxes')}}{{__('Total amount')}}
{{$currency}}{{$income->count}}{{$income->price}}{{$income->taxes}}{{$income->total}}
+