Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
spitfire305 authored and github-actions[bot] committed Jan 10, 2024
1 parent f3e05c0 commit 429bc89
Show file tree
Hide file tree
Showing 80 changed files with 269 additions and 269 deletions.
6 changes: 3 additions & 3 deletions app/Datagrids/Filters/CharacterFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function build()
->add('title')
->add([
'field' => 'family_id',
'label' => \App\Facades\Module::singular(config('entities.ids.family'), __('entities.family')),
'label' => Module::singular(config('entities.ids.family'), __('entities.family')),
'type' => 'select2',
'route' => route('families.find', $this->campaign),
'placeholder' => $famPlaceholder,
Expand All @@ -45,7 +45,7 @@ public function build()
->location()
->add([
'field' => 'race_id',
'label' => \App\Facades\Module::singular(config('entities.ids.race'), __('entities.race')),
'label' => Module::singular(config('entities.ids.race'), __('entities.race')),
'type' => 'select2',
'route' => route('races.find', $this->campaign),
'placeholder' => $racePlaceholder,
Expand All @@ -54,7 +54,7 @@ public function build()
])
->add([
'field' => 'member_id',
'label' => \App\Facades\Module::singular(config('entities.ids.organisation'), __('entities.organisation')),
'label' => Module::singular(config('entities.ids.organisation'), __('entities.organisation')),
'type' => 'select2',
'route' => route('organisations.find', $this->campaign),
'placeholder' => $orgPlaceholder,
Expand Down
8 changes: 4 additions & 4 deletions app/Datagrids/Filters/DatagridFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected function location(): self
}
$this->filters[] = [
'field' => 'location_id',
'label' => \App\Facades\Module::singular(config('entities.ids.location'), __('entities.location')),
'label' => Module::singular(config('entities.ids.location'), __('entities.location')),
'type' => 'select2',
'route' => route('locations.find', $this->campaign),
'placeholder' => $placeholder,
Expand All @@ -81,7 +81,7 @@ protected function character(string $field = 'character_id'): self
}
$this->filters[] = [
'field' => $field,
'label' => \App\Facades\Module::singular(config('entities.ids.character'), __('entities.character')),
'label' => Module::singular(config('entities.ids.character'), __('entities.character')),
'type' => 'select2',
'route' => route('characters.find', $this->campaign),
'placeholder' => $placeholder,
Expand All @@ -103,7 +103,7 @@ protected function journal(): self
}
$this->filters[] = [
'field' => 'journal_id',
'label' => \App\Facades\Module::singular(config('entities.ids.journal'), __('entities.journal')),
'label' => Module::singular(config('entities.ids.journal'), __('entities.journal')),
'type' => 'select2',
'route' => route('journals.find', $this->campaign),
'placeholder' => $placeholder,
Expand All @@ -125,7 +125,7 @@ protected function tags(): self
}
$this->filters[] = [
'field' => 'tags',
'label' => \App\Facades\Module::singular(config('entities.ids.tag'), __('entities.tag')),
'label' => Module::singular(config('entities.ids.tag'), __('entities.tag')),
'type' => 'tag',
'route' => route('tags.find', $this->campaign),
'placeholder' => $placeholder,
Expand Down
2 changes: 1 addition & 1 deletion app/Facades/Datagrid.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Class Datagrid
* @package App\Facades
*
* @see \App\Renderers\DatagridRenderer2
* @see DatagridRenderer2
* @mixin \App\Renderers\DatagridRenderer2
*/
class Datagrid extends Facade
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function findOrCreateUser(mixed $user, mixed $provider)
// Make sure the email doesn't already exist
$emailExists = User::where('email', $user->email)->first();
if ($emailExists) {
throw new \Exception('', 1);
throw new Exception('', 1);
}

// Only allow creating if it's set that way
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected function validator(array $data)
/**
* Create a new user instance after a valid registration.
*
* @return \App\User
* @return User
*/
protected function create(array $data)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/BulkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function index(BulkRequest $request, Campaign $campaign)

/**
* @return \Illuminate\Http\RedirectResponse
* @throws \Exception
* @throws Exception
*/
protected function batch()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function index(Campaign $campaign)

$dashboard = null;
if (request()->get('dashboard')) {
$dashboard = \App\Models\CampaignDashboard::findOrFail(request()->get('dashboard'));
$dashboard = CampaignDashboard::findOrFail(request()->get('dashboard'));
}

return view('dashboard.widgets.selection')
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/AbilityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AbilityController extends CrudController
/**
* Crud models
*/
protected $model = \App\Models\Ability::class;
protected $model = Ability::class;

protected string $filter = AbilityFilter::class;

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/AttributeTemplateController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AttributeTemplateController extends CrudController
protected string $route = 'attribute_templates';
protected string $module = 'entity_attributes';

protected $model = \App\Models\AttributeTemplate::class;
protected $model = AttributeTemplate::class;

protected string $filter = AttributeTemplateFilter::class;

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/BookmarkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class BookmarkController extends CrudController
protected bool $hasLimitCheck = true;

/** @var string */
protected $model = \App\Models\Bookmark::class;
protected $model = Bookmark::class;

/** */
protected string $datagridActions = BookmarkDatagridActions::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/CalendarController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CalendarController extends CrudController


/** @var string */
protected $model = \App\Models\Calendar::class;
protected $model = Calendar::class;

/** */
protected string $filter = CalendarFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/CharacterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CharacterController extends CrudController
/**
* @var string
*/
protected $model = \App\Models\Character::class;
protected $model = Character::class;

/**
*/
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/ConversationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ConversationController extends CrudController
protected $module = 'conversations';

/** @var string Model */
protected $model = \App\Models\Conversation::class;
protected $model = Conversation::class;

/** @var string Filter */
protected string $filter = ConversationFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/CreatureController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CreatureController extends CrudController
protected $module = 'creatures';

/** @var string Model */
protected $model = \App\Models\Creature::class;
protected $model = Creature::class;

/** @var string Filter */
protected string $filter = CreatureFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/DiceRollController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DiceRollController extends CrudController
protected $module = 'dice_rolls';

/** @var string Model */
protected $model = \App\Models\DiceRoll::class;
protected $model = DiceRoll::class;

/** @var string Filter */
protected string $filter = DiceRollFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/DiceRollResultController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DiceRollResultController extends CrudController
protected string $route = 'dice_roll_results';

/** @var string Model */
protected $model = \App\Models\DiceRollResult::class;
protected $model = DiceRollResult::class;

/** @var string Filter */
protected string $filter = DiceRollResult::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/EventController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class EventController extends CrudController
protected $module = 'events';

/** @var string Model */
protected $model = \App\Models\Event::class;
protected $model = Event::class;

/** @var string Filter */
protected string $filter = EventFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/FamilyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FamilyController extends CrudController
/**
* Crud models
*/
protected $model = \App\Models\Family::class;
protected $model = Family::class;

/** @var string Filter */
protected string $filter = FamilyFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/ItemController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ItemController extends CrudController
protected $module = 'items';

/** @var string Model */
protected $model = \App\Models\Item::class;
protected $model = Item::class;

/** @var string Filter */
protected string $filter = ItemFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/JournalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class JournalController extends CrudController
protected $module = 'journals';

/** @var string Model*/
protected $model = \App\Models\Journal::class;
protected $model = Journal::class;

/** @var string Filter */
protected string $filter = JournalFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/LocationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class LocationController extends CrudController
protected $module = 'locations';

/** @var string Model */
protected $model = \App\Models\Location::class;
protected $model = Location::class;

/** @var string Filter */
protected string $filter = LocationFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/MapController.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MapController extends CrudController
/**
* Crud models
*/
protected $model = \App\Models\Map::class;
protected $model = Map::class;

/** @var string Filter */
protected string $filter = MapFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/NoteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class NoteController extends CrudController
protected $module = 'notes';

/** @var string */
protected $model = \App\Models\Note::class;
protected $model = Note::class;

/** @var string Filter */
protected string $filter = NoteFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/OrganisationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class OrganisationController extends CrudController
protected $module = 'organisations';

/** @var string */
protected $model = \App\Models\Organisation::class;
protected $model = Organisation::class;

/** @var string Filter */
protected string $filter = OrganisationFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/QuestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class QuestController extends CrudController
protected $module = 'quests';

/** @var string Model */
protected $model = \App\Models\Quest::class;
protected $model = Quest::class;

/** @var string Filter */
protected string $filter = QuestFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/RaceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class RaceController extends CrudController
protected $module = 'races';

/** @var string Model */
protected $model = \App\Models\Race::class;
protected $model = Race::class;

/** @var string Filter */
protected string $filter = RaceFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/TagController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TagController extends CrudController
protected $module = 'tags';

/** @var string Model */
protected $model = \App\Models\Tag::class;
protected $model = Tag::class;

/** @var string Filter */
protected string $filter = TagFilter::class;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Crud/TimelineController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TimelineController extends CrudController
protected string $route = 'timelines';

/** @var string */
protected $model = \App\Models\Timeline::class;
protected $model = Timeline::class;

protected string $filter = TimelineFilter::class;

Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/CrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public function crudIndex(Request $request)
// Don't use total as it won't use the distinct() filters (typically when doing
// left join on the entities table)
$filteredCount = $models->total();
//$filteredCount = count($models); //->total()
//$filteredCount = count($models); //->total()
} else {
/** @var Paginator $models */
$models = $base->paginate();
Expand Down
8 changes: 4 additions & 4 deletions app/Http/Controllers/EditingController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ public function index(Campaign $campaign)
->user(auth()->user())
->users();

if ($model instanceof \App\Models\Post) {
if ($model instanceof Post) {
$url = route('posts.confirm-editing', [$campaign, 'post' => $model, 'entity' => $model->entity]);
$show = $model->entity->url();
} elseif ($model instanceof \App\Models\Campaign) {
} elseif ($model instanceof Campaign) {
$url = route('campaigns.confirm-editing', $model);
$show = route('overview', $campaign);
} elseif ($model instanceof \App\Models\TimelineElement) {
} elseif ($model instanceof TimelineElement) {
$url = route('timeline-elements.confirm-editing', [$campaign, $model]);
$show = $model->timeline->getLink();
} elseif ($model instanceof \App\Models\QuestElement) {
} elseif ($model instanceof QuestElement) {
$url = route('quest-elements.confirm-editing', [$campaign, $model]);
$show = $model->quest->getLink();
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Entity/ReminderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ReminderController extends Controller

protected CalendarService $calendarService;

protected $model = \App\Models\EntityEvent::class;
protected $model = EntityEvent::class;

public function __construct(CalendarService $calendarService)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/RelationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class RelationController extends CrudController
protected string $forceMode = 'table';

/** @var string */
protected $model = \App\Models\Relation::class;
protected $model = Relation::class;

/** @var string The datagrid controlling the bulk actions */
protected string $datagridActions = RelationDatagridActions::class;
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Search/MiscController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function characters(Request $request, Campaign $campaign)
return $this->familyCharacters($request, $campaign);
}
$term = trim($request->q);
return $this->buildSearchResults($term, \App\Models\Character::class);
return $this->buildSearchResults($term, Character::class);
}

/**
Expand Down Expand Up @@ -149,7 +149,7 @@ public function tags(Request $request, Campaign $campaign)
{
$term = trim($request->q);
$exclude = $request->has('exclude') ? [$request->get('exclude')] : [];
return $this->buildSearchResults($term, \App\Models\Tag::class, $exclude);
return $this->buildSearchResults($term, Tag::class, $exclude);
}

/**
Expand Down
Loading

0 comments on commit 429bc89

Please sign in to comment.