beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #356 from IceToast/development

Browse source 
fix: 🎨 fixed typo & added DB-Migration paypal_products renaming
This commit is contained in:
Dennis 2021-12-28 21:41:15 +01:00 committed by GitHub
parent d0c0a8fd58 0a75de9689
commit 4b768d55ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 121 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/HomeController.php
View file

@ -90,7 +90,7 @@ class HomeController extends Controller
// RETURN ALL VALUES // RETURN ALL VALUES
return view('home')->with([ return view('home')->with([
'useage' => $usage, 'usage' => $usage,
'credits' => $credits, 'credits' => $credits,
'useful_links' => UsefulLink::all()->sortBy('id'), 'useful_links' => UsefulLink::all()->sortBy('id'),
'bg' => $bg, 'bg' => $bg,
@ -98,6 +98,4 @@ class HomeController extends Controller
'unit' => $unit 'unit' => $unit
]); ]);
} }
} }

28
database/migrations/2021_12_28_203515_rename_paypal_products_table.php Normal file
View file

@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class RenamePaypalProductsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::rename('paypal_products', 'credit_products');
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::rename('credit_products', 'paypal_products');
}
}

178
resources/views/home.blade.php
View file

@ -6,11 +6,11 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row mb-2"> <div class="row mb-2">
<div class="col-sm-6"> <div class="col-sm-6">
<h1>{{__('Dashboard')}}</h1> <h1>{{ __('Dashboard') }}</h1>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<ol class="breadcrumb float-sm-right"> <ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a class="text-muted" href="">{{__('Dashboard')}}</a></li> <li class="breadcrumb-item"><a class="text-muted" href="">{{ __('Dashboard') }}</a></li>
</ol> </ol>
</div> </div>
</div> </div>
@ -28,8 +28,8 @@
<span class="info-box-icon bg-info elevation-1"><i class="fas fa-server"></i></span> <span class="info-box-icon bg-info elevation-1"><i class="fas fa-server"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">{{__('Servers')}}</span> <span class="info-box-text">{{ __('Servers') }}</span>
<span class="info-box-number">{{Auth::user()->servers()->count()}}</span> <span class="info-box-number">{{ Auth::user()->servers()->count() }}</span>
</div> </div>
<!-- /.info-box-content --> <!-- /.info-box-content -->
</div> </div>
@ -41,8 +41,8 @@
<span class="info-box-icon bg-secondary elevation-1"><i class="fas fa-coins"></i></span> <span class="info-box-icon bg-secondary elevation-1"><i class="fas fa-coins"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">{{CREDITS_DISPLAY_NAME}}</span> <span class="info-box-text">{{ CREDITS_DISPLAY_NAME }}</span>
<span class="info-box-number">{{Auth::user()->Credits()}}</span> <span class="info-box-number">{{ Auth::user()->Credits() }}</span>
</div> </div>
<!-- /.info-box-content --> <!-- /.info-box-content -->
</div> </div>
@ -58,8 +58,9 @@
<span class="info-box-icon bg-warning elevation-1"><i class="fas fa-chart-line"></i></span> <span class="info-box-icon bg-warning elevation-1"><i class="fas fa-chart-line"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">{{CREDITS_DISPLAY_NAME}} {{__('Usage')}}</span> <span class="info-box-text">{{ CREDITS_DISPLAY_NAME }} {{ __('Usage') }}</span>
<span class="info-box-number">{{number_format($useage, 2, '.', '')}} <sup>{{__('per month')}}</sup></span> <span class="info-box-number">{{ number_format($usage, 2, '.', '') }}
<sup>{{ __('per month') }}</sup></span>
</div> </div>
<!-- /.info-box-content --> <!-- /.info-box-content -->
</div> </div>
@ -67,101 +68,106 @@
</div> </div>
<!-- /.col --> <!-- /.col -->
@if($credits > 0.01 and $useage > 0) @if ($credits > 0.01 and $usage > 0)
<div class="col-12 col-sm-6 col-md-3"> <div class="col-12 col-sm-6 col-md-3">
<div class="info-box mb-3"> <div class="info-box mb-3">
<span class="info-box-icon {{$bg}} elevation-1"> <span class="info-box-icon {{ $bg }} elevation-1">
<i class="fas fa-hourglass-half"></i></span> <i class="fas fa-hourglass-half"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">{{__('Out of Credits in',["credits"=>CREDITS_DISPLAY_NAME])}} </span> <span
<span class="info-box-number">{{$boxText}}<sup>{{$unit}}</sup></span> class="info-box-text">{{ __('Out of Credits in', ['credits' => CREDITS_DISPLAY_NAME]) }}
</span>
<span class="info-box-number">{{ $boxText }}<sup>{{ $unit }}</sup></span>
</div> </div>
</div> </div>
<!-- /.info-box --> <!-- /.info-box -->
@endif @endif
</div>
<!-- /.col -->
</div> </div>
<!-- /.col -->
</div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="card card-default"> <div class="card card-default">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"> <h3 class="card-title">
<i class="fas fa-link mr-2"></i> <i class="fas fa-link mr-2"></i>
{{__('Useful Links')}} {{ __('Useful Links') }}
</h3> </h3>
</div>
<!-- /.card-header -->
<div class="card-body">
@foreach ($useful_links as $useful_link)
<div class="alert alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5>
<a class="alert-link text-decoration-none" target="__blank" href="{{ $useful_link->link }}">
<i class="{{ $useful_link->icon }} mr-2"></i>{{ $useful_link->title }}
</a>
</h5>
{!! $useful_link->description !!}
</div>
@endforeach
</div>
<!-- /.card-body -->
</div> </div>
<!-- /.card --> <!-- /.card-header -->
<div class="card-body">
@foreach ($useful_links as $useful_link)
<div class="alert alert-dismissible">
<button type="button" class="close" data-dismiss="alert"
aria-hidden="true">×</button>
<h5>
<a class="alert-link text-decoration-none" target="__blank"
href="{{ $useful_link->link }}">
<i class="{{ $useful_link->icon }} mr-2"></i>{{ $useful_link->title }}
</a>
</h5>
{!! $useful_link->description !!}
</div>
@endforeach
</div>
<!-- /.card-body -->
</div> </div>
<!-- /.col --> <!-- /.card -->
</div>
<!-- /.col -->
<div class="col-md-6"> <div class="col-md-6">
<div class="card card-default"> <div class="card card-default">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"> <h3 class="card-title">
<i class="fas fa-history mr-2"></i> <i class="fas fa-history mr-2"></i>
{{__('Activity Logs')}} {{ __('Activity Logs') }}
</h3> </h3>
</div> </div>
<!-- /.card-header --> <!-- /.card-header -->
<div class="card-body py-0 pb-2"> <div class="card-body py-0 pb-2">
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
@foreach(Auth::user()->actions()->take(8)->orderBy('created_at' , 'desc')->get() as $log) @foreach (Auth::user()->actions()->take(8)->orderBy('created_at', 'desc')->get()
<li class="list-group-item d-flex justify-content-between text-muted"> as $log)
<span> <li class="list-group-item d-flex justify-content-between text-muted">
@switch($log->description) <span>
@case('created') @switch($log->description)
<small><i class="fas text-success fa-plus mr-2"></i></small> @case('created')
@break <small><i class="fas text-success fa-plus mr-2"></i></small>
@case('redeemed') @break
@case('redeemed')
<small><i class="fas text-success fa-money-check-alt mr-2"></i></small> <small><i class="fas text-success fa-money-check-alt mr-2"></i></small>
@break @break
@case('deleted') @case('deleted')
<small><i class="fas text-danger fa-times mr-2"></i></small> <small><i class="fas text-danger fa-times mr-2"></i></small>
@break @break
@case('updated') @case('updated')
<small><i class="fas text-info fa-pen mr-2"></i></small> <small><i class="fas text-info fa-pen mr-2"></i></small>
@break @break
@endswitch @endswitch
{{ucfirst($log->description)}} {{ ucfirst($log->description) }}
{{ explode("\\" , $log->subject_type)[2]}} {{ explode('\\', $log->subject_type)[2] }}
</span> </span>
<small> <small>
{{$log->created_at->diffForHumans()}} {{ $log->created_at->diffForHumans() }}
</small> </small>
</li> </li>
@endforeach @endforeach
</ul> </ul>
</div>
<!-- /.card-body -->
</div> </div>
<!-- /.card --> <!-- /.card-body -->
</div> </div>
<!-- /.col --> <!-- /.card -->
</div> </div>
<!-- END CUSTOM CONTENT --> <!-- /.col -->
</div>
<!-- END CUSTOM CONTENT -->
</div> </div>
</section> </section>
<!-- END CONTENT --> <!-- END CONTENT -->