Skip to content

feat: Navigation 2.0 + New Folder Structure #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.19.0-pre-6",
"version": "1.19.0-pre-7",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-bot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-clipboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-cloud.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-coins.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-devtron-text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-files-changed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-trend-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions src/Common/SearchBar/SearchBar.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const SearchBar = ({
noBackgroundAndBorder = false,
size = ComponentSizeType.medium,
keyboardShortcut,
variant = 'default',
}: SearchBarProps) => {
const [showClearButton, setShowClearButton] = useState(!!initialSearchText)
const inputRef = useRef<HTMLInputElement>()
Expand Down Expand Up @@ -157,11 +158,14 @@ const SearchBar = ({
return (
<div className={`search-bar-container ${containerClassName || ''}`}>
<div
className={`search-bar ${noBackgroundAndBorder ? 'dc__no-border dc__no-background dc__hover-n50' : 'bg__secondary en-2 dc__hover-border-n300'} focus-within-border-b5 dc__block w-100 min-w-200 dc__position-rel br-4 bw-1 ${getSearchBarHeightFromSize(size)}`}
className={`search-bar search-bar--${variant} ${noBackgroundAndBorder ? 'dc__no-border dc__no-background dc__hover-n50' : 'bg__secondary en-2 dc__hover-border-n300'} focus-within-border-b5 dc__block w-100 min-w-200 dc__position-rel br-4 bw-1 ${getSearchBarHeightFromSize(size)}`}
>
<Search className="search-bar__icon dc__position-abs icon-color-n6 icon-dim-16" />
<Search
className={`search-bar__icon dc__position-abs icon-dim-16 ${variant === 'sidenav' ? 'icon-fill__sidenav' : 'icon-color-n6'}`}
/>
<input
placeholder="Search"
data-variant={variant}
data-testid={dataTestId}
type="text"
{...inputProps}
Expand Down
29 changes: 29 additions & 0 deletions src/Common/SearchBar/searchBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/

.search-bar {
$root: &;

&:focus,
&:focus-within {
outline: none;
Expand All @@ -29,11 +31,38 @@
}
}

&#{$root}--sidenav {
background: transparent;
border-color: var(--sidenav-input-border);

&:hover {
border-color: var(--sidenav-input-border-hover);
}

&:focus,
&:focus-within {
border: solid 1px var(--sidenav-input-border-focus) !important;
}

#{$root}__input {
color: var(--sidenav-text);
background: transparent;

&::placeholder {
color: var(--sidenav-input-placeholder);
}
}
}

&__icon {
z-index: 1;
top: 50%;
left: 8px;
transform: translateY(-50%);

*[fill^='#'] {
fill: var(--sidenav-input-icon);
}
}

&__clear-button {
Expand Down
4 changes: 4 additions & 0 deletions src/Common/SearchBar/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,8 @@ export interface SearchBarProps {
* @note This is displayed in place of the dropdown indicator
*/
keyboardShortcut?: SupportedKeyboardKeysType
/**
* @default 'default'
*/
variant?: 'default' | 'sidenav'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/ApplicationManagement/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/Automation&Enablement/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/CostVisibility/Overview/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/CostVisibility/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/GlobalConfiguration/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/GlobalOverview/GlobalOverview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const GlobalOverview = () => <div>GlobalOverview</div>
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/GlobalOverview/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './GlobalOverview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/InfrastructureManagement/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/SecurityCenter/Overview/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/SecurityCenter/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Overview = () => <div>Overview</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/SoftwareReleaseManagement/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Overview'
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './ApplicationManagement'
3 changes: 2 additions & 1 deletion src/Shared/Components/FramerComponents/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import {
animate,
AnimatePresence,
motion,
useAnimation,
useAnimationControls,
useMotionTemplate,
useMotionValue,
} from 'framer-motion'

export { animate, AnimatePresence, motion, useAnimationControls, useMotionTemplate, useMotionValue }
export { animate, AnimatePresence, motion, useAnimation, useAnimationControls, useMotionTemplate, useMotionValue }
14 changes: 14 additions & 0 deletions src/Shared/Components/Icon/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { ReactComponent as ICBgEnvironment } from '@IconsV2/ic-bg-environment.sv
import { ReactComponent as ICBharatpe } from '@IconsV2/ic-bharatpe.svg'
import { ReactComponent as ICBitbucket } from '@IconsV2/ic-bitbucket.svg'
import { ReactComponent as ICBookOpen } from '@IconsV2/ic-book-open.svg'
import { ReactComponent as ICBot } from '@IconsV2/ic-bot.svg'
import { ReactComponent as ICBrain } from '@IconsV2/ic-brain.svg'
import { ReactComponent as ICBrowser } from '@IconsV2/ic-browser.svg'
import { ReactComponent as ICBug } from '@IconsV2/ic-bug.svg'
Expand All @@ -42,13 +43,16 @@ import { ReactComponent as ICChecks } from '@IconsV2/ic-checks.svg'
import { ReactComponent as ICCiLinked } from '@IconsV2/ic-ci-linked.svg'
import { ReactComponent as ICCircleLoader } from '@IconsV2/ic-circle-loader.svg'
import { ReactComponent as ICCleanBrush } from '@IconsV2/ic-clean-brush.svg'
import { ReactComponent as ICClipboard } from '@IconsV2/ic-clipboard.svg'
import { ReactComponent as ICClock } from '@IconsV2/ic-clock.svg'
import { ReactComponent as ICCloseLarge } from '@IconsV2/ic-close-large.svg'
import { ReactComponent as ICCloseSmall } from '@IconsV2/ic-close-small.svg'
import { ReactComponent as ICCloud } from '@IconsV2/ic-cloud.svg'
import { ReactComponent as ICCloudVms } from '@IconsV2/ic-cloud-vms.svg'
import { ReactComponent as ICCluster } from '@IconsV2/ic-cluster.svg'
import { ReactComponent as ICClusterIsolated } from '@IconsV2/ic-cluster-isolated.svg'
import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg'
import { ReactComponent as ICCoins } from '@IconsV2/ic-coins.svg'
import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg'
import { ReactComponent as ICContainerRegistry } from '@IconsV2/ic-container-registry.svg'
import { ReactComponent as ICCookr } from '@IconsV2/ic-cookr.svg'
Expand All @@ -67,6 +71,7 @@ import { ReactComponent as ICDevtronAi } from '@IconsV2/ic-devtron-ai.svg'
import { ReactComponent as ICDevtronApp } from '@IconsV2/ic-devtron-app.svg'
import { ReactComponent as ICDevtronHeaderLogo } from '@IconsV2/ic-devtron-header-logo.svg'
import { ReactComponent as ICDevtronJob } from '@IconsV2/ic-devtron-job.svg'
import { ReactComponent as ICDevtronText } from '@IconsV2/ic-devtron-text.svg'
import { ReactComponent as ICDiffAdded } from '@IconsV2/ic-diff-added.svg'
import { ReactComponent as ICDiffDeleted } from '@IconsV2/ic-diff-deleted.svg'
import { ReactComponent as ICDiffUpdated } from '@IconsV2/ic-diff-updated.svg'
Expand All @@ -92,6 +97,7 @@ import { ReactComponent as ICFileCode } from '@IconsV2/ic-file-code.svg'
import { ReactComponent as ICFileEdit } from '@IconsV2/ic-file-edit.svg'
import { ReactComponent as ICFileKey } from '@IconsV2/ic-file-key.svg'
import { ReactComponent as ICFiles } from '@IconsV2/ic-files.svg'
import { ReactComponent as ICFilesChanged } from '@IconsV2/ic-files-changed.svg'
import { ReactComponent as ICFilter } from '@IconsV2/ic-filter.svg'
import { ReactComponent as ICFilterApplied } from '@IconsV2/ic-filter-applied.svg'
import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
Expand Down Expand Up @@ -218,6 +224,7 @@ import { ReactComponent as ICTimeoutDash } from '@IconsV2/ic-timeout-dash.svg'
import { ReactComponent as ICTimer } from '@IconsV2/ic-timer.svg'
import { ReactComponent as ICTrafficSignal } from '@IconsV2/ic-traffic-signal.svg'
import { ReactComponent as ICTravclan } from '@IconsV2/ic-travclan.svg'
import { ReactComponent as ICTrendUp } from '@IconsV2/ic-trend-up.svg'
import { ReactComponent as ICTwoCubes } from '@IconsV2/ic-two-cubes.svg'
import { ReactComponent as ICUbuntu } from '@IconsV2/ic-ubuntu.svg'
import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg'
Expand Down Expand Up @@ -260,6 +267,7 @@ export const iconMap = {
'ic-bharatpe': ICBharatpe,
'ic-bitbucket': ICBitbucket,
'ic-book-open': ICBookOpen,
'ic-bot': ICBot,
'ic-brain': ICBrain,
'ic-browser': ICBrowser,
'ic-bug': ICBug,
Expand All @@ -280,13 +288,16 @@ export const iconMap = {
'ic-ci-linked': ICCiLinked,
'ic-circle-loader': ICCircleLoader,
'ic-clean-brush': ICCleanBrush,
'ic-clipboard': ICClipboard,
'ic-clock': ICClock,
'ic-close-large': ICCloseLarge,
'ic-close-small': ICCloseSmall,
'ic-cloud-vms': ICCloudVms,
'ic-cloud': ICCloud,
'ic-cluster-isolated': ICClusterIsolated,
'ic-cluster': ICCluster,
'ic-code': ICCode,
'ic-coins': ICCoins,
'ic-container-registry': ICContainerRegistry,
'ic-container': ICContainer,
'ic-cookr': ICCookr,
Expand All @@ -304,6 +315,7 @@ export const iconMap = {
'ic-devtron-app': ICDevtronApp,
'ic-devtron-header-logo': ICDevtronHeaderLogo,
'ic-devtron-job': ICDevtronJob,
'ic-devtron-text': ICDevtronText,
'ic-devtron': ICDevtron,
'ic-diff-added': ICDiffAdded,
'ic-diff-deleted': ICDiffDeleted,
Expand All @@ -329,6 +341,7 @@ export const iconMap = {
'ic-file-edit': ICFileEdit,
'ic-file-key': ICFileKey,
'ic-file': ICFile,
'ic-files-changed': ICFilesChanged,
'ic-files': ICFiles,
'ic-filter-applied': ICFilterApplied,
'ic-filter': ICFilter,
Expand Down Expand Up @@ -456,6 +469,7 @@ export const iconMap = {
'ic-timer': ICTimer,
'ic-traffic-signal': ICTrafficSignal,
'ic-travclan': ICTravclan,
'ic-trend-up': ICTrendUp,
'ic-two-cubes': ICTwoCubes,
'ic-ubuntu': ICUbuntu,
'ic-unknown': ICUnknown,
Expand Down
Loading