developer/lk.zachem.info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: developer:787306e5701606776f754d603ebfb11a261d6a56
Branches Tags
developer:main
..
compare: developer:a0f83704c8f00adeaa89a90123df24fd7d34e309
Branches Tags
developer:main

No commits in common. "787306e5701606776f754d603ebfb11a261d6a56" and "a0f83704c8f00adeaa89a90123df24fd7d34e309" have entirely different histories.
787306e570 ... a0f83704c8

3 changed files with 3 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
app/Modules/Plan7/Views/livewire/selector.blade.php
View File

@ -13,7 +13,8 @@
</div> </div>
</div> </div>
@endif @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) @if($room)
Изменить Изменить
@else @else
@ -23,7 +24,6 @@
</div> </div>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" wire:ignore.self id="plan7_selector_modal" tabindex="-1" aria-labelledby="exampleModalLabel" <div class="modal fade" wire:ignore.self id="plan7_selector_modal" tabindex="-1" aria-labelledby="exampleModalLabel"
aria-hidden="true"> aria-hidden="true">

2
public/pull.php
View File

@ -25,7 +25,7 @@
if($json['total_commits'] > 0) 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");
$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>" ; echo "<p>$result</p>" ;
} }

3
resources/js/bootstrap.js vendored
View File

@ -1,8 +1,5 @@
import 'bootstrap'; import 'bootstrap';
import * as bootstrap from 'bootstrap';
window.bootstrap = bootstrap;
/** /**
* We'll load the axios HTTP library which allows us to easily issue requests * 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 * to our Laravel back-end. This library automatically handles sending the