فهرست منبع

remove usage of styled components and replace with mui styled

Abhinav 3 سال پیش
والد
کامیت
d0765c52a1
50فایلهای تغییر یافته به همراه131 افزوده شده و 181 حذف شده
  1. 2 2
      src/components/AddToCollectionBtn.tsx
  2. 2 3
      src/components/CodeBlock/styledComponents.tsx
  3. 1 6
      src/components/Collections/AllCollections/CollectionSort/optionCreator.tsx
  4. 2 2
      src/components/Collections/CollectionBar/ScrollButton.tsx
  5. 1 2
      src/components/Collections/CollectionShare/publicShare/switch.tsx
  6. 3 4
      src/components/Collections/CollectionShare/styledComponents.tsx
  7. 7 8
      src/components/Collections/styledComponents.ts
  8. 7 7
      src/components/Container.ts
  9. 2 2
      src/components/DeleteBtn.tsx
  10. 2 2
      src/components/EmptyScreen.tsx
  11. 2 3
      src/components/EnteLogo.tsx
  12. 2 2
      src/components/ExportInProgress.tsx
  13. 3 3
      src/components/ExportModal.tsx
  14. 2 3
      src/components/FavButton.tsx
  15. 4 4
      src/components/FullScreenDropZone.tsx
  16. 2 3
      src/components/LoadingOverlay.tsx
  17. 2 3
      src/components/LogoImg.tsx
  18. 1 2
      src/components/Navbar/SelectionBar.tsx
  19. 1 2
      src/components/Navbar/base.tsx
  20. 7 10
      src/components/Notification.tsx
  21. 2 2
      src/components/PhotoFrame.tsx
  22. 2 2
      src/components/PhotoList.tsx
  23. 2 3
      src/components/PhotoSwipe/styledComponents/Legend.tsx
  24. 2 3
      src/components/PhotoSwipe/styledComponents/LegendContainer.tsx
  25. 2 3
      src/components/PhotoSwipe/styledComponents/LivePhotoBtn.tsx
  26. 2 3
      src/components/PhotoSwipe/styledComponents/Pre.tsx
  27. 2 3
      src/components/Search/SearchStatsContainer.tsx
  28. 1 6
      src/components/Search/optionWithInfo.tsx
  29. 1 1
      src/components/Search/styledComponents.tsx
  30. 2 3
      src/components/Sidebar/styledComponents.tsx
  31. 2 3
      src/components/TruncateText.tsx
  32. 2 3
      src/components/TwoFactor/styledComponents.ts
  33. 4 5
      src/components/UploadProgress/styledComponents.tsx
  34. 1 10
      src/components/UploadProgress/title.tsx
  35. 2 3
      src/components/icons/InProgressIcon.tsx
  36. 2 3
      src/components/icons/LivePhotoIndicatorOverlay.tsx
  37. 3 3
      src/components/pages/dedupe/SelectedFileOptions.tsx
  38. 3 8
      src/components/pages/gallery/AddCollectionButton.tsx
  39. 2 2
      src/components/pages/gallery/AlertBanner.tsx
  40. 2 3
      src/components/pages/gallery/OptionIcon.tsx
  41. 2 2
      src/components/pages/gallery/PlanSelector/plans/planTile.tsx
  42. 7 7
      src/components/pages/gallery/PreviewCard.tsx
  43. 2 2
      src/components/pages/gallery/UploadButton.tsx
  44. 2 2
      src/components/pages/sharedAlbum/AbuseReportForm.tsx
  45. 3 3
      src/components/pages/sharedAlbum/GoToEnte.tsx
  46. 2 3
      src/components/pages/sharedAlbum/ReportAbuse.tsx
  47. 2 2
      src/pages/deduplicate/index.tsx
  48. 3 3
      src/pages/gallery/index.tsx
  49. 9 9
      src/pages/index.tsx
  50. 3 3
      src/utils/strings/englishConstants.tsx

+ 2 - 2
src/components/AddToCollectionBtn.tsx

@@ -1,7 +1,7 @@
+import { styled } from '@mui/material';
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
 
 
-const Wrapper = styled.button`
+const Wrapper = styled('button')`
     border: none;
     border: none;
     background-color: #51cd7c;
     background-color: #51cd7c;
     position: fixed;
     position: fixed;

+ 2 - 3
src/components/CodeBlock/styledComponents.tsx

@@ -1,7 +1,6 @@
 import { IconButton } from '@mui/material';
 import { IconButton } from '@mui/material';
 import { CenteredFlex } from 'components/Container';
 import { CenteredFlex } from 'components/Container';
-import styled from 'styled-components';
-
+import { styled } from '@mui/material';
 export const Wrapper = styled(CenteredFlex)`
 export const Wrapper = styled(CenteredFlex)`
     position: relative;
     position: relative;
     background: ${({ theme }) => theme.palette.accent.dark};
     background: ${({ theme }) => theme.palette.accent.dark};
@@ -15,7 +14,7 @@ export const CopyButtonWrapper = styled(IconButton)`
     margin: ${({ theme }) => theme.spacing(1)};
     margin: ${({ theme }) => theme.spacing(1)};
 `;
 `;
 
 
-export const CodeWrapper = styled.div`
+export const CodeWrapper = styled('div')`
     padding: 36px 36px 16px 16px;
     padding: 36px 36px 16px 16px;
     border-radius: ${({ theme }) => theme.shape.borderRadius}px;
     border-radius: ${({ theme }) => theme.shape.borderRadius}px;
 `;
 `;

+ 1 - 6
src/components/Collections/AllCollections/CollectionSort/optionCreator.tsx

@@ -19,12 +19,7 @@ const SortByOptionCreator =
             <MenuItem onClick={handleClick} style={{ paddingLeft: '5px' }}>
             <MenuItem onClick={handleClick} style={{ paddingLeft: '5px' }}>
                 <ListItemIcon style={{ minWidth: '25px' }}>
                 <ListItemIcon style={{ minWidth: '25px' }}>
                     {activeSortBy === props.sortBy && (
                     {activeSortBy === props.sortBy && (
-                        <TickIcon
-                            css={`
-                                height: 16px;
-                                width: 16px;
-                            `}
-                        />
+                        <TickIcon sx={{ fontSize: 16 }} />
                     )}
                     )}
                 </ListItemIcon>
                 </ListItemIcon>
                 <ListItemText>{props.children}</ListItemText>
                 <ListItemText>{props.children}</ListItemText>

+ 2 - 2
src/components/Collections/CollectionBar/ScrollButton.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import React from 'react';
-import styled, { css } from 'styled-components';
 import NavigateNextIcon from '@mui/icons-material/NavigateNext';
 import NavigateNextIcon from '@mui/icons-material/NavigateNext';
 import { SCROLL_DIRECTION } from 'hooks/useComponentScroll';
 import { SCROLL_DIRECTION } from 'hooks/useComponentScroll';
+import { css, styled } from '@mui/material';
 
 
-const Wrapper = styled.button<{ direction: SCROLL_DIRECTION }>`
+const Wrapper = styled('button')<{ direction: SCROLL_DIRECTION }>`
     position: absolute;
     position: absolute;
     z-index: 2;
     z-index: 2;
     top: 7px;
     top: 7px;

+ 1 - 2
src/components/Collections/CollectionShare/publicShare/switch.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
 import { SwitchProps, Switch } from '@mui/material';
 import { SwitchProps, Switch } from '@mui/material';
-import styled from 'styled-components';
-
+import { styled } from '@mui/material';
 const PublicShareSwitch = styled((props: SwitchProps) => (
 const PublicShareSwitch = styled((props: SwitchProps) => (
     <Switch
     <Switch
         focusVisibleClassName=".Mui-focusVisible"
         focusVisibleClassName=".Mui-focusVisible"

+ 3 - 4
src/components/Collections/CollectionShare/styledComponents.tsx

@@ -1,13 +1,12 @@
-import styled from 'styled-components';
-
-export const ManageSectionLabel = styled.summary(
+import { styled } from '@mui/material';
+export const ManageSectionLabel = styled('summary')(
     ({ theme }) => `
     ({ theme }) => `
     text-align: center;
     text-align: center;
     margin-bottom:${theme.spacing(1)};
     margin-bottom:${theme.spacing(1)};
 `
 `
 );
 );
 
 
-export const ManageSectionOptions = styled.section(
+export const ManageSectionOptions = styled('section')(
     ({ theme }) => `
     ({ theme }) => `
     margin-bottom:${theme.spacing(4)};
     margin-bottom:${theme.spacing(4)};
 `
 `

+ 7 - 8
src/components/Collections/styledComponents.ts

@@ -1,7 +1,6 @@
 import { Box } from '@mui/material';
 import { Box } from '@mui/material';
 import { PaddedContainer } from 'components/Container';
 import { PaddedContainer } from 'components/Container';
-import styled from 'styled-components';
-
+import { styled } from '@mui/material';
 export const CollectionListWrapper = styled(Box)`
 export const CollectionListWrapper = styled(Box)`
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
@@ -19,7 +18,7 @@ export const CollectionInfoBarWrapper = styled(Box)`
     margin-bottom: 24px;
     margin-bottom: 24px;
 `;
 `;
 
 
-export const ScrollContainer = styled.div`
+export const ScrollContainer = styled('div')`
     width: 100%;
     width: 100%;
     height: 100px;
     height: 100px;
     overflow: auto;
     overflow: auto;
@@ -27,7 +26,7 @@ export const ScrollContainer = styled.div`
     display: flex;
     display: flex;
 `;
 `;
 
 
-export const CollectionTile = styled.div`
+export const CollectionTile = styled('div')`
     display: flex;
     display: flex;
     position: relative;
     position: relative;
     border-radius: 4px;
     border-radius: 4px;
@@ -42,18 +41,18 @@ export const CollectionTile = styled.div`
     }
     }
 `;
 `;
 
 
-export const CollectionTileWrapper = styled.div`
+export const CollectionTileWrapper = styled('div')`
     margin-right: 4px;
     margin-right: 4px;
 `;
 `;
 
 
-export const ActiveIndicator = styled.div`
+export const ActiveIndicator = styled('div')`
     height: 3px;
     height: 3px;
     background-color: ${({ theme }) => theme.palette.text.primary};
     background-color: ${({ theme }) => theme.palette.text.primary};
     margin-top: 18px;
     margin-top: 18px;
     border-radius: 2px;
     border-radius: 2px;
 `;
 `;
 
 
-export const Hider = styled.div<{ hide: boolean }>`
+export const Hider = styled('div')<{ hide: boolean }>`
     display: ${(props) => (props.hide ? 'none' : 'block')};
     display: ${(props) => (props.hide ? 'none' : 'block')};
 `;
 `;
 
 
@@ -85,7 +84,7 @@ export const ResultPreviewTile = styled(AllCollectionTile)`
     border-radius: 4px;
     border-radius: 4px;
 `;
 `;
 
 
-export const CollectionTileTextOverlay = styled.div`
+export const CollectionTileTextOverlay = styled('div')`
     height: 100%;
     height: 100%;
     width: 100%;
     width: 100%;
     position: absolute;
     position: absolute;

+ 7 - 7
src/components/Container.ts

@@ -1,5 +1,5 @@
 import { Box } from '@mui/material';
 import { Box } from '@mui/material';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { default as MuiStyled } from '@mui/styled-engine';
 import { default as MuiStyled } from '@mui/styled-engine';
 import { IMAGE_CONTAINER_MAX_WIDTH } from 'constants/gallery';
 import { IMAGE_CONTAINER_MAX_WIDTH } from 'constants/gallery';
 
 
@@ -15,13 +15,13 @@ const VerticallyCentered = MuiStyled(Box)`
 
 
 export default VerticallyCentered;
 export default VerticallyCentered;
 
 
-export const DisclaimerContainer = styled.div`
+export const DisclaimerContainer = styled('div')`
     margin: 16px 0;
     margin: 16px 0;
     color: rgb(158, 150, 137);
     color: rgb(158, 150, 137);
     font-size: 14px;
     font-size: 14px;
 `;
 `;
 
 
-export const IconButton = styled.button`
+export const IconButton = styled('button')`
     background: none;
     background: none;
     border: none;
     border: none;
     border-radius: 50%;
     border-radius: 50%;
@@ -38,18 +38,18 @@ export const IconButton = styled.button`
     }
     }
 `;
 `;
 
 
-export const Row = styled.div`
+export const Row = styled('div')`
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     margin-bottom: ${({ theme }) => theme.spacing(2)};
     margin-bottom: ${({ theme }) => theme.spacing(2)};
     flex: 1;
     flex: 1;
 `;
 `;
 
 
-export const Label = styled.div<{ width?: string }>`
+export const Label = styled('div')<{ width?: string }>`
     width: ${(props) => props.width ?? '70%'};
     width: ${(props) => props.width ?? '70%'};
     color: ${(props) => props.theme.palette.text.secondary};
     color: ${(props) => props.theme.palette.text.secondary};
 `;
 `;
-export const Value = styled.div<{ width?: string }>`
+export const Value = styled('div')<{ width?: string }>`
     display: flex;
     display: flex;
     justify-content: flex-start;
     justify-content: flex-start;
     align-items: center;
     align-items: center;
@@ -62,7 +62,7 @@ export const FlexWrapper = styled(Box)`
     align-items: center;
     align-items: center;
 `;
 `;
 
 
-export const FreeFlowText = styled.div`
+export const FreeFlowText = styled('div')`
     word-break: break-word;
     word-break: break-word;
     min-width: 30%;
     min-width: 30%;
     text-align: left;
     text-align: left;

+ 2 - 2
src/components/DeleteBtn.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import { IconWithMessage } from './IconWithMessage';
 import { IconWithMessage } from './IconWithMessage';
 
 
-const Wrapper = styled.button`
+const Wrapper = styled('button')`
     border: none;
     border: none;
     background-color: #ff6666;
     background-color: #ff6666;
     position: fixed;
     position: fixed;

+ 2 - 2
src/components/EmptyScreen.tsx

@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
 import React, { useContext } from 'react';
 import { Button } from 'react-bootstrap';
 import { Button } from 'react-bootstrap';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import { DeduplicateContext } from 'pages/deduplicate';
 import { DeduplicateContext } from 'pages/deduplicate';
 
 
-const Wrapper = styled.div`
+const Wrapper = styled('div')`
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;
     align-items: center;
     align-items: center;

+ 2 - 3
src/components/EnteLogo.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-const LogoImage = styled.img`
+import { styled } from '@mui/material';
+const LogoImage = styled('img')`
     height: 18px;
     height: 18px;
     padding: 0 3px;
     padding: 0 3px;
 `;
 `;

+ 2 - 2
src/components/ExportInProgress.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import React from 'react';
 import { Button, ProgressBar } from 'react-bootstrap';
 import { Button, ProgressBar } from 'react-bootstrap';
 import { ExportProgress } from 'types/export';
 import { ExportProgress } from 'types/export';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import { ExportStage } from 'constants/export';
 import { ExportStage } from 'constants/export';
 
 
-export const ComfySpan = styled.span`
+export const ComfySpan = styled('span')`
     word-spacing: 1rem;
     word-spacing: 1rem;
     color: #ddd;
     color: #ddd;
 `;
 `;

+ 3 - 3
src/components/ExportModal.tsx

@@ -5,7 +5,7 @@ import exportService from 'services/exportService';
 import { ExportProgress, ExportStats } from 'types/export';
 import { ExportProgress, ExportStats } from 'types/export';
 import { getLocalFiles } from 'services/fileService';
 import { getLocalFiles } from 'services/fileService';
 import { User } from 'types/user';
 import { User } from 'types/user';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { sleep } from 'utils/common';
 import { sleep } from 'utils/common';
 import { getExportRecordFileUID } from 'utils/export';
 import { getExportRecordFileUID } from 'utils/export';
 import { logError } from 'utils/sentry';
 import { logError } from 'utils/sentry';
@@ -20,7 +20,7 @@ import InProgressIcon from './icons/InProgressIcon';
 import DialogBox from './DialogBox';
 import DialogBox from './DialogBox';
 import { ExportStage, ExportType } from 'constants/export';
 import { ExportStage, ExportType } from 'constants/export';
 
 
-const FolderIconWrapper = styled.div`
+const FolderIconWrapper = styled('div')`
     width: 15%;
     width: 15%;
     margin-left: 10px;
     margin-left: 10px;
     cursor: pointer;
     cursor: pointer;
