Merge branch 'master' of https://gitlab.com/online-sistem1/kaunter into farisv2

This commit is contained in:
fariz
2021-04-14 01:55:33 +08:00
4 changed files with 8 additions and 7 deletions
+2 -1
View File
@@ -37,7 +37,8 @@ return [
'app_id' => env('PUSHER_APP_ID'),
'options' => [
'cluster' => 'ap1',
'useTLS' => true
'useTLS' => false,
'scheme' => 'http'
],
],
@@ -10,9 +10,9 @@
<div class="modal-header">
<ul class="nav nav-pills">
<li class="nav-item">
{{-- <li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
</li>
</li> --}}
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
</li>
@@ -43,9 +43,9 @@
<br>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
{{-- <li class="nav-item">
<a class="nav-link" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a>
</li>
</li> --}}
<li class="nav-item">
<a class="nav-link active" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a>
</li>
@@ -42,9 +42,9 @@
<br>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
{{-- <li class="nav-item">
<a class="nav-link" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a>
</li>
</li> --}}
<li class="nav-item">
<a class="nav-link active" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a>
</li>