Skip to content

Commit

Permalink
fix: formatting and composer conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
CS76 committed Dec 7, 2023
1 parent 7a09901 commit 64ccbfc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/Http/Controllers/ApplicationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ public function resolve(Request $request, $identifier)
]);
break;
case 'study':
if($project){
if ($project) {
return Inertia::render('Public/Project/Study', [
'project' => (new ProjectResource($project))->lite(false, []),
'tab' => $tab,
'study' => (new StudyResource($study))->lite(false, ['tags', 'sample', 'datasets', 'molecules']),
]);
break;
}else{
} else {
return Inertia::render('Public/Sample/Show', [
'tab' => $tab,
'study' => (new StudyResource($study))->lite(false, ['tags', 'sample', 'datasets', 'molecules', 'owner', 'license']),
Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@
},
"extra": {
"laravel": {
"dont-discover": [
"laravel/telescope"
]
"dont-discover": []
}
},
"config": {
Expand Down

0 comments on commit 64ccbfc

Please sign in to comment.