This commit is contained in:
Čarodej
2021-11-03 17:34:46 +01:00
parent 98823504ba
commit cdaad931bb
40 changed files with 69 additions and 112 deletions
@@ -1,16 +1,15 @@
<?php
namespace Domain\Teams\Controllers;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderCollection;
use Domain\Folders\Resources\FolderResource;
use Gate;
use Str;
use Gate;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Resources\FolderCollection;
class BrowseSharedWithMeController
{
@@ -36,7 +35,7 @@ class BrowseSharedWithMeController
->get();
}
if (!$id) {
if (! $id) {
$sharedFolderIds = DB::table('team_folder_members')
->where('user_id', Auth::id())
->whereIn('permission', ['can-edit', 'can-view'])
@@ -1,14 +1,13 @@
<?php
namespace Domain\Teams\Controllers;
use Auth;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Illuminate\Support\Facades\DB;
class ConvertFolderIntoTeamFolderController extends Controller
{
@@ -2,12 +2,12 @@
namespace Domain\Teams\Controllers;
use App\Users\Models\User;
use Domain\Teams\Resources\TeamInvitationResource;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Domain\Teams\Models\TeamFolderInvitation;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Teams\Resources\TeamInvitationResource;
class InvitationsController extends Controller
{
@@ -1,18 +1,17 @@
<?php
namespace Domain\Teams\Controllers;
use Auth;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
use Domain\Folders\Models\Folder;
use Auth;
class LeaveTeamFolderController extends Controller
{
public function __invoke(Folder $folder): Response|Application|ResponseFactory
public function __invoke(Folder $folder): Response | Application | ResponseFactory
{
// Find and delete attached member from team folder
DB::table('team_folder_members')
@@ -22,4 +21,4 @@ class LeaveTeamFolderController extends Controller
return response('Done.', 204);
}
}
}
@@ -1,8 +1,8 @@
<?php
namespace Domain\Teams\Controllers;
use Domain\Folders\Models\Folder;
use Gate;
use Domain\Folders\Models\Folder;
class NavigationTreeController
{
@@ -1,7 +1,6 @@
<?php
namespace Domain\Teams\Controllers;
use Gate;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
@@ -2,9 +2,9 @@
namespace Domain\Teams\Models;
use App\Users\Models\User;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Database\Factories\TeamFolderInvitationFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -1,5 +1,4 @@
<?php
namespace Domain\Teams\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -20,7 +19,7 @@ class TeamInvitationResource extends JsonResource
'permission' => $this->permission,
],
'relationships' => [
$this->mergeWhen($this->inviter, fn() => [
$this->mergeWhen($this->inviter, fn () => [
'inviter' => [
'data' => [
'type' => 'user',