Skip to content

Agora Meetings in lowcoder-comps - production ready #832

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

Merged
merged 22 commits into from
Apr 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aa8d8cc
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into dev
freddysundowner Feb 23, 2024
34aadee
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into dev
freddysundowner Mar 19, 2024
8e415b7
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into dev
freddysundowner Mar 21, 2024
0de683e
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into dev
freddysundowner Apr 4, 2024
84188bb
unfinished moving meeting comp to lowcoder-comps
freddysundowner Apr 9, 2024
3621bfe
unfinished moving meeting comp to lowcoder-comps
freddysundowner Apr 9, 2024
95c9de9
"unfinished agora meeting to lowcoder plugin"
freddysundowner Apr 11, 2024
25cda6a
with t constructor error
freddysundowner Apr 15, 2024
f678002
exported missing compos to lowcoder sdk
freddysundowner Apr 15, 2024
8952a66
Merge branch 'dev' of https://github.com/lowcoder-org/lowcoder into c…
freddysundowner Apr 15, 2024
bb1014a
moved agora meeting components to lowcoder-comps
freddysundowner Apr 15, 2024
b565318
exported missing comps to lowcoder-sdk
freddysundowner Apr 15, 2024
acfa2a1
fixed lowcoder-comps agora loading
freddysundowner Apr 15, 2024
ccfa3eb
fixed lowcoder-comps agora loading
freddysundowner Apr 15, 2024
7292e25
fixed meeting bug
freddysundowner Apr 20, 2024
019cc17
fixed meeting bug
freddysundowner Apr 20, 2024
0e982fa
fixed meeting bug
freddysundowner Apr 25, 2024
a91f142
fixed meeting bug on lowcoder-comp
freddysundowner Apr 25, 2024
dc59f88
Merge branch 'dev' into condition-load-agora
FalkWolsky Apr 28, 2024
550470c
Update package.json
FalkWolsky Apr 28, 2024
4d97714
Update loaders.tsx
FalkWolsky Apr 28, 2024
d6cbbaf
Update yarn.lock
FalkWolsky Apr 28, 2024
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
with t constructor error
  • Loading branch information
freddysundowner committed Apr 15, 2024
commit 25cda6ad6da0a761f4d31158331947842ea9d3bc
2 changes: 1 addition & 1 deletion client/packages/lowcoder-comps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"echarts-extension-gmap": "^1.6.0",
"echarts-wordcloud": "^2.1.0",
"lowcoder-cli": "workspace:^",
"lowcoder-sdk": "workspace:^",
"lowcoder-sdk": "/Users/la/Desktop/lowcoder-1/client/packages/lowcoder-sdk",
"mermaid": "^10.6.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,24 @@
import {
isValidColor,
NameConfig,
NameConfigHidden,
BoolControl,
UICompBuilder,
withDefault,
withExposingConfigs,
NumberControl,
StringControl,
hiddenPropertyView,
ChangeEventHandlerControl,
Section,
sectionNames,
dropdownControl,
styleControl,
ThemeContext,
CalendarStyle,
DateParser,
CustomModal,
jsonValueExposingStateControl,
CalendarDeleteIcon,
Tooltip,
BooleanStateControl,
AutoHeightControl,
stringStateControl,
InnerGrid,
useUserViewMode,
getData,
DrawerWrapper,
gridItemCompToGridItems,
Layers,
isNumeric,
EditorContext,
withMethodExposing,
eventHandlerControl,
EventOptions,
DrawerStyle,
PositionControl,
jsonObjectExposingStateControl,
Expand All @@ -43,10 +27,12 @@ import {
changeChildAction,
HintPlaceHolder,
styled,
BackgroundColorContext,
ContainerCompBuilder,
closeEvent,
} from "lowcoder-sdk";

import { BackgroundColorContext } from "../../../../lowcoder/src/comps/utils/backgroundColorContext";
import { ContainerCompBuilder } from "../../../../lowcoder/src/comps/comps/containerBase/containerCompBuilder";
const EventOptions = [closeEvent] as const;
import { Button } from "antd-mobile";
import { trans, getCalendarLocale } from "../../i18n/comps";
import {
Expand All @@ -55,7 +41,10 @@ import {
FirstDayOptions,
} from "./calendarConstants";
import { default as CloseOutlined } from "@ant-design/icons/CloseOutlined";

const DrawerWrapper = styled.div`
// Shield the mouse events of the lower layer, the mask can be closed in the edit mode to prevent the lower layer from sliding
pointer-events: auto;
`;
import AgoraRTC, {
type ICameraVideoTrack,
type IMicrophoneAudioTrack,
Expand All @@ -64,6 +53,7 @@ import AgoraRTC, {
type UID,
type ILocalVideoTrack,
} from "agora-rtc-sdk-ng";

import type { RtmChannel, RtmClient } from "agora-rtm-sdk";
import { useCallback, useContext, useEffect, useState } from "react";
// import { Drawer, changeChildAction } from "lowcoder-sdk/src";
Expand Down Expand Up @@ -98,34 +88,34 @@ let screenShareStream: ILocalVideoTrack;
let userId: UID | null | undefined;
let rtmChannelResponse: RtmChannel;
let rtmClient: RtmClient;
const ButtonStyle = styled(Button)`
position: absolute;
left: 0;
top: 0;
z-index: 10;
font-weight: 700;
box-shadow: none;
color: rgba(0, 0, 0, 0.45);
height: 54px;
width: 54px;

svg {
width: 16px;
height: 16px;
}

&,
:hover,
:focus {
background-color: transparent;
border: none;
}

:hover,
:focus {
color: rgba(0, 0, 0, 0.75);
}
`;
// const ButtonStyle = styled(Button)`
// position: absolute;
// left: 0;
// top: 0;
// z-index: 10;
// font-weight: 700;
// box-shadow: none;
// color: rgba(0, 0, 0, 0.45);
// height: 54px;
// width: 54px;

// svg {
// width: 16px;
// height: 16px;
// }

// &,
// :hover,
// :focus {
// background-color: transparent;
// border: none;
// }

// :hover,
// :focus {
// color: rgba(0, 0, 0, 0.75);
// }
// `;
const turnOnCamera = async (flag?: boolean) => {
if (videoTrack) {
return videoTrack.setEnabled(flag!);
Expand Down Expand Up @@ -532,10 +522,10 @@ let MTComp = (function () {
? transToPxSize(props.height || DEFAULT_SIZE)
: ""
}
onClose={(e) => {
onClose={(e: any) => {
props.visible.onChange(false);
}}
afterOpenChange={(visible) => {
afterOpenChange={(visible: any) => {
if (!visible) {
props.onEvent("close");
}
Expand All @@ -544,13 +534,14 @@ let MTComp = (function () {
maskClosable={props.maskClosable}
mask={props.showMask}
>
<ButtonStyle
<p>sfsd</p>
{/* <ButtonStyle
onClick={() => {
props.visible.onChange(false);
}}
>
<CloseOutlined />
</ButtonStyle>
</ButtonStyle> */}
<InnerGrid
{...otherContainerProps}
items={gridItemCompToGridItems(items)}
Expand Down