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.

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
Show file tree
Hide file tree
Changes from all commits
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
79 changes: 71 additions & 8 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,89 @@ docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks"

### Start develop

1. Check out the source code.
2. Change to client dir in the repository root via cd client.

1. Check out source code.
2. Change to **/client** dir in the source dir.

```bash
cd client
```

4. Run yarn to install dependencies: .
3. Run yarn to install dependencies.

```bash
yarn install
```

5. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start`.
6. After the dev server starts successfully, it will be automatically opened in the default browser.
4. Start dev server:

```bash
LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start
```

5. After dev server starts successfully, it will be automatically opened in the default browser.

### Before submitting a pull request

In addition, before submitting a pull request, please make sure the following is done:

1. If you’ve fixed a bug or added code that should be tested and add unit test suite.
2. Run `yarn test` and ensure all test suites pass.
3. If you add new dependency, use yarn workspace lowcoder some-package to make sure yarn.lock is also updated.
2. Run test and ensure all test suites pass.

```bash
yarn test
```

3. If you add new dependency, use the yarn worspace tool to make sure yarn.lock is also updated.

```bash
yarn workspace lowcoder <package name>
```

### Developing and publishung UI components for Lowcoder

1. Initialization

Project initiation

```bash
yarn create Lowcoder-plugin <your plugin name>
```

Go to the project root

```bash
cd my-plugin
```

Start the development environment

```bash
yarn start
```

After executing yarn start, the browser is automatically opened and you enter the component development environment.
Please find more information in our [docs](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/develop-ui-components-for-apps)

2. Export components

To export all the components, use src/index.ts, for example:

```bash
import HelloWorldComp from "./HelloWorldComp";

export default {
hello_world: HelloWorldComp,
};
```

import HelloWorldComp from "./HelloWorldComp";

3. Publish plugins

When you finish developing and testing the plugin, you can publish it into the npm registry. Login in to the npm registry locally, and then execute the following command:

```bash
yarn build --publish
```

You can check a code demo here: [Code Demo on Github](https://github.com/lowcoder-org/lowcoder/tree/main/client/packages/lowcoder-plugin-demo)
2 changes: 1 addition & 1 deletion client/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0
2.1.4
2 changes: 1 addition & 1 deletion client/packages/lowcoder-comps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@fullcalendar/core": "^6.1.6",
"@fullcalendar/daygrid": "^6.1.6",
"@fullcalendar/interaction": "^6.1.6",
"@fullcalendar/list": "^6.1.6",
"@fullcalendar/list": "^6.1.9",
"@fullcalendar/moment": "^6.1.6",
"@fullcalendar/react": "^6.1.6",
"@fullcalendar/timegrid": "^6.1.6",
Expand Down
2 changes: 1 addition & 1 deletion client/packages/lowcoder/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@

<div id="root"></div>
<script type="module" src="/src/index.ts"></script>
<%- browserCheckScript %>
<!-- <%- browserCheckScript %> -->
</body>
</html>
2 changes: 1 addition & 1 deletion client/packages/lowcoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
},
"devDependencies": {
"@types/core-js": "^2.5.5",
"@types/intl": "^1.2.0",
"@types/intl": "^1.2.1",
"@types/papaparse": "^5.3.5",
"@types/regenerator-runtime": "^0.13.1",
"@types/uuid": "^8.3.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ function TabBarView(props: TabBarProps) {
activeKey={props.selectedKey}
>
{props.tabs.map((tab) => {
return <TabBarItem key={tab.key} icon={tab.icon} title={tab.title} />;
return (
<TabBarItem key={tab.key} icon={tab.icon} title={tab.title} />
);
})}
</TabBar>
</TabBarWrapper>
Expand Down Expand Up @@ -126,9 +128,18 @@ let MobileTabLayoutTmp = (function () {
const childrenMap = {
tabs: manualOptionsControl(TabOptionComp, {
initOptions: [
{ label: trans("optionsControl.optionI", { i: 1 }), icon: "/icon:solid/1" },
{ label: trans("optionsControl.optionI", { i: 2 }), icon: "/icon:solid/2" },
{ label: trans("optionsControl.optionI", { i: 3 }), icon: "/icon:solid/3" },
{
label: trans("optionsControl.optionI", { i: 1 }),
icon: "/icon:solid/1",
},
{
label: trans("optionsControl.optionI", { i: 2 }),
icon: "/icon:solid/2",
},
{
label: trans("optionsControl.optionI", { i: 3 }),
icon: "/icon:solid/3",
},
],
}),
};
Expand All @@ -138,7 +149,9 @@ let MobileTabLayoutTmp = (function () {
.setPropertyViewFn((children) => {
return (
<>
<Section name={trans("aggregation.tabBar")}>{children.tabs.propertyView({})}</Section>
<Section name={trans("aggregation.tabBar")}>
{children.tabs.propertyView({})}
</Section>
</>
);
})
Expand Down Expand Up @@ -168,7 +181,9 @@ MobileTabLayoutTmp = withViewFn(MobileTabLayoutTmp, (comp) => {
tabs={tabViews.map((tab, index) => ({
key: index,
title: tab.children.label.getView(),
icon: tab.children.icon.toJsonValue() ? tab.children.icon.getView() : undefined,
icon: tab.children.icon.toJsonValue()
? tab.children.icon.getView()
: undefined,
}))}
selectedKey={tabIndex + ""}
onChange={(key) => setTabIndex(Number(key))}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { CheckBox, controlItem, Switch, SwitchWrapper } from "lowcoder-design";
import { ReactNode } from "react";
import { ControlParams, SimpleComp } from "@lowcoder-ee/index.sdk";

export class BoolShareVideoControl extends SimpleComp<boolean> {
readonly IGNORABLE_DEFAULT_VALUE = false;
protected getDefaultValue(): boolean {
return false;
}

getPropertyView(): ReactNode {
return (
<Switch
value={this.value}
onChange={(x) => this.dispatchChangeValueAction(x)}
/>
);
}

propertyView(params: ControlParams & { type?: "switch" | "checkbox" }) {
return controlItem(
{ filterText: params.label },
<SwitchWrapper {...params}>
{params.type === "checkbox" ? (
<CheckBox
style={{ marginRight: "8px" }}
checked={this.value}
onChange={(x) => this.dispatchChangeValueAction(x.target.checked)}
/>
) : (
this.getPropertyView()
)}
</SwitchWrapper>
);
}
}
Loading