From 23c9972dcdc48aaa68644c4bc4a714db6287991a Mon Sep 17 00:00:00 2001 From: AVMG <45005889+AVMG20@users.noreply.github.com> Date: Sun, 8 Aug 2021 12:26:38 +0200 Subject: [PATCH 1/6] Update README.md updates urls --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 251aff76..fa0690e2 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ ControlPanel's Dashboard is a dashboard application designed to offer clients a This dashboard offers an easy to use and free billing solution for all starting and experienced hosting providers. This dashboard has many customization options and added discord 0auth verification to offer a solid link between your discord server and your dashboard. -### [Installation](https://github.com/ControlPanel-gg/dashboard/wiki/Installation "Installation") -### [Updating](https://github.com/ControlPanel-gg/dashboard/wiki/Updating "Updating") +### [Installation](https://controlpanel.gg/docs/intro "Installation") +### [Updating](https://controlpanel.gg/docs/Installation/updating "Updating") ### [Discord](https://discord.gg/4Y6HjD2uyU "discord") -### [Contributing](https://github.com/ControlPanel-gg/dashboard/wiki/Contributing "Contributing") -### [Donating](https://github.com/ControlPanel-gg/dashboard/wiki#donating "Donating") +### [Contributing](https://controlpanel.gg/docs/Contributing/contributing "Contributing") +### [Donating](https://controlpanel.gg/docs/Contributing/donating "Donating") From cc4e942d69a8653179e6b6fdca94a56c6843b373 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 22 Sep 2021 09:17:44 +0200 Subject: [PATCH 2/6] Show Days left till servers get suspended in Dashboard --- resources/views/home.blade.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 5c13ea05..44726536 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -66,7 +66,21 @@ + + +
+
+ +
+ Time left + {{number_format(({{Auth::user()->Credits()}}/30)*$useage), 0, '.', '')}} days left +
+ +
+ +
+ ` From 4d0e71539d08454046e74239637b4f636971274d Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 22 Sep 2021 09:53:30 +0200 Subject: [PATCH 3/6] Update home.blade.php --- resources/views/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 44726536..2df3dc2c 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -74,7 +74,7 @@
Time left - {{number_format(({{Auth::user()->Credits()}}/30)*$useage), 0, '.', '')}} days left + {{number_format((Auth::user()->Credits()/30)*$useage, 0, '.', '')}} days left
From 0c3749e5f0d3c550de182b95a7360767e80dc3a1 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 22 Sep 2021 09:56:39 +0200 Subject: [PATCH 4/6] Update home.blade.php --- resources/views/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 2df3dc2c..114b6823 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -74,7 +74,7 @@
Time left - {{number_format((Auth::user()->Credits()/30)*$useage, 0, '.', '')}} days left + {{number_format((Auth::user()->Credits()*30)/$useage, 0, '.', '')}} days left
From 9fb8091ea54b502073a80c51e5957d6a4c0cd8bc Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 22 Sep 2021 09:57:19 +0200 Subject: [PATCH 5/6] fixed a lil' math oopsie --- resources/views/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 114b6823..981a9da6 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -74,7 +74,7 @@
Time left - {{number_format((Auth::user()->Credits()*30)/$useage, 0, '.', '')}} days left + {{number_format((Auth::user()->Credits()*30)/$useage, 0, '.', '')}} days
From daf0bee8be6eafb3ad9fd52219058de7848941a1 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 22 Sep 2021 18:07:19 +0200 Subject: [PATCH 6/6] Change to Days/Hours and color changes It now changes to x hours left when its less than 1 Day left. Also changes color ranging from more than 14 Days = Green Between 14 and 7 Days = Yellow less than 7 days = red Im sure theres a way better way to code this but it works --- resources/views/home.blade.php | 37 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 981a9da6..4ec088d4 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -38,7 +38,7 @@
- +
{{CREDITS_DISPLAY_NAME}} @@ -66,21 +66,32 @@
- - -
-
- -
- Time left - {{number_format((Auth::user()->Credits()*30)/$useage, 0, '.', '')}} days +
+
+ @if(number_format((Auth::user()->Credits()*30)/$useage,0,'.','') >= 15) + + @elseif (number_format((Auth::user()->Credits()*30)/$useage,0,'.','') >= 8 && number_format((Auth::user()->Credits()*30)/$useage,0,'.','') <= 14) + + @elseif (number_format((Auth::user()->Credits()*30)/$useage,0,'.','') <= 7) + + @endif + + +
+ Out of {{CREDITS_DISPLAY_NAME}} in + @if(number_format((Auth::user()->Credits()*30)/$useage,2,'.','') < "1") + {{number_format(Auth::user()->Credits()/($useage/30/24),0,'.','')}} hours + @else + {{number_format((Auth::user()->Credits()*30)/$useage,0,'.','')}} days + @endif +
+
- +
- -
- ` + +