davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Dennis Smink
2020-10-05 14:34:24 +02:00
parent 57a5ec2206
commit 204afb7eb1
15 changed files with 380 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/Admin/SynchronizeProviderController.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\Provider;
use App\Services\Ploi\Ploi;
use Illuminate\Http\Request;
class SynchronizeProviderController extends Controller
{
public function index()
{
}
public function synchronize()
{
$providers = (new Ploi)->user()->serverProviders()->getData();
foreach ($providers as $ploiProvider) {
$provider = Provider::updateOrCreate([
'ploi_id' => $ploiProvider->id,
], [
'label' => $ploiProvider->label,
'name' => $ploiProvider->name
]);
foreach ($ploiProvider->provider->plans as $plan) {
$provider->plans()->updateOrCreate([
'plan_id' => $plan->id
], [
'label' => $plan->name,
]);
}
foreach ($ploiProvider->provider->regions as $region) {
$provider->regions()->updateOrCreate([
'region_id' => $region->id
], [
'label' => $region->name,
]);
}
}
}
}

5
app/Http/Controllers/DashboardController.php
View File

@@ -8,8 +8,6 @@ class DashboardController extends Controller
{
public function index()
{
$package = auth()->user()->package;
$logs = auth()->user()->systemLogs()
->with('model')
->latest()
@@ -31,9 +29,6 @@ class DashboardController extends Controller
return inertia('Dashboard/Index', [
'sites' => auth()->user()->sites()->count(),
'servers' => auth()->user()->servers()->count(),
'package' => [
'name' => $package->name ?? 'None'
],
'logs' => $logs,
]);
}

5
app/Providers/AppServiceProvider.php
View File

@@ -71,8 +71,11 @@ class AppServiceProvider extends ServiceProvider
'theme' => Auth::user()->theme,
] : null,
'package' => auth()->user() && auth()->user()->package ? [
'name' => auth()->user()->package->name,
'maximum_sites' => auth()->user()->package->maximum_sites
] : null,
] : [
'name' => __('None')
],
'can' => $can
];
},

391
composer.lock generated
View File