@@ -32,7 +32,7 @@ const FolderIconWrapper = styled.div`
     }
     }
 `;
 `;
 
 
-const ExportFolderPathContainer = styled.span`
+const ExportFolderPathContainer = styled('span')`
     white-space: nowrap;
     white-space: nowrap;
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;

+ 2 - 3
src/components/FavButton.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-const HeartUI = styled.button<{
+import { styled } from '@mui/material';
+const HeartUI = styled('button')<{
     isClick: boolean;
     isClick: boolean;
     size: number;
     size: number;
 }>`
 }>`

+ 4 - 4
src/components/FullScreenDropZone.tsx

@@ -1,20 +1,20 @@
 import React, { useEffect, useState } from 'react';
 import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import CloseIcon from '@mui/icons-material/Close';
 import CloseIcon from '@mui/icons-material/Close';
 
 
-const CloseButtonWrapper = styled.div`
+const CloseButtonWrapper = styled('div')`
     position: absolute;
     position: absolute;
     top: 10px;
     top: 10px;
     right: 10px;
     right: 10px;
     cursor: pointer;
     cursor: pointer;
 `;
 `;
-const DropDiv = styled.div`
+const DropDiv = styled('div')`
     flex: 1;
     flex: 1;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
 `;
 `;
-const Overlay = styled.div`
+const Overlay = styled('div')`
     border-width: 8px;
     border-width: 8px;
     left: 0;
     left: 0;
     top: 0;
     top: 0;

+ 2 - 3
src/components/LoadingOverlay.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const LoadingOverlay = styled.div`
+import { styled } from '@mui/material';
+export const LoadingOverlay = styled('div')`
     left: 0;
     left: 0;
     top: 0;
     top: 0;
     outline: none;
     outline: none;

+ 2 - 3
src/components/LogoImg.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export default styled.img`
+import { styled } from '@mui/material';
+export default styled('img')`
     height: 25px;
     height: 25px;
     vertical-align: bottom;
     vertical-align: bottom;
     padding-right: 15px;
     padding-right: 15px;

+ 1 - 2
src/components/Navbar/SelectionBar.tsx

@@ -1,6 +1,5 @@
 import NavbarBase from 'components/Navbar/base';
 import NavbarBase from 'components/Navbar/base';
-import styled from 'styled-components';
-
+import { styled } from '@mui/material';
 export const SelectionBar = styled(NavbarBase)`
 export const SelectionBar = styled(NavbarBase)`
     position: fixed;
     position: fixed;
     z-index: 2;
     z-index: 2;

+ 1 - 2
src/components/Navbar/base.tsx

@@ -1,6 +1,5 @@
 import { FlexWrapper } from 'components/Container';
 import { FlexWrapper } from 'components/Container';
-import styled from 'styled-components';
-
+import { styled } from '@mui/material';
 const NavbarBase = styled(FlexWrapper)`
 const NavbarBase = styled(FlexWrapper)`
     padding: 0 20px;
     padding: 0 20px;
     min-height: 64px;
     min-height: 64px;

+ 7 - 10
src/components/Notification.tsx

@@ -45,11 +45,11 @@ export default function Notification({ open, onClose, attributes }: Iprops) {
                 component={Button}
                 component={Button}
                 color={attributes.variant}
                 color={attributes.variant}
                 onClick={handleClick}
                 onClick={handleClick}
-                css={`
-                    width: 320px;
-                    padding: 12px 16px;
-                `}
-                sx={{ textAlign: 'left' }}>
+                sx={{
+                    textAlign: 'left',
+                    width: '320px',
+                    padding: '12px 16px',
+                }}>
                 <Stack
                 <Stack
                     flex={'1'}
                     flex={'1'}
                     spacing={2}
                     spacing={2}
@@ -68,11 +68,8 @@ export default function Notification({ open, onClose, attributes }: Iprops) {
                         {attributes?.action && (
                         {attributes?.action && (
                             <Typography
                             <Typography
                                 mb={0.5}
                                 mb={0.5}
-                                css={`
-                                    font-size: 16px;
-                                    font-weight: 600;
-                                    line-height: 19px;
-                                `}>
+                                variant="button"
+                                fontWeight={'bold'}>
                                 {attributes?.action.text}
                                 {attributes?.action.text}
                             </Typography>
                             </Typography>
                         )}
                         )}

+ 2 - 2
src/components/PhotoFrame.tsx

@@ -2,7 +2,7 @@ import { GalleryContext } from 'pages/gallery';
 import PreviewCard from './pages/gallery/PreviewCard';
 import PreviewCard from './pages/gallery/PreviewCard';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { EnteFile } from 'types/file';
 import { EnteFile } from 'types/file';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import DownloadManager from 'services/downloadManager';
 import DownloadManager from 'services/downloadManager';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -30,7 +30,7 @@ import { Search } from 'types/search';
 import { logError } from 'utils/sentry';
 import { logError } from 'utils/sentry';
 import { CustomError } from 'utils/error';
 import { CustomError } from 'utils/error';
 
 
-const Container = styled.div`
+const Container = styled('div')`
     display: block;
     display: block;
     flex: 1;
     flex: 1;
     width: 100%;
     width: 100%;

+ 2 - 2
src/components/PhotoList.tsx

@@ -1,6 +1,6 @@
 import React, { useRef, useEffect, useContext } from 'react';
 import React, { useRef, useEffect, useContext } from 'react';
 import { VariableSizeList as List } from 'react-window';
 import { VariableSizeList as List } from 'react-window';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { EnteFile } from 'types/file';
 import { EnteFile } from 'types/file';
 import {
 import {
     IMAGE_CONTAINER_MAX_WIDTH,
     IMAGE_CONTAINER_MAX_WIDTH,
@@ -49,7 +49,7 @@ export interface TimeStampListItem {
     fileCount?: number;
     fileCount?: number;
 }
 }
 
 
-const ListItem = styled.div`
+const ListItem = styled('div')`
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;
 `;
 `;

+ 2 - 3
src/components/PhotoSwipe/styledComponents/Legend.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const Legend = styled.span`
+import { styled } from '@mui/material';
+export const Legend = styled('span')`
     font-size: 20px;
     font-size: 20px;
     color: #ddd;
     color: #ddd;
     display: inline;
     display: inline;

+ 2 - 3
src/components/PhotoSwipe/styledComponents/LegendContainer.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const LegendContainer = styled.div`
+import { styled } from '@mui/material';
+export const LegendContainer = styled('div')`
     display: flex;
     display: flex;
     justify-content: space-between;
     justify-content: space-between;
 `;
 `;

+ 2 - 3
src/components/PhotoSwipe/styledComponents/LivePhotoBtn.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const LivePhotoBtn = styled.button`
+import { styled } from '@mui/material';
+export const LivePhotoBtn = styled('button')`
     position: absolute;
     position: absolute;
     bottom: 6vh;
     bottom: 6vh;
     right: 6vh;
     right: 6vh;

+ 2 - 3
src/components/PhotoSwipe/styledComponents/Pre.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const Pre = styled.pre`
+import { styled } from '@mui/material';
+export const Pre = styled('p')`
     color: #aaa;
     color: #aaa;
     padding: 7px 15px;
     padding: 7px 15px;
 `;
 `;

+ 2 - 3
src/components/Search/SearchStatsContainer.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-const SearchStatsContainer = styled.div(
+import { styled } from '@mui/material';
+const SearchStatsContainer = styled('div')(
     ({ theme }) => `
     ({ theme }) => `
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;

+ 1 - 6
src/components/Search/optionWithInfo.tsx

@@ -18,12 +18,7 @@ export const OptionWithInfo = (props) => (
 const LabelWithInfo = ({ data }: { data: SearchOption }) => (
 const LabelWithInfo = ({ data }: { data: SearchOption }) => (
     <>
     <>
         <Box className="main" px={2} py={1}>
         <Box className="main" px={2} py={1}>
-            <Typography
-                css={`
-                    font-size: 12px;
-                    line-height: 16px;
-                `}
-                mb={1}>
+            <Typography variant="caption" mb={1}>
                 {constants.SEARCH_TYPE(data.type)}
                 {constants.SEARCH_TYPE(data.type)}
             </Typography>
             </Typography>
             <SpaceBetweenFlex>
             <SpaceBetweenFlex>

+ 1 - 1
src/components/Search/styledComponents.tsx

@@ -3,7 +3,7 @@ import {
     FlexWrapper,
     FlexWrapper,
     FluidContainer,
     FluidContainer,
 } from 'components/Container';
 } from 'components/Container';
-import styled, { css } from 'styled-components';
+import { styled, css } from '@mui/material';
 
 
 export const SearchBarWrapper = styled(CenteredFlex)<{ isOpen: boolean }>`
 export const SearchBarWrapper = styled(CenteredFlex)<{ isOpen: boolean }>`
     ${(props) =>
     ${(props) =>

+ 2 - 3
src/components/Sidebar/styledComponents.tsx

@@ -1,8 +1,7 @@
 import { Drawer, Divider, styled } from '@mui/material';
 import { Drawer, Divider, styled } from '@mui/material';
-import { default as MuiStyled } from '@mui/styled-engine';
 import CircleIcon from '@mui/icons-material/Circle';
 import CircleIcon from '@mui/icons-material/Circle';
 
 
-export const DrawerSidebar = MuiStyled(Drawer)(({ theme }) => ({
+export const DrawerSidebar = styled(Drawer)(({ theme }) => ({
     '& .MuiPaper-root': {
     '& .MuiPaper-root': {
         width: '320px',
         width: '320px',
         padding: theme.spacing(2, 1, 4, 1),
         padding: theme.spacing(2, 1, 4, 1),
@@ -11,7 +10,7 @@ export const DrawerSidebar = MuiStyled(Drawer)(({ theme }) => ({
 
 
 DrawerSidebar.defaultProps = { anchor: 'left' };
 DrawerSidebar.defaultProps = { anchor: 'left' };
 
 
-export const PaddedDivider = MuiStyled(Divider)<{
+export const PaddedDivider = styled(Divider)<{
     invisible?: boolean;
     invisible?: boolean;
     spaced?: boolean;
     spaced?: boolean;
 }>(({ theme, invisible, spaced }) => ({
 }>(({ theme, invisible, spaced }) => ({

+ 2 - 3
src/components/TruncateText.tsx

@@ -1,8 +1,7 @@
 import Tooltip from '@mui/material/Tooltip';
 import Tooltip from '@mui/material/Tooltip';
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-export const EllipseText = styled.div`
+import { styled } from '@mui/material';
+export const EllipseText = styled('div')`
     white-space: nowrap;
     white-space: nowrap;
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;

+ 2 - 3
src/components/TwoFactor/styledComponents.ts

@@ -1,7 +1,6 @@
 import VerticallyCentered from 'components/Container';
 import VerticallyCentered from 'components/Container';
-import styled from 'styled-components';
-
-export const QRCode = styled.img(
+import { styled } from '@mui/material';
+export const QRCode = styled('img')(
     ({ theme }) => `
     ({ theme }) => `
     height: 200px;
     height: 200px;
     width: 200px;
     width: 200px;

+ 4 - 5
src/components/UploadProgress/styledComponents.tsx

@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-export const NotUploadSectionHeader = styled.div(
+import { styled } from '@mui/material';
+export const NotUploadSectionHeader = styled('div')(
     ({ theme }) => `
     ({ theme }) => `
     text-align: center;
     text-align: center;
     color: ${theme.palette.danger.main};
     color: ${theme.palette.danger.main};
@@ -9,7 +8,7 @@ export const NotUploadSectionHeader = styled.div(
 `
 `
 );
 );
 
 
-export const InProgressItemContainer = styled.div`
+export const InProgressItemContainer = styled('div')`
     display: inline-block;
     display: inline-block;
     & > span {
     & > span {
         display: inline-block;
         display: inline-block;
@@ -27,7 +26,7 @@ export const InProgressItemContainer = styled.div`
     }
     }
 `;
 `;
 
 
-export const ResultItemContainer = styled.div`
+export const ResultItemContainer = styled('div')`
     position: relative;
     position: relative;
     top: 5px;
     top: 5px;
     display: inline-block;
     display: inline-block;

+ 1 - 10
src/components/UploadProgress/title.tsx

@@ -20,16 +20,7 @@ const IconButtonWithBG = styled(IconButton)(({ theme }) => ({
 }));
 }));
 
 
 const UploadProgressTitleText = ({ expanded }) => (
 const UploadProgressTitleText = ({ expanded }) => (
-    <Typography
-        {...(expanded ? { variant: 'title' } : {})}
-        css={
-            !expanded &&
-            `
-font-size: 24px;
-font-weight: 600;
-line-height: 36px;
-`
-        }>
+    <Typography variant={expanded ? 'title' : 'subtitle'}>
         {constants.FILE_UPLOAD}
         {constants.FILE_UPLOAD}
     </Typography>
     </Typography>
 );
 );

+ 2 - 3
src/components/icons/InProgressIcon.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-const Rotate = styled.div<{ disabled }>`
+import { styled } from '@mui/material';
+const Rotate = styled('div')<{ disabled }>`
     width: 24px;
     width: 24px;
     height: 27px;
     height: 27px;
     ${(props) =>
     ${(props) =>

+ 2 - 3
src/components/icons/LivePhotoIndicatorOverlay.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-const Wrapper = styled.div`
+import { styled } from '@mui/material';
+const Wrapper = styled('div')`
     font-size: 10px;
     font-size: 10px;
     position: absolute;
     position: absolute;
     padding: 2px;
     padding: 2px;

+ 3 - 3
src/components/pages/dedupe/SelectedFileOptions.tsx

@@ -3,14 +3,14 @@ import { SelectionBar } from '../../Navbar/SelectionBar';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import DeleteIcon from 'components/icons/DeleteIcon';
 import DeleteIcon from 'components/icons/DeleteIcon';
 import React, { useContext } from 'react';
 import React, { useContext } from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { DeduplicateContext } from 'pages/deduplicate';
 import { DeduplicateContext } from 'pages/deduplicate';
 import { IconWithMessage } from 'components/IconWithMessage';
 import { IconWithMessage } from 'components/IconWithMessage';
 import { AppContext } from 'pages/_app';
 import { AppContext } from 'pages/_app';
 import CloseIcon from '@mui/icons-material/Close';
 import CloseIcon from '@mui/icons-material/Close';
 import BackButton from '@mui/icons-material/ArrowBackOutlined';
 import BackButton from '@mui/icons-material/ArrowBackOutlined';
 
 
-const VerticalLine = styled.div`
+const VerticalLine = styled('div')`
     position: absolute;
     position: absolute;
     width: 1px;
     width: 1px;
     top: 0;
     top: 0;
@@ -18,7 +18,7 @@ const VerticalLine = styled.div`
     background: #303030;
     background: #303030;
 `;
 `;
 
 
-const CheckboxText = styled.div`
+const CheckboxText = styled('div')`
     margin-left: 0.5em;
     margin-left: 0.5em;
     font-size: 16px;
     font-size: 16px;
     margin-right: 0.8em;
     margin-right: 0.8em;

+ 3 - 8
src/components/pages/gallery/AddCollectionButton.tsx

@@ -2,10 +2,10 @@ import { Typography } from '@mui/material';
 import CollectionCard from 'components/Collections/CollectionCard';
 import CollectionCard from 'components/Collections/CollectionCard';
 import { CollectionSelectorTile } from 'components/Collections/styledComponents';
 import { CollectionSelectorTile } from 'components/Collections/styledComponents';
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 
 
-const ImageContainer = styled.div`
+const ImageContainer = styled('div')`
     position: absolute;
     position: absolute;
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
@@ -25,12 +25,7 @@ export default function AddCollectionButton({
             collectionTile={CollectionSelectorTile}
             collectionTile={CollectionSelectorTile}
             onClick={() => showNextModal()}
             onClick={() => showNextModal()}
             latestFile={null}>
             latestFile={null}>
-            <Typography
-                css={`
-                    font-size: 14px;
-                    font-weight: 600;
-                    line-height: 20px;
-                `}>
+            <Typography variant="body2" fontWeight={'bold'}>
                 {constants.CREATE_COLLECTION}
                 {constants.CREATE_COLLECTION}
             </Typography>
             </Typography>
             <ImageContainer>+</ImageContainer>
             <ImageContainer>+</ImageContainer>

+ 2 - 2
src/components/pages/gallery/AlertBanner.tsx

@@ -1,14 +1,14 @@
 import { FlexWrapper } from 'components/Container';
 import { FlexWrapper } from 'components/Container';
 import WarningIcon from 'components/icons/WarningIcon';
 import WarningIcon from 'components/icons/WarningIcon';
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { ButtonVariant, getVariantColor } from './LinkButton';
 import { ButtonVariant, getVariantColor } from './LinkButton';
 
 
 interface Props {
 interface Props {
     bannerMessage?: any;
     bannerMessage?: any;
     variant?: string;
     variant?: string;
 }
 }
-const Banner = styled.div`
+const Banner = styled('div')`
     border: 1px solid ${getVariantColor(ButtonVariant.warning)};
     border: 1px solid ${getVariantColor(ButtonVariant.warning)};
     border-radius: 8px;
     border-radius: 8px;
     padding: 16px 28px;
     padding: 16px 28px;

+ 2 - 3
src/components/pages/gallery/OptionIcon.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
-
-export const OptionIconWrapper = styled.div`
+import { styled } from '@mui/material';
+export const OptionIconWrapper = styled('div')`
     display: inline-block;
     display: inline-block;
     opacity: 0;
     opacity: 0;
     font-weight: bold;
     font-weight: bold;

+ 2 - 2
src/components/pages/gallery/PlanSelector/plans/planTile.tsx

@@ -1,6 +1,6 @@
-import styled, { css } from 'styled-components';
+import { css, styled } from '@mui/material';
 
 
-export const PlanTile = styled.div<{ currentlySubscribed: boolean }>`
+export const PlanTile = styled('div')<{ currentlySubscribed: boolean }>`
     border-radius: 20px;
     border-radius: 20px;
     width: 220px;
     width: 220px;
     border: 2px solid #333;
     border: 2px solid #333;

+ 7 - 7
src/components/pages/gallery/PreviewCard.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
 import React, { useContext, useLayoutEffect, useRef, useState } from 'react';
 import { EnteFile } from 'types/file';
 import { EnteFile } from 'types/file';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import PlayCircleOutlineOutlinedIcon from '@mui/icons-material/PlayCircleOutlineOutlined';
 import PlayCircleOutlineOutlinedIcon from '@mui/icons-material/PlayCircleOutlineOutlined';
 import DownloadManager from 'services/downloadManager';
 import DownloadManager from 'services/downloadManager';
 import useLongPress from 'utils/common/useLongPress';
 import useLongPress from 'utils/common/useLongPress';
@@ -28,7 +28,7 @@ interface IProps {
     isInsSelectRange?: boolean;
     isInsSelectRange?: boolean;
 }
 }
 
 
-const Check = styled.input<{ active: boolean }>`
+const Check = styled('input')<{ active: boolean }>`
     appearance: none;
     appearance: none;
     position: absolute;
     position: absolute;
     z-index: 10;
     z-index: 10;
@@ -87,7 +87,7 @@ const Check = styled.input<{ active: boolean }>`
     }
     }
 `;
 `;
 
 
