- added file resource

- frontend refactoring
This commit is contained in:
Peter Papp
2021-08-26 18:01:57 +02:00
parent f5f2179145
commit 5c6a873b02
37 changed files with 339 additions and 773 deletions

View File

@@ -7,6 +7,7 @@ use Domain\Teams\Requests\CreateTeamFolderRequest;
use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Files\Models\File;
use Illuminate\Http\Resources\Json\ResourceCollection;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
@@ -51,11 +52,12 @@ class TeamFoldersController extends Controller
->get();
}
return new FolderCollection($folders);
// Collect folders and files to single array
return [
'content' => collect([$folders, $files])->collapse(),
'content' => collect([
new FolderCollection($folders),
$files
])->collapse(),
'folder' => $requestedFolder,
];
}