Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Align Space file naming conventions

Anand Baburajanbdf51add6819
diff --git a/web/apps/space/src/components/SpaceActionFeedback.tsx b/web/apps/space/src/components/ActionFeedback.tsx
similarity index 100%
rename from web/apps/space/src/components/SpaceActionFeedback.tsx
rename to web/apps/space/src/components/ActionFeedback.tsx
diff --git a/web/apps/space/src/components/SpaceActionToast.tsx b/web/apps/space/src/components/ActionToast.tsx
similarity index 98%
rename from web/apps/space/src/components/SpaceActionToast.tsx
rename to web/apps/space/src/components/ActionToast.tsx
index 08dd89f1a5..6395992b1a 100644
--- a/web/apps/space/src/components/SpaceActionToast.tsx
+++ b/web/apps/space/src/components/ActionToast.tsx
@@ -3,7 +3,7 @@ import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
import { keyframes } from "@mui/material/styles";
import React from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx b/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
index b321dfd534..cf64d22f9d 100644
--- a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
+++ b/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
@@ -1,8 +1,8 @@
-import { spaceDefaultProfilePicPath } from "components/SpaceAvatarImage";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { spaceDefaultProfilePicPath } from "components/AvatarImage";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
-import { useBrowserBackClose } from "hooks/useBrowserBackClose";
+import { useBrowserBackClose } from "hooks/use-browser-back-close";
import React from "react";
import { friendsBackground } from "screens/FriendsScreen";
import {
@@ -10,6 +10,10 @@ import {
friendProfileImageViewerBackground,
} from "screens/ProfileImageViewerScreen";
import { ProfileScreen } from "screens/ProfileScreen";
+import {
+ patchCachedSpaceFeedPost,
+ removeCachedSpaceFeedPostsBySpace,
+} from "services/feed-cache";
import {
loadCurrentSpacePostAssetURL,
loadCurrentSpaceProfile,
@@ -19,18 +23,11 @@ import {
setCurrentPostLiked,
type SpaceProfilePost,
} from "services/space";
-import {
- patchCachedSpaceFeedPost,
- removeCachedSpaceFeedPostsBySpace,
-} from "services/spaceFeedCache";
-import { useSpaceAppState } from "state/spaceAppState";
-import { profilePostItemsFromPosts } from "utils/spacePostDisplay";
-import { spaceDefaultCoverImagePath } from "utils/spacePostImage";
-import { spaceRoutes } from "utils/spaceRoutes";
-import {
- hasPreviousSpaceRoute,
- useSpaceRouter,
-} from "utils/spaceRouteTransitions";
+import { useSpaceAppState } from "state/app-state";
+import { profilePostItemsFromPosts } from "utils/post-display";
+import { spaceDefaultCoverImagePath } from "utils/post-image";
+import { hasPreviousSpaceRoute, useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
interface AuthenticatedFriendProfileProps {
friendSpaceId: string;
diff --git a/web/apps/space/src/components/SpaceAvatarCropPage.tsx b/web/apps/space/src/components/AvatarCropPage.tsx
similarity index 98%
rename from web/apps/space/src/components/SpaceAvatarCropPage.tsx
rename to web/apps/space/src/components/AvatarCropPage.tsx
index 6a3d8e1945..0fff3c3077 100644
--- a/web/apps/space/src/components/SpaceAvatarCropPage.tsx
+++ b/web/apps/space/src/components/AvatarCropPage.tsx
@@ -1,9 +1,9 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import React from "react";
import Cropper, { type Area, type Point } from "react-easy-crop";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/components/SpaceAvatarImage.tsx b/web/apps/space/src/components/AvatarImage.tsx
similarity index 100%
rename from web/apps/space/src/components/SpaceAvatarImage.tsx
rename to web/apps/space/src/components/AvatarImage.tsx
diff --git a/web/apps/space/src/components/SpaceBackIcon.tsx b/web/apps/space/src/components/BackIcon.tsx
similarity index 100%
rename from web/apps/space/src/components/SpaceBackIcon.tsx
rename to web/apps/space/src/components/BackIcon.tsx
diff --git a/web/apps/space/src/components/SpaceBottomSheetTransition.tsx b/web/apps/space/src/components/BottomSheetTransition.tsx
similarity index 100%
rename from web/apps/space/src/components/SpaceBottomSheetTransition.tsx
rename to web/apps/space/src/components/BottomSheetTransition.tsx
diff --git a/web/apps/space/src/components/SpaceButtonSpinner.tsx b/web/apps/space/src/components/ButtonSpinner.tsx
similarity index 77%
rename from web/apps/space/src/components/SpaceButtonSpinner.tsx
rename to web/apps/space/src/components/ButtonSpinner.tsx
index 34c0b5bfac..4aeb63b570 100644
--- a/web/apps/space/src/components/SpaceButtonSpinner.tsx
+++ b/web/apps/space/src/components/ButtonSpinner.tsx
@@ -1,4 +1,4 @@
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
import React from "react";
export const SpaceButtonSpinner: React.FC = () => (
diff --git a/web/apps/space/src/components/ConfirmationActionSheet.tsx b/web/apps/space/src/components/ConfirmationActionSheet.tsx
index 145af6340c..ea2ac0277a 100644
--- a/web/apps/space/src/components/ConfirmationActionSheet.tsx
+++ b/web/apps/space/src/components/ConfirmationActionSheet.tsx
@@ -2,8 +2,8 @@ import { Box, Dialog, useMediaQuery } from "@mui/material";
import {
SpaceActionFeedbackIcon,
type SpaceActionPhase,
-} from "components/SpaceActionFeedback";
-import { SpaceBottomSheetTransition } from "components/SpaceBottomSheetTransition";
+} from "components/ActionFeedback";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import React from "react";
const green = "#08C225";
diff --git a/web/apps/space/src/components/SpaceFileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
similarity index 99%
rename from web/apps/space/src/components/SpaceFileViewer.tsx
rename to web/apps/space/src/components/FileViewer.tsx
index 2a8199626a..f85f69f9a3 100644
--- a/web/apps/space/src/components/SpaceFileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -11,26 +11,26 @@ import {
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Menu, MenuItem } from "@mui/material";
import { keyframes } from "@mui/material/styles";
-import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
spaceActionDoneDurationMs,
type SpaceActionPhase,
-} from "components/SpaceActionFeedback";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
+} from "components/ActionFeedback";
+import { SpaceAvatarImage } from "components/AvatarImage";
+import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
spacePostLikeButtonPop,
spacePostLikeHeartPop,
spacePostLikePopDurationMs,
spacePostLikePopTiming,
-} from "components/SpacePostLikeAnimation";
+} from "components/post-like-animation";
import log from "ente-base/log";
import type PhotoSwipe from "photoswipe";
import React from "react";
-import type { SpaceInviteIntent } from "services/spaceInvite";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { firstNameFrom, formatSpaceDate } from "utils/spaceDisplay";
-import { clampSpaceMessageText } from "utils/spaceMessageLimits";
-import type { SpaceImageCropArea } from "utils/spacePostImage";
+import type { SpaceInviteIntent } from "services/invite";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { firstNameFrom, formatSpaceDate } from "utils/display";
+import { clampSpaceMessageText } from "utils/message-limits";
+import type { SpaceImageCropArea } from "utils/post-image";
const green = "#08C225";
const textBase = "#F4F4F4";
diff --git a/web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx b/web/apps/space/src/components/FriendRequestCanceledToast.tsx
similarity index 91%
rename from web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx
rename to web/apps/space/src/components/FriendRequestCanceledToast.tsx
index 44fffcc5f2..1e91d7aed9 100644
--- a/web/apps/space/src/components/SpaceFriendRequestCanceledToast.tsx
+++ b/web/apps/space/src/components/FriendRequestCanceledToast.tsx
@@ -1,6 +1,6 @@
import { UserRemove01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
-import { SpaceActionToast } from "components/SpaceActionToast";
+import { SpaceActionToast } from "components/ActionToast";
import React from "react";
interface SpaceFriendRequestCanceledToastProps {
diff --git a/web/apps/space/src/components/SpaceInlinePostButton.tsx b/web/apps/space/src/components/InlinePostButton.tsx
similarity index 96%
rename from web/apps/space/src/components/SpaceInlinePostButton.tsx
rename to web/apps/space/src/components/InlinePostButton.tsx
index 32116540f0..df51b7ab38 100644
--- a/web/apps/space/src/components/SpaceInlinePostButton.tsx
+++ b/web/apps/space/src/components/InlinePostButton.tsx
@@ -2,7 +2,7 @@ import { AddSquareIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
import React from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
diff --git a/web/apps/space/src/components/SpaceMessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsx
similarity index 98%
rename from web/apps/space/src/components/SpaceMessagesPage.tsx
rename to web/apps/space/src/components/MessagesPage.tsx
index 338a1488c1..a47672e817 100644
--- a/web/apps/space/src/components/SpaceMessagesPage.tsx
+++ b/web/apps/space/src/components/MessagesPage.tsx
@@ -1,10 +1,11 @@
-import { SpaceFriendRequestCanceledToast } from "components/SpaceFriendRequestCanceledToast";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceFriendRequestCanceledToast } from "components/FriendRequestCanceledToast";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React from "react";
import { MessagesScreen, messagesBackground } from "screens/MessagesScreen";
import type { SetupProfile } from "screens/SetupProfileScreen";
+import { spaceInviteURL } from "services/invite";
import {
confirmCurrentFriendRequest,
deleteCurrentFriendRequest,
@@ -23,10 +24,9 @@ import {
type SpaceMessage,
type SpaceMessageConversation,
} from "services/space";
-import { spaceInviteURL } from "services/spaceInvite";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
interface SpaceMessagesPageProps {
selectedSpaceId?: string;
diff --git a/web/apps/space/src/components/SpaceMobileBestToast.tsx b/web/apps/space/src/components/MobileBestToast.tsx
similarity index 100%
rename from web/apps/space/src/components/SpaceMobileBestToast.tsx
rename to web/apps/space/src/components/MobileBestToast.tsx
diff --git a/web/apps/space/src/components/SpaceNotificationPermissionInstructions.tsx b/web/apps/space/src/components/NotificationPermissionInstructions.tsx
similarity index 98%
rename from web/apps/space/src/components/SpaceNotificationPermissionInstructions.tsx
rename to web/apps/space/src/components/NotificationPermissionInstructions.tsx
index 0b4d88539a..68ec1e212f 100644
--- a/web/apps/space/src/components/SpaceNotificationPermissionInstructions.tsx
+++ b/web/apps/space/src/components/NotificationPermissionInstructions.tsx
@@ -1,6 +1,6 @@
import { Box, Dialog, useMediaQuery } from "@mui/material";
-import { SpaceBottomSheetTransition } from "components/SpaceBottomSheetTransition";
-import { isSpaceIOS } from "hooks/useSpacePWAInstallPrompt";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
+import { isSpaceIOS } from "hooks/use-pwa-install-prompt";
import React from "react";
const green = "#08C225";
diff --git a/web/apps/space/src/components/SpaceOtpInput.tsx b/web/apps/space/src/components/OtpInput.tsx
similarity index 99%
rename from web/apps/space/src/components/SpaceOtpInput.tsx
rename to web/apps/space/src/components/OtpInput.tsx
index d493e7f1d1..140cdbe41c 100644
--- a/web/apps/space/src/components/SpaceOtpInput.tsx
+++ b/web/apps/space/src/components/OtpInput.tsx
@@ -1,6 +1,6 @@
import { Box } from "@mui/material";
import React from "react";
-import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/spaceOtp";
+import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/otp";
const green = "#08C225";
const activeFill = "rgba(8, 194, 37, 0.08)";
diff --git a/web/apps/space/src/components/SpacePWAInstallPrompt.tsx b/web/apps/space/src/components/PWAInstallPrompt.tsx
similarity index 98%
rename from web/apps/space/src/components/SpacePWAInstallPrompt.tsx
rename to web/apps/space/src/components/PWAInstallPrompt.tsx
index 8c3ab68c48..8a8243c940 100644
--- a/web/apps/space/src/components/SpacePWAInstallPrompt.tsx
+++ b/web/apps/space/src/components/PWAInstallPrompt.tsx
@@ -11,12 +11,12 @@ import {
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Dialog, useMediaQuery } from "@mui/material";
-import { SpaceBottomSheetTransition } from "components/SpaceBottomSheetTransition";
-import { SpaceNotificationPermissionInstructions } from "components/SpaceNotificationPermissionInstructions";
-import { useSpacePWAInstallPrompt } from "hooks/useSpacePWAInstallPrompt";
-import { useSpaceWebPushPrompt } from "hooks/useSpaceWebPushPrompt";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
+import { SpaceNotificationPermissionInstructions } from "components/NotificationPermissionInstructions";
+import { useSpacePWAInstallPrompt } from "hooks/use-pwa-install-prompt";
+import { useSpaceWebPushPrompt } from "hooks/use-web-push-prompt";
import React from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/components/SpacePageMeta.tsx b/web/apps/space/src/components/PageMeta.tsx
similarity index 100%
rename from web/apps/space/src/components/SpacePageMeta.tsx
rename to web/apps/space/src/components/PageMeta.tsx
diff --git a/web/apps/space/src/components/SpacePostFloatingActionButton.tsx b/web/apps/space/src/components/PostFloatingActionButton.tsx
similarity index 100%
rename from web/apps/space/src/components/SpacePostFloatingActionButton.tsx
rename to web/apps/space/src/components/PostFloatingActionButton.tsx
diff --git a/web/apps/space/src/components/SpaceProfileImagePages.tsx b/web/apps/space/src/components/ProfileImagePages.tsx
similarity index 93%
rename from web/apps/space/src/components/SpaceProfileImagePages.tsx
rename to web/apps/space/src/components/ProfileImagePages.tsx
index 04933b8d7e..31f1087e6f 100644
--- a/web/apps/space/src/components/SpaceProfileImagePages.tsx
+++ b/web/apps/space/src/components/ProfileImagePages.tsx
@@ -1,5 +1,5 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect } from "react";
import {
@@ -8,17 +8,14 @@ import {
} from "screens/EditProfilePhotoScreen";
import { ProfileImageViewerScreen } from "screens/ProfileImageViewerScreen";
import { profileBackground } from "screens/ProfileScreen";
-import {
- saveSpaceProfile,
- spaceProfileErrorMessage,
-} from "services/spaceProfile";
-import { useSpaceAppState } from "state/spaceAppState";
+import { saveSpaceProfile, spaceProfileErrorMessage } from "services/profile";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
import {
type ProfileImageFlowSource,
profileImageFlowSourceFromQuery,
spaceRoutes,
-} from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "utils/routes";
type ProfileImageVariant = "avatar" | "cover";
diff --git a/web/apps/space/src/components/SpacePublicProfileNotificationControl.tsx b/web/apps/space/src/components/PublicProfileNotificationControl.tsx
similarity index 97%
rename from web/apps/space/src/components/SpacePublicProfileNotificationControl.tsx
rename to web/apps/space/src/components/PublicProfileNotificationControl.tsx
index bfd521fc46..b6ad23e1bf 100644
--- a/web/apps/space/src/components/SpacePublicProfileNotificationControl.tsx
+++ b/web/apps/space/src/components/PublicProfileNotificationControl.tsx
@@ -1,15 +1,15 @@
import { Notification02Icon, Tick02Icon } from "@hugeicons/core-free-icons";
-import { SpaceNotificationPermissionInstructions } from "components/SpaceNotificationPermissionInstructions";
+import { SpaceNotificationPermissionInstructions } from "components/NotificationPermissionInstructions";
import {
SpacePWAInstallInstructions,
SpacePWAPromptBanner,
-} from "components/SpacePWAInstallPrompt";
-import { useHideOnScrollDirection } from "hooks/useHideOnScrollDirection";
+} from "components/PWAInstallPrompt";
+import { useHideOnScrollDirection } from "hooks/use-hide-on-scroll-direction";
import {
isSpaceIOS,
isSpaceStandalone,
useSpacePWAInstallPrompt,
-} from "hooks/useSpacePWAInstallPrompt";
+} from "hooks/use-pwa-install-prompt";
import React from "react";
import type { PublicSpaceLinkSession } from "services/space";
import {
@@ -18,7 +18,7 @@ import {
reconcilePublicSpaceWebPush,
subscribeToPublicSpaceWebPush,
type SpaceWebPushState,
-} from "services/spaceWebPush";
+} from "services/web-push";
type SuccessState = "exiting" | "hidden" | "visible";
diff --git a/web/apps/space/src/components/SpaceRouteFallback.tsx b/web/apps/space/src/components/RouteFallback.tsx
similarity index 97%
rename from web/apps/space/src/components/SpaceRouteFallback.tsx
rename to web/apps/space/src/components/RouteFallback.tsx
index 17f72314ed..485a6f801a 100644
--- a/web/apps/space/src/components/SpaceRouteFallback.tsx
+++ b/web/apps/space/src/components/RouteFallback.tsx
@@ -1,5 +1,5 @@
import { Box } from "@mui/material";
-import { SpacePageMeta } from "components/SpacePageMeta";
+import { SpacePageMeta } from "components/PageMeta";
import React from "react";
interface SpaceRouteFallbackProps {
diff --git a/web/apps/space/src/components/SpaceRouteTransitionBoundary.tsx b/web/apps/space/src/components/RouteTransitionBoundary.tsx
similarity index 78%
rename from web/apps/space/src/components/SpaceRouteTransitionBoundary.tsx
rename to web/apps/space/src/components/RouteTransitionBoundary.tsx
index e6cd170704..37ddc35cfe 100644
--- a/web/apps/space/src/components/SpaceRouteTransitionBoundary.tsx
+++ b/web/apps/space/src/components/RouteTransitionBoundary.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { useSpaceRouteTransitionPopState } from "utils/spaceRouteTransitions";
+import { useSpaceRouteTransitionPopState } from "utils/route-transitions";
interface SpaceRouteTransitionBoundaryProps {
children: React.ReactNode;
diff --git a/web/apps/space/src/components/SpaceShareInviteButton.tsx b/web/apps/space/src/components/ShareInviteButton.tsx
similarity index 96%
rename from web/apps/space/src/components/SpaceShareInviteButton.tsx
rename to web/apps/space/src/components/ShareInviteButton.tsx
index 77c1ce6be8..032634da17 100644
--- a/web/apps/space/src/components/SpaceShareInviteButton.tsx
+++ b/web/apps/space/src/components/ShareInviteButton.tsx
@@ -2,7 +2,7 @@ import { Share08Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, type SxProps, type Theme } from "@mui/material";
import React from "react";
-import { openSpaceShareLinkDialog } from "services/spaceShareLink";
+import { openSpaceShareLinkDialog } from "services/share-link";
export const SpaceShareIcon: React.FC<{ strokeWidth?: number }> = ({
strokeWidth = 1.8,
diff --git a/web/apps/space/src/components/SpaceShareLinkDialog.tsx b/web/apps/space/src/components/ShareLinkDialog.tsx
similarity index 98%
rename from web/apps/space/src/components/SpaceShareLinkDialog.tsx
rename to web/apps/space/src/components/ShareLinkDialog.tsx
index 95d3e47ee6..cf7161b14a 100644
--- a/web/apps/space/src/components/SpaceShareLinkDialog.tsx
+++ b/web/apps/space/src/components/ShareLinkDialog.tsx
@@ -1,11 +1,11 @@
import { Box, Dialog, useMediaQuery } from "@mui/material";
-import { SpaceBottomSheetTransition } from "components/SpaceBottomSheetTransition";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
import log from "ente-base/log";
import React from "react";
import {
onOpenSpaceShareLinkDialog,
type SpaceShareLinkDialogMode,
-} from "services/spaceShareLink";
+} from "services/share-link";
const green = "#08C225";
const dangerColor = "#F63A3A";
diff --git a/web/apps/space/src/components/SpacePostLikeAnimation.ts b/web/apps/space/src/components/post-like-animation.ts
similarity index 100%
rename from web/apps/space/src/components/SpacePostLikeAnimation.ts
rename to web/apps/space/src/components/post-like-animation.ts
diff --git a/web/apps/space/src/configureZod.ts b/web/apps/space/src/configure-zod.ts
similarity index 100%
rename from web/apps/space/src/configureZod.ts
rename to web/apps/space/src/configure-zod.ts
diff --git a/web/apps/space/src/hooks/useBrowserBackClose.ts b/web/apps/space/src/hooks/use-browser-back-close.ts
similarity index 100%
rename from web/apps/space/src/hooks/useBrowserBackClose.ts
rename to web/apps/space/src/hooks/use-browser-back-close.ts
diff --git a/web/apps/space/src/hooks/useHideOnScrollDirection.ts b/web/apps/space/src/hooks/use-hide-on-scroll-direction.ts
similarity index 100%
rename from web/apps/space/src/hooks/useHideOnScrollDirection.ts
rename to web/apps/space/src/hooks/use-hide-on-scroll-direction.ts
diff --git a/web/apps/space/src/hooks/useSpacePWAInstallPrompt.ts b/web/apps/space/src/hooks/use-pwa-install-prompt.ts
similarity index 100%
rename from web/apps/space/src/hooks/useSpacePWAInstallPrompt.ts
rename to web/apps/space/src/hooks/use-pwa-install-prompt.ts
diff --git a/web/apps/space/src/hooks/useSpaceWebPushPrompt.ts b/web/apps/space/src/hooks/use-web-push-prompt.ts
similarity index 98%
rename from web/apps/space/src/hooks/useSpaceWebPushPrompt.ts
rename to web/apps/space/src/hooks/use-web-push-prompt.ts
index 1a7c9b99e5..7ec9906907 100644
--- a/web/apps/space/src/hooks/useSpaceWebPushPrompt.ts
+++ b/web/apps/space/src/hooks/use-web-push-prompt.ts
@@ -1,4 +1,4 @@
-import { isSpaceIOS, isSpaceStandalone } from "hooks/useSpacePWAInstallPrompt";
+import { isSpaceIOS, isSpaceStandalone } from "hooks/use-pwa-install-prompt";
import React from "react";
import {
isBravePushServiceError,
@@ -7,7 +7,7 @@ import {
subscribeToSpaceWebPush,
unsubscribeFromSpaceWebPush,
type SpaceWebPushState,
-} from "services/spaceWebPush";
+} from "services/web-push";
type PromptStatus = "enabling" | "error" | "hidden" | "loading" | "ready";
diff --git a/web/apps/space/src/pages/_app.tsx b/web/apps/space/src/pages/_app.tsx
index f34f7758b0..dad43ade1c 100644
--- a/web/apps/space/src/pages/_app.tsx
+++ b/web/apps/space/src/pages/_app.tsx
@@ -2,20 +2,20 @@ import "@fontsource-variable/inter";
import "@fontsource/nunito/800.css";
import { CssBaseline } from "@mui/material";
import { createTheme, ThemeProvider } from "@mui/material/styles";
-import { SpaceRouteTransitionBoundary } from "components/SpaceRouteTransitionBoundary";
-import { SpaceShareLinkDialogHost } from "components/SpaceShareLinkDialog";
-import "configureZod";
+import { SpaceRouteTransitionBoundary } from "components/RouteTransitionBoundary";
+import { SpaceShareLinkDialogHost } from "components/ShareLinkDialog";
+import "configure-zod";
import { CustomHead } from "ente-base/components/Head";
import { useSetupLogs } from "ente-base/components/utils/hooks-app";
import { shareTheme } from "ente-base/components/utils/theme";
-import { captureSpacePWAInstallPrompt } from "hooks/useSpacePWAInstallPrompt";
+import { captureSpacePWAInstallPrompt } from "hooks/use-pwa-install-prompt";
import type { AppProps } from "next/app";
import { useRouter } from "next/router";
import "photoswipe/dist/photoswipe.css";
import React from "react";
import "react-easy-crop/react-easy-crop.css";
-import { registerSpaceServiceWorker } from "services/spaceWebPush";
-import { SpaceAppStateProvider } from "state/SpaceAppStateProvider";
+import { registerSpaceServiceWorker } from "services/web-push";
+import { SpaceAppStateProvider } from "state/AppStateProvider";
import "styles/globals.css";
const spaceTheme = createTheme(shareTheme, {
diff --git a/web/apps/space/src/pages/add-profile-photo.tsx b/web/apps/space/src/pages/add-profile-photo.tsx
index 200005b8b2..247056ba94 100644
--- a/web/apps/space/src/pages/add-profile-photo.tsx
+++ b/web/apps/space/src/pages/add-profile-photo.tsx
@@ -1,18 +1,15 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
import { SetupProfilePhotoScreen } from "screens/SetupProfilePhotoScreen";
import { setupProfileBackground } from "screens/SetupProfileScreen";
-import { savedPendingSpaceInvite } from "services/spaceInvite";
-import {
- saveSpaceProfile,
- spaceProfileErrorMessage,
-} from "services/spaceProfile";
-import { useSpaceAppState } from "state/spaceAppState";
-import { sendPendingSpaceFriendRequest } from "utils/spacePendingFriendRequest";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { savedPendingSpaceInvite } from "services/invite";
+import { saveSpaceProfile, spaceProfileErrorMessage } from "services/profile";
+import { useSpaceAppState } from "state/app-state";
+import { sendPendingSpaceFriendRequest } from "utils/pending-friend-request";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/app/friends/index.tsx b/web/apps/space/src/pages/app/friends/index.tsx
index 2941d268ad..6af9b55233 100644
--- a/web/apps/space/src/pages/app/friends/index.tsx
+++ b/web/apps/space/src/pages/app/friends/index.tsx
@@ -1,9 +1,14 @@
-import { SpaceFriendRequestCanceledToast } from "components/SpaceFriendRequestCanceledToast";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceFriendRequestCanceledToast } from "components/FriendRequestCanceledToast";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect } from "react";
import { FriendsScreen, friendsBackground } from "screens/FriendsScreen";
+import {
+ invalidateCachedSpaceFeed,
+ removeCachedSpaceFeedPostsBySpace,
+} from "services/feed-cache";
+import { spaceInviteURL } from "services/invite";
import {
clearSpaceFriendsCache,
confirmCurrentFriendRequest,
@@ -16,14 +21,9 @@ import {
requestFriendByUsername,
type SpaceFriendRequest,
} from "services/space";
-import {
- invalidateCachedSpaceFeed,
- removeCachedSpaceFeedPostsBySpace,
-} from "services/spaceFeedCache";
-import { spaceInviteURL } from "services/spaceInvite";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsx
index 2651a64cc2..099e224c5d 100644
--- a/web/apps/space/src/pages/app/index.tsx
+++ b/web/apps/space/src/pages/app/index.tsx
@@ -1,8 +1,17 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
import { HomeScreen, homeBackground } from "screens/HomeScreen";
+import {
+ cacheCurrentSpaceFeedPage,
+ loadCachedSpaceFeed,
+ patchCachedSpaceFeedPost,
+ prependCachedSpaceFeedPost,
+ removeCachedSpaceFeedPost,
+} from "services/feed-cache";
+import { consumeSentSpaceInviteFriend, spaceInviteURL } from "services/invite";
+import { loadExistingSpaceId } from "services/profile";
import {
createCurrentPhotoPost,
deleteCurrentPost,
@@ -17,27 +26,15 @@ import {
updateCurrentPostCaption,
type SpacePost,
} from "services/space";
-import {
- cacheCurrentSpaceFeedPage,
- loadCachedSpaceFeed,
- patchCachedSpaceFeedPost,
- prependCachedSpaceFeedPost,
- removeCachedSpaceFeedPost,
-} from "services/spaceFeedCache";
-import {
- consumeSentSpaceInviteFriend,
- spaceInviteURL,
-} from "services/spaceInvite";
-import { loadExistingSpaceId } from "services/spaceProfile";
-import { useSpaceAppState } from "state/spaceAppState";
+import { useSpaceAppState } from "state/app-state";
import {
confirmLocalFeedPost,
createLocalFeedPostID,
failLocalFeedPost,
-} from "utils/localFeedPost";
-import { prepareSpacePostImageFromEdit } from "utils/spacePostImage";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "utils/local-feed-post";
+import { prepareSpacePostImageFromEdit } from "utils/post-image";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const inviteFriendsToastDelayMs = 3000;
diff --git a/web/apps/space/src/pages/app/messages.tsx b/web/apps/space/src/pages/app/messages.tsx
index 1acb3b8ef7..d4fd4cdf71 100644
--- a/web/apps/space/src/pages/app/messages.tsx
+++ b/web/apps/space/src/pages/app/messages.tsx
@@ -1,4 +1,4 @@
-import { SpaceMessagesPage } from "components/SpaceMessagesPage";
+import { SpaceMessagesPage } from "components/MessagesPage";
import React from "react";
const Page: React.FC = () => <SpaceMessagesPage />;
diff --git a/web/apps/space/src/pages/app/messages/[spaceId].tsx b/web/apps/space/src/pages/app/messages/[spaceId].tsx
index 086629df09..95528ba166 100644
--- a/web/apps/space/src/pages/app/messages/[spaceId].tsx
+++ b/web/apps/space/src/pages/app/messages/[spaceId].tsx
@@ -1,7 +1,7 @@
-import { SpaceMessagesPage } from "components/SpaceMessagesPage";
+import { SpaceMessagesPage } from "components/MessagesPage";
import React from "react";
-import { friendSpaceIdFromQuery } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { useSpaceRouter } from "utils/route-transitions";
+import { friendSpaceIdFromQuery } from "utils/routes";
const messageSpaceIdFromPath = () => {
if (typeof window == "undefined") return "";
diff --git a/web/apps/space/src/pages/app/post.tsx b/web/apps/space/src/pages/app/post.tsx
index 95af78956b..1a5a8d16cf 100644
--- a/web/apps/space/src/pages/app/post.tsx
+++ b/web/apps/space/src/pages/app/post.tsx
@@ -1,16 +1,16 @@
import { AddSquareIcon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React from "react";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { spacePostImageInputAccept } from "utils/spacePostImage";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { useSpaceAppState } from "state/app-state";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { spacePostImageInputAccept } from "utils/post-image";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const background = "#F5F5F7";
const green = "#08C225";
diff --git a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
index 354f4373d6..9022b8702c 100644
--- a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
+++ b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
@@ -1,18 +1,18 @@
-import { SpaceFileViewer } from "components/SpaceFileViewer";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceFileViewer } from "components/FileViewer";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React from "react";
+import { patchCachedSpaceFeedPost } from "services/feed-cache";
import {
loadCurrentSpacePost,
replyToCurrentPost,
setCurrentPostLiked,
type SpacePost,
} from "services/space";
-import { patchCachedSpaceFeedPost } from "services/spaceFeedCache";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const postBackground = "#000000";
diff --git a/web/apps/space/src/pages/app/profile.tsx b/web/apps/space/src/pages/app/profile.tsx
index 615df266e8..dd4706390a 100644
--- a/web/apps/space/src/pages/app/profile.tsx
+++ b/web/apps/space/src/pages/app/profile.tsx
@@ -1,8 +1,14 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useMemo, useState } from "react";
import { ProfileScreen, profileBackground } from "screens/ProfileScreen";
+import {
+ patchCachedSpaceFeedPost,
+ prependCachedSpaceFeedPost,
+ removeCachedSpaceFeedPost,
+} from "services/feed-cache";
+import { spaceInviteURL } from "services/invite";
import {
createCurrentPhotoPost,
deleteCurrentPost,
@@ -14,22 +20,16 @@ import {
updateCurrentPostCaption,
type SpaceProfilePost,
} from "services/space";
-import {
- patchCachedSpaceFeedPost,
- prependCachedSpaceFeedPost,
- removeCachedSpaceFeedPost,
-} from "services/spaceFeedCache";
-import { spaceInviteURL } from "services/spaceInvite";
-import { useSpaceAppState } from "state/spaceAppState";
+import { useSpaceAppState } from "state/app-state";
import {
confirmLocalFeedPost,
createLocalFeedPostID,
failLocalFeedPost,
-} from "utils/localFeedPost";
-import { profilePostItemsFromPosts } from "utils/spacePostDisplay";
-import { prepareSpacePostImageFromEdit } from "utils/spacePostImage";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "utils/local-feed-post";
+import { profilePostItemsFromPosts } from "utils/post-display";
+import { prepareSpacePostImageFromEdit } from "utils/post-image";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const initialPostLoadingIndicatorDelayMs = 350;
diff --git a/web/apps/space/src/pages/app/profile/cover-edit.tsx b/web/apps/space/src/pages/app/profile/cover-edit.tsx
index 02fa014681..4d815c8e76 100644
--- a/web/apps/space/src/pages/app/profile/cover-edit.tsx
+++ b/web/apps/space/src/pages/app/profile/cover-edit.tsx
@@ -1,4 +1,4 @@
-import { SpaceProfileImageEditPage } from "components/SpaceProfileImagePages";
+import { SpaceProfileImageEditPage } from "components/ProfileImagePages";
import React from "react";
const Page: React.FC = () => <SpaceProfileImageEditPage variant="cover" />;
diff --git a/web/apps/space/src/pages/app/profile/cover.tsx b/web/apps/space/src/pages/app/profile/cover.tsx
index 45723ffa35..3ffc268d63 100644
--- a/web/apps/space/src/pages/app/profile/cover.tsx
+++ b/web/apps/space/src/pages/app/profile/cover.tsx
@@ -1,4 +1,4 @@
-import { SpaceProfileImageViewerPage } from "components/SpaceProfileImagePages";
+import { SpaceProfileImageViewerPage } from "components/ProfileImagePages";
import React from "react";
const Page: React.FC = () => <SpaceProfileImageViewerPage variant="cover" />;
diff --git a/web/apps/space/src/pages/app/profile/photo-edit.tsx b/web/apps/space/src/pages/app/profile/photo-edit.tsx
index 0dfb44a7cb..e3d6410e51 100644
--- a/web/apps/space/src/pages/app/profile/photo-edit.tsx
+++ b/web/apps/space/src/pages/app/profile/photo-edit.tsx
@@ -1,4 +1,4 @@
-import { SpaceProfileImageEditPage } from "components/SpaceProfileImagePages";
+import { SpaceProfileImageEditPage } from "components/ProfileImagePages";
import React from "react";
const Page: React.FC = () => <SpaceProfileImageEditPage variant="avatar" />;
diff --git a/web/apps/space/src/pages/app/profile/photo.tsx b/web/apps/space/src/pages/app/profile/photo.tsx
index eef061a55d..20d6dc93b5 100644
--- a/web/apps/space/src/pages/app/profile/photo.tsx
+++ b/web/apps/space/src/pages/app/profile/photo.tsx
@@ -1,4 +1,4 @@
-import { SpaceProfileImageViewerPage } from "components/SpaceProfileImagePages";
+import { SpaceProfileImageViewerPage } from "components/ProfileImagePages";
import React from "react";
const Page: React.FC = () => <SpaceProfileImageViewerPage variant="avatar" />;
diff --git a/web/apps/space/src/pages/app/settings.tsx b/web/apps/space/src/pages/app/settings.tsx
index a6df294f1a..ed23a6d1fb 100644
--- a/web/apps/space/src/pages/app/settings.tsx
+++ b/web/apps/space/src/pages/app/settings.tsx
@@ -1,11 +1,11 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import React, { useEffect } from "react";
import { SettingsScreen, settingsBackground } from "screens/SettingsScreen";
-import { spaceLogout } from "services/spaceLogout";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { spaceLogout } from "services/logout";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/app/settings/profile/name.tsx b/web/apps/space/src/pages/app/settings/profile/name.tsx
index 1c1c5176e7..27abddcef1 100644
--- a/web/apps/space/src/pages/app/settings/profile/name.tsx
+++ b/web/apps/space/src/pages/app/settings/profile/name.tsx
@@ -1,18 +1,15 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
import {
ChangeNameSettingsScreen,
settingsBackground,
} from "screens/SettingsScreen";
-import {
- saveSpaceProfile,
- spaceProfileErrorMessage,
-} from "services/spaceProfile";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { saveSpaceProfile, spaceProfileErrorMessage } from "services/profile";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/create-profile.tsx b/web/apps/space/src/pages/create-profile.tsx
index 98d07e7081..97a75680c4 100644
--- a/web/apps/space/src/pages/create-profile.tsx
+++ b/web/apps/space/src/pages/create-profile.tsx
@@ -1,20 +1,20 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
import {
SetupProfileScreen,
setupProfileBackground,
} from "screens/SetupProfileScreen";
-import { savedSpaceSessionToken } from "services/spacePersistentSession";
+import { savedSpaceSessionToken } from "services/persistent-session";
import {
spaceUsernameAvailability,
spaceUsernameValidationError,
-} from "services/spaceProfile";
-import { useSpaceAppState } from "state/spaceAppState";
-import { sendPendingSpaceFriendRequest } from "utils/spacePendingFriendRequest";
-import { createProfileSourceFromQuery, spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "services/profile";
+import { useSpaceAppState } from "state/app-state";
+import { sendPendingSpaceFriendRequest } from "utils/pending-friend-request";
+import { useSpaceRouter } from "utils/route-transitions";
+import { createProfileSourceFromQuery, spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/index.tsx b/web/apps/space/src/pages/index.tsx
index a76ec07f64..77919a166a 100644
--- a/web/apps/space/src/pages/index.tsx
+++ b/web/apps/space/src/pages/index.tsx
@@ -1,23 +1,14 @@
import { Box } from "@mui/material";
import { AuthenticatedFriendProfile } from "components/AuthenticatedFriendProfile";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
-import { SpaceMobileBestToast } from "components/SpaceMobileBestToast";
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpacePublicProfileNotificationControl } from "components/SpacePublicProfileNotificationControl";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
+import { SpaceMobileBestToast } from "components/MobileBestToast";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpacePublicProfileNotificationControl } from "components/PublicProfileNotificationControl";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useMemo, useState } from "react";
import { OnboardingScreen, onboardingGreen } from "screens/OnboardingScreen";
import { ProfileScreen, profileBackground } from "screens/ProfileScreen";
-import {
- loadCurrentSpaceRelationship,
- loadPublicSpaceIdentity,
- openPublicSpaceLink,
- requestFriendByUsername,
- type PublicSpaceIdentity,
- type PublicSpaceLinkSession,
- type SpaceProfilePost,
-} from "services/space";
import {
clearPendingSpaceInvite,
clearPendingSpaceInviteFriend,
@@ -32,14 +23,20 @@ import {
type PendingSpaceInvite,
type SpaceInviteIntent,
type SpaceInviteRoute,
-} from "services/spaceInvite";
+} from "services/invite";
import {
- useSpaceAppState,
- type OnboardingEntrySource,
-} from "state/spaceAppState";
-import { profilePostItemsFromPosts } from "utils/spacePostDisplay";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+ loadCurrentSpaceRelationship,
+ loadPublicSpaceIdentity,
+ openPublicSpaceLink,
+ requestFriendByUsername,
+ type PublicSpaceIdentity,
+ type PublicSpaceLinkSession,
+ type SpaceProfilePost,
+} from "services/space";
+import { useSpaceAppState, type OnboardingEntrySource } from "state/app-state";
+import { profilePostItemsFromPosts } from "utils/post-display";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
type RouteMode =
| { kind: "checking" }
diff --git a/web/apps/space/src/pages/login.tsx b/web/apps/space/src/pages/login.tsx
index 2313f3323b..a602047f14 100644
--- a/web/apps/space/src/pages/login.tsx
+++ b/web/apps/space/src/pages/login.tsx
@@ -1,17 +1,17 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
+import { SpacePageMeta } from "components/PageMeta";
import React, { useState } from "react";
import {
LoginScreen,
loginBackground,
type SpaceLoginCredentials,
} from "screens/LoginScreen";
-import { spaceAuthErrorMessage } from "services/spaceAuthError";
-import { beginSpaceLogin, type SpaceLoginResult } from "services/spaceLogin";
-import { savePendingSpacePasskeyVerification } from "services/spacePasskeyVerification";
-import { useSpaceAppState } from "state/spaceAppState";
-import { routeAfterCompletedLogin } from "utils/spaceLoginNavigation";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { spaceAuthErrorMessage } from "services/auth-error";
+import { beginSpaceLogin, type SpaceLoginResult } from "services/login";
+import { savePendingSpacePasskeyVerification } from "services/passkey-verification";
+import { useSpaceAppState } from "state/app-state";
+import { routeAfterCompletedLogin } from "utils/login-navigation";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/passkeys/finish.tsx b/web/apps/space/src/pages/passkeys/finish.tsx
index 0418ef1334..7b30629446 100644
--- a/web/apps/space/src/pages/passkeys/finish.tsx
+++ b/web/apps/space/src/pages/passkeys/finish.tsx
@@ -1,13 +1,13 @@
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpaceRouteFallback } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useRef } from "react";
import { verifyEmailBackground } from "screens/VerifyEmailScreen";
-import { completeSpaceLoginPasskey } from "services/spaceLogin";
-import { clearPendingSpacePasskeyVerification } from "services/spacePasskeyVerification";
-import { useSpaceAppState } from "state/spaceAppState";
-import { routeAfterCompletedLogin } from "utils/spaceLoginNavigation";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { completeSpaceLoginPasskey } from "services/login";
+import { clearPendingSpacePasskeyVerification } from "services/passkey-verification";
+import { useSpaceAppState } from "state/app-state";
+import { routeAfterCompletedLogin } from "utils/login-navigation";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/passkeys/verify.tsx b/web/apps/space/src/pages/passkeys/verify.tsx
index d02ea0381b..f650d1fb22 100644
--- a/web/apps/space/src/pages/passkeys/verify.tsx
+++ b/web/apps/space/src/pages/passkeys/verify.tsx
@@ -1,5 +1,5 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { openPasskeyVerificationURL } from "ente-accounts/services/passkey";
import log from "ente-base/log";
@@ -9,22 +9,22 @@ import {
passkeyVerificationBackground,
type PasskeyVerificationStatus,
} from "screens/PasskeyVerificationScreen";
-import { spaceAuthErrorMessage } from "services/spaceAuthError";
+import { spaceAuthErrorMessage } from "services/auth-error";
import {
checkSpaceLoginPasskeyStatus,
useSpaceLoginTwoFactorInstead,
-} from "services/spaceLogin";
+} from "services/login";
import {
clearPendingSpacePasskeyVerification,
hasAutoOpenedSpacePasskeyVerification,
markAutoOpenedSpacePasskeyVerification,
savedPendingSpacePasskeyVerification,
type PendingSpacePasskeyVerification,
-} from "services/spacePasskeyVerification";
-import { useSpaceAppState } from "state/spaceAppState";
-import { routeAfterCompletedLogin } from "utils/spaceLoginNavigation";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "services/passkey-verification";
+import { useSpaceAppState } from "state/app-state";
+import { routeAfterCompletedLogin } from "utils/login-navigation";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/signup.tsx b/web/apps/space/src/pages/signup.tsx
index b173c5a86d..7732126d05 100644
--- a/web/apps/space/src/pages/signup.tsx
+++ b/web/apps/space/src/pages/signup.tsx
@@ -1,17 +1,14 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
+import { SpacePageMeta } from "components/PageMeta";
import React, { useState } from "react";
import {
CreateAccountScreen,
createAccountBackground,
type CreateAccountInput,
} from "screens/CreateAccountScreen";
-import {
- beginSpaceSignup,
- spaceSignupErrorMessage,
-} from "services/spaceSignup";
-import { useSpaceAppState } from "state/spaceAppState";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { beginSpaceSignup, spaceSignupErrorMessage } from "services/signup";
+import { useSpaceAppState } from "state/app-state";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const Page: React.FC = () => {
const router = useSpaceRouter();
diff --git a/web/apps/space/src/pages/two-factor/verify.tsx b/web/apps/space/src/pages/two-factor/verify.tsx
index b2c62979bd..34e22057ab 100644
--- a/web/apps/space/src/pages/two-factor/verify.tsx
+++ b/web/apps/space/src/pages/two-factor/verify.tsx
@@ -1,5 +1,5 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { isHTTPErrorWithStatus } from "ente-base/http";
import log from "ente-base/log";
@@ -8,12 +8,12 @@ import {
VerifyTwoFactorScreen,
verifyTwoFactorBackground,
} from "screens/VerifyTwoFactorScreen";
-import { spaceAuthErrorMessage } from "services/spaceAuthError";
-import { completeSpaceLoginSecondFactor } from "services/spaceLogin";
-import { useSpaceAppState } from "state/spaceAppState";
-import { routeAfterCompletedLogin } from "utils/spaceLoginNavigation";
-import { spaceRoutes } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+import { spaceAuthErrorMessage } from "services/auth-error";
+import { completeSpaceLoginSecondFactor } from "services/login";
+import { useSpaceAppState } from "state/app-state";
+import { routeAfterCompletedLogin } from "utils/login-navigation";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes } from "utils/routes";
const twoFactorErrorMessage = (error: unknown) => {
if (isHTTPErrorWithStatus(error, 401)) {
diff --git a/web/apps/space/src/pages/verify.tsx b/web/apps/space/src/pages/verify.tsx
index 267ebec1c6..0fbfbe94bc 100644
--- a/web/apps/space/src/pages/verify.tsx
+++ b/web/apps/space/src/pages/verify.tsx
@@ -1,5 +1,5 @@
-import { SpacePageMeta } from "components/SpacePageMeta";
-import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import { SpacePageMeta } from "components/PageMeta";
+import { SpaceRouteFallback } from "components/RouteFallback";
import { isHTTPErrorWithStatus } from "ente-base/http";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
@@ -7,23 +7,20 @@ import {
VerifyEmailScreen,
verifyEmailBackground,
} from "screens/VerifyEmailScreen";
-import { spaceAuthErrorMessage } from "services/spaceAuthError";
+import { spaceAuthErrorMessage } from "services/auth-error";
import {
completeSpaceLoginEmailVerification,
resendSpaceLoginCode,
savedPendingSpaceLoginCredentials,
type SpaceLoginInput,
type SpaceLoginResult,
-} from "services/spaceLogin";
-import { savePendingSpacePasskeyVerification } from "services/spacePasskeyVerification";
-import {
- completeSpaceSignup,
- resendSpaceSignupCode,
-} from "services/spaceSignup";
-import { useSpaceAppState } from "state/spaceAppState";
-import { routeAfterCompletedLogin } from "utils/spaceLoginNavigation";
-import { spaceRoutes, verifyFlowFromQuery } from "utils/spaceRoutes";
-import { useSpaceRouter } from "utils/spaceRouteTransitions";
+} from "services/login";
+import { savePendingSpacePasskeyVerification } from "services/passkey-verification";
+import { completeSpaceSignup, resendSpaceSignupCode } from "services/signup";
+import { useSpaceAppState } from "state/app-state";
+import { routeAfterCompletedLogin } from "utils/login-navigation";
+import { useSpaceRouter } from "utils/route-transitions";
+import { spaceRoutes, verifyFlowFromQuery } from "utils/routes";
const verificationErrorMessage = (error: unknown) => {
if (isHTTPErrorWithStatus(error, 401)) {
diff --git a/web/apps/space/src/screens/CreateAccountScreen.tsx b/web/apps/space/src/screens/CreateAccountScreen.tsx
index bb0caf08b7..79ea5ef09e 100644
--- a/web/apps/space/src/screens/CreateAccountScreen.tsx
+++ b/web/apps/space/src/screens/CreateAccountScreen.tsx
@@ -1,12 +1,12 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import {
estimatePasswordStrength,
type PasswordStrength,
} from "ente-accounts/utils/password";
import React, { useId, useMemo, useState } from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const createAccountBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/EditProfilePhotoScreen.tsx b/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
index 93f9f7fd48..a0deb72c8d 100644
--- a/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
+++ b/web/apps/space/src/screens/EditProfilePhotoScreen.tsx
@@ -1,13 +1,13 @@
import { ArrowLeft02Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
-import { SpaceAvatarCropPage } from "components/SpaceAvatarCropPage";
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
+import { SpaceAvatarCropPage } from "components/AvatarCropPage";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
import log from "ente-base/log";
import React, { useEffect, useRef, useState } from "react";
import type { Area, Point } from "react-easy-crop";
import { profileBackground } from "screens/ProfileScreen";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
import {
prepareSpaceAvatarImageFromCrop,
prepareSpaceCoverImageFromCrop,
@@ -18,7 +18,7 @@ import {
spaceCoverImageErrorMessage,
spaceCoverImageInputAccept,
spaceProfileCoverAspectRatio,
-} from "utils/spacePostImage";
+} from "utils/post-image";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/screens/FriendsScreen.tsx b/web/apps/space/src/screens/FriendsScreen.tsx
index 87e4c38e77..3c603719a5 100644
--- a/web/apps/space/src/screens/FriendsScreen.tsx
+++ b/web/apps/space/src/screens/FriendsScreen.tsx
@@ -15,25 +15,25 @@ import {
Skeleton,
useMediaQuery,
} from "@mui/material";
-import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
SpaceActionFeedbackIcon,
spaceActionDoneDurationMs,
type SpaceActionPhase,
-} from "components/SpaceActionFeedback";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
-import { SpaceBottomSheetTransition } from "components/SpaceBottomSheetTransition";
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
-import { SpaceShareInviteButton } from "components/SpaceShareInviteButton";
+} from "components/ActionFeedback";
+import { SpaceAvatarImage } from "components/AvatarImage";
+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";
+import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
+import { SpaceShareInviteButton } from "components/ShareInviteButton";
import type { FriendProfile } from "data/friends";
import log from "ente-base/log";
import React, { useState } from "react";
-import type { SpaceFriendRequest } from "services/space";
import {
normalizeSpaceUsername,
spaceUsernameValidationError,
-} from "services/spaceProfile";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+} from "services/profile";
+import type { SpaceFriendRequest } from "services/space";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const friendsBackground = "#FFFFFF";
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 3d675e5105..ecc46a79c4 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -6,28 +6,28 @@ import {
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Skeleton } from "@mui/material";
-import { SpaceActionToast } from "components/SpaceActionToast";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
+import { SpaceActionToast } from "components/ActionToast";
+import { SpaceAvatarImage } from "components/AvatarImage";
import {
SpaceFileViewer,
SpaceViewerFeedBackdrop,
type SpaceViewerDraftPostEdit,
type SpaceViewerPhoto,
type SpaceViewerPostActionMode,
-} from "components/SpaceFileViewer";
-import { SpaceInlinePostButton } from "components/SpaceInlinePostButton";
-import { SpacePostFloatingActionButton } from "components/SpacePostFloatingActionButton";
+} from "components/FileViewer";
+import { SpaceInlinePostButton } from "components/InlinePostButton";
import {
spacePostLikeButtonPop,
spacePostLikeHeartPop,
spacePostLikePopDurationMs,
spacePostLikePopTiming,
-} from "components/SpacePostLikeAnimation";
-import { SpacePWAInstallPrompt } from "components/SpacePWAInstallPrompt";
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
-import { SpaceShareInviteButton } from "components/SpaceShareInviteButton";
+} from "components/post-like-animation";
+import { SpacePostFloatingActionButton } from "components/PostFloatingActionButton";
+import { SpacePWAInstallPrompt } from "components/PWAInstallPrompt";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
+import { SpaceShareInviteButton } from "components/ShareInviteButton";
import log from "ente-base/log";
-import { useBrowserBackClose } from "hooks/useBrowserBackClose";
+import { useBrowserBackClose } from "hooks/use-browser-back-close";
import React, { useState } from "react";
import type { SetupProfile } from "screens/SetupProfileScreen";
import {
@@ -36,16 +36,16 @@ import {
type SpacePostAssetURLLoader,
type SpacePostAvatarURLLoader,
} from "services/space";
-import type { LocalSpaceFeedPost } from "state/spaceAppState";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { createLoadedLocalPostPhoto } from "utils/localPostPhoto";
-import { firstNameFrom, formatSpaceDate } from "utils/spaceDisplay";
+import type { LocalSpaceFeedPost } from "state/app-state";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { firstNameFrom, formatSpaceDate } from "utils/display";
+import { createLoadedLocalPostPhoto } from "utils/local-post-photo";
import {
canPreviewSpaceImageFile,
spacePostImageErrorMessage,
spacePostImageInputAccept,
spacePostPreviewImageForFile,
-} from "utils/spacePostImage";
+} from "utils/post-image";
import { thumbHashDataURLFromBase64 } from "utils/thumbhash";
export const homeBackground = "#F5F5F7";
diff --git a/web/apps/space/src/screens/LoginScreen.tsx b/web/apps/space/src/screens/LoginScreen.tsx
index 88aacc4a13..f92526f37a 100644
--- a/web/apps/space/src/screens/LoginScreen.tsx
+++ b/web/apps/space/src/screens/LoginScreen.tsx
@@ -1,8 +1,8 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import React, { useEffect, useRef, useState } from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const loginBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index 60801a2557..af032b4466 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -14,9 +14,9 @@ import {
MenuList,
Popper,
} from "@mui/material";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
-import { SpaceShareInviteButton } from "components/SpaceShareInviteButton";
+import { SpaceAvatarImage } from "components/AvatarImage";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
+import { SpaceShareInviteButton } from "components/ShareInviteButton";
import { formatTimeAgo } from "ente-base/date";
import log from "ente-base/log";
import React from "react";
@@ -28,10 +28,10 @@ import type {
SpaceMessageConversation,
SpaceMessageQuote,
} from "services/space";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { firstNameFrom } from "utils/spaceDisplay";
-import { clampSpaceMessageText } from "utils/spaceMessageLimits";
-import { spacePostImageInputAccept } from "utils/spacePostImage";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { firstNameFrom } from "utils/display";
+import { clampSpaceMessageText } from "utils/message-limits";
+import { spacePostImageInputAccept } from "utils/post-image";
export const messagesBackground = "#FFFFFF";
diff --git a/web/apps/space/src/screens/OnboardingScreen.tsx b/web/apps/space/src/screens/OnboardingScreen.tsx
index dfd2c9e801..f643a691ba 100644
--- a/web/apps/space/src/screens/OnboardingScreen.tsx
+++ b/web/apps/space/src/screens/OnboardingScreen.tsx
@@ -1,5 +1,5 @@
import { Box } from "@mui/material";
-import { SpaceMobileBestToast } from "components/SpaceMobileBestToast";
+import { SpaceMobileBestToast } from "components/MobileBestToast";
import React from "react";
export const onboardingGreen = "#08C225";
diff --git a/web/apps/space/src/screens/PasskeyVerificationScreen.tsx b/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
index ef5aa708c9..69c5a50d49 100644
--- a/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
+++ b/web/apps/space/src/screens/PasskeyVerificationScreen.tsx
@@ -1,8 +1,8 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import React from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const passkeyVerificationBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
index 7e2b02f24c..0259bbebf7 100644
--- a/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
+++ b/web/apps/space/src/screens/ProfileImageViewerScreen.tsx
@@ -1,17 +1,17 @@
import { ArrowLeft02Icon, Cancel01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Skeleton } from "@mui/material";
-import { spaceAppAvatarCropSize } from "components/SpaceAvatarCropPage";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
+import { spaceAppAvatarCropSize } from "components/AvatarCropPage";
+import { SpaceAvatarImage } from "components/AvatarImage";
import React, { useEffect, useRef } from "react";
import type { SetupProfile } from "screens/SetupProfileScreen";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
import {
spaceAvatarImageInputAccept,
spaceCoverImageInputAccept,
spaceDefaultCoverImagePath,
spaceProfileCoverAspectRatio,
-} from "utils/spacePostImage";
+} from "utils/post-image";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index 8e5e775c99..f8d74f93ad 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -8,40 +8,40 @@ import {
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, Menu, MenuItem, Skeleton } from "@mui/material";
-import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
spaceActionDoneDurationMs,
type SpaceActionPhase,
-} from "components/SpaceActionFeedback";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+} from "components/ActionFeedback";
+import { SpaceAvatarImage } from "components/AvatarImage";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
+import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
import {
SpaceFileViewer,
SpaceViewerFeedBackdrop,
type SpaceViewerDraftPostEdit,
type SpaceViewerPhoto,
type SpaceViewerPostActionMode,
-} from "components/SpaceFileViewer";
-import { SpacePostFloatingActionButton } from "components/SpacePostFloatingActionButton";
-import { SpaceLoadingSpinner } from "components/SpaceRouteFallback";
-import { SpaceShareIcon } from "components/SpaceShareInviteButton";
+} from "components/FileViewer";
+import { SpacePostFloatingActionButton } from "components/PostFloatingActionButton";
+import { SpaceLoadingSpinner } from "components/RouteFallback";
+import { SpaceShareIcon } from "components/ShareInviteButton";
import log from "ente-base/log";
-import { useBrowserBackClose } from "hooks/useBrowserBackClose";
+import { useBrowserBackClose } from "hooks/use-browser-back-close";
import React, { useState } from "react";
import type { SetupProfile } from "screens/SetupProfileScreen";
+import type { SpaceInviteIntent } from "services/invite";
+import { openSpaceShareLinkDialog } from "services/share-link";
import { isSpaceContentError, type SpacePostAsset } from "services/space";
-import type { SpaceInviteIntent } from "services/spaceInvite";
-import { openSpaceShareLinkDialog } from "services/spaceShareLink";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { createLoadedLocalPostPhoto } from "utils/localPostPhoto";
-import { firstNameFrom } from "utils/spaceDisplay";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { firstNameFrom } from "utils/display";
+import { createLoadedLocalPostPhoto } from "utils/local-post-photo";
import {
canPreviewSpaceImageFile,
spaceDefaultCoverImagePath,
spacePostImageErrorMessage,
spacePostImageInputAccept,
spacePostPreviewImageForFile,
-} from "utils/spacePostImage";
+} from "utils/post-image";
import { thumbHashDataURLFromBase64 } from "utils/thumbhash";
export const profileBackground = "#FFFFFF";
diff --git a/web/apps/space/src/screens/SettingsScreen.tsx b/web/apps/space/src/screens/SettingsScreen.tsx
index d766b07c91..d0f2cec53c 100644
--- a/web/apps/space/src/screens/SettingsScreen.tsx
+++ b/web/apps/space/src/screens/SettingsScreen.tsx
@@ -11,20 +11,20 @@ import {
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon, type IconSvgElement } from "@hugeicons/react";
import { Box } from "@mui/material";
+import type { SpaceActionPhase } from "components/ActionFeedback";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import { ConfirmationActionSheet } from "components/ConfirmationActionSheet";
-import type { SpaceActionPhase } from "components/SpaceActionFeedback";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
-import { SpaceNotificationPermissionInstructions } from "components/SpaceNotificationPermissionInstructions";
-import { SpacePWAInstallInstructions } from "components/SpacePWAInstallPrompt";
+import { SpaceNotificationPermissionInstructions } from "components/NotificationPermissionInstructions";
+import { SpacePWAInstallInstructions } from "components/PWAInstallPrompt";
import log from "ente-base/log";
import {
isSpaceIOS,
isSpaceStandalone,
useSpacePWAInstallPrompt,
-} from "hooks/useSpacePWAInstallPrompt";
-import { useSpaceWebPushPrompt } from "hooks/useSpaceWebPushPrompt";
+} from "hooks/use-pwa-install-prompt";
+import { useSpaceWebPushPrompt } from "hooks/use-web-push-prompt";
import React from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const settingsBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx b/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
index 422c8a2953..2fecafaf0b 100644
--- a/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
+++ b/web/apps/space/src/screens/SetupProfilePhotoScreen.tsx
@@ -3,21 +3,21 @@ import {
SpaceAvatarCropPage,
spaceSetupAvatarCropFooterHeight,
spaceSetupAvatarCropSize,
-} from "components/SpaceAvatarCropPage";
-import { SpaceAvatarImage } from "components/SpaceAvatarImage";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
+} from "components/AvatarCropPage";
+import { SpaceAvatarImage } from "components/AvatarImage";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
import log from "ente-base/log";
import React, { useEffect, useRef, useState } from "react";
import type { Area, Point } from "react-easy-crop";
import { setupProfileBackground } from "screens/SetupProfileScreen";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
import {
prepareSpaceAvatarImageFromCrop,
spaceAvatarCropImageForFile,
spaceAvatarImageErrorMessage,
spaceAvatarImageInputAccept,
-} from "utils/spacePostImage";
+} from "utils/post-image";
const green = "#08C225";
const textBase = "#000";
diff --git a/web/apps/space/src/screens/SetupProfileScreen.tsx b/web/apps/space/src/screens/SetupProfileScreen.tsx
index f120a360e1..768491e9e1 100644
--- a/web/apps/space/src/screens/SetupProfileScreen.tsx
+++ b/web/apps/space/src/screens/SetupProfileScreen.tsx
@@ -1,7 +1,7 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
+import { SpaceBackIcon } from "components/BackIcon";
import React, { useState } from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spaceTouchTargetSize } from "styles/touch-targets";
export const setupProfileBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/VerifyEmailScreen.tsx b/web/apps/space/src/screens/VerifyEmailScreen.tsx
index 3d79d86ca4..c9c65c08d5 100644
--- a/web/apps/space/src/screens/VerifyEmailScreen.tsx
+++ b/web/apps/space/src/screens/VerifyEmailScreen.tsx
@@ -1,10 +1,10 @@
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
-import { SpaceOtpInput } from "components/SpaceOtpInput";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
+import { SpaceOtpInput } from "components/OtpInput";
import React, { useEffect, useRef, useState } from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/spaceOtp";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/otp";
export const verifyEmailBackground = "#FAFAFA";
diff --git a/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx b/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
index 1f5a7cc91f..cfa2a4daab 100644
--- a/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
+++ b/web/apps/space/src/screens/VerifyTwoFactorScreen.tsx
@@ -1,12 +1,12 @@
import { Shield01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box } from "@mui/material";
-import { SpaceBackIcon } from "components/SpaceBackIcon";
-import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
-import { SpaceOtpInput } from "components/SpaceOtpInput";
+import { SpaceBackIcon } from "components/BackIcon";
+import { SpaceButtonSpinner } from "components/ButtonSpinner";
+import { SpaceOtpInput } from "components/OtpInput";
import React, { useEffect, useRef, useState } from "react";
-import { spaceTouchTargetSize } from "styles/touchTargets";
-import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/spaceOtp";
+import { spaceTouchTargetSize } from "styles/touch-targets";
+import { sanitizeSpaceOTP, spaceOTPCodeLength } from "utils/otp";
export const verifyTwoFactorBackground = "#FAFAFA";
diff --git a/web/apps/space/src/services/spaceAuthError.ts b/web/apps/space/src/services/auth-error.ts
similarity index 100%
rename from web/apps/space/src/services/spaceAuthError.ts
rename to web/apps/space/src/services/auth-error.ts
diff --git a/web/apps/space/src/services/spaceBootstrapAuth.ts b/web/apps/space/src/services/bootstrap-auth.ts
similarity index 100%
rename from web/apps/space/src/services/spaceBootstrapAuth.ts
rename to web/apps/space/src/services/bootstrap-auth.ts
diff --git a/web/apps/space/src/services/spaceFeedCache.ts b/web/apps/space/src/services/feed-cache.ts
similarity index 100%
rename from web/apps/space/src/services/spaceFeedCache.ts
rename to web/apps/space/src/services/feed-cache.ts
diff --git a/web/apps/space/src/services/spaceInvite.ts b/web/apps/space/src/services/invite.ts
similarity index 100%
rename from web/apps/space/src/services/spaceInvite.ts
rename to web/apps/space/src/services/invite.ts
diff --git a/web/apps/space/src/services/spaceLogin.ts b/web/apps/space/src/services/login.ts
similarity index 98%
rename from web/apps/space/src/services/spaceLogin.ts
rename to web/apps/space/src/services/login.ts
index 3233fbbf8a..04e6a4f39c 100644
--- a/web/apps/space/src/services/spaceLogin.ts
+++ b/web/apps/space/src/services/login.ts
@@ -38,12 +38,12 @@ import { clientPackageName } from "ente-base/app";
import { HTTPError } from "ente-base/http";
import log from "ente-base/log";
import { nullToUndefined } from "ente-utils/transform";
-import { spaceAuthError } from "services/spaceAuthError";
-import { decryptSpaceBootstrapAuthToken } from "services/spaceBootstrapAuth";
+import { spaceAuthError } from "services/auth-error";
+import { decryptSpaceBootstrapAuthToken } from "services/bootstrap-auth";
import {
createSpaceBrowserSession,
getOrCreateSpaceRootKey,
-} from "services/spacePersistentSession";
+} from "services/persistent-session";
import { z } from "zod";
export interface SpaceLoginInput {
diff --git a/web/apps/space/src/services/spaceLogout.ts b/web/apps/space/src/services/logout.ts
similarity index 84%
rename from web/apps/space/src/services/spaceLogout.ts
rename to web/apps/space/src/services/logout.ts
index d9404b37fb..7ad4fa1d52 100644
--- a/web/apps/space/src/services/spaceLogout.ts
+++ b/web/apps/space/src/services/logout.ts
@@ -3,8 +3,8 @@ import log from "ente-base/log";
import {
clearSpaceBrowserSession,
revokeSpaceBrowserSessions,
-} from "services/spacePersistentSession";
-import { forgetSpaceWebPushAccountTarget } from "services/spaceWebPush";
+} from "services/persistent-session";
+import { forgetSpaceWebPushAccountTarget } from "services/web-push";
export const spaceLogout = async () => {
await revokeSpaceBrowserSessions();
diff --git a/web/apps/space/src/services/spaceMediaCache.ts b/web/apps/space/src/services/media-cache.ts
similarity index 98%
rename from web/apps/space/src/services/spaceMediaCache.ts
rename to web/apps/space/src/services/media-cache.ts
index a0ecd82aa0..258cf555d1 100644
--- a/web/apps/space/src/services/spaceMediaCache.ts
+++ b/web/apps/space/src/services/media-cache.ts
@@ -2,7 +2,7 @@ import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { blobCache, clearBlobCache } from "ente-base/blob-cache";
import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
-import { blobPartForBytes } from "services/spaceProfilePayload";
+import { blobPartForBytes } from "services/profile-payload";
const maxSpaceMediaCacheEntries = 128;
const spaceMediaURLCache = new Map<string, Promise<string>>();
diff --git a/web/apps/space/src/services/spacePasskeyVerification.ts b/web/apps/space/src/services/passkey-verification.ts
similarity index 100%
rename from web/apps/space/src/services/spacePasskeyVerification.ts
rename to web/apps/space/src/services/passkey-verification.ts
diff --git a/web/apps/space/src/services/spacePersistentSession.ts b/web/apps/space/src/services/persistent-session.ts
similarity index 98%
rename from web/apps/space/src/services/spacePersistentSession.ts
rename to web/apps/space/src/services/persistent-session.ts
index 9049be35aa..196630c8ea 100644
--- a/web/apps/space/src/services/spacePersistentSession.ts
+++ b/web/apps/space/src/services/persistent-session.ts
@@ -14,12 +14,12 @@ import { ensureOk, publicRequestHeaders } from "ente-base/http";
import log from "ente-base/log";
import { apiURL } from "ente-base/origins";
import { removeAuthToken } from "ente-base/token";
-import { spaceBootstrapAuthHeaders } from "services/spaceBootstrapAuth";
+import { spaceBootstrapAuthHeaders } from "services/bootstrap-auth";
import {
clearSpaceSecureSessionStorage,
saveSpaceRootKeyInSpaceSession,
spaceRootKeyFromSpaceSession,
-} from "services/spaceSecureSessionStorage";
+} from "services/secure-session-storage";
import { z } from "zod";
const spaceBrowserSessionStorageKey = "spaceBrowserSession";
diff --git a/web/apps/space/src/services/spaceProfilePayload.ts b/web/apps/space/src/services/profile-payload.ts
similarity index 100%
rename from web/apps/space/src/services/spaceProfilePayload.ts
rename to web/apps/space/src/services/profile-payload.ts
diff --git a/web/apps/space/src/services/spaceProfile.ts b/web/apps/space/src/services/profile.ts
similarity index 99%
rename from web/apps/space/src/services/spaceProfile.ts
rename to web/apps/space/src/services/profile.ts
index e73eee0e80..cdbc018ae1 100644
--- a/web/apps/space/src/services/spaceProfile.ts
+++ b/web/apps/space/src/services/profile.ts
@@ -11,7 +11,7 @@ import {
cachedSpaceMediaBlobURLIfPresent,
rememberCachedSpaceMediaBlobURL,
spaceProfileMediaCacheKey,
-} from "services/spaceMediaCache";
+} from "services/media-cache";
import {
restoreSpaceBrowserSessionIfNeeded,
savedSpaceOwnedSpaces,
@@ -20,12 +20,12 @@ import {
saveSpaceOwnedSpaces,
saveSpaceProfileAvatar,
type OwnedSpace,
-} from "services/spacePersistentSession";
+} from "services/persistent-session";
import {
parseSpaceProfilePayload,
spaceProfileTextField,
-} from "services/spaceProfilePayload";
-import { spaceRootKeyFromSpaceSession } from "services/spaceSecureSessionStorage";
+} from "services/profile-payload";
+import { spaceRootKeyFromSpaceSession } from "services/secure-session-storage";
const usernamePattern = /^[a-z0-9][a-z0-9._]*$/;
const minUsernameLength = 4;
diff --git a/web/apps/space/src/services/spaceSecureSessionStorage.ts b/web/apps/space/src/services/secure-session-storage.ts
similarity index 100%
rename from web/apps/space/src/services/spaceSecureSessionStorage.ts
rename to web/apps/space/src/services/secure-session-storage.ts
diff --git a/web/apps/space/src/services/spaceShareLink.ts b/web/apps/space/src/services/share-link.ts
similarity index 100%
rename from web/apps/space/src/services/spaceShareLink.ts
rename to web/apps/space/src/services/share-link.ts
diff --git a/web/apps/space/src/services/spaceSignup.ts b/web/apps/space/src/services/signup.ts
similarity index 97%
rename from web/apps/space/src/services/spaceSignup.ts
rename to web/apps/space/src/services/signup.ts
index 817d7a14d8..3054b9ba83 100644
--- a/web/apps/space/src/services/spaceSignup.ts
+++ b/web/apps/space/src/services/signup.ts
@@ -22,21 +22,21 @@ import {
type KeyAttributes,
} from "ente-accounts/services/user";
import { isMuseumHTTPError } from "ente-base/http";
-import { spaceAuthError, spaceAuthErrorMessage } from "services/spaceAuthError";
+import { spaceAuthError, spaceAuthErrorMessage } from "services/auth-error";
import {
decryptSpaceBootstrapAuthToken,
putSpaceSignupKeyAttributes,
setupSpaceSignupSRP,
-} from "services/spaceBootstrapAuth";
+} from "services/bootstrap-auth";
import {
createSpaceBrowserSession,
getOrCreateSpaceRootKey,
-} from "services/spacePersistentSession";
+} from "services/persistent-session";
import {
authMasterKeyFromSpaceSession,
clearAuthMasterKeyFromSpaceSession,
saveAuthMasterKeyInSpaceSession,
-} from "services/spaceSecureSessionStorage";
+} from "services/secure-session-storage";
export interface SpaceSignupInput {
email: string;
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index a25fab3ee9..5fe8a2376d 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -6,7 +6,7 @@ import type {
SpaceAccountCtxHandle,
SpaceLinkCtxHandle,
} from "ente-space-wasm";
-import type { PendingSpaceInvite } from "services/spaceInvite";
+import type { PendingSpaceInvite } from "services/invite";
import {
cachedSpaceMediaBlobURL,
cachedSpaceMediaBlobURLIfPresent,
@@ -14,20 +14,20 @@ import {
rememberCachedSpaceMediaBlobURL,
spacePostMediaCacheKey,
spaceProfileMediaCacheKey,
-} from "services/spaceMediaCache";
+} from "services/media-cache";
import {
ensureCurrentSpaceContext,
loadExistingSpaceProfile,
persistCurrentOwnedSpaces,
releaseCurrentSpaceContext,
-} from "services/spaceProfile";
+} from "services/profile";
import {
parseSpaceProfilePayload,
spaceProfileTextField,
-} from "services/spaceProfilePayload";
-import { normalizeSpaceMessageText } from "utils/spaceMessageLimits";
+} from "services/profile-payload";
+import { normalizeSpaceMessageText } from "utils/message-limits";
-export { clearSpaceMediaURLCache } from "services/spaceMediaCache";
+export { clearSpaceMediaURLCache } from "services/media-cache";
const currentFeedPageSize = 10;
diff --git a/web/apps/space/src/services/spaceWebPush.ts b/web/apps/space/src/services/web-push.ts
similarity index 99%
rename from web/apps/space/src/services/spaceWebPush.ts
rename to web/apps/space/src/services/web-push.ts
index 548afbd4cb..7b9c165ef3 100644
--- a/web/apps/space/src/services/spaceWebPush.ts
+++ b/web/apps/space/src/services/web-push.ts
@@ -1,10 +1,10 @@
import { ensureOk, publicRequestHeaders } from "ente-base/http";
import { apiURL } from "ente-base/origins";
-import type { PublicSpaceLinkSession } from "services/space";
import {
savedSpaceSessionToken,
spaceSessionTokenHeader,
-} from "services/spacePersistentSession";
+} from "services/persistent-session";
+import type { PublicSpaceLinkSession } from "services/space";
import { z } from "zod";
const SpaceWebPushVAPIDKeyResponse = z.object({ publicKey: z.string() });
diff --git a/web/apps/space/src/state/SpaceAppStateProvider.tsx b/web/apps/space/src/state/AppStateProvider.tsx
similarity index 97%
rename from web/apps/space/src/state/SpaceAppStateProvider.tsx
rename to web/apps/space/src/state/AppStateProvider.tsx
index 1601137569..97e04163b0 100644
--- a/web/apps/space/src/state/SpaceAppStateProvider.tsx
+++ b/web/apps/space/src/state/AppStateProvider.tsx
@@ -8,13 +8,9 @@ import React, {
} from "react";
import type { SpaceLoginCredentials } from "screens/LoginScreen";
import type { SetupProfile } from "screens/SetupProfileScreen";
-import {
- clearSpaceFriendsCache,
- clearSpaceMediaURLCache,
-} from "services/space";
-import { clearSpaceFeedMemoryCache } from "services/spaceFeedCache";
-import type { PendingSpacePasskeyVerification } from "services/spacePasskeyVerification";
-import { logoutRevokedSpaceSession } from "services/spacePersistentSession";
+import { clearSpaceFeedMemoryCache } from "services/feed-cache";
+import type { PendingSpacePasskeyVerification } from "services/passkey-verification";
+import { logoutRevokedSpaceSession } from "services/persistent-session";
import {
clearCurrentSpaceContext,
isSpaceSessionUnauthorized,
@@ -22,7 +18,11 @@ import {
loadExistingSpaceAvatar,
loadExistingSpaceCover,
loadExistingSpaceProfile,
-} from "services/spaceProfile";
+} from "services/profile";
+import {
+ clearSpaceFriendsCache,
+ clearSpaceMediaURLCache,
+} from "services/space";
import {
type LocalSpaceFeedPost,
type OnboardingEntrySource,
@@ -32,7 +32,7 @@ import {
SpaceAppStateContext,
type SpaceProfileLoadStatus,
initialFriends,
-} from "state/spaceAppState";
+} from "state/app-state";
export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
children,
diff --git a/web/apps/space/src/state/spaceAppState.tsx b/web/apps/space/src/state/app-state.tsx
similarity index 96%
rename from web/apps/space/src/state/spaceAppState.tsx
rename to web/apps/space/src/state/app-state.tsx
index 8e2590424b..55c4970c55 100644
--- a/web/apps/space/src/state/spaceAppState.tsx
+++ b/web/apps/space/src/state/app-state.tsx
@@ -5,9 +5,9 @@ import type {
SetupProfile,
SetupProfileDetails,
} from "screens/SetupProfileScreen";
+import type { PendingSpacePasskeyVerification } from "services/passkey-verification";
import type { SpacePost } from "services/space";
-import type { PendingSpacePasskeyVerification } from "services/spacePasskeyVerification";
-import type { CreateProfileSource } from "utils/spaceRoutes";
+import type { CreateProfileSource } from "utils/routes";
export type OnboardingEntrySource = "direct" | "add-friend-link";
export type SpaceProfileLoadStatus = "error" | "loading" | "ready";
diff --git a/web/apps/space/src/styles/touchTargets.ts b/web/apps/space/src/styles/touch-targets.ts
similarity index 100%
rename from web/apps/space/src/styles/touchTargets.ts
rename to web/apps/space/src/styles/touch-targets.ts
diff --git a/web/apps/space/src/utils/spaceDisplay.ts b/web/apps/space/src/utils/display.ts
similarity index 100%
rename from web/apps/space/src/utils/spaceDisplay.ts
rename to web/apps/space/src/utils/display.ts
diff --git a/web/apps/space/src/utils/localFeedPost.ts b/web/apps/space/src/utils/local-feed-post.ts
similarity index 94%
rename from web/apps/space/src/utils/localFeedPost.ts
rename to web/apps/space/src/utils/local-feed-post.ts
index 483f6a04d2..0a2d16e141 100644
--- a/web/apps/space/src/utils/localFeedPost.ts
+++ b/web/apps/space/src/utils/local-feed-post.ts
@@ -1,9 +1,6 @@
import type React from "react";
import type { SpacePost } from "services/space";
-import type {
- FailedSpaceFeedPost,
- LocalSpaceFeedPost,
-} from "state/spaceAppState";
+import type { FailedSpaceFeedPost, LocalSpaceFeedPost } from "state/app-state";
let nextLocalFeedPostID = 0;
diff --git a/web/apps/space/src/utils/localPostPhoto.ts b/web/apps/space/src/utils/local-post-photo.ts
similarity index 96%
rename from web/apps/space/src/utils/localPostPhoto.ts
rename to web/apps/space/src/utils/local-post-photo.ts
index 8f3bc00914..1286348980 100644
--- a/web/apps/space/src/utils/localPostPhoto.ts
+++ b/web/apps/space/src/utils/local-post-photo.ts
@@ -1,4 +1,4 @@
-import type { SpaceViewerPhoto } from "components/SpaceFileViewer";
+import type { SpaceViewerPhoto } from "components/FileViewer";
export interface LocalPostPhotoDimensions {
height: number;
diff --git a/web/apps/space/src/utils/spaceLoginNavigation.ts b/web/apps/space/src/utils/login-navigation.ts
similarity index 82%
rename from web/apps/space/src/utils/spaceLoginNavigation.ts
rename to web/apps/space/src/utils/login-navigation.ts
index 15516e0595..b56c0eaa9a 100644
--- a/web/apps/space/src/utils/spaceLoginNavigation.ts
+++ b/web/apps/space/src/utils/login-navigation.ts
@@ -1,8 +1,8 @@
import log from "ente-base/log";
import type { NextRouter } from "next/router";
-import type { SpaceAppState } from "state/spaceAppState";
-import { sendPendingSpaceFriendRequest } from "utils/spacePendingFriendRequest";
-import { spaceRoutes } from "utils/spaceRoutes";
+import type { SpaceAppState } from "state/app-state";
+import { sendPendingSpaceFriendRequest } from "utils/pending-friend-request";
+import { spaceRoutes } from "utils/routes";
type RefreshProfile = SpaceAppState["refreshProfile"];
diff --git a/web/apps/space/src/utils/spaceMessageLimits.ts b/web/apps/space/src/utils/message-limits.ts
similarity index 100%
rename from web/apps/space/src/utils/spaceMessageLimits.ts
rename to web/apps/space/src/utils/message-limits.ts
diff --git a/web/apps/space/src/utils/spaceOtp.ts b/web/apps/space/src/utils/otp.ts
similarity index 100%
rename from web/apps/space/src/utils/spaceOtp.ts
rename to web/apps/space/src/utils/otp.ts
diff --git a/web/apps/space/src/utils/spacePendingFriendRequest.ts b/web/apps/space/src/utils/pending-friend-request.ts
similarity index 96%
rename from web/apps/space/src/utils/spacePendingFriendRequest.ts
rename to web/apps/space/src/utils/pending-friend-request.ts
index 3ce3c0ea00..03d139a5da 100644
--- a/web/apps/space/src/utils/spacePendingFriendRequest.ts
+++ b/web/apps/space/src/utils/pending-friend-request.ts
@@ -1,4 +1,3 @@
-import { requestFriendByUsername } from "services/space";
import {
clearPendingSpaceInvite,
clearPendingSpaceInviteFriend,
@@ -6,7 +5,8 @@ import {
saveSentSpaceInviteFriend,
savedPendingSpaceInvite,
savedPendingSpaceInviteFriend,
-} from "services/spaceInvite";
+} from "services/invite";
+import { requestFriendByUsername } from "services/space";
export const sendPendingSpaceFriendRequest = async () => {
const pendingInvite = savedPendingSpaceInvite();
diff --git a/web/apps/space/src/utils/spacePostDisplay.ts b/web/apps/space/src/utils/post-display.ts
similarity index 100%
rename from web/apps/space/src/utils/spacePostDisplay.ts
rename to web/apps/space/src/utils/post-display.ts
diff --git a/web/apps/space/src/utils/spacePostImage.ts b/web/apps/space/src/utils/post-image.ts
similarity index 100%
rename from web/apps/space/src/utils/spacePostImage.ts
rename to web/apps/space/src/utils/post-image.ts
diff --git a/web/apps/space/src/utils/spaceRouteTransitions.tsx b/web/apps/space/src/utils/route-transitions.tsx
similarity index 100%
rename from web/apps/space/src/utils/spaceRouteTransitions.tsx
rename to web/apps/space/src/utils/route-transitions.tsx
diff --git a/web/apps/space/src/utils/spaceRoutes.ts b/web/apps/space/src/utils/routes.ts
similarity index 100%
rename from web/apps/space/src/utils/spaceRoutes.ts
rename to web/apps/space/src/utils/routes.ts