Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web][photos] Lowercase collections component directory

AswinAsok684a8e62f986
diff --git a/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx b/web/apps/photos/src/components/collections/AlbumCastDialog.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/AlbumCastDialog.tsx
rename to web/apps/photos/src/components/collections/AlbumCastDialog.tsx
diff --git a/web/apps/photos/src/components/Collections/AlbumSlideshow.tsx b/web/apps/photos/src/components/collections/AlbumSlideshow.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/AlbumSlideshow.tsx
rename to web/apps/photos/src/components/collections/AlbumSlideshow.tsx
diff --git a/web/apps/photos/src/components/Collections/AlbumSlideshowSettings.tsx b/web/apps/photos/src/components/collections/AlbumSlideshowSettings.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/AlbumSlideshowSettings.tsx
rename to web/apps/photos/src/components/collections/AlbumSlideshowSettings.tsx
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/collections/CollectionHeader.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/CollectionHeader.tsx
rename to web/apps/photos/src/components/collections/CollectionHeader.tsx
diff --git a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx b/web/apps/photos/src/components/collections/CollectionMapDialog.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/CollectionMapDialog.tsx
rename to web/apps/photos/src/components/collections/CollectionMapDialog.tsx
diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/collections/CollectionShare.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/CollectionShare.tsx
rename to web/apps/photos/src/components/collections/CollectionShare.tsx
diff --git a/web/apps/photos/src/components/Collections/CreateAlbumDialog.tsx b/web/apps/photos/src/components/collections/CreateAlbumDialog.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/CreateAlbumDialog.tsx
rename to web/apps/photos/src/components/collections/CreateAlbumDialog.tsx
diff --git a/web/apps/photos/src/components/Collections/EditAlbumDetailsDialog.tsx b/web/apps/photos/src/components/collections/EditAlbumDetailsDialog.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/EditAlbumDetailsDialog.tsx
rename to web/apps/photos/src/components/collections/EditAlbumDetailsDialog.tsx
diff --git a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx b/web/apps/photos/src/components/collections/GalleryBarAndListHeader.tsx
similarity index 99%
rename from web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx
rename to web/apps/photos/src/components/collections/GalleryBarAndListHeader.tsx
index 617c8f9d69..8603281f43 100644
--- a/web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx
+++ b/web/apps/photos/src/components/collections/GalleryBarAndListHeader.tsx
@@ -3,7 +3,7 @@ import {
CollectionShare,
type CollectionShareIntent,
type CollectionShareProps,
-} from "@/components/Collections/CollectionShare";
+} from "@/components/collections/CollectionShare";
import type { FileListHeaderOrFooter } from "@/components/FileList";
import {
GalleryBarImpl,
diff --git a/web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsx b/web/apps/photos/src/components/collections/PickCoverPhotoDialog.tsx
similarity index 100%
rename from web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsx
rename to web/apps/photos/src/components/collections/PickCoverPhotoDialog.tsx
diff --git a/web/apps/photos/src/components/Collections/album-slideshow.ts b/web/apps/photos/src/components/collections/album-slideshow.ts
similarity index 100%
rename from web/apps/photos/src/components/Collections/album-slideshow.ts
rename to web/apps/photos/src/components/collections/album-slideshow.ts
diff --git a/web/apps/photos/src/components/Collections/useDeleteEmptyAlbums.ts b/web/apps/photos/src/components/collections/useDeleteEmptyAlbums.ts
similarity index 100%
rename from web/apps/photos/src/components/Collections/useDeleteEmptyAlbums.ts
rename to web/apps/photos/src/components/collections/useDeleteEmptyAlbums.ts
diff --git a/web/apps/photos/src/components/gallery/AlbumsOverview.tsx b/web/apps/photos/src/components/gallery/AlbumsOverview.tsx
index 5ae45efba9..0ad9a527f4 100644
--- a/web/apps/photos/src/components/gallery/AlbumsOverview.tsx
+++ b/web/apps/photos/src/components/gallery/AlbumsOverview.tsx
@@ -1,4 +1,4 @@
-import { useDeleteEmptyAlbums } from "@/components/Collections/useDeleteEmptyAlbums";
+import { useDeleteEmptyAlbums } from "@/components/collections/useDeleteEmptyAlbums";
import type { RemotePullOpts } from "@/components/gallery";
import type { AlbumFilter } from "@/utils/album-filters";
import { Delete02Icon } from "@hugeicons/core-free-icons";
diff --git a/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx b/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx
index 5d43303c03..e4628feba5 100644
--- a/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx
+++ b/web/apps/photos/src/components/gallery/PhotosNavigationShell.tsx
@@ -1,8 +1,8 @@
-import { CreateAlbumDialog } from "@/components/Collections/CreateAlbumDialog";
+import { CreateAlbumDialog } from "@/components/collections/CreateAlbumDialog";
import {
GalleryBarAndListHeader,
type GalleryBarAndListHeaderProps,
-} from "@/components/Collections/GalleryBarAndListHeader";
+} from "@/components/collections/GalleryBarAndListHeader";
import { SearchBar, type SearchBarProps } from "@/components/SearchBar";
import { uploadManager } from "@/services/upload-manager";
import {
diff --git a/web/apps/photos/src/components/gallery/PublicLinkDetails.tsx b/web/apps/photos/src/components/gallery/PublicLinkDetails.tsx
index 7caac20c4e..ab7b20346e 100644
--- a/web/apps/photos/src/components/gallery/PublicLinkDetails.tsx
+++ b/web/apps/photos/src/components/gallery/PublicLinkDetails.tsx
@@ -1,5 +1,5 @@
-import { ManagePublicShareOptions } from "@/components/Collections/CollectionShare";
-import { PickCoverPhotoDialog } from "@/components/Collections/PickCoverPhotoDialog";
+import { ManagePublicShareOptions } from "@/components/collections/CollectionShare";
+import { PickCoverPhotoDialog } from "@/components/collections/PickCoverPhotoDialog";
import { usePublicLinkURL } from "@/components/utils/use-public-link-url";
import { Copy01Icon, Edit03Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index ea793ec9ea..e81dcba91f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -8,13 +8,6 @@ import {
CollectionSelector,
type CollectionSelectorAttributes,
} from "@/components/CollectionSelector";
-import { AlbumSlideshow } from "@/components/Collections/AlbumSlideshow";
-import { CollectionMapDialog } from "@/components/Collections/CollectionMapDialog";
-import {
- EditAlbumDetailsDialog,
- type AlbumDetails,
-} from "@/components/Collections/EditAlbumDetailsDialog";
-import { slideshowFiles } from "@/components/Collections/album-slideshow";
import { FamilyManagement } from "@/components/FamilyManagement";
import type { FileListHeaderOrFooter } from "@/components/FileList";
import { FileListWithViewer } from "@/components/FileListWithViewer";
@@ -28,6 +21,13 @@ import {
} from "@/components/SelectedFileOptions";
import { Upload } from "@/components/Upload";
import { WhatsNew } from "@/components/WhatsNew";
+import { AlbumSlideshow } from "@/components/collections/AlbumSlideshow";
+import { CollectionMapDialog } from "@/components/collections/CollectionMapDialog";
+import {
+ EditAlbumDetailsDialog,
+ type AlbumDetails,
+} from "@/components/collections/EditAlbumDetailsDialog";
+import { slideshowFiles } from "@/components/collections/album-slideshow";
import {
GalleryEmptyState,
PeopleConsentDialog,
diff --git a/web/apps/photos/tests/album-slideshow.test.ts b/web/apps/photos/tests/album-slideshow.test.ts
index fabc21082c..e329e8a77b 100644
--- a/web/apps/photos/tests/album-slideshow.test.ts
+++ b/web/apps/photos/tests/album-slideshow.test.ts
@@ -6,7 +6,7 @@ import {
slideshowFiles,
slideshowIndex,
slideshowPrefetchFiles,
-} from "../src/components/Collections/album-slideshow";
+} from "../src/components/collections/album-slideshow";
const photo = (id: number, fileType: FileType = FileType.image) =>
({ id, metadata: { fileType } }) as EnteFile;
diff --git a/web/apps/photos/tests/delete-empty-albums.test.ts b/web/apps/photos/tests/delete-empty-albums.test.ts
index f387a648e9..62100657e2 100644
--- a/web/apps/photos/tests/delete-empty-albums.test.ts
+++ b/web/apps/photos/tests/delete-empty-albums.test.ts
@@ -1,7 +1,7 @@
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import type { CollectionSummary } from "ente-new/photos/services/collection-summary";
import { beforeEach, describe, expect, test, vi } from "vitest";
-import { useDeleteEmptyAlbums } from "../src/components/Collections/useDeleteEmptyAlbums";
+import { useDeleteEmptyAlbums } from "../src/components/collections/useDeleteEmptyAlbums";
const mocks = vi.hoisted(() => ({
showMiniDialog: vi.fn<(attributes: MiniDialogAttributes) => void>(),
diff --git a/web/apps/photos/tests/sidebar-quick-links.test.tsx b/web/apps/photos/tests/sidebar-quick-links.test.tsx
index beecfd4d18..c3e622f54d 100644
--- a/web/apps/photos/tests/sidebar-quick-links.test.tsx
+++ b/web/apps/photos/tests/sidebar-quick-links.test.tsx
@@ -5,7 +5,7 @@ import { beforeEach, describe, expect, test, vi } from "vitest";
import {
GalleryBarAndListHeader,
type GalleryBarAndListHeaderProps,
-} from "../src/components/Collections/GalleryBarAndListHeader";
+} from "../src/components/collections/GalleryBarAndListHeader";
import type { GalleryBarImplProps } from "../src/components/gallery/BarImpl";
const { renderBar } = vi.hoisted(() => ({
@@ -13,16 +13,16 @@ const { renderBar } = vi.hoisted(() => ({
}));
vi.mock("@/components/gallery/BarImpl", () => ({ GalleryBarImpl: renderBar }));
-vi.mock("@/components/Collections/CollectionShare", () => ({
+vi.mock("@/components/collections/CollectionShare", () => ({
CollectionShare: () => null,
}));
vi.mock("@/components/gallery/PeopleHeader", () => ({
PeopleHeader: () => null,
}));
-vi.mock("../src/components/Collections/AlbumCastDialog", () => ({
+vi.mock("../src/components/collections/AlbumCastDialog", () => ({
AlbumCastDialog: () => null,
}));
-vi.mock("../src/components/Collections/CollectionHeader", () => ({
+vi.mock("../src/components/collections/CollectionHeader", () => ({
CollectionHeader: () => null,
}));
vi.mock("@/utils/album-filters", () => import("../src/utils/album-filters"));
diff --git a/web/checks/lint-exceptions/suppressions.json b/web/checks/lint-exceptions/suppressions.json
index 378eb490e7..c78b9ec55a 100644
--- a/web/checks/lint-exceptions/suppressions.json
+++ b/web/checks/lint-exceptions/suppressions.json
@@ -11,10 +11,10 @@
"web/apps/albums/src/public-album/viewer/components/FileViewer.tsx": [
"react-hooks/exhaustive-deps"
],
- "web/apps/photos/src/components/Collections/CollectionShare.tsx": [
+ "web/apps/photos/src/components/collections/CollectionShare.tsx": [
"@typescript-eslint/no-unnecessary-condition"
],
- "web/apps/photos/src/components/Collections/GalleryBarAndListHeader.tsx": [
+ "web/apps/photos/src/components/collections/GalleryBarAndListHeader.tsx": [
"react-hooks/exhaustive-deps"
],
"web/apps/photos/src/components/PlanSelector.tsx": [