Skip to content

Commit beb8290

Browse files
author
FalkWolsky
committed
Make ENV Vars accessible in Web-App
1 parent e659406 commit beb8290

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

‎client/packages/lowcoder-cli/client.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ declare var REACT_APP_LANGUAGES: string;
3131
declare var REACT_APP_COMMIT_ID: string;
3232
declare var REACT_APP_API_HOST: string;
3333
declare var LOWCODER_NODE_SERVICE_URL: string;
34-
declare var LOWCODER_SHOW_BRAND: string;
35-
declare var LOWCODER_CUSTOM_LOGO: string;
36-
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
37-
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
34+
declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
35+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
36+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
37+
declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
3838
declare var REACT_APP_ENV: string;
3939
declare var REACT_APP_BUILD_ID: string;
4040
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder-dev-utils/buildVars.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ export const buildVars = [
2020
defaultValue: "",
2121
},
2222
{
23-
name: "LOWCODER_SHOW_BRAND",
23+
name: "REACT_APP_LOWCODER_SHOW_BRAND",
2424
defaultValue: 'false',
2525
},
2626
{
27-
name: "LOWCODER_CUSTOM_LOGO",
27+
name: "REACT_APP_LOWCODER_CUSTOM_LOGO",
2828
defaultValue: '',
2929
},
3030
{
31-
name: "LOWCODER_CUSTOM_LOGO_SQUARE",
31+
name: "REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE",
3232
defaultValue: '',
3333
},
3434
{
35-
name: "LOWCODER_NODE_SERVICE_URL",
36-
defaultValue: "",
35+
name: "REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
36+
defaultValue: '',
3737
},
3838
{
39-
name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
39+
name: "LOWCODER_NODE_SERVICE_URL",
4040
defaultValue: "",
4141
},
4242
{

‎client/packages/lowcoder/src/app-env.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ declare var REACT_APP_LANGUAGES: string;
3434
declare var REACT_APP_COMMIT_ID: string;
3535
declare var REACT_APP_API_HOST: string;
3636
declare var LOWCODER_NODE_SERVICE_URL: string;
37-
declare var LOWCODER_SHOW_BRAND: string;
38-
declare var LOWCODER_CUSTOM_LOGO: string;
39-
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
40-
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
37+
declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
38+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
39+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
40+
declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
4141
declare var REACT_APP_ENV: string;
4242
declare var REACT_APP_BUILD_ID: string;
4343
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder/src/components/PageSkeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export default function PageSkeleton(props: IProps) {
8383
{!hideHeader && isHeaderReady && (
8484
<Header
8585
headerStart={
86-
LOWCODER_SHOW_BRAND === 'true' ?
87-
LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> :
86+
REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
87+
REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> :
8888
<StyledLogoHome branding={true} />
8989
}
9090
style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}

‎client/packages/lowcoder/src/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`);
3535
debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
3636
debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
3737

38+
debug(`REACT_APP_LOWCODER_SHOW_BRAND:, ${REACT_APP_LOWCODER_SHOW_BRAND}`);
39+
debug(`REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT:, ${REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT}`);
40+
debug(`LOWCODER_CUSTOM_LOGO:, ${REACT_APP_LOWCODER_CUSTOM_LOGO}`);
41+
debug(`LOWCODER_CUSTOM_LOGO_SQUARE:, ${REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE}`);
42+
3843
try {
3944
bootstrap();
4045
hideLoading();

‎client/packages/lowcoder/src/pages/common/header.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ export default function Header(props: HeaderProps) {
290290
const headerStart = (
291291
<>
292292
<StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
293-
{LOWCODER_SHOW_BRAND === 'true' ?
294-
LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> :
293+
{REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
294+
REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> :
295295
<LogoHome />}
296296
</StyledLink>
297297
{editName ? (
@@ -434,8 +434,8 @@ export function AppHeader() {
434434
const brandingConfig = useSelector(getBrandingConfig);
435435
const headerStart = (
436436
<StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
437-
{LOWCODER_SHOW_BRAND === 'true' ?
438-
LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO} height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> :
437+
{REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
438+
REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO} height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> :
439439
<LogoHome />}
440440
</StyledLink>
441441
);

‎client/packages/lowcoder/src/pages/userAuth/login.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ function Login() {
131131
loginCardView = thirdPartyLoginView;
132132
}
133133

134-
const loginHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
135-
? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
134+
const loginHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
135+
? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
136136
: getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName)
137137

138-
const loginSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
138+
const loginSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
139139
? trans("userAuth.poweredByLowcoder")
140140
: ''
141141

‎client/packages/lowcoder/src/pages/userAuth/register.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ function UserRegister() {
7171
return null;
7272
}
7373

74-
const registerHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
75-
? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
74+
const registerHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
75+
? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
7676
: trans("userAuth.register")
7777

78-
const registerSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
78+
const registerSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
7979
? trans("userAuth.poweredByLowcoder")
8080
: ''
8181

0 commit comments

Comments
 (0)