Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8a8ee3f

Browse files
Merge pull request #413 from lowcoder-org/agora-integrationn
WIP: Agora integration
2 parents 8a4c0f6 + 447dd8e commit 8a8ee3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+5874
-141
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎client/packages/lowcoder-design/src/icons/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ export { ReactComponent as AudioCompIcon } from "./icon-insert-audio.svg";
168168
export { ReactComponent as VideoCompIcon } from "./icon-insert-video.svg";
169169
export { ReactComponent as videoPlayTriangle } from "./icon-video-play-triangle.svg";
170170
export { ReactComponent as DrawerCompIcon } from "./icon-drawer.svg";
171+
export { ReactComponent as LeftMeetingIcon } from "./icon-left-comp-video.svg";
171172
export { ReactComponent as PlusIcon } from "./icon-plus.svg";
172173
export { ReactComponent as HomeIcon } from "./icon-application-home.svg";
173174
export { ReactComponent as HomeModuleIcon } from "./icon-application-module.svg";
@@ -236,6 +237,7 @@ export { ReactComponent as LeftContainer } from "./icon-left-comp-container.svg"
236237
export { ReactComponent as LeftDate } from "./icon-left-comp-date.svg";
237238
export { ReactComponent as LeftDivider } from "./icon-left-comp-divider.svg";
238239
export { ReactComponent as LeftDrawer } from "./icon-left-comp-drawer.svg";
240+
export { ReactComponent as LeftMeeting } from "./icon-left-comp-video.svg";
239241
export { ReactComponent as LeftFile } from "./icon-left-comp-file.svg";
240242
export { ReactComponent as LeftFileViewer } from "./icon-left-comp-fileViewer.svg";
241243
export { ReactComponent as LeftForm } from "./icon-left-comp-form.svg";
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
version: '3'
2+
3+
services:
4+
mysql:
5+
image: mysql:8.0.22
6+
command: --default-authentication-plugin=mysql_native_password
7+
volumes:
8+
- mysqlvol:/var/lib/mysql
9+
- ./backup:/var/backup
10+
environment:
11+
MYSQL_ROOT_PASSWORD: defaultpassword
12+
ports:
13+
- "3306:3306"
14+
15+
redis:
16+
image: redis
17+
volumes:
18+
- redisvol:/data
19+
20+
taxi-rider-api:
21+
image: ridyio/ridy-rider-api
22+
restart: always
23+
depends_on:
24+
- "mysql"
25+
- "redis"
26+
- "taxi-admin-api"
27+
volumes:
28+
- ./img:/app/uploads
29+
- ./config-new:/app/config
30+
environment:
31+
- MYSQL_HOST=mysql
32+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
33+
- RIDER_SERVER_URL=http://x.x.x.x:4000
34+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
35+
- REDIS_HOST=redis
36+
ports:
37+
- "4000:3000"
38+
39+
taxi-driver-api:
40+
image: ridyio/ridy-driver-api
41+
restart: always
42+
depends_on:
43+
- "mysql"
44+
- "redis"
45+
- "taxi-admin-api"
46+
volumes:
47+
- ./img:/app/uploads
48+
- ./config-new:/app/config
49+
environment:
50+
- MYSQL_HOST=mysql
51+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
52+
- DRIVER_SERVER_URL=http://x.x.x.x:4002
53+
- REDIS_HOST=redis
54+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
55+
ports:
56+
- "4002:3000"
57+
58+
taxi-admin-api:
59+
image: ridyio/ridy-admin-api
60+
restart: always
61+
depends_on:
62+
- "mysql"
63+
- "redis"
64+
links:
65+
- mysql
66+
volumes:
67+
- ./img:/app/uploads
68+
- ./config-new:/app/config
69+
environment:
70+
- MYSQL_HOST=mysql
71+
- REDIS_HOST=redis
72+
ports:
73+
- "4001:3000"
74+
75+
taxi-admin-panel:
76+
image: ridyio/ridy-admin-panel
77+
restart: always
78+
volumes:
79+
- taxiassets:/usr/share/nginx/html/assets
80+
ports:
81+
- "4003:80"
82+
83+
payment-gateways:
84+
image: ridyio/delivery-gateway-box
85+
depends_on:
86+
- "taxi-rider-api"
87+
ports:
88+
- "3333:3333"
89+
environment:
90+
- MYSQL_HOST=mysql
91+
- TEST_MODE=true
92+
- MYSQL_DB=ridy
93+
- GATEWAY_SERVER_URL=http://x.x.x.x:3333
94+
- ENCRYPTION_KEY=lPw3ethAy4WqnWa3b4TAbCUJr89RifEs
95+
96+
volumes:
97+
redisvol:
98+
mysqlvol:
99+
taxiassets:

‎client/packages/lowcoder/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"@types/react-signature-canvas": "^1.0.2",
3737
"@types/react-test-renderer": "^18.0.0",
3838
"@types/react-virtualized": "^9.21.21",
39+
"agora-access-token": "^2.0.4",
40+
"agora-rtc-sdk-ng": "^4.19.0",
3941
"ali-oss": "^6.17.1",
4042
"antd": "5.7.2",
4143
"antd-img-crop": "^4.12.2",

‎client/packages/lowcoder/src/comps/comps/containerBase/utils.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export function oldContainerParamsToNew(params: any): any {
9595
container: { layout: params.value.layout, items: params.value.items },
9696
};
9797
const newParams = { ...params, value: newValue };
98+
// console.log("tempParams", newParams);
9899
// log.debug("params: ", params, "newParams: ", newParams);
99100
return newParams;
100101
}

‎client/packages/lowcoder/src/comps/comps/imageComp.tsx‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
import styled, { css } from "styled-components";
22
import { Section, sectionNames } from "lowcoder-design";
3-
import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl";
3+
import {
4+
clickEvent,
5+
eventHandlerControl,
6+
} from "../controls/eventHandlerControl";
47
import { StringStateControl } from "../controls/codeStateControl";
58
import { UICompBuilder, withDefault } from "../generators";
6-
import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing";
9+
import {
10+
NameConfig,
11+
NameConfigHidden,
12+
withExposingConfigs,
13+
} from "../generators/withExposing";
714
import { RecordConstructorToView } from "lowcoder-core";
815
import { useEffect, useRef, useState } from "react";
916
import _ from "lodash";
1017
import ReactResizeDetector from "react-resize-detector";
1118
import { styleControl } from "comps/controls/styleControl";
12-
import { ImageStyle, ImageStyleType, heightCalculator, widthCalculator } from "comps/controls/styleControlConstants";
19+
import {
20+
ImageStyle,
21+
ImageStyleType,
22+
heightCalculator,
23+
widthCalculator,
24+
} from "comps/controls/styleControlConstants";
1325
import { hiddenPropertyView } from "comps/utils/propertyUtils";
1426
import { trans } from "i18n";
1527
import { AutoHeightControl } from "comps/controls/autoHeightControl";
@@ -42,9 +54,9 @@ const getStyle = (style: ImageStyleType) => {
4254
img {
4355
border: 1px solid ${style.border};
4456
border-radius: ${style.radius};
45-
margin: ${style.margin};
46-
padding: ${style.padding};
47-
max-width: ${widthCalculator(style.margin)};
57+
margin: ${style.margin};
58+
padding: ${style.padding};
59+
max-width: ${widthCalculator(style.margin)};
4860
max-height: ${heightCalculator(style.margin)};
4961
}
5062
@@ -67,7 +79,7 @@ const ContainerImg = (props: RecordConstructorToView<typeof childrenMap>) => {
6779
setWidth(img.naturalWidth);
6880
setHeight(img.naturalHeight);
6981
};
70-
}
82+
};
7183

7284
useEffect(() => {
7385
const newImage = new Image(0, 0);
@@ -79,14 +91,16 @@ const ContainerImg = (props: RecordConstructorToView<typeof childrenMap>) => {
7991
};
8092
}, [props.src.value]);
8193

82-
useEffect(() =>{
94+
useEffect(() =>{
8395
if (height && width) {
8496
onResize();
8597
}
86-
}, [height, width])
98+
}, [height, width]);
8799

88100
// on safari
89101
const setStyle = (height: string, width: string) => {
102+
console.log(width, height);
103+
90104
const img = imgRef.current;
91105
const imgDiv = img?.getElementsByTagName("div")[0];
92106
const imgCurrent = img?.getElementsByTagName("img")[0];
@@ -117,7 +131,12 @@ const ContainerImg = (props: RecordConstructorToView<typeof childrenMap>) => {
117131
return (
118132
<ReactResizeDetector onResize={onResize}>
119133
<Container ref={conRef} $style={props.style}>
120-
<div ref={imgRef} style={props.autoHeight ? { width: "100%", height: "100%" } : undefined}>
134+
<div
135+
ref={imgRef}
136+
style={
137+
props.autoHeight ? { width: "100%", height: "100%" } : undefined
138+
}
139+
>
121140
<AntImage
122141
src={props.src.value}
123142
referrerPolicy="same-origin"
@@ -156,14 +175,18 @@ let ImageBasicComp = new UICompBuilder(childrenMap, (props) => {
156175
})}
157176
</Section>
158177

159-
<Section name={sectionNames.interaction}>{children.onEvent.getPropertyView()}</Section>
178+
<Section name={sectionNames.interaction}>
179+
{children.onEvent.getPropertyView()}
180+
</Section>
160181

161182
<Section name={sectionNames.layout}>
162183
{children.autoHeight.getPropertyView()}
163184
{hiddenPropertyView(children)}
164185
</Section>
165186

166-
<Section name={sectionNames.style}>{children.style.getPropertyView()}</Section>
187+
<Section name={sectionNames.style}>
188+
{children.style.getPropertyView()}
189+
</Section>
167190
</>
168191
);
169192
})

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /