From 3815afa3b9499293aa77413aeaf2bde90a8e2743 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Mon, 6 Nov 2023 10:57:13 +0300 Subject: [PATCH 1/4] fixed audio toggle when meeting not active --- .../comps/comps/meetingComp/videoMeetingControllerComp.tsx | 5 +++++ .../src/comps/comps/meetingComp/videoMeetingStreamComp.tsx | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 13b6b86e1..9dd419d7e 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -540,6 +540,7 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + if (!comp.children.meetingActive.getView().value) return; let sharing = !comp.children.sharing.getView().value; await shareScreen(sharing); comp.children.sharing.change(sharing); @@ -552,6 +553,7 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + if (!comp.children.meetingActive.getView().value) return; let value = !comp.children.audioControl.getView().value; comp.children.localUser.change({ user: userId + "", @@ -570,6 +572,7 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + if (!comp.children.meetingActive.getView().value) return; let value = !comp.children.videoControl.getView().value; if (videoTrack) { videoTrack.setEnabled(value); @@ -633,6 +636,7 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + if (!comp.children.meetingActive.getView().value) return; let otherData = values != undefined && values[1] !== undefined ? values[1] : ""; let toUsers: any = @@ -684,6 +688,7 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + if (!comp.children.meetingActive.getView().value) return; let value = !comp.children.endCall.getView().value; comp.children.endCall.change(value); comp.children.meetingActive.change(false); diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 2b22ede61..6c268f1bb 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -246,7 +246,6 @@ let VideoCompBuilder = (function (props) { setUserId(userData.user); setUsername(userData.userName); - // console.log(userData); } }, [props.userId.value]); From 2e252af6b1d6e1411a2e8d3faaa7fe05e394edb1 Mon Sep 17 00:00:00 2001 From: freddysundowner Date: Tue, 7 Nov 2023 08:47:34 +0300 Subject: [PATCH 2/4] more fix and refactoring --- .../videoMeetingControllerComp.tsx | 147 +++++++++++------- .../meetingComp/videoMeetingStreamComp.tsx | 6 +- 2 files changed, 99 insertions(+), 54 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 9dd419d7e..0ab1d61d6 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -197,14 +197,6 @@ const publishVideo = async ( await rtmInit(appId, userId, channel); - const mediaStreamTrack = videoTrack.getMediaStreamTrack(); - if (mediaStreamTrack) { - const videoSettings = mediaStreamTrack.getSettings(); - const videoWidth = videoSettings.width; - const videoHeight = videoSettings.height; - // height.videoWidth.change(videoWidth); - // height.videoHeight.change(videoHeight); - } }; const sendMessageRtm = (message: any) => { @@ -278,12 +270,69 @@ let MTComp = (function () { }); const [rtmMessages, setRtmMessages] = useState([]); const [localUserSpeaking, setLocalUserSpeaking] = useState(false); + const [userJoined, setUserJoined] = useState(); + const [userLeft, setUserLeft] = useState(); useEffect(() => { - dispatch( - changeChildAction("participants", getData(userIds).data, false) - ); - }, [userIds]); + if (userJoined) { + let userData = { + user: userJoined.uid, + host: false, + audiostatus: userJoined.hasVideo, + }; + setUserIds((userIds: any) => [...userIds, userData]); + if (userIds.length == 0) { + userData.host = true; + } else { + userData.host = false; + } + dispatch( + changeChildAction( + "participants", + removeDuplicates(getData([...userIds, userData]).data, "user"), + false + ) + ); + } + }, [userJoined]); + function removeDuplicates(arr: any, prop: any) { + const uniqueObjects = []; + const seenValues = new Set(); + + for (const obj of arr) { + const objValue = obj[prop]; + + if (!seenValues.has(objValue)) { + seenValues.add(objValue); + uniqueObjects.push(obj); + } + } + + return uniqueObjects; + } + useEffect(() => { + if (userLeft) { + console.log("user left", userLeft.uid); + console.log("all users ", userIds); + let newUsers = userIds.filter( + (item: any) => item.user !== userLeft.uid + ); + console.log("after user left ", newUsers); + let hostExists = newUsers.filter((f: any) => f.host === true); + if (hostExists.length == 0 && newUsers.length > 0) { + newUsers[0].host = true; + hostChanged(newUsers); + } + setUserIds(newUsers); + dispatch( + changeChildAction( + "participants", + removeDuplicates(getData(newUsers).data, "user"), + false + ) + ); + } + }, [userLeft]); useEffect(() => { if (updateVolume.userid) { @@ -304,14 +353,12 @@ let MTComp = (function () { } }, [updateVolume]); - useEffect(() => { - if (props.endCall.value) { - let newUsers = userIds.filter((item: any) => item.user !== userId); - dispatch( - changeChildAction("participants", getData(newUsers).data, false) - ); - } - }, [props.endCall.value]); + // useEffect(() => { + // if (props.endCall.value) { + // let newUsers = userIds.filter((item: any) => item.user !== userId); + // changeChildAction("participants", getData([]).data, false); + // } + // }, [props.endCall.value]); useEffect(() => { if (rtmMessages) { @@ -333,17 +380,17 @@ let MTComp = (function () { } }, [localUserSpeaking]); - useEffect(() => { - if (props.localUser.value) { - let newUsers = userIds.filter((item: any) => item.user !== userId); - if (newUsers.length == 0) return; - newUsers = props.localUser.value; - let updatedUsers = [...userIds, newUsers]; - dispatch( - changeChildAction("participants", getData(updatedUsers).data, false) - ); - } - }, [props.localUser.value]); + // useEffect(() => { + // if (props.localUser.value) { + // let newUsers = userIds.filter((item: any) => item.user !== userId); + // if (newUsers.length == 0) return; + // newUsers = props.localUser.value; + // let updatedUsers = [...userIds, newUsers]; + // dispatch( + // changeChildAction("participants", getData(updatedUsers).data, false) + // ); + // } + // }, [props.localUser.value]); useEffect(() => { if (rtmChannelResponse) { @@ -363,29 +410,10 @@ let MTComp = (function () { if (client) { client.enableAudioVolumeIndicator(); client.on("user-joined", (user: IAgoraRTCRemoteUser) => { - let userData = { - user: user.uid, - host: false, - audiostatus: user.hasVideo, - }; - - if (userIds.length == 0) { - userData.host = true; - } else { - userData.host = false; - } - setUserIds((userIds: any) => [...userIds, userData]); + setUserJoined(user); }); client.on("user-left", (user: IAgoraRTCRemoteUser, reason: any) => { - let newUsers = userIds.filter( - (item: any) => item.user !== user.uid - ); - let hostExists = newUsers.filter((f: any) => f.host === true); - if (hostExists.length == 0 && newUsers.length > 0) { - newUsers[0].host = true; - hostChanged(newUsers); - } - setUserIds(newUsers); + setUserLeft(user); }); client.on("volume-indicator", (volumeInfos: any) => { if (volumeInfos.length == 0) return; @@ -689,6 +717,21 @@ MTComp = withMethodExposing(MTComp, [ }, execute: async (comp, values) => { if (!comp.children.meetingActive.getView().value) return; + let participants = comp.children.participants.getView() as []; + console.log("participants", participants); + + let newUsers = participants.filter((item: any) => item.user !== userId); + console.log("after user left ", newUsers); + let hostExists = newUsers.filter((f: any) => f.host === true); + // if (hostExists.length == 0 && newUsers.length > 0) { + // newUsers[0].host = true; + // hostChanged(newUsers); + // } + // setUserIds(newUsers); + // dispatch( + // changeChildAction("participants", getData(newUsers).data, false) + // ); + let value = !comp.children.endCall.getView().value; comp.children.endCall.change(value); comp.children.meetingActive.change(false); diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 6c268f1bb..329a1724e 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -290,7 +290,8 @@ let VideoCompBuilder = (function (props) { padding: props.profilePadding, }} > - - Date: Tue, 7 Nov 2023 11:17:55 +0300 Subject: [PATCH 3/4] fixed local/participant video toggle bug of showing mage/profile --- .../videoMeetingControllerComp.tsx | 73 ++++++------- .../meetingComp/videoMeetingStreamComp.tsx | 100 ++++++------------ 2 files changed, 69 insertions(+), 104 deletions(-) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx index 0ab1d61d6..427feabb3 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingControllerComp.tsx @@ -196,7 +196,6 @@ const publishVideo = async ( await client.publish(videoTrack); await rtmInit(appId, userId, channel); - }; const sendMessageRtm = (message: any) => { @@ -270,6 +269,8 @@ let MTComp = (function () { }); const [rtmMessages, setRtmMessages] = useState([]); const [localUserSpeaking, setLocalUserSpeaking] = useState(false); + const [localUserVideo, setLocalUserVideo] = + useState(); const [userJoined, setUserJoined] = useState(); const [userLeft, setUserLeft] = useState(); @@ -278,7 +279,8 @@ let MTComp = (function () { let userData = { user: userJoined.uid, host: false, - audiostatus: userJoined.hasVideo, + audiostatus: userJoined.hasAudio, + streamingVideo: true, }; setUserIds((userIds: any) => [...userIds, userData]); if (userIds.length == 0) { @@ -312,12 +314,9 @@ let MTComp = (function () { } useEffect(() => { if (userLeft) { - console.log("user left", userLeft.uid); - console.log("all users ", userIds); let newUsers = userIds.filter( (item: any) => item.user !== userLeft.uid ); - console.log("after user left ", newUsers); let hostExists = newUsers.filter((f: any) => f.host === true); if (hostExists.length == 0 && newUsers.length > 0) { newUsers[0].host = true; @@ -353,12 +352,18 @@ let MTComp = (function () { } }, [updateVolume]); - // useEffect(() => { - // if (props.endCall.value) { - // let newUsers = userIds.filter((item: any) => item.user !== userId); - // changeChildAction("participants", getData([]).data, false); - // } - // }, [props.endCall.value]); + useEffect(() => { + let prevUsers: [] = props.participants as []; + const updatedItems = prevUsers.map((userInfo: any) => { + if (userInfo.user === localUserVideo?.uid) { + return { ...userInfo, streamingVideo: localUserVideo?.hasVideo }; + } + return userInfo; + }); + dispatch( + changeChildAction("participants", getData(updatedItems).data, false) + ); + }, [localUserVideo?.hasVideo]); useEffect(() => { if (rtmMessages) { @@ -369,7 +374,7 @@ let MTComp = (function () { }, [rtmMessages]); useEffect(() => { - if (localUserSpeaking === true) { + if (localUserSpeaking === true || localUserVideo) { let localObject = { user: userId + "", audiostatus: props.audioControl.value, @@ -380,18 +385,6 @@ let MTComp = (function () { } }, [localUserSpeaking]); - // useEffect(() => { - // if (props.localUser.value) { - // let newUsers = userIds.filter((item: any) => item.user !== userId); - // if (newUsers.length == 0) return; - // newUsers = props.localUser.value; - // let updatedUsers = [...userIds, newUsers]; - // dispatch( - // changeChildAction("participants", getData(updatedUsers).data, false) - // ); - // } - // }, [props.localUser.value]); - useEffect(() => { if (rtmChannelResponse) { rtmClient.on("MessageFromPeer", function (message, peerId) { @@ -429,6 +422,21 @@ let MTComp = (function () { } }); }); + + client.on( + "user-published", + async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { + setLocalUserVideo(user); + } + ); + client.on( + "user-unpublished", + (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { + console.log("user-unpublished"); + + setLocalUserVideo(user); + } + ); } }, [client]); @@ -600,13 +608,16 @@ MTComp = withMethodExposing(MTComp, [ params: [], }, execute: async (comp, values) => { + //check if meeting is active if (!comp.children.meetingActive.getView().value) return; + //toggle videoControl let value = !comp.children.videoControl.getView().value; if (videoTrack) { videoTrack.setEnabled(value); } else { await turnOnCamera(value); } + //change my local user data let localData = { user: userId + "", streamingVideo: value, @@ -717,20 +728,6 @@ MTComp = withMethodExposing(MTComp, [ }, execute: async (comp, values) => { if (!comp.children.meetingActive.getView().value) return; - let participants = comp.children.participants.getView() as []; - console.log("participants", participants); - - let newUsers = participants.filter((item: any) => item.user !== userId); - console.log("after user left ", newUsers); - let hostExists = newUsers.filter((f: any) => f.host === true); - // if (hostExists.length == 0 && newUsers.length > 0) { - // newUsers[0].host = true; - // hostChanged(newUsers); - // } - // setUserIds(newUsers); - // dispatch( - // changeChildAction("participants", getData(newUsers).data, false) - // ); let value = !comp.children.endCall.getView().value; comp.children.endCall.change(value); diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx index 329a1724e..2218ba0c3 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/videoMeetingStreamComp.tsx @@ -169,19 +169,6 @@ let VideoCompBuilder = (function (props) { useEffect(() => { if (props.userId.value !== "") { let userData = JSON.parse(props.userId?.value); - if ( - userData.user === userId && - userData.streamingVideo === false && - videoRef.current && - videoRef.current?.id === userId + "" - ) { - if (videoRef.current && videoRef.current?.id === userId + "") { - videoRef.current.srcObject = null; - setVideo(false); - } - } else { - setVideo(true); - } client.on( "user-published", async (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { @@ -219,6 +206,8 @@ let VideoCompBuilder = (function (props) { client.on( "user-unpublished", (user: IAgoraRTCRemoteUser, mediaType: "video" | "audio") => { + console.log("user-unpublished"); + if (mediaType === "audio") { if ( !user.hasAudio && @@ -246,6 +235,7 @@ let VideoCompBuilder = (function (props) { setUserId(userData.user); setUsername(userData.userName); + setVideo(userData.streamingVideo); } }, [props.userId.value]); @@ -268,62 +258,40 @@ let VideoCompBuilder = (function (props) { }} > {userId ? ( - showVideo ? ( - props.onEvent("videoClicked")} - ref={videoRef} - style={{ - display: `${showVideo ? "flex" : "none"}`, - aspectRatio: props.videoAspectRatio, - borderRadius: props.style.radius, - width: "auto", - }} - id={props.shareScreen ? "share-screen" : userId} - > - ) : ( -
- -

{userName ?? ""}

-
- ) - ) : ( -
props.onEvent("videoClicked")} + ref={videoRef} style={{ - flexDirection: "column", - display: "flex", - alignItems: "center", - margin: "0 auto", - padding: props.profilePadding, + display: `${showVideo ? "flex" : "none"}`, + aspectRatio: props.videoAspectRatio, + borderRadius: props.style.radius, + width: "auto", }} - > - -

{userName ?? ""}

-
+ id={props.shareScreen ? "share-screen" : userId} + > + ) : ( + <> )} +
+ +

{userName ?? ""}

+
)} From 39dbe795dd640e454b910a7b00304e36345048b2 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Fri, 10 Nov 2023 17:52:30 +0100 Subject: [PATCH 4/4] fix branding by ENV --- client/packages/lowcoder-cli/client.d.ts | 8 ++------ client/packages/lowcoder-dev-utils/buildVars.js | 16 ---------------- client/packages/lowcoder/index.html | 6 ------ client/packages/lowcoder/src/app-env.d.ts | 4 ---- .../lowcoder/src/components/PageSkeleton.tsx | 11 +++++------ client/packages/lowcoder/src/index.ts | 4 ---- .../lowcoder/src/pages/common/header.tsx | 10 ++++------ .../lowcoder/src/pages/userAuth/login.tsx | 9 ++------- .../lowcoder/src/pages/userAuth/register.tsx | 9 ++------- 9 files changed, 15 insertions(+), 62 deletions(-) diff --git a/client/packages/lowcoder-cli/client.d.ts b/client/packages/lowcoder-cli/client.d.ts index 2959f3bb7..6fdc538b4 100644 --- a/client/packages/lowcoder-cli/client.d.ts +++ b/client/packages/lowcoder-cli/client.d.ts @@ -8,8 +8,8 @@ declare module "*.svg" { React.SVGProps & { title?: string } >; - const src: string; - export default src; + // const src: string; + // export default src; } declare module "*.md" { @@ -31,10 +31,6 @@ declare var REACT_APP_LANGUAGES: string; declare var REACT_APP_COMMIT_ID: string; declare var REACT_APP_API_HOST: string; declare var LOWCODER_NODE_SERVICE_URL: string; -declare var REACT_APP_LOWCODER_SHOW_BRAND: string; -declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string; -declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string; -declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; declare var REACT_APP_ENV: string; declare var REACT_APP_BUILD_ID: string; declare var REACT_APP_LOG_LEVEL: string; diff --git a/client/packages/lowcoder-dev-utils/buildVars.js b/client/packages/lowcoder-dev-utils/buildVars.js index baaeb0131..7087c85ac 100644 --- a/client/packages/lowcoder-dev-utils/buildVars.js +++ b/client/packages/lowcoder-dev-utils/buildVars.js @@ -19,22 +19,6 @@ export const buildVars = [ name: "REACT_APP_API_HOST", defaultValue: "", }, - { - name: "REACT_APP_LOWCODER_SHOW_BRAND", - defaultValue: 'false', - }, - { - name: "REACT_APP_LOWCODER_CUSTOM_LOGO", - defaultValue: '', - }, - { - name: "REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE", - defaultValue: '', - }, - { - name: "REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT", - defaultValue: '', - }, { name: "LOWCODER_NODE_SERVICE_URL", defaultValue: "", diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 6d3750b31..2a45e2639 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -96,11 +96,5 @@
- diff --git a/client/packages/lowcoder/src/app-env.d.ts b/client/packages/lowcoder/src/app-env.d.ts index 4a67d01bd..92184884d 100644 --- a/client/packages/lowcoder/src/app-env.d.ts +++ b/client/packages/lowcoder/src/app-env.d.ts @@ -34,10 +34,6 @@ declare var REACT_APP_LANGUAGES: string; declare var REACT_APP_COMMIT_ID: string; declare var REACT_APP_API_HOST: string; declare var LOWCODER_NODE_SERVICE_URL: string; -declare var REACT_APP_LOWCODER_SHOW_BRAND: string; -declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string; -declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string; -declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; declare var REACT_APP_ENV: string; declare var REACT_APP_BUILD_ID: string; declare var REACT_APP_LOG_LEVEL: string; diff --git a/client/packages/lowcoder/src/components/PageSkeleton.tsx b/client/packages/lowcoder/src/components/PageSkeleton.tsx index bf3455f24..d3bf0fcdb 100644 --- a/client/packages/lowcoder/src/components/PageSkeleton.tsx +++ b/client/packages/lowcoder/src/components/PageSkeleton.tsx @@ -78,15 +78,13 @@ export default function PageSkeleton(props: IProps) { ); + // {/* headerStart={REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? logo : : } */} + return ( {!hideHeader && isHeaderReady && ( -
: : - - } +
} style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }} /> )} @@ -95,5 +93,6 @@ export default function PageSkeleton(props: IProps) { {!hideContent && skeleton} + ); } diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts index 77336f089..97fc259c0 100644 --- a/client/packages/lowcoder/src/index.ts +++ b/client/packages/lowcoder/src/index.ts @@ -34,10 +34,6 @@ debug(`REACT_APP_LANGUAGES:, ${REACT_APP_LANGUAGES}`); debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`); debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`); debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`); -debug(`REACT_APP_LOWCODER_SHOW_BRAND:, ${REACT_APP_LOWCODER_SHOW_BRAND}`); -debug(`REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT:, ${REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT}`); -debug(`LOWCODER_CUSTOM_LOGO:, ${REACT_APP_LOWCODER_CUSTOM_LOGO}`); -debug(`LOWCODER_CUSTOM_LOGO_SQUARE:, ${REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE}`); try { bootstrap(); diff --git a/client/packages/lowcoder/src/pages/common/header.tsx b/client/packages/lowcoder/src/pages/common/header.tsx index 57a3e80b6..0b481fa1b 100644 --- a/client/packages/lowcoder/src/pages/common/header.tsx +++ b/client/packages/lowcoder/src/pages/common/header.tsx @@ -290,9 +290,8 @@ export default function Header(props: HeaderProps) { const headerStart = ( <> history.push(ALL_APPLICATIONS_URL)}> - {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? - REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? logo : : - } + {/* {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? logo : : } */} + {editName ? ( @@ -434,9 +433,8 @@ export function AppHeader() { const brandingConfig = useSelector(getBrandingConfig); const headerStart = ( history.push(ALL_APPLICATIONS_URL)}> - {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? - REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? logo : : - } + {/* {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? logo : : } */} + ); const headerEnd = ; diff --git a/client/packages/lowcoder/src/pages/userAuth/login.tsx b/client/packages/lowcoder/src/pages/userAuth/login.tsx index 8717b4962..67b791a7d 100644 --- a/client/packages/lowcoder/src/pages/userAuth/login.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/login.tsx @@ -131,13 +131,8 @@ function Login() { loginCardView = thirdPartyLoginView; } - const loginHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" - ? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT - : getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName) - - const loginSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" - ? trans("userAuth.poweredByLowcoder") - : '' + const loginHeading = getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName) + const loginSubHeading = '' // REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? trans("userAuth.poweredByLowcoder") : '' return (