Skip to content
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

PS-745 use logo instead of databox text #499

Merged
merged 4 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions dashboard/client/config-compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ window.config.muiTheme = ${stackConfig.theme.replace(/^export\s+const\s+themeOpt

return {
customHTML,
logo: stackConfig.logo,
locales: config.available_locales,
autoConnectIdP: env.AUTO_CONNECT_IDP,
baseUrl: env.DASHBOARD_CLIENT_URL,
Expand Down
6 changes: 5 additions & 1 deletion dashboard/client/src/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ export default function Dashboard({}: Props) {
},
}}
>
{STACK_NAME}
{
config.logo ? <img src={config.logo} alt={STACK_NAME} style={{ maxHeight:48, maxWidth:150 }}/>
: STACK_NAME
}

{user ? (
<Chip
icon={<SellIcon />}
Expand Down
1 change: 1 addition & 0 deletions databox/client/config-compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ window.config.muiTheme = ${stackConfig.theme.replace(/^export\s+const\s+themeOpt

return {
customHTML,
logo: stackConfig.logo,
autoConnectIdP: env.AUTO_CONNECT_IDP,
baseUrl: env.DATABOX_API_URL,
uploaderApiBaseUrl: env.UPLOADER_API_URL,
Expand Down
6 changes: 5 additions & 1 deletion databox/client/src/components/Layout/MainAppBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ export default function MainAppBar({onToggleLeftPanel}: Props) {
cursor: 'pointer',
}}
>
{t('common.databox', `Databox`)}
{
config.logo ? <img src={config.logo} alt={t('common.databox', `Databox`)} style={{ maxHeight:32, maxWidth:150 }}/>
: t('common.databox', `Databox`)
}

</Typography>

<Box
Expand Down
1 change: 1 addition & 0 deletions lib/js/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export type WindowConfig = {
analytics?: AnalyticsConfig;
pusherHost?: Readonly<string>;
pusherKey?: Readonly<string>;
logo: Readonly<string>;
}

export type SentryConfig = Pick<WindowConfig,
Expand Down
Loading