Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Threeveta web master #1

Open
wants to merge 110 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
863f5b1
adds custom threeveta styles
Jazastry Nov 4, 2020
4f4dc3f
initial js changes
Jazastry Nov 4, 2020
41d9580
wip commit
Jazastry Nov 17, 2020
5a59fec
removes make generated files
Jazastry Nov 17, 2020
ada1814
reverts interface_config.js to master
Jazastry Nov 17, 2020
afdd83b
Restore default override by env
kachar Nov 25, 2020
07a1bc4
Restore default override by env
kachar Nov 25, 2020
d122b5a
Merge remote-tracking branch 'origin/master' into threeveta-web-master
kachar Nov 25, 2020
43fbbd5
facelifts bottom controls, and starrts settings modal
Jazastry Nov 30, 2020
aeadf1c
Merge branch 'master' into threeveta-web-master
Jazastry Nov 30, 2020
d7eeeef
sets custom logo/watermark and background functionality
Jazastry Dec 2, 2020
42f1e26
disables participants connection stats popover dialog
Jazastry Dec 2, 2020
5a69e67
adds hangup button custom class
Jazastry Dec 2, 2020
5bb5e84
initial facelift
Jazastry Dec 2, 2020
31cd09b
fixes settings dialogs issues
Jazastry Dec 3, 2020
f605859
RN: hides the filmstrip for one_v_manu meetings
Jazastry Dec 3, 2020
b774bb0
updates the settings dialog selector
Jazastry Dec 3, 2020
373f56e
RN: adds mute participant fom filmstrip for provider
Jazastry Dec 4, 2020
6ffdbbe
RN: adds custom connection indicatior
Jazastry Dec 7, 2020
a11cf07
removes unnecessary TvtConnectionIndicatior type prop
Jazastry Dec 7, 2020
6876550
updates tile view indicators styling
Jazastry Dec 7, 2020
ebac457
updates tile view indicators styling
Jazastry Dec 7, 2020
24cebfb
RN: updates conference timer styling
Jazastry Dec 7, 2020
363d0fd
updates timer styles for larger time period
Jazastry Dec 7, 2020
5f4d3a0
RN: updates notifications appearance
Jazastry Dec 7, 2020
18f6227
RN: hides the support error message button
Jazastry Dec 7, 2020
b7756f7
RN: updates the watermark-logo styles
Jazastry Dec 8, 2020
2abb8fd
RN: updates main view connection indicator position
Jazastry Dec 8, 2020
813cf53
reverts webpack config, deletes unnecessary file
Jazastry Dec 9, 2020
8338851
reverts change in webpack config
Jazastry Dec 10, 2020
f3ca469
RN: updates connection related facelifts
Jazastry Dec 10, 2020
488b2ef
updates func. name and comment
Jazastry Dec 10, 2020
04f59fb
RN: settings fix + updates settings dialog styles
Jazastry Dec 10, 2020
6e6ff4b
RN: upgrades bottom controls + notification styles
Jazastry Dec 10, 2020
bb15777
Merge pull request #6 from threeveta/201-jitsi-facelift-update-connec…
kachar Dec 11, 2020
601d433
Merge pull request #8 from threeveta/216-jitsi-facelift-settings-dial…
kachar Dec 11, 2020
54b9146
updates bottom center controls
Jazastry Dec 11, 2020
65aef59
sunc watermark with timer background colors
Jazastry Dec 11, 2020
c9ea337
updgrades the notifications styling
Jazastry Dec 11, 2020
3c5d1e2
adds a color
Jazastry Dec 11, 2020
87be42d
updates the interfaceConfigWhitelist
Jazastry Dec 14, 2020
cc23d91
updates the SmallVideo component
Jazastry Dec 14, 2020
e422a73
adds dev jitsi expoerts directory
Jazastry Dec 14, 2020
ab06459
adds dev webpack fix
Jazastry Dec 14, 2020
5257ee2
adds dev webpack setyp fix
Jazastry Dec 14, 2020
32cff23
removes console.log
Jazastry Dec 14, 2020
fce6e30
fixes TvtConnectionIndicator
Jazastry Dec 14, 2020
7a46c96
updates webpack config
Jazastry Dec 14, 2020
fa9a452
Merge pull request #9 from threeveta/227-raise-hand-visual-bug
kachar Dec 15, 2020
1345c55
Merge branch 'threeveta-web-master' into 222-jitsi-facelift-update-fa…
Jazastry Dec 15, 2020
0fb483b
pdates webpack config
Jazastry Dec 15, 2020
523dbc8
removes unnecesary dev files
Jazastry Dec 15, 2020
5f3d623
updates webpack.config
Jazastry Dec 15, 2020
cda6afa
removes unnecessary files
Jazastry Dec 15, 2020
5aa19dc
Merge pull request #10 from threeveta/228-connection-meter-discrepancy
kachar Dec 15, 2020
c63dde7
updates tile view box-shadow
Jazastry Dec 15, 2020
6a3b013
updates audio settings dialog styles
Jazastry Dec 15, 2020
b136777
updates bottom settings dialogs
Jazastry Dec 15, 2020
13b11d4
updates participants styles
Jazastry Dec 15, 2020
25aae24
updates participants style
Jazastry Dec 15, 2020
f0ed6a0
updates participants styles
Jazastry Dec 15, 2020
71b9abd
Merge pull request #11 from threeveta/222-jitsi-facelift-update-facel…
iskrenvankov Dec 15, 2020
110aeb1
updates participant container styles
Jazastry Dec 16, 2020
66404c7
updates Subject (top-left) timer display logic
Jazastry Dec 16, 2020
1abe3a7
hides notifications in WaitingRoom
Jazastry Dec 16, 2020
2e055ca
Merge pull request #12 from threeveta/254-jitsi-facelift-small-upgrades
ivorcho Dec 16, 2020
970a71a
updates Jitsi external api with kickout and mute
Jazastry Dec 17, 2020
89948df
Merge pull request #13 from threeveta/250-jitsi-fing-better-jitsi-way…
iskrenvankov Dec 17, 2020
f195a6c
adds indicators to Subject component
Jazastry Dec 18, 2020
2a4d43b
adds styles for the Subject indicators
Jazastry Dec 18, 2020
1cfb052
removes console.log
Jazastry Dec 18, 2020
03205a5
Merge pull request #14 from threeveta/244-jitsi-facelift-create-top-l…
ivorcho Dec 18, 2020
d224a0a
removes wallcome page and FeedbackDialog
Jazastry Dec 28, 2020
069e974
Merge pull request #17 from threeveta/296-hide-jitsi-before-and-after…
kachar Dec 29, 2020
3eeb697
adds hide reload overlay by config functionality
Jazastry Jan 4, 2021
9893a39
hides the moderator incon in the top bar
Jazastry Jan 4, 2021
ee774ad
updates the implementation
Jazastry Jan 5, 2021
e52d169
reverts empty line addition
Jazastry Jan 5, 2021
593e45a
adds css mozzila/webkit prefixes
Jazastry Jan 5, 2021
1e87322
Merge pull request #19 from threeveta/315-hide-jitsi-reconnecting-screen
kachar Jan 5, 2021
945868d
Merge pull request #20 from threeveta/320-mozilla-visual-bug
kachar Jan 5, 2021
a8883f4
updates the share screen label css casing
Jazastry Jan 11, 2021
8f7abf5
updates translations casing
Jazastry Jan 11, 2021
f5b6602
adds user media permissions overlay conditional
Jazastry Jan 11, 2021
0cef224
removes unnecessary console.log
Jazastry Jan 11, 2021
edc218e
Merge pull request #21 from threeveta/341-fix-jitsi-sharescreen-and-v…
kachar Jan 12, 2021
a2b893f
Merge pull request #22 from threeveta/327-not-billed-voluntary-work-h…
kachar Jan 12, 2021
586b3d7
Skip host check on local development server
kachar Jan 22, 2021
32591ea
Pass the avatar url on participant-joined event
kachar Jan 22, 2021
4cc8464
Resolve circular dependencies
kachar Jan 25, 2021
af45de7
Hide participant count and add custom css for the meeting type
kachar Jan 25, 2021
896587e
Tweak top indicators to simplify the conference ui
kachar Jan 26, 2021
f2701ae
Adjust dominant speaker icon
kachar Jan 26, 2021
015960f
Provide a way to read user settings and always store the device in se…
kachar Jan 29, 2021
54c11c0
Double click video to toggle full screen mode
kachar Jan 29, 2021
ec32e3b
Merge pull request #25 from threeveta/device-updates
iskrenvankov Jan 31, 2021
fc83339
Move full screen handler up on the large web video
kachar Feb 1, 2021
9b3cc3b
Double click on filmstrip should go full screen
kachar Feb 1, 2021
36971d3
Double click on toolbox should go full screen
kachar Feb 1, 2021
0e17bb4
Fix alignment
kachar Feb 1, 2021
24480fb
Merge pull request #26 from threeveta/384-double-click-on-the-jitsi-b…
kachar Feb 1, 2021
10cd937
Make vertical videos be displayed in full height
kachar Feb 1, 2021
1207a2c
Update visuals of vertical video sides and shared screen blur
kachar Feb 1, 2021
a43ff00
Merge pull request #27 from threeveta/386-mobile-vertical-handling
kachar Feb 1, 2021
006a50f
Show full vertical videos and bring back black stripes
kachar Feb 1, 2021
61f8f46
Show full list of devices in meeting
kachar Feb 2, 2021
6202970
Show connection notification only once
kachar Feb 2, 2021
73579ff
Merge pull request #28 from threeveta/389-in-call-notifications-are-a…
kachar Feb 2, 2021
48eb2b7
Added a method to clear jitsi localstorage externally
kachar Feb 10, 2021
180db1c
Do not show ninja icon in connection indicator
kachar Mar 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions css/_videolayout_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
}
}
#largeVideoBackgroundContainer {
filter: blur(40px);
filter: blur(20px);
opacity: 0.4;
}

