diff --git a/app/Enums/DynamicFieldTypes.php b/app/Enums/DynamicFieldTypes.php index ec54e44f..4eb99f93 100644 --- a/app/Enums/DynamicFieldTypes.php +++ b/app/Enums/DynamicFieldTypes.php @@ -24,6 +24,8 @@ enum DynamicFieldTypes: int case date = 13; case color = 14; case model = 15; + // Specific inputs + case position = 101; /** * Labels definition. @@ -46,6 +48,8 @@ enum DynamicFieldTypes: int self::date->name => 'enums.dynamic-field-types.date', self::color->name => 'enums.dynamic-field-types.color', self::model->name => 'enums.dynamic-field-types.model', + // Specific inputs + self::position->name => 'enums.dynamic-field-types.position', ]; /** @@ -67,6 +71,8 @@ enum DynamicFieldTypes: int self::date->name => 'required|date', self::color->name => 'required|string|hex_color', self::model->name => 'required|numeric|exists:dynamic_pages,id', + // Specific inputs + self::position->name => 'required|numeric|between:1,5', ]; /** @@ -100,5 +106,7 @@ enum DynamicFieldTypes: int self::date->name => false, self::color->name => false, self::model->name => false, + // Specific inputs + self::position->name => false, ]; } diff --git a/app/Enums/ElementPositionEnum.php b/app/Enums/ElementPositionEnum.php new file mode 100644 index 00000000..3378f256 --- /dev/null +++ b/app/Enums/ElementPositionEnum.php @@ -0,0 +1,27 @@ +name => 'enums.element-position.showleft', + self::showright->name => 'enums.element-position.showright', + self::showtop->name => 'enums.element-position.showtop', + self::showbottom->name => 'enums.element-position.showbottom', + ]; +} diff --git a/app/Http/Controllers/Back/DynamicPageController.php b/app/Http/Controllers/Back/DynamicPageController.php index ab3bb5de..5bd27224 100644 --- a/app/Http/Controllers/Back/DynamicPageController.php +++ b/app/Http/Controllers/Back/DynamicPageController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Back; use App\Enums\DynamicPages\PageStatusEnum; +use App\Enums\ElementPositionEnum; use App\Http\Requests\Back\DynamicPages\StoreDynamicPageRequest; use App\Http\Requests\Back\DynamicPages\UpdateDynamicPageRequest; use App\Models\DynamicPage; @@ -70,6 +71,7 @@ class DynamicPageController extends Controller 'search' => $search, 'searchFields' => $searchFields, 'enumDynamicPageStatus' => PageStatusEnum::toArray(), + 'enumElementPosition' => ElementPositionEnum::toArray(), 'modelName' => $this->modelName ]); } @@ -89,6 +91,7 @@ class DynamicPageController extends Controller 'dynamicPageModels' => $dynamicPageModels, 'pageConfigModels' => $pageConfigModels, 'enumDynamicPageStatus' => PageStatusEnum::toArray(), + 'enumElementPosition' => ElementPositionEnum::toArray(), 'modelName' => $this->modelName ]); } @@ -104,6 +107,7 @@ class DynamicPageController extends Controller return Inertia::render('DynamicPages/Show', [ 'data' => CommonResource::make($dynamic_page->load(['parentPage', 'config'])), 'enumDynamicPageStatus' => PageStatusEnum::toArray(), + 'enumElementPosition' => ElementPositionEnum::toArray(), 'modelName' => $this->modelName ]); } @@ -146,6 +150,7 @@ class DynamicPageController extends Controller 'dynamicPageModels' => $dynamicPageModels, 'pageConfigModels' => $pageConfigModels, 'enumDynamicPageStatus' => PageStatusEnum::toArray(), + 'enumElementPosition' => ElementPositionEnum::toArray(), 'modelName' => $this->modelName ]); } diff --git a/app/Http/Requests/Back/UpdateDynamicFieldRequest.php b/app/Http/Requests/Back/UpdateDynamicFieldRequest.php index 1204358d..5ee8a390 100644 --- a/app/Http/Requests/Back/UpdateDynamicFieldRequest.php +++ b/app/Http/Requests/Back/UpdateDynamicFieldRequest.php @@ -2,12 +2,14 @@ namespace App\Http\Requests\Back; +use App\Enums\ElementPositionEnum; use App\Enums\DynamicFieldTypes; use App\Models\PageConfig; use App\Traits\Requests\HasInertiaPicture; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Str; use Illuminate\Validation\ValidationException; +use Illuminate\Validation\Rules\Enum; use Uwil\LaravelCommon\Helpers\ToolboxHelper; abstract class UpdateDynamicFieldRequest extends FormRequest @@ -176,6 +178,14 @@ abstract class UpdateDynamicFieldRequest extends FormRequest $ruleKeyReserved => 'required|string|between:3,255', ]); break; + // Specific inputs. + case DynamicFieldTypes::position->value: + $rules = array_merge($rules, [ + $ruleKey => array_merge($this->compileValidate(DynamicFieldTypes::position->getValidation(), $input), [ + new Enum(ElementPositionEnum::class), + ]) + ]); + break; default: throw new \UnexpectedValueException("Unrecognized dynamic type: " . ($input['type'] ?? 'null')); break; diff --git a/lang/en/enums.php b/lang/en/enums.php index 98ef022e..ad3d207d 100644 --- a/lang/en/enums.php +++ b/lang/en/enums.php @@ -27,6 +27,7 @@ return [ 'date' => 'Date', 'color' => 'Color', 'model' => 'Model', + 'position' => 'Element position', ], 'contactFormType' => [ 'collaborator' => [ @@ -106,4 +107,10 @@ return [ 'unpublished' => 'Unpublished', 'published' => 'Published', ], + 'element-position' => [ + 'showleft' => 'Position the element on the left', + 'showright' => 'Position the element on the right', + 'showtop' => 'Position the element on the top', + 'showbottom' => 'Position the element on the bottom', + ], ]; diff --git a/lang/fr/enums.php b/lang/fr/enums.php index 9c2cde63..acd6bc21 100644 --- a/lang/fr/enums.php +++ b/lang/fr/enums.php @@ -27,6 +27,7 @@ return [ 'date' => 'Date', 'color' => 'Couleur', 'model' => 'Modèle', + 'position' => 'Positionnement de l\'élement', ], 'contactFormType' => [ 'collaborator' => [ @@ -108,4 +109,10 @@ return [ 'unpublished' => 'Non publié', 'published' => 'Publié', ], + 'element-position' => [ + 'showleft' => 'Positionner l\'élement à gauche', + 'showright' => 'Positionner l\'élement à droite', + 'showtop' => 'Positionner l\'élement en haut', + 'showbottom' => 'Positionner l\'élement en bas', + ], ]; diff --git a/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx b/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx index 3803e4d3..a8bfb2ab 100644 --- a/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx +++ b/resources/ts/back/Components/DynamicPages/DynamicInputs.tsx @@ -13,6 +13,7 @@ import SimpleDatePicker from "@/back/Components/Inputs/SimpleDatePicker"; import SimpleColorPicker from "@/back/Components/Inputs/SimpleColorPicker"; import SimpleYoutubeId from "@/back/Components/Inputs/SimpleYoutubeId"; import SimpleVimeoId from "@/back/Components/Inputs/SimpleVimeoId"; +import EnumSelect from "@/back/Components/Inputs/EnumSelect"; import ModelSelect from "@/back/Components/Inputs/ModelSelect"; import { ConfigField, @@ -357,6 +358,19 @@ export default function DynamicInputs({ setData={setData} /> ); + // Position select. + case enumDynamicFieldTypes.position.value: + return ( + + ); default: return (