beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

remove styled component ThemeProvider

Browse source
This commit is contained in:
Abhinav 2022-06-13 20:01:24 +05:30
parent 5a5ed66431
commit 33c70cb5cf
2 changed files with 56 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
src/pages/_app.tsx
View file

@ -1,5 +1,4 @@
import React, { createContext, useEffect, useRef, useState } from 'react';
import styled, { ThemeProvider as SThemeProvider } from 'styled-components';
import AppNavbar from 'components/Navbar/app';
import constants from 'utils/strings/constants';
import { useRouter } from 'next/router';
@ -17,7 +16,7 @@ import Head from 'next/head';
import { logUploadInfo } from 'utils/upload';
import LoadingBar from 'react-top-loading-bar';
import DialogBox from 'components/DialogBox';
import { ThemeProvider as MThemeProvider } from '@mui/material/styles';
import { styled, ThemeProvider } from '@mui/material/styles';
import darkThemeOptions from 'themes/darkThemeOptions';
import { CssBaseline } from '@mui/material';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@ -29,7 +28,7 @@ import {
} from 'services/userService';
import { CustomError } from 'utils/error';
export const MessageContainer = styled.div`
export const MessageContainer = styled('div')`
background-color: #111;
padding: 0;
font-size: 14px;
@ -232,66 +231,62 @@ export default function App({ Component, err }) {
/>
</Head>
<MThemeProvider theme={darkThemeOptions}>
<SThemeProvider theme={darkThemeOptions}>
<CssBaseline />
{showNavbar && <AppNavbar />}
<MessageContainer>
{offline && constants.OFFLINE_MSG}
</MessageContainer>
{sharedFiles &&
(router.pathname === '/gallery' ? (
<MessageContainer>
{constants.FILES_TO_BE_UPLOADED(
sharedFiles.length
)}
</MessageContainer>
) : (
<MessageContainer>
{constants.LOGIN_TO_UPLOAD_FILES(
sharedFiles.length
)}
</MessageContainer>
))}
{flashMessage && (
<FlashMessageBar
flashMessage={flashMessage}
onClose={() => setFlashMessage(null)}
/>
)}
<LoadingBar color="#51cd7c" ref={loadingBar} />
<DialogBox
open={messageDialogView}
onClose={closeMessageDialog}
attributes={dialogMessage}
<ThemeProvider theme={darkThemeOptions}>
<CssBaseline />
{showNavbar && <AppNavbar />}
<MessageContainer>
{offline && constants.OFFLINE_MSG}
</MessageContainer>
{sharedFiles &&
(router.pathname === '/gallery' ? (
<MessageContainer>
{constants.FILES_TO_BE_UPLOADED(sharedFiles.length)}
</MessageContainer>
) : (
<MessageContainer>
{constants.LOGIN_TO_UPLOAD_FILES(
sharedFiles.length
)}
</MessageContainer>
))}
{flashMessage && (
<FlashMessageBar
flashMessage={flashMessage}
onClose={() => setFlashMessage(null)}
/>
)}
<LoadingBar color="#51cd7c" ref={loadingBar} />
<AppContext.Provider
value={{
showNavBar,
sharedFiles,
resetSharedFiles,
setDisappearingFlashMessage,
redirectURL,
setRedirectURL,
startLoading,
finishLoading,
closeMessageDialog,
setDialogMessage,
}}>
{loading ? (
<VerticallyCentered>
<EnteSpinner>
<span className="sr-only">Loading...</span>
</EnteSpinner>
</VerticallyCentered>
) : (
<Component err={err} setLoading={setLoading} />
)}
</AppContext.Provider>
</SThemeProvider>
</MThemeProvider>
<DialogBox
open={messageDialogView}
onClose={closeMessageDialog}
attributes={dialogMessage}
/>
<AppContext.Provider
value={{
showNavBar,
sharedFiles,
resetSharedFiles,
setDisappearingFlashMessage,
redirectURL,
setRedirectURL,
startLoading,
finishLoading,
closeMessageDialog,
setDialogMessage,
}}>
{loading ? (
<VerticallyCentered>
<EnteSpinner>
<span className="sr-only">Loading...</span>
</EnteSpinner>
</VerticallyCentered>
) : (
<Component err={err} setLoading={setLoading} />
)}
</AppContext.Provider>
</ThemeProvider>
</>
);
}

7
src/types/theme/styled.d.ts vendored
View file

@ -1,7 +0,0 @@
// styled.d.ts
import 'styled-components';
import { Theme } from '@mui/material';
declare module 'styled-components' {
export interface DefaultTheme extends Theme {}
}