Skip to content

chore(site): Upgrade to MUI v5 #7437

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

Merged
merged 36 commits into from
May 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
73c3c17
Initial changes
BrunoQuaresma May 5, 2023
047c10b
Apply codemod
BrunoQuaresma May 5, 2023
0b26a9b
Apply variant mod
BrunoQuaresma May 5, 2023
d0b064a
Migrate theme options
BrunoQuaresma May 5, 2023
9a5203d
Merge branch 'main' into bq/migrate-to-muiv5
BrunoQuaresma May 8, 2023
1f078ce
Fix all TS problems
BrunoQuaresma May 8, 2023
fc683c8
Merge branch 'main' into bq/migrate-to-muiv5
BrunoQuaresma May 8, 2023
77777fb
Remove unusable test
BrunoQuaresma May 8, 2023
479ce07
Button and input text
BrunoQuaresma May 8, 2023
9dfec8f
Set typography
BrunoQuaresma May 8, 2023
50e9f22
Remove default outlined
BrunoQuaresma May 8, 2023
34d9d8d
Improve theme
BrunoQuaresma May 8, 2023
9a62dcc
Setup links
BrunoQuaresma May 8, 2023
756277e
Fix link
BrunoQuaresma May 8, 2023
5c45cf6
Fix button outlined neutral
BrunoQuaresma May 8, 2023
5ae26fa
Fix
BrunoQuaresma May 8, 2023
a1cbc12
Update workspace header
BrunoQuaresma May 8, 2023
55c0751
Merge branch 'main' into bq/migrate-to-muiv5
BrunoQuaresma May 9, 2023
168814c
Fix format
BrunoQuaresma May 9, 2023
a591559
Adjust buttons
BrunoQuaresma May 9, 2023
a4bba50
Fix table loaders
BrunoQuaresma May 9, 2023
a24edee
Few tweaks on deployment settings
BrunoQuaresma May 9, 2023
4abb23d
Fix typo
BrunoQuaresma May 9, 2023
a0bbf8f
Fix filter size
BrunoQuaresma May 9, 2023
029e658
Fix skeleton path
BrunoQuaresma May 9, 2023
367c445
Fix storybook
BrunoQuaresma May 9, 2023
9682b7b
Many storybook fixes
BrunoQuaresma May 9, 2023
82d2e53
Fix table min
BrunoQuaresma May 9, 2023
a38eb9a
Fix colors and input sizes
BrunoQuaresma May 9, 2023
9a0e553
Previous design issue
BrunoQuaresma May 9, 2023
1145725
Better workspace build state error
BrunoQuaresma May 9, 2023
7251da2
Fix type
BrunoQuaresma May 9, 2023
a3a807a
Merge branch 'main' into bq/migrate-to-muiv5
BrunoQuaresma May 10, 2023
e18c0c1
Apply Kira PR comments
BrunoQuaresma May 10, 2023
47ab467
Fix fmt
BrunoQuaresma May 10, 2023
6bb6f5b
Fix
BrunoQuaresma May 10, 2023
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
Prev Previous commit
Next Next commit
Update workspace header
  • Loading branch information
BrunoQuaresma committed May 8, 2023
commit a1cbc123b25b700ddebb9c53deb5a921fb7af42a
1 change: 1 addition & 0 deletions site/src/components/Stats/Stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export const StatsItem: FC<

const useStyles = makeStyles((theme) => ({
stats: {
...theme.typography.body2,
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
borderRadius: theme.shape.borderRadius,
Expand Down
11 changes: 7 additions & 4 deletions site/src/components/TemplateLayout/TemplatePageHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Button from "@mui/material/Button"
import AddCircleOutline from "@mui/icons-material/AddCircleOutline"
import AddIcon from "@mui/icons-material/AddOutlined"
import {
AuthorizationResponse,
Template,
Expand All @@ -25,6 +25,7 @@ import SettingsOutlined from "@mui/icons-material/SettingsOutlined"
import DeleteOutlined from "@mui/icons-material/DeleteOutlined"
import EditOutlined from "@mui/icons-material/EditOutlined"
import FileCopyOutlined from "@mui/icons-material/FileCopyOutlined"
import IconButton from "@mui/material/IconButton"

const TemplateMenu: FC<{
templateName: string
Expand All @@ -44,14 +45,15 @@ const TemplateMenu: FC<{

return (
<div>
<Button
<IconButton
aria-controls="template-options"
aria-haspopup="true"
onClick={() => setIsMenuOpen(true)}
ref={menuTriggerRef}
arial-label="More options"
>
<MoreVertOutlined />
</Button>
</IconButton>

<Menu
id="template-options"
Expand Down Expand Up @@ -99,7 +101,8 @@ const CreateWorkspaceButton: FC<{
className?: string
}> = ({ templateName }) => (
<Button
startIcon={<AddCircleOutline />}
variant="contained"
startIcon={<AddIcon />}
component={RouterLink}
to={`/templates/${templateName}/workspace`}
>
Expand Down
7 changes: 6 additions & 1 deletion site/src/pages/TemplatesPage/TemplatesPageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ export const TemplatesPageView: FC<
<Button component={RouterLink} to="/starter-templates">
Starter templates
</Button>
<Button startIcon={<AddIcon />} component={RouterLink} to="new">
<Button
startIcon={<AddIcon />}
component={RouterLink}
to="new"
variant="contained"
>
Add template
</Button>
</Maybe>
Expand Down
19 changes: 8 additions & 11 deletions site/src/theme/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ dark = createTheme(dark, {
outlinedNeutral: {
borderColor: colors.gray[12],
},
containedNeutral: {
borderColor: colors.gray[12],
backgroundColor: colors.gray[13],
"&:hover": {
backgroundColor: colors.gray[12],
},
},
iconSizeMedium: {
"& > .MuiSvgIcon-root": {
fontSize: 18,
Expand All @@ -148,16 +155,6 @@ dark = createTheme(dark, {
},
},
},
MuiIconButton: {
styleOverrides: {
sizeSmall: {
"& .MuiSvgIcon-root": {
width: 20,
height: 20,
},
},
},
},
MuiTableContainer: {
styleOverrides: {
root: {
Expand Down Expand Up @@ -270,7 +267,7 @@ dark = createTheme(dark, {
marginTop: 8,
borderRadius: 4,
padding: "4px 0",
minWidth: 120,
minWidth: 160,
},
},
},
Expand Down