Skip to content

Commit e66ad7e

Browse files
Merge pull request #1473 from devtron-labs/login_page_img_from_cm
feat: Login page BG from CM
2 parents 83405b0 + bb8bc45 commit e66ad7e

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

.env

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
3030
ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false
3131
HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
3232
ENABLE_BUILD_CONTEXT=false
33-
CLAIR_TOOL_VERSION=
33+
CLAIR_TOOL_VERSION=
3434
ENABLE_RESTART_WORKLOAD=false
3535
ENABLE_SCOPED_VARIABLES=false
3636
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
3737
ANNOUNCEMENT_BANNER_MSG=
38+
LOGIN_PAGE_IMAGE=
39+
LOGIN_PAGE_IMAGE_BG=

config.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| SENTRY_ENABLED | "false" | Sentry integration status |
1313
| SENTRY_ENV | stage | Sentry environment |
1414
| SENTRY_ERROR_ENABLED | false | To send uncaught errors to sentry |
15-
| SENTRY_PERFORMANCE_ENABLED | false | To send persormance sentry |
15+
| SENTRY_PERFORMANCE_ENABLED | false | To send persormance sentry |
1616
| SENTRY_DSN | '' | SENTRY Data Source Name |
1717
| SENTRY_TRACES_SAMPLE_RATE | 0.2 | Rate at which data send to sentry.(min=0 max=1)|
1818
| USE_V2 | "true" | Use the v2 APIs |
@@ -25,5 +25,7 @@
2525
| RECOMMEND_SECURITY_SCANNING | "false" | Recommend security scanning |
2626
| FORCE_SECURITY_SCANNING | "false" | Force Security Scanning |
2727
| CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL | 7000 | Interval for checking connection with cluster terminal. |
28+
| LOGIN_PAGE_IMAGE | "" | Login page image url |
29+
| LOGIN_PAGE_IMAGE_BG | "" | Login page image background color code |
2830

2931
# DASHBOARD CONFIG SECRET

src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function SuggestionItem({
5656

5757
return (
5858
<Tippy
59-
className="default-tt"
59+
className="default-tt dc__word-break-all"
6060
content={
6161
<div className="mw-200 flex column dc__content-start dc__align-start">
6262
<div className="flex column dc__content-start dc__align-start">Value</div>

src/components/login/Login.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ export default class Login extends Component<LoginProps, LoginFormState> {
226226
render() {
227227
return (
228228
<div className="login">
229-
<div className="login__bg">
230-
<div className="login__image" />
229+
<div className="login__bg" style={window?._env_?.LOGIN_PAGE_IMAGE_BG?{backgroundColor: window._env_.LOGIN_PAGE_IMAGE_BG}:{}}>
230+
<div className="login__image" style={window?._env_?.LOGIN_PAGE_IMAGE?{backgroundImage: `url(${window._env_.LOGIN_PAGE_IMAGE})`}:{}} />
231231
</div>
232232
<div className="login__section">
233233
<Switch>

src/index.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ interface customEnv {
4545
ENABLE_SCOPED_VARIABLES?: boolean
4646
DEFAULT_CI_TRIGGER_TYPE_MANUAL: boolean
4747
ANNOUNCEMENT_BANNER_MSG?: string
48+
LOGIN_PAGE_IMAGE?: string
49+
LOGIN_PAGE_IMAGE_BG?: string
4850
}
4951
declare global {
5052
interface Window {
@@ -127,7 +129,7 @@ if (!window || !window._env_) {
127129
POSTHOG_TOKEN: '',
128130
RECOMMEND_SECURITY_SCANNING: false,
129131
FORCE_SECURITY_SCANNING: false,
130-
ENABLE_CI_JOB: false,
132+
ENABLE_CI_JOB: false,
131133
HIDE_DISCORD: true,
132134
DEVTRON_APP_DETAILS_POLLING_INTERVAL: 30000,
133135
HELM_APP_DETAILS_POLLING_INTERVAL: 30000,
@@ -147,7 +149,9 @@ if (!window || !window._env_) {
147149
ENABLE_RESTART_WORKLOAD: false,
148150
ENABLE_SCOPED_VARIABLES: false,
149151
DEFAULT_CI_TRIGGER_TYPE_MANUAL: false,
150-
ANNOUNCEMENT_BANNER_MSG: 'Avoid deploying non critical changes to production between 1st to 31st August 2023'
152+
ANNOUNCEMENT_BANNER_MSG: 'Avoid deploying non critical changes to production between 1st to 31st August 2023',
153+
LOGIN_PAGE_IMAGE: '',
154+
LOGIN_PAGE_IMAGE_BG: ''
151155
}
152156
}
153157

0 commit comments

Comments
 (0)