From 46173d7bfb3bcf79439990363c6ba6c49d0eb436 Mon Sep 17 00:00:00 2001 From: WBLKLeipe Date: Wed, 27 Oct 2021 07:48:00 +0200 Subject: [PATCH] Beautify --- app/Http/Controllers/HomeController.php | 90 ++++++++++++++++--------- resources/views/home.blade.php | 2 +- 2 files changed, 59 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4bbfe0ed..8189efc4 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -8,11 +8,65 @@ use Illuminate\Support\Facades\Auth; class HomeController extends Controller { + const TIME_LEFT_BG_SUCCESS = "bg-success"; + const TIME_LEFT_BG_WARNING = "bg-warning"; + const TIME_LEFT_BG_DANGER = "bg-danger"; + + public function __construct() { $this->middleware('auth'); } +/** Get the Background Color for the Days-Left-Box in HomeView */ + public function getTimeLeftBoxBackground($days){ + switch($days){ + case ($days >= 15): + return $this::TIME_LEFT_BG_SUCCESS; + break; + case ($days >= 8 && $days <= 14): + return $this::TIME_LEFT_BG_WARNING; + break; + case ($days <= 7): + return $this::TIME_LEFT_BG_DANGER; + break; + default: + return $this::TIME_LEFT_BG_WARNING; + } + } + +/** Get the Text for the Days-Left-Box in HomeView */ + public function getTimeLeftBoxText($days,$hours){ + if ($days < 1) + { + if ($hours < 1) + { + return 'You ran out of Credits '; + } + else + { + return $hours; + } + } + else + { + return number_format($days, 0); + } + } + + public function getTimeLeftUnit($days){ + switch($days){ + case ($days < 1): + return "hours"; + break; + case ($days > 1): + return "days"; + break; + default: + return "days"; + } + } + /** Show the application dashboard. */ public function index(Request $request) { @@ -22,44 +76,16 @@ class HomeController extends Controller $boxText = ""; $unit = ""; - // START OF THE TIME-REMAINING-BOX + /** Build our Time-Left-Box */ if ($credits > 0.01 and $usage > 0) { $days = number_format(($credits * 30) / $usage, 2, '.', ''); $hours = number_format($credits / ($usage / 30 / 24) , 2, '.', ''); - // DEFINE THE BACKGROUND COLOR - if ($days >= 15) - { - $bg = "success"; - } - elseif ($days >= 8 && $days <= 14) - { - $bg = "warning"; - } - elseif ($days <= 7) - { - $bg = "danger"; - } + $bg = $this->getTimeLeftBoxBackground($days); + $boxText = $this->getTimeLeftBoxText($days,$hours); + $unit = $this->getTimeLeftUnit($days,$hours); - // DEFINE WETHER DAYS OR HOURS REMAIN - if ($days < 1) - { - if ($hours < 1) - { - $boxText = 'You ran out of Credits '; - } - else - { - $boxText = $hours; - $unit = "hours"; - } - } - else - { - $boxText = number_format($days, 0); - $unit = "days"; - } } // RETURN ALL VALUES diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 03bc8d06..ee44e0e4 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -70,7 +70,7 @@ @if($credits > 0.01 and $useage > 0)
- +
Out of {{CREDITS_DISPLAY_NAME}} in