diff --git a/app/Http/Controllers/Admin/ManageChatController.php b/app/Http/Controllers/Admin/ManageChatController.php index bb1ba91..0abc6bc 100644 --- a/app/Http/Controllers/Admin/ManageChatController.php +++ b/app/Http/Controllers/Admin/ManageChatController.php @@ -72,8 +72,13 @@ class ManageChatController extends Controller $data['filename'] = $data->getRawOriginal('file'); } } + $username = "
+ $user->name +
+ +
"; $chatPage = View::make('Admin.Pages.manage_chat.chat')->with('chat', $chat)->with('user', $user)->render(); - return response()->json(['user' => $userPage, 'chat' => $chatPage]); + return response()->json(['user' => $userPage, 'chat' => $chatPage, 'username' => $username]); } public function getChat(Request $request) diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 04c044a..dcdb797 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -1275,12 +1275,18 @@ nav { border-radius: 9px; } .chat-box div#kt_drawer_chat_messenger_footer { - /* position: absolute; */ + position: absolute; bottom: 0; width: 100%; background-color: #dfdfdf; color: #000; } +div#kt_drawer_chat_messenger { + height: 400px !important; +} +.chat_screen { + position: relative; +} .chat-box .chat-msgs .card-body { height: 85%; overflow-y: scroll; @@ -1337,7 +1343,8 @@ td a.action_icon { font-size: 15px; } -#manage_investors_kyc_wrapper tr.odd td:last-child, #manage_investors_kyc_wrapper tr.even td:last-child { +#manage_investors_kyc_wrapper tr.odd td:last-child, +#manage_investors_kyc_wrapper tr.even td:last-child { display: flex; /* justify-content: center; */ } @@ -1411,10 +1418,12 @@ button.btn.btn-light-primary.me-3 { .top_header { align-items: end; } -tr.odd td.dataTables_empty:last-child, tr.even td.dataTables_empty:last-child { +tr.odd td.dataTables_empty:last-child, +tr.even td.dataTables_empty:last-child { display: revert; } -.dropdown .dropdown-item.active, .dropdown .dropdown-item:active { +.dropdown .dropdown-item.active, +.dropdown .dropdown-item:active { background: #eff2f5; color: #000; } @@ -1432,11 +1441,19 @@ label.error { #active_meeting .tabdiv select { padding-bottom: 5px !important; } -.cmm-span{ +.cmm-span { color: red; } .chat-msgs { - height: 90% !important; + height: 366px !important; + overflow-x: hidden; +} +.user_name { + height: 40px; + display: flex; + align-items: center; + padding: 10px; + background: #d9dbe5; } #kt_profile_details_view svg.svg-inline--fa.fa-download:hover { color: #c18948; @@ -1455,7 +1472,9 @@ label.error { color: #000 !important; } -.activ .accordion-item:first-of-type .accordion-button:after {filter: brightness(0);} +.activ .accordion-item:first-of-type .accordion-button:after { + filter: brightness(0); +} .tabdiv { padding-bottom: 10px; @@ -1468,7 +1487,7 @@ label.error { .tabdiv label { box-sizing: border-box; - padding: 6px; + padding: 6px !important; color: var(--labelColor); display: inline-block; width: 50%; @@ -1491,4 +1510,8 @@ label.error { align-items: center; justify-content: center; border-radius: 5px; -} \ No newline at end of file +} + +.modal .tabdiv label.error { + padding: 6px 6px 6px 20px !important; +} diff --git a/resources/views/Admin/Pages/manage_chat/chat.blade.php b/resources/views/Admin/Pages/manage_chat/chat.blade.php index 7ba589e..5fc19a9 100644 --- a/resources/views/Admin/Pages/manage_chat/chat.blade.php +++ b/resources/views/Admin/Pages/manage_chat/chat.blade.php @@ -1,13 +1,10 @@ -
+ {{--
{{$user->name}} - {{--
--}} - {{--
-
--}}
-
+
--}} -
+ {{--
--}}
@foreach($chat as $data) @if($data->by == 'User') @@ -68,4 +65,4 @@ @endif @endforeach
-
\ No newline at end of file + {{--
--}} \ No newline at end of file diff --git a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php index 1240390..0666bd5 100644 --- a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php +++ b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php @@ -69,23 +69,28 @@
+
-
-
- -

+ {{--
--}} +
+
+
+ +

+
-
+ + {{-- --}}
@@ -103,11 +108,8 @@ }) setInterval(function() { if ($('#user_id').val()) { - // $(`#user_${$('#user_id').val()}`).addClass('active'); getUser($('#user_id').val()); - // $('.spanName').each(function() { - // $(this).removeClass('active'); - // }) + checkScroll(); } }, 4000); @@ -181,6 +183,11 @@ if (result.status == 200) { getUser($('#user_id').val()); + setTimeout(() => { + $('.user-chat-message').scrollTop($('.user-chat-message')[0] + .scrollHeight); + }, 2000); + checkScroll(); $('#message').val('') @@ -197,6 +204,9 @@ }); } + // $(document).ready(function(){ + // }) + let firstTime = true; function getUser(id) { $('.spanName').each(function() { @@ -219,14 +229,24 @@ }, success: function(result) { - + // alert(firstTime) $('.show-user').html(''); $('.chat-msgs').html(''); - + $('.show-user').append(result.user); - $('.chat-msgs').append(result.chat); + + $('.user_name').html(''); + $('.user_name').append(result.username); + + if (firstTime) { + // $('.chat-msgs').scrollTop($('.user-chat-message')[0].scrollHeight); + $('.user-chat-message').children('div.first').addClass('d-none'); + $('.user-chat-message').scrollTop($('.user-chat-message')[0].scrollHeight); + $('.user-chat-message').children('div.first').removeClass('d-none'); + } + firstTime = false; $('#kt_drawer_chat_messenger_footer').removeClass('d-none'); @@ -258,6 +278,47 @@ }, }); } + + function checkScroll() { + // $(function() { + var lastScrollTop = 0, + delta = 5; + $('.user-chat-message').scroll(function() { + var nowScrollTop = $(this).scrollTop(); + // alert(nowScrollTop); + if (Math.abs(lastScrollTop - nowScrollTop) >= delta) { + if (nowScrollTop > lastScrollTop) { + // ACTION ON + // SCROLLING DOWN + // alert('down'); + autoScrollDown = true; + if ($('.user-chat-message')[0].scrollHeight) { + // $('#down_btn').addClass('d-none'); + } + } else { + // alert('up'); + // ACTION ON + // SCROLLING UP + autoScrollDown = false; + if (condition) { + $('.user-chat-message').scroll(function() { + setTimeout(() => { + $('.user-chat-message').scrollTop($( + '.user-chat-message')[0] + .scrollHeight); + }, 2000); + }); + condition = false; + } else { + // alert('stop'); + // $('#down_btn').removeClass('d-none'); + } + } + lastScrollTop = nowScrollTop; + } + }); + // }); + } @endsection