Skip to content
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.

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

Added Tabler Modal. #28

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions config/tablar-kit.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
'dependent-select' => Takielias\TablarKit\Components\Forms\Inputs\DependentSelect::class,
'tom-select' => Takielias\TablarKit\Components\Forms\Inputs\TomSelect::class,
'email' => Takielias\TablarKit\Components\Forms\Inputs\Email::class,
'modal' => Takielias\TablarKit\Components\Modals\Modal::class,
'modal-form' => Takielias\TablarKit\Components\Modals\ModalForm::class,
'error' => Takielias\TablarKit\Components\Forms\Error::class,
'lite-picker' => Takielias\TablarKit\Components\Forms\Inputs\LitePicker::class,
'flat-picker' => Takielias\TablarKit\Components\Forms\Inputs\FlatPicker::class,
Expand Down
1 change: 1 addition & 0 deletions resources/js/plugins/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ import './filepond.js'
import './tabulator.js'
import './xlsx.js'
import './jspdf.js'
import './modal'
import './common.js'
102 changes: 102 additions & 0 deletions resources/js/plugins/modal.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
const TablarModal = {
init() {
this.bindModalTriggers();
this.bindFormSubmissions();
},

loadModal(url, containerId = 'modal-container') {
fetch(url)
.then(response => {
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
return response.text();
})
.then(html => {
document.getElementById(containerId).innerHTML = html;
// Initialize the new modal
const modalElement = document.querySelector('.modal');
const modal = new bootstrap.Modal(modalElement);
modal.show();

// Rebind form submissions for the new modal
this.bindFormSubmissions();
})
.catch(error => {
console.error('Error loading modal:', error);
// Optionally show error message to user
alert('Error loading modal content. Please try again.');
});
},

bindModalTriggers() {
// For buttons with data-modal-url
document.querySelectorAll('[data-modal-url]').forEach(button => {
button.addEventListener('click', (e) => {
e.preventDefault();
const url = button.dataset.modalUrl;
this.loadModal(url);
});
});

// For links with data-modal-trigger
document.querySelectorAll('[data-modal-trigger]').forEach(link => {
link.addEventListener('click', (e) => {
e.preventDefault();
const url = link.href;
this.loadModal(url);
});
});
},

bindFormSubmissions() {
document.querySelectorAll('.modal form').forEach(form => {
form.addEventListener('submit', async (e) => {
e.preventDefault();

try {
const response = await fetch(form.action, {
method: form.method,
body: new FormData(form),
headers: {
'X-Requested-With': 'XMLHttpRequest'
}
});

const data = await response.json();

if (data.success) {
// Close modal
const modal = bootstrap.Modal.getInstance(form.closest('.modal'));
modal.hide();

// Clear modal container
document.getElementById('modal-container').innerHTML = '';

// Optional: Show success message
if (data.message) {
alert(data.message);
}

// Optional: Refresh page or update specific content
if (data.reload) {
window.location.reload();
}
}
} catch (error) {
console.error('Error submitting form:', error);
}
});
});
}
};

// Initialize TablarModal when DOM is ready
document.addEventListener('DOMContentLoaded', () => {
TablarModal.init();
});

// Global function to open any modal
window.openModal = (url) => {
TablarModal.loadModal(url);
}
16 changes: 16 additions & 0 deletions resources/views/components/modals/form.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@props([
'id' => 'modal-form',
'action' => '',
'method' => 'POST'
])

<form action="{{ $action }}" method="{{ $method === 'GET' ? 'GET' : 'POST' }}">
@csrf
@if(!in_array($method, ['GET', 'POST']))
@method($method)
@endif

<x-modal :id="$id" {{ $attributes }}>
{{ $slot }}
</x-modal>
</form>
46 changes: 46 additions & 0 deletions resources/views/components/modals/modal.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
@props([
'id' => 'modal-default',
'size' => '', // sm, lg, full-width
'status' => '', // success, danger
'title' => '',
'scrollable' => false,
'centered' => true,
])

<div {{ $attributes->merge(['class' => 'modal modal-blur fade']) }}
id="{{ $id }}"
tabindex="-1"
role="dialog"
aria-hidden="true">
<div class="modal-dialog modal-dialog-{{ $centered ? 'centered' : '' }}
{{ $scrollable ? 'modal-dialog-scrollable' : '' }}
{{ $size ? 'modal-'.$size : '' }}"
role="document">
<div class="modal-content">
@if($status)
<div class="modal-status bg-{{ $status }}"></div>
@endif

@if($title || isset($header))
<div class="modal-header">
@if(isset($header))
{{ $header }}
@else
<h5 class="modal-title">{{ $title }}</h5>
@endif
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
@endif

<div class="modal-body" id="modal-container">
{{ $slot }}
</div>

@isset($footer)
<div class="modal-footer">
{{ $footer }}
</div>
@endisset
</div>
</div>
</div>
28 changes: 19 additions & 9 deletions src/Commands/InstallTablarKit.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function handle(): void
self::updateTablarJs();
self::scaffoldConfig();
$this->newLine();
$this->comment('Tablar kit is now installed 🚀');
$this->comment('Tablar kit has been installed successfully. 🚀');
$this->newLine();
$this->comment('Run "npm install" first. Once the installation is done, run "npm run dev"');
$this->newLine();
Expand Down Expand Up @@ -103,14 +103,24 @@ protected static function updateTablarJs(): void

// Array of lines to be added
$linesToAdd = [
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/filepond.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/jodit-editor.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/tom-select.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/flat-picker.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/lite-picker.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/tabulator.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/xlsx.js';\n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/jspdf.js';\n",
"\n// Tablar Kit components' JavaScript dependencies.\n",
"// Uncomment the required dependencies and run npm run build to include them. \n",
"\n // Filepond components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/filepond.js';\n",
"\n // Editor components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/jodit-editor.js';\n",
"\n // Select/DropDown components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/tom-select.js';\n",
"\n // Date & Time Picker components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/flat-picker.js';\n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/lite-picker.js';\n",
"\n // Table components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/tabulator.js';\n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/xlsx.js';\n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/jspdf.js';\n",
"\n // Modal components' JavaScript dependencies. \n",
"//import '../../vendor/takielias/tablar-kit/resources/js/plugins/modal.js';\n",
"\n // Common JavaScript dependencies. \n",
"import '../../vendor/takielias/tablar-kit/resources/js/plugins/common.js';\n",
];

Expand Down
13 changes: 13 additions & 0 deletions src/Components/Modals/Modal.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Takielias\TablarKit\Components\Modals;

use Illuminate\View\Component;

class Modal extends Component
{
public function render()
{
return view('tablar-kit::components.modals.modal');
}
}
26 changes: 26 additions & 0 deletions src/Components/Modals/ModalForm.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace Takielias\TablarKit\Components\Modals;

use Illuminate\View\Component;

class ModalForm extends Component
{
public $id;
public $action;
public $method;
public $title;

public function __construct($id = 'modal-form', $action = '', $method = 'POST', $title = '')
{
$this->id = $id;
$this->action = $action;
$this->method = $method;
$this->title = $title;
}

public function render()
{
return view('tablar-kit::components.modals.form');
}
}
35 changes: 35 additions & 0 deletions tests/Components/Modals/ModalTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

declare(strict_types=1);

namespace TakiElias\TablarKit\Tests\Components\Cards;


use TakiElias\TablarKit\Tests\ComponentTestCase;

class ModalTest extends ComponentTestCase
{

/** @test */
public function the_component_can_be_rendered()
{
$view = $this->blade('<x-modal status="success" title="Create User"/>'
);

$view->assertSee('class="modal modal-blur fade"', false)
->assertSee('class="modal-status bg-success"', false)
->assertSee('class="modal-content"', false);
}

/** @test */
public function can_render_danger()
{
$view = $this->blade('<x-modal status="danger" title="Create User"/>'
);

$view->assertSee('class="modal modal-blur fade"', false)
->assertSee('class="modal-status bg-danger"', false)
->assertSee('class="modal-content"', false);
}

}
Loading