Commit fabb6bbe authored by Chanon.u's avatar Chanon.u
Browse files

Merge branch 'sprint1' of...

Merge branch 'sprint1' of https://idemo.netbay.co.th/gitlab/sarun.netbay/spnpatch-laravel into sprint1
parents b36b6395 8b446300
...@@ -8,8 +8,8 @@ class HomeController extends Controller ...@@ -8,8 +8,8 @@ class HomeController extends Controller
{ {
public function index() public function index()
{ {
$menu = 'Patch'; $menu = '';
$currentContent = 'Patch'; $currentContent = '';
return view('home', compact('menu', 'currentContent')); return view('home', compact('menu', 'currentContent'));
} }
......
...@@ -6,7 +6,7 @@ use Livewire\Component; ...@@ -6,7 +6,7 @@ use Livewire\Component;
class MainContainer extends Component class MainContainer extends Component
{ {
public $currentContent = 'Patch'; public $currentContent = '';
public $loading = false; public $loading = false;
public $pagePaginate = 1; public $pagePaginate = 1;
......
...@@ -19,7 +19,6 @@ class SendPatchEdit extends Component ...@@ -19,7 +19,6 @@ class SendPatchEdit extends Component
public $search = ''; public $search = '';
public $server_lists; public $server_lists;
public $selectedOwnerType = ''; public $selectedOwnerType = '';
public $showMessage= false;
public $message; public $message;
public $searchSelected = 'SNKEY'; public $searchSelected = 'SNKEY';
public $keyword = ''; public $keyword = '';
......
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>{{ config('app.name') }} @isset($title) <title>SPN Patch
- {{ $title }}
@endisset
</title> </title>
<!-- CSS & JS Assets --> <!-- CSS & JS Assets -->
......
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>{{ config('app.name') }} @isset($title) <title>SPN Patch
- {{ $title }}
@endisset
</title> </title>
<!-- CSS & JS Assets --> <!-- CSS & JS Assets -->
......
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
@mouseleave="timer = setTimeout(() => open = false, 100)" @mouseleave="timer = setTimeout(() => open = false, 100)"
class="relative px-2 py-1 rounded text-gray-700 hover:bg-primary-focus hover:text-white cursor-pointer"> class="relative px-2 py-1 rounded text-gray-700 hover:bg-primary-focus hover:text-white cursor-pointer">
<i aria-hidden="true" class="fa fa-user mr-2" aria-hidden="true"></i> <i aria-hidden="true" class="fa fa-user mr-2" aria-hidden="true"></i>
<span>Hello, {{ $userName ?? '' }}</span> <span>Hello, {{ ucwords($userName) ?? '' }}</span>
<ul x-cloak x-show="open" @click="open = false" @mouseleave="open = false" <ul x-cloak x-show="open" @click="open = false" @mouseleave="open = false"
class="absolute left-0 mt-2 w-32 bg-white shadow-lg"> class="absolute left-0 mt-2 w-32 bg-white shadow-lg">
<li class="block px-4 py-2 text-gray-700 hover:bg-stone-100"> <li class="block px-4 py-2 text-gray-700 hover:bg-stone-100">
......
...@@ -92,7 +92,14 @@ ...@@ -92,7 +92,14 @@
@break @break
@default @default
@livewire('code-comparer')
<div class="bg-gray-100 h-screen flex justify-center h-[800px] w-full items-center">
<div class="text-center min-w-full card shadow-md h-screen flex justify-center items-center m-4 max-h-[780px]">
<h1 class="text-4xl font-bold text-primary-500 mb-4">Welcome {{ ucwords(auth()->user()->username )}}</h1>
<p class="text-gray-700">Have a nice day.</p>
</div>
</div>
{{-- @livewire('code-comparer') --}}
@endswitch @endswitch
<x-modals.alert-modal name="alert-modal"></x-modals.alert-modal> <x-modals.alert-modal name="alert-modal"></x-modals.alert-modal>
......
...@@ -14,7 +14,14 @@ ...@@ -14,7 +14,14 @@
</template> </template>
</div> </div>
<div class="flex flex-wrap -mx-3 w-full bg-main-container items-center justify-center " x-data="{ activeTab: 'form' }"> <div class="flex flex-wrap -mx-3 w-full bg-main-container items-center justify-center " x-data="{ activeTab: 'form' }">
<div class="w-11/12 p-5 mb-6 shadow-md rounded-lg bg-white"> <div class="w-11/12 p-5 mb-6 shadow-md rounded-lg bg-white">
<div class="text-xl rounded-lg bg-white p-4 flex justify-between self-center">
<h3>Server Key :: {{ $serverKey }}</h3>
<a type="button" href="/server-license"
class="bg-primary text-white px-3 py-1 text-md rounded-md hover:bg-primary-focus">Back</a>
</div>
<div class="mb-4 border-b border-gray-200"> <div class="mb-4 border-b border-gray-200">
<ul class="flex flex-wrap -mb-px"> <ul class="flex flex-wrap -mb-px">
<li class="mr-2"> <li class="mr-2">
...@@ -375,7 +382,7 @@ ...@@ -375,7 +382,7 @@
</div> </div>
<div class="flex justify-center space-x-2 mt-3"> <div class="flex justify-center space-x-2 mt-3">
<a type="button" href="/server-license" <a type="button" href="/server-license"
class="bg-slate-700 text-white px-4 py-2 rounded-md hover:bg-slate-900">Back</a> class="bg-slate-200 text-black px-4 py-2 rounded-md hover:bg-slate-400">Back</a>
<button type="button" wire:click="updateLicense" <button type="button" wire:click="updateLicense"
class="bg-primary text-white px-4 py-2 rounded-md hover:bg-primary-focus">Save</button> class="bg-primary text-white px-4 py-2 rounded-md hover:bg-primary-focus">Save</button>
</div> </div>
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</div> </div>
</div> </div>
<div class="my-5 flex h-8 place-content-center px-4 "> <div class="my-5 flex h-8 place-content-center px-4 ">
<h2 class="text-xl text-slate-800"> <a href="/server-license" > <h2 class="text-xl text-slate-800 ">
Server License Management Server License Management
</h2> </h2></a>
<h2 class="ml-3 text-xl text-slate-800 font-semibold underline underline-offset-4"> <h2 class="ml-3 text-xl text-slate-800 font-semibold underline underline-offset-4">
{{ $action === 'add' ? 'Create' : ($action === 'edit' ? 'Edit' : '') }} {{ $action === 'add' ? 'Create' : ($action === 'edit' ? 'Edit' : '') }}
</h2> </h2>
......
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