nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-29 15:44:41 +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
routes/admin.php
+5 -6
View File
@@ -1,13 +1,12 @@
<?php
use App\Http\Controllers\Admin\DashboardController;
use App\Http\Controllers\Admin\InvoiceController;
use App\Http\Controllers\Admin\LanguageController;
use App\Http\Controllers\Admin\PagesController;
use App\Http\Controllers\Admin\PlanController;
use App\Http\Controllers\Admin\UserController;
use App\Http\Controllers\AppFunctionsController;
use App\Http\Controllers\Admin\PagesController;
use App\Http\Controllers\Admin\InvoiceController;
use App\Http\Controllers\Admin\SettingController;
use App\Http\Controllers\Admin\LanguageController;
use App\Http\Controllers\Admin\DashboardController;
// Dashboard
Route::group(['prefix' => 'dashboard'], function () {
@@ -66,4 +65,4 @@ Route::group(['prefix' => 'languages'], function () {
Route::patch('/{language}', [LanguageController::class, 'update_language']);
Route::post('/', [LanguageController::class, 'create_language']);
Route::get('/', [LanguageController::class, 'get_languages']);
});
});
routes/api.php
+5 -7
View File
@@ -1,13 +1,13 @@
<?php
use App\Http\Controllers\App\AppFunctionsController;
use App\Http\Controllers\Auth\ForgotPasswordController;
use App\Http\Controllers\Auth\ResetPasswordController;
use App\Http\Controllers\FileManager\BrowseController;
use App\Http\Controllers\FileManager\EditItemsController;
use App\Http\Controllers\FileManager\FavouriteController;
use App\Http\Controllers\FileManager\ShareController;
use App\Http\Controllers\FileManager\TrashController;
use App\Http\Controllers\Auth\ResetPasswordController;
use App\Http\Controllers\FileManager\BrowseController;
use App\Http\Controllers\Auth\ForgotPasswordController;
use App\Http\Controllers\FileManager\EditItemsController;
use App\Http\Controllers\FileManager\FavouriteController;
// Pages
Route::get('/content', [AppFunctionsController::class, 'get_setting_columns']);
@@ -23,7 +23,6 @@ Route::group(['prefix' => 'password'], function () {
// User master Routes
Route::group(['middleware' => ['auth:sanctum']], function () {
// Browse
Route::group(['prefix' => 'browse'], function () {
Route::get('/participants', [BrowseController::class, 'participant_uploads']);
@@ -58,7 +57,6 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
// User master,editor routes
Route::group(['middleware' => ['auth:sanctum']], function () {
Route::post('/create-folder', [EditItemsController::class, 'create_folder']);
Route::patch('/rename/{id}', [EditItemsController::class, 'rename_item']);
Route::post('/remove', [EditItemsController::class, 'delete_item']);
routes/file.php
+1 -1
View File
@@ -17,4 +17,4 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::get('/thumbnail/{name}', [FileAccessController::class, 'get_thumbnail'])->name('thumbnail');
Route::get('/file/{name}', [FileAccessController::class, 'get_file'])->name('file');
Route::get('/zip/{id}', [FileAccessController::class, 'get_zip'])->name('zip');
});
});
routes/maintenance.php
-2
View File
@@ -3,7 +3,6 @@
use App\Http\Controllers\App\Maintenance;
Route::group(['middleware' => ['auth:sanctum']], function () {
Route::get('/down', [Maintenance::class, 'down']);
Route::get('/up', [Maintenance::class, 'up']);
@@ -12,4 +11,3 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::get('/database', [Maintenance::class, 'upgrade_database']);
});
});
routes/setup.php
+1 -1
View File
@@ -8,4 +8,4 @@ Route::post('/stripe-credentials', [SetupWizardController::class, 'store_stripe_
Route::post('/stripe-billings', [SetupWizardController::class, 'store_stripe_billings']);
Route::post('/stripe-plans', [SetupWizardController::class, 'store_stripe_plans']);
Route::post('/environment-setup', [SetupWizardController::class, 'store_environment_setup']);
Route::post('/app-setup', [SetupWizardController::class, 'store_app_settings']);
Route::post('/app-setup', [SetupWizardController::class, 'store_app_settings']);
routes/share.php
+2 -2
View File
@@ -1,9 +1,9 @@
<?php
use App\Http\Controllers\App\AppFunctionsController;
use App\Http\Controllers\FileManager\ShareController;
use App\Http\Controllers\Sharing\BrowseShareController;
use App\Http\Controllers\Sharing\ManipulateShareItemsController;
use App\Http\Controllers\FileManager\ShareController;
// Browse functions
Route::group(['prefix' => 'editor'], function () {
@@ -30,4 +30,4 @@ Route::group(['prefix' => 'browse'], function () {
Route::get('/share/{shared}', [ShareController::class, 'show']);
});
Route::get('/og-site/{shared}', [AppFunctionsController::class, 'og_site']);
Route::get('/og-site/{shared}', [AppFunctionsController::class, 'og_site']);
routes/user.php
+1 -3
View File
@@ -2,13 +2,12 @@
use App\Http\Controllers\Auth\AuthController;
use App\Http\Controllers\User\AccountController;
use App\Http\Controllers\User\PaymentMethodsController;
use App\Http\Controllers\User\SubscriptionController;
use App\Http\Controllers\User\PaymentMethodsController;
Route::post('/check', [AuthController::class, 'check_account']);
Route::group(['middleware' => ['auth:sanctum']], function () {
// Account
Route::patch('/relationships/settings', [AccountController::class, 'update_user_settings']);
Route::post('/password', [AccountController::class, 'change_password']);
@@ -31,4 +30,3 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::post('/resume', [SubscriptionController::class, 'resume']);
});
});