Merge pull request #1025 from owlchester/dialog-update

Dialog update

Author: ilestis

app/Http/Controllers/Api/v1/EntityTagApiController.php

@@ -16,7 +16,7 @@ public function index(Campaign $campaign, Entity $entity)
         $this->authorize('access', $campaign);
         $this->authorize('view', $entity);
 
-        return Resource::collection($entity->tags()->paginate());
+        return Resource::collection($entity->tags()->withPivot('id')->paginate());
     }
 
     public function show(Campaign $campaign, Entity $entity, EntityTag $entityTag)

app/Http/Controllers/CrudController.php

@@ -352,7 +352,13 @@ public function crudCreate($params = [])
             $params['title'] = __('crud.titles.new', ['module' => $singular]);
         }
 
-        return view('cruds.forms.create', array_merge(['name' => $this->view], $params));
+        $view = 'cruds.forms.create';
+        $override = $this->view . '.forms.create';
+        if (view()->exists($override)) {
+            $view = $override;
+        }
+
+        return view($view, array_merge(['name' => $this->view], $params));
     }
 
     public function crudStore(Request $request, bool $redirectToCreated = false)
@@ -518,7 +524,13 @@ public function crudEdit(Model|MiscModel $model)
             $params['entity'] = $model->entity;
         }
 
