Merge pull request #889 from owlchester/refactor-forms-hidden

Remove deprecated laravelcollective/html library
owlchester · Jun 10, 2024 · 5fd05de · 5fd05de
2 parents f632787 + 719317a
commit 5fd05de
Show file tree

Hide file tree

Showing 443 changed files with 2,728 additions and 3,391 deletions.
diff --git a/app/Http/Controllers/Calendars/Bulks/EntityEventController.php b/app/Http/Controllers/Calendars/Bulks/EntityEventController.php
@@ -29,6 +29,9 @@ public function index(Request $request, Campaign $campaign, Calendar $calendar)
                 'campaign' => $campaign, 'calendar' => $calendar]), '_calendar-event', $models, $calendar);
         }
 
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $count = $this->campaign($campaign)->bulkProcess($request, EntityEvent::class);
 
         return redirect()

diff --git a/app/Http/Controllers/Campaign/DefaultImageController.php b/app/Http/Controllers/Campaign/DefaultImageController.php
@@ -84,7 +84,10 @@ public function store(DefaultImageStore $request, Campaign $campaign)
     public function destroy(DefaultImageDestroy $request, Campaign $campaign)
     {
         $this->authorize('recover', $campaign);
-        $this->service->campaign($campaign)->type($request->post('entity_type'))->destroy();
+        $this->service
+            ->campaign($campaign)
+            ->type($request->post('entity_type'))
+            ->destroy();
 
         return redirect()->route('campaign.default-images', $campaign)
             ->with(

diff --git a/app/Http/Controllers/Campaign/InviteController.php b/app/Http/Controllers/Campaign/InviteController.php
@@ -69,12 +69,8 @@ public function store(StoreCampaignInvite $request, Campaign $campaign)
         $invitation = CampaignInvite::create($data);
 
         $link = route('campaigns.join', [$invitation->token]);
-        $copy = link_to('#', '<i class="fa-solid fa-copy"></i> ' . __('campaigns.invites.actions.copy'), [
-            'data-clipboard' => $link,
-            'data-toggle' => 'tooltip',
-            'data-toast' => __('crud.alerts.copy_invite'),
-            'title' => __('campaigns.invites.actions.copy')
-        ], null, false);
+        $copy = '<a href="#" data-clipboard="' . $link . '" data-toggle="tooltip" data-toast="' . __('crud.alerts.copy_invite') . '" title="' . __('campaigns.invites.actions.copy') . '"><i class="fa-solid fa-copy"></i> ' . __('campaigns.invites.actions.copy') . '</a>';
+
 
         return redirect()->route('campaign_users.index', $campaign)
             ->with(

diff --git a/app/Http/Controllers/Campaign/ModuleController.php b/app/Http/Controllers/Campaign/ModuleController.php
@@ -58,6 +58,9 @@ public function update(UpdateModuleName $request, Campaign $campaign, EntityType
             return view('campaign.modules')
                 ->with('errors', __('This feature is only available on premium and boosted campaigns'));
         }
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $this->moduleService
             ->campaign($campaign)

diff --git a/app/Http/Controllers/Campaign/StyleController.php b/app/Http/Controllers/Campaign/StyleController.php
@@ -13,7 +13,7 @@
 
 class StyleController extends Controller
 {
-    public const MAX_THEMES = 30;
+    public const int MAX_THEMES = 30;
 
     /**
      * Create a new controller instance.
@@ -78,6 +78,9 @@ public function create(Campaign $campaign)
     public function store(StoreCampaignStyle $request, Campaign $campaign)
     {
         $this->authorize('update', $campaign);
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         if ($campaign->styles()->count() >= self::MAX_THEMES) {
             return redirect()->route('campaign_styles.index', $campaign)

diff --git a/app/Http/Controllers/Campaign/VisibilityController.php b/app/Http/Controllers/Campaign/VisibilityController.php
@@ -37,7 +37,7 @@ public function save(StoreCampaignVisibility $request, Campaign $campaign)
         ]);
 
         $success = __('campaigns/public.update.' . ($campaign->isPublic() ? 'public' : 'private'), [
-            'public-campaigns' => link_to('https://kanka.io/campaigns', __('footer.public-campaigns'), ['target' => '_blank']),
+            'public-campaigns' => '<a href="https://kanka.io/campaigns" target="_blank">' . __('footer.public-campaigns') . '</a>',
         ]);
 
         if ($request->get('from') === 'overview') {

diff --git a/app/Http/Controllers/ConversationParticipantController.php b/app/Http/Controllers/ConversationParticipantController.php
@@ -21,13 +21,16 @@ public function index(Campaign $campaign, Conversation $conversation)
     public function store(StoreConversationParticipant $request, Campaign $campaign, Conversation $conversation)
     {
         $this->authorize('update', $conversation);
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $participant = new ConversationParticipant();
         $participant = $participant->create($request->all());
 
         return redirect()
-            ->to($conversation->getLink())
-            ->with('success', trans('conversations.participants.create.success', [
+            ->route('entities.show', [$campaign, $conversation->entity])
+            ->with('success', __('conversations.participants.create.success', [
                 'name' => $conversation->name,
                 'entity' => $participant->name()
             ]));

diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
@@ -108,7 +108,7 @@ public function crudIndex(Request $request)
             return redirect()->route('dashboard', $this->campaign)->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$this->campaign, '#' . $this->module]),
+                    'fix' => '<a href="' . route('campaign.modules', [$this->campaign, '#' . $this->module]) . '">' . __('crud.fix-this-issue') . '</a>',
                 ])
             );
         }
@@ -383,16 +383,13 @@ public function crudStore(Request $request, bool $redirectToCreated = false)
                 $new->entity->crudSaved();
             }
 
+            $link = '<a href="' . route(
+                $new->entity ? 'entities.show' : $this->view . '.show',
+                $new->entity ? [$this->campaign, $new->entity] : [$this->campaign, $new->id]
+            )
+                . '">' . $new->name . '</a>';
             $success = __('general.success.created', [
-                'name' => $new->entity ? link_to_route(
-                    'entities.show',
-                    $new->name,
-                    [$this->campaign, $new->entity]
-                ) : link_to_route(/** Menu link **/
-                    $this->view . '.show',
-                    $new->name,
-                    [$this->campaign, $new->id]
-                )
+                'name' => $link
             ]);
 
             session()->flash('success_raw', $success);
@@ -541,16 +538,13 @@ public function crudUpdate(Request $request, Model|MiscModel $model)
                 }
             }
 