-export const HoverOverlay = styled.div<{ checked: boolean }>`
+export const HoverOverlay = styled('div')<{ checked: boolean }>`
     opacity: 0;
     opacity: 0;
     left: 0;
     left: 0;
     top: 0;
     top: 0;
@@ -100,7 +100,7 @@ export const HoverOverlay = styled.div<{ checked: boolean }>`
         'background:linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0))'};
         'background:linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0))'};
 `;
 `;
 
 
-export const InSelectRangeOverLay = styled.div<{ active: boolean }>`
+export const InSelectRangeOverLay = styled('div')<{ active: boolean }>`
     opacity: ${(props) => (!props.active ? 0 : 1)};
     opacity: ${(props) => (!props.active ? 0 : 1)};
     left: 0;
     left: 0;
     top: 0;
     top: 0;
@@ -111,7 +111,7 @@ export const InSelectRangeOverLay = styled.div<{ active: boolean }>`
     ${(props) => props.active && 'background:rgba(81, 205, 124, 0.25)'};
     ${(props) => props.active && 'background:rgba(81, 205, 124, 0.25)'};
 `;
 `;
 
 
-export const FileAndCollectionNameOverlay = styled.div`
+export const FileAndCollectionNameOverlay = styled('div')`
     width: 100%;
     width: 100%;
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
@@ -135,7 +135,7 @@ export const FileAndCollectionNameOverlay = styled.div`
     position: absolute;
     position: absolute;
 `;
 `;
 
 
-export const SelectedOverlay = styled.div<{ selected: boolean }>`
+export const SelectedOverlay = styled('div')<{ selected: boolean }>`
     z-index: 5;
     z-index: 5;
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
@@ -146,7 +146,7 @@ export const SelectedOverlay = styled.div<{ selected: boolean }>`
     border-radius: 4px;
     border-radius: 4px;
 `;
 `;
 
 
-const Cont = styled.div<{ disabled: boolean }>`
+const Cont = styled('div')<{ disabled: boolean }>`
     background: #222;
     background: #222;
     display: flex;
     display: flex;
     width: fit-content;
     width: fit-content;

+ 2 - 2
src/components/pages/gallery/UploadButton.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import FileUploadOutlinedIcon from '@mui/icons-material/FileUploadOutlined';
 import FileUploadOutlinedIcon from '@mui/icons-material/FileUploadOutlined';
 import { Button } from '@mui/material';
 import { Button } from '@mui/material';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 
 
-const Wrapper = styled.div<{ isDisabled: boolean }>`
+const Wrapper = styled('div')<{ isDisabled: boolean }>`
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: center;
     justify-content: center;

+ 2 - 2
src/components/pages/sharedAlbum/AbuseReportForm.tsx

@@ -8,7 +8,7 @@ import { Col, Form, FormControl, Row } from 'react-bootstrap';
 import { reportAbuse } from 'services/publicCollectionService';
 import { reportAbuse } from 'services/publicCollectionService';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 import * as Yup from 'yup';
 import * as Yup from 'yup';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { AbuseReportDetails, AbuseReportRequest } from 'types/publicCollection';
 import { AbuseReportDetails, AbuseReportRequest } from 'types/publicCollection';
 import { AppContext } from 'pages/_app';
 import { AppContext } from 'pages/_app';
 
 
@@ -52,7 +52,7 @@ const defaultInitialValues: FormValues = {
     },
     },
 };
 };
 
 
-const Wrapper = styled.div`
+const Wrapper = styled('div')`
     padding: 5px 20px;
     padding: 5px 20px;
 `;
 `;
 
 

+ 3 - 3
src/components/pages/sharedAlbum/GoToEnte.tsx

@@ -1,16 +1,16 @@
 import { ENTE_WEBSITE_LINK } from 'constants/urls';
 import { ENTE_WEBSITE_LINK } from 'constants/urls';
 import React, { useEffect, useState } from 'react';
 import React, { useEffect, useState } from 'react';
 import { Button } from 'react-bootstrap';
 import { Button } from 'react-bootstrap';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import GetDeviceOS, { OS } from 'utils/common/deviceDetection';
 import GetDeviceOS, { OS } from 'utils/common/deviceDetection';
 import constants from 'utils/strings/constants';
 import constants from 'utils/strings/constants';
 
 
-const Wrapper = styled.div`
+const Wrapper = styled('div')`
     position: fixed;
     position: fixed;
     right: 20px;
     right: 20px;
 `;
 `;
 
 
