diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index bf5a2032..8f8a2ac5 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/input.css b/osinaweb/input.css index 36b451d1..090b9a05 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -420,4 +420,39 @@ #closeChatContainer { display: none !important; } -} */ \ No newline at end of file +} */ + + +/* TO ANIMATE TEH GREEN LIVE BUTTON NEXT TO USER IN MOBILE SIDE BAR */ +@keyframes wave { + 0% { + transform: scale(1); + opacity: 0.8; + } + + 100% { + transform: scale(2); + opacity: 0; + } +} + +.onlineDot { + width: 15px; + height: 15px; + background-color: #1ABC9C; + /* Fallback color */ + border-radius: 50%; + position: relative; +} + +/* Creating gradient waves */ +.wave { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + border-radius: 100%; + animation: wave 1.5s linear infinite; + background: radial-gradient(circle, rgba(23, 1, 1, 0.377) 40%, rgba(5, 158, 41, 0.712) 80%, rgba(10, 147, 5, 0.499) 100%); +} \ No newline at end of file diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc index b471c4ba..1c0d6d63 100644 Binary files a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc and b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc differ diff --git a/osinaweb/osichat/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc index 38bca7e0..4756bcea 100644 Binary files a/osinaweb/osichat/__pycache__/models.cpython-310.pyc and b/osinaweb/osichat/__pycache__/models.cpython-310.pyc differ diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py index 439f2172..ed259a15 100644 --- a/osinaweb/osichat/consumers.py +++ b/osinaweb/osichat/consumers.py @@ -182,7 +182,7 @@ class OsitcomChatRooms(WebsocketConsumer): class OsitcomChatRoom(WebsocketConsumer): def connect(self): - self.domain = 'https://osina.ositcom.com' + self.domain = 'http://192.168.1.109:8000' self.session_id = self.scope['url_route']['kwargs']['session_id'] self.visitor = Visitor.objects.filter(session_id=self.session_id).last() if not self.visitor: diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py index 9d4587f2..0937c392 100644 --- a/osinaweb/osichat/models.py +++ b/osinaweb/osichat/models.py @@ -17,7 +17,7 @@ class Visitor(models.Model): email = models.CharField(max_length=100, null=True, blank=True) @property def flag_image_url(self): - flag_url = f"https://flagcdn.com/w320/{self.country.lower()}.webp" + flag_url = f"http://192.168.1.109:8000/static/images/flags/{self.country.lower()}.svg/" return flag_url diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc index a817a3fd..02781699 100644 Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/api/views.py b/osinaweb/osinacore/api/views.py index 0bd0f96d..01ebcd88 100644 --- a/osinaweb/osinacore/api/views.py +++ b/osinaweb/osinacore/api/views.py @@ -32,4 +32,4 @@ def login_user(request): return errorRes(msg=str(err)) except Exception as e: print(e) - return errorRes(default=True) + return errorRes(msg=str(e)) \ 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 f48e1fd4..c9760162 100644 --- a/osinaweb/osinacore/templates/chat_templates/partials/rooms.html +++ b/osinaweb/osinacore/templates/chat_templates/partials/rooms.html @@ -1,5 +1,6 @@ -