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

Remove @mui/styles legacy package #7446

Open
wants to merge 36 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6822ddf
Remove makeStyles for global styles
thalacheva Jan 6, 2025
520689b
Remove makeStyles from QR code dialogs
thalacheva Jan 9, 2025
0935454
Remove makeStyles from deprecated section
thalacheva Jan 9, 2025
436036f
Remove makeStyles from loading
thalacheva Jan 9, 2025
64199d8
Remove makeStyles from CredentialProfileCard
thalacheva Jan 9, 2025
427c511
Delete deprecated tags component
thalacheva Jan 9, 2025
362be5b
Clean up UserPopup dialog
thalacheva Jan 10, 2025
50afd74
Credential card - use styled components instead of makeStyles
thalacheva Jan 10, 2025
8b78bd6
Auth required page - remove makeStyles
thalacheva Jan 10, 2025
651f0f6
Clean up deprecated section component
thalacheva Jan 10, 2025
db452ff
WrapperBackdrop - use styled component instead of makeStyles
thalacheva Jan 10, 2025
868f16c
Fix problem with styled_default is not a function
thalacheva Jan 13, 2025
135a9a1
Remove makeStyles for Whiteboard dialogs
thalacheva Jan 13, 2025
0f2490a
Remove makeStyles from Application dialog
thalacheva Jan 13, 2025
80d27fb
Delete useProfileStyles
thalacheva Jan 13, 2025
53fb540
Refactor membership backdrop
thalacheva Jan 13, 2025
2b6fecd
Remove makeStyles from contributor components
thalacheva Jan 13, 2025
f78a721
Delete SearchableListIconButton
thalacheva Jan 13, 2025
cd9b155
Clean up circle tag
thalacheva Jan 13, 2025
d49545f
Remove makeStyles for FormikSelect
thalacheva Jan 14, 2025
e6ba436
Fix wrong import of styled
thalacheva Jan 14, 2025
a81cc35
Remove makeStyles from Excalidraw whiteboard
thalacheva Jan 15, 2025
ff18a83
Replace deprecated WrapperTypography in some pages
thalacheva Jan 15, 2025
c6e904a
Delete WrapperTypography - replace with Typography
thalacheva Jan 15, 2025
0d62466
Delete legacy package '@mui/styles'
thalacheva Jan 15, 2025
a966fe5
Add alt text to section image banner
thalacheva Jan 16, 2025
e1d7b35
Import DialogContent from @mui/material directly
thalacheva Jan 16, 2025
c670c12
Remove unused prop - message
thalacheva Jan 16, 2025
f5bf7b1
Add types to MetricViewItem
thalacheva Jan 16, 2025
ae97ac8
Address some coderabbitai comments
thalacheva Jan 16, 2025
3fbe65a
Merge branch 'develop' into remove-more-make-styles
bobbykolev Jan 17, 2025
507f369
excalidraw help dialog z-index fix
bobbykolev Jan 17, 2025
14ebf96
Merge branch 'develop' into remove-more-make-styles
thalacheva Jan 28, 2025
bf8a356
Extract the repeating styles in object
thalacheva Jan 28, 2025
317e898
Delete file after merge conflicts
thalacheva Jan 28, 2025
2d2e76d
fixup! Extract the repeating styles in object
thalacheva Jan 28, 2025
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
234 changes: 0 additions & 234 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"@mui/icons-material": "^5.15.10",
"@mui/lab": "^5.0.0-alpha.56",
"@mui/material": "5.13.x",
"@mui/styles": "^5.2.0",
"@mui/x-data-grid": "^5.0.1",
"@mui/x-date-pickers": "^5.0.16",
"@ory/kratos-client": "^0.10.1",
Expand Down
25 changes: 13 additions & 12 deletions src/core/auth/authentication/pages/AuthRequiredPage.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { _AUTH_LOGIN_PATH, AUTH_SIGN_UP_PATH } from '@/core/auth/authentication/constants/authentication.constants';
import { useQueryParams } from '@/core/routing/useQueryParams';
import { buildReturnUrlParam } from '@/main/routing/urlBuilders';
import AuthenticationLayout from '@/main/ui/layout/AuthenticationLayout';
import ErrorOutline from '@mui/icons-material/ErrorOutline';
import { Box, Button, Typography } from '@mui/material';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import WrapperTypography from '@/core/ui/typography/deprecated/WrapperTypography';
import { useQueryParams } from '@/core/routing/useQueryParams';
import AuthenticationLayout from '@/main/ui/layout/AuthenticationLayout';
import { _AUTH_LOGIN_PATH, AUTH_SIGN_UP_PATH } from '@/core/auth/authentication/constants/authentication.constants';
import { Box, Button } from '@mui/material';
import { buildReturnUrlParam } from '@/main/routing/urlBuilders';

export const AuthRequiredPage = () => {
const returnUrl = useQueryParams().get('returnUrl') ?? undefined;
Expand All @@ -26,12 +25,14 @@ export const AuthRequiredPage = () => {

return (
<AuthenticationLayout>
<Box textAlign={'center'}>
<WrapperTypography variant={'h2'}>
<ErrorOutline color={'primary'} fontSize={'large'} />
</WrapperTypography>
<WrapperTypography variant={'h2'}>{t('pages.authentication-required.header')}</WrapperTypography>
<WrapperTypography variant={'h3'}>{t('pages.authentication-required.subheader')}</WrapperTypography>
<Box textAlign="center">
<ErrorOutline color="primary" fontSize="large" sx={{ mb: 1 }} />
<Typography variant="h2" mb={1} fontWeight="medium" textTransform="uppercase">
{t('pages.authentication-required.header')}
</Typography>
<Typography variant="h3" fontWeight="medium">
{t('pages.authentication-required.subheader')}
</Typography>
</Box>
<Box display="flex" marginTop={4} gap={2} justifyContent="center">
<Button component={Link} to={loginUrl} variant="outlined" color="primary">
Expand Down
19 changes: 9 additions & 10 deletions src/core/help/dialog/HelpDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import { Trans, useTranslation } from 'react-i18next';
import { Box, Grid, Link, styled } from '@mui/material';
import QuizOutlinedIcon from '@mui/icons-material/QuizOutlined';
import ForumOutlinedIcon from '@mui/icons-material/ForumOutlined';
import FiberNewTwoToneIcon from '@mui/icons-material/FiberNewTwoTone';
import { DialogContent } from '@/core/ui/dialog/deprecated';
import WrapperMarkdown from '@/core/ui/markdown/WrapperMarkdown';
import { useConfig } from '@/domain/platform/config/useConfig';
import DialogHeader from '@/core/ui/dialog/DialogHeader';
import { TopLevelRoutePath } from '@/main/routing/TopLevelRoutePath';
import useServerMetadata from '@/domain/platform/metadata/useServerMetadata';
import DialogWithGrid from '@/core/ui/dialog/DialogWithGrid';
import Gutters from '@/core/ui/grid/Gutters';
import WrapperMarkdown from '@/core/ui/markdown/WrapperMarkdown';
import { Caption } from '@/core/ui/typography';
import { useConfig } from '@/domain/platform/config/useConfig';
import useServerMetadata from '@/domain/platform/metadata/useServerMetadata';
import { TopLevelRoutePath } from '@/main/routing/TopLevelRoutePath';
import { buildWelcomeSpaceUrl } from '@/main/routing/urlBuilders';
import FiberNewTwoToneIcon from '@mui/icons-material/FiberNewTwoTone';
import ForumOutlinedIcon from '@mui/icons-material/ForumOutlined';
import QuizOutlinedIcon from '@mui/icons-material/QuizOutlined';
import { Box, DialogContent, Grid, Link, styled } from '@mui/material';
import { Trans, useTranslation } from 'react-i18next';

interface HelpDialogProps {
open: boolean;
Expand Down
Loading