From d3df878d0e761e2bce4ec759a99bb879c5712ac7 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 8 Aug 2024 23:43:24 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1945600 -> 1945600 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 14044 -> 14218 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 5676 -> 5675 bytes
 .../__pycache__/routing.cpython-310.pyc       | Bin 526 -> 459 bytes
 osinaweb/osichat/consumers.py                 | 101 +++++++++++-------
 osinaweb/osichat/models.py                    |   8 +-
 osinaweb/osichat/routing.py                   |   3 +-
 .../templates/chat_templates/chat-widget.html |  51 ++++++++-
 .../partials/new-chat-room.html               |  25 +++--
 .../chat_templates/partials/rooms.html        |  72 +------------
 .../chat_templates/partials/visitors.html     |  30 ++++++
 .../static/js/osichat-admin/chat-toggle.js    |   6 +-
 osinaweb/static/js/osichat-admin/rooms.js     |  86 ++++++++++-----
 13 files changed, 224 insertions(+), 158 deletions(-)
 create mode 100644 osinaweb/osinacore/templates/chat_templates/partials/visitors.html

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 8f8a2ac557363ace9419e7587c46411bbc8e23d3..2491d07ff51bdd02c3e1facb2a16aacf4ca12c70 100644
GIT binary patch
delta 4937
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
L=IEZH#U=j*&!yEd

delta 2256
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

diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index cf94d1e0346ef170e7c2c226fc3a61664ce6ceb6..5bd69a3ddb7289afda4b6a7dda321488d0510f3a 100644
GIT binary patch
delta 5206
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

delta 5071
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

diff --git a/osinaweb/osichat/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc
index a705f211b51a502f10ed0a74bfd15d0606775e8e..0f665e1b276fc687970d855aaf48e26dced69c03 100644
GIT binary patch
delta 646
zcmZ9Ky>1gh5XU_sj(t9#efaJ$7D@z?k@$!e3Q!t@gaCsJ6R=GpK#6U|XB+`Gp0fl(
ze5Bz4U<w)<Br1p$5Tc>r5qJQLidO&%pn&;r3MB3{Kh4h0e|Khgx8~o>J444w#q@ho
z`p}bi&PB`055l{x^?qk8Evslv62oZ2jGkHds3LaimGW(BmTK}j^)sle_N-boqe#Yb
zw1>DZU+l*Ru4v%!)Woh1x*NS-$l+kj%R8}MjZT+W<UzVl4SAaJ<ZF7d(A2rAT7-I%
zv1!W1UCI$RC7UTr+fT|PFCh<|GA+qR=Tv@G(;8~uk|y6Jm(s+mnjO-byi5nOX~(A+
z8#J?R&AF<^EubymGrvxvY(586fN5X>I1j{u3jm7Z8sGswP?4kVN_h$HC7=vkS4<M?
z!@(H69zo~?V3xlO&n#e2lTYq*T6@2|dmm9>IM*+s89oLaR7?`L!zk+92+gwGNBkx*
z2MlG~-b-EC?-i8U%&h!z=cMIZdPpU0f6F@_+(Du#(NtH!@EUaak-GQQqJKx{5|5<l
zKT+*#|Frv`wl2T@g#xQ&6SAEfa>>_Ug)C=+Lo+>{;af5aszp2s#(gp_iQ9l_tP2mj
Mt7hBI%a363FP$ul7ytkO

delta 629
zcmZ9KO=}ZT6ozx^q|Hn+&2=(k45A`bu+kC*p$lulkEkgjnxs`4+Qyhn(kjizoj^qq
z+_|+J#H|ZAQmKgDbm33XAJCl}|A2zpjh=V15S-yW+;i{yUd}!DZcn|Nvb(lzMdZu=
z+-<%5U>8lp>G+%6G$)c(yBn+z8r_XrW34_2c*}f5Ikv1f!uQs3D)49Pw^tJLHHlzU
z5Q{i;gmj6|+b-WTO#T(We`-M%CP((;`A&1a)$+C98R*5~+@VUnsqgTUM48I`B{83=
z$b4QRKvA)XK~7YWL%Je6KBpq@*>mY-S%U6+EYv7clpwt<idmi?pQIIjo$&aN5gpNG
zelfm~tch+(Lazd~u(+}0w@X)%qIR7F3?K_!2cp0Y;3iN2Qh*EO_^i6CiWuGkW`Qbi
zsk9evb{lyp4^iMx>J_bgTs(Y?sLg$6ZMqD_IpDNle{91Kf_mH6RZO*k2fzuS!#nY#
z)Zmk;jPR?v$g8f&PgB!!*zME>uM1IFOjt(-=@LBYo(vyL1pk_)NcX}X%(#8=zjZIG
z|NJFBaI=}d*q*^UybDFH{9^9&74OWbFDv>X_q_ZBo`A-UXk3j(yN3sBV1x?9vlCDA
H4{zo#^qYmn

diff --git a/osinaweb/osichat/__pycache__/routing.cpython-310.pyc b/osinaweb/osichat/__pycache__/routing.cpython-310.pyc
index 7f41bd733da044ce419777f9975be1fcf70b3f65..18b6a6f57ca4378c261c880dbb92c65ec1c8da70 100644
GIT binary patch
delta 132
zcmeBUInAt{&&$ij00cW^x2DN4GB7*_agYHUkmCTv#SRm-O$1pNuq<R~W=dy{VoPBU
zX3*rASR=vBU0$r8U!0kokytWucQ7OSWPV0DL3V$L$SwB7;`qek^vucOj7tT0fF|)U
Pa4_;P^Dy!-a{L7Vid`GT

delta 198
zcmX@j+{dDw&&$ij00g#6H>71UGB7*_agYH!kmCTv#Xb|YO=Q^?uq<R~W=dsDVNZp!
z(^;a}Q#gVdG&v_0NT`dH7whL2XC`MPmgtvd7H5{^7ZvMQ2_lIW<>%)XPn;ag$T9J`
zoED!yP)%}vZWu)EE%wCX_{8G$%qRh<gfq~jAdr^HVvI|L_<%0qVc=loVdh~3L5@EF
Dc{nti

diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py
index 439f2172..e9f03e1a 100644
--- a/osinaweb/osichat/consumers.py
+++ b/osinaweb/osichat/consumers.py
@@ -29,13 +29,6 @@ class OsitcomVisitor(WebsocketConsumer):
     def receive(self, text_data): 
         text_data_json = json.loads(text_data)
         event_type = text_data_json.get('event_type')
-
-
-        if event_type == 'set_client_type':
-            self.client_type = text_data_json.get('client_type')
-            self.user_id =  text_data_json.get('user_id')
-            self.get_vistors_handler()
-
         if event_type == 'visitor_ping': 
             session_id = text_data_json.get('session_id')
             if Visitor.objects.filter(session_id=session_id).last():
@@ -54,42 +47,22 @@ class OsitcomVisitor(WebsocketConsumer):
                 visit_date = datetime.now()
             )
 
-    def get_vistors_handler(self):
-        visitors = Visitor.objects.all().order_by('-id')
-        context = {
-            'visitors': visitors,
-        }
-        if self.client_type == 'mobile_admin':
-            visitors_data = []
-            for visitor in visitors:
-                visitor_dict = model_to_dict(visitor)
-                visitor_logs = VisitorLog.objects.filter(visitor=visitor)
-
-                visitor_logs_data = [model_to_dict(log) for log in visitor_logs]
-                visitor_dict['visitor_logs'] = visitor_logs_data
-                
-                visitors_data.append(visitor_dict)
-
-            self.send(text_data=json.dumps({
-                'event_type': 'get_visitors',
-                'visitors_data': visitors_data,
-            }, cls=DjangoJSONEncoder))
 
 
 
 
 
 
-class OsitcomChatRooms(WebsocketConsumer):
+class Osichat(WebsocketConsumer):
     def connect(self):
         async_to_sync(self.channel_layer.group_add)(
-            'ositcom_chats', self.channel_name
+            'osichat', self.channel_name
         )
         self.accept()
 
     def disconnect(self, close_code):
         async_to_sync(self.channel_layer.group_discard)(
-            'ositcom_chats', self.channel_name
+            'osichat', self.channel_name
         )
 
     def receive(self, text_data):
@@ -99,11 +72,30 @@ class OsitcomChatRooms(WebsocketConsumer):
         if event_type == 'set_client_type':
             self.client_type = data.get('client_type')
             self.user_id =  data.get('user_id')
-            self.get_chats_handler()
+            event = {
+                'type': 'get_chats_handler',
+            }
+            self.get_chats_handler(event)
+
+        if event_type == 'get_chats':
+            event = {
+                'type': 'get_chats_handler',
+            }
+            async_to_sync(self.channel_layer.group_send)(
+            'osichat', event
+            )
+
+        if event_type == 'get_visitors':
+            print('eeewew')
+            event = {
+                'type': 'get_visitors_handler',
+            }
+            async_to_sync(self.channel_layer.group_send)(
+            'osichat', event
+            )
 
     
-    def get_chats_handler(self):
-        
+    def get_chats_handler(self, event):
         chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),
             order_key=Case(
                 When(last_update__isnull=True, then=F('date_created')),
@@ -149,7 +141,7 @@ class OsitcomChatRooms(WebsocketConsumer):
         }))
 
 
-    def new_update_handler(self, event):
+    def new_chat_update_handler(self, event):
         chat_room = get_object_or_404(ChatRoom, id=event['chatroom_id'])
         user = get_object_or_404(User, id=self.user_id)
         number_of_unread = ChatMessage.objects.filter(room=chat_room).exclude(member=user).exclude(chatmessageseen__member=user).count()
@@ -168,13 +160,43 @@ class OsitcomChatRooms(WebsocketConsumer):
         else:
             html = render_to_string("chat_templates/partials/new-chat-room.html", context=context)
             self.send(text_data=json.dumps({
-                'event_type': 'new_update',
+                'event_type': 'new_chat_update',
                 'chatroom_id': chat_room.id,
                 'user': last_message.member.id if last_message and last_message.member else None,
                 'html': html,
             }))
 
 
+    def get_visitors_handler(self, event):
+        visitors = Visitor.objects.all().order_by('-id')
+        context = {
+            'visitors': visitors,
+        }
+        if self.client_type == 'mobile_admin':
+            visitors_data = []
+            for visitor in visitors:
+                visitor_dict = model_to_dict(visitor)
+                visitor_logs = VisitorLog.objects.filter(visitor=visitor)
+
+                visitor_logs_data = [model_to_dict(log) for log in visitor_logs]
+                visitor_dict['visitor_logs'] = visitor_logs_data
+                
+                visitors_data.append(visitor_dict)
+
+            self.send(text_data=json.dumps({
+                'event_type': 'get_visitors',
+                'visitors_data': visitors_data,
+            }, cls=DjangoJSONEncoder))
+
+        else:
+            html = render_to_string("chat_templates/partials/visitors.html", context=context)
+            self.send(text_data=json.dumps({
+                'event_type': 'get_visitors',
+                'html': html,
+        }))            
+
+
+
 
 
 
@@ -244,21 +266,20 @@ class OsitcomChatRoom(WebsocketConsumer):
                 visitor=self.visitor
             )
             self.chat_room = chat_room
-            self.group = f"{self.session_id}_{self.chat_room.id}"
             async_to_sync(self.channel_layer.group_discard)(
             self.group, self.channel_name
             )
+            self.group = f"{self.session_id}_{self.chat_room.id}"
             async_to_sync(self.channel_layer.group_add)(
             self.group, self.channel_name
             )
-            async_to_sync(self.channel_layer.group_send)(
-            self.group, event
-            )
-
             event = {
                 'type': 'start_conversation_handler',
                 'chat_room_id':  chat_room.id
             }
+            async_to_sync(self.channel_layer.group_send)(
+            self.group, event
+            )
 
         if event_type == 'typing':
             event = {
diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py
index dcdcd33a..2c4db2d8 100644
--- a/osinaweb/osichat/models.py
+++ b/osinaweb/osichat/models.py
@@ -58,10 +58,10 @@ class ChatRoom(models.Model):
         super().save(*args, **kwargs)
         channel_layer = get_channel_layer()
         event = {
-            'type': 'new_update_handler',
+            'type': 'new_chat_update_handler',
             'chatroom_id': self.id,
         }
-        async_to_sync(channel_layer.group_send)("ositcom_chats", event)
+        async_to_sync(channel_layer.group_send)("osichat", event)
 
 
 
@@ -102,10 +102,10 @@ class ChatMessage(models.Model):
         super().save(*args, **kwargs)
         channel_layer = get_channel_layer()
         event = {
-            'type': 'new_update_handler',
+            'type': 'new_chat_update_handler',
             'chatroom_id': self.room.id,
         }
-        async_to_sync(channel_layer.group_send)("ositcom_chats", event)
+        async_to_sync(channel_layer.group_send)("osichat", event)
 
 
 class ChatMessageAttachment(models.Model):
diff --git a/osinaweb/osichat/routing.py b/osinaweb/osichat/routing.py
index 05e2bcb1..21d897e3 100644
--- a/osinaweb/osichat/routing.py
+++ b/osinaweb/osichat/routing.py
@@ -2,8 +2,7 @@ from django.urls import path
 from .consumers import *
 
 websocket_urlpatterns = [
-    path("ws/osichat/visitors/", OsitcomVisitor.as_asgi()),
-    path("ws/osichat/rooms/", OsitcomChatRooms.as_asgi()),
+    path("ws/osichat/", Osichat.as_asgi()),
     path("ws/osichat/<str:session_id>/", OsitcomChatRoom.as_asgi()),
     path("ws/osichat-admin/<str:session_id>/<int:chat_id>/", OsitcomChatRoom.as_asgi()),
 
diff --git a/osinaweb/osinacore/templates/chat_templates/chat-widget.html b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
index 838d79cd..189eb5b8 100644
--- a/osinaweb/osinacore/templates/chat_templates/chat-widget.html
+++ b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
@@ -1,10 +1,57 @@
 {% load static %}
 <p id="userId" class="hidden">{{request.user.id}}</p>
-<div id="chatWidget" class="hidden fixed bg-black bg-opacity-50 inset-0 z-50 h-[100vh]">
+<div id="osichatWidget" class="hidden fixed bg-black bg-opacity-50 inset-0 z-50 h-[100vh]">
     <div
         class="w-[950px] min-h-[500px] h-[80%] bg-white rounded-md border border-gray-200 shadow-xl z-20 right-9 bottom-24 grid grid-cols-3 fixed">
-        <!-- LEFT SIDE - CHATS -->
+
+
+        <!-- LEFT SIDE - CONTENT -->
         <div id="widgetLeftSide" class="h-full overflow-y-auto border-r border-gray-200 bg-gray-50 relative rounded-l-md">
+            <!-- RECONNECTING LOADER -->
+            <div id="roomsLoader"
+                class="w-full h-full absolute flex justify-center items-center bg-black bg-opacity-60 z-20 inset-0 rounded-l-md hidden">
+                <div class="flex flex-col justify-center items-center gap-2">
+                    <p class="text-white">Reconneting</p>
+                    <div class="w-fit flex gap-1 justify-start items-center">
+                        <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md"></div>
+                        <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md" style="animation-delay: 0.2s;"></div>
+                        <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md" style="animation-delay: 0.4s;">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- HEADER -->
+            <div class="grid grid-cols-2 sticky top-0 z-10 rounded-l-md">
+                <div id="chatsTab"
+                    class="w-full flex items-center justify-center gap-1 py-3 px-3 border-b border-gray-100 bg-white rounded-md shadow-md cursor-pointer text-secondosiblue">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                        class="w-5">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 0 1 .865-.501 48.172 48.172 0 0 0 3.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z" />
+                    </svg>
+                    <p>Chats</p>
+                </div>
+
+
+                <div id="visitorsTab"
+                    class=" w-full flex items-center justify-center gap-1 py-3 px-3 border-b border-gray-100 bg-gray-100 text-gray-400 cursor-pointer">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5" fill="none">
+                        <path
+                            d="M2.5 8.18677C2.60406 6.08705 2.91537 4.77792 3.84664 3.84664C4.77792 2.91537 6.08705 2.60406 8.18677 2.5M21.5 8.18677C21.3959 6.08705 21.0846 4.77792 20.1534 3.84664C19.2221 2.91537 17.9129 2.60406 15.8132 2.5M15.8132 21.5C17.9129 21.3959 19.2221 21.0846 20.1534 20.1534C21.0846 19.2221 21.3959 17.9129 21.5 15.8132M8.18676 21.5C6.08705 21.3959 4.77792 21.0846 3.84664 20.1534C2.91537 19.2221 2.60406 17.9129 2.5 15.8132"
+                            stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        <path
+                            d="M19.6352 11.3178C19.8784 11.6224 20 11.7746 20 12C20 12.2254 19.8784 12.3776 19.6352 12.6822C18.5423 14.0504 15.7514 17 12 17C8.24862 17 5.45768 14.0504 4.36483 12.6822C4.12161 12.3776 4 12.2254 4 12C4 11.7746 4.12161 11.6224 4.36483 11.3178C5.45768 9.9496 8.24862 7 12 7C15.7514 7 18.5423 9.9496 19.6352 11.3178Z"
+                            stroke="currentColor" stroke-width="1.5" />
+                        <path
+                            d="M14 12C14 10.8954 13.1046 10 12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12Z"
+                            stroke="currentColor" stroke-width="1.5" />
+                    </svg>
+                    <p>Visitors</p>
+                </div>
+            </div>
+
+            <div id="leftDynamic"></div>
         </div>
 
         <!-- RIGHT SIDE -->
diff --git a/osinaweb/osinacore/templates/chat_templates/partials/new-chat-room.html b/osinaweb/osinacore/templates/chat_templates/partials/new-chat-room.html
index 63855b16..d74b8e1f 100644
--- a/osinaweb/osinacore/templates/chat_templates/partials/new-chat-room.html
+++ b/osinaweb/osinacore/templates/chat_templates/partials/new-chat-room.html
@@ -1,14 +1,21 @@
-<div data-roomid = {{chat_room.id}} data-session="{{chat_room.chatroomguest.visitor.session_id}}" class="chat-room w-full flex flex-col gap-1 py-3 px-3 border-b border-gray-100 text-sm cursor-pointer">
-    <div class="w-full flex justify-between items-center">
-        <p class="text-secondosiblue font-poppinsBold">{{chat_room.chatroomguest.visitor.ip_address}}</p>
+<div data-roomid={{chat_room.id}} data-session="{{chat_room.chatroomguest.visitor.session_id}}"
+class="chat-room w-full flex flex-col gap-1 py-4 px-3 border-b border-gray-200 text-sm cursor-pointer bg-white">
+<div class="w-full flex justify-between items-center">
+    <div class="w-full flex items-center gap-2">
+        <div class="w-[40px] h-[40px] rounded-full">
+            <img src="{{chat_room.chatroomguest.visitor.flag_image_url}}">
+        </div>
+        <div class="flex flex-col">
+            <p class="text-secondosiblue font-poppinsBold">{{chat_room.chatroomguest.visitor.ip_address}}</p>
+            <p class="text-gray-500 text-xs">{{chat_room.chatmessage_set.all.last.content}}</p>
 
-        <div data-roomid={{chat_room.id}}
-            class="unread w-[20px] h-[20px] bg-osiblue rounded-full shadow-md flex justify-center items-center text-white text-[10px] {% if chat_room.number_of_unread == 0 %} hidden {% endif %}">
-            <p>{{number_of_unread}}</p>
+            <p class="text-gray-500 opacity-70 text-xs">{{chat_room.last_updated}}</p>
         </div>
     </div>
 
-    <p class="text-gray-500 text-xs">{{chat_room.chatmessage_set.all.last.content}}</p>
-
-    <p class="text-gray-500 opacity-70 text-xs">{{chat_room.last_updated}}</p>
+    <div data-roomid={{chat_room.id}}
+        class="unread w-[20px] h-[20px] bg-osiblue rounded-full shadow-md flex justify-center items-center text-white text-[10px] {% if chat_room.number_of_unread == 0 %} hidden {% endif %}">
+        <p>{{number_of_unread}}</p>
+    </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/chat_templates/partials/rooms.html b/osinaweb/osinacore/templates/chat_templates/partials/rooms.html
index c9760162..b46c1675 100644
--- a/osinaweb/osinacore/templates/chat_templates/partials/rooms.html
+++ b/osinaweb/osinacore/templates/chat_templates/partials/rooms.html
@@ -1,50 +1,5 @@
-<!-- RECONNECTING LOADER -->
-<div id="roomsLoader"
-    class="w-full h-full absolute flex justify-center items-center bg-black bg-opacity-60 z-20 inset-0 rounded-l-md hidden">
-    <div class="flex flex-col justify-center items-center gap-2">
-        <p class="text-white">Reconneting</p>
-        <div class="w-fit flex gap-1 justify-start items-center">
-            <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md"></div>
-            <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md" style="animation-delay: 0.2s;"></div>
-            <div class="h-2 w-2 bg-white rounded-full animate-typing shadow-md" style="animation-delay: 0.4s;">
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- HEADER -->
-<div class="grid grid-cols-2 sticky top-0 z-10 rounded-l-md">
-    <div
-        class="w-full flex items-center justify-center gap-1 py-3 px-3 border-b border-gray-100 bg-white rounded-md shadow-md cursor-pointer text-secondosiblue">
-        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-            class="w-5">
-            <path stroke-linecap="round" stroke-linejoin="round"
-                d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 0 1 .865-.501 48.172 48.172 0 0 0 3.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z" />
-        </svg>
-        <p>Chats</p>
-    </div>
-
-
-    <div
-        class="w-full flex items-center justify-center gap-1 py-3 px-3 border-b border-gray-100 bg-gray-100 text-gray-400 cursor-pointer">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5" fill="none">
-            <path
-                d="M2.5 8.18677C2.60406 6.08705 2.91537 4.77792 3.84664 3.84664C4.77792 2.91537 6.08705 2.60406 8.18677 2.5M21.5 8.18677C21.3959 6.08705 21.0846 4.77792 20.1534 3.84664C19.2221 2.91537 17.9129 2.60406 15.8132 2.5M15.8132 21.5C17.9129 21.3959 19.2221 21.0846 20.1534 20.1534C21.0846 19.2221 21.3959 17.9129 21.5 15.8132M8.18676 21.5C6.08705 21.3959 4.77792 21.0846 3.84664 20.1534C2.91537 19.2221 2.60406 17.9129 2.5 15.8132"
-                stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
-            <path
-                d="M19.6352 11.3178C19.8784 11.6224 20 11.7746 20 12C20 12.2254 19.8784 12.3776 19.6352 12.6822C18.5423 14.0504 15.7514 17 12 17C8.24862 17 5.45768 14.0504 4.36483 12.6822C4.12161 12.3776 4 12.2254 4 12C4 11.7746 4.12161 11.6224 4.36483 11.3178C5.45768 9.9496 8.24862 7 12 7C15.7514 7 18.5423 9.9496 19.6352 11.3178Z"
-                stroke="currentColor" stroke-width="1.5" />
-            <path
-                d="M14 12C14 10.8954 13.1046 10 12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12Z"
-                stroke="currentColor" stroke-width="1.5" />
-        </svg>
-        <p>Visitors</p>
-    </div>
-</div>
-
-
 <!-- CHATS -->
-<div class="h-full flex flex-col text-secondosiblue" id="chatrooms">
+<div class="h-full flex flex-col" id="chatrooms">
     {% for chat_room in chat_rooms %}
     <div data-roomid={{chat_room.id}} data-session="{{chat_room.chatroomguest.visitor.session_id}}"
         class="chat-room w-full flex flex-col gap-1 py-4 px-3 border-b border-gray-200 text-sm cursor-pointer bg-white">
@@ -71,31 +26,6 @@
 </div>
 
 
-<!-- VISITORS -->
-<!-- <div class="h-full flex flex-col">
-    <div class="w-full py-3 px-3 border-b border-gray-200 flex items-center gap-2">
-        <div class="w-[20px] h-[20px] bg-green-600 rounded-full onlineDot">
-            <div class="wave"></div>
-        </div>
-
-        <p class="text-secondosiblue">Active</p>
-    </div>
-
-    <div class="w-full flex justify-between gap-2 items-center py-3 px-3 border-b border-gray-200 text-sm cursor-pointer bg-white">
-        <div class="w-full flex gap-2 items-center">
-            <div class="w-[40px] h-[40px] rounded-full bg-red-500"></div>
-
-            <div class="flex flex-col">   
-                <p class="text-secondosiblue font-poppinsBold">192.168.1.1092</p>
-                <p class="text-fifthosiblue text-xs">Web development</p>
-            </div>
-         
-        </div>
-
-        <p class="text-gray-500 text-sm">00:00</p>
-    </div>
-</div> -->
-
 
 <audio id="notification-sound" src="{{domain}}/static/notifications/osichat-notification.mp3" preload="auto"></audio>
 <audio id="out-notification-sound" src="{{domain}}/static/notifications/out-osichat-notification.wav"
diff --git a/osinaweb/osinacore/templates/chat_templates/partials/visitors.html b/osinaweb/osinacore/templates/chat_templates/partials/visitors.html
new file mode 100644
index 00000000..4af561b1
--- /dev/null
+++ b/osinaweb/osinacore/templates/chat_templates/partials/visitors.html
@@ -0,0 +1,30 @@
+<!-- VISITORS -->
+<div class="h-full flex flex-col" id="visitors">
+    <div class="w-full py-3 px-3 border-b border-gray-200 flex items-center gap-2">
+        <div class="w-[20px] h-[20px] bg-green-600 rounded-full onlineDot">
+            <div class="wave"></div>
+        </div>
+
+        <p class="text-secondosiblue">Active</p>
+    </div>
+
+    {% for visitor in visitors %}
+    <div class="w-full flex justify-between gap-2 items-center py-3 px-3 border-b border-gray-200 text-sm cursor-pointer bg-white">
+        <div class="w-full flex gap-2 items-center">
+            <div class="w-[40px] h-[40px] rounded-full">
+                <img src="{{visitor.flag_image_url}}">
+            </div>
+
+            <div class="flex flex-col">   
+                <p class="text-secondosiblue font-poppinsBold">{{visitor.ip_address}}</p>
+                <p class="text-fifthosiblue text-xs">{{visitor.visitorlog_set.all.last.url}}</p>
+            </div>
+         
+        </div>
+
+        <p class="text-gray-500 text-sm">00:00</p>
+    </div>
+    {% endfor %}
+</div> 
+
+ 
\ No newline at end of file
diff --git a/osinaweb/static/js/osichat-admin/chat-toggle.js b/osinaweb/static/js/osichat-admin/chat-toggle.js
index 91e05cc8..ce07f46c 100644
--- a/osinaweb/static/js/osichat-admin/chat-toggle.js
+++ b/osinaweb/static/js/osichat-admin/chat-toggle.js
@@ -1,5 +1,5 @@
 const openChatButton = document.getElementById('openChatContainer');
-const chatWidget = document.getElementById('chatWidget');
+const osichatWidget = document.getElementById('osichatWidget');
 const closeChatButton = document.getElementById('closeChatContainer');
 const conversation = document.getElementById('conversation');
 
@@ -8,14 +8,14 @@ function scrollToBottom() {
 }
 
 openChatButton.addEventListener('click', function () {
-    chatWidget.classList.remove('hidden');
+    osichatWidget.classList.remove('hidden');
     openChatButton.classList.add('hidden');
     closeChatButton.classList.remove('hidden');
     scrollToBottom();
 });
 
 function closeChat() {
-    chatWidget.classList.add('hidden');
+    osichatWidget.classList.add('hidden');
     openChatButton.classList.remove('hidden');
     closeChatButton.classList.add('hidden');
 }
diff --git a/osinaweb/static/js/osichat-admin/rooms.js b/osinaweb/static/js/osichat-admin/rooms.js
index a921c68a..97102345 100644
--- a/osinaweb/static/js/osichat-admin/rooms.js
+++ b/osinaweb/static/js/osichat-admin/rooms.js
@@ -30,10 +30,8 @@ function appendInnerConversationScript(div) {
 
 
 
-
-
-function getRooms(){
-    osichatroomsSocket = new WebSocket(`${admin_chat_ws_scheme}://${admin_chat_domain}/ws/osichat/rooms/`);
+function initializeOsichat(){
+    osichatroomsSocket = new WebSocket(`${admin_chat_ws_scheme}://${admin_chat_domain}/ws/osichat/`);
 
     osichatroomsSocket.onopen = function () {
         console.log('WebSocket connection to rooms established');
@@ -48,34 +46,39 @@ function getRooms(){
     osichatroomsSocket.onmessage = function (e) {
         const data = JSON.parse(e.data);
         const leftDiv = document.getElementById('widgetLeftSide');
+        const leftDynamicDiv = document.getElementById('leftDynamic');
         switch (data.event_type) {
             case 'get_chats':
-                leftDiv.innerHTML = data.html;
+                leftDynamicDiv.innerHTML = data.html;
                 appendInnerConversationScript(leftDiv);
                 break;
-            case 'new_update':
-                    const roomsContainer = document.getElementById('chatrooms');
-                    const chatRoomDiv = roomsContainer.querySelector(`.chat-room[data-roomid='${data.chatroom_id}']`);
-        
-                    if (chatRoomDiv) {
-                        chatRoomDiv.remove();  // Remove the existing chat room div
-                    }
 
-                    // Insert the new chat room HTML at the top of the container
-                    const newChatRoomDiv = document.createElement('div');
-                    newChatRoomDiv.innerHTML = data.html;
-                    roomsContainer.insertAdjacentElement('afterbegin', newChatRoomDiv.firstElementChild);
+            case 'get_visitors':
+                leftDynamicDiv.innerHTML = data.html;
+                break;
 
-                    if (parseInt(currentChatId) === parseInt(data.chatroom_id)) { 
-                        const unreadIndicator = roomsContainer.querySelector(`.unread[data-roomid='${data.chatroom_id}']`);
-                        if (unreadIndicator) {
-                            unreadIndicator.classList.add('hidden');  
-                        }
-                        if (!data.user) { // If it is sent by a guest play a notification sound for the guest
-                            const notificationSound = document.getElementById('notification-sound');
-                            notificationSound.play();
+            case 'new_chat_update':
+                const roomsContainer = document.getElementById('chatrooms');
+                const chatRoomDiv = roomsContainer.querySelector(`.chat-room[data-roomid='${data.chatroom_id}']`);
+        
+                if (chatRoomDiv) {
+                    chatRoomDiv.remove();  // Remove the existing chat room div
+                }
+                // Insert the new chat room HTML at the top of the container
+                const newChatRoomDiv = document.createElement('div');
+                newChatRoomDiv.innerHTML = data.html;
+                roomsContainer.insertAdjacentElement('afterbegin', newChatRoomDiv.firstElementChild);
+
+                if (parseInt(currentChatId) === parseInt(data.chatroom_id)) { 
+                    const unreadIndicator = roomsContainer.querySelector(`.unread[data-roomid='${data.chatroom_id}']`);
+                    if (unreadIndicator) {
+                        unreadIndicator.classList.add('hidden');  
+                    }
+                    if (!data.user) { // If it is sent by a guest play a notification sound for the guest
+                        const notificationSound = document.getElementById('notification-sound');
+                        notificationSound.play();
 
-                        }
+                    }
                     } else {
                         const unreadIndicator = roomsContainer.querySelector(`.unread[data-roomid='${data.chatroom_id}']`);
                         if (unreadIndicator) {
@@ -100,7 +103,7 @@ function getRooms(){
         showLoader();
         setTimeout(() => {
             console.log('Attempting to reconnect to WebSocket...');
-            getRooms();
+            initializeOsichat();
         }, 2000);
     };
 
@@ -118,4 +121,33 @@ function getRooms(){
 
 }
 
-getRooms();
\ No newline at end of file
+const chatsTab = document.getElementById('chatsTab');
+const visitorsTab = document.getElementById('visitorsTab');
+
+function switchToChats() {
+    chatsTab.classList.add('bg-white', 'text-secondosiblue', 'shadow-md');
+    chatsTab.classList.remove('bg-gray-100', 'text-gray-400');
+    visitorsTab.classList.add('bg-gray-100', 'text-gray-400');
+    visitorsTab.classList.remove('bg-white', 'text-secondosiblue', 'shadow-md');
+
+    osichatroomsSocket.send(JSON.stringify({
+        event_type: 'get_chats'
+    }));
+}
+
+function switchToVisitors() {
+    visitorsTab.classList.add('bg-white', 'text-secondosiblue', 'shadow-md');
+    visitorsTab.classList.remove('bg-gray-100', 'text-gray-400');
+    chatsTab.classList.add('bg-gray-100', 'text-gray-400');
+    chatsTab.classList.remove('bg-white', 'text-secondosiblue', 'shadow-md');
+
+    osichatroomsSocket.send(JSON.stringify({
+        event_type: 'get_visitors'
+    }));
+}
+
+chatsTab.addEventListener('click', switchToChats);
+visitorsTab.addEventListener('click', switchToVisitors);
+
+
+initializeOsichat();
\ No newline at end of file