From 776915e65955850660002b4ea4eb9df1212e03a9 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Sun, 30 Jun 2024 18:16:11 +0530 Subject: [PATCH] Continue painting --- web/apps/cast/src/pages/_app.tsx | 4 ++-- web/apps/photos/src/pages/_app.tsx | 7 ++----- web/apps/photos/src/services/face/mlWorkManager.ts | 2 +- web/packages/accounts/api/user.ts | 2 +- web/packages/accounts/pages/two-factor/recover.tsx | 2 +- web/packages/accounts/services/passkey.ts | 2 +- web/packages/accounts/services/redirect.ts | 2 +- web/packages/accounts/types/page.ts | 2 +- web/packages/shared/components/LoginComponents.tsx | 2 +- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/web/apps/cast/src/pages/_app.tsx b/web/apps/cast/src/pages/_app.tsx index 5ae3158587..ecb3166969 100644 --- a/web/apps/cast/src/pages/_app.tsx +++ b/web/apps/cast/src/pages/_app.tsx @@ -1,7 +1,7 @@ +import { staticAppTitle } from "@/next/app"; import { CustomHead } from "@/next/components/Head"; import { disableDiskLogs } from "@/next/log"; import { logUnhandledErrorsAndRejections } from "@/next/log-web"; -import { appTitle } from "@/next/app"; import { getTheme } from "@ente/shared/themes"; import { THEME_COLOR } from "@ente/shared/themes/constants"; import { CssBaseline, ThemeProvider } from "@mui/material"; @@ -19,7 +19,7 @@ const App: React.FC = ({ Component, pageProps }) => { return ( <> - + diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index 4cba5e1845..c90c4092de 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -1,3 +1,4 @@ +import { clientPackageName, staticAppTitle } from "@/next/app"; import { CustomHead } from "@/next/components/Head"; import { setupI18n } from "@/next/i18n"; import log from "@/next/log"; @@ -5,11 +6,7 @@ import { logStartupBanner, logUnhandledErrorsAndRejections, } from "@/next/log-web"; -import { - clientPackageName, - staticAppTitle, - type BaseAppContextT, -} from "@/next/types/app"; +import type { BaseAppContextT } from "@/next/types/context"; import { AppUpdate } from "@/next/types/ipc"; import { ensure } from "@/utils/ensure"; import { Overlay } from "@ente/shared/components/Container"; diff --git a/web/apps/photos/src/services/face/mlWorkManager.ts b/web/apps/photos/src/services/face/mlWorkManager.ts index d1d1dcbad8..8a555e82bd 100644 --- a/web/apps/photos/src/services/face/mlWorkManager.ts +++ b/web/apps/photos/src/services/face/mlWorkManager.ts @@ -1,8 +1,8 @@ import { FILE_TYPE } from "@/media/file-type"; import { EnteFile } from "@/new/photos/types/file"; +import { clientPackageNamePhotosDesktop } from "@/next/app"; import { ensureElectron } from "@/next/electron"; import log from "@/next/log"; -import { clientPackageNamePhotosDesktop } from "@/next/types/app"; import { ComlinkWorker } from "@/next/worker/comlink-worker"; import { eventBus, Events } from "@ente/shared/events"; import { getToken, getUserID } from "@ente/shared/storage/localStorage/helpers"; diff --git a/web/packages/accounts/api/user.ts b/web/packages/accounts/api/user.ts index 5ed4005cfc..7b2bb56f6f 100644 --- a/web/packages/accounts/api/user.ts +++ b/web/packages/accounts/api/user.ts @@ -1,5 +1,5 @@ +import { appName } from "@/next/app"; import { apiURL } from "@/next/origins"; -import { appName } from "@/next/types/app"; import type { RecoveryKey, TwoFactorRecoveryResponse, diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx index e52f90c633..6175b305b0 100644 --- a/web/packages/accounts/pages/two-factor/recover.tsx +++ b/web/packages/accounts/pages/two-factor/recover.tsx @@ -1,5 +1,5 @@ import log from "@/next/log"; -import type { BaseAppContextT } from "@/next/types/app"; +import type { BaseAppContextT } from "@/next/types/context"; import { ensure } from "@/utils/ensure"; import { recoverTwoFactor, diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.ts index c6f144b786..ad094cef18 100644 --- a/web/packages/accounts/services/passkey.ts +++ b/web/packages/accounts/services/passkey.ts @@ -1,7 +1,7 @@ +import { clientPackageName, isDesktop } from "@/next/app"; import { clientPackageHeader } from "@/next/http"; import log from "@/next/log"; import { accountsAppOrigin, apiURL } from "@/next/origins"; -import { clientPackageName, isDesktop } from "@/next/types/app"; import { TwoFactorAuthorizationResponse } from "@/next/types/credentials"; import { ensure } from "@/utils/ensure"; import ComlinkCryptoWorker from "@ente/shared/crypto"; diff --git a/web/packages/accounts/services/redirect.ts b/web/packages/accounts/services/redirect.ts index 2a4aaad867..88e4b78677 100644 --- a/web/packages/accounts/services/redirect.ts +++ b/web/packages/accounts/services/redirect.ts @@ -9,6 +9,6 @@ import { AUTH_PAGES, PHOTOS_PAGES } from "@ente/shared/constants/pages"; export const appHomeRoute: string = { accounts: "/passkeys", auth: AUTH_PAGES.AUTH, - cast: "/", + cast: "/" /* The cast app doesn't use this, this is an arbitrary value. */, photos: PHOTOS_PAGES.GALLERY, }[appName]; diff --git a/web/packages/accounts/types/page.ts b/web/packages/accounts/types/page.ts index 490967ae35..c673f8a47e 100644 --- a/web/packages/accounts/types/page.ts +++ b/web/packages/accounts/types/page.ts @@ -1,4 +1,4 @@ -import type { BaseAppContextT } from "@/next/types/app"; +import type { BaseAppContextT } from "@/next/types/context"; /** * The default type for pages exposed by this package. diff --git a/web/packages/shared/components/LoginComponents.tsx b/web/packages/shared/components/LoginComponents.tsx index 46cdc102da..3f47225cd9 100644 --- a/web/packages/shared/components/LoginComponents.tsx +++ b/web/packages/shared/components/LoginComponents.tsx @@ -1,6 +1,6 @@ import log from "@/next/log"; import { customAPIHost } from "@/next/origins"; -import type { BaseAppContextT } from "@/next/types/app"; +import type { BaseAppContextT } from "@/next/types/context"; import { checkPasskeyVerificationStatus, passkeySessionExpiredErrorMessage,