Commit 930e8709 authored by Sarun Mungthanya's avatar Sarun Mungthanya
Browse files

add , reload , delete patch

parent 5bad2db9
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class RoleController extends Controller
{
public function index() {
// dd("sad");
}
}
<?php
namespace App\Http\Controllers;
use App\Models\ConfServerLicense;
use Illuminate\Http\Request;
class ServerLicenseController extends Controller
{
public function getAllServerKey()
{
$serverLicenses = ConfServerLicense::select('ID', 'SNKEY')->get();
$formattedserverLicenses = [];
foreach ($serverLicenses as $license) {
$formattedserverLicenses[] = [
'id' => $license->ID,
'name' => $license->SNKEY,
];
}
return response()->json(['serverLicenses' => $formattedserverLicenses]);
}
}
<?php
namespace App\Http\Livewire;
use Livewire\Component;
class MainContainer extends Component
{
public $currentContent = 'SendPatch';
public $loading = false;
protected $listeners = ['menuChanged' => 'loadContent'];
public function loadContent($menu)
{
$this->loading = true;
// Simulate loading delay
sleep(1);
$this->currentContent = $menu;
$this->loading = false;
}
public function render()
{
return view('livewire.main-container');
}
}
<?php
namespace App\Http\Livewire;
use Livewire\Component;
class Navbar extends Component
{
public $currentMenu = 'home';
public function loadContent($menu)
{
$this->currentMenu = $menu;
$this->emit('menuChanged', $menu);
}
public function render()
{
return view('livewire.navbar');
}
}
<?php
namespace App\Http\Livewire\Pages\Role;
use Livewire\Component;
class RoleIndex extends Component
{
public function render()
{
return view('livewire.pages.role.role-index');
}
}
<?php <?php
namespace App\Http\Livewire\Pages; namespace App\Http\Livewire\Pages\SendPatch;
use App\Models\ConfServerPendding; use App\Models\ConfServerPendding;
use Livewire\Component; use Livewire\Component;
use Livewire\WithPagination; use Livewire\WithPagination;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Models\ConfSmartUpdate; use App\Models\ConfSmartUpdate;
use Illuminate\Support\Facades\Cache;
class SendPatch extends Component class SendPatch extends Component
{ {
use WithPagination; use WithPagination;
public $searchBy, $message, $keyword, $perPage, $searchSelected ,$action = 'list' ; // protected $paginationTheme = 'bootstrap';
public $searchBy, $editPid, $message, $keyword, $perPage = 10, $searchSelected = 'PID',
// $action = 'list';
$action = 'edit'; // test
protected $listeners = ['showGroupList', 'deleteItem', 'deleteSelected']; protected $listeners = ['showGroupList', 'deleteItem', 'deleteSelected'];
...@@ -19,7 +23,7 @@ class SendPatch extends Component ...@@ -19,7 +23,7 @@ class SendPatch extends Component
{ {
$this->searchBy = [ $this->searchBy = [
'PID' => 'PID', 'PID' => 'PID',
'PATCH NAME' => 'Patch Name', 'PATCHNAME' => 'Patch Name',
'PDESC' => 'Description', 'PDESC' => 'Description',
'MAJOR_VERSION' => 'Major Vaersion', 'MAJOR_VERSION' => 'Major Vaersion',
'Remark' => 'Remark' 'Remark' => 'Remark'
...@@ -27,6 +31,7 @@ class SendPatch extends Component ...@@ -27,6 +31,7 @@ class SendPatch extends Component
]; ];
$this->message = session('message'); $this->message = session('message');
} }
public function render() public function render()
{ {
$numServerSubquery = DB::table('conf_server_pendding as p2') $numServerSubquery = DB::table('conf_server_pendding as p2')
...@@ -35,7 +40,7 @@ class SendPatch extends Component ...@@ -35,7 +40,7 @@ class SendPatch extends Component
// Query หลัก // Query หลัก
$query = ConfSmartUpdate::from('conf_smartupdate as p1') $query = ConfSmartUpdate::from('conf_smartupdate as p1')
->select('p1.PID', 'p1.PATCHNAME', 'p1.PDESC', 'p1.PDATE', 'p1.PLEVEL','p1.Remark', 'p3.NUMSERVER') ->select('p1.PID', 'p1.PATCHNAME', 'p1.PDESC', 'p1.PDATE', 'p1.PLEVEL', 'p1.Remark', 'p3.NUMSERVER')
->leftJoinSub($numServerSubquery, 'p3', function ($join) { ->leftJoinSub($numServerSubquery, 'p3', function ($join) {
$join->on('p1.PID', '=', 'p3.PatchID'); $join->on('p1.PID', '=', 'p3.PatchID');
}); });
...@@ -46,8 +51,16 @@ class SendPatch extends Component ...@@ -46,8 +51,16 @@ class SendPatch extends Component
$query->orderBy('p1.PID', 'DESC'); $query->orderBy('p1.PID', 'DESC');
$results = $query->paginate($this->perPage); $results = $query->paginate($this->perPage);
return view('livewire.pages.send-patch' , compact('results')); return view('livewire.pages.sendpatch.send-patch', compact('results'));
} }
public function search()
{
$this->resetPage();
}
public function showpatchEditForm($pid)
{
$this->editPid = $pid;
$this->action = 'edit';
}
} }
<?php
namespace App\Http\Livewire\Pages\SendPatch;
use App\Models\ConfServerLicense;
use App\Models\ConfServerOwnertype;
use App\Models\ConfServerPendding;
use App\Models\ConfSmartupdate;
use App\Models\LogSendPath2customer;
use Livewire\Component;
class SendPatchEdit extends Component
{
public $PID, $test;
public $perPage = 10;
public $search = '';
public $server_lists;
public $selectedOwnerType = '';
public $message;
public $searchSelected = 'SNKEY';
public $keyword = '';
public $selectedPenddings = [];
protected $listeners = ['deletePatch' ,'refreshComponent' => '$refresh'];
public function mount($editPid)
{
// $this->PID = $editPid;
$this->PID = 15670;
$this->updateServerLists();
}
public function updatedSelectedOwnerType()
{
$this->updateServerLists();
}
public function updatedSearch()
{
$this->updateServerLists();
}
private function updateServerLists()
{
// $query = ConfServerLicense::query();
// if ($this->selectedOwnerType) {
// $query->where('OWNERTYPE', $this->selectedOwnerType);
// }
// if ($this->search) {
// $query->where('SNKEY', 'like', '%' . $this->search . '%');
// }
// $this->server_lists = $query->limit(20)->get(['ID as id', 'SNKEY as name'])->toArray();
// // dd( $this->server_lists);
}
public function render()
{
$ownerType = ConfServerOwnertype::all();
$results = $this->searchSelected && $this->keyword
? ConfServerPendding::join('conf_server_license as p2', 'conf_server_pendding.ServerID', '=', 'p2.ID')
->where('PatchID', $this->PID)
->where($this->searchSelected, 'LIKE', '%' . $this->keyword . '%')
->paginate($this->perPage)
: ConfServerPendding::join('conf_server_license as p2', 'conf_server_pendding.ServerID', '=', 'p2.ID')
->where('PatchID', $this->PID)
->paginate($this->perPage);
return view('livewire.pages.sendpatch.send-patch-edit', compact('ownerType', 'results'));
}
public function sendPatch()
{
if (!is_array($this->server_lists)) {
$arr_server_lists = explode(",", $this->server_lists);
} else {
$arr_server_lists = $this->server_lists;
}
if (isset($arr_server_lists)) {
foreach ($arr_server_lists as $serverId) {
$serverPedding = new ConfServerPendding;
$serverPedding->ServerID = $serverId;
$serverPedding->PatchID = $this->PID;
$serverPedding->TaskDate = date("Y-m-d H:i:s");
$serverPedding->TaskType = "";
$serverPedding->TaskStatus = "0";
$serverPedding->TaskRunner = auth()->user()->USERNAME;
$serverPedding->save();
static::logSendPatch($this->PID, $serverId, "Add Patch");
$this->server_lists = [];
}
}
}
public function resendPatch($serverId)
{
$pendding = ConfServerPendding::where('ServerID', $serverId)->where('PatchID', $this->PID)->update([
"TaskStatus" => "0",
"TaskFinish" => '0000_00_00 00:00:00'
]);
// $pendding->TaskStatus = "0";
// $pendding->TaskFinish = '0000_00_00 00:00:00';
// $pendding->save();
static::logSendPatch($this->PID, $serverId, "Reload Patch");
}
public function deletePatch($serverId)
{
// if (!\Auth::user()->hasPermissions(['delete-pendding'])) {
// $this->showNoPermissionModal = TRUE;
// return;
// }
$pendding = ConfServerPendding::where("ServerID", $serverId)->where("PatchID", $this->PID,)->delete();
static::logSendPatch($this->PID, $serverId, "Delete Patch");
}
public function deleteSelected($selectedPenddings)
{
// if (!\Auth::user()->hasPermissions(['delete-user'])) {
// $this->showNoPermissionModal = TRUE;
// return;
// }
ConfServerPendding::destroy($selectedPenddings);
$message = "Deleted ID : " . json_encode($selectedPenddings) . " Successfully";
$this->message = $message;
$this->selectedPenddings = [];
}
public static function logSendPatch($patchId, $serverId, $logDesc)
{
$log = new LogSendPath2customer;
$log->UID = auth()->user()->UID;
$log->PATCHID = $patchId;
$log->SERVERKEYID = $serverId;
$log->ACTDATETIME = date("Y-m-d H:i:s");
$log->LOGDESC = $logDesc;
$log->IPACTIVE = request()->ip();
$log->save();
}
}
<?php
namespace App\Http\Livewire\Pages\User;
use Livewire\Component;
class UserIndex extends Component
{
public function render()
{
return view('livewire.pages.user.user-index');
}
}
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerPendding extends Model class ConfServerPendding extends Model
{ {
protected $table = 'conf_server_pendding'; protected $table = 'conf_server_pendding';
public $timestamps = false;
protected $fillable = [ protected $fillable = [
'ServerID', 'ServerID',
'PatchID', 'PatchID',
......
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class LogSendPath2customer extends Model class LogSendPath2customer extends Model
{ {
protected $table = 'log_send_path2customer'; protected $table = 'log_send_path2customer';
public $timestamps = false;
protected $fillable = [ protected $fillable = [
'LOGID', 'LOGID',
'UID', 'UID',
......
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class TabRole extends Model class TabRole extends Model
{ {
protected $table = 'tab_role'; protected $table = 'tab_role';
protected $fillable = [ protected $fillable = [
'ROLEID', 'ROLEID',
'ROLENAME', 'ROLENAME',
...@@ -18,4 +19,103 @@ class TabRole extends Model ...@@ -18,4 +19,103 @@ class TabRole extends Model
'OnAssign', 'OnAssign',
'OnDeassign', 'OnDeassign',
]; ];
// Accessors and Mutators for ROLEID
// public function getRoleIdAttribute()
// {
// return $this->attributes['ROLEID'];
// }
// public function setRoleIdAttribute($value)
// {
// $this->attributes['ROLEID'] = $value;
// }
// // Accessors and Mutators for ROLENAME
// public function getRoleNameAttribute()
// {
// return $this->attributes['ROLENAME'];
// }
// public function setRoleNameAttribute($value)
// {
// $this->attributes['ROLENAME'] = $value;
// }
// // Accessors and Mutators for DEPEND_ON_ROLE
// public function getDependOnRoleAttribute()
// {
// return $this->attributes['DEPEND_ON_ROLE'];
// }
// public function setDependOnRoleAttribute($value)
// {
// $this->attributes['DEPEND_ON_ROLE'] = $value;
// }
// // Accessors and Mutators for ROLE_DESCRIPTION
// public function getRoleDescriptionAttribute()
// {
// return $this->attributes['ROLE_DESCRIPTION'];
// }
// public function setRoleDescriptionAttribute($value)
// {
// $this->attributes['ROLE_DESCRIPTION'] = $value;
// }
// // Accessors and Mutators for REQUIRED_SERVICE
// public function getRequiredServiceAttribute()
// {
// return $this->attributes['REQUIRED_SERVICE'];
// }
// public function setRequiredServiceAttribute($value)
// {
// $this->attributes['REQUIRED_SERVICE'] = $value;
// }
// // Accessors and Mutators for OnConfigure
// public function getOnConfigureAttribute()
// {
// return $this->attributes['OnConfigure'];
// }
// public function setOnConfigureAttribute($value)
// {
// $this->attributes['OnConfigure'] = $value;
// }
// // Accessors and Mutators for OnSaveConfig
// public function getOnSaveConfigAttribute()
// {
// return $this->attributes['OnSaveConfig'];
// }
// public function setOnSaveConfigAttribute($value)
// {
// $this->attributes['OnSaveConfig'] = $value;
// }
// // Accessors and Mutators for OnAssign
// public function getOnAssignAttribute()
// {
// return $this->attributes['OnAssign'];
// }
// public function setOnAssignAttribute($value)
// {
// $this->attributes['OnAssign'] = $value;
// }
// // Accessors and Mutators for OnDeassign
// public function getOnDeassignAttribute()
// {
// return $this->attributes['OnDeassign'];
// }
// public function setOnDeassignAttribute($value)
// {
// $this->attributes['OnDeassign'] = $value;
// }
} }
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
class TabUser extends Authenticatable class TabUser extends Authenticatable
{ {
protected $table = 'tab_user'; protected $table = 'tab_user';
...@@ -13,8 +13,6 @@ class TabUser extends Authenticatable ...@@ -13,8 +13,6 @@ class TabUser extends Authenticatable
'PASSWORD', 'PASSWORD',
]; ];
protected $fillable = [ protected $fillable = [
'UID', 'UID',
'UCODE', 'UCODE',
...@@ -38,4 +36,230 @@ class TabUser extends Authenticatable ...@@ -38,4 +36,230 @@ class TabUser extends Authenticatable
'PAYMENT_ORG', 'PAYMENT_ORG',
'BUCODE', 'BUCODE',
]; ];
// Accessors and Mutators for UID
// public function getUidAttribute()
// {
// return $this->attributes['UID'];
// }
// public function setUidAttribute($value)
// {
// $this->attributes['UID'] = $value;
// }
// // Accessors and Mutators for UCODE
// public function getUcodeAttribute()
// {
// return $this->attributes['UCODE'];
// }
// public function setUcodeAttribute($value)
// {
// $this->attributes['UCODE'] = $value;
// }
// // Accessors and Mutators for USERNAME
// public function getUsernameAttribute()
// {
// return $this->attributes['USERNAME'];
// }
// public function setUsernameAttribute($value)
// {
// $this->attributes['USERNAME'] = $value;
// }
// // Accessors and Mutators for PASSWORD
// public function setPasswordAttribute($value)
// {
// $this->attributes['PASSWORD'] = bcrypt($value);
// }
// // Accessors and Mutators for CPID
// public function getCpidAttribute()
// {
// return $this->attributes['CPID'];
// }
// public function setCpidAttribute($value)
// {
// $this->attributes['CPID'] = $value;
// }
// // Accessors and Mutators for GID
// public function getGidAttribute()
// {
// return $this->attributes['GID'];
// }
// public function setGidAttribute($value)
// {
// $this->attributes['GID'] = $value;
// }
// // Accessors and Mutators for FIRSTNAME
// public function getFirstNameAttribute()
// {
// return $this->attributes['FIRSTNAME'];
// }
// public function setFirstNameAttribute($value)
// {
// $this->attributes['FIRSTNAME'] = ucfirst(strtolower($value));
// }
// // Accessors and Mutators for LASTNAME
// public function getLastNameAttribute()
// {
// return $this->attributes['LASTNAME'];
// }
// public function setLastNameAttribute($value)
// {
// $this->attributes['LASTNAME'] = ucfirst(strtolower($value));
// }
// // Accessors and Mutators for EMAIL
// public function getEmailAttribute()
// {
// return $this->attributes['EMAIL'];
// }
// public function setEmailAttribute($value)
// {
// $this->attributes['EMAIL'] = strtolower($value);
// }
// // Accessors and Mutators for PHONE
// public function getPhoneAttribute()
// {
// return $this->attributes['PHONE'];
// }
// public function setPhoneAttribute($value)
// {
// $this->attributes['PHONE'] = $value;
// }
// // Accessors and Mutators for APPROVED
// public function getApprovedAttribute()
// {
// return $this->attributes['APPROVED'];
// }
// public function setApprovedAttribute($value)
// {
// $this->attributes['APPROVED'] = $value;
// }
// // Accessors and Mutators for APPROVEDATE
// public function getApproveDateAttribute()
// {
// return $this->attributes['APPROVEDATE'];
// }
// public function setApproveDateAttribute($value)
// {
// $this->attributes['APPROVEDATE'] = $value;
// }
// // Accessors and Mutators for STATUSLOGIN
// public function getStatusLoginAttribute()
// {
// return $this->attributes['STATUSLOGIN'];
// }
// public function setStatusLoginAttribute($value)
// {
// $this->attributes['STATUSLOGIN'] = $value;
// }
// // Accessors and Mutators for LASTLOGIN
// public function getLastLoginAttribute()
// {
// return $this->attributes['LASTLOGIN'];
// }
// public function setLastLoginAttribute($value)
// {
// $this->attributes['LASTLOGIN'] = $value;
// }
// // Accessors and Mutators for ACTIVITY
// public function getActivityAttribute()
// {
// return $this->attributes['ACTIVITY'];
// }
// public function setActivityAttribute($value)
// {
// $this->attributes['ACTIVITY'] = $value;
// }
// // Accessors and Mutators for ACTIVITY_TIME
// public function getActivityTimeAttribute()
// {
// return $this->attributes['ACTIVITY_TIME'];
// }
// public function setActivityTimeAttribute($value)
// {
// $this->attributes['ACTIVITY_TIME'] = $value;
// }
// // Accessors and Mutators for UCID
// public function getUcidAttribute()
// {
// return $this->attributes['UCID'];
// }
// public function setUcidAttribute($value)
// {
// $this->attributes['UCID'] = $value;
// }
// // Accessors and Mutators for PAYMENT_USER
// public function getPaymentUserAttribute()
// {
// return $this->attributes['PAYMENT_USER'];
// }
// public function setPaymentUserAttribute($value)
// {
// $this->attributes['PAYMENT_USER'] = $value;
// }
// // Accessors and Mutators for PAYMENT_PASS
// public function getPaymentPassAttribute()
// {
// return $this->attributes['PAYMENT_PASS'];
// }
// public function setPaymentPassAttribute($value)
// {
// $this->attributes['PAYMENT_PASS'] = $value;
// }
// // Accessors and Mutators for PAYMENT_ORG
// public function getPaymentOrgAttribute()
// {
// return $this->attributes['PAYMENT_ORG'];
// }
// public function setPaymentOrgAttribute($value)
// {
// $this->attributes['PAYMENT_ORG'] = $value;
// }
// // Accessors and Mutators for BUCODE
// public function getBuCodeAttribute()
// {
// return $this->attributes['BUCODE'];
// }
// public function setBuCodeAttribute($value)
// {
// $this->attributes['BUCODE'] = $value;
// }
} }
<?php return array (
'delete-modal' => 'App\\Http\\Livewire\\DeleteModal',
'main-container' => 'App\\Http\\Livewire\\MainContainer',
'navbar' => 'App\\Http\\Livewire\\Navbar',
'pages.role.role-index' => 'App\\Http\\Livewire\\Pages\\Role\\RoleIndex',
'pages.send-patch.send-patch' => 'App\\Http\\Livewire\\Pages\\SendPatch\\SendPatch',
'pages.send-patch.send-patch-edit' => 'App\\Http\\Livewire\\Pages\\SendPatch\\SendPatchEdit',
'pages.user.user-index' => 'App\\Http\\Livewire\\Pages\\User\\UserIndex',
);
\ No newline at end of file
...@@ -42,6 +42,17 @@ ...@@ -42,6 +42,17 @@
'Livewire' => 'Livewire\\Livewire', 'Livewire' => 'Livewire\\Livewire',
), ),
), ),
'maatwebsite/excel' =>
array (
'providers' =>
array (
0 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
),
'aliases' =>
array (
'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel',
),
),
'nesbot/carbon' => 'nesbot/carbon' =>
array ( array (
'providers' => 'providers' =>
......
...@@ -28,15 +28,16 @@ ...@@ -28,15 +28,16 @@
24 => 'Laravel\\Sanctum\\SanctumServiceProvider', 24 => 'Laravel\\Sanctum\\SanctumServiceProvider',
25 => 'Laravel\\Tinker\\TinkerServiceProvider', 25 => 'Laravel\\Tinker\\TinkerServiceProvider',
26 => 'Livewire\\LivewireServiceProvider', 26 => 'Livewire\\LivewireServiceProvider',
27 => 'Carbon\\Laravel\\ServiceProvider', 27 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
28 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', 28 => 'Carbon\\Laravel\\ServiceProvider',
29 => 'Termwind\\Laravel\\TermwindServiceProvider', 29 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
30 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', 30 => 'Termwind\\Laravel\\TermwindServiceProvider',
31 => 'App\\Providers\\AppServiceProvider', 31 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
32 => 'App\\Providers\\AuthServiceProvider', 32 => 'App\\Providers\\AppServiceProvider',
33 => 'App\\Providers\\EventServiceProvider', 33 => 'App\\Providers\\AuthServiceProvider',
34 => 'App\\Providers\\RouteServiceProvider', 34 => 'App\\Providers\\EventServiceProvider',
35 => 'App\\Providers\\ViewServiceProvider', 35 => 'App\\Providers\\RouteServiceProvider',
36 => 'App\\Providers\\ViewServiceProvider',
), ),
'eager' => 'eager' =>
array ( array (
...@@ -53,15 +54,16 @@ ...@@ -53,15 +54,16 @@
10 => 'Barryvdh\\Debugbar\\ServiceProvider', 10 => 'Barryvdh\\Debugbar\\ServiceProvider',
11 => 'Laravel\\Sanctum\\SanctumServiceProvider', 11 => 'Laravel\\Sanctum\\SanctumServiceProvider',
12 => 'Livewire\\LivewireServiceProvider', 12 => 'Livewire\\LivewireServiceProvider',
13 => 'Carbon\\Laravel\\ServiceProvider', 13 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
14 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', 14 => 'Carbon\\Laravel\\ServiceProvider',
15 => 'Termwind\\Laravel\\TermwindServiceProvider', 15 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
16 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', 16 => 'Termwind\\Laravel\\TermwindServiceProvider',
17 => 'App\\Providers\\AppServiceProvider', 17 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
18 => 'App\\Providers\\AuthServiceProvider', 18 => 'App\\Providers\\AppServiceProvider',
19 => 'App\\Providers\\EventServiceProvider', 19 => 'App\\Providers\\AuthServiceProvider',
20 => 'App\\Providers\\RouteServiceProvider', 20 => 'App\\Providers\\EventServiceProvider',
21 => 'App\\Providers\\ViewServiceProvider', 21 => 'App\\Providers\\RouteServiceProvider',
22 => 'App\\Providers\\ViewServiceProvider',
), ),
'deferred' => 'deferred' =>
array ( array (
...@@ -85,7 +87,6 @@ ...@@ -85,7 +87,6 @@
'Illuminate\\Auth\\Console\\ClearResetsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Auth\\Console\\ClearResetsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ConfigClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ConfigClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ConfigShowCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Database\\Console\\DbCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Database\\Console\\DbCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Database\\Console\\MonitorCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Database\\Console\\MonitorCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Database\\Console\\PruneCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Database\\Console\\PruneCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
...@@ -103,7 +104,6 @@ ...@@ -103,7 +104,6 @@
'Illuminate\\Foundation\\Console\\OptimizeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\OptimizeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Cache\\Console\\PruneStaleTagsCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Queue\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Queue\\Console\\ClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Queue\\Console\\ListFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Queue\\Console\\ListFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Queue\\Console\\FlushFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Queue\\Console\\FlushFailedCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
...@@ -127,15 +127,13 @@ ...@@ -127,15 +127,13 @@
'Illuminate\\Console\\Scheduling\\ScheduleClearCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Console\\Scheduling\\ScheduleClearCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Console\\Scheduling\\ScheduleTestCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Console\\Scheduling\\ScheduleTestCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Console\\Scheduling\\ScheduleWorkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Console\\Scheduling\\ScheduleWorkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Console\\Scheduling\\ScheduleInterruptCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ShowModelCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Database\\Console\\ShowModelCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\StorageLinkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\StorageLinkCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\UpCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\UpCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ViewCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ViewCacheCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ViewClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ViewClearCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Cache\\Console\\CacheTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Cache\\Console\\CacheTableCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\CastMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\CastMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ChannelListCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ComponentMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ComponentMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ConsoleMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ConsoleMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
...@@ -146,7 +144,6 @@ ...@@ -146,7 +144,6 @@
'Illuminate\\Foundation\\Console\\ExceptionMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ExceptionMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Database\\Console\\Factories\\FactoryMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Database\\Console\\Factories\\FactoryMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\JobMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\JobMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\LangPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\ListenerMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\MailMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\MailMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Routing\\Console\\MiddlewareMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Routing\\Console\\MiddlewareMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
...@@ -169,7 +166,6 @@ ...@@ -169,7 +166,6 @@
'Illuminate\\Foundation\\Console\\StubPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\StubPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\TestMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\TestMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\VendorPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'Illuminate\\Foundation\\Console\\VendorPublishCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'Illuminate\\Foundation\\Console\\ViewMakeCommand' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider', 'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
...@@ -188,7 +184,6 @@ ...@@ -188,7 +184,6 @@
'mailer' => 'Illuminate\\Mail\\MailServiceProvider', 'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider', 'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider', 'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
'pipeline' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
'queue' => 'Illuminate\\Queue\\QueueServiceProvider', 'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider', 'queue.connection' => 'Illuminate\\Queue\\QueueServiceProvider',
'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider', 'queue.failer' => 'Illuminate\\Queue\\QueueServiceProvider',
...@@ -202,7 +197,6 @@ ...@@ -202,7 +197,6 @@
'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider', 'translation.loader' => 'Illuminate\\Translation\\TranslationServiceProvider',
'validator' => 'Illuminate\\Validation\\ValidationServiceProvider', 'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider', 'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
'Illuminate\\Contracts\\Validation\\UncompromisedVerifier' => 'Illuminate\\Validation\\ValidationServiceProvider',
'Laravel\\Sail\\Console\\InstallCommand' => 'Laravel\\Sail\\SailServiceProvider', 'Laravel\\Sail\\Console\\InstallCommand' => 'Laravel\\Sail\\SailServiceProvider',
'Laravel\\Sail\\Console\\PublishCommand' => 'Laravel\\Sail\\SailServiceProvider', 'Laravel\\Sail\\Console\\PublishCommand' => 'Laravel\\Sail\\SailServiceProvider',
'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider', 'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
......
...@@ -2,28 +2,25 @@ ...@@ -2,28 +2,25 @@
"name": "laravel/laravel", "name": "laravel/laravel",
"type": "project", "type": "project",
"description": "The Laravel Framework.", "description": "The Laravel Framework.",
"keywords": [ "keywords": ["framework", "laravel"],
"framework",
"laravel"
],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.1", "php": "^8.2",
"doctrine/dbal": "^4.0",
"guzzlehttp/guzzle": "^7.2", "guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^10.0", "laravel/framework": "^9.5",
"laravel/sanctum": "^3.0", "laravel/sanctum": "^3.0",
"laravel/tinker": "^2.7", "laravel/tinker": "^2.7",
"livewire/livewire": "^3.0" "livewire/livewire": "^2.12",
"maatwebsite/excel": "^3.1"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.13", "barryvdh/laravel-debugbar": "^3.13",
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.21", "laravel/sail": "^1.21",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0", "nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^10.0", "phpunit/phpunit": "^9.5.10",
"spatie/laravel-ignition": "^2.0" "spatie/laravel-ignition": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
...@@ -40,7 +37,8 @@ ...@@ -40,7 +37,8 @@
"scripts": { "scripts": {
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi" "@php artisan package:discover --ansi",
"@php artisan vendor:publish --force --tag=livewire:assets --ansi"
], ],
"post-update-cmd": [ "post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force" "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
......
...@@ -39,7 +39,7 @@ return [ ...@@ -39,7 +39,7 @@ return [
| |
*/ */
'layout' => 'components.app-layout-sideblock', 'layout' => 'components.app-layout',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -82,7 +82,6 @@ return [ ...@@ -82,7 +82,6 @@ return [
*/ */
'middleware_group' => 'web', 'middleware_group' => 'web',
'inject_assets' => false,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Livewire Temporary File Uploads Endpoint Configuration | Livewire Temporary File Uploads Endpoint Configuration
...@@ -137,7 +136,7 @@ return [ ...@@ -137,7 +136,7 @@ return [
| Setting it to "false" (default) will disable back button cache. | Setting it to "false" (default) will disable back button cache.
| |
*/ */
'inject_assets' => true,
'back_button_cache' => false, 'back_button_cache' => false,
/* /*
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
"prettier": "^2.8.4", "prettier": "^2.8.4",
"prettier-plugin-tailwindcss": "^0.2.2", "prettier-plugin-tailwindcss": "^0.2.2",
"tailwindcss": "^3.2.6", "tailwindcss": "^3.2.6",
"vite": "^4.1.1", "vite": "^4.1.1"
"vite-plugin-externals": "^0.6.2"
}, },
"dependencies": { "dependencies": {
"@alpinejs/collapse": "^3.11.1", "@alpinejs/collapse": "^3.11.1",
...@@ -31,6 +30,8 @@ ...@@ -31,6 +30,8 @@
"alpinejs": "^3.11.1", "alpinejs": "^3.11.1",
"apexcharts": "^3.37.0", "apexcharts": "^3.37.0",
"cleave.js": "^1.6.0", "cleave.js": "^1.6.0",
"cron": "^3.1.7",
"crontab": "^1.4.2",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"esbuild": "^0.20.2", "esbuild": "^0.20.2",
"filepond": "^4.30.4", "filepond": "^4.30.4",
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
"quill": "^1.3.7", "quill": "^1.3.7",
"simplebar": "^6.2.1", "simplebar": "^6.2.1",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"supervisor": "^0.12.0",
"swiper": "^9.0.5", "swiper": "^9.0.5",
"tippy.js": "^6.3.7", "tippy.js": "^6.3.7",
"toastify-js": "^1.12.0", "toastify-js": "^1.12.0",
......
public/favicon.png

13.8 KB | W: | H:

public/favicon.png

1 KB | W: | H:

public/favicon.png
public/favicon.png
public/favicon.png
public/favicon.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment