Skip to content

Commit 2b54c93

Browse files
authored
update sci react ui (#18)
1 parent 9684b82 commit 2b54c93

File tree

3 files changed

+94
-23
lines changed

3 files changed

+94
-23
lines changed

web-conexs-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"dependencies": {
1515
"3dmol": "^2.4.2",
16-
"@diamondlightsource/sci-react-ui": "^0.1.0",
16+
"@diamondlightsource/sci-react-ui": "^0.2.0",
1717
"@emotion/react": "^11.14.0",
1818
"@emotion/styled": "^11.14.0",
1919
"@h5web/lib": "^13.0.0",

web-conexs-client/pnpm-lock.yaml

Lines changed: 77 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web-conexs-client/src/components/Header.tsx

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,25 @@ export default function Header() {
1818
const handleLogout = () => window.location.assign("/oauth2/sign_out");
1919

2020
return (
21-
<Navbar logo="theme">
22-
<SideDrawer />
21+
<Navbar
22+
logo="theme"
23+
leftSlot={<SideDrawer />}
24+
rightSlot={
25+
<>
26+
<User
27+
color="white"
28+
onLogin={handleLogin}
29+
onLogout={handleLogout}
30+
user={user == null ? null : { fedid: user.identifier }}
31+
/>
32+
<ColourSchemeButton />
33+
</>
34+
}
35+
containerWidth={false}
36+
>
2337
<Typography variant="h4" color={theme.palette.primary.contrastText}>
2438
Web-CONEXS
2539
</Typography>
26-
<User
27-
color="white"
28-
onLogin={handleLogin}
29-
onLogout={handleLogout}
30-
user={user == null ? null : { fedid: user.identifier }}
31-
/>
32-
<ColourSchemeButton />
3340
</Navbar>
3441
);
3542
}

0 commit comments

Comments
 (0)