Skip to content

Dev -> Main to prepare V2.1.4 #476

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.

Sign up for GitHub

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

Merged
merged 31 commits into from
Nov 4, 2023
Merged

Dev -> Main to prepare V2.1.4 #476

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b9bce7c
added agora token
freddysundowner Oct 24, 2023
21aa2bb
feat: added set username and Fix: dublicate events
freddysundowner Oct 25, 2023
871e856
feat: speaking status to participant and local object
freddysundowner Oct 27, 2023
25a3e35
feat: removed dark screen when video ends streaming
freddysundowner Oct 27, 2023
e601b46
fix: trasmitting audio and video stream
freddysundowner Oct 27, 2023
d113fc2
fix: remove logs
freddysundowner Oct 27, 2023
691c42f
feat: added no text when there is no user
freddysundowner Oct 27, 2023
4a838cf
feat: added no text when there is no user
freddysundowner Oct 28, 2023
3ebf5bc
feat: added username when there is no video stream
freddysundowner Oct 28, 2023
ace706f
feat: added profile image url provision on video comp
freddysundowner Oct 31, 2023
26917d3
build(deps-dev): bump @types/intl from 1.2.0 to 1.2.1 in /client
dependabot[bot] Nov 1, 2023
ccf6612
build(deps): bump @fullcalendar/list from 6.1.8 to 6.1.9 in /client
dependabot[bot] Nov 1, 2023
3ae7d6f
build(deps): bump antd from 5.7.2 to 5.10.3 in /client
dependabot[bot] Nov 1, 2023
dd56bfb
fix: profile image styling
freddysundowner Nov 2, 2023
07bfe35
feat: changed share screen bool from string to switch
freddysundowner Nov 2, 2023
385b89f
fix: speaking bool on local user object
freddysundowner Nov 2, 2023
62c21f0
fix: profile image showing when audio is toggled
freddysundowner Nov 3, 2023
167211d
feat: exposed meeting active bool and also fixed image padding issue
freddysundowner Nov 3, 2023
4010b73
Fixes flaws in documentation
Nov 4, 2023
7506d33
outcommented Browsercheck in index.html
Nov 4, 2023
7d4efa5
fixed image and video aspect ratio
freddysundowner Nov 4, 2023
5366cd4
Fix Editable Aspect Ratio
Nov 4, 2023
e985886
Fix Version Display
Nov 4, 2023
a63026e
Merge pull request #455 from lowcoder-org/main
FalkWolsky Nov 4, 2023
f966e63
Merge branch 'dev' into agora-integrationn
FalkWolsky Nov 4, 2023
4ae1006
Merge pull request #474 from lowcoder-org/agora-integrationn
FalkWolsky Nov 4, 2023
9420af4
Merge pull request #462 from lowcoder-org/dependabot/npm_and_yarn/cli…
FalkWolsky Nov 4, 2023
c3a2540
Merge pull request #461 from lowcoder-org/dependabot/npm_and_yarn/cli…
FalkWolsky Nov 4, 2023
ce6d9b9
Merge pull request #459 from lowcoder-org/dependabot/npm_and_yarn/cli…
FalkWolsky Nov 4, 2023
cbec794
Revert "build(deps): bump antd from 5.7.2 to 5.10.3 in /client"
FalkWolsky Nov 4, 2023
c11ba71
Merge pull request #475 from lowcoder-org/revert-462-dependabot/npm_a…
FalkWolsky Nov 4, 2023
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
Prev Previous commit
Next Next commit
fix: profile image styling
  • Loading branch information
@freddysundowner
freddysundowner committed Nov 2, 2023
commit dd56bfb55068b5eea105087d11f6b201c06cf69d
7 changes: 2 additions & 5 deletions client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,7 @@ let MTComp = (function () {
volumeInfo.uid == userId &&
props.localUser.value.speaking != speaking
) {
props.localUser.onChange({
...props.localUser.value,
speaking,
});
props.localUser.value.speaking = speaking;
} else {
setUpdateVolume({ update: speaking, userid: volumeInfo.uid });
}
Expand Down Expand Up @@ -474,7 +471,7 @@ let MTComp = (function () {
{children.meetingName.propertyView({
label: trans("meeting.meetingName"),
})}

{children.placement.propertyView({
label: trans("drawer.placement"),
radioButton: true,
Expand Down
40 changes: 33 additions & 7 deletions client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng";

import {
MeetingEventHandlerControl,
StringControl,
StringStateControl,
hiddenPropertyView,
stringExposingStateControl,
Expand Down Expand Up @@ -72,6 +73,15 @@ const TextContainer = styled.div<{ $style: any }>`
justify-content: center;
${(props) => props.$style && getStyle(props.$style)}
`;
const ProfileImageContainer = styled.div<{ $style: any }>`
height: 100%;
width: 100%;
display: flex;
align-items: center;
position: absolute;
justify-content: center;
${(props) => props.$style && getStyle(props.$style)}
`;
const VideoContainer = styled.video<{ $style: any }>`
height: 100%;
width: 100%;
Expand Down Expand Up @@ -166,6 +176,8 @@ const typeOptions = [
export const meetingStreamChildren = {
autoHeight: withDefault(AutoHeightControl, "fixed"),
shareScreen: withDefault(BoolCodeControl, false),
profileImageHeight: withDefault(StringControl, "300px"),
profileImageWidth: withDefault(StringControl, "300px"),
type: dropdownControl(typeOptions, ""),
onEvent: MeetingEventHandlerControl,
disabled: BoolCodeControl,
Expand Down Expand Up @@ -311,16 +323,26 @@ let VideoCompBuilder = (function (props) {
$style={props.style}
>
<img
style={{ borderRadius: "50%" }}
style={{
borderRadius: "50%",
width: props.profileImageWidth,
height: props.profileImageHeight,
}}
src={props.profileImageUrl.value}
/>
{userName ?? "No Username"}
</TextContainer>
</>
) : (
// )
<TextContainer $style={props.style}>
<p>No Video</p>
<img
style={{
borderRadius: "50%",
width: props.profileImageWidth,
height: props.profileImageHeight,
}}
src={props.profileImageUrl.value}
/>
</TextContainer>
)}
</Container>
Expand All @@ -333,10 +355,6 @@ let VideoCompBuilder = (function (props) {
<>
<Section name={sectionNames.basic}>
{children.userId.propertyView({ label: trans("meeting.videoId") })}
{children.profileImageUrl.propertyView({
label: trans("meeting.profileImageUrl"),
placeholder: "https://via.placeholder.com/120",
})}
{children.autoHeight.getPropertyView()}
{children.shareScreen.propertyView({
label: trans("meeting.shareScreen"),
Expand All @@ -349,6 +367,14 @@ let VideoCompBuilder = (function (props) {
{hiddenPropertyView(children)}
</Section>
<Section name={sectionNames.style}>
{children.profileImageUrl.propertyView({
label: trans("meeting.profileImageUrl"),
placeholder: "https://via.placeholder.com/120",
})}
{children.profileImageHeight.propertyView({
label: "Profile Height",
})}
{children.profileImageWidth.propertyView({ label: "Profile Width" })}
{children.style.getPropertyView()}
</Section>
</>
Expand Down