nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-24 13:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php
This commit is contained in:
Peter Papp
2021-04-01 10:45:10 +02:00
parent 6d5a43da72 7772ef6b40
commit 5d0348e2d0
124 changed files with 3745 additions and 3576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/admin.php
+11
View File
@@ -2,6 +2,7 @@
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;
@@ -55,4 +56,14 @@ Route::group(['prefix' => 'settings'], function () {
Route::post('/email', [SettingController::class, 'set_email']);
Route::patch('/', [SettingController::class, 'update']);
Route::get('/', [SettingController::class, 'show']);
});
// Language
Route::group(['prefix' => 'languages'], function () {
Route::get('/{language}', [LanguageController::class, 'get_language']);
Route::patch('/{language}/strings', [LanguageController::class, 'update_string']);
Route::delete('/{language}', [LanguageController::class, 'delete_language']);
Route::patch('/{language}', [LanguageController::class, 'update_language']);
Route::post('/', [LanguageController::class, 'create_language']);
Route::get('/', [LanguageController::class, 'get_languages']);
});
routes/web.php
+2
View File
@@ -9,6 +9,8 @@ use App\Http\Controllers\Subscription\StripeWebhookController;
Route::post('/stripe/webhook', [StripeWebhookController::class, 'handleWebhook']);
Route::post('/admin-setup', [SetupWizardController::class, 'create_admin_account']);
Route::get('/translations/{lang}', [AppFunctionsController::class, 'get_translations']);
// Get user invoice from stripe service
Route::get('/invoice/{customer}/{token}', [InvoiceController::class, 'show'])->middleware(['auth:sanctum']);