Compare commits
No commits in common. "787306e5701606776f754d603ebfb11a261d6a56" and "a0f83704c8f00adeaa89a90123df24fd7d34e309" have entirely different histories.
787306e570
...
a0f83704c8
@ -13,7 +13,8 @@
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<button type="button" wire:click="start()" class="btn btn-primary" onclick="plan7SelectorModal = new bootstrap.Modal(document.getElementById('plan7_selector_modal'), {});plan7SelectorModal.show()">
|
||||
<button type="button" wire:click="start()" class="btn btn-primary" data-bs-toggle="modal"
|
||||
data-bs-target="#plan7_selector_modal">
|
||||
@if($room)
|
||||
Изменить
|
||||
@else
|
||||
@ -22,7 +23,6 @@
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- Modal -->
|
||||
<div class="modal fade" wire:ignore.self id="plan7_selector_modal" tabindex="-1" aria-labelledby="exampleModalLabel"
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
if($json['total_commits'] > 0)
|
||||
{
|
||||
//$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && npm run build");
|
||||
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && npm run build && php artisan optimize:clear");
|
||||
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && php artisan optimize:clear");
|
||||
echo "<p>$result</p>" ;
|
||||
}
|
||||
|
||||
|
||||
3
resources/js/bootstrap.js
vendored
3
resources/js/bootstrap.js
vendored
@ -1,8 +1,5 @@
|
||||
import 'bootstrap';
|
||||
|
||||
import * as bootstrap from 'bootstrap';
|
||||
window.bootstrap = bootstrap;
|
||||
|
||||
/**
|
||||
* We'll load the axios HTTP library which allows us to easily issue requests
|
||||
* to our Laravel back-end. This library automatically handles sending the
|
||||
|
||||
Loading…
Reference in New Issue
Block a user