Assets is now its own module

owlchester · Apr 25, 2024 · 64fc9b7 · 64fc9b7
1 parent 488ca27
commit 64fc9b7
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 3 deletions.
diff --git a/app/Http/Controllers/Entity/AssetController.php b/app/Http/Controllers/Entity/AssetController.php
@@ -21,6 +21,15 @@ class AssetController extends Controller
 
     public function index(Campaign $campaign, Entity $entity)
     {
+        if (!$campaign->enabled('assets')) {
+            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'), ['#assets']),
+                ])
+            );
+        }
+
         $this->authEntityView($entity);
 
         $assets = $entity->assets;

diff --git a/app/Http/Controllers/Entity/AttributeController.php b/app/Http/Controllers/Entity/AttributeController.php
@@ -31,13 +31,14 @@ public function __construct(AttributeService $attributeService, TemplateService
     public function index(Campaign $campaign, Entity $entity)
     {
         if (!$campaign->enabled('entity_attributes')) {
-            return redirect()->route('dashboard', $campaign)->with(
+            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'), ['#entity_attributes']),
+                    'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), ['#assets']),
                 ])
             );
         }
+
         $this->authEntityView($entity);
 
         if (!$entity->accessAttributes()) {

diff --git a/app/Http/Controllers/Entity/InventoryController.php b/app/Http/Controllers/Entity/InventoryController.php
@@ -28,6 +28,15 @@ class InventoryController extends Controller
 
     public function index(Campaign $campaign, Entity $entity)
     {
+        if (!$campaign->enabled('inventories')) {
+            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'), ['#inventories']),
+                ])
+            );
+        }
+
         $this->authEntityView($entity);
 
         $inventory = $entity

diff --git a/app/Models/CampaignSetting.php b/app/Models/CampaignSetting.php
@@ -13,6 +13,7 @@ class CampaignSetting extends Model
 
     protected $fillable = [
         'abilities',
+        'assets',
         'campaign_id',
         'characters',
         'entity_attributes',

diff --git a/app/Models/MiscModel.php b/app/Models/MiscModel.php
@@ -299,7 +299,7 @@ public function menuItems(array $items = []): array
 
 
         // Each entity can have assets
-        if ($this->entity->hasFiles()) {
+        if ($campaign->enabled('assets') && $this->entity->hasFiles()) {
             $items['third']['assets'] = [
                 'name' => 'crud.tabs.assets',
                 'route' => 'entities.entity_assets.index',

diff --git a/database/migrations/2024_04_24_193659_update_campaign_settings_add_assets.php b/database/migrations/2024_04_24_193659_update_campaign_settings_add_assets.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('campaign_settings', function (Blueprint $table) {
+            $table->boolean('assets')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('campaign_settings', function (Blueprint $table) {
+            $table->dropColumn('assets');
+        });
+    }
+};
diff --git a/lang/en/campaigns.php b/lang/en/campaigns.php
@@ -371,6 +371,7 @@
         ],
         'helpers'       => [
             'abilities'         => 'Create abilities, be it feats, spells, or powers that can be assigned to entities.',
+            'assets'            => 'Upload files, links and aliases to individual entities.',
             'bookmarks'         => 'Create bookmarks to entities or filtered lists that appear in the sidebar.',
             'calendars'         => 'A place to define the calendars of your world.',
             'characters'        => 'Create and keep track of the people inhabiting the world with characters.',

diff --git a/lang/en/entities.php b/lang/en/entities.php
@@ -3,6 +3,7 @@
 return [
     'abilities'             => 'Abilities',
     'ability'               => 'Ability',
+    'assets'                => 'Assets',
     'attribute_template'    => 'Attribute Template',
     'attribute_templates'   => 'Attribute Templates',
     'bookmark'              => 'Bookmark',

diff --git a/resources/views/campaigns/modules/index.blade.php b/resources/views/campaigns/modules/index.blade.php
@@ -107,6 +107,9 @@
             <div class="cell col-span-1 flex">
                 @include('campaigns.modules.box', ['icon' => 'fa-solid fa-table', 'module' => 'entity_attributes'])
             </div>
+            <div class="cell col-span-1 flex">
+                @include('campaigns.modules.box', ['icon' => 'fa-solid fa-folder', 'module' => 'assets'])
+            </div>
         </div>
     </div>
 @endsection