From 2db5a580ce7c8a115b013a08d61b086419d8c365 Mon Sep 17 00:00:00 2001 From: IceToast Date: Tue, 28 Dec 2021 20:05:03 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=8E=A8=20fixed=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/HomeController.php | 4 +- resources/views/home.blade.php | 178 ++++++++++++------------ 2 files changed, 93 insertions(+), 89 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 965bcdea..646293ac 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -90,7 +90,7 @@ class HomeController extends Controller // RETURN ALL VALUES return view('home')->with([ - 'useage' => $usage, + 'usage' => $usage, 'credits' => $credits, 'useful_links' => UsefulLink::all()->sortBy('id'), 'bg' => $bg, @@ -98,6 +98,4 @@ class HomeController extends Controller 'unit' => $unit ]); } - } - diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 72829e34..d9a744bf 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -6,11 +6,11 @@
-

{{__('Dashboard')}}

+

{{ __('Dashboard') }}

    -
  1. {{__('Dashboard')}}
    2. +
  2. {{ __('Dashboard') }}
@@ -28,8 +28,8 @@
- {{__('Servers')}} - {{Auth::user()->servers()->count()}} + {{ __('Servers') }} + {{ Auth::user()->servers()->count() }}
@@ -41,8 +41,8 @@
- {{CREDITS_DISPLAY_NAME}} - {{Auth::user()->Credits()}} + {{ CREDITS_DISPLAY_NAME }} + {{ Auth::user()->Credits() }}
@@ -58,8 +58,9 @@
- {{CREDITS_DISPLAY_NAME}} {{__('Usage')}} - {{number_format($useage, 2, '.', '')}} {{__('per month')}} + {{ CREDITS_DISPLAY_NAME }} {{ __('Usage') }} + {{ number_format($usage, 2, '.', '') }} + {{ __('per month') }}
@@ -67,101 +68,106 @@ - @if($credits > 0.01 and $useage > 0) -
+ @if ($credits > 0.01 and $usage > 0) +
- - + +
- {{__('Out of Credits in',["credits"=>CREDITS_DISPLAY_NAME])}} - {{$boxText}}{{$unit}} + {{ __('Out of Credits in', ['credits' => CREDITS_DISPLAY_NAME]) }} + + {{ $boxText }}{{ $unit }}
- + @endif -
- -
+ + + -
-
-
-
-

- - {{__('Useful Links')}} -

-
- -
- @foreach ($useful_links as $useful_link) -
- -
- - {{ $useful_link->title }} - -
- {!! $useful_link->description !!} -
- @endforeach -
- +
+
+
+
+

+ + {{ __('Useful Links') }} +

- + +
+ @foreach ($useful_links as $useful_link) +
+ +
+ + {{ $useful_link->title }} + +
+ {!! $useful_link->description !!} +
+ @endforeach +
+
- + +
+ -
-
-
-

- - {{__('Activity Logs')}} -

-
- -
-
    - @foreach(Auth::user()->actions()->take(8)->orderBy('created_at' , 'desc')->get() as $log) -
  • - - @switch($log->description) - @case('created') - - @break - @case('redeemed') +
    +
    +
    +

    + + {{ __('Activity Logs') }} +

    +
    + +
    +
      + @foreach (Auth::user()->actions()->take(8)->orderBy('created_at', 'desc')->get() + as $log) +
    • + + @switch($log->description) + @case('created') + + @break + @case('redeemed') - @break - @case('deleted') - - @break - @case('updated') - - @break - @endswitch - {{ucfirst($log->description)}} - {{ explode("\\" , $log->subject_type)[2]}} - - - {{$log->created_at->diffForHumans()}} - -
      • - @endforeach -
    -
    - + @break + @case('deleted') + + @break + @case('updated') + + @break + @endswitch + {{ ucfirst($log->description) }} + {{ explode('\\', $log->subject_type)[2] }} + + + {{ $log->created_at->diffForHumans() }} + +
    • + @endforeach +
- +
- - +
- + + +
+
From 0a75de96895dfbdfc25ab12be4503df854048ae7 Mon Sep 17 00:00:00 2001 From: IceToast Date: Tue, 28 Dec 2021 21:38:55 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=9A=91=EF=B8=8F=20Added=20DB-M?= =?UTF-8?q?igration=20->=20renaming=20paypal=5Fproducts=20table=20to=20cre?= =?UTF-8?q?dit=5Fproducts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...28_203515_rename_paypal_products_table.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 database/migrations/2021_12_28_203515_rename_paypal_products_table.php diff --git a/database/migrations/2021_12_28_203515_rename_paypal_products_table.php b/database/migrations/2021_12_28_203515_rename_paypal_products_table.php new file mode 100644 index 00000000..b3b64dca --- /dev/null +++ b/database/migrations/2021_12_28_203515_rename_paypal_products_table.php @@ -0,0 +1,28 @@ +