-const NoStyleAnchor = styled.a`
+const NoStyleAnchor = styled('a')`
     color: inherit;
     color: inherit;
     text-decoration: none !important;
     text-decoration: none !important;
     &:hover {
     &:hover {

+ 2 - 3
src/components/pages/sharedAlbum/ReportAbuse.tsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import React from 'react';
 import { Button } from 'react-bootstrap';
 import { Button } from 'react-bootstrap';
-import styled from 'styled-components';
-
-const Container = styled.div`
+import { styled } from '@mui/material';
+const Container = styled('div')`
     position: fixed;
     position: fixed;
     bottom: 7%;
     bottom: 7%;
     right: 2%;
     right: 2%;

+ 2 - 2
src/pages/deduplicate/index.tsx

@@ -22,13 +22,13 @@ import DeduplicateOptions from 'components/pages/dedupe/SelectedFileOptions';
 import { PAGES } from 'constants/pages';
 import { PAGES } from 'constants/pages';
 import router from 'next/router';
 import router from 'next/router';
 import { getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';
 import { getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { syncCollections } from 'services/collectionService';
 import { syncCollections } from 'services/collectionService';
 
 
 export const DeduplicateContext = createContext<DeduplicateContextType>(
 export const DeduplicateContext = createContext<DeduplicateContextType>(
     DefaultDeduplicateContext
     DefaultDeduplicateContext
 );
 );
-export const Info = styled.div`
+export const Info = styled('div')`
     padding: 24px;
     padding: 24px;
     font-size: 18px;
     font-size: 18px;
 `;
 `;

+ 3 - 3
src/pages/gallery/index.tsx

@@ -14,7 +14,7 @@ import {
     trashFiles,
     trashFiles,
     deleteFromTrash,
     deleteFromTrash,
 } from 'services/fileService';
 } from 'services/fileService';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import {
 import {
     syncCollections,
     syncCollections,
     getFavItemIds,
     getFavItemIds,
@@ -104,7 +104,7 @@ import SearchResultInfo from 'components/Search/SearchResultInfo';
 import { NotificationAttributes } from 'types/Notification';
 import { NotificationAttributes } from 'types/Notification';
 import { ITEM_TYPE, TimeStampListItem } from 'components/PhotoList';
 import { ITEM_TYPE, TimeStampListItem } from 'components/PhotoList';
 
 
-export const DeadCenter = styled.div`
+export const DeadCenter = styled('div')`
     flex: 1;
     flex: 1;
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;
@@ -112,7 +112,7 @@ export const DeadCenter = styled.div`
     text-align: center;
     text-align: center;
     flex-direction: column;
     flex-direction: column;
 `;
 `;
-const AlertContainer = styled.div`
+const AlertContainer = styled('div')`
     background-color: #111;
     background-color: #111;
     padding: 5px 0;
     padding: 5px 0;
     font-size: 14px;
     font-size: 14px;

+ 9 - 9
src/pages/index.tsx

@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useState } from 'react';
 import React, { useContext, useEffect, useState } from 'react';
 import Carousel from 'react-bootstrap/Carousel';
 import Carousel from 'react-bootstrap/Carousel';
 import Button from 'react-bootstrap/Button';
 import Button from 'react-bootstrap/Button';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { AppContext } from './_app';
 import { AppContext } from './_app';
 import Login from 'components/Login';
 import Login from 'components/Login';
 import { useRouter } from 'next/router';
 import { useRouter } from 'next/router';
@@ -13,7 +13,7 @@ import localForage from 'utils/storage/localForage';
 import { logError } from 'utils/sentry';
 import { logError } from 'utils/sentry';
 import { getAlbumSiteHost, PAGES } from 'constants/pages';
 import { getAlbumSiteHost, PAGES } from 'constants/pages';
 
 
-const Container = styled.div`
+const Container = styled('div')`
     display: flex;
     display: flex;
     flex: 1;
     flex: 1;
     align-items: center;
     align-items: center;
@@ -25,7 +25,7 @@ const Container = styled.div`
     }
     }
 `;
 `;
 
 
-const SlideContainer = styled.div`
+const SlideContainer = styled('div')`
     flex: 1;
     flex: 1;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
@@ -38,7 +38,7 @@ const SlideContainer = styled.div`
     }
     }
 `;
 `;
 
 
-const DesktopBox = styled.div`
+const DesktopBox = styled('div')`
     flex: 1;
     flex: 1;
     height: 100%;
     height: 100%;
     padding: 10px;
     padding: 10px;
@@ -52,7 +52,7 @@ const DesktopBox = styled.div`
     }
     }
 `;
 `;
 
 
-const MobileBox = styled.div`
+const MobileBox = styled('div')`
     display: none;
     display: none;
 
 
     @media (max-width: 1024px) {
     @media (max-width: 1024px) {
@@ -62,13 +62,13 @@ const MobileBox = styled.div`
     }
     }
 `;
 `;
 
 
-const SideBox = styled.div`
+const SideBox = styled('div')`
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     min-width: 320px;
     min-width: 320px;
 `;
 `;
 
 
-const TextContainer = styled.div`
+const TextContainer = styled('div')`
     padding: 20px;
     padding: 20px;
     max-width: 300px;
     max-width: 300px;
     margin: 0 auto;
     margin: 0 auto;
@@ -80,14 +80,14 @@ const UpperText = styled(TextContainer)`
     margin-bottom: 20px;
     margin-bottom: 20px;
 `;
 `;
 
 
-const FeatureText = styled.div`
+const FeatureText = styled('div')`
     color: #51cd7c;
     color: #51cd7c;
     font-weight: bold;
     font-weight: bold;
     padding-top: 20px;
     padding-top: 20px;
     font-size: 24px;
     font-size: 24px;
 `;
 `;
 
 
-const Img = styled.img`
+const Img = styled('img')`
     height: 250px;
     height: 250px;
     object-fit: contain;
     object-fit: contain;
 
 

+ 3 - 3
src/utils/strings/englishConstants.tsx

@@ -2,7 +2,7 @@ import { Box, Typography } from '@mui/material';
 import Link from '@mui/material/Link';
 import Link from '@mui/material/Link';
 import LinkButton from 'components/pages/gallery/LinkButton';
 import LinkButton from 'components/pages/gallery/LinkButton';
 import React from 'react';
 import React from 'react';
-import styled from 'styled-components';
+import { styled } from '@mui/material';
 import { SuggestionType } from 'types/search';
 import { SuggestionType } from 'types/search';
 import { formatNumberWithCommas } from '.';
 import { formatNumberWithCommas } from '.';
 
 
@@ -18,11 +18,11 @@ const dateString = function (date) {
     });
     });
 };
 };
 
 
-const Strong = styled.strong`
+const Strong = styled('strong')`
     color: #ddd;
     color: #ddd;
 `;
 `;
 
 
-const Logo = styled.img`
+const Logo = styled('img')`
     height: 18px;
     height: 18px;
     vertical-align: middle;
     vertical-align: middle;
     margin-top: -3px;
     margin-top: -3px;