update bo homepage: remove index page and redirect to the edit

This commit is contained in:
Alexis Gousseau 2023-11-06 09:32:11 +01:00
parent 480482f5b2
commit 35f6d98dbc
9 changed files with 50 additions and 185 deletions

View file

@ -5,86 +5,49 @@ namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\Homepage\UpdateHomepageRequest;
use App\Models\Homepage;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
class HomepageController extends Controller
{
/**
* Create the controller instance.
*/
public function __construct()
{
$this->authorizeResource(Homepage::class);
}
/**
* Display a listing of the resource.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View
*/
public function index(Request $request): \Illuminate\Contracts\View\View
{
/** @var \Illuminate\Database\Eloquent\Builder $homepageModels */
$homepageModels = Homepage::query();
/** @var string $search Search field */
$search = $request->search;
if ($search) {
$this->searchQuery(
$homepageModels,
$search,
null,
'title_part1',
'title_part2',
'title_part3'
);
}
$searchFields = \implode(', ', [
Str::ucfirst(trans('validation.attributes.title'))
]);
/** Sort columns with a query */
$this->sortQuery($homepageModels);
/** Custom pagination */
$homepageModels = $this->paginate($homepageModels);
return view('bo.pages.homepages.index', compact('homepageModels', 'search', 'searchFields'));
}
/**
* Show the form for editing the specified resource.
*
* @param App\Models\Homepage $homepage
* @return \Illuminate\Contracts\View\View
*/
public function edit(Homepage $homepage): \Illuminate\Contracts\View\View
public function edit(): \Illuminate\Contracts\View\View
{
return view('bo.pages.homepages.edit', ['homepageModel' => $homepage]);
$this->authorize('update', \App\Models\Homepage::class);
/** @var \App\Models\Homepage $homepageModel */
$homepageModel = Homepage::query()->firstOrFail();
return view('bo.pages.homepages.edit', compact('homepageModel'));
}
/**
* Update the specified resource in storage.
*
* @param \App\Http\Requests\Bo\Homepages\UpdateHomepageRequest $request
* @param \App\Models\Homepage $homepage
* @param \App\Http\Requests\Bo\Homepage\UpdateHomepageRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateHomepageRequest $request, Homepage $homepage): \Illuminate\Http\RedirectResponse
public function update(UpdateHomepageRequest $request): \Illuminate\Http\RedirectResponse
{
return DB::transaction(function () use ($request, $homepage) {
$homepage->fill($request->validated());
$this->authorize('update', \App\Models\Homepage::class);
if ($homepage->saveOrFail()) {
return redirect()->route('bo.homepages.edit', $homepage)
return DB::transaction(function () use ($request) {
/** @var \App\Models\Homepage $homepageModel */
$homepageModel = Homepage::query()->firstOrFail();
$homepageModel->fill($request->validated());
if ($homepageModel->saveOrFail()) {
return redirect()->route('bo.homepages.edit')
->with('success', __('crud.messages.has_been_updated', [
'model' => Str::ucfirst(__('models.classes.homepage'))
]));
}
return redirect()->route('bo.homepages.edit', $homepage)
return redirect()->route('bo.homepages.edit')
->with('error', __('crud.messages.cannot_be_updated', [
'model' => Str::ucfirst(__('models.classes.homepage'))
]));

View file

@ -19,17 +19,6 @@ class HomepagePolicy
return UserStaticRules::atLeastRole($authUser, RoleEnum::admin);
}
/**
* Determine whether the user can view the model.
*
* @param \App\Models\User $authUser
* @return boolean
*/
public function view(User $authUser): bool
{
return UserStaticRules::atLeastRole($authUser, RoleEnum::admin);
}
/**
* Determine whether the user can update the model.
*

View file

@ -14,12 +14,12 @@ class HomepageFactory extends Factory
public function definition()
{
return [
'title_part1' => fake()->sentence(),
'title_part2' => fake()->sentence(),
'title_part3' => fake()->sentence(),
'picture_alt' => fake()->sentence(),
'picture_title' => fake()->sentence(),
'presentation_title' => fake()->sentence(),
'title_part1' => fake()->sentence(),
'title_part2' => fake()->sentence(),
'title_part3' => fake()->sentence(),
'picture_alt' => fake()->sentence(),
'picture_title' => fake()->sentence(),
'presentation_title' => fake()->sentence(),
'presentation_content' => \clean(\fake()->randomHtml(6, 7)),
];
}

View file

@ -50,15 +50,15 @@
request()->routeIs('bo.joinuspages.*') ||
request()->routeIs('bo.news.*')) active @endif dropdown-toggle" data-bs-toggle="dropdown" type="button"
aria-expanded="false">
{{ Str::of(trans_choice('models.classes.static_page', '*'))->title() }}
{{ Str::of(trans_choice('models.classes.static_page', '*'))->ucfirst() }}
</a>
<ol class="dropdown-menu">
@can('viewAny', \App\Models\StaticPage::class)
<li class="nav-item">
<a class="nav-link @if (request()->routeIs('bo.static_pages.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.static_pages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(trans_choice('models.classes.static_page', '*'))->title()]) }}">
{{ Str::of(trans_choice('models.classes.static_page', '*'))->title() }}
title="{{ __('crud.helpers.list_all', ['model' => Str::of(trans_choice('models.classes.static_page', '*'))->ucfirst()]) }}">
{{ Str::of(trans_choice('models.classes.static_page', '*'))->ucfirst() }}
</a>
</li>
@endcan
@ -66,17 +66,17 @@
<li class="nav-item">
<a class="nav-link @if (request()->routeIs('bo.news.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.news.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.news'))->plural()->title()]) }}">
{{ Str::of(__('models.classes.news'))->plural()->title() }}
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.news'))->plural()->ucfirst()]) }}">
{{ Str::of(__('models.classes.news'))->plural()->ucfirst() }}
</a>
</li>
@endcan
@can('viewAny', \App\Models\Homepage::class)
<li>
<a class="nav-link @if (request()->routeIs('bo.homepages.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.homepages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.homepage'))->plural()]) }}">
{{ Str::of(__('models.classes.homepage'))->plural()->title() }}
href="{{ route('bo.homepages.edit') }}"
title="{{ trans_choice('crud.meta.title.edit', 1, ['model' => __('models.classes.homepage')]) }}">
{{ Str::of(__('models.classes.homepage'))->ucfirst() }}
</a>
</li>
@endcan
@ -84,8 +84,8 @@
<li>
<a class="nav-link @if (request()->routeIs('bo.explorerpages.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.explorerpages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.explorerpage'))->plural()]) }}">
{{ Str::of(__('models.classes.explorerpage'))->plural()->title() }}
title="{{ trans_choice('crud.meta.title.edit', 1, ['model' => __('models.classes.explorerpage')]) }}">
{{ Str::of(__('models.classes.explorerpage'))->ucfirst() }}
</a>
</li>
@endcan
@ -93,8 +93,8 @@
<li>
<a class="nav-link @if (request()->routeIs('bo.convictionpages.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.convictionpages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.convictionpage'))->plural()]) }}">
{{ Str::of(__('models.classes.convictionpage'))->plural()->title() }}
title="{{ trans_choice('crud.meta.title.edit', 1, ['model' => __('models.classes.convictionpage')]) }}">
{{ Str::of(__('models.classes.convictionpage'))->ucfirst() }}
</a>
</li>
@endcan
@ -102,8 +102,8 @@
<li>
<a class="nav-link @if (request()->routeIs('bo.joinuspages.*')) active @endif" data-bs-toggle="tooltip"
href="{{ route('bo.joinuspages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::of(__('models.classes.joinuspage'))]) }}">
{{ Str::of(__('models.classes.joinuspage'))->title() }}
title="{{ trans_choice('crud.meta.title.edit', 1, ['model' => __('models.classes.joinuspage')]) }}">
{{ Str::of(__('models.classes.joinuspage'))->ucfirst() }}
</a>
</li>
@endcan

View file

@ -8,22 +8,16 @@
@section('content')
<div class="d-flex justify-content-between flex-md-nowrap align-items-center flex-wrap pb-3">
<div class="d-flex align-items-start flex-row">
<a class="btn btn-primary text-decoration-none m-0" data-bs-toggle="tooltip" href="{{ route('bo.homepages.index') }}"
title="{{ __('crud.helpers.list_all', ['model' => Str::plural(__('models.classes.homepage'))]) }}">
<i class="fa-solid fa-arrow-left"></i>
</a>
@include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $homepageModel])
</div>
<div class="mb-md-0 mb-2">
<form class="btn-group confirmDeleteTS" action="{{ route('bo.homepages.edit', $homepageModel) }}" method="POST" novalidate>
<button class="btn btn-primary" id="formSubmitClone" data-bs-toggle="tooltip" type="submit"
title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.homepage')]) }}">
{{ Str::ucfirst(__('crud.actions.save')) }}
</button>
</form>
<button class="btn btn-primary" id="formSubmitClone" data-bs-toggle="tooltip" type="submit"
title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.homepage')]) }}">
{{ Str::ucfirst(__('crud.actions.save')) }}
</button>
</div>
</div>
<form action="{{ route('bo.homepages.update', $homepageModel) }}" method="POST" enctype="multipart/form-data">
<form action="{{ route('bo.homepages.update') }}" method="POST" enctype="multipart/form-data">
@csrf
@method('PUT')
@include('bo.pages.homepages.form')

View file

@ -1,62 +0,0 @@
<table class="table-hover table-fix-action m-0 table">
@if (count($homepageModels) > 0)
<thead>
@include('bo.modules.table-col-sorter', [
'cols' => [
'title_part1' => Str::ucfirst(__('validation.custom.title_part1')),
'title_part2' => Str::ucfirst(__('validation.custom.title_part2')),
'title_part3' => Str::ucfirst(__('validation.custom.title_part3')),
'picture' => Str::ucfirst(__('validation.custom.picture')),
'presentation_title' => Str::ucfirst(__('validation.custom.presentation_title')),
'presentation_content' => Str::ucfirst(__('validation.attributes.content')),
'updated_at' => Str::ucfirst(__('validation.attributes.updated_at')),
],
])
</thead>
<tbody>
@foreach ($homepageModels as $homepageModel)
<tr class="border-bottom list-item">
<td class="text-center align-middle">{{ $homepageModel->title_part1 }}</td>
<td class="text-center align-middle">{{ $homepageModel->title_part2 }}</td>
<td class="text-center align-middle">{{ $homepageModel->title_part3 }}</td>
<td class="text-center align-middle">
<img src="{{ asset($homepageModel->picture) }}" title="{{ $homepageModel->picture_title }}"
alt="{{ $homepageModel->picture_alt }}" height="50px">
</td>
<td class="text-center align-middle">{{ $homepageModel->presentation_title }}</td>
<td class="text-center align-middle">{!! Str::limit($homepageModel->presentation_content, 100) !!}</td>
<td class="text-center align-middle">
<span class="badge bg-secondary">{{ $homepageModel->updated_at->isoFormat('LLLL') }}</span>
</td>
@php
$routeName = request()
->route()
->getName();
@endphp
<td class="text-end align-middle">
@canAny(['update'], $homepageModel)
<form class="btn-group confirmDeleteTS" action="{{ route('bo.homepages.edit', $homepageModel) }}" method="POST"
novalidate>
@can('update', $homepageModel)
<a class="btn btn-sm btn-primary" data-bs-toggle="tooltip"
href="{{ route('bo.homepages.edit', ['homepage' => $homepageModel]) }}"
title="{{ Str::ucfirst(__('crud.actions.update')) }}">
<i class="fa-solid fa-pencil"></i>
</a>
@endcan
</form>
@else
<span class="text-danger" data-bs-toggle="tooltip" title="{{ __('list.right') }}">
<i class="fa-solid fa-ban"></i>
</span>
@endcan
</td>
</tr>
@endforeach
</tbody>
@else
<tr>
<td class="border-0">{{ __('crud.other.no_model_found', ['model' => __('models.classes.homepage')]) }}</td>
</tr>
@endif
</table>

View file

@ -1,16 +0,0 @@
@extends('bo.layout')
@section('title',
Str::of(__('models.classes.homepage'))->plural()->ucfirst())
@section('description', trans_choice('crud.meta.description.index', 0, ['model' => Str::plural(__('models.classes.homepage'))]))
@section('content')
<div class="d-flex justify-content-between flex-md-nowrap align-items-center flex-wrap">
@include('modules.breadcrumbs.breadcrumb-body')
</div>
@include('bo.modules.search-bar')
<div class="table-responsive mb-3">
@include('bo.pages.homepages.index-list')
</div>
{{ $homepageModels->links() }}
@endsection

View file

@ -4,7 +4,6 @@ use App\Models\ActivityLog;
use App\Models\Commitment;
use App\Models\Convictionpage;
use App\Models\Explorerpage;
use App\Models\Homepage;
use App\Models\Joinuspage;
use App\Models\Range;
use App\Models\News;
@ -142,16 +141,13 @@ Breadcrumbs::for('bo.seasonalsections.duplicate', function (Generator $trail) {
$trail->push(Str::ucfirst(trans('crud.actions.duplicate')));
});
// * HOMEPAGES
// * HOMEPAGE
Breadcrumbs::for('bo.homepages.index', function (Generator $trail) {
$trail->push(
Str::of(trans('models.classes.homepage'))->plural()->ucfirst(),
route('bo.homepages.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc'])
);
$trail->push(Str::ucfirst(trans('models.classes.homepage')));
});
Breadcrumbs::for('bo.homepages.edit', function (Generator $trail, Homepage $homepage) {
Breadcrumbs::for('bo.homepages.edit', function (Generator $trail) {
$trail->parent('bo.homepages.index');
$trail->push(Str::ucfirst(trans('crud.actions.edit')), route('bo.homepages.edit', $homepage));
$trail->push(Str::ucfirst(trans('crud.actions.edit')));
});
// * JOINUSPAGES

View file

@ -113,7 +113,8 @@ Route::prefix('bo')
])->name('seasonalsections.duplicate');
// * HOMEPAGE
Route::resource('homepages', HomepageController::class)->only(['index', 'edit', 'update'])
Route::get('/homepages/edit', [HomepageController::class, 'edit'])->name('homepages.edit');
Route::put('/homepages/update', [HomepageController::class, 'update'])->name('homepages.update')
->withoutMiddleware('htmlsanitize')
->middleware('htmlsanitize:presentation_content');