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.

Sign up for GitHub

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

PS-745 use logo instead of databox text #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
934c7a4
use logo if exist
aynsix Dec 2, 2024
a895b92
add maxHeight maxWidth
aynsix Dec 3, 2024
051e854
Merge branch 'master' of https://github.com/alchemy-fr/phrasea into P…
aynsix Dec 3, 2024
726dd04
fix icon alignement and add git-log link
aynsix Dec 4, 2024
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
View file
Open in desktop
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
30 changes: 20 additions & 10 deletions dashboard/client/src/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,26 @@ export default function Dashboard({}: Props) {
},
}}
>
{STACK_NAME}
{user ? (
<Chip
icon={<SellIcon />}
label={STACK_VERSION}
color={'info'}
/>
) : (
''
)}
<div style={{ display: 'flex', alignItems: 'center' }}>
{
config.logo ? <img src={config.logo} alt={STACK_NAME} style={{ maxHeight:48, maxWidth:150 }}/>
: STACK_NAME
}

{user ? (
<Chip
icon={<SellIcon />}
label={STACK_VERSION}
color={'info'}
component="a"
href="/git-log.html"
target={'_blank'}
clickable
/>
) : (
''
)}
</div>
</Typography>
</DashboardBar>
)}
Expand Down
1 change: 1 addition & 0 deletions databox/client/config-compiler.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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