.videocontainer {
Expand Down Expand Up @@ -74,18 +75,19 @@
display: inline-block;
float: left;
pointer-events: all;
padding-left: 8px;
}
}

&__toolbar {
bottom: 0;
top: 13px;
height: $thumbnailToolbarHeight;
padding: 0 5px 0 5px;
}

&__toptoolbar {
$toolbarIconMargin: 5px;
top: 0;
top: 4px;
padding-bottom: 0;
/**
* Override text-align center as icons need to be left justified.
Expand Down
2 changes: 1 addition & 1 deletion css/filmstrip/_small_video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
& > video {
cursor: hand;
border-radius: $borderRadius;
object-fit: cover;
object-fit: contain;
overflow: hidden;
}

Expand Down
1 change: 1 addition & 0 deletions css/filmstrip/_vertical_filmstrip_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

.indicator-container {
float: none;
padding-left: 4px;
}

/**
Expand Down
1 change: 1 addition & 0 deletions css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,6 @@ $flagsImagePath: "../images/";
@import 'e2ee';
@import 'responsive';
@import 'connection-status';
@import 'threeveta';

/* Modules END */
220 changes: 220 additions & 0 deletions css/threeveta/_bottom-controls.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
// Bottom controls
$button-padding: 6px;

.button-group-left,
.button-group-right {
.toolbox-icon {
border-radius: 50% !important;
background: $main-white;
padding: $button-padding;
font-size: 11px !important;
&.toggled,
&:hover {
background: $inactive-gray !important;
}
svg {
fill: none !important;
}
&.labeled {
flex-direction: row;
align-items: center;
border-radius: 30px !important;
color: $main-gray;
text-transform: uppercase;
font-weight: bold;
width: fit-content;
width: -moz-fit-content;
width: -webkit-fit-content;
padding: $button-padding ($button-padding * 3);
.tvt-icon-label {
margin-left: 1em;
text-transform: none;
}
}
@media only screen and (max-width: 700px) {
&.labeled {
padding: $button-padding;
.tvt-icon-label {
display: none;
}
}
}
}
}
.button-group-center {
.toolbox-icon {
padding: $button-padding;
&:hover {
background: $gray-lighten4 !important;
border: 1px solid transparent !important;
}
&.toggled, {
background: $main-gray !important;
border: 1px solid transparent !important;
&:hover {
background: $gray-lighten !important;
}
}
}
.toolbox-button.tvt-hangup-button {
.toolbox-icon {
background-color: $error-color !important;
border: 1px solid $error-color !important;
}
}
.settings-button-small-icon {
&:hover {
background-color: $gray-lighten4;
}
}
}

// Bottom controls popup container
$popup-radius: 5px;
.toolbox-button-wth-dialog,
.audio-preview,
.video-preview {
div div:not(.jitsi-icon) {
border-radius: $popup-radius;
box-shadow: none;
}
}


@mixin popup {
background: $main-white;
border-radius: $popup-radius;
color: $main-gray !important;
font-size: 16px;
}
@mixin popup-item {
border-radius: 3px;
background: $main-white !important;
color: $main-gray !important;
&:hover {
background: $gray-lighten5 !important;
}
}

// Central bottom settings popup
.audio-preview-content {
@include popup;
padding: 9px 20px;
.audio-preview-header {
color: $main-gray;
padding-left: 0px;
&:last-child {
position: relative;
&:before {
content: ' ';
border-top: 1px solid $main-gray;
width: 80%;
left: 10%;
top: 0px;
position: absolute;
}
}
& .audio-preview-header-icon {
svg {
transform: scale(0.85);
}
}
}
.audio-preview-speaker,
.audio-preview-microphone {
@include popup-item;
&:hover {
.audio-preview-entry {
margin-left: 48px;
}
}
.audio-preview-entry {
background: transparent !important;
padding: 8px 0;
.audio-preview-entry-text {
color: $main-gray !important;
font-size: 14px;
}
&:last-child {
margin-bottom: 6px;
}
&.audio-preview-entry--selected {
margin-left: 21px;
}
}
.audio-preview-test-button {
border: 1px solid $accent2;
border-radius: 3px;
font-size: 9px;
padding: 3px 16px;
line-height: 16px;
color: $accent2;
text-transform: uppercase;
top: 8px;
right: 10px;
}
.audio-preview-meter-mic {
top: 14px;
right: 10px;
&.jitsi-icon.metr > svg {
fill: #E1E3EA;
transform: scale(1.5);
}
}
.audio-preview-icon--check {
background: transparent;
}
}
.audio-preview-speaker:last-child {
margin-bottom: 10px;
}
}
// Video preview dialog of the bottom center video settings button
$video-previw-border-radius: 5px;
.video-preview-container {
@include popup;
padding: 10px;
.video-preview {
border-radius: $video-previw-border-radius;
.video-preview-entry {
border-radius: $video-previw-border-radius;
&.video-preview-entry--selected {
border: 3px solid $accent2;
}
.video-preview-label {
border-radius: $video-previw-border-radius;
text-align: start;
bottom: 0px;
font-weight: bold;
}
.video-preview-overlay {
border-radius: 0px;
}
.video-preview-video {
border-radius: $video-previw-border-radius;
}
}
}
}

// Right side bottom popup
.new-toolbox {
.toolbox-background {
background-image: linear-gradient(to top, rgb(0 0 0 / 81%), rgb(0 0 0 / 0%));
z-index: 615;
}
.toolbox-content {
z-index: 616;
.overflow-menu {
@include popup;
padding: 7px;
.overflow-menu-item {
@include popup-item;
padding: 7px 12px;
&:hover {
background: $gray-lighten5 !important;
}
}
}
}
}
108 changes: 108 additions & 0 deletions css/threeveta/_connection-indicator.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
// Connection indicator
.tvt-connection-indicator,
.tvt-indicator {
position: relative;
text-align: center;
line-height: $thumbnailIndicatorSize;
padding: 0;
@include circle($thumbnailIndicatorSize);
box-sizing: border-box;
z-index: $zindex3;
color: $thumbnailPictogramColor;
width: 2em;
height: 2em;

.indicatoricon {
@include absoluteAligning();
}

.connection {
position: relative;
display: inline-block;
margin: 0 auto;
left: 0;
@include transform(translate(0, -50%));

&_empty,
&_lost {
color: #8b8b8b;
overflow: hidden;
}

&_full {
@include topLeft();
color: #ffffff;
overflow: hidden;
}

&_ninja {
font-size: 1.5em;
}
}

.icon-gsm-bars {
cursor: pointer;
font-size: 1em;
}
}

.videocontainer__toptoolbar {
.tvt-connection-indicator,
.tvt-indicator {
margin-left: 12px !important;
margin-top: 9px !important;
}
}

.tvt-connection-indicator {
&.status-high {
background: #63cc81;
}

&.status-med {
background: #e9da59;
}

&.status-other,
&.status-lost,
&.status-low {
$low-status-red: #ff4848;
background: $low-status-red;
&::after {
position: absolute;
left: 0px;
top: 0px;
content: " ";
width: 100%;
height: 100%;
border-radius: 50%;
@keyframes status-low-pulsate {
0% {
opacity: 0;
transition: opacity 0.5s ease-out;
}
25% {
opacity: 1;
transition: opacity 1s linear;
}

100% {
opacity: 0;
}
}
box-shadow: 0 0 11px 3px #ff4848d4;
opacity: 0;
animation: status-low-pulsate 2s infinite;
}
}
}

.tile-view {
.videocontainer {
.videocontainer__toptoolbar {
.tvt-connection-indicator {
font-size: 12px !important;
}
}
}
}
10 changes: 10 additions & 0 deletions css/threeveta/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@import 'variables';
@import 'pre-meeting';
@import 'main-video-area';
@import 'top-bar';
@import 'connection-indicator';
@import 'bottom-controls';
@import 'settings-dialog';
@import 'participants';
@import 'notifications';
@import 'watermark';
Loading