Skip to content

Commit

Permalink
Bunch of Frontend Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
FalkWolsky committed Nov 21, 2023
1 parent f563ca6 commit b83ae94
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 15 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion client/packages/lowcoder-design/src/icons/icon-comment-comp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 20 additions & 1 deletion client/packages/lowcoder-design/src/icons/icon-mention-comp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 23 additions & 1 deletion client/packages/lowcoder-design/src/icons/icon-timeline-comp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 10 additions & 3 deletions client/packages/lowcoder-design/src/icons/icon-undo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 10 additions & 8 deletions client/packages/lowcoder/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1484,14 +1484,14 @@ export const en = {
broadCast: "BroadCast Messages",
title: "Meeting Title",
//ADDED BY FRED
meetingCompName: "Meeting Controller",
sharingCompName: "Video Share",
videoCompName: "Video Stream",
videoSharingCompName: "Screen Sharing",
meetingControlCompName: "Controls Buttons",
meetingCompDesc: "Meeting component",
meetingCompControls: "Meeting control",
meetingCompKeywords: "",
meetingCompName: "Agora Meeting Controller",
sharingCompName: "Screen share Stream",
videoCompName: "Camera Stream",
videoSharingCompName: "Screen share Stream",
meetingControlCompName: "Control Button",
meetingCompDesc: "Meeting Component",
meetingCompControls: "Meeting Control",
meetingCompKeywords: "Agora Meeting, Web Meeting, Collaboration",
//END
iconSize: "Icon Size",
userId: "userId",
Expand Down Expand Up @@ -1846,6 +1846,8 @@ export const en = {
preloadLibsEmpty: "No JavaScript libraries were added",
preloadLibsAddBtn: "Add a library",
saveSuccess: "Saved successfully",
AuthOrgTitle: "Workspace welcome Screen",
AuthOrgDescrition: "The URL for your users to Sign in to the current workspace.",
},
branding: {
title: "Branding",
Expand Down
19 changes: 19 additions & 0 deletions client/packages/lowcoder/src/pages/setting/idSource/list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { messageInstance, AddIcon } from "lowcoder-design";
import { currentOrgAdmin } from "../../../util/permissionUtils";
import CreateModal from "./createModal";
import _ from "lodash";
import { HelpText } from "components/HelpText";

export const IdSourceList = (props: any) => {
const user = useSelector(getUser);
Expand All @@ -44,6 +45,18 @@ export const IdSourceList = (props: any) => {
const [modalVisible, setModalVisible] = useState(false);
const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin;

let protocol = window.location.protocol;
const port = window.location.port;
let currentDomain = window.location.hostname;

// Show port only if it is not a standard port
if (port && port !== '80' && port !== '443') {
currentDomain += `:${port}`;
}

const redirectUrl = encodeURIComponent(`${protocol}//${currentDomain}/apps`);
const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login?redirectUrl=${encodeURIComponent(redirectUrl)}`;

useEffect(() => {
if (!currentOrgId) {
return;
Expand Down Expand Up @@ -154,6 +167,11 @@ export const IdSourceList = (props: any) => {
)}
/>
</TableStyled>

<div style={{ marginTop: 20, marginLeft: 12 }} className="section-title">{trans("advanced.AuthOrgTitle")}</div>
<HelpText style={{ marginBottom: 12, marginLeft: 12 }}>{trans("advanced.AuthOrgDescrition") + ": "}</HelpText>
<HelpText style={{ marginBottom: 12, marginLeft: 12 }}><a href={loginUrl} target="blank">{loginUrl}</a></HelpText>

</Level1SettingPageContentWithList>
<CreateModal
modalVisible={modalVisible}
Expand All @@ -167,3 +185,4 @@ export const IdSourceList = (props: any) => {
</>
);
};

0 comments on commit b83ae94

Please sign in to comment.