Skip to content

Commit 738f447

Browse files
AbhishekA1509AbhishekA1509
committed
feat: derive dt logo from cm
1 parent 9d5641f commit 738f447

File tree

6 files changed

+46
-600
lines changed

6 files changed

+46
-600
lines changed

‎.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ LOGIN_PAGE_IMAGE_BG=
4040
HIDE_DEFAULT_CLUSTER=false
4141
GLOBAL_API_TIMEOUT=60000
4242
TRIGGER_API_TIMEOUT=60000
43+
LOGIN_DT_LOGO=
44+
SIDEBAR_DT_LOGO=

‎config.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@
3030
| DEFAULT_CI_TRIGGER_TYPE_MANUAL | "false" | Change default trigger behaviour of newly created ci-pipeline to manual |
3131
| GLOBAL_API_TIMEOUT | 60000 | Default timeout for all API requests in DASHBOARD |
3232
| TRIGGER_API_TIMEOUT | 60000 | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD |
33+
| LOGIN_DT_LOGO | "" | Devtron logo for login page |
34+
| SIDEBAR_DT_LOGO | "" | Devtron logo for sidebar |
3335

3436
# DASHBOARD CONFIG SECRET

‎src/assets/icons/ic-login-dt-with-hat.svg

Lines changed: 0 additions & 289 deletions
This file was deleted.

‎src/assets/icons/ic-sidebar-dt-with-hat.svg

Lines changed: 0 additions & 286 deletions
This file was deleted.

‎src/components/common/navigation/Navigation.tsx

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ import { ReactComponent as SecurityIcon } from '../../../assets/icons/ic-nav-sec
1414
import { ReactComponent as BulkEditIcon } from '../../../assets/icons/ic-nav-code.svg'
1515
import { ReactComponent as GlobalConfigIcon } from '../../../assets/icons/ic-nav-gear.svg'
1616
import { ReactComponent as StackManagerIcon } from '../../../assets/icons/ic-nav-stack.svg'
17-
import { ReactComponent as ChristmasLogo } from '../../../assets/icons/ic-sidebar-dt-with-hat.svg'
18-
// TODO: Remove after New Year
19-
// import NavSprite from '../../../assets/icons/navigation-sprite.svg'
17+
// Fallback Icon
18+
import NavSprite from '../../../assets/icons/navigation-sprite.svg'
2019
import TextLogo from '../../../assets/icons/ic-nav-devtron.svg'
2120
import { Command, CommandErrorBoundary } from '../../command'
2221
import { ModuleStatus } from '../../v2/devtronStackManager/DevtronStackManager.type'
@@ -336,15 +335,23 @@ export default class Navigation extends Component<
336335
}}
337336
>
338337
<div className="short-nav--flex">
339-
{/* TODO: Uncomment after New Year */}
340-
{/* <svg
341-
className="devtron-logo"
342-
data-testid="click-on-devtron-app-logo"
343-
viewBox="0 0 40 40"
344-
>
345-
<use href={`${NavSprite}#nav-short-devtron-logo`}></use>
346-
</svg> */}
347-
<ChristmasLogo className="icon-dim-40" />
338+
{window._env_.SIDEBAR_DT_LOGO ? (
339+
<img
340+
src={window._env_.SIDEBAR_DT_LOGO}
341+
alt="devtron"
342+
className="icon-dim-40"
343+
width={40}
344+
height={40}
345+
/>
346+
): (
347+
<svg
348+
className="devtron-logo"
349+
data-testid="click-on-devtron-app-logo"
350+
viewBox="0 0 40 40"
351+
>
352+
<use href={`${NavSprite}#nav-short-devtron-logo`}></use>
353+
</svg>
354+
)}
348355
<div className="pl-12">
349356
<img src={TextLogo} alt="devtron" className="devtron-logo devtron-logo--text" />
350357
</div>

‎src/components/login/Login.tsx

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { Component } from 'react'
2-
// TODO: Enable after New Year
3-
// import dt from '../../assets/icons/logo/logo-dt.svg'
2+
import dt from '../../assets/icons/logo/logo-dt.svg'
43
import LoginIcons from '../../assets/icons/LoginSprite.svg'
54
import { Switch, Redirect, Route, NavLink } from 'react-router-dom'
65
import { toast } from 'react-toastify'
@@ -9,8 +8,6 @@ import { URLS, DOCUMENTATION, TOKEN_COOKIE_NAME, PREVIEW_DEVTRON, PRIVACY_POLICY
98
import { LoginProps, LoginFormState } from './login.types'
109
import { getSSOConfigList, loginAsAdmin } from './login.service'
1110
import { dashboardAccessed } from '../../services/service'
12-
// TODO: remove after New Year
13-
import { ReactComponent as ChristmasLogo } from '../../assets/icons/ic-login-dt-with-hat.svg'
1411
import './login.scss'
1512

1613
export default class Login extends Component<LoginProps, LoginFormState> {
@@ -141,10 +138,17 @@ export default class Login extends Component<LoginProps, LoginFormState> {
141138

142139
return (
143140
<div className="login__control">
144-
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
145-
<div className="flex">
146-
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
147-
</div>
141+
{window._env_.LOGIN_DT_LOGO ? (
142+
<img
143+
src={window._env_.LOGIN_DT_LOGO}
144+
alt="login-dt-logo"
145+
className="login__dt-logo"
146+
width="170px"
147+
height="120px"
148+
/>
149+
) : (
150+
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
151+
)}
148152
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
149153
{this.state.loginList
150154
.filter((sso) => sso.active)
@@ -178,11 +182,17 @@ export default class Login extends Component<LoginProps, LoginFormState> {
178182

179183
return (
180184
<div className="login__control">
181-
{/* TODO: Uncomment after New year */}
182-
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
183-
<div className="flex">
184-
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
185-
</div>
185+
{window._env_.LOGIN_DT_LOGO ? (
186+
<img
187+
src={window._env_.LOGIN_DT_LOGO}
188+
alt="login-dt-logo"
189+
className="login__dt-logo"
190+
width="170px"
191+
height="120px"
192+
/>
193+
) : (
194+
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
195+
)}
186196
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
187197
{/* @ts-ignore */}
188198
<form className="login-dt__form" autoComplete="on" onSubmit={this.login}>

0 commit comments

Comments
 (0)