From 5d676ad351a8dae8f04efae38b077ed36d7e513b Mon Sep 17 00:00:00 2001 From: Miroslav Pejic Date: Tue, 18 Jan 2022 22:12:03 +0100 Subject: [PATCH] [mirotalksfu] - improve file transfer UI --- public/css/Room.css | 18 ++++++++++++++++-- public/images/share.png | Bin 0 -> 4340 bytes public/js/Room.js | 2 ++ public/js/RoomClient.js | 3 +++ public/view/Room.html | 7 +++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 public/images/share.png diff --git a/public/css/Room.css b/public/css/Room.css index a82488d..15b8cf3 100644 --- a/public/css/Room.css +++ b/public/css/Room.css @@ -524,6 +524,13 @@ emoji-picker { transform: translate(-50%, -50%); } +.center-img { + display: block; + margin-left: auto; + margin-right: auto; + width: 50%; +} + .fadein { -webkit-animation: fadeIn ease-in 1; -moz-animation: fadeIn ease-in 1; @@ -626,14 +633,16 @@ button:hover { overflow: hidden; } -#sendAbortBtn { +#sendAbortBtn, +#receiveHideBtn { padding: 5px; border-radius: 5px; color: white; background: transparent; } -#sendAbortBtn:hover { +#sendAbortBtn:hover, +#receiveHideBtn:hover { color: rgb(255, 0, 0); transform: var(--btns-hover-scale); transition: all 0.3s ease-in-out; @@ -644,6 +653,11 @@ progress { min-width: 100%; } +#imgShareSend:hover, +#imgShareReceive:hover { + cursor: move; +} + /*-------------------------------------------------------------- # Whiteboard --------------------------------------------------------------*/ diff --git a/public/images/share.png b/public/images/share.png new file mode 100644 index 0000000000000000000000000000000000000000..c3c7567ddcc8314c4d111f2d0d6b9eb0ab6e703f GIT binary patch literal 4340 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 b5r&`fdes>mZ##ATjRDYx76$eDE)V_>9FhY` literal 0 HcmV?d00001 diff --git a/public/js/Room.js b/public/js/Room.js index 2314e49..71f4696 100644 --- a/public/js/Room.js +++ b/public/js/Room.js @@ -481,6 +481,8 @@ function roomIsReady() { rc.makeDraggable(mySettings, mySettingsHeader); rc.makeDraggable(participants, participantsHeader); rc.makeDraggable(whiteboard, whiteboardHeader); + rc.makeDraggable(sendFileDiv, imgShareSend); + rc.makeDraggable(receiveFileDiv, imgShareReceive); if (navigator.getDisplayMedia || navigator.mediaDevices.getDisplayMedia) { show(startScreenButton); } diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js index d0761ad..1d014ad 100644 --- a/public/js/RoomClient.js +++ b/public/js/RoomClient.js @@ -25,6 +25,7 @@ const image = { user: '../images/participant.png', youtube: '../images/youtube.png', message: '../images/message.png', + share: '../images/share.png', }; const mediaType = { @@ -1778,6 +1779,8 @@ class RoomClient { Swal.fire({ allowOutsideClick: false, background: swalBackground, + imageAlt: 'mirotalksfu-file-sharing', + imageUrl: image.share, position: 'center', title: 'Share the file', input: 'file', diff --git a/public/view/Room.html b/public/view/Room.html index 1b8383d..81376fb 100644 --- a/public/view/Room.html +++ b/public/view/Room.html @@ -256,6 +256,7 @@ access to use this app.
+ mirotalksfu-share-send
@@ -263,6 +264,12 @@ access to use this app.
+ mirotalksfu-share-receive