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
nolanpro 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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

nolanpro
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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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