Skip to content

GitLab

Commit 4f05b759 authored by Sarun Mungthanya's avatar Sarun Mungthanya
Browse files

update css auto hide search

parent 7885f031
Show whitespace changes
Inline Side-by-side
app/Http/Livewire/Pages/Patch/PatchEdit.php
View file @ 4f05b759
......@@ -35,6 +35,7 @@ class PatchEdit extends Component
public $PDESC;
public $Remark;
public $POWNER;
public $POWNERNAME;
public $PAPPROVEDATE;
public $PTYPE;
public $PATCHCODE;
......@@ -55,6 +56,8 @@ class PatchEdit extends Component
$this->patchId = $editPid;
$this->loadPatchData();
}
public function updatedSearchProject()
{
$this->fetchProjects();
......@@ -151,6 +154,7 @@ class PatchEdit extends Component
$this->PDESC = $patch->PDESC;
$this->Remark = $patch->Remark;
$this->POWNER = $patch->POWNER;
$this->POWNERNAME = $patch->user->first_name ?? '';
$this->PAPPROVEDATE = $patch->PAPPROVEDATE;
$this->PTYPE = $patch->PTYPE;
$this->PATCHCODE = $patch->PATCHCODE;
......
app/Http/Livewire/Pages/SendPatch/SendPatchEdit.php
View file @ 4f05b759
......@@ -11,7 +11,7 @@ use Livewire\Component;
class SendPatchEdit extends Component
{
public $PID, $serverKeyOption, $serverKeyOwnerType, $company, $db_type, $cur_ver;
public $PID,$patchName , $serverKeyOption, $serverKeyOwnerType, $company, $db_type, $cur_ver;
public $perPage = 10;
public $search = '';
public $server_lists;
......@@ -26,6 +26,8 @@ class SendPatchEdit extends Component
public function mount($editPid)
{
$this->PID = $editPid;
$patch = ConfSmartupdate::where("PID", $editPid)->first();
$this->patchName = $patch->PATCHNAME;
// $this->PID = 15670;
// $this->updateServerLists();
......
app/Models/ConfSmartupdate.php
View file @ 4f05b759
......@@ -48,4 +48,8 @@ class ConfSmartupdate extends Model
{
return $this->hasMany(ConfServerPendding::class, 'PatchID', 'PID');
}
public function user()
{
return $this->belongsTo(User::class, 'POWNER', 'uid');
}
}
config/database.php
View file @ 4f05b759
......@@ -60,6 +60,7 @@ return [
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
PDO::ATTR_PERSISTENT => true,
]) : [],
],
......
resources/views/components/sidebar.blade.php
View file @ 4f05b759
<div class="h-full text-white bg-main-container w-80 p-4 transition-all duration-300 overflow-y" x-data="{ activeLink: window.location.pathname }">
<div class="rounded-2xl p-3 bg-white w-full mb-2">
<div class="rounded-2xl p-3 bg-white w-full mb-2" x-init="checkWindowWidth(); window.addEventListener('resize', checkWindowWidth)">
<ul >
<li class="mb-1 flex justify-between">
<a href="/" class="text-black block py-1 px-4 rounded text-xl">Spn Patch</a>
......@@ -77,12 +77,22 @@
</div>
</ul>
</div>
<div class="rounded-2xl p-3 bg-white w-full mb-2">
<ul >
<li class="mb-1">
<a href="/server-license" :class="activeLink === '/server-license' ? 'bg-primary-focus text-white rounded-xl' : 'text-black'"
class="block py-2 px-4 rounded text-black flex items-center">
<i aria-hidden="true" class="fa-solid fa-building mr-2"></i> Server License Management
</a>
</li>
</ul>
</div>
<div class="rounded-2xl p-3 bg-white w-full mb-2">
<ul >
<li class="mb-1">
<a href="/exchange-rate" :class="activeLink === '/exchange-rate' ? 'bg-primary-focus text-white rounded-xl' : 'text-black'"
class="block py-2 px-4 rounded text-black flex items-center">
<i aria-hidden="true" class="fa-solid fa-money-bill-transfer mr-2"></i> Exchange Rate
<i aria-hidden="true" class="fa fa-money-bill-transfer mr-2"></i> Exchange Rate
</a>
</li>
</ul>
......
resources/views/home.blade.php
View file @ 4f05b759
......@@ -4,30 +4,39 @@
display: none;
}
</style>
<div x-data="{ sidebarOpen: true, showSidebarButton: false }" class="flex h-screen">
<div x-show="sidebarOpen" class="w-1/5 bg-gray-100"
x-transition:enter="transition transform ease-out duration-300" x-transition:enter-start="-translate-x-full"
x-transition:enter-end="translate-x-0" x-transition:leave="transition transform ease-in duration-300"
<div x-data="{
sidebarOpen: true,
showSidebarButton: false,
checkWindowWidth() {
this.sidebarOpen = window.innerWidth >= 1550;
this.showSidebarButton = window.innerWidth < 1550;
}
}"
x-init="checkWindowWidth(); window.addEventListener('resize', () => checkWindowWidth())"
class="flex h-screen">
<div x-show="sidebarOpen" x-cloak class=" w-1/5 max-w-[340px] bg-gray-100"
x-transition:enter="transition transform ease-out duration-300"
x-transition:enter-start="-translate-x-full" x-transition:enter-end="translate-x-0"
x-transition:leave="transition transform ease-in duration-300"
x-transition:leave-start="translate-x-0" x-transition:leave-end="-translate-x-full">
<!-- Sidebar Content -->
@include('components.sidebar', [
'currentContent' => $currentContent,
'userName' => auth()->user()->username ?? '',
])
</div>
<button @click="sidebarOpen = true; showSidebarButton= false" x-show="showSidebarButton" x-cloak
class="mb-4 ml-2 pt-1 focus:outline-none "
<button @click="sidebarOpen = true" x-show="showSidebarButton" x-cloak
class="mb-4 ml-2 pt-1 focus:outline-none"
x-transition:enter="transition ease-out duration-100 transform"
x-transition:enter-start="opacity-0 -translate-x-full" x-transition:enter-end="opacity-100 translate-x-0"
x-transition:leave="transition ease-in duration-300 transform"
x-transition:leave-start="opacity-300 translate-x-0" x-transition:leave-end="opacity-0 -translate-x-full">
x-transition:leave-start="opacity-100 translate-x-0" x-transition:leave-end="opacity-0 -translate-x-full">
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="black" viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16m-7 6h7" />
</svg>
</button>
<div :class="sidebarOpen ? 'w-4/5 mr-5' : 'w-full ml-2 mr-5'" class="transition-all duration-300">
<div :class="sidebarOpen ? 'lg:w-4/5 mr-5' : 'w-full ml-2 mr-5'" class="transition-all duration-300">
<livewire:main-container :currentContent="$currentContent" />
</div>
</div>
......
resources/views/livewire/pages/company/company-index.blade.php
View file @ 4f05b759
......@@ -68,11 +68,11 @@
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-primary-focus hover:text-main-container active:text-main-container focus:text-main-container primary-focus hover:text-main-container active:text-main-container focus:text-main-container dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/dischargeport/dischargeport-index.blade.php
View file @ 4f05b759
......@@ -36,11 +36,11 @@
</div>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/exchangerate/exchangerate-index.blade.php
View file @ 4f05b759
......@@ -39,11 +39,11 @@
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-primary-focus hover:text-main-container active:text-main-container focus:text-main-container primary-focus hover:text-main-container active:text-main-container focus:text-main-container dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/format-file-master/file-index.blade.php
View file @ 4f05b759
......@@ -42,11 +42,11 @@
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-primary-focus hover:text-main-container active:text-main-container focus:text-main-container primary-focus hover:text-main-container active:text-main-container focus:text-main-container dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/group/group-index.blade.php
View file @ 4f05b759
......@@ -70,11 +70,11 @@
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-3 px-5 items-center">
<div class="flex flex-wrap gap-3 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/news/news-index.blade.php
View file @ 4f05b759
......@@ -39,11 +39,11 @@
</div>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-primary-focus hover:text-main-container active:text-main-container focus:text-main-container primary-focus hover:text-main-container active:text-main-container focus:text-main-container dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/parameter/parameter-index.blade.php
View file @ 4f05b759
......@@ -36,11 +36,11 @@
</div>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/patch/patch-edit.blade.php
View file @ 4f05b759
......@@ -152,10 +152,10 @@
<div x-show="activeTab === 'tab2'" class="" x-data="{ selectedDeleteFiles: [], showDeleteListModal: false }">
<div class="py-2 ">
<button type="button"
class="py-2 px-3 bg-main-container border border-primary text-primary rounded-md hover:text-main-container hover:bg-primary-focus"
class="py-2 px-3 bg-white border border-primary text-primary rounded-md hover:text-main-container hover:bg-primary-focus"
wire:click="$emit('openModalFormPatchFile', '', '{{ $patchId }}')">Add</button>
<button type="button"
class="py-2 px-3 bg-main-container border-error border rounded-md text-error hover:text-main-container hover:bg-error-focus"
class="py-2 px-3 bg-white border-error border rounded-md text-error hover:text-main-container hover:bg-error-focus"
@click="showDeleteListModal = true">Delete</button>
</div>
<div x-show="showDeleteListModal"
......@@ -282,9 +282,9 @@
class="w-full mt-1 p-2 border border-gray-300 rounded-md">
</div>
<div class="mb-4">
<label for="owner" class="block text-gray-700">Owner</label>
<input type="text" id="owner" wire:model.defer="POWNER"
class="w-full mt-1 p-2 border border-gray-300 rounded-md">
<label for="owner" class="block text-gray-700 ">Owner</label>
<input type="text" id="owner" wire:model.defer="POWNERNAME" readonly
class="w-full mt-1 p-2 border border-gray-300 rounded-md bg-slate-300">
</div>
<div class="mb-4">
<label for="papprovedate" class="block text-gray-700">Papprovedate</label>
......
resources/views/livewire/pages/patch/patch-index.blade.php
View file @ 4f05b759
......@@ -33,11 +33,11 @@
</div>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-10 rounded-full p-0 hover:bg-primary-focus hover:text-main-container active:text-main-container focus:text-main-container primary-focus hover:text-main-container active:text-main-container focus:text-main-container dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......@@ -122,7 +122,7 @@
</td>
<td class="whitespace-nowrap px-1 py-3 sm:px-2">{{ $patch->PID }}</td>
<td class="whitespace-nowrap px-1 py-3 sm:px-2">
{{ \Illuminate\Support\Str::limit($patch->PATCHNAME, 40) }}</td>
{{ \Illuminate\Support\Str::limit($patch->PATCHNAME, 120) }}</td>
<td class="whitespace-nowrap px-1 py-3 sm:px-2">{{ $patch->PDATE }}</td>
<td class="whitespace-nowrap px-1 py-3 sm:px-2">{{ $patch->PLEVEL }}</td>
<td class="whitespace-nowrap px-1 py-3 sm:px-2">{{ $patch->MAJOR_VERSION }}
......
resources/views/livewire/pages/role/role-index.blade.php
View file @ 4f05b759
......@@ -68,11 +68,11 @@
</div>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/send-patch/delete-multi-patch-list.blade.php
View file @ 4f05b759
......@@ -96,11 +96,11 @@
<div class="flex justify-end mb-5">
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/send-patch/send-multi-patch-list.blade.php
View file @ 4f05b759
......@@ -114,11 +114,11 @@
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/send-patch/send-multi-patch-old.blade.php
View file @ 4f05b759
......@@ -34,11 +34,11 @@
</h2>
<div class="inline-flex flex-initial">
<div x-data="{ isInputActive: true }">
<div class="flex gap-4 px-5 items-center">
<div class="flex flex-wrap gap-4 px-5 items-center">
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none"
viewBox="0 0 24 24" stroke="currentColor">
viewBox="0 0 24 24" stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
resources/views/livewire/pages/send-patch/send-patch-edit.blade-old.php
View file @ 4f05b759
......@@ -128,7 +128,7 @@
<button @click="isInputActive = !isInputActive"
class="btn h-8 w-14 rounded-full p-0 hover:bg-slate-300/20 focus:bg-slate-300/20 active:bg-slate-300/25 dark:hover:bg-navy-300/20 dark:focus:bg-navy-300/20 dark:active:bg-navy-300/25">
<svg xmlns="http://www.w3.org/2000/svg" class="h-4.5 w-4.5" fill="none" viewBox="0 0 24 24"
stroke="currentColor">
stroke="black">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
</svg>
......
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