-[Demo site](https://demo.myidlers.com/)
+[Demo site](https://demo.myidlers.com/)
**Note:** Create, Update and Delete are disabled on demo site.
@@ -19,17 +20,26 @@ GeekBench 5 scores to do easier comparing and sorting.
[Cloud Five Limited](https://cloud-v.net/) for providing the hosting for demo installation.
-## 2.1.2 changes (19th July 2022):
+## 2.1.3 changes (20th July 2022):
-* Added YABs compare page
-* Added caching for YABs
-* Added LabelsAssigned model
-* Updated Server model to use relationships
-* Updated Shared model to use relationships
-* Updated Shared model to use caching
-* Updated Table model to have table name defined
-* Fixed server compare initial selection
-* Fixed switch in getIpForDomain()
+#### Please run the following if updating from existing install:
+
+```shell
+php artisan migrate
+php artisan route:cache
+php artisan cache:clear
+```
+
+* Added YABs to JSON output page
+* Added uptime, distro and kernel to YABs inserting
+* Added memory swap values to YABs inserting
+* Added save YABs as txt file (setting)
+* Added back and edit button component with icon
+* Updated Reseller model to use relationships + caching
+* Updated Misc model to use relationships + caching
+* Updated SeedBoxes model to use relationships + caching
+* Updated ApiController to use the new model relationship calling (& caching)
+* Updated container large screen max width from 1320px to 1420px
## Requires
@@ -65,13 +75,15 @@ GeekBench 5 scores to do easier comparing and sorting.
* Run `php artisan migrate:fresh --seed` to create tables and seed data
* Run `php artisan serve`
-## Update
+## Updating
-If you have at least version 2.0 installed:
+If you already have at least version 2.0 installed:
* Run `git clone https://github.com/cp6/my-idlers.git`
* Run `composer install`
* Run `php artisan migrate`
+* Run `php artisan route:cache`
+* Run `php artisan cache:clear`
## Run using Docker
@@ -93,7 +105,6 @@ Run with a single click on [PikaPods.com](https://www.pikapods.com/)
[](https://www.pikapods.com/pods?run=my-idlers)
-
## API endpoints
For GET requests the header must have `Accept: application/json` and your API token (found at `/account`)
@@ -168,35 +179,35 @@ Body content template
```json
{
-"active": 1,
-"show_public": 0,
-"hostname": "test.domain.com",
-"ns1": "ns1",
-"ns2": "ns2",
-"server_type": 1,
-"os_id": 2,
-"provider_id": 10,
-"location_id": 15,
-"ssh_port": 22,
-"bandwidth": 2000,
-"ram": 2024,
-"ram_type": "MB",
-"ram_as_mb": 2024,
-"disk": 30,
-"disk_type": "GB",
-"disk_as_gb": 30,
-"cpu": 2,
-"has_yabs": 0,
-"was_promo": 1,
-"ip1": "127.0.0.1",
-"ip2": null,
-"owned_since": "2022-01-01",
-"currency": "USD",
-"price": 4.00,
-"payment_term": 1,
-"as_usd": 4.00,
-"usd_per_month": 4.00,
-"next_due_date": "2022-02-01"
+ "active": 1,
+ "show_public": 0,
+ "hostname": "test.domain.com",
+ "ns1": "ns1",
+ "ns2": "ns2",
+ "server_type": 1,
+ "os_id": 2,
+ "provider_id": 10,
+ "location_id": 15,
+ "ssh_port": 22,
+ "bandwidth": 2000,
+ "ram": 2024,
+ "ram_type": "MB",
+ "ram_as_mb": 2024,
+ "disk": 30,
+ "disk_type": "GB",
+ "disk_as_gb": 30,
+ "cpu": 2,
+ "has_yabs": 0,
+ "was_promo": 1,
+ "ip1": "127.0.0.1",
+ "ip2": null,
+ "owned_since": "2022-01-01",
+ "currency": "USD",
+ "price": 4.00,
+ "payment_term": 1,
+ "as_usd": 4.00,
+ "usd_per_month": 4.00,
+ "next_due_date": "2022-02-01"
}
```
@@ -210,27 +221,27 @@ Body content template
```json
{
-"active": 1,
-"show_public": 0,
-"hostname": "test.domain.com",
-"ns1": "ns1",
-"ns2": "ns2",
-"server_type": 1,
-"os_id": 2,
-"provider_id": 10,
-"location_id": 15,
-"ssh_port": 22,
-"bandwidth": 2000,
-"ram": 2024,
-"ram_type": "MB",
-"ram_as_mb": 2024,
-"disk": 30,
-"disk_type": "GB",
-"disk_as_gb": 30,
-"cpu": 2,
-"has_yabs": 0,
-"was_promo": 1,
-"owned_since": "2022-01-01"
+ "active": 1,
+ "show_public": 0,
+ "hostname": "test.domain.com",
+ "ns1": "ns1",
+ "ns2": "ns2",
+ "server_type": 1,
+ "os_id": 2,
+ "provider_id": 10,
+ "location_id": 15,
+ "ssh_port": 22,
+ "bandwidth": 2000,
+ "ram": 2024,
+ "ram_type": "MB",
+ "ram_as_mb": 2024,
+ "disk": 30,
+ "disk_type": "GB",
+ "disk_as_gb": 30,
+ "cpu": 2,
+ "has_yabs": 0,
+ "was_promo": 1,
+ "owned_since": "2022-01-01"
}
```
@@ -244,7 +255,7 @@ Body content template
{
"price": 10.50,
"currency": "USD",
- "term" : 1
+ "term": 1
}
```
@@ -254,7 +265,6 @@ Delete a server
`/servers/ID`
-
## Notes
**Public viewable listings**
diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index 19015fa..c67eb7b 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -2,12 +2,16 @@
namespace App\Http\Controllers;
+use App\Models\Domains;
use App\Models\IPs;
use App\Models\Labels;
+use App\Models\Misc;
use App\Models\NetworkSpeed;
use App\Models\OS;
use App\Models\Pricing;
use App\Models\Providers;
+use App\Models\Reseller;
+use App\Models\SeedBoxes;
use App\Models\Server;
use App\Models\Shared;
use DataTables;
@@ -21,53 +25,13 @@ class ApiController extends Controller
{
protected function getAllServers()
{
- $servers = DB::table('servers as s')
- ->Join('pricings as p', 's.id', '=', 'p.service_id')
- ->join('providers as pr', 's.provider_id', '=', 'pr.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->join('os as o', 's.os_id', '=', 'o.id')
- ->get(['s.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date', 'pr.name as provider', 'l.name as location', 'o.name as os'])->toJson(JSON_PRETTY_PRINT);
-
+ $servers = Server::allServers()->toJson(JSON_PRETTY_PRINT);
return response($servers, 200);
}
protected function getServer($id)
{
- $server = DB::table('servers as s')
- ->Join('pricings as p', 's.id', '=', 'p.service_id')
- ->join('providers as pr', 's.provider_id', '=', 'pr.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->join('os as o', 's.os_id', '=', 'o.id')
- ->where('s.id', '=', $id)
- ->get(['s.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date', 'pr.name as provider', 'l.name as location', 'o.name as os']);
-
- $yabs = DB::table('yabs')
- ->where('yabs.server_id', '=', $id)
- ->get();
-
- $disk_speed = DB::table('disk_speed')
- ->where('disk_speed.server_id', '=', $id)
- ->get();
-
- $network_speed = DB::table('network_speed')
- ->where('network_speed.server_id', '=', $id)
- ->get();
-
- $labels = DB::table('labels_assigned as la')
- ->Join('labels as l', 'la.label_id', '=', 'l.id')
- ->where('la.service_id', '=', $id)
- ->get(['l.*']);
-
- $ip_addresses = DB::table('ips as i')
- ->where('i.service_id', '=', $id)
- ->get(['i.*']);
-
- $server['ip_addresses'] = $ip_addresses;
- $server['yabs'] = $yabs;
- $server['disk_speed'] = $disk_speed;
- $server['network_speed'] = $network_speed;
- $server['labels'] = $labels;
-
+ $server = Server::server($id)->toJson(JSON_PRETTY_PRINT);
return response($server, 200);
}
@@ -79,7 +43,8 @@ class ApiController extends Controller
protected function getPricing($id)
{
- $pricing = Pricing::where('id', $id)->get()->toJson(JSON_PRETTY_PRINT);
+ $pricing = Pricing::where('id', $id)
+ ->get()->toJson(JSON_PRETTY_PRINT);
return response($pricing, 200);
}
@@ -91,8 +56,7 @@ class ApiController extends Controller
protected function getNetworkSpeeds($id)
{
- $ns = DB::table('network_speed as n')
- ->where('n.server_id', '=', $id)
+ $ns = NetworkSpeed::where('server_id', '=', $id)
->get()->toJson(JSON_PRETTY_PRINT);
return response($ns, 200);
}
@@ -105,94 +69,68 @@ class ApiController extends Controller
protected function getLabel($id)
{
- $label = DB::table('labels as l')
- ->where('l.id', '=', $id)
+ $label = Labels::where('id', '=', $id)
->get()->toJson(JSON_PRETTY_PRINT);
return response($label, 200);
}
protected function getAllShared()
{
- $shared = DB::table('shared_hosting as sh')
- ->Join('pricings as p', 'sh.id', '=', 'p.service_id')
- ->get(['sh.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $shared = Shared::allSharedHosting()->toJson(JSON_PRETTY_PRINT);
return response($shared, 200);
}
protected function getShared($id)
{
- $shared = DB::table('shared_hosting as sh')
- ->Join('pricings as p', 'sh.id', '=', 'p.service_id')
- ->where('sh.id', '=', $id)
- ->get(['sh.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $shared = Shared::sharedHosting($id)->toJson(JSON_PRETTY_PRINT);
return response($shared, 200);
}
protected function getAllReseller()
{
- $reseller = DB::table('reseller_hosting as rh')
- ->Join('pricings as p', 'rh.id', '=', 'p.service_id')
- ->get(['rh.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $reseller = Reseller::allResellerHosting()->toJson(JSON_PRETTY_PRINT);
return response($reseller, 200);
}
protected function getReseller($id)
{
- $reseller = DB::table('reseller_hosting as rh')
- ->Join('pricings as p', 'rh.id', '=', 'p.service_id')
- ->where('rh.id', '=', $id)
- ->get(['rh.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $reseller = Reseller::resellerHosting($id)->toJson(JSON_PRETTY_PRINT);
return response($reseller, 200);
}
protected function getAllSeedbox()
{
- $reseller = DB::table('seedboxes as sb')
- ->Join('pricings as p', 'sb.id', '=', 'p.service_id')
- ->get(['sb.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $reseller = SeedBoxes::allSeedboxes()->toJson(JSON_PRETTY_PRINT);
return response($reseller, 200);
}
protected function getSeedbox($id)
{
- $reseller = DB::table('seedboxes as sb')
- ->Join('pricings as p', 'sb.id', '=', 'p.service_id')
- ->where('sb.id', '=', $id)
- ->get(['sb.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $reseller = SeedBoxes::seedbox($id)->toJson(JSON_PRETTY_PRINT);
return response($reseller, 200);
}
protected function getAllDomains()
{
- $domains = DB::table('domains as d')
- ->Join('pricings as p', 'd.id', '=', 'p.service_id')
- ->get(['d.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $domains = Domains::allDomains()->toJson(JSON_PRETTY_PRINT);
return response($domains, 200);
}
protected function getDomains($id)
{
- $domain = DB::table('domains as d')
- ->Join('pricings as p', 'd.id', '=', 'p.service_id')
- ->where('d.id', '=', $id)
- ->get(['d.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $domain = Domains::domain($id)->toJson(JSON_PRETTY_PRINT);
return response($domain, 200);
}
protected function getAllMisc()
{
- $misc = DB::table('misc_services as m')
- ->Join('pricings as p', 'm.id', '=', 'p.service_id')
- ->get(['m.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $misc = Misc::allMisc()->toJson(JSON_PRETTY_PRINT);
return response($misc, 200);
}
protected function getMisc($id)
{
- $misc = DB::table('misc_services as m')
- ->Join('pricings as p', 'm.id', '=', 'p.service_id')
- ->where('m.id', '=', $id)
- ->get(['m.*', 'p.id as price_id', 'p.currency', 'p.price', 'p.term', 'p.as_usd', 'p.usd_per_month', 'p.next_due_date'])->toJson(JSON_PRETTY_PRINT);
+ $misc = Misc::misc($id)->toJson(JSON_PRETTY_PRINT);
return response($misc, 200);
}
diff --git a/app/Http/Controllers/DomainsController.php b/app/Http/Controllers/DomainsController.php
index 1467c63..89b6ef7 100644
--- a/app/Http/Controllers/DomainsController.php
+++ b/app/Http/Controllers/DomainsController.php
@@ -14,20 +14,16 @@ use Illuminate\Support\Str;
class DomainsController extends Controller
{
-
public function index()
{
- $domains = Domains::domainsDataIndexPage();
-
+ $domains = Domains::allDomains();
return view('domains.index', compact(['domains']));
}
public function show(Domains $domain)
- {
- $service_extras = Domains::domainsDataShowPage($domain->id);
- $labels = Labels::labelsForService($domain->id);
-
- return view('domains.show', compact(['domain', 'service_extras', 'labels']));
+ {//Need to modern
+ $domain_info = Domains::domain($domain->id)[0];
+ return view('domains.show', compact(['domain_info']));
}
public function create()
@@ -46,11 +42,8 @@ class DomainsController extends Controller
]);
$domain_id = Str::random(8);
-
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->insertPricing(4, $domain_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
Domains::create([
@@ -66,6 +59,7 @@ class DomainsController extends Controller
Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $domain_id);
+ Cache::forget("all_domains");
Home::homePageCacheForget();
return redirect()->route('domains.index')
@@ -74,11 +68,8 @@ class DomainsController extends Controller
public function edit(Domains $domain)
{
- $domain_info = Domains::domainsDataEditPage($domain->id);
-
- $labels = Labels::labelsForService($domain->id);
-
- return view('domains.edit', compact(['domain', 'domain_info', 'labels']));
+ $domain_info = Domains::domain($domain->id)[0];
+ return view('domains.edit', compact(['domain_info']));
}
public function update(Request $request, Domains $domain)
@@ -91,9 +82,7 @@ class DomainsController extends Controller
]);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->updatePricing($domain->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
$domain->update([
@@ -108,9 +97,10 @@ class DomainsController extends Controller
]);
Labels::deleteLabelsAssignedTo($domain->id);
-
Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $domain->id);
+ Cache::forget("all_domains");
+ Cache::forget("domain.{$domain->id}");
Cache::forget("labels_for_service.{$domain->id}");
Home::homePageCacheForget();
@@ -121,7 +111,6 @@ class DomainsController extends Controller
public function destroy(Domains $domain)
{
$items = Domains::find($domain->id);
-
$items->delete();
$p = new Pricing();
@@ -129,6 +118,8 @@ class DomainsController extends Controller
Labels::deleteLabelsAssignedTo($domain->id);
+ Cache::forget("all_domains");
+ Cache::forget("domain.{$domain->id}");
Home::homePageCacheForget();
return redirect()->route('domains.index')
diff --git a/app/Http/Controllers/MiscController.php b/app/Http/Controllers/MiscController.php
index c5fc361..271e9d7 100644
--- a/app/Http/Controllers/MiscController.php
+++ b/app/Http/Controllers/MiscController.php
@@ -14,10 +14,7 @@ class MiscController extends Controller
{
public function index()
{
- $misc = DB::table('misc_services as d')
- ->join('pricings as pr', 'd.id', '=', 'pr.service_id')
- ->get(['d.*', 'pr.*']);
-
+ $misc = Misc::allMisc();
return view('misc.index', compact(['misc']));
}
@@ -28,12 +25,8 @@ class MiscController extends Controller
public function show(Misc $misc)
{
- $service_extras = DB::table('misc_services as m')
- ->join('pricings as p', 'm.id', '=', 'p.service_id')
- ->where('m.id', '=', $misc->id)
- ->get(['m.*', 'p.*']);
-
- return view('misc.show', compact(['misc', 'service_extras']));
+ $misc_data = Misc::misc($misc->id)[0];
+ return view('misc.show', compact(['misc_data']));
}
public function store(Request $request)
@@ -45,20 +38,19 @@ class MiscController extends Controller
'next_due_date' => 'required|date'
]);
- $ms_id = Str::random(8);
+ $misc_id = Str::random(8);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
- $pricing->insertPricing(5, $ms_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
+ $pricing->insertPricing(5, $misc_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
Misc::create([
- 'id' => $ms_id,
+ 'id' => $misc_id,
'name' => $request->name,
'owned_since' => $request->owned_since
]);
+ Cache::forget("all_misc");
Home::homePageCacheForget();
return redirect()->route('misc.index')
@@ -67,12 +59,8 @@ class MiscController extends Controller
public function edit(Misc $misc)
{
- $misc = DB::table('misc_services as s')
- ->join('pricings as p', 's.id', '=', 'p.service_id')
- ->where('s.id', '=', $misc->id)
- ->get(['s.*', 'p.*']);
-
- return view('misc.edit', compact('misc'));
+ $misc_data = Misc::misc($misc->id)[0];
+ return view('misc.edit', compact('misc_data'));
}
public function update(Request $request, Misc $misc)
@@ -91,11 +79,11 @@ class MiscController extends Controller
]);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->updatePricing($misc->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
+ Cache::forget("all_misc");
+ Cache::forget("misc.{$misc->id}");
Home::homePageCacheForget();
return redirect()->route('misc.index')
@@ -105,12 +93,13 @@ class MiscController extends Controller
public function destroy(Misc $misc)
{
$items = Misc::find($misc->id);
-
$items->delete();
$p = new Pricing();
$p->deletePricing($misc->id);
+ Cache::forget("all_misc");
+ Cache::forget("misc.{$misc->id}");
Home::homePageCacheForget();
return redirect()->route('misc.index')
diff --git a/app/Http/Controllers/ResellerController.php b/app/Http/Controllers/ResellerController.php
index 075fc72..399a3c6 100644
--- a/app/Http/Controllers/ResellerController.php
+++ b/app/Http/Controllers/ResellerController.php
@@ -18,16 +18,13 @@ class ResellerController extends Controller
{
public function index()
{
- $resellers = Reseller::resellerDataIndexPage();
-
+ $resellers = Reseller::allResellerHosting();
return view('reseller.index', compact(['resellers']));
}
public function create()
{
- $Providers = Providers::allProviders();
- $Locations = Locations::allLocations();
- return view('reseller.create', compact(['Providers', 'Locations']));
+ return view('reseller.create');
}
public function store(Request $request)
@@ -60,9 +57,7 @@ class ResellerController extends Controller
$reseller_id = Str::random(8);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->insertPricing(3, $reseller_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
if (!is_null($request->dedicated_ip)) {
@@ -91,32 +86,23 @@ class ResellerController extends Controller
'db_limit' => $request->db
]);
+ Cache::forget("all_reseller");
Home::homePageCacheForget();
return redirect()->route('reseller.index')
->with('success', 'Reseller hosting created Successfully.');
}
-
public function show(Reseller $reseller)
{
- $reseller_extras = Reseller::resellerDataShowPage($reseller->id);
-
- $labels = Labels::labelsForService($reseller->id);
-
- $ip_address = IPs::ipsForServer($reseller->id);
- return view('reseller.show', compact(['reseller', 'reseller_extras', 'labels', 'ip_address']));
+ $reseller = Reseller::resellerHosting($reseller->id)[0];
+ return view('reseller.show', compact(['reseller']));
}
public function edit(Reseller $reseller)
{
- $labels = Labels::labelsForService($reseller->id);
-
- $ip_address = IPs::ipsForServer($reseller->id);
-
- $reseller = Reseller::resellerDataEditPage($reseller->id);
-
- return view('reseller.edit', compact(['reseller', 'ip_address', 'labels']));
+ $reseller = Reseller::resellerHosting($reseller->id)[0];
+ return view('reseller.edit', compact(['reseller']));
}
public function update(Request $request, Reseller $reseller)
@@ -164,13 +150,10 @@ class ResellerController extends Controller
]);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->updatePricing($request->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
Labels::deleteLabelsAssignedTo($request->id);
-
Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $request->id);
IPs::deleteIPsAssignedTo($request->id);
@@ -179,6 +162,7 @@ class ResellerController extends Controller
IPs::insertIP($request->id, $request->dedicated_ip);
}
+ Cache::forget("reseller_hosting.{$request->id}");
Cache::forget("labels_for_service.{$request->id}");
Home::homePageCacheForget();
@@ -189,18 +173,19 @@ class ResellerController extends Controller
public function destroy(Reseller $reseller)
{
- $id = $reseller->id;
- $items = Reseller::find($id);
-
+ $reseller_id = $reseller->id;
+ $items = Reseller::find($reseller_id);
$items->delete();
$p = new Pricing();
- $p->deletePricing($id);
+ $p->deletePricing($reseller_id);
- Labels::deleteLabelsAssignedTo($id);
+ Labels::deleteLabelsAssignedTo($reseller_id);
- IPs::deleteIPsAssignedTo($id);
+ IPs::deleteIPsAssignedTo($reseller_id);
+ Cache::forget("all_reseller");
+ Cache::forget("reseller_hosting.$reseller_id");
Home::homePageCacheForget();
return redirect()->route('reseller.index')
diff --git a/app/Http/Controllers/SeedBoxesController.php b/app/Http/Controllers/SeedBoxesController.php
index ed5bfe0..5a4ad2d 100644
--- a/app/Http/Controllers/SeedBoxesController.php
+++ b/app/Http/Controllers/SeedBoxesController.php
@@ -17,8 +17,7 @@ class SeedBoxesController extends Controller
{
public function index()
{
- $seedboxes = SeedBoxes::seedBoxesDataIndexPage();
-
+ $seedboxes = SeedBoxes::allSeedboxes();
return view('seedboxes.index', compact(['seedboxes']));
}
@@ -48,13 +47,10 @@ class SeedBoxesController extends Controller
$seedbox_id = Str::random(8);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->insertPricing(6, $seedbox_id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
Labels::deleteLabelsAssignedTo($seedbox_id);
-
Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $seedbox_id);
SeedBoxes::create([
@@ -73,6 +69,7 @@ class SeedBoxesController extends Controller
'was_promo' => $request->was_promo
]);
+ Cache::forget("all_seedboxes");
Home::homePageCacheForget();
return redirect()->route('seedboxes.index')
@@ -82,20 +79,14 @@ class SeedBoxesController extends Controller
public function show(SeedBoxes $seedbox)
{
- $seedbox_extras = SeedBoxes::seedBoxDataShowPage($seedbox->id);
-
- $labels = Labels::labelsForService($seedbox->id);
-
- return view('seedboxes.show', compact(['seedbox', 'seedbox_extras', 'labels']));
+ $seedbox_data = SeedBoxes::seedbox($seedbox->id)[0];
+ return view('seedboxes.show', compact(['seedbox_data']));
}
public function edit(SeedBoxes $seedbox)
{
- $seedbox = SeedBoxes::seedBoxEditDataPage($seedbox->id);
-
- $labels = Labels::labelsForService($seedbox[0]->id);
-
- return view('seedboxes.edit', compact(['seedbox', 'labels']));
+ $seedbox_data = SeedBoxes::seedbox($seedbox->id)[0];
+ return view('seedboxes.edit', compact(['seedbox_data']));
}
public function update(Request $request, SeedBoxes $seedbox)
@@ -134,17 +125,15 @@ class SeedBoxesController extends Controller
]);
$pricing = new Pricing();
-
$as_usd = $pricing->convertToUSD($request->price, $request->currency);
-
$pricing->updatePricing($seedbox->id, $request->currency, $request->price, $request->payment_term, $as_usd, $request->next_due_date);
Labels::deleteLabelsAssignedTo($seedbox->id);
-
Labels::insertLabelsAssigned([$request->label1, $request->label2, $request->label3, $request->label4], $seedbox->id);
+ Cache::forget("all_seedboxes");
+ Cache::forget("seedbox.{$seedbox->id}");
Cache::forget("labels_for_service.{$seedbox->id}");
-
Home::homePageCacheForget();
return redirect()->route('seedboxes.index')
@@ -162,6 +151,8 @@ class SeedBoxesController extends Controller
Labels::deleteLabelsAssignedTo($seedbox_id);
+ Cache::forget("all_seedboxes");
+ Cache::forget("seedbox.{$seedbox->id}");
Home::homePageCacheForget();
return redirect()->route('seedboxes.index')
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index c474492..9314c2d 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -30,6 +30,7 @@ class SettingsController extends Controller
'show_server_value_location' => 'required|boolean',
'show_server_value_price' => 'required|boolean',
'show_server_value_yabs' => 'required|boolean',
+ 'save_yabs_as_txt' => 'required|boolean',
'default_currency' => 'required',
'default_server_os' => 'required',
'due_soon_amount' => 'required|integer|between:0,12',
@@ -49,6 +50,7 @@ class SettingsController extends Controller
'show_server_value_location' => $request->show_server_value_location,
'show_server_value_price' => $request->show_server_value_price,
'show_server_value_yabs' => $request->show_server_value_yabs,
+ 'save_yabs_as_txt' => $request->save_yabs_as_txt,
'default_currency' => $request->default_currency,
'default_server_os' => $request->default_server_os,
'due_soon_amount' => $request->due_soon_amount,
diff --git a/app/Http/Controllers/SharedController.php b/app/Http/Controllers/SharedController.php
index 0a3f26e..6b824f9 100644
--- a/app/Http/Controllers/SharedController.php
+++ b/app/Http/Controllers/SharedController.php
@@ -97,7 +97,7 @@ class SharedController extends Controller
public function edit(Shared $shared)
{
- $shared = Shared::sharedHosting($shared->id);
+ $shared = Shared::sharedHosting($shared->id)[0];
return view('shared.edit', compact(['shared']));
}
diff --git a/app/Http/Controllers/YabsController.php b/app/Http/Controllers/YabsController.php
index 5658589..4c2e6c6 100644
--- a/app/Http/Controllers/YabsController.php
+++ b/app/Http/Controllers/YabsController.php
@@ -52,12 +52,18 @@ class YabsController extends Controller
'ram' => $yabs['ram'],
'ram_type' => $yabs['ram_type'],
'ram_mb' => $yabs['ram_mb'],
+ 'swap' => $yabs['swap'],
+ 'swap_type' => $yabs['swap_type'],
+ 'swap_mb' => $yabs['swap_mb'],
'disk' => $yabs['disk'],
'disk_type' => $yabs['disk_type'],
'disk_gb' => $yabs['disk_gb'],
'gb5_single' => $yabs['GB5_single'],
'gb5_multi' => $yabs['GB5_mult'],
- 'gb5_id' => $yabs['GB5_id']
+ 'gb5_id' => $yabs['GB5_id'],
+ 'uptime' => $yabs['uptime'],
+ 'distro' => $yabs['distro'],
+ 'kernel' => $yabs['kernel']
]);
DiskSpeed::create([
@@ -159,4 +165,11 @@ class YabsController extends Controller
return view('yabs.compare', compact('yabs1_data', 'yabs2_data'));
}
+ public function yabsToJson(Yabs $yab): array
+ {
+ $all_yabs = Yabs::yabs($yab->id)[0];
+ return Yabs::buildYabsArray($all_yabs);
+ }
+
+
}
diff --git a/app/Models/Domains.php b/app/Models/Domains.php
index 4e17810..72001eb 100644
--- a/app/Models/Domains.php
+++ b/app/Models/Domains.php
@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
class Domains extends Model
@@ -12,30 +13,39 @@ class Domains extends Model
public $incrementing = false;
+ protected $table = 'domains';
+
protected $fillable = ['id', 'domain', 'extension', 'ns1', 'ns2', 'ns3', 'price', 'currency', 'payment_term', 'owned_since', 'provider_id', 'next_due_date'];
- public static function domainsDataIndexPage()
- {
- return DB::table('domains as d')
- ->join('providers as p', 'd.provider_id', '=', 'p.id')
- ->join('pricings as pr', 'd.id', '=', 'pr.service_id')
- ->get(['d.*', 'p.name as provider_name', 'pr.*']);
+
+ public static function allDomains()
+ {//All domains and relationships (no using joins)
+ return Cache::remember("all_domains", now()->addMonth(1), function () {
+ return Domains::with(['provider', 'price', 'labels', 'labels.label'])->get();
+ });
}
- public static function domainsDataShowPage(string $domain_id)
- {
- return DB::table('domains as d')
- ->join('providers as p', 'd.provider_id', '=', 'p.id')
- ->join('pricings as pr', 'd.id', '=', 'pr.service_id')
- ->where('d.id', '=', $domain_id)
- ->get(['d.*', 'p.name as provider_name', 'pr.*']);
+ public static function domain(string $domain_id)
+ {//Single domains and relationships (no using joins)
+ return Cache::remember("domain.$domain_id", now()->addMonth(1), function () use ($domain_id) {
+ return Domains::where('id', $domain_id)
+ ->with(['provider', 'price', 'labels', 'labels.label'])->get();
+ });
}
- public static function domainsDataEditPage(string $domain_id)
+ public function provider()
{
- return DB::table('domains as d')
- ->join('pricings as pr', 'd.id', '=', 'pr.service_id')
- ->where('d.id', '=', $domain_id)
- ->get(['d.*', 'pr.*']);
+ return $this->hasOne(Providers::class, 'id', 'provider_id');
}
+
+ public function price()
+ {
+ return $this->hasOne(Pricing::class, 'service_id', 'id');
+ }
+
+ public function labels()
+ {
+ return $this->hasMany(LabelsAssigned::class, 'service_id', 'id');
+ }
+
}
diff --git a/app/Models/Labels.php b/app/Models/Labels.php
index 50f1840..02fd417 100644
--- a/app/Models/Labels.php
+++ b/app/Models/Labels.php
@@ -43,14 +43,9 @@ class Labels extends Model
});
}
- public static function labelsForService(string $service_id)
+ public function assigned()
{
- return Cache::remember("labels_for_service.$service_id", now()->addMinute(5), function () use ($service_id) {
- return DB::table('labels_assigned as l')
- ->join('labels', 'l.label_id', '=', 'labels.id')
- ->where('l.service_id', '=', $service_id)
- ->get(['labels.id', 'labels.label']);
- });
+ return $this->hasMany(LabelsAssigned::class, 'label_id', 'id');
}
}
diff --git a/app/Models/Misc.php b/app/Models/Misc.php
index cba204b..21115b0 100644
--- a/app/Models/Misc.php
+++ b/app/Models/Misc.php
@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
class Misc extends Model
{
@@ -14,4 +15,25 @@ class Misc extends Model
protected $table = 'misc_services';
protected $fillable = ['id', 'name', 'owned_since'];
+
+ public static function allMisc()
+ {//All misc and relationships (no using joins)
+ return Cache::remember("all_misc", now()->addMonth(1), function () {
+ return Misc::with(['price'])->get();
+ });
+ }
+
+ public static function misc(string $misc_id)
+ {//Single misc and relationships (no using joins)
+ return Cache::remember("misc.$misc_id", now()->addMonth(1), function () use ($misc_id) {
+ return Misc::where('id', $misc_id)
+ ->with(['price'])->get();
+ });
+ }
+
+ public function price()
+ {
+ return $this->hasOne(Pricing::class, 'service_id', 'id');
+ }
+
}
diff --git a/app/Models/Reseller.php b/app/Models/Reseller.php
index b3dfd31..df43c73 100644
--- a/app/Models/Reseller.php
+++ b/app/Models/Reseller.php
@@ -17,32 +17,44 @@ class Reseller extends Model
public $incrementing = false;
- public static function resellerDataIndexPage()
- {
- return DB::table('reseller_hosting as s')
- ->join('providers as p', 's.provider_id', '=', 'p.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->join('pricings as pr', 's.id', '=', 'pr.service_id')
- ->get(['s.*', 'p.name as provider_name', 'pr.*', 'l.name as location']);
+ public static function allResellerHosting()
+ {//All reseller hosting and relationships (no using joins)
+ return Cache::remember("all_reseller", now()->addMonth(1), function () {
+ return Reseller::with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->get();
+ });
}
- public static function resellerDataShowPage(string $reseller_id)
+ public static function resellerHosting(string $shared_id)
+ {//Single reseller hosting and relationships (no using joins)
+ return Cache::remember("reseller_hosting.$shared_id", now()->addMonth(1), function () use ($shared_id) {
+ return Reseller::where('id', $shared_id)
+ ->with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->get();
+ });
+ }
+
+ public function ips()
{
- return DB::table('reseller_hosting as s')
- ->join('pricings as pr', 's.id', '=', 'pr.service_id')
- ->join('providers as p', 's.provider_id', '=', 'p.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->where('s.id', '=', $reseller_id)
- ->get(['s.*', 'p.name as provider_name', 'l.name as location', 'pr.*']);
+ return $this->hasMany(IPs::class, 'service_id', 'id');
}
- public static function resellerDataEditPage(string $reseller_id)
+ public function location()
{
- return DB::table('reseller_hosting as s')
- ->join('pricings as p', 's.id', '=', 'p.service_id')
- ->where('s.id', '=', $reseller_id)
- ->get(['s.*', 'p.*']);
+ return $this->hasOne(Locations::class, 'id', 'location_id');
+ }
+ public function provider()
+ {
+ return $this->hasOne(Providers::class, 'id', 'provider_id');
+ }
+
+ public function price()
+ {
+ return $this->hasOne(Pricing::class, 'service_id', 'id');
+ }
+
+ public function labels()
+ {
+ return $this->hasMany(LabelsAssigned::class, 'service_id', 'id');
}
}
diff --git a/app/Models/SeedBoxes.php b/app/Models/SeedBoxes.php
index 4582881..3b82126 100644
--- a/app/Models/SeedBoxes.php
+++ b/app/Models/SeedBoxes.php
@@ -17,34 +17,39 @@ class SeedBoxes extends Model
protected $fillable = ['id', 'active', 'title', 'hostname', 'seed_box_type', 'provider_id', 'location_id', 'bandwidth', 'port_speed', 'disk', 'disk_type', 'disk_as_gb', 'was_promo', 'owned_since'];
- public static function seedBoxesDataIndexPage()
- {
- return DB::table('seedboxes as s')
- ->join('providers as p', 's.provider_id', '=', 'p.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->join('pricings as pr', 's.id', '=', 'pr.service_id')
- ->get(['s.*', 'p.name as provider_name', 'pr.*', 'l.name as location']);
+ public static function allSeedboxes()
+ {//All seedboxes and relationships (no using joins)
+ return Cache::remember("all_seedboxes", now()->addMonth(1), function () {
+ return SeedBoxes::with(['location', 'provider', 'price', 'labels.label'])->get();
+ });
}
- public static function seedBoxDataShowPage(string $seed_box_id)
- {
- return DB::table('seedboxes as s')
- ->join('pricings as pr', 's.id', '=', 'pr.service_id')
- ->join('providers as p', 's.provider_id', '=', 'p.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->where('s.id', '=', $seed_box_id)
- ->get(['s.*', 'p.name as provider_name', 'l.name as location', 'pr.*']);
+ public static function seedbox(string $seedbox_id)
+ {//Single seedbox and relationships (no using joins)
+ return Cache::remember("seedbox.$seedbox_id", now()->addMonth(1), function () use ($seedbox_id) {
+ return SeedBoxes::where('id', $seedbox_id)
+ ->with(['location', 'provider', 'price', 'labels.label'])->get();
+ });
}
- public static function seedBoxEditDataPage(string $seed_box_id)
+ public function location()
{
- return DB::table('seedboxes as s')
- ->join('pricings as pr', 's.id', '=', 'pr.service_id')
- ->join('providers as p', 's.provider_id', '=', 'p.id')
- ->join('locations as l', 's.location_id', '=', 'l.id')
- ->where('s.id', '=', $seed_box_id)
- ->get(['s.*', 'p.name as provider_name', 'l.name as location', 'pr.*']);
+ return $this->hasOne(Locations::class, 'id', 'location_id');
}
+ public function provider()
+ {
+ return $this->hasOne(Providers::class, 'id', 'provider_id');
+ }
+
+ public function price()
+ {
+ return $this->hasOne(Pricing::class, 'service_id', 'id');
+ }
+
+ public function labels()
+ {
+ return $this->hasMany(LabelsAssigned::class, 'service_id', 'id');
+ }
}
diff --git a/app/Models/Settings.php b/app/Models/Settings.php
index 300f66b..913d183 100644
--- a/app/Models/Settings.php
+++ b/app/Models/Settings.php
@@ -36,6 +36,7 @@ class Settings extends Model
Session::put('show_server_value_yabs', $settings[0]->show_server_value_yabs ?? 0);
Session::put('show_server_value_provider', $settings[0]->show_server_value_provider ?? 0);
Session::put('show_server_value_location', $settings[0]->show_server_value_location ?? 0);
+ Session::put('save_yabs_as_txt', $settings[0]->save_yabs_as_txt ?? 0);
Session::put('default_currency', $settings[0]->default_currency ?? 'USD');
Session::put('default_server_os', $settings[0]->default_server_os ?? 1);
Session::put('due_soon_amount', $settings[0]->due_soon_amount ?? 6);
diff --git a/app/Models/Yabs.php b/app/Models/Yabs.php
index 3010313..130a4ac 100644
--- a/app/Models/Yabs.php
+++ b/app/Models/Yabs.php
@@ -15,30 +15,12 @@ class Yabs extends Model
protected $table = 'yabs';
- protected $fillable = ['id', 'server_id', 'has_ipv6', 'aes', 'vm', 'output_date', 'cpu_cores', 'cpu_freq', 'cpu_model', 'ram', 'ram_type', 'ram_mb', 'disk', 'disk_type', 'disk_gb', 'gb5_single', 'gb5_multi', 'gb5_id', '4k', '4k_type', '4k_as_mbps', '64k', '64k_type', '64k_as_mbps', '512k', '512k_type', '512k_as_mbps', '1m', '1m_type', '1m_as_mbps', 'location', 'send', 'send_type', 'send_as_mbps', 'receive', 'receive_type', 'receive_as_mbps'];
-
- public static function networkSpeedsForServer(string $server_id)
- {
- return Cache::remember("network_speeds.$server_id", now()->addMonth(1), function () use ($server_id) {
- return json_decode(DB::table('network_speed')
- ->where('network_speed.server_id', '=', $server_id)
- ->get(), true);
- });
- }
-
- public static function serverCompareNetwork(string $yabs_id)
- {
- return Cache::remember("compare_network_speeds.$yabs_id", now()->addMonth(1), function () use ($yabs_id) {
- return DB::table('network_speed')
- ->where('id', '=', $yabs_id)
- ->get();
- });
- }
+ protected $fillable = ['id', 'server_id', 'has_ipv6', 'aes', 'vm', 'output_date', 'cpu_cores', 'cpu_freq', 'cpu_model', 'ram', 'ram_type', 'ram_mb', 'disk', 'disk_type', 'disk_gb', 'gb5_single', 'gb5_multi', 'gb5_id', '4k', '4k_type', '4k_as_mbps', '64k', '64k_type', '64k_as_mbps', '512k', '512k_type', '512k_as_mbps', '1m', '1m_type', '1m_as_mbps', 'location', 'send', 'send_type', 'send_as_mbps', 'receive', 'receive_type', 'receive_as_mbps', 'uptime', 'distro', 'kernel', 'swap', 'swap_type', 'swap_mb'];
public static function yabs(string $yabs_id)
{
return Cache::remember("yabs.$yabs_id", now()->addMonth(1), function () use ($yabs_id) {
- return self::where('id', $yabs_id)->with(['server', 'disk_speed', 'network_speed'])
+ return self::where('id', $yabs_id)->with(['server', 'disk_speed', 'network_speed', 'server.location', 'server.provider'])
->get();
});
}
@@ -46,7 +28,7 @@ class Yabs extends Model
public static function allYabs()
{
return Cache::remember("all_yabs", now()->addMonth(1), function () {
- return self::with(['server', 'disk_speed', 'network_speed'])
+ return self::with(['server', 'disk_speed', 'network_speed', 'server.location', 'server.provider'])
->get();
});
}
@@ -66,4 +48,55 @@ class Yabs extends Model
return $this->hasMany(NetworkSpeed::class, 'id', 'id');
}
+ public static function buildYabsArray($data): array
+ {
+ $speed_tests = [];
+ foreach ($data->network_speed as $ns) {
+ $speed_tests[] = array(
+ 'location' => $ns->location,
+ 'send' => $ns->send . ' ' . $ns->send_type,
+ 'receive' => $ns->receive . ' ' . $ns->receive_type,
+ );
+ }
+ return array(
+ 'date_time' => $data->output_date,
+ 'location' => $data->server->location->name,
+ 'provider' => $data->server->provider->name,
+ 'uptime' => $data->uptime,
+ 'distro' => $data->distro,
+ 'kernel' => $data->kernel,
+ 'cpu' => array(
+ 'cores' => $data->cpu_cores,
+ 'speed_mhz' => $data->cpu_freq,
+ 'model' => $data->cpu_model,
+ 'aes' => $data->aes === 1,
+ 'vm' => $data->vm === 1,
+ 'GB5_single' => $data->gb5_single,
+ 'GB5_multi' => $data->gb5_multi,
+ ),
+ 'ram' => array(
+ 'amount' => $data->ram . ' ' . $data->ram_type,
+ 'mb' => $data->ram_mb,
+ 'swap' => array(
+ 'amount' => $data->swap ?? null . ' ' . $data->swap_type ?? null,
+ 'mb' => $data->swap_mb ?? null,
+ ),
+ ),
+ 'disk' => array(
+ 'amount' => $data->disk . ' ' . $data->disk_type,
+ 'gb' => $data->disk_gb,
+ 'speed_tests' => array(
+ '4k' => $data->disk_speed->d_4k . ' ' . $data->disk_speed->d_4k_type,
+ '64k' => $data->disk_speed->d_64k . ' ' . $data->disk_speed->d_64k_type,
+ '512k' => $data->disk_speed->d_512k . ' ' . $data->disk_speed->d_512k_type,
+ '1m' => $data->disk_speed->d_1m . ' ' . $data->disk_speed->d_1m_type,
+ ),
+ ),
+ 'network' => array(
+ 'has_ipv6' => $data->has_ipv6 === 1,
+ 'speed_tests' => $speed_tests
+ ),
+ );
+ }
+
}
diff --git a/app/Process.php b/app/Process.php
index 1c7e636..dc82dfb 100644
--- a/app/Process.php
+++ b/app/Process.php
@@ -3,6 +3,7 @@
namespace App;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Storage;
class Process
@@ -169,22 +170,24 @@ class Process
public function yabsOutputAsJson(string $server_id, string $data_from_form): array
{
- $file_name = 'tempYabs.txt';
-
$allowed_versions = ['v2021-12-28', 'v2022-02-18', 'v2022-04-30', 'v2022-05-06', 'v2022-06-11'];
+ $file_name = date('Y') . '/' . date('m') . '/' . time() . '.txt';
+
Storage::disk('local')->put($file_name, $data_from_form);
$file = Storage::disk('local')->get($file_name);
if ($file) {
$array = explode("\n", $file);
- Storage::disk('local')->delete($file_name);//Delete file
+ if (!Session::get('save_yabs_as_txt')) {//Check if we want YABs txt to stay
+ Storage::disk('local')->delete($file_name);//Delete file
+ }
} else {
return array('error_id' => 10, 'error_message' => 'Issue writing/reading txt file');
}
- //dd($array);
+ //dd($array);//Good for debugging the lines
if (count($array) < 46) {
return array('error_id' => 9, 'error_message' => 'Less than 46 lines');
@@ -213,6 +216,9 @@ class Process
$io_6 = explode(' ', preg_replace('!\s+!', ' ', $array[33]));
(str_contains($array[13], 'Enabled')) ? $aes_ni = true : $aes_ni = false;
(str_contains($array[14], 'Enabled')) ? $vm_amd_v = true : $vm_amd_v = false;
+ $uptime = str_replace(["Uptime : ", "\r"], '', $array[10]);
+ $distro = str_replace(["Distro : ", "\r"], '', $array[18]);
+ $kernel = str_replace(["Kernel : ", "\r"], '', $array[19]);
} else {
$cpu = $this->trimRemoveR(str_replace(':', '', strstr($array[10], ': ')));
$cpu_spec = explode(' ', strstr($array[11], ': '));//: 2 @ 3792.872 MHz
@@ -304,7 +310,7 @@ class Process
$gb_s = 60;
$gb_m = 61;
$gb_url = 62;
- }elseif ($array[59] === "Geekbench 5 Benchmark Test:\r") {
+ } elseif ($array[59] === "Geekbench 5 Benchmark Test:\r") {
//HAS ipv6
//Has full ipv4 & ipv6 network speed testing
$has_ipv6 = true;
@@ -397,7 +403,10 @@ class Process
'vm' => $vm_amd_v,
'GB5_single' => $geekbench_single,
'GB5_mult' => $geekbench_multi,
- 'GB5_id' => $gb5_id
+ 'GB5_id' => $gb5_id,
+ 'uptime' => $uptime ?? null,
+ 'distro' => $distro ?? null,
+ 'kernel' => $kernel ?? null,
];
$output['disk_speed'] = $disk_test_arr;
diff --git a/database/migrations/2022_07_20_011250_add_columns_to_yabs_table.php b/database/migrations/2022_07_20_011250_add_columns_to_yabs_table.php
new file mode 100644
index 0000000..c89e1c8
--- /dev/null
+++ b/database/migrations/2022_07_20_011250_add_columns_to_yabs_table.php
@@ -0,0 +1,31 @@
+string('uptime')->nullable()->default(null)->after('gb5_id');
+ $table->string('distro')->nullable()->default(null)->after('gb5_id');
+ $table->string('kernel')->nullable()->default(null)->after('gb5_id');
+ $table->float('swap')->nullable()->default(null)->after('ram_mb');
+ $table->char('swap_type', 2)->nullable()->default(null)->after('ram_mb');
+ $table->float('swap_mb')->nullable()->default(null)->after('ram_mb');
+ });
+ }
+
+ public function down()
+ {
+ Schema::table('yabs', function (Blueprint $table) {
+ $table->dropColumn('uptime');
+ $table->dropColumn('distro');
+ $table->dropColumn('kernel');
+ $table->dropColumn('swap');
+ $table->dropColumn('swap_type', 2);
+ $table->dropColumn('swap_mb');
+ });
+ }
+};
diff --git a/database/migrations/2022_07_20_015804_add_column_to_settings_table.php b/database/migrations/2022_07_20_015804_add_column_to_settings_table.php
new file mode 100644
index 0000000..f94fe56
--- /dev/null
+++ b/database/migrations/2022_07_20_015804_add_column_to_settings_table.php
@@ -0,0 +1,22 @@
+boolean('save_yabs_as_txt')->default(false)->after('show_server_value_yabs');
+ });
+ }
+
+ public function down()
+ {
+ Schema::table('settings', function (Blueprint $table) {
+ $table->dropColumn('save_yabs_as_txt');
+ });
+ }
+};
diff --git a/public/css/bootstrap-dark.min.css b/public/css/bootstrap-dark.min.css
index 2a68b73..87bc38b 100644
Binary files a/public/css/bootstrap-dark.min.css and b/public/css/bootstrap-dark.min.css differ
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
index 3a41517..c49c20a 100644
Binary files a/public/css/bootstrap.min.css and b/public/css/bootstrap.min.css differ
diff --git a/resources/views/components/back-btn.blade.php b/resources/views/components/back-btn.blade.php
new file mode 100644
index 0000000..245a480
--- /dev/null
+++ b/resources/views/components/back-btn.blade.php
@@ -0,0 +1,4 @@
+
+
+ {{$text ?? 'Go back'}}
+
diff --git a/resources/views/components/edit-btn.blade.php b/resources/views/components/edit-btn.blade.php
new file mode 100644
index 0000000..5e0f98c
--- /dev/null
+++ b/resources/views/components/edit-btn.blade.php
@@ -0,0 +1,4 @@
+
+
+ {{$text ?? 'Edit'}}
+
diff --git a/resources/views/domains/edit.blade.php b/resources/views/domains/edit.blade.php
index f9ae1c4..d3d5681 100644
--- a/resources/views/domains/edit.blade.php
+++ b/resources/views/domains/edit.blade.php
@@ -1,7 +1,7 @@
@section('title') {{'Edit domain'}} @endsection
@foreach($labels as $label)
- @if($loop->last)
- {{$label->label}}
- @else
- {{$label->label}},
- @endif
- @endforeach
+ @foreach($labels as $label)
- @if($loop->last)
- {{$label->label}}
- @else
- {{$label->label}},
- @endif
- @endforeach
+ @foreach($reseller->labels as $label)
+ {{$label->label->label}}
+ @endforeach
@if(isset($ip_address[0]->address))
- {{$ip_address[0]->address}}
+ @if(isset($reseller->ips[0]->address))
+ {{$reseller->ips[0]->address}}
@endif
diff --git a/resources/views/seedboxes/edit.blade.php b/resources/views/seedboxes/edit.blade.php
index e846120..737c7bd 100644
--- a/resources/views/seedboxes/edit.blade.php
+++ b/resources/views/seedboxes/edit.blade.php
@@ -1,7 +1,7 @@
-@section('title') {{$seedbox[0]->title}} {{'edit'}} @endsection
+@section('title') {{$seedbox_data->title}} {{'edit'}} @endsection
diff --git a/resources/views/servers/index-cards.blade.php b/resources/views/servers/index-cards.blade.php
new file mode 100644
index 0000000..7f5af80
--- /dev/null
+++ b/resources/views/servers/index-cards.blade.php
@@ -0,0 +1,149 @@
+@section('title')
+ {{'Servers'}}
+@endsection
+@section('style')
+ {{ $server->provider->name }} {{ $server->os->name }} Built on Laravel
+ v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) Only if Show servers to public is YES do these apply:
diff --git a/resources/views/yabs/show.blade.php b/resources/views/yabs/show.blade.php
index 35f8475..7ed410a 100644
--- a/resources/views/yabs/show.blade.php
+++ b/resources/views/yabs/show.blade.php
@@ -5,10 +5,9 @@
diff --git a/resources/views/seedboxes/show.blade.php b/resources/views/seedboxes/show.blade.php
index b52f480..579a95d 100644
--- a/resources/views/seedboxes/show.blade.php
+++ b/resources/views/seedboxes/show.blade.php
@@ -1,4 +1,4 @@
-@section('title') {{$seedbox->title}} {{'Seed box'}} @endsection
+@section('title') {{$seedbox_data->title}} {{'Seed box'}} @endsection
{{ $row->title }}
{{ $row->seed_box_type }}
- {{ $row->location }}
- {{ $row->provider_name }}
+ {{ $row->location->name }}
+ {{ $row->provider->name }}
@if($row->disk_as_gb >= 1000)
{{ number_format($row->disk_as_gb / 1000,1) }} TB
@@ -66,22 +66,22 @@
{{ $row->port_speed }} Mbps
@endif
- {{ $row->price }} {{$row->currency}} {{\App\Process::paymentTermIntToString($row->term)}}
- {{Carbon\Carbon::parse($row->next_due_date)->diffForHumans()}}
+ {{ $row->price->price }} {{$row->price->currency}} {{\App\Process::paymentTermIntToString($row->price->term)}}
+ {{Carbon\Carbon::parse($row->price->next_due_date)->diffForHumans()}}
{{ $row->owned_since }}
-
{{ $seedbox->title }}
- @foreach($labels as $label)
- @if($loop->last)
- {{$label->label}}
- @else
- {{$label->label}},
- @endif
- @endforeach
+ {{ $seedbox_data->title }}
+ @foreach($seedbox_data->labels as $label)
+ {{$label->label->label}}
+ @endforeach
{{ $seedbox->id }}
- @if($seedbox->active !== 1)
+ {{ $seedbox_data->id }}
+ @if($seedbox_data->active !== 1)
not active
@endif
Type
- {{ $seedbox->seed_box_type }}
+ {{ $seedbox_data->seed_box_type }}
Hostname
- {{ $seedbox_extras[0]->hostname }}{{ $seedbox_data->hostname }}
Location
- {{ $seedbox_extras[0]->location }}
+ {{ $seedbox_data->location->name }}
Provider
- {{ $seedbox_extras[0]->provider_name }}
+ {{ $seedbox_data->provider->name }}
Price
- {{ $seedbox_extras[0]->price }} {{ $seedbox_extras[0]->currency }}
- {{\App\Process::paymentTermIntToString($seedbox_extras[0]->term)}}
+ {{ $seedbox_data->price->price }} {{ $seedbox_data->price->currency }}
+ {{\App\Process::paymentTermIntToString($seedbox_data->price->term)}}
Was promo
- {{ ($seedbox_extras[0]->was_promo === 1) ? 'Yes' : 'No' }}
+ {{ ($seedbox_data->was_promo === 1) ? 'Yes' : 'No' }}
Owned since
- @if(!is_null($seedbox->owned_since))
- {{ date_format(new DateTime($seedbox->owned_since), 'jS F Y') }}
+ @if(!is_null($seedbox_data->owned_since))
+ {{ date_format(new DateTime($seedbox_data->owned_since), 'jS F Y') }}
@endif
Next due date
- {{Carbon\Carbon::parse($seedbox_extras[0]->next_due_date)->diffForHumans()}}
- ({{Carbon\Carbon::parse($seedbox_extras[0]->next_due_date)->format('d/m/Y')}})
+ {{Carbon\Carbon::parse($seedbox_data->price->next_due_date)->diffForHumans()}}
+ ({{Carbon\Carbon::parse($seedbox_data->price->next_due_date)->format('d/m/Y')}})
Inserted
- @if(!is_null($seedbox->created_at))
- {{ date_format(new DateTime($seedbox->created_at), 'jS M y g:i a') }}
+ @if(!is_null($seedbox_data->created_at))
+ {{ date_format(new DateTime($seedbox_data->created_at), 'jS M y g:i a') }}
@endif
@@ -94,30 +90,30 @@
Updated
- @if(!is_null($seedbox->updated_at))
- {{ date_format(new DateTime($seedbox->updated_at), 'jS M y g:i a') }}
+ @if(!is_null($seedbox_data->updated_at))
+ {{ date_format(new DateTime($seedbox_data->updated_at), 'jS M y g:i a') }}
@endif
Disk
- @if($seedbox->disk_as_gb >= 1000)
- {{ number_format($seedbox->disk_as_gb / 1000,1) }} TB
+ @if($seedbox_data->disk_as_gb >= 1000)
+ {{ number_format($seedbox_data->disk_as_gb / 1000,1) }} TB
@else
- {{ $seedbox->disk_as_gb }} GB
+ {{ $seedbox_data->disk_as_gb }} GB
@endif
Bandwidth
- @if($seedbox->bandwidth >= 1000)
- {{ number_format($seedbox->bandwidth / 1000,1) }} TB
+ @if($seedbox_data->bandwidth >= 1000)
+ {{ number_format($seedbox_data->bandwidth / 1000,1) }} TB
@else
- {{ $seedbox->bandwidth }} GB
+ {{ $seedbox_data->bandwidth }} GB
@endif
@@ -126,14 +122,12 @@
-
- Go back
-
-
- Edit
-
+ Port speed
- @if($seedbox->port_speed >= 1000)
- {{ number_format($seedbox->port_speed / 1000,1) }} Gbps
+ @if($seedbox_data->port_speed >= 1000)
+ {{ number_format($seedbox_data->port_speed / 1000,1) }} Gbps
@else
- {{ $seedbox->port_speed }} Mbps
+ {{ $seedbox_data->port_speed }} Mbps
@endif
{{ $server->location->name }}
+ {{ $server->price->currency }} {{ $server->price->price }}
+ Server
{{ $yab[0]->server->hostname }}