+            $link = '<a href="' . route(
+                $model->entity ? 'entities.show' : $this->view . '.show',
+                $model->entity ? [$this->campaign, $model->entity] : [$this->campaign, $model->id]
+            )
+                . '">' . $model->name . '</a>';
             $success = __('general.success.updated', [
-                'name' => $model->entity ? link_to_route(
-                    'entities.show',
-                    $model->name,
-                    [$this->campaign, $model->entity]
-                ) : link_to_route(/** Menu link **/
-                    $this->view . '.show',
-                    $model->name,
-                    [$this->campaign, $model]
-                )
+                'name' => $link
             ]);
 
             if ($model->entity) {
@@ -608,7 +602,7 @@ public function crudDestroy(Model|MiscModel $model)
         return redirect()->route($this->route . '.index', $this->campaign)
             ->with('success_raw', __('general.success.deleted-cancel', [
                 'name' => $model->name,
-                'cancel' => link_to_route('recovery', __('crud.cancel'), [$model->campaign])
+                'cancel' => '<a href="' . route('recovery', $model->campaign) . '">' . __('crud.cancel') . '</a>'
             ]));
     }
 

diff --git a/app/Http/Controllers/Entity/AbilityController.php b/app/Http/Controllers/Entity/AbilityController.php
@@ -22,7 +22,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('entities.show', [$campaign, $entity])->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#abilities']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#abilities']) . '">' . __('crud.fix-this-issue') . '</a>',
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/AssetController.php b/app/Http/Controllers/Entity/AssetController.php
@@ -25,7 +25,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('entities.show', [$campaign, $entity])->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#assets']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#assets']) . '">' . __('crud.fix-this-issue') . '</a>',
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/AttributeController.php b/app/Http/Controllers/Entity/AttributeController.php
@@ -34,7 +34,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('entities.show', [$campaign, $entity])->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#entity_attributes']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#entity_attributes']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }
@@ -71,7 +71,7 @@ public function dashboard(Campaign $campaign, Entity $entity)
             return redirect()->route('dashboard', $campaign)->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#entity_attributes']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#entity_attributes']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }
@@ -106,7 +106,7 @@ public function edit(Campaign $campaign, Entity $entity)
             return redirect()->route('dashboard', $campaign)->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#entity_attributes']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#entity_attributes']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/AttributeTemplateController.php b/app/Http/Controllers/Entity/AttributeTemplateController.php
@@ -29,7 +29,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('dashboard', $campaign)->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#entity_attributes']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#entity_attributes']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/InventoryController.php b/app/Http/Controllers/Entity/InventoryController.php
@@ -34,7 +34,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('entities.show', [$campaign, $entity])->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#inventories']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#inventories']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/MoveController.php b/app/Http/Controllers/Entity/MoveController.php
@@ -44,12 +44,14 @@ public function index(Campaign $campaign, Entity $entity)
     }
 
     /**
-     * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function move(MoveEntityRequest $request, Campaign $campaign, Entity $entity)
     {
         $this->authorize('view', $entity->child);
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $copied = $request->filled('copy');
         try {

diff --git a/app/Http/Controllers/Entity/ReminderController.php b/app/Http/Controllers/Entity/ReminderController.php
@@ -46,7 +46,7 @@ public function index(Campaign $campaign, Entity $entity)
             return redirect()->route('entities.show', [$campaign, $entity])->with(
                 'error_raw',
                 __('campaigns.settings.errors.module-disabled', [
-                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), [$campaign, '#calendars']),
+                    'fix' => '<a href="' . route('campaign.modules', [$campaign, '#calendars']) . '">' . __('crud.fix-this-issue') . '</a>'
                 ])
             );
         }

diff --git a/app/Http/Controllers/Entity/TransformController.php b/app/Http/Controllers/Entity/TransformController.php
@@ -50,6 +50,9 @@ public function index(Campaign $campaign, Entity $entity)
     public function transform(TransformEntityRequest $request, Campaign $campaign, Entity $entity)
     {
         $this->authorize('move', $entity->child);
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         try {
             $this->transformService

diff --git a/app/Http/Controllers/EntityCreatorController.php b/app/Http/Controllers/EntityCreatorController.php
@@ -148,7 +148,7 @@ public function store(Request $request, Campaign $campaign, $type)
                 }
             }
             $createdEntities[] = $new;
-            $links[] = link_to($new->entity->url(), $new->name);
+            $links[] = '<a href="' . $new->entity->url() . '">' . $new->name . '</a>';
         }
 
         // If no entity was created, we throw the standard error

diff --git a/app/Http/Controllers/Families/MemberController.php b/app/Http/Controllers/Families/MemberController.php
@@ -70,6 +70,9 @@ public function create(Campaign $campaign, Family $family)
     public function store(StoreCharacterFamily $request, Campaign $campaign, Family $family)
     {
         $this->authorize('update', $family);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $newMembers = $family->members()->syncWithoutDetaching($request->members);
 

diff --git a/app/Http/Controllers/Maps/Bulks/GroupController.php b/app/Http/Controllers/Maps/Bulks/GroupController.php
@@ -29,6 +29,9 @@ public function index(Request $request, Campaign $campaign, Map $map)
             return $this->bulkBatch(route('maps.groups.bulk', [$campaign, 'map' => $map]), '_map-group', $models);
         }
 
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $count = $this->bulkProcess($request, MapGroup::class);
 
         return redirect()

diff --git a/app/Http/Controllers/Maps/Bulks/LayerController.php b/app/Http/Controllers/Maps/Bulks/LayerController.php
@@ -30,6 +30,9 @@ public function index(Request $request, Campaign $campaign, Map $map)
             return $this->campaign($campaign)->bulkBatch(route('maps.layers.bulk', [$campaign, 'map' => $map]), '_map-layer', $models);
         }
 
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $count = $this->bulkProcess($request, MapLayer::class);
 
         return redirect()

diff --git a/app/Http/Controllers/Maps/Bulks/MarkerController.php b/app/Http/Controllers/Maps/Bulks/MarkerController.php
@@ -29,6 +29,9 @@ public function index(Request $request, Campaign $campaign, Map $map)
                 'campaign' => $campaign, 'map' => $map]), '_map-marker', $models, $map);
         }
 
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $count = $this->campaign($campaign)->bulkProcess($request, MapMarker::class);
 
         return redirect()

diff --git a/app/Http/Controllers/Maps/Markers/DetailController.php b/app/Http/Controllers/Maps/Markers/DetailController.php
@@ -40,7 +40,7 @@ public function index(Campaign $campaign, Map $map, MapMarker $mapMarker)
         $name = $mapMarker->name;
         if ($mapMarker->entity) {
             $name = !empty($mapMarker->name) ? $mapMarker->name : $mapMarker->entity->name;
-            $name = link_to($mapMarker->entity->url(), $name, ['target' => '_blank']);
+            $name = '<a href="' . $mapMarker->entity->url() . '" target="_blank">' . $name . '</a>';
         }
         if (request()->has('mobile')) {
             return response()->view('maps.markers.dialog_details', [

diff --git a/app/Http/Controllers/Organisation/MemberController.php b/app/Http/Controllers/Organisation/MemberController.php
@@ -43,7 +43,7 @@ public function index(Campaign $campaign, Organisation $organisation)
             ->select('organisation_member.*')
             ->with([
                 'organisation', 'organisation.entity',
-                'parent', 'parent.character',
+                'parent', 'parent.character', 'parent.character.entity',
                 'character', 'character.entity', 'character.entity.image',
                 'character.location', 'character.location.entity'])
             ->has('character')
@@ -79,6 +79,9 @@ public function create(Campaign $campaign, Organisation $organisation)
     public function store(StoreOrganisationMember $request, Campaign $campaign, Organisation $organisation)
     {
         $this->authorize('member', $organisation);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $relation = OrganisationMember::create($request->all());
         return redirect()->route('entities.show', [$campaign, $organisation->entity])
@@ -123,6 +126,9 @@ public function update(
         OrganisationMember $organisationMember
     ) {
         $this->authorize('member', $organisation);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $organisationMember->update($request->all());
         return redirect()->route('entities.show', [$campaign, $organisation->entity])

diff --git a/app/Http/Controllers/RelationController.php b/app/Http/Controllers/RelationController.php
@@ -85,10 +85,7 @@ public function store(StoreRelation $request, Campaign $campaign)
             $count = $this->relationService->getCount();
 
             $success = trans_choice($this->langKey . '.create.success_bulk', $count, [
-                'entity' => link_to(
-                    $new->owner->url(),
-                    $new->owner->name
-                ),
+                'entity' => '<a href="' . $new->owner->url() . '">' . $new->owner->name . '</a>',
                 'count' => $count,
             ]);
             session()->flash('success_raw', $success);

diff --git a/app/Http/Controllers/Timelines/TimelineEraController.php b/app/Http/Controllers/Timelines/TimelineEraController.php
@@ -171,6 +171,9 @@ public function bulk(Request $request, Campaign $campaign, Timeline $timeline)
             return $this->bulkBatch(route('timelines.eras.bulk', [$campaign, 'timeline' => $timeline]), '_timeline-era', $models);
         }*/
 
+        if (request()->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $count = $this->bulkProcess($request, TimelineEra::class);
 
         return redirect()

diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php
@@ -63,7 +63,7 @@ class AttributeTemplate extends MiscModel
     ];
 
     /** @var bool Attribute templates don't have inventory, relations or abilities */
-    public $hasRelations = false;
+    public bool $hasRelations = false;
 
     public function attributeTemplate(): BelongsTo
     {