@@ -205,16 +205,16 @@
},
{
"name": "dasprid/enum",
"version": "1.0.2",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/DASPRiD/Enum.git",
"reference": "6ccc0d7141a7f149e3c56cb0ce5f05d9152cfd07"
"reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6ccc0d7141a7f149e3c56cb0ce5f05d9152cfd07",
"reference": "6ccc0d7141a7f149e3c56cb0ce5f05d9152cfd07",
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2",
"reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2",
"shasum": ""
},
"require-dev": {
@@ -244,7 +244,7 @@
"enum",
"map"
],
"time": "2020-07-30T16:37:13+00:00"
"time": "2020-10-02T16:03:48+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -570,16 +570,16 @@
},
{
"name": "egulias/email-validator",
"version": "2.1.21",
"version": "2.1.22",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "563d0cdde5d862235ffe24a158497f4d490191b5"
"reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/563d0cdde5d862235ffe24a158497f4d490191b5",
"reference": "563d0cdde5d862235ffe24a158497f4d490191b5",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5",
"reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5",
"shasum": ""
},
"require": {
@@ -624,7 +624,7 @@
"validation",
"validator"
],
"time": "2020-09-19T14:37:56+00:00"
"time": "2020-09-26T15:48:38+00:00"
},
{
"name": "fideloper/proxy",
@@ -885,23 +885,23 @@
},
{
"name": "guzzlehttp/promises",
"version": "v1.3.1",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
"reference": "60d379c243457e073cff02bc323a2a86cb355631"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
"reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
"url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
"reference": "60d379c243457e073cff02bc323a2a86cb355631",
"shasum": ""
},
"require": {
"php": ">=5.5.0"
"php": ">=5.5"
},
"require-dev": {
"phpunit/phpunit": "^4.0"
"symfony/phpunit-bridge": "^4.4 || ^5.1"
},
"type": "library",
"extra": {
@@ -932,20 +932,20 @@
"keywords": [
"promise"
],
"time": "2016-12-20T10:07:11+00:00"
"time": "2020-09-30T07:37:28+00:00"
},
{
"name": "guzzlehttp/psr7",
"version": "1.6.1",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "239400de7a173fe9901b9ac7c06497751f00727a"
"reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
"reference": "239400de7a173fe9901b9ac7c06497751f00727a",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
"reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
"shasum": ""
},
"require": {
@@ -958,15 +958,15 @@
},
"require-dev": {
"ext-zlib": "*",
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
},
"suggest": {
"zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
"dev-master": "1.7-dev"
}
},
"autoload": {
@@ -1003,20 +1003,20 @@
"uri",
"url"
],
"time": "2019-07-01T23:21:34+00:00"
"time": "2020-09-30T07:37:11+00:00"
},
{
"name": "inertiajs/inertia-laravel",
"version": "v0.2.12",
"version": "v0.2.15",
"source": {
"type": "git",
"url": "https://github.com/inertiajs/inertia-laravel.git",
"reference": "4f0e1ef6410276ebb4ae6e958e73e9339de2c0cf"
"reference": "3db77cb928a2b8373ebb863fbdc6345883f13b61"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/4f0e1ef6410276ebb4ae6e958e73e9339de2c0cf",
"reference": "4f0e1ef6410276ebb4ae6e958e73e9339de2c0cf",
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/3db77cb928a2b8373ebb863fbdc6345883f13b61",
"reference": "3db77cb928a2b8373ebb863fbdc6345883f13b61",
"shasum": ""
},
"require": {
@@ -1063,7 +1063,7 @@
"type": "github"
}
],
"time": "2020-09-17T15:38:25+00:00"
"time": "2020-10-02T12:53:20+00:00"
},
{
"name": "intervention/image",
@@ -1137,16 +1137,16 @@
},
{
"name": "laravel/cashier",
"version": "v12.3.1",
"version": "v12.4.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/cashier-stripe.git",
"reference": "9ca4eb279953be913480ff541c9f36c0dd76bf2e"
"reference": "1f5cf6b0068e6edf1d14689b1cd8fdf0b3025102"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/cashier-stripe/zipball/9ca4eb279953be913480ff541c9f36c0dd76bf2e",
"reference": "9ca4eb279953be913480ff541c9f36c0dd76bf2e",
"url": "https://api.github.com/repos/laravel/cashier-stripe/zipball/1f5cf6b0068e6edf1d14689b1cd8fdf0b3025102",
"reference": "1f5cf6b0068e6edf1d14689b1cd8fdf0b3025102",
"shasum": ""
},
"require": {
@@ -1207,20 +1207,20 @@
"laravel",
"stripe"
],
"time": "2020-09-01T15:17:21+00:00"
"time": "2020-09-29T17:15:30+00:00"
},
{
"name": "laravel/framework",
"version": "v8.6.0",
"version": "v8.8.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "a71952a6dba55de0bb11b5fbbd84874eda2a755c"
"reference": "0bdd5c6f12cb7cb6644e484169656245af417735"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/a71952a6dba55de0bb11b5fbbd84874eda2a755c",
"reference": "a71952a6dba55de0bb11b5fbbd84874eda2a755c",
"url": "https://api.github.com/repos/laravel/framework/zipball/0bdd5c6f12cb7cb6644e484169656245af417735",
"reference": "0bdd5c6f12cb7cb6644e484169656245af417735",
"shasum": ""
},
"require": {
@@ -1370,20 +1370,20 @@
"framework",
"laravel"
],
"time": "2020-09-22T13:42:02+00:00"
"time": "2020-10-02T14:33:08+00:00"
},
{
"name": "laravel/horizon",
"version": "v5.1.0",
"version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/horizon.git",
"reference": "09173d933845cb035eeee19ce8debf94b28bb717"
"reference": "839bf8b142585f7be142090d4d05c341a4595fae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/horizon/zipball/09173d933845cb035eeee19ce8debf94b28bb717",
"reference": "09173d933845cb035eeee19ce8debf94b28bb717",
"url": "https://api.github.com/repos/laravel/horizon/zipball/839bf8b142585f7be142090d4d05c341a4595fae",
"reference": "839bf8b142585f7be142090d4d05c341a4595fae",
"shasum": ""
},
"require": {
@@ -1443,7 +1443,7 @@
"laravel",
"queue"
],
"time": "2020-09-22T16:21:33+00:00"
"time": "2020-09-29T17:39:48+00:00"
},
{
"name": "laravel/tinker",
@@ -2126,16 +2126,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.10.1",
"version": "v4.10.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "1b479e7592812411c20c34d9ed33db3957bde66e"
"reference": "658f1be311a230e0907f5dfe0213742aff0596de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1b479e7592812411c20c34d9ed33db3957bde66e",
"reference": "1b479e7592812411c20c34d9ed33db3957bde66e",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de",
"reference": "658f1be311a230e0907f5dfe0213742aff0596de",
"shasum": ""
},
"require": {
@@ -2174,7 +2174,7 @@
"parser",
"php"
],
"time": "2020-09-23T18:23:49+00:00"
"time": "2020-09-26T10:30:38+00:00"
},
{
"name": "opis/closure",
@@ -3218,16 +3218,16 @@
},
{
"name": "stripe/stripe-php",
"version": "v7.55.0",
"version": "v7.57.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
"reference": "992057d4fd50b3979a8cdabf1d44bd13d55a78a9"
"reference": "e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/992057d4fd50b3979a8cdabf1d44bd13d55a78a9",
"reference": "992057d4fd50b3979a8cdabf1d44bd13d55a78a9",
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5",
"reference": "e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5",
"shasum": ""
},
"require": {
@@ -3271,7 +3271,7 @@
"payment processing",
"stripe"
],
"time": "2020-09-24T23:45:12+00:00"
"time": "2020-09-30T05:53:53+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -3337,16 +3337,16 @@
},
{
"name": "symfony/console",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf"
"reference": "04c3a31fe8ea94b42c9e2d1acc93d19782133b00"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/186f395b256065ba9b890c0a4e48a91d598fa2cf",
"reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf",
"url": "https://api.github.com/repos/symfony/console/zipball/04c3a31fe8ea94b42c9e2d1acc93d19782133b00",
"reference": "04c3a31fe8ea94b42c9e2d1acc93d19782133b00",
"shasum": ""
},
"require": {
@@ -3426,11 +3426,11 @@
"type": "tidelift"
}
],
"time": "2020-09-02T07:07:40+00:00"
"time": "2020-09-18T14:27:32+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3561,16 +3561,16 @@
},
{
"name": "symfony/error-handler",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a"
"reference": "5e4d8ef8d71822922d1eebd130219ae3491a5ca9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/525636d4b84e06c6ca72d96b6856b5b169416e6a",
"reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/5e4d8ef8d71822922d1eebd130219ae3491a5ca9",
"reference": "5e4d8ef8d71822922d1eebd130219ae3491a5ca9",
"shasum": ""
},
"require": {
@@ -3628,20 +3628,20 @@
"type": "tidelift"
}
],
"time": "2020-08-17T10:01:29+00:00"
"time": "2020-10-02T08:49:02+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "94871fc0a69c3c5da57764187724cdce0755899c"
"reference": "d5de97d6af175a9e8131c546db054ca32842dd0f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/94871fc0a69c3c5da57764187724cdce0755899c",
"reference": "94871fc0a69c3c5da57764187724cdce0755899c",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d5de97d6af175a9e8131c546db054ca32842dd0f",
"reference": "d5de97d6af175a9e8131c546db054ca32842dd0f",
"shasum": ""
},
"require": {
@@ -3661,6 +3661,7 @@
"psr/log": "~1.0",
"symfony/config": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/error-handler": "^4.4|^5.0",
"symfony/expression-language": "^4.4|^5.0",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/service-contracts": "^1.1|^2",
@@ -3714,7 +3715,7 @@
"type": "tidelift"
}
],
"time": "2020-08-13T14:19:42+00:00"
"time": "2020-09-18T14:27:32+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -3794,16 +3795,16 @@
},
{
"name": "symfony/finder",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d"
"reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/2b765f0cf6612b3636e738c0689b29aa63088d5d",
"reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d",
"url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
"reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
"shasum": ""
},
"require": {
@@ -3853,20 +3854,95 @@
"type": "tidelift"
}
],
"time": "2020-08-17T10:01:29+00:00"
"time": "2020-09-02T16:23:27+00:00"
},
{
"name": "symfony/http-foundation",
"version": "v5.1.5",
"name": "symfony/http-client-contracts",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "41a4647f12870e9d41d9a7d72ff0614a27208558"
"url": "https://github.com/symfony/http-client-contracts.git",
"reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/41a4647f12870e9d41d9a7d72ff0614a27208558",
"reference": "41a4647f12870e9d41d9a7d72ff0614a27208558",
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3",
"reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3",
"shasum": ""
},
"require": {
"php": ">=7.2.5"
},
"suggest": {
"symfony/http-client-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
"url": "https://github.com/symfony/contracts"
}
},
"autoload": {
"psr-4": {
"Symfony\\Contracts\\HttpClient\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Generic abstractions related to HTTP clients",
"homepage": "https://symfony.com",
"keywords": [
"abstractions",
"contracts",
"decoupling",
"interfaces",
"interoperability",
"standards"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/http-foundation",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "353b42e7b4fd1c898aab09a059466c9cea74039b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/353b42e7b4fd1c898aab09a059466c9cea74039b",
"reference": "353b42e7b4fd1c898aab09a059466c9cea74039b",
"shasum": ""
},
"require": {
@@ -3928,20 +4004,20 @@
"type": "tidelift"
}
],
"time": "2020-08-17T07:48:54+00:00"
"time": "2020-09-27T14:14:57+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b"
"reference": "1764b87d2f10d5c9ce6e4850fe27934116d89708"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/3e32676e6cb5d2081c91a56783471ff8a7f7110b",
"reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/1764b87d2f10d5c9ce6e4850fe27934116d89708",
"reference": "1764b87d2f10d5c9ce6e4850fe27934116d89708",
"shasum": ""
},
"require": {
@@ -3950,6 +4026,7 @@
"symfony/deprecation-contracts": "^2.1",
"symfony/error-handler": "^4.4|^5.0",
"symfony/event-dispatcher": "^5.0",
"symfony/http-client-contracts": "^1.1|^2",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-php73": "^1.9",
@@ -4041,20 +4118,20 @@
"type": "tidelift"
}
],
"time": "2020-09-02T08:15:18+00:00"
"time": "2020-10-04T07:57:28+00:00"
},
{
"name": "symfony/intl",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/intl.git",
"reference": "b6886c43cc1ae3367c569c5a8d4182555dd694fb"
"reference": "9381fd69ce6407041185aa6f1bafbf7d65f0e66a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/intl/zipball/b6886c43cc1ae3367c569c5a8d4182555dd694fb",
"reference": "b6886c43cc1ae3367c569c5a8d4182555dd694fb",
"url": "https://api.github.com/repos/symfony/intl/zipball/9381fd69ce6407041185aa6f1bafbf7d65f0e66a",
"reference": "9381fd69ce6407041185aa6f1bafbf7d65f0e66a",
"shasum": ""
},
"require": {
@@ -4131,20 +4208,20 @@
"type": "tidelift"
}
],
"time": "2020-08-17T07:42:30+00:00"
"time": "2020-09-27T03:44:28+00:00"
},
{
"name": "symfony/mime",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc"
"reference": "4404d6545125863561721514ad9388db2661eec5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/89a2c9b4cb7b5aa516cf55f5194c384f444c81dc",
"reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc",
"url": "https://api.github.com/repos/symfony/mime/zipball/4404d6545125863561721514ad9388db2661eec5",
"reference": "4404d6545125863561721514ad9388db2661eec5",
"shasum": ""
},
"require": {
@@ -4208,7 +4285,7 @@
"type": "tidelift"
}
],
"time": "2020-08-17T10:01:29+00:00"
"time": "2020-09-02T16:23:27+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -5068,16 +5145,16 @@
},
{
"name": "symfony/process",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "1864216226af21eb76d9477f691e7cbf198e0402"
"reference": "d3a2e64866169586502f0cd9cab69135ad12cee9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/1864216226af21eb76d9477f691e7cbf198e0402",
"reference": "1864216226af21eb76d9477f691e7cbf198e0402",
"url": "https://api.github.com/repos/symfony/process/zipball/d3a2e64866169586502f0cd9cab69135ad12cee9",
"reference": "d3a2e64866169586502f0cd9cab69135ad12cee9",
"shasum": ""
},
"require": {
@@ -5128,20 +5205,20 @@
"type": "tidelift"
}
],
"time": "2020-07-23T08:36:24+00:00"
"time": "2020-09-02T16:23:27+00:00"
},
{
"name": "symfony/routing",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d"
"reference": "720348c2ae011f8c56964c0fc3e992840cb60ccf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/47b0218344cb6af25c93ca8ee1137fafbee5005d",
"reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d",
"url": "https://api.github.com/repos/symfony/routing/zipball/720348c2ae011f8c56964c0fc3e992840cb60ccf",
"reference": "720348c2ae011f8c56964c0fc3e992840cb60ccf",
"shasum": ""
},
"require": {
@@ -5220,7 +5297,7 @@
"type": "tidelift"
}
],
"time": "2020-08-10T08:03:57+00:00"
"time": "2020-10-02T13:05:43+00:00"
},
{
"name": "symfony/service-contracts",
@@ -5300,16 +5377,16 @@
},
{
"name": "symfony/string",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a"
"reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/0de4cc1e18bb596226c06a82e2e7e9bc6001a63a",
"reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a",
"url": "https://api.github.com/repos/symfony/string/zipball/4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
"reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
"shasum": ""
},
"require": {
@@ -5381,20 +5458,20 @@
"type": "tidelift"
}
],
"time": "2020-08-17T07:48:54+00:00"
"time": "2020-09-15T12:23:47+00:00"
},
{
"name": "symfony/translation",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413"
"reference": "e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/917b02cdc5f33e0309b8e9d33ee1480b20687413",
"reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413",
"url": "https://api.github.com/repos/symfony/translation/zipball/e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b",
"reference": "e3cdd5119b1b5bf0698c351b8ee20fb5a4ea248b",
"shasum": ""
},
"require": {
@@ -5473,7 +5550,7 @@
"type": "tidelift"
}
],
"time": "2020-08-17T10:01:29+00:00"
"time": "2020-09-27T03:44:28+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -5552,16 +5629,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "b43a3905262bcf97b2510f0621f859ca4f5287be"
"reference": "c976c115a0d788808f7e71834c8eb0844f678d02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b43a3905262bcf97b2510f0621f859ca4f5287be",
"reference": "b43a3905262bcf97b2510f0621f859ca4f5287be",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/c976c115a0d788808f7e71834c8eb0844f678d02",
"reference": "c976c115a0d788808f7e71834c8eb0844f678d02",
"shasum": ""
},
"require": {
@@ -5638,7 +5715,7 @@
"type": "tidelift"
}
],
"time": "2020-08-17T07:42:30+00:00"
"time": "2020-09-18T14:27:32+00:00"
},
{
"name": "tightenco/ziggy",
@@ -5972,16 +6049,16 @@
},
{
"name": "composer/semver",
"version": "1.7.0",
"version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "114f819054a2ea7db03287f5efb757e2af6e4079"
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/114f819054a2ea7db03287f5efb757e2af6e4079",
"reference": "114f819054a2ea7db03287f5efb757e2af6e4079",
"url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7",
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7",
"shasum": ""
},
"require": {
@@ -6043,7 +6120,7 @@
"type": "tidelift"
}
],
"time": "2020-09-09T09:34:06+00:00"
"time": "2020-09-27T13:13:07+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -6306,16 +6383,16 @@
},
{
"name": "facade/ignition",
"version": "2.3.7",
"version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
"reference": "b364db8860a63c1fb58b72b9718863c21df08762"
"reference": "e8fed9c382cd1d02b5606688576a35619afdf82c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/ignition/zipball/b364db8860a63c1fb58b72b9718863c21df08762",
"reference": "b364db8860a63c1fb58b72b9718863c21df08762",
"url": "https://api.github.com/repos/facade/ignition/zipball/e8fed9c382cd1d02b5606688576a35619afdf82c",
"reference": "e8fed9c382cd1d02b5606688576a35619afdf82c",
"shasum": ""
},
"require": {
@@ -6374,7 +6451,7 @@
"laravel",
"page"
],
"time": "2020-09-06T19:26:27+00:00"
"time": "2020-10-01T23:01:14+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -7248,28 +7325,28 @@
},
{
"name": "phpspec/prophecy",
"version": "1.11.1",
"version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
"reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
"reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
"reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.2",
"php": "^7.2",
"phpdocumentor/reflection-docblock": "^5.0",
"php": "^7.2 || ~8.0, <8.1",
"phpdocumentor/reflection-docblock": "^5.2",
"sebastian/comparator": "^3.0 || ^4.0",
"sebastian/recursion-context": "^3.0 || ^4.0"
},
"require-dev": {
"phpspec/phpspec": "^6.0",
"phpunit/phpunit": "^8.0"
"phpunit/phpunit": "^8.0 || ^9.0 <9.3"
},
"type": "library",
"extra": {
@@ -7307,7 +7384,7 @@
"spy",
"stub"
],
"time": "2020-07-08T12:44:21+00:00"
"time": "2020-09-29T09:10:42+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -8347,16 +8424,16 @@
},
{
"name": "symfony/debug",
"version": "v4.4.13",
"version": "v4.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e"
"reference": "726b85e69342e767d60e3853b98559a68ff74183"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e",
"reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e",
"url": "https://api.github.com/repos/symfony/debug/zipball/726b85e69342e767d60e3853b98559a68ff74183",
"reference": "726b85e69342e767d60e3853b98559a68ff74183",
"shasum": ""
},
"require": {
@@ -8414,20 +8491,20 @@
"type": "tidelift"
}
],
"time": "2020-08-10T07:47:39+00:00"
"time": "2020-09-09T05:20:36+00:00"
},
{
"name": "symfony/filesystem",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "f7b9ed6142a34252d219801d9767dedbd711da1a"
"reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/f7b9ed6142a34252d219801d9767dedbd711da1a",
"reference": "f7b9ed6142a34252d219801d9767dedbd711da1a",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
"reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
"shasum": ""
},
"require": {
@@ -8478,20 +8555,20 @@
"type": "tidelift"
}
],
"time": "2020-08-21T17:19:47+00:00"
"time": "2020-09-27T14:02:37+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "9ff59517938f88d90b6e65311fef08faa640f681"
"reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/9ff59517938f88d90b6e65311fef08faa640f681",
"reference": "9ff59517938f88d90b6e65311fef08faa640f681",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
"reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
"shasum": ""
},
"require": {
@@ -8548,11 +8625,11 @@
"type": "tidelift"
}
],
"time": "2020-07-12T12:58:00+00:00"
"time": "2020-09-27T03:44:28+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v5.1.5",
"version": "v5.1.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",

