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

build

Browse Source
This commit is contained in:
Čarodej
2022-03-29 12:29:32 +02:00
parent af3f08e728
commit b0829c71e9
19 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:X7/vUveJtTmrC1J+UFXb9m6l1RBbAoJvNyj7sMC+GFI=
APP_KEY=base64:Rv3QVmDH6npEiVy+pKyyjWYyTJfMvsQdFZ2YA7hAclg=
APP_DEBUG=true
APP_URL=http://localhost
APP_DEMO=false

2
config/vuefilemanager.php
View File

@@ -1,7 +1,7 @@
<?php
return [
'version' => '2.0.8',
'version' => '2.0.9',
'is_demo' => env('APP_DEMO', false),

2
routes/web.php
View File

@@ -4,9 +4,9 @@ use Domain\Homepage\Controllers\IndexController;
use Domain\Invoices\Controllers\GetInvoiceController;
use Domain\Settings\Controllers\DownloadLogController;
use App\Socialite\Controllers\SocialiteCallbackController;
use Domain\Sharing\Controllers\DirectlyDownloadFileController;
use Domain\Sharing\Controllers\SharePublicIndexController;
use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
use Domain\Sharing\Controllers\DirectlyDownloadFileController;
use Domain\Localization\Controllers\CurrentLocalizationController;
Route::get('/socialite/{provider}/callback', SocialiteCallbackController::class);

1
src/App/Users/Models/User.php
View File

@@ -223,7 +223,6 @@ class User extends Authenticatable implements MustVerifyEmail
});
static::updating(function ($user) {
// Prevent to set 2fa in demo mode
if (config('vuefilemanager.is_demo') && $user->email === 'howdy@hi5ve.digital') {
$user->two_factor_secret = null;

4
src/App/Users/Resources/UserResource.php
View File

@@ -36,8 +36,8 @@ class UserResource extends JsonResource
'avatar' => $this->settings->avatar,
'email' => is_demo() ? obfuscate_email($this->email) : $this->email,
'role' => $this->role,
'two_factor_authentication' => (bool)$this->two_factor_secret,
'socialite_account' => !(bool)$this->password,
'two_factor_authentication' => (bool) $this->two_factor_secret,
'socialite_account' => ! (bool) $this->password,
'storage' => $this->storage,
'created_at' => format_date($this->created_at, 'd. M. Y'),
'updated_at' => format_date($this->updated_at, 'd. M. Y'),

10
src/Domain/Admin/Controllers/Dashboard/GetDashboardDataController.php
View File

@@ -1,5 +1,4 @@
<?php
namespace Domain\Admin\Controllers\Dashboard;
use ByteUnits\Metric;
@@ -68,18 +67,18 @@ class GetDashboardDataController extends Controller
DB::raw('sum(download) as download'),
DB::raw('sum(upload) as upload'),
])
->each(fn($record) => $record->date = format_date($record->date, 'd. M. Y'))
->each(fn ($record) => $record->date = format_date($record->date, 'd. M. Y'))
->keyBy('date');
$mappedTrafficRecords = mapTrafficRecords($trafficRecords);
$upload = $mappedTrafficRecords->map(fn($record) => [
$upload = $mappedTrafficRecords->map(fn ($record) => [
'created_at' => $record->date,
'percentage' => intval($trafficRecords->max('upload')) !== 0 ? round(($record->upload / $trafficRecords->max('upload')) * 100, 2) : 0,
'amount' => Metric::bytes($record->upload)->format(),
]);
$download = $mappedTrafficRecords->map(fn($record) => [
$download = $mappedTrafficRecords->map(fn ($record) => [
'created_at' => $record->date,
'percentage' => intval($trafficRecords->max('download')) !== 0 ? round(($record->download / $trafficRecords->max('download')) * 100, 2) : 0,
'amount' => Metric::bytes($record->download)->format(),
@@ -128,6 +127,7 @@ class GetDashboardDataController extends Controller
$activeTranslationsCount = DB::table('language_translations')
->where('lang', 'en')
->count();
return array($originalTranslationCount, $activeTranslationsCount);
return [$originalTranslationCount, $activeTranslationsCount];
}
}

1
src/Domain/Admin/Controllers/Users/DeleteUserController.php
View File

@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Domain\Admin\Requests\DeleteUserRequest;
use Domain\Admin\Actions\DeleteUserDataAction;
use Illuminate\Support\Str;
class DeleteUserController extends Controller
{

4
src/Domain/Files/Controllers/FileAccess/GetFileController.php
View File

@@ -2,10 +2,10 @@
namespace Domain\Files\Controllers\FileAccess;
use Gate;
use Illuminate\Http\RedirectResponse;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Files\Models\File;
use Illuminate\Http\RedirectResponse;
use Domain\Files\Actions\DownloadFileAction;
use Domain\Traffic\Actions\RecordDownloadAction;
use Symfony\Component\HttpFoundation\StreamedResponse;

6
src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php
View File

@@ -4,9 +4,9 @@ namespace Domain\Files\Controllers\FileAccess;
use Gate;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Files\Actions\DownloadThumbnailAction;
use Illuminate\Http\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
@@ -14,13 +14,13 @@ class GetThumbnailController extends Controller
{
public function __construct(
private DownloadThumbnailAction $downloadThumbnail,
) {}
) {
}
public function __invoke(
Request $request,
string $filename,
): FileNotFoundException | StreamedResponse | Response {
// Get requested thumbnail
$file = File::withTrashed()
->where('basename', substr($filename, 3))

4
src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php
View File

@@ -2,15 +2,15 @@
namespace Domain\Files\Controllers\FileAccess;
use Domain\Files\Models\File;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Domain\Files\Actions\DownloadFileAction;
use Domain\Traffic\Actions\RecordDownloadAction;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemWithinAction;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Domain\Sharing\Actions\VerifyAccessToItemWithinAction;
/**
* Get file public

2
src/Domain/Folders/Controllers/FavouriteController.php
View File

@@ -3,8 +3,8 @@ namespace Domain\Folders\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
class FavouriteController extends Controller

3
src/Domain/Homepage/Mail/SendContactMessage.php
View File

@@ -11,7 +11,8 @@ class SendContactMessage extends Mailable
public function __construct(
private array $request
) {}
) {
}
/**
* Build the message.

11
src/Domain/Items/Actions/MoveFileOrFolderAction.php
View File

@@ -1,17 +1,17 @@
<?php
namespace Domain\Items\Actions;
use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
use Domain\Folders\Models\Folder;
use Domain\Sharing\Models\Share;
use Gate;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
class MoveFileOrFolderAction
{
public function __construct(
public SetTeamFolderPropertyForAllChildrenAction $setTeamFolderPropertyForAllChildren,
) {}
) {
}
/**
* Move folder or file to new location
@@ -26,7 +26,6 @@ class MoveFileOrFolderAction
// Process folder
if ($item['type'] === 'folder') {
// Determine, if we are moving folder into the team folder or not
$isTeamFolder = is_null($request->input('to_id'))
? false

32
src/Domain/Sharing/Controllers/DirectlyDownloadFileController.php
View File

@@ -1,32 +1,30 @@
<?php
namespace Domain\Sharing\Controllers;
use App\Http\Controllers\Controller;
use Domain\Files\Actions\DownloadFileAction;
use Domain\Files\Models\File;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemWithinAction;
use Domain\Sharing\Models\Share;
use Domain\Traffic\Actions\RecordDownloadAction;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Storage;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Domain\Files\Actions\DownloadFileAction;
use Domain\Traffic\Actions\RecordDownloadAction;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Domain\Sharing\Actions\VerifyAccessToItemWithinAction;
class DirectlyDownloadFileController extends Controller
{
public function __construct(
private DownloadFileAction $downloadFile,
private RecordDownloadAction $recordDownload,
private ProtectShareRecordAction $protectShareRecord,
private DownloadFileAction $downloadFile,
private RecordDownloadAction $recordDownload,
private ProtectShareRecordAction $protectShareRecord,
private VerifyAccessToItemWithinAction $verifyAccessToItemWithin,
) {}
) {
}
public function __invoke(
Share $share
): Response|StreamedResponse|RedirectResponse
{
): Response|StreamedResponse|RedirectResponse {
// Check if item is not a folder
if ($share->type !== 'file') {
return response('This content is not downloadable');
@@ -36,7 +34,7 @@ class DirectlyDownloadFileController extends Controller
($this->protectShareRecord)($share);
// Check if user can download file
if (!$share->user->canDownload()) {
if (! $share->user->canDownload()) {
return response([
'type' => 'error',
'message' => 'This user action is not allowed.',
@@ -59,4 +57,4 @@ class DirectlyDownloadFileController extends Controller
return ($this->downloadFile)($file);
}
}
}

3
src/Domain/Sharing/Controllers/ShareViaEmailController.php
View File

@@ -11,7 +11,8 @@ class ShareViaEmailController extends Controller
{
public function __construct(
private SendViaEmailAction $sendLinkToEmailAction,
) {}
) {
}
public function __invoke(
Request $request,

3
src/Domain/Sharing/Notifications/SharedSendViaEmail.php
View File

@@ -16,7 +16,8 @@ class SharedSendViaEmail extends Notification
public function __construct(
public string $token,
public User $user,
) {}
) {
}
/**
* Get the notification's delivery channels.

2
src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php
View File

@@ -2,8 +2,8 @@
namespace Domain\UploadRequest\Controllers\FileAccess;
use Domain\Files\Models\File;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
use Illuminate\Http\RedirectResponse;
use Domain\Files\Actions\DownloadFileAction;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\Traffic\Actions\RecordDownloadAction;

8
src/Support/errors.php
View File

@@ -1,15 +1,17 @@
<?php
function accessDeniedError(): array {
function accessDeniedError(): array
{
return [
'type' => 'error',
'message' => 'Access Denied',
];
}
function userActionNotAllowedError(): array {
function userActionNotAllowedError(): array
{
return [
'type' => 'error',
'message' => 'This user action is not allowed.',
];
}
}

3
tests/Domain/Admin/DashboardTest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace Tests\Domain\Admin;
use Tests\TestCase;
@@ -55,7 +54,7 @@ class DashboardTest extends TestCase
->create(['role' => 'admin']);
$users->each(
fn($user) => $this
fn ($user) => $this
->actingAs($admin)
->getJson('/api/admin/dashboard/newbies')
->assertStatus(200)