TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unnest

Browse Source
This commit is contained in:
Manav Rathi
2025-02-14 14:29:43 +05:30
parent 06450a0ce0
commit 6d552f5190
4 changed files with 55 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/apps/accounts/src/pages/_app.tsx
View File

@@ -38,21 +38,18 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
const title = isI18nReady ? t("title_accounts") : staticAppTitle;
return (
<>
<ThemeProvider theme={photosTheme}>
<CustomHead {...{ title }} />
<CssBaseline enableColorScheme />
<AttributedMiniDialog {...miniDialogProps} />
<ThemeProvider theme={photosTheme}>
<CssBaseline enableColorScheme />
<AttributedMiniDialog {...miniDialogProps} />
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady && <LoadingIndicator />}
{isI18nReady && <Component {...pageProps} />}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
</>
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady && <LoadingIndicator />}
{isI18nReady && <Component {...pageProps} />}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
);
};

38
web/apps/auth/src/pages/_app.tsx
View File

@@ -59,30 +59,24 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
const title = isI18nReady ? t("title_auth") : staticAppTitle;
return (
<>
<ThemeProvider theme={authTheme}>
<CustomHead {...{ title }} />
<CssBaseline enableColorScheme />
<AttributedMiniDialog {...miniDialogProps} />
<ThemeProvider theme={authTheme}>
<CssBaseline enableColorScheme />
<AttributedMiniDialog {...miniDialogProps} />
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady ? (
<LoadingIndicator />
) : (
<>
{isChangingRoute && (
<TranslucentLoadingOverlay />
)}
<Component {...pageProps} />
</>
)}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
</>
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady ? (
<LoadingIndicator />
) : (
<>
{isChangingRoute && <TranslucentLoadingOverlay />}
<Component {...pageProps} />
</>
)}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
);
};

15
web/apps/cast/src/pages/_app.tsx
View File

@@ -10,15 +10,14 @@ import React from "react";
const App: React.FC<AppProps> = ({ Component, pageProps }) => {
useSetupLogs({ disableDiskLogs: true });
return (
<>
<CustomHead title={staticAppTitle} />
// We don't provide BaseContext. Nothing in the cast app needs it yet.
<ThemeProvider theme={castTheme}>
<CssBaseline enableColorScheme />
<Component {...pageProps} />
</ThemeProvider>
</>
return (
<ThemeProvider theme={castTheme}>
<CustomHead title={staticAppTitle} />
<CssBaseline enableColorScheme />
<Component {...pageProps} />
</ThemeProvider>
);
};

49
web/apps/photos/src/pages/_app.tsx
View File

@@ -187,37 +187,32 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
const title = isI18nReady ? t("title_photos") : staticAppTitle;
return (
<>
<ThemeProvider theme={photosTheme}>
<CustomHead {...{ title }} />
<CssBaseline enableColorScheme />
<ThemedLoadingBar ref={loadingBarRef} />
<ThemeProvider theme={photosTheme}>
<CssBaseline enableColorScheme />
<ThemedLoadingBar ref={loadingBarRef} />
<AttributedMiniDialog
sx={{ zIndex: aboveFileViewerContentZ }}
{...miniDialogProps}
/>
<AttributedMiniDialog
sx={{ zIndex: aboveFileViewerContentZ }}
{...miniDialogProps}
/>
<Notification {...notificationProps} />
<Notification {...notificationProps} />
{isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady ? (
<LoadingIndicator />
) : (
<>
{isChangingRoute && (
<TranslucentLoadingOverlay />
)}
<Component {...pageProps} />
</>
)}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
</>
{isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
<BaseContext value={baseContext}>
<AppContext.Provider value={appContext}>
{!isI18nReady ? (
<LoadingIndicator />
) : (
<>
{isChangingRoute && <TranslucentLoadingOverlay />}
<Component {...pageProps} />
</>
)}
</AppContext.Provider>
</BaseContext>
</ThemeProvider>
);
};