18
package-lock.json generated
View File

@@ -1055,13 +1055,12 @@
}
},
"@inertiajs/inertia": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/@inertiajs/inertia/-/inertia-0.2.1.tgz",
"integrity": "sha512-FwaCe1c5si1k/K6pAoMiqENBd3jALuEkvJm4Yu2hDJjA23cVJKFcjfC3sD4Us0iRfGXL3QBORmJZpvSEVzEcGw==",
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/@inertiajs/inertia/-/inertia-0.3.6.tgz",
"integrity": "sha512-4Hr5dU0iQCO2qc+1b0FWH7reFYve2HnsTgQWaFPSS3JCPGYSGuyxkP2efVghzl3O05RZpsoHuR3dcch2RMfQOw==",
"dev": true,
"requires": {
"axios": "^0.19.0",
"nprogress": "^0.2.0"
"axios": "^0.19.0 || ^0.20.0"
}
},
"@inertiajs/inertia-vue": {
@@ -1070,6 +1069,15 @@
"integrity": "sha512-FRn3y7wOuqCNVLnUex4tTnVl1/f8CZordS+/Kl+qTTcsUxqn2VNR856TYniySqSS7OWxwkQFAoO9LZWqam/7FQ==",
"dev": true
},
"@inertiajs/progress": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@inertiajs/progress/-/progress-0.1.2.tgz",
"integrity": "sha512-XazXCp9ezY2GLfS37O+LUf6Ni1xYLtrQg+svUi+videi3Aby28d4xRCtrqLvyo3HIWQE5DvNqCPQ8BFbaPZTOA==",
"dev": true,
"requires": {
"nprogress": "^0.2.0"
}
},
"@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",