-        return view('cruds.forms.edit', $params);
+        $view = 'cruds.forms.edit';
+        $override = $this->view . '.forms.edit';
+        if (view()->exists($override)) {
+            $view = $override;
+        }
+
+        return view($view, $params);
     }
 
     /**

app/Http/Controllers/PresetController.php

@@ -47,6 +47,9 @@ public function create(Campaign $campaign, PresetType $presetType)
     public function store(StorePreset $request, Campaign $campaign, PresetType $presetType)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $data = $request->only('name', 'config', 'visibility_id');
         $data['type_id'] = $presetType->id;
@@ -81,6 +84,9 @@ public function edit(Campaign $campaign, PresetType $presetType, Preset $preset)
     public function update(StorePreset $request, Campaign $campaign, PresetType $presetType, Preset $preset)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
 
         $data = $request->only('name', 'config', 'visibility_id');
         $preset->update($data);
@@ -99,6 +105,9 @@ public function update(StorePreset $request, Campaign $campaign, PresetType $pre
     public function destroy(Request $request, Campaign $campaign, PresetType $presetType, Preset $preset)
     {
         $this->authorize('mapPresets', $campaign);
+        if ($request->ajax()) {
+            return response()->json(['success' => true]);
+        }
         $preset->delete();
 
         [$route, $params] = $this->parseFrom($request);

app/Http/Resources/Api/EntityTagResource.php

@@ -19,7 +19,6 @@ public function toArray(Request $request): array
         $model = $this->resource;
 
         return [
-            'id' => $model->id,
             'tag_id' => $model->tag_id,
         ];
     }

app/Models/Concerns/Taggable.php

@@ -27,7 +27,6 @@ public static function bootTaggable(): void
     public function tags(): BelongsToMany
     {
         return $this->belongsToMany(Tag::class, $this->getTagPivotTableName())
-            ->withPivot('id')
             ->with('entity')
             ->has('entity');
     }

app/View/Components/Dialog/Article.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\View\Components\Dialog;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Article extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.dialog.article');
+    }
+}

lang/en/bookmarks.php

@@ -12,17 +12,14 @@
     ],
     'fields'            => [
         'active'            => 'Active',
-        'dashboard'         => 'Dashboard',
+        'dashboard' => 'Dashboard',
         'default_dashboard' => 'Default dashboard',
-        'entity'            => 'Entity',
         'filters'           => 'Filters',
         'menu'              => 'Subpage',
         'position'          => 'Position',
-        'random'            => 'Random',
         'random_type'       => 'Random Entity Type',
         'selector'          => 'Bookmark Configuration',
         'target'            => 'Target',
-        'type'              => 'Entity List',
     ],
     'helpers'           => [
         'active'            => 'Inactive bookmarks won\'t appear in the interface.',
@@ -33,6 +30,7 @@
         'random'            => 'Use this field to have a bookmark pointing to a random entity. You can filter the link to only go to a specific entity type.',
         'selector'          => 'Configure where this bookmark goes when a user clicks on it in the sidebar.',
         'type'              => 'Set up this bookmark to go directly to a list of entities. To filter the results, copy parts of the url on the filtered entity list after the :? sign into the :filter field.',
+        'css' => 'Add a CSS class that will be added to the bookmark\'s link in the sidebar.',
     ],
     'placeholders'      => [
         'filters'   => 'location_id=15&type=city',
@@ -50,4 +48,11 @@
     'visibilities'      => [
         'is_active' => 'Show the bookmark in the sidebar',
     ],
+    'targets' => [
+        'select' => 'Choose an option',
+        'entity' => 'A single entity',
+        'random' => 'A random entity',
+        'type' => 'List of entities of a specific entity type/module',
+        'dashboard' => 'One of the campaign\'s dashboards',
+    ]
 ];

lang/en/entities/abilities.php

@@ -10,9 +10,10 @@
         'left'  => ':amount left',
     ],
     'create'    => [
+        'helper'            => 'Attach one of several abilities to :name.',
         'success'           => 'Ability :ability added to :entity.',
         'success_multiple'  => 'Abilities :abilities added to :entity.',
-        'title'             => 'Add abilities to :name',
+        'title'             => 'Add abilities',
     ],
     'fields'    => [
         'note'      => 'Note',

lang/en/entities/aliases.php

@@ -5,8 +5,9 @@
         'add'   => 'Add an alias',
     ],
     'create'        => [
+        'helper' => 'Create an alias for :name, which will make it findable in the global search and through :code mentions.',
         'success'   => 'Alias :name added to :entity.',
-        'title'     => 'Add an alias to :name',
+        'title'     => 'New alias',
     ],
     'destroy'       => [
         'success'   => 'Alias :name removed.',
@@ -15,7 +16,7 @@
         'name'  => 'Name',
     ],
     'helpers'       => [
-        'primary'   => 'Setting one or several aliases on the entity will make it findable in the global search (top bar) and through mentions.',
+        'primary'   => 'Setting one or several aliases on the entity will make it findable in the global search (top bar) and through :code mentions.',
     ],
     'pitch'         => 'Create aliases for this entity to easily find it through the search and through mentions.',
     'placeholders'  => [

lang/en/entities/events.php

@@ -1,6 +1,9 @@
 <?php
 
 return [
+    'create' => [
+        'helper' => 'Create a reminder to link :name to a calendar.',
+    ],
     'fields'    => [
         'type'  => 'Reminder Type',
     ],

lang/en/entities/files.php

@@ -6,8 +6,9 @@
         'premium'   => 'Uploading more files requires a premium campaign.',
     ],
     'create'            => [
+        'helper'            => 'Add a file to :name. The file will count towards your gallery storage limit.',
         'success_plural'    => '{1} File :name added.|[2,*] :count files added.',
-        'title'             => 'New file for :entity',
+        'title'             => 'New file',
     ],
     'destroy'           => [
         'success'   => 'File :name removed.',

lang/en/entities/inventories.php

@@ -7,12 +7,13 @@
         'copy_inventory'    => 'Copy inventory',
     ],
     'copy'              => [
-        'title' => 'Copy inventory to :name',
+        'helper' => 'Copy the whole inventory of an entity to :name.',
     ],
     'create'            => [
         'success'       => 'Item :item added to :entity.',
         'success_bulk'  => '{0} No item added to :entity.|{1} Added :count item to :entity.|[2,*] Added :count items to :entity.',
-        'title'         => 'Add an Item to :name',
+        'title'         => 'Add to inventory',
+        'helper'        => 'Add an item to :name\'s inventory. It can optionally be linked to an existing object from the campaign.',
     ],
     'default_position'  => 'Unorganised',
     'destroy'           => [

lang/en/entities/links.php

@@ -6,8 +6,9 @@
     ],
     'call-to-action'    => 'Add links to external resources on this entity, like to DnDBeyond, and they will display directly on the entity\'s overview.',
     'create'            => [
+        'helper'    => 'Add an external link to :name, for example to their DnDBeyond page.',
         'success'   => 'Link :name added to :entity.',
-        'title'     => 'Add a link to :name',
+        'title'     => 'New link',
     ],
     'destroy'           => [
         'success'   => 'Link :name removed.',
@@ -27,7 +28,7 @@
         'title'         => 'Leaving Kanka',
     ],
     'helpers'           => [
-        'icon'      => 'Replace the default icon with one of your choice. Find our more about available icons in our :docs.',
+        'icon'      => 'Customise the link icon with one from :fontawesome or :rpgawesome. Find our more about available icons in our :docs.',
         'parent'    => 'Display this bookmark after an element of the sidebar, rather than in the bookmark section of the sidebar.',
     ],
     'placeholders'      => [

lang/en/entities/relations.php

@@ -32,7 +32,7 @@
     'create'            => [
         'new_title'     => 'New connection',
         'success_bulk'  => '{1} Added :count connection to :entity.|[2,*] Added :count connections to :entity.',
-        'title'         => 'New connection for :name',
+        'helper'        => 'Create a connection between :name and one or several entities.'
     ],
     'delete_mirrored'   => [
         'helper'    => 'This connection is mirrored on the target entity. Select this option to also remove the mirrored connection.',
@@ -59,6 +59,7 @@
     ],
     'helper'            => 'Set up connections between entities with attitudes and visibility. Connections can also be pinned to the entity\'s menu.',
     'helpers'           => [
+        'description' => 'Detail the nature of the connection between the two entities.',
         'no_relations'  => 'This entity doesn\'t currently have any connection to other entities of the campaign.',
         'popup'         => 'Entities of the campaign can be linked together using connections. These can have a description, an attitude rating, a visibility to control who sees a connection, and more.',
     ],
@@ -69,7 +70,7 @@
             'title' => 'Mirrored',
         ],
         'target_relation'   => 'The connection description on the target. Leave blank to use this connection\'s text.',
-        'two_way'           => 'Create a connection on the selected target and mirror them. Updating a mirrored relation doesn\'t update the original connection.',
+        'two_way'           => 'Create a mirrored connection on the target entity. Updating a mirrored connection doesn\'t update the original connection.',
     ],
     'index'             => [
         'title' => 'Connections',

lang/en/entities/tags.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'create' => [
+        'title' => 'Tag an entity',
+        'helper' => 'Add or remove tags on :name.',
+    ]
+];

lang/en/organisations.php

@@ -17,6 +17,7 @@
             'add_multiple'      => 'Add members',
         ],
         'create'        => [
+            'helper'            => 'Add one or several members to :name.',
             'success_multiple'  => '{1} Added :count member to :name.|[2,*] Added :count members to :name.',
             'title_multiple'    => 'New Members',
         ],

lang/en/settings/appearance.php

@@ -29,7 +29,7 @@
         'date-format'           => 'Date formatting',
         'editor'                => 'Text editor',
         'entity-explore'        => 'Entity lists',
-        'mentions'              => 'Mentions when editing',
+        'mentions'              => 'Mentions',
         'new-entity-workflow'   => 'New entity workflow',
         'pagination'            => 'Results per page',
         'theme'                 => 'Theme preference',

lang/en/subscriptions/faq.php

@@ -4,7 +4,7 @@
     'title' => 'Frequently Asked Questions',
     'cost' => [
         'question' => 'How much does a subscription cost?',
-        'answer' => 'Kanka offers three subscription tiers named after D&D monsters: Owlbear, Wyvern, and Elemental. Pricing varies based on your preferred currency (USD, EUR, or BRL). You\'ll enjoy a 20% discount when choosing an annual subscription instead of monthly billing.'
+        'answer' => 'Kanka offers three subscription tiers named after D&D monsters: Owlbear, Wyvern, and Elemental. Pricing varies based on your preferred currency (USD, EUR, or BRL). You\'ll enjoy two months for free when choosing an annual subscription instead of monthly billing.'
     ],
     'methods' => [
         'question' => 'What payment methods are accepted?',
@@ -38,7 +38,7 @@
     ],
     'discount' => [
         'question' => 'Are there any discounts for annual subscriptions?',
-        'answer' => 'Yes! We reward our annual subscribers with a 20% discount compared to monthly billing. This is our way of thanking you for your long-term commitment to Kanka.',
+        'answer' => 'Yes! We reward our annual subscribers with two months for free compared to monthly billing. This is our way of thanking you for your long-term commitment to Kanka.',
     ],
     'sharing' => [
         'question' => 'Can I share my account/subscription with others?',