Skip to content

Commit

Permalink
Merge branch 'master' into PS-670_input-audio-files
Browse files Browse the repository at this point in the history
  • Loading branch information
jygaulier authored Jan 29, 2025
2 parents b2c252c + 2ce743e commit 2edf122
Show file tree
Hide file tree
Showing 201 changed files with 10,052 additions and 6,312 deletions.
4 changes: 3 additions & 1 deletion dashboard/client/config-compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@
return false;
}

const stackConfig = JSON.parse(require('node:fs').readFileSync('/etc/app/stack-config.json', 'utf8'));
const stackConfig = JSON.parse(
require('node:fs').readFileSync('/etc/app/stack-config.json', 'utf8')
);
const customHTML = {};
customHTML['__MUI_THEME__'] = '';
if (stackConfig.theme) {
Expand Down
18 changes: 9 additions & 9 deletions dashboard/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
"@alchemy/phrasea-ui": "workspace:*",
"@alchemy/react-auth": "workspace:*",
"@alchemy/theme-editor": "workspace:*",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/icons-material": "^5.16.14",
"@mui/material": "^5.16.14",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-google-font-loader": "^1.1.0",
"react-i18next": "^14.1.3",
"vite-plugin-svgr": "^4.2.0"
"vite-plugin-svgr": "^4.3.0"
},
"devDependencies": {
"@types/node": "^18.19.55",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/node": "^18.19.74",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react-swc": "^3.7.1",
"@vitejs/plugin-react-swc": "^3.7.2",
"eslint": "^8.57.1",
"typescript": "^5.6.2",
"vite": "^5.4.8",
"typescript": "^5.7.3",
"vite": "^5.4.14",
"vite-plugin-checker": "^0.6.4",
"vite-plugin-svgr": "^4.2.0"
}
Expand Down
26 changes: 18 additions & 8 deletions dashboard/client/src/Dashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,16 @@ export default function Dashboard({}: Props) {
},
}}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
{
config.logo ? <img src={config.logo} alt={STACK_NAME} style={{ maxHeight:48, maxWidth:150 }}/>
: STACK_NAME
}
<div style={{display: 'flex', alignItems: 'center'}}>
{config.logo ? (
<img
src={config.logo}
alt={STACK_NAME}
style={{maxHeight: 48, maxWidth: 150}}
/>
) : (
STACK_NAME
)}

{user ? (
<Chip
Expand Down Expand Up @@ -171,9 +176,14 @@ export default function Dashboard({}: Props) {
)}
</Grid>
{roles.includes('tech') && (
<Grid container spacing={2} marginTop={1} sx={{
mb: 5
}}>
<Grid
container
spacing={2}
marginTop={1}
sx={{
mb: 5,
}}
>
{PGADMIN_URL && (
<Grid item>
<Link
Expand Down
1 change: 1 addition & 0 deletions dashboard/client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ export default defineConfig({
server: {
port: 3000,
host: '0.0.0.0',
allowedHosts: true,
},
});
Loading

0 comments on commit 2edf122

Please sign in to comment.