3
package.json
View File

@@ -11,8 +11,9 @@
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@inertiajs/inertia": "^0.2.1",
"@inertiajs/inertia": "^0.3.4",
"@inertiajs/inertia-vue": "^0.2.1",
"@inertiajs/progress": "^0.1.2",
"@tailwindcss/ui": "^0.3.0",
"axios": "^0.19",
"balloon-css": "^1.2.0",

16
public/js/12.js vendored
View File

@@ -83,6 +83,7 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
@@ -684,6 +685,16 @@ var render = function() {
expression: "form.package"
}
},
[
_c("option", {
attrs: { value: "" },
domProps: {
textContent: _vm._s(
_vm.__("None")
)
}
}),
_vm._v(" "),
_vm._l(_vm.packages, function(
name,
id
@@ -694,8 +705,9 @@ var render = function() {
textContent: _vm._s(name)
}
})
}),
0
})
],
2
),
_vm._v(" "),
_c(

16
public/js/13.js vendored
View File

@@ -83,6 +83,7 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
@@ -673,6 +674,16 @@ var render = function() {
expression: "form.package"
}
},
[
_c("option", {
attrs: { value: "" },
domProps: {
textContent: _vm._s(
_vm.__("None")
)
}
}),
_vm._v(" "),
_vm._l(_vm.packages, function(
name,
id
@@ -683,8 +694,9 @@ var render = function() {
textContent: _vm._s(name)
}
})
}),
0
})
],
2
),
_vm._v(" "),
_c(

2
public/js/45.js vendored
View File

@@ -347,7 +347,7 @@ var render = function() {
_c(
"h3",
{ staticClass: "font-semibold text-body" },
[_vm._v(_vm._s(_vm.package.name))]
[_vm._v(_vm._s(_vm.$page.auth.package.name))]
),
_vm._v(" "),
_c(

28
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

1
resources/js/Pages/Admin/Users/Create.vue
View File

@@ -29,6 +29,7 @@
</FormSelect>
<FormSelect :label="__('Package')" v-model="form.package">
<option value="" v-text="__('None')"></option>
<option v-for="(name, id) in packages" :value="id" v-text="name"></option>
</FormSelect>

1
resources/js/Pages/Admin/Users/Edit.vue
View File

@@ -28,6 +28,7 @@
<option value="admin">Administrator</option>
</FormSelect>
<FormSelect :label="__('Package')" v-model="form.package">
<option value="" v-text="__('None')"></option>
<option v-for="(name, id) in packages" :value="id" v-text="name"></option>
</FormSelect>
<FormSelect :label="__('Language')" v-model="form.language">

2
resources/js/Pages/Dashboard/Index.vue
View File

@@ -41,7 +41,7 @@
<IconBox class="w-6 h-6"/>
</div>
<div>
<h3 class="font-semibold text-body">{{ package.name }}</h3>
<h3 class="font-semibold text-body">{{ $page.auth.package.name }}</h3>
<p class="text-medium-emphasis text-small">{{ __('Package') }}</p>
</div>
</div>

8
resources/js/app.js vendored
View File

@@ -14,6 +14,14 @@ Vue.use(VueMeta)
Vue.use(VueClipboard)
Vue.mixin({ methods: { route: window.route } })
Vue.mixin(require('./mixins'));
import { InertiaProgress } from '@inertiajs/progress'
InertiaProgress.init({
delay: 250,
color: '#1b8ae8',
includeCSS: true,
showSpinner: false,
})
window.eventBus = new Vue();

2
resources/js/mixins.js vendored
View File

@@ -35,7 +35,7 @@ module.exports = {
},
can(subject, permission) {
return this.$page.auth.can[subject][permission];
return this.$page.auth.can[subject] ? this.$page.auth.can[subject][permission] : false;
}
}
};