diff --git a/app/Http/Controllers/Chat/ChatController.php b/app/Http/Controllers/Chat/ChatController.php index 0e936a2..de62c16 100644 --- a/app/Http/Controllers/Chat/ChatController.php +++ b/app/Http/Controllers/Chat/ChatController.php @@ -12,6 +12,21 @@ class ChatController extends Controller { + + public function getChat(Request $request){ + $chat_id = $request->chat_id; + + return ChatGroup::find($chat_id); + } + + + public function getMessages(Request $request){ + $chat_id = $request->chat_id; + + return Message::where('chat_id',$chat_id)->get(); + } + + /** * Start a new chat by creating a chat group. * @@ -53,7 +68,7 @@ public function startChat(Request $request) $chatGroup = ChatGroup::create($data); - return response()->json(['chat_id' => $chatGroup->id], 200); + return response()->json(['chat' => $chatGroup], 200); }else{ return response()->json(['message' => 'user not found'], 400); @@ -109,4 +124,13 @@ public function select_user($company_id){ return $selected; } + + public function getChatGroupsByCompany(Request $request) + { + $companyId = getSelectedCompany(); + + $chatGroups = ChatGroup::where('company_id', $companyId)->get(); + + return response()->json($chatGroups); + } } diff --git a/public/assets/noti.wav b/public/assets/noti.wav new file mode 100644 index 0000000..46c3308 Binary files /dev/null and b/public/assets/noti.wav differ diff --git a/public/assets/script.js b/public/assets/script.js index 4add0d0..5d3e529 100644 --- a/public/assets/script.js +++ b/public/assets/script.js @@ -9,11 +9,13 @@ $(document).ready(function () { }); initFomanticDropdown(".user-select-dropdown", { action: "activate" }); + + //Handle opening / closing of inbox - $(".open-inbox").on("click", function () { - slideTransition("#chat-feature-widget", "left", true); - slideTransition("#inbox", "right", false); - }); +// $(".open-inbox").on("click", function () { +// slideTransition("#chat-feature-widget", "left", true); +// slideTransition("#inbox", "right", false); +// }); $("#back-to-users").on("click", function () { slideTransition("#inbox", "left", true); diff --git a/resources/views/all-tickets.blade.php b/resources/views/all-tickets.blade.php index 07d979a..0c76294 100644 --- a/resources/views/all-tickets.blade.php +++ b/resources/views/all-tickets.blade.php @@ -5,65 +5,153 @@ @section('content') + @@ -185,6 +293,28 @@ +
+
+ Filter on:   + +
+ +
+
+
diff --git a/resources/views/components/chat-box.blade.php b/resources/views/components/chat-box.blade.php new file mode 100644 index 0000000..784875d --- /dev/null +++ b/resources/views/components/chat-box.blade.php @@ -0,0 +1,425 @@ + + + +
+ + + + + + + + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 1dfbc10..6273432 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -13,6 +13,277 @@ + + + + +
@@ -36,6 +307,44 @@
+
+
+
+ Filter on:   + +
+ +
+
+
+
+
+ +
+ + + + + + + + + +
+
    @@ -72,4 +381,51 @@
+ + + + + + @endsection \ No newline at end of file diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 27dbff3..64d8c13 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -39,216 +39,10 @@ @yield('content') - -
- - - - - - - - - - - - -
- + + + +
diff --git a/resources/views/layouts/setting.blade.php b/resources/views/layouts/setting.blade.php index d7925d1..d3935b1 100644 --- a/resources/views/layouts/setting.blade.php +++ b/resources/views/layouts/setting.blade.php @@ -105,211 +105,7 @@ class="side-bar-link bg-light-color d-flex align-items-center justify-content-be -
- - - - - - - - - - - - -
+ diff --git a/resources/views/show-ticket.blade.php b/resources/views/show-ticket.blade.php index 435cdba..0f52fe0 100644 --- a/resources/views/show-ticket.blade.php +++ b/resources/views/show-ticket.blade.php @@ -8,6 +8,10 @@ div.chat-inbox>.chat-content-wrapper>.chat-message>.single-message-chat>.user-message{ max-width:90%!important; } + + .receiver-message{ + word-break: break-all; + }
diff --git a/resources/views/waiting.blade.php b/resources/views/waiting.blade.php index 0f7c7c3..5653bdb 100644 --- a/resources/views/waiting.blade.php +++ b/resources/views/waiting.blade.php @@ -13,6 +13,279 @@ + + + + + + +
@@ -29,6 +302,44 @@
+
+
+
+ Filter on:   + +
+ +
+
+
+
+
+ +
+ + + + + + + + + +
+
@if(count($tickets) > 0)
@@ -71,4 +382,51 @@
+ + + + + + @endsection \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index 6393ca0..7c3d892 100644 --- a/routes/api.php +++ b/routes/api.php @@ -22,6 +22,9 @@ Route::post('/chat/start', [ChatController::class, 'startChat']); Route::post('/chat/send-message', [ChatController::class, 'sendMessage']); +Route::post('/chat/get', [ChatController::class, 'getChat']); +Route::post('/chat/getMessages', [ChatController::class, 'getMessages']); + diff --git a/routes/web.php b/routes/web.php index e6f4b54..1ba267c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -9,6 +9,7 @@ use App\Http\Controllers\TicketController; use App\Http\Controllers\Mailgun\MailgunController; +use App\Http\Controllers\Chat\ChatController; @@ -24,6 +25,7 @@ */ + Route::get('/', [LoginController::class, 'login'])->name('login.create'); Route::post('store/login', [LoginController::class, 'storeLogin'])->name('store.login'); Route::post('store/register', [RegisterController::class, 'storeRegister'])->name('store.register'); @@ -33,6 +35,10 @@ Route::middleware(['auth'])->group(function(){ + // In routes/web.php +Route::get('/chatgroups', [ChatController::class, 'getChatGroupsByCompany'])->name('chatgroups.get'); + + Route::get('/test', [MailgunController::class, 'test'])->name('test'); Route::get('/show-domain/{domain}', [MailgunController::class, 'showDomain'])->name('showDomain');