Skip to content

Migrate to spatie/laravel-html #7940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Migrate to spatie/laravel-html #7940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
780dd81
Swap dependency
laravel-shift Jan 25, 2025
a440441
Convert `Form` facade
laravel-shift Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"laravel/telescope": "^5.2",
"laravel/tinker": "^2.10",
"laravel/ui": "^4.6",

"lavary/laravel-menu": "^1.8",
"lcobucci/jwt": "^5.4",
"league/flysystem-aws-s3-v3": "^3.29",
Expand Down Expand Up @@ -58,7 +57,7 @@
"ralouphie/getallheaders": "^3.0",
"simplesoftwareio/simple-qrcode": "*",
"spatie/laravel-fractal": "^6.3",
"spatie/laravel-html": "*",
"spatie/laravel-html": "^3.11",
"spatie/laravel-medialibrary": "^11.11",
"spomky-labs/otphp": "^11.3",
"symfony/expression-language": "^7.2",
Expand Down
10 changes: 4 additions & 6 deletions resources/views/admin/auth-clients/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
<pm-modal ref="createEditAuthClient" id="createEditAuthClient" :title="title" @hidden="onClose" @ok.prevent="onSave" style="display: none;">
<required></required>
<div class="form-group" required>
{!!Form::label('name', __('Name'))!!}
{!!Form::text('name', null, ['class'=> 'form-control', 'v-model'=> 'authClient.name',
'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true'])!!}
{{ html()->label(__('Name'), 'name') }}
{{ html()->text('name')->class('form-control')->attribute('v-model', 'authClient.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
<small class="form-text text-muted">{{ __('Name must be unique') }}</small>
<div class="invalid-feedback" role="alert" v-if="errors.name">@{{ errors.name[0] }}</div>
</div>
Expand All @@ -31,9 +30,8 @@
<b-form-checkbox value="authorization_code_grant">{{__('Enable Authorization Code Grant')}}</b-form-checkbox>
<br />
<template v-if="authClient['types'].includes('authorization_code_grant')">
{!!Form::label('redirect', __('Redirect URL'))!!}
{!!Form::text('redirect', null, ['class'=> 'form-control', 'v-model'=> 'authClient.redirect',
'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.redirect}','rows'=>3])!!}
{{ html()->label(__('Redirect URL'), 'redirect') }}
{{ html()->text('redirect')->class('form-control')->attribute('v-model', 'authClient.redirect')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.redirect}')->attribute('rows', 3) }}
<div class="invalid-feedback" role="alert" v-if="errors.redirect">@{{ errors.redirect[0] }}</div>
</template>
</div>
Expand Down
49 changes: 14 additions & 35 deletions resources/views/admin/groups/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,49 +38,28 @@
aria-labelledby="nav-home-tab">
<required></required>
<div class="form-group">
{!! Form::label('name', __('Name') . '<small class="ml-1">*</small>', [], false) !!}
{!! Form::text('name', null, [
'id' => 'name',
'class'=> 'form-control',
'maxlength' => '255',
'v-model' => 'formData.name',
'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
{{ html()->label(__('Name') . '<small class="ml-1">*</small>', 'name') }}
{{ html()->text('name')->id('name')->class('form-control')->maxlength('255')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
<small class="form-text text-muted">{{__('Group name must be unique')}}</small>
<div class="invalid-feedback" role="alert" v-if="errors.name">@{{errors.name[0]}}</div>
</div>
<div class="form-group mt-3">
{!! Form::label('description', __('Description')) !!}
{!! Form::textarea('description', null, [
'id' => 'description',
'rows' => 4,
'class'=> 'form-control',
'v-model' => 'formData.description',
'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.description}']) !!}
{{ html()->label(__('Description'), 'description') }}
{{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.description}') }}
<div class="invalid-feedback" role="alert" v-if="errors.description">@{{errors.description[0]}}</div>
</div>
<div class="form-group mt-3">
{!! Form::label('status', __('Status')) !!}
{!! Form::select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')], null, [
'id' => 'status',
'class' => 'form-control',
'v-model' => 'formData.status',
'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.status}']) !!}
{{ html()->label(__('Status'), 'status') }}
{{ html()->select('status', ['ACTIVE' => __('Active'), 'INACTIVE' => __('Inactive')])->id('status')->class('form-control')->attribute('v-model', 'formData.status')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.status}') }}
<div class="invalid-feedback" role="alert" v-if="errors.status">@{{errors.status[0]}}</div>
</div>

@if ($settings['2fa_enabled'])
<div class="form-group mt-3">
<div class="custom-control custom-switch">
{!! Form::checkbox('enabled_2fa', 1, null, [
'id' => 'enabled_2fa',
'class' => 'custom-control-input',
'v-model' => 'formData.enabled_2fa',
]) !!}
{{ html()->checkbox('enabled_2fa', null, 1)->id('enabled_2fa')->class('custom-control-input')->attribute('v-model', 'formData.enabled_2fa') }}

{!! Form::label('enabled_2fa', __('Two Factor Authentication'), [
'class' => 'custom-control-label',
'for' => 'enabled_2fa',
]) !!}
{{ html()->label(__('Two Factor Authentication'), 'enabled_2fa')->class('custom-control-label')->for('enabled_2fa') }}
</div>
</div>
@endif
Expand All @@ -92,8 +71,8 @@
@endisset
<br>
<div class="d-flex justify-content-end mt-3">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
{!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'onUpdate', 'id'=>'saveGroup']) !!}
{{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
{{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'onUpdate')->id('saveGroup') }}
</div>
</div>
<div class="card card-body border-top-0 tab-pane p-3" id="nav-users" role="tabpanel" aria-labelledby="nav-profile-tab">
Expand Down Expand Up @@ -150,8 +129,8 @@
</div>
@include('admin.shared.permissions')
<div class="d-flex justify-content-end mt-3">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose'])!!}
{!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'permissionUpdate','id'=>'savePermissions'])!!}
{{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
{{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'permissionUpdate')->id('savePermissions') }}
</div>
</div>
</div>
Expand All @@ -161,7 +140,7 @@
<pm-modal ref="addUser" id="addUser" title="{{__('Add Users')}}" @hidden="onCloseAddUser" @ok.prevent="onSave" style="display: none;">
<div class="form-user">
<required></required>
{!!Form::label('users', __('Users') . '<small class="ml-1">*</small>', [], false)!!}
{{ html()->label(__('Users') . '<small class="ml-1">*</small>', 'users') }}
<multiselect id="users"
v-model="selectedUsers"
placeholder="{{__('Select user or type here to search users')}}"
Expand Down Expand Up @@ -206,7 +185,7 @@ class="multiselect__tag-icon"></i>
<pm-modal ref="addGroup" id="addGroup" title="{{__('Add Groups')}}" @hidden="onCloseAddGroup" @ok.prevent="onSaveGroups" style="display: none;">
<div class="form-user">
<required></required>
{!!Form::label('groups', __('Groups') . '<small class="ml-1">*</small>', [], false)!!}
{{ html()->label(__('Groups') . '<small class="ml-1">*</small>', 'groups') }}
<multiselect id="groups"
v-model="selectedGroups"
placeholder="{{__('Select group or type here to search groups')}}"
Expand Down
12 changes: 5 additions & 7 deletions resources/views/admin/groups/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,16 @@
<pm-modal ref="createGroupModal" id="createGroupModal" title="{{__('Create Group')}}" @hidden="onClose" @ok.prevent="onSubmit" :ok-disabled="disabled" style="display: none;">
<required></required>
<div class="form-group">
{!! Form::label('name', __('Name')) !!}<small class="ml-1">*</small>
{!! Form::text('name', null, ['id' => 'name','class'=> 'form-control', 'v-model' =>
'formData.name', 'v-bind:class' => '{\'form-control\':true, \'is-invalid\':errors.name}', 'required', 'aria-required' => 'true']) !!}
{{ html()->label(__('Name'), 'name') }}<small class="ml-1">*</small>
{{ html()->text('name')->id('name')->class('form-control')->attribute('v-model', 'formData.name')->attribute('v-bind:class', '{\'form-control\':true, \'is-invalid\':errors.name}')->required()->attribute('aria-required', 'true') }}
<small id="emailHelp"
class="form-text text-muted">{{__('Group name must be unique')}}</small>
<div class="invalid-feedback" role="alert" v-for="name in errors.name">@{{name}}</div>
</div>
<div class="form-group">
{!! Form::label('description', __('Description')) !!}
{!! Form::textarea('description', null, ['id' => 'description', 'rows' => 4, 'class'=>
'form-control', 'v-model' => 'formData.description', 'v-bind:class' => '{\'form-control\':true,
\'is-invalid\':errors.description}']) !!}
{{ html()->label(__('Description'), 'description') }}
{{ html()->textarea('description')->id('description')->rows(4)->class('form-control')->attribute('v-model', 'formData.description')->attribute('v-bind:class', '{\'form-control\':true,
\'is-invalid\':errors.description}') }}
<div class="invalid-feedback" role="alert" v-for="description in errors.description">@{{description}}
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/admin/users/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
</div>
</div>
<div class="d-flex justify-content-end mt-3">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
{!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'profileUpdate','id'=>'saveUser']) !!}
{{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
{{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'profileUpdate')->id('saveUser') }}
</div>
</div>
<div class="tab-pane show" id="nav-groups" role="tabpanel"
Expand All @@ -71,8 +71,8 @@
/>
</div>
<div class="d-flex justify-content-end mt-3">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose']) !!}
{!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'onSaveGroups','id'=>'saveGroups']) !!}
{{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
{{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'onSaveGroups')->id('saveGroups') }}
</div>
</div>
<div class="tab-pane" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
Expand All @@ -87,8 +87,8 @@
</div>
@include('admin.shared.permissions')
<div class="d-flex justify-content-end mt-3">
{!! Form::button(__('Cancel'), ['class'=>'btn btn-outline-secondary', '@click' => 'onClose'])!!}
{!! Form::button(__('Save'), ['class'=>'btn btn-secondary ml-3', '@click' => 'permissionUpdate','id'=>'savePermissions'])!!}
{{ html()->button(__('Cancel'), 'button')->class('btn btn-outline-secondary')->attribute('@click', 'onClose') }}
{{ html()->button(__('Save'), 'button')->class('btn btn-secondary ml-3')->attribute('@click', 'permissionUpdate')->id('savePermissions') }}
</div>
</div>
</div>
Expand Down
Loading
Loading