user settings api update

This commit is contained in:
Čarodej
2022-05-04 07:20:15 +02:00
parent 4fc5ccd26d
commit 3d2e279afd
31 changed files with 148 additions and 104 deletions
@@ -2,7 +2,6 @@
namespace Domain\Browsing\Controllers;
use Str;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;
@@ -1,12 +1,12 @@
<?php
namespace Domain\Browsing\Controllers;
use Str;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderCollection;
use Str;
class BrowseTrashContentController
{
@@ -1,10 +1,10 @@
<?php
namespace Domain\Folders\Controllers;
use Domain\Folders\Requests\AddFolderToFavouritesRequest;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\JsonResponse;
use Domain\Folders\Requests\AddFolderToFavouritesRequest;
class FavouriteController extends Controller
{
@@ -1,5 +1,4 @@
<?php
namespace Domain\Items\Requests;
use Illuminate\Foundation\Http\FormRequest;
@@ -1,5 +1,4 @@
<?php
namespace Domain\Items\Requests;
use Illuminate\Foundation\Http\FormRequest;
@@ -1,9 +1,9 @@
<?php
namespace Domain\RemoteUpload\Controllers;
use Illuminate\Http\JsonResponse;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
@@ -3,9 +3,8 @@ namespace Domain\RemoteUpload\Controllers;
use DB;
use Domain\Folders\Models\Folder;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
class UploadFilesRemotelyForUploadRequestController
@@ -1,12 +1,12 @@
<?php
namespace Domain\RemoteUpload\Controllers;
use Illuminate\Http\JsonResponse;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemAction;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
class VisitorRemoteUploadFileController extends Controller
@@ -1,14 +1,14 @@
<?php
namespace Domain\Sharing\Controllers;
use Domain\Folders\Models\Folder;
use Domain\Sharing\Requests\RevokeSharesRequest;
use Illuminate\Http\JsonResponse;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Domain\Sharing\Resources\ShareResource;
use Domain\Sharing\Requests\UpdateShareRequest;
use Domain\Sharing\Requests\RevokeSharesRequest;
class ShareController extends Controller
{
@@ -1,20 +1,20 @@
<?php
namespace Domain\Sharing\Controllers;
use App\Http\Controllers\Controller;
use Domain\Folders\Models\Folder;
use Domain\Sharing\Actions\SendViaEmailAction;
use Domain\Sharing\Models\Share;
use Domain\Sharing\Requests\CreateShareRequest;
use Domain\Sharing\Resources\ShareResource;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Sharing\Resources\ShareResource;
use Domain\Sharing\Actions\SendViaEmailAction;
use Domain\Sharing\Requests\CreateShareRequest;
class ShareItemController extends Controller
{
public function __construct(
public SendViaEmailAction $sendLinkToEmailAction,
) {}
) {
}
/**
* Generate file share link
@@ -65,4 +65,4 @@ class ShareItemController extends Controller
// Return created shared record
return response()->json(new ShareResource($shared), 201);
}
}
}
@@ -2,10 +2,10 @@
namespace Domain\Sharing\Controllers;
use Auth;
use Domain\Sharing\Requests\ShareByEmailRequest;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Sharing\Actions\SendViaEmailAction;
use Domain\Sharing\Requests\ShareByEmailRequest;
class ShareViaEmailController extends Controller
{
@@ -1,5 +1,4 @@
<?php
namespace Domain\Sharing\Requests;
use Illuminate\Support\Facades\Auth;
@@ -1,7 +1,6 @@
<?php
namespace Domain\Sharing\Requests;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class ShareByEmailRequest extends FormRequest
@@ -2,8 +2,8 @@
namespace Domain\Trash\Controllers;
use Domain\Files\Models\File;
use Illuminate\Http\JsonResponse;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
@@ -24,7 +24,7 @@ class DumpTrashController extends Controller
Folder::onlyTrashed()
->where('user_id', auth()->id())
->cursor()
->each(fn($folder) => $folder->forceDelete());
->each(fn ($folder) => $folder->forceDelete());
// Delete files
File::onlyTrashed()
@@ -1,5 +1,4 @@
<?php
namespace Domain\Trash\Requests;
use Illuminate\Foundation\Http\FormRequest;
@@ -1,15 +1,15 @@
<?php
namespace Domain\Zip\Controllers;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use ZipStream\ZipStream;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Domain\Zip\Actions\ZipAction;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use Domain\Traffic\Actions\RecordDownloadAction;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemAction;
@@ -80,7 +80,8 @@ class VisitorZipController extends Controller
$zip = ($this->zip)($folders, $files, $shared);
($this->recordDownload)(
$zip->predictZipSize(), $shared->user_id
$zip->predictZipSize(),
$shared->user_id
);
return $zip;
+6 -5
View File
@@ -1,14 +1,14 @@
<?php
namespace Domain\Zip\Controllers;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use ZipStream\ZipStream;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\Zip\Actions\ZipAction;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use Domain\Traffic\Actions\RecordDownloadAction;
class ZipController extends Controller
@@ -55,7 +55,8 @@ class ZipController extends Controller
$zip = ($this->zip)($folders, $files);
($this->recordDownload)(
$zip->predictZipSize(), auth()->id()
$zip->predictZipSize(),
auth()->id()
);
return $zip;