nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into oasis

Browse Source 
# Conflicts:
#	app/Console/Commands/SetupDevEnvironment.php
#	app/Console/Kernel.php
#	app/Http/Resources/InvoiceResource.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	config/app.php
#	config/custom-language-translations.php
#	config/language-translations.php
#	public/chunks/admin.js
#	public/chunks/app-language.js
#	public/chunks/dashboard.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/invoices.js
#	public/chunks/pages.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-subscription.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/user-invoices.js
#	public/chunks/user-subscription.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
This commit is contained in:
Peter Papp
2021-04-29 11:06:14 +02:00
parent 834b0ba5e0 7d020b0bbc
commit 1486ce63fa
166 changed files with 2945 additions and 2876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Requests/Admin/ChangeRoleRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,8 +23,8 @@ class ChangeRoleRequest extends FormRequest
public function rules()
{
return [
'attributes' => 'required|array',
'attributes.role' => 'required|string'
'attributes' => 'required|array',
'attributes.role' => 'required|string',
];
}
}

5
app/Http/Requests/Admin/ChangeStorageCapacityRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,8 +23,8 @@ class ChangeStorageCapacityRequest extends FormRequest
public function rules()
{
return [
'attributes' => 'required|array',
'attributes.storage_capacity' => 'required|digits_between:1,9'
'attributes' => 'required|array',
'attributes.storage_capacity' => 'required|digits_between:1,9',
];
}
}

11
app/Http/Requests/Admin/CreateUserByAdmin.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,12 +23,12 @@ class CreateUserByAdmin extends FormRequest
public function rules()
{
return [
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
'name' => 'required|string|max:255',
'storage_capacity' => 'required|digits_between:1,9',
'role' => 'required|string',
'avatar' => 'sometimes|file',
'role' => 'required|string',
'avatar' => 'sometimes|file',
];
}
}

1
app/Http/Requests/Admin/DeleteUserRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/Auth/CheckAccountRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/FileBrowser/SearchRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\FileBrowser;
use Illuminate\Foundation\Http\FormRequest;

4
app/Http/Requests/FileFunctions/CreateFolderRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class CreateFolderRequest extends FormRequest
{
@@ -26,7 +24,7 @@ class CreateFolderRequest extends FormRequest
{
return [
'parent_id' => 'nullable|uuid',
'name' => 'required|string',
'name' => 'required|string',
];
}
}

6
app/Http/Requests/FileFunctions/DeleteItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class DeleteItemRequest extends FormRequest
{
@@ -26,8 +24,8 @@ class DeleteItemRequest extends FormRequest
{
return [
'data[*].force_delete' => 'required|boolean',
'data[*].type' => 'required|string',
'data[*].id' => 'required|integer'
'data[*].type' => 'required|string',
'data[*].id' => 'required|integer',
];
}
}

6
app/Http/Requests/FileFunctions/MoveItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class MoveItemRequest extends FormRequest
{
@@ -25,9 +23,9 @@ class MoveItemRequest extends FormRequest
public function rules()
{
return [
'to_id' => 'nullable|uuid',
'to_id' => 'nullable|uuid',
'items[*].type' => 'required|string',
'items[*].id' => 'required|uuid',
'items[*].id' => 'required|uuid',
];
}
}

6
app/Http/Requests/FileFunctions/RenameItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class RenameItemRequest extends FormRequest
{
@@ -25,8 +23,8 @@ class RenameItemRequest extends FormRequest
public function rules()
{
return [
'name' => 'required|string',
'type' => 'required|string',
'name' => 'required|string',
'type' => 'required|string',
];
}
}

3
app/Http/Requests/FileFunctions/UploadRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\FileFunctions;
use App\Rules\DisabledMimetypes;
@@ -26,7 +25,7 @@ class UploadRequest extends FormRequest
{
return [
'folder_id' => 'nullable|uuid',
'file' => ['required', 'file', new DisabledMimetypes]
'file' => ['required', 'file', new DisabledMimetypes],
];
}
}

3
app/Http/Requests/Languages/CreateLanguageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class CreateLanguageRequest extends FormRequest
{
return [
'name' => 'required|string',
'locale' => 'required|string'
'locale' => 'required|string',
];
}
}

5
app/Http/Requests/Languages/UpdateLanguageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,8 +23,8 @@ class UpdateLanguageRequest extends FormRequest
public function rules()
{
return [
'name' => 'required|string',
'value' => 'required|string'
'name' => 'required|string',
'value' => 'required|string',
];
}
}

5
app/Http/Requests/Languages/UpdateStringRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,8 +23,8 @@ class UpdateStringRequest extends FormRequest
public function rules()
{
return [
'name' => 'required|string',
'value' => 'required|string'
'name' => 'required|string',
'value' => 'required|string',
];
}
}

5
app/Http/Requests/Payments/RegisterNewPaymentMethodRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Payments;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,8 +23,8 @@ class RegisterNewPaymentMethodRequest extends FormRequest
public function rules()
{
return [
'token' => 'required|string',
'default' => 'required|boolean'
'token' => 'required|string',
'default' => 'required|boolean',
];
}
}

3
app/Http/Requests/PublicPages/SendContactMessageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\PublicPages;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,7 +23,7 @@ class SendContactMessageRequest extends FormRequest
public function rules()
{
return [
'email' => 'required|email',
'email' => 'required|email',
'message' => 'required|string',
];
}

19
app/Http/Requests/SetupWizard/StoreAppSetupRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,15 +23,15 @@ class StoreAppSetupRequest extends FormRequest
public function rules()
{
return [
'title' => 'required|string',
'description' => 'required|string',
'logo' => 'sometimes|file',
'logo_horizontal' => 'sometimes|file',
'favicon' => 'sometimes|file',
'contactMail' => 'required|email',
'googleAnalytics' => 'sometimes|string',
'defaultStorage' => 'sometimes|digits_between:1,9',
'userRegistration' => 'required|boolean',
'title' => 'required|string',
'description' => 'required|string',
'logo' => 'sometimes|file',
'logo_horizontal' => 'sometimes|file',
'favicon' => 'sometimes|file',
'contactMail' => 'required|email',
'googleAnalytics' => 'sometimes|string',
'defaultStorage' => 'sometimes|digits_between:1,9',
'userRegistration' => 'required|boolean',
'storageLimitation' => 'required|boolean',
];
}

11
app/Http/Requests/SetupWizard/StoreDatabaseCredentialsRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,11 +24,11 @@ class StoreDatabaseCredentialsRequest extends FormRequest
{
return [
'connection' => 'required|string',
'host' => 'required|string',
'port' => 'required|string',
'name' => 'required|string',
'username' => 'required|string',
'password' => 'required|string',
'host' => 'required|string',
'port' => 'required|string',
'name' => 'required|string',
'username' => 'required|string',
'password' => 'required|string',
];
}
}

27
app/Http/Requests/SetupWizard/StoreEnvironmentSetupRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,20 +23,20 @@ class StoreEnvironmentSetupRequest extends FormRequest
public function rules()
{
return [
'storage' => 'required|array',
'storage.driver' => 'required|string',
'storage.key' => 'sometimes|nullable|string',
'storage.secret' => 'sometimes|nullable|string',
'storage' => 'required|array',
'storage.driver' => 'required|string',
'storage.key' => 'sometimes|nullable|string',
'storage.secret' => 'sometimes|nullable|string',
'storage.endpoint' => 'sometimes|nullable|string',
'storage.region' => 'sometimes|nullable|string',
'storage.bucket' => 'sometimes|nullable|string',
'mail' => 'required|array',
'mail.driver' => 'required|string',
'mail.host' => 'required|string',
'mail.port' => 'required|string',
'mail.username' => 'required|string',
'mail.password' => 'required|string',
'mail.encryption' => 'required|string',
'storage.region' => 'sometimes|nullable|string',
'storage.bucket' => 'sometimes|nullable|string',
'mail' => 'required|array',
'mail.driver' => 'required|string',
'mail.host' => 'required|string',
'mail.port' => 'required|string',
'mail.username' => 'required|string',
'mail.password' => 'required|string',
'mail.encryption' => 'required|string',
];
}
}

15
app/Http/Requests/SetupWizard/StoreStripeBillingRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,13 +24,13 @@ class StoreStripeBillingRequest extends FormRequest
{
return [
'billing_phone_number' => 'sometimes|nullable|string',
'billing_postal_code' => 'required|string',
'billing_vat_number' => 'required|string',
'billing_address' => 'required|string',
'billing_country' => 'required|string',
'billing_state' => 'required|string',
'billing_city' => 'required|string',
'billing_name' => 'required|string',
'billing_postal_code' => 'required|string',
'billing_vat_number' => 'required|string',
'billing_address' => 'required|string',
'billing_country' => 'required|string',
'billing_state' => 'required|string',
'billing_city' => 'required|string',
'billing_name' => 'required|string',
];
}
}

7
app/Http/Requests/SetupWizard/StoreStripeCredentialsRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,10 +23,10 @@ class StoreStripeCredentialsRequest extends FormRequest
public function rules()
{
return [
'currency' => 'required|string',
'currency' => 'required|string',
'webhookSecret' => 'required|string',
'secret' => 'required|string',
'key' => 'required|string',
'secret' => 'required|string',
'key' => 'required|string',
];
}
}

11
app/Http/Requests/SetupWizard/StoreStripePlansRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,12 +23,12 @@ class StoreStripePlansRequest extends FormRequest
public function rules()
{
return [
'plans' => 'required|array',
'plans.*.type' => 'required|string',
'plans.*.attributes.name' => 'required|string',
'plans.*.attributes.price' => 'required|string',
'plans' => 'required|array',
'plans.*.type' => 'required|string',
'plans.*.attributes.name' => 'required|string',
'plans.*.attributes.price' => 'required|string',
'plans.*.attributes.description' => 'sometimes|nullable|string',
'plans.*.attributes.capacity' => 'required|digits_between:1,9',
'plans.*.attributes.capacity' => 'required|digits_between:1,9',
];
}
}

1
app/Http/Requests/Share/AuthenticateShareRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;

9
app/Http/Requests/Share/CreateShareRequest.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class CreateShareRequest extends FormRequest
{
@@ -26,11 +25,11 @@ class CreateShareRequest extends FormRequest
{
return [
'isPassword' => 'required|boolean',
'type' => 'required|string',
'type' => 'required|string',
'expiration' => 'integer|nullable',
'permission' => 'string',
'password' => 'string',
'emails.*' => 'email'
'password' => 'string',
'emails.*' => 'email',
];
}
}

7
app/Http/Requests/Share/UpdateShareRequest.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class UpdateShareRequest extends FormRequest
{
@@ -25,10 +24,10 @@ class UpdateShareRequest extends FormRequest
public function rules()
{
return [
'protected' => 'required|boolean',
'protected' => 'required|boolean',
'permission' => 'nullable|string',
'expiration' => 'integer|nullable',
'password' => 'string',
'password' => 'string',
];
}
}

43
app/Http/Requests/Subscription/StoreUpgradeAccountRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Subscription;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,32 +24,32 @@ class StoreUpgradeAccountRequest extends FormRequest
{
return [
// Billings
'billing' => 'required|array',
'billing.billing_address' => 'required|string',
'billing.billing_city' => 'required|string',
'billing.billing_country' => 'required|string',
'billing.billing_name' => 'required|string',
'billing.billing_phone_number' => 'required|string',
'billing.billing_postal_code' => 'required|string',
'billing.billing_state' => 'required|string',
'billing' => 'required|array',
'billing.billing_address' => 'required|string',
'billing.billing_city' => 'required|string',
'billing.billing_country' => 'required|string',
'billing.billing_name' => 'required|string',
'billing.billing_phone_number' => 'required|string',
'billing.billing_postal_code' => 'required|string',
'billing.billing_state' => 'required|string',
// Payment
'payment' => 'required|array',
'payment.type' => 'required|string',
'payment.meta' => 'required|sometimes|array',
'payment.meta.pm' => 'required|sometimes|string',
'payment' => 'required|array',
'payment.type' => 'required|string',
'payment.meta' => 'required|sometimes|array',
'payment.meta.pm' => 'required|sometimes|string',
// Plan
'plan.data' => 'required|array',
'plan.data.attributes' => 'required|array',
'plan.data.attributes.capacity' => 'required|digits_between:1,9',
'plan.data' => 'required|array',
'plan.data.attributes' => 'required|array',
'plan.data.attributes.capacity' => 'required|digits_between:1,9',
'plan.data.attributes.capacity_formatted' => 'required|string',
'plan.data.attributes.currency' => 'required|string',
'plan.data.attributes.description' => 'sometimes|string|nullable',
'plan.data.attributes.name' => 'required|string',
'plan.data.attributes.price' => 'required|string',
'plan.data.id' => 'required|string',
'plan.data.type' => 'required|string',
'plan.data.attributes.currency' => 'required|string',
'plan.data.attributes.description' => 'sometimes|string|nullable',
'plan.data.attributes.name' => 'required|string',
'plan.data.attributes.price' => 'required|string',
'plan.data.id' => 'required|string',
'plan.data.type' => 'required|string',
];
}
}

1
app/Http/Requests/User/UpdateUserPasswordRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\User;
use Illuminate\Foundation\Http\FormRequest;