diff --git a/app/src/Server.js b/app/src/Server.js index 421e41af..e6dc4894 100644 --- a/app/src/Server.js +++ b/app/src/Server.js @@ -55,7 +55,7 @@ dev dependencies: { * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.98 + * @version 1.6.99 * */ diff --git a/package.json b/package.json index 3d8f37fb..788b38e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mirotalksfu", - "version": "1.6.98", + "version": "1.6.99", "description": "WebRTC SFU browser-based video calls", "main": "Server.js", "scripts": { diff --git a/public/js/Common.js b/public/js/Common.js index af46516a..7fcebcd7 100644 --- a/public/js/Common.js +++ b/public/js/Common.js @@ -224,11 +224,11 @@ function joinRoom() { const roomValid = isValidRoomName(roomName); if (!roomName) { - alert('Room name empty!\nPlease pick a room name.'); + popup('warning', 'Room name empty!\nPlease pick a room name.'); return; } if (!roomValid) { - alert('Invalid Room name!\nPath traversal pattern detected!'); + popup('warning', 'Invalid Room name!\nPath traversal pattern detected!'); return; } diff --git a/public/js/Login.js b/public/js/Login.js index 1e273f65..99e624fe 100644 --- a/public/js/Login.js +++ b/public/js/Login.js @@ -87,20 +87,20 @@ function login() { }) .catch(function (error) { console.error(error); - alert('Unauthorized'); + popup('warning', 'Invalid credentials. Please try again.'); }); return; } if (!username && !password) { - alert('Username and Password required'); + popup('warning', 'Username and Password required'); return; } if (!username) { - alert('Username required'); + popup('warning', 'Username required'); return; } if (!password) { - alert('Password required'); + popup('warning', 'Password required'); return; } } diff --git a/public/js/Room.js b/public/js/Room.js index 5fe643fd..e818e06d 100644 --- a/public/js/Room.js +++ b/public/js/Room.js @@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.98 + * @version 1.6.99 * */ @@ -4904,7 +4904,7 @@ function showAbout() { imageUrl: image.about, customClass: { image: 'img-about' }, position: 'center', - title: 'WebRTC SFU v1.6.98', + title: 'WebRTC SFU v1.6.99', html: `
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js index c28820d0..bd1dc045 100644 --- a/public/js/RoomClient.js +++ b/public/js/RoomClient.js @@ -9,7 +9,7 @@ * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 * @author Miroslav Pejic - miroslav.pejic.85@gmail.com - * @version 1.6.98 + * @version 1.6.99 * */ diff --git a/public/js/Utils.js b/public/js/Utils.js new file mode 100644 index 00000000..d20d4735 --- /dev/null +++ b/public/js/Utils.js @@ -0,0 +1,15 @@ +'use strict'; + +function popup(icon, text, position = 'center') { + Swal.fire({ + background: '#1D2026', + position: position, + icon: icon, + text: text, + color: '#FFFFFF', + confirmButtonColor: '#1A84F5', + showClass: { popup: 'animate__animated animate__fadeInDown' }, + hideClass: { popup: 'animate__animated animate__fadeOutUp' }, + }); +} +//... diff --git a/public/views/landing.html b/public/views/landing.html index b7e9ca52..4eefa6ab 100644 --- a/public/views/landing.html +++ b/public/views/landing.html @@ -39,6 +39,7 @@ + @@ -52,6 +53,7 @@ + @@ -628,8 +630,9 @@

Our advertisers

- + + diff --git a/public/views/login.html b/public/views/login.html index e43a29c6..557f4c61 100644 --- a/public/views/login.html +++ b/public/views/login.html @@ -56,6 +56,10 @@ crossorigin="anonymous" > + + + + @@ -65,12 +69,13 @@ - - + + +
@@ -250,6 +255,7 @@

+ diff --git a/public/views/newroom.html b/public/views/newroom.html index 67dbdcb6..8c39e0b3 100755 --- a/public/views/newroom.html +++ b/public/views/newroom.html @@ -38,7 +38,7 @@ - + @@ -48,6 +48,7 @@ + @@ -244,6 +245,7 @@

+