Merge pull request #356 from IceToast/development
fix: 🎨 fixed typo & added DB-Migration paypal_products renaming
This commit is contained in:
Dennis
GitHub
commit
4b768d55ec
|
|
@ -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
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
}
|
||||
}
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1>{{__('Dashboard')}}</h1>
|
||||
<h1>{{ __('Dashboard') }}</h1>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
<span class="info-box-icon bg-info elevation-1"><i class="fas fa-server"></i></span>
|
||||
|
||||
<div class="info-box-content">
|
||||
<span class="info-box-text">{{__('Servers')}}</span>
|
||||
<span class="info-box-number">{{Auth::user()->servers()->count()}}</span>
|
||||
<span class="info-box-text">{{ __('Servers') }}</span>
|
||||
<span class="info-box-number">{{ Auth::user()->servers()->count() }}</span>
|
||||
</div>
|
||||
<!-- /.info-box-content -->
|
||||
</div>
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
<span class="info-box-icon bg-secondary elevation-1"><i class="fas fa-coins"></i></span>
|
||||
|
||||
<div class="info-box-content">
|
||||
<span class="info-box-text">{{CREDITS_DISPLAY_NAME}}</span>
|
||||
<span class="info-box-number">{{Auth::user()->Credits()}}</span>
|
||||
<span class="info-box-text">{{ CREDITS_DISPLAY_NAME }}</span>
|
||||
<span class="info-box-number">{{ Auth::user()->Credits() }}</span>
|
||||
</div>
|
||||
<!-- /.info-box-content -->
|
||||
</div>
|
||||
|
|
@ -58,8 +58,9 @@
|
|||
<span class="info-box-icon bg-warning elevation-1"><i class="fas fa-chart-line"></i></span>
|
||||
|
||||
<div class="info-box-content">
|
||||
<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-text">{{ CREDITS_DISPLAY_NAME }} {{ __('Usage') }}</span>
|
||||
<span class="info-box-number">{{ number_format($usage, 2, '.', '') }}
|
||||
<sup>{{ __('per month') }}</sup></span>
|
||||
</div>
|
||||
<!-- /.info-box-content -->
|
||||
</div>
|
||||
|
|
@ -67,101 +68,106 @@
|
|||
</div>
|
||||
|
||||
<!-- /.col -->
|
||||
@if($credits > 0.01 and $useage > 0)
|
||||
<div class="col-12 col-sm-6 col-md-3">
|
||||
@if ($credits > 0.01 and $usage > 0)
|
||||
<div class="col-12 col-sm-6 col-md-3">
|
||||
<div class="info-box mb-3">
|
||||
<span class="info-box-icon {{$bg}} elevation-1">
|
||||
<i class="fas fa-hourglass-half"></i></span>
|
||||
<span class="info-box-icon {{ $bg }} elevation-1">
|
||||
<i class="fas fa-hourglass-half"></i></span>
|
||||
<div class="info-box-content">
|
||||
<span class="info-box-text">{{__('Out of Credits in',["credits"=>CREDITS_DISPLAY_NAME])}} </span>
|
||||
<span class="info-box-number">{{$boxText}}<sup>{{$unit}}</sup></span>
|
||||
<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>
|
||||
<!-- /.info-box -->
|
||||
<!-- /.info-box -->
|
||||
@endif
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="card card-default">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<i class="fas fa-link mr-2"></i>
|
||||
{{__('Useful Links')}}
|
||||
</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 class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="card card-default">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<i class="fas fa-link mr-2"></i>
|
||||
{{ __('Useful Links') }}
|
||||
</h3>
|
||||
</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>
|
||||
<!-- /.col -->
|
||||
<!-- /.card -->
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="card card-default">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<i class="fas fa-history mr-2"></i>
|
||||
{{__('Activity Logs')}}
|
||||
</h3>
|
||||
</div>
|
||||
<!-- /.card-header -->
|
||||
<div class="card-body py-0 pb-2">
|
||||
<ul class="list-group list-group-flush">
|
||||
@foreach(Auth::user()->actions()->take(8)->orderBy('created_at' , 'desc')->get() as $log)
|
||||
<li class="list-group-item d-flex justify-content-between text-muted">
|
||||
<span>
|
||||
@switch($log->description)
|
||||
@case('created')
|
||||
<small><i class="fas text-success fa-plus mr-2"></i></small>
|
||||
@break
|
||||
@case('redeemed')
|
||||
<div class="col-md-6">
|
||||
<div class="card card-default">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<i class="fas fa-history mr-2"></i>
|
||||
{{ __('Activity Logs') }}
|
||||
</h3>
|
||||
</div>
|
||||
<!-- /.card-header -->
|
||||
<div class="card-body py-0 pb-2">
|
||||
<ul class="list-group list-group-flush">
|
||||
@foreach (Auth::user()->actions()->take(8)->orderBy('created_at', 'desc')->get()
|
||||
as $log)
|
||||
<li class="list-group-item d-flex justify-content-between text-muted">
|
||||
<span>
|
||||
@switch($log->description)
|
||||
@case('created')
|
||||
<small><i class="fas text-success fa-plus mr-2"></i></small>
|
||||
@break
|
||||
@case('redeemed')
|
||||
<small><i class="fas text-success fa-money-check-alt mr-2"></i></small>
|
||||
@break
|
||||
@case('deleted')
|
||||
<small><i class="fas text-danger fa-times mr-2"></i></small>
|
||||
@break
|
||||
@case('updated')
|
||||
<small><i class="fas text-info fa-pen mr-2"></i></small>
|
||||
@break
|
||||
@endswitch
|
||||
{{ucfirst($log->description)}}
|
||||
{{ explode("\\" , $log->subject_type)[2]}}
|
||||
</span>
|
||||
<small>
|
||||
{{$log->created_at->diffForHumans()}}
|
||||
</small>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.card-body -->
|
||||
@break
|
||||
@case('deleted')
|
||||
<small><i class="fas text-danger fa-times mr-2"></i></small>
|
||||
@break
|
||||
@case('updated')
|
||||
<small><i class="fas text-info fa-pen mr-2"></i></small>
|
||||
@break
|
||||
@endswitch
|
||||
{{ ucfirst($log->description) }}
|
||||
{{ explode('\\', $log->subject_type)[2] }}
|
||||
</span>
|
||||
<small>
|
||||
{{ $log->created_at->diffForHumans() }}
|
||||
</small>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.card -->
|
||||
<!-- /.card-body -->
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
<!-- /.card -->
|
||||
</div>
|
||||
<!-- END CUSTOM CONTENT -->
|
||||
<!-- /.col -->
|
||||
|
||||
</div>
|
||||
<!-- END CUSTOM CONTENT -->
|
||||
</div>
|
||||
</section>
|
||||
<!-- END CONTENT -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue