Skip to content
Draft
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
35 changes: 35 additions & 0 deletions ui/src/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,41 @@ body, html {
font-family: 'Poppins', sans-serif;
}

:root {
--app-bg-layout: #f7f8fa;
--app-bg-elevated: #ffffff;
--app-bg-subtle: #f4f6f9;
--app-bg-overlay: rgba(0, 0, 0, 0.4);
--app-sidebar-bg: #111111;
--app-sidebar-text: #a0b3c2;
--app-sidebar-text-active: #cddae4;
--app-border-subtle: rgba(0, 0, 0, 0.05);
--app-border-strong: #d9d9d9;
--app-text: #454545;
--app-text-secondary: #6b7280;
--app-minimap-border: #9cccf1;
}

[data-theme='dark'] {
--app-bg-layout: #0f141a;
--app-bg-elevated: #161d24;
--app-bg-subtle: #1b242d;
--app-bg-overlay: rgba(0, 0, 0, 0.55);
--app-sidebar-bg: #0b1016;
--app-sidebar-text: #8da0b3;
--app-sidebar-text-active: #d7e3ef;
--app-border-subtle: rgba(255, 255, 255, 0.08);
--app-border-strong: #2a333d;
--app-text: #d7dee7;
--app-text-secondary: #9cadbd;
--app-minimap-border: #36536b;
}

body {
background: var(--app-bg-layout);
color: var(--app-text);
}

.ant-btn {
box-shadow: none !important;
}
Expand Down
114 changes: 63 additions & 51 deletions ui/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Project } from '@ui/pages/project';

import { paths } from './config/paths';
import { queryClient } from './config/query-client';
import { themeConfig } from './config/themeConfig';
import { getThemeConfig } from './config/themeConfig';
import { AppExtensions } from './extensions/pages/app-extensions';
import { ArgoCDExtension } from './extensions/pages/argocd-extension';
import { ProjectExtensions } from './extensions/pages/project-extensions';
Expand All @@ -19,6 +19,8 @@ import { TokenRenew } from './features/auth/token-renew';
import { MainLayout } from './features/common/layout/main-layout';
import { Events } from './features/project/events/events';
import { ProjectSettings } from './features/project/settings/project-settings';
import { ThemeProvider } from './features/theme/theme-provider';
import { useThemeContext } from './features/theme/use-theme-context';
import { AnalysisRunLogsPage } from './pages/analysis-run-logs';
import { Downloads } from './pages/downloads/downloads';
import { Login } from './pages/login/login';
Expand All @@ -29,59 +31,69 @@ import { User } from './pages/user';
import './app.less';
import 'antd/dist/reset.css';

export const App = () => (
<TransportProvider transport={transport}>
<QueryClientProvider client={queryClient}>
<ConfigProvider theme={themeConfig}>
<AuthContextProvider>
<BrowserRouter>
<Routes>
<Route element={<ProtectedRoute />}>
<Route element={<MainLayout />}>
<Route path={paths.projects} element={<Projects />} />
<Route path={paths.project} element={<Project />} />
<Route path={paths.projectEvents} element={<Events />} />
<Route path={paths.stage} element={<Project />} />
<Route path={paths.promotion} element={<Project />} />
<Route path={paths.promote} element={<Project />} />
<Route path={paths.freight} element={<Project />} />
<Route path={paths.warehouse} element={<Project />} />
<Route path={paths.downloads} element={<Downloads />} />
<Route path={paths.user} element={<User />} />
<Route
path={paths.createStage}
element={<Project tab='pipelines' creatingStage={true} />}
/>
<Route
path={paths.createWarehouse}
element={<Project tab='pipelines' creatingWarehouse />}
/>
<Route path={paths.promotionTasks} element={<Project tab='promotionTasks' />} />
<Route path={paths.projectSettings}>
<Route index element={<ProjectSettings />} />
<Route path='*' element={<ProjectSettings />} />
</Route>
<Route path={paths.projectExtensions}>
<Route path='*' element={<ProjectExtensions />} />
</Route>
<Route path={paths.projectArgoCDExtension} element={<ArgoCDExtension />} />
const AppContent = () => {
const { resolvedTheme } = useThemeContext();

return (
<ConfigProvider theme={getThemeConfig(resolvedTheme)}>
<AuthContextProvider>
<BrowserRouter>
<Routes>
<Route element={<ProtectedRoute />}>
<Route element={<MainLayout />}>
<Route path={paths.projects} element={<Projects />} />
<Route path={paths.project} element={<Project />} />
<Route path={paths.projectEvents} element={<Events />} />
<Route path={paths.stage} element={<Project />} />
<Route path={paths.promotion} element={<Project />} />
<Route path={paths.promote} element={<Project />} />
<Route path={paths.freight} element={<Project />} />
<Route path={paths.warehouse} element={<Project />} />
<Route path={paths.downloads} element={<Downloads />} />
<Route path={paths.user} element={<User />} />
<Route
path={paths.createStage}
element={<Project tab='pipelines' creatingStage={true} />}
/>
<Route
path={paths.createWarehouse}
element={<Project tab='pipelines' creatingWarehouse />}
/>
<Route path={paths.promotionTasks} element={<Project tab='promotionTasks' />} />
<Route path={paths.projectSettings}>
<Route index element={<ProjectSettings />} />
<Route path='*' element={<ProjectSettings />} />
</Route>
<Route path={paths.projectExtensions}>
<Route path='*' element={<ProjectExtensions />} />
</Route>
<Route path={paths.projectArgoCDExtension} element={<ArgoCDExtension />} />

<Route path={paths.appExtensions}>
<Route path='*' element={<AppExtensions />} />
</Route>
<Route path={paths.settings}>
<Route index element={<Settings />} />
<Route path='*' element={<Settings />} />
</Route>
<Route path={paths.appExtensions}>
<Route path='*' element={<AppExtensions />} />
</Route>
<Route path={paths.settings}>
<Route index element={<Settings />} />
<Route path='*' element={<Settings />} />
</Route>
<Route path={paths.analysisRunLogs} element={<AnalysisRunLogsPage />} />
</Route>
<Route path={paths.login} element={<Login />} />
<Route path={paths.tokenRenew} element={<TokenRenew />} />
</Routes>
</BrowserRouter>
</AuthContextProvider>
</ConfigProvider>
<Route path={paths.analysisRunLogs} element={<AnalysisRunLogsPage />} />
</Route>
<Route path={paths.login} element={<Login />} />
<Route path={paths.tokenRenew} element={<TokenRenew />} />
</Routes>
</BrowserRouter>
</AuthContextProvider>
</ConfigProvider>
);
};

export const App = () => (
<TransportProvider transport={transport}>
<QueryClientProvider client={queryClient}>
<ThemeProvider>
<AppContent />
</ThemeProvider>
<ReactQueryDevtools buttonPosition='bottom-left' />
</QueryClientProvider>
</TransportProvider>
Expand Down
71 changes: 48 additions & 23 deletions ui/src/config/themeConfig.ts
Original file line number Diff line number Diff line change
@@ -1,39 +1,64 @@
import { theme } from 'antd';
import { ThemeConfig } from 'antd/es/config-provider';
import { MapToken } from 'antd/es/theme/interface';

import type { ResolvedTheme } from '@ui/features/theme/types';

export const token: Partial<MapToken> = {
colorPrimary: '#30476c',
fontSizeHeading1: 28,
fontSizeHeading2: 24,
fontSizeHeading3: 20,
fontSizeHeading4: 18,
fontSizeHeading5: 14,
colorText: '#454545',
borderRadius: 8,
fontFamily: 'Poppins, sans-serif',
colorBgLayout: '#f7f8fa'
fontFamily: 'Poppins, sans-serif'
};

export const themeConfig: ThemeConfig = {
// ...token,
token,
components: {
Menu: {
itemActiveBg: '#ebedf1',
itemSelectedBg: '#ebedf1',
itemHoverBg: '#f8f9fb',
itemHeight: 36
},
Layout: {
headerBg: '#fff',
headerHeight: 50,
headerPadding: '0 16px'
},
Card: {
borderRadius: 8
const lightToken: Partial<MapToken> = {
colorText: '#454545',
colorBgLayout: '#f7f8fa',
colorBgContainer: '#ffffff',
colorBorderSecondary: '#eef2f6'
};

const darkToken: Partial<MapToken> = {
colorText: '#d7dee7',
colorTextSecondary: '#9cadbd',
colorBgLayout: '#0f141a',
colorBgContainer: '#161d24',
colorBorder: '#2a333d',
colorBorderSecondary: '#222b34'
};

export const getThemeConfig = (mode: ResolvedTheme): ThemeConfig => {
const isDark = mode === 'dark';

return {
cssVar: true,
algorithm: isDark ? theme.darkAlgorithm : theme.defaultAlgorithm,
token: {
...token,
...(isDark ? darkToken : lightToken)
},
Button: {
contentFontSizeSM: 13
components: {
Menu: {
itemActiveBg: isDark ? '#1d2630' : '#ebedf1',
itemSelectedBg: isDark ? '#1d2630' : '#ebedf1',
itemHoverBg: isDark ? '#18212a' : '#f8f9fb',
itemHeight: 36
},
Layout: {
headerBg: isDark ? '#161d24' : '#fff',
headerHeight: 50,
headerPadding: '0 16px'
},
Card: {
borderRadius: 8
},
Button: {
contentFontSizeSM: 13
}
}
}
};
};
11 changes: 7 additions & 4 deletions ui/src/features/assemble-freight/artifact-menu-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ export interface ArtifactMenuItemProps {
export const ArtifactMenuItem = ({ onClick, selected, children }: ArtifactMenuItemProps) => (
<div
onClick={onClick}
className={classNames(
'p-2 bg-white mb-1 cursor-pointer rounded-md border border-solid border-gray-100 break-words',
{ 'border-sky-500': selected }
)}
className={classNames('p-2 mb-1 cursor-pointer rounded-md border border-solid break-words', {
'border-sky-500': selected
})}
style={{
background: 'var(--app-bg-elevated)',
borderColor: selected ? undefined : 'var(--app-border-subtle)'
}}
>
{children}
</div>
Expand Down
7 changes: 6 additions & 1 deletion ui/src/features/common/code-editor/yaml-editor-lazy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { configureMonacoYaml } from 'monaco-yaml';
import React, { FC, useEffect, useRef } from 'react';
import yaml from 'yaml';

import { useThemeContext } from '@ui/features/theme/use-theme-context';

import styles from './yaml-editor.module.less';

loader.config({ monaco });
Expand Down Expand Up @@ -41,6 +43,8 @@ const YamlEditor: FC<YamlEditorProps> = (props) => {
resourceType
} = props;

const { resolvedTheme } = useThemeContext();

const handleOnChange = (newValue: string | undefined) => {
onChange?.(newValue);
};
Expand Down Expand Up @@ -100,10 +104,11 @@ const YamlEditor: FC<YamlEditorProps> = (props) => {
<div>{label}</div>
</Flex>
<div
style={{ border: '1px solid #d9d9d9', height, overflow: 'hidden' }}
style={{ border: '1px solid var(--ant-color-border)', height, overflow: 'hidden' }}
className={className}
>
<Editor
theme={resolvedTheme === 'dark' ? 'vs-dark' : 'light'}
options={{
readOnly: disabled,
lineDecorationsWidth: 5,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/features/common/layout/base-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PropsWithChildren } from 'react';
export const BaseHeader = ({ children }: PropsWithChildren) => (
<Header
className='flex items-center justify-between'
style={{ borderBottom: '2px solid rgba(0,0,0,.05)' }}
style={{ borderBottom: '2px solid var(--app-border-subtle)' }}
>
{children}
</Header>
Expand Down
17 changes: 13 additions & 4 deletions ui/src/features/common/layout/main-layout.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
display: flex;
flex-direction: column;
flex: 0 0 110px;
background-color: #111;
background-color: var(--app-sidebar-bg);
color: @colorWhite;
}

.contentWrapper {
position: relative;
flex: 1;
background-color: @colorBgLayout;
background-color: var(--app-bg-layout);
overflow: hidden;
}

Expand Down Expand Up @@ -49,10 +49,19 @@
}

.logout {
color: #a0b3c2;
color: var(--app-sidebar-text);
margin: ~'@{sizeSM}px 0';

&:hover {
color: #cddae4 !important;
color: var(--app-sidebar-text-active) !important;
}
}

.themeButton {
color: var(--app-sidebar-text);
margin: 0 auto;

&:hover {
color: var(--app-sidebar-text-active) !important;
}
}
2 changes: 2 additions & 0 deletions ui/src/features/common/layout/main-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { KargoLogo } from '@ui/features/common/logo/logo';

import * as styles from './main-layout.module.less';
import { NavItem } from './nav-item/nav-item';
import { ThemeToggle } from './theme-toggle';

export const MainLayout = () => {
const { logout, JWTInfo } = useAuthContext();
Expand Down Expand Up @@ -69,6 +70,7 @@ export const MainLayout = () => {
</NavItem>
</nav>

<ThemeToggle />
<Button
className={styles.logout}
onClick={logout}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/features/common/layout/nav-item/nav-item.module.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.navItem {
color: #a0b3c2;
color: var(--app-sidebar-text);
text-decoration: none;
display: flex;
flex-direction: column;
Expand All @@ -12,6 +12,6 @@

&:hover,
&.active {
color: #cddae4;
color: var(--app-sidebar-text-active);
}
}
Loading
Loading