From e8a91bb5513cea50672c84d0878b5a2e64f9ec8a Mon Sep 17 00:00:00 2001 From: daniel31x13 Date: Fri, 1 Dec 2023 17:44:34 -0500 Subject: [PATCH] renamed modal contents --- components/CollectionCard.tsx | 6 +++--- components/LinkCard.tsx | 2 +- components/{Modal/index.tsx => Modal.tsx} | 0 .../{Modals => ModalContent}/DeleteCollectionModal.tsx | 0 components/{Modals => ModalContent}/EditCollectionModal.tsx | 0 .../{Modals => ModalContent}/EditCollectionSharingModal.tsx | 0 components/{Modals => ModalContent}/EditLinkModal.tsx | 0 components/{Modals => ModalContent}/NewCollectionModal.tsx | 0 components/{Modals => ModalContent}/NewLinkModal.tsx | 0 components/Navbar.tsx | 4 ++-- components/NoLinksFound.tsx | 2 +- pages/collections/[id].tsx | 6 +++--- pages/collections/index.tsx | 2 +- pages/dashboard.tsx | 2 +- pages/public/collections/[id].tsx | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename components/{Modal/index.tsx => Modal.tsx} (100%) rename components/{Modals => ModalContent}/DeleteCollectionModal.tsx (100%) rename components/{Modals => ModalContent}/EditCollectionModal.tsx (100%) rename components/{Modals => ModalContent}/EditCollectionSharingModal.tsx (100%) rename components/{Modals => ModalContent}/EditLinkModal.tsx (100%) rename components/{Modals => ModalContent}/NewCollectionModal.tsx (100%) rename components/{Modals => ModalContent}/NewLinkModal.tsx (100%) diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsx index beca2ae..baf574b 100644 --- a/components/CollectionCard.tsx +++ b/components/CollectionCard.tsx @@ -9,9 +9,9 @@ import usePermissions from "@/hooks/usePermissions"; import useLocalSettingsStore from "@/store/localSettings"; import getPublicUserData from "@/lib/client/getPublicUserData"; import useAccountStore from "@/store/account"; -import EditCollectionModal from "./Modals/EditCollectionModal"; -import EditCollectionSharingModal from "./Modals/EditCollectionSharingModal"; -import DeleteCollectionModal from "./Modals/DeleteCollectionModal"; +import EditCollectionModal from "./ModalContent/EditCollectionModal"; +import EditCollectionSharingModal from "./ModalContent/EditCollectionSharingModal"; +import DeleteCollectionModal from "./ModalContent/DeleteCollectionModal"; type Props = { collection: CollectionIncludingMembersAndLinkCount; diff --git a/components/LinkCard.tsx b/components/LinkCard.tsx index 61c4371..9c0ecea 100644 --- a/components/LinkCard.tsx +++ b/components/LinkCard.tsx @@ -20,7 +20,7 @@ import isValidUrl from "@/lib/client/isValidUrl"; import Link from "next/link"; import unescapeString from "@/lib/client/unescapeString"; import { useRouter } from "next/router"; -import EditLinkModal from "./Modals/EditLinkModal"; +import EditLinkModal from "./ModalContent/EditLinkModal"; type Props = { link: LinkIncludingShortenedCollectionAndTags; diff --git a/components/Modal/index.tsx b/components/Modal.tsx similarity index 100% rename from components/Modal/index.tsx rename to components/Modal.tsx diff --git a/components/Modals/DeleteCollectionModal.tsx b/components/ModalContent/DeleteCollectionModal.tsx similarity index 100% rename from components/Modals/DeleteCollectionModal.tsx rename to components/ModalContent/DeleteCollectionModal.tsx diff --git a/components/Modals/EditCollectionModal.tsx b/components/ModalContent/EditCollectionModal.tsx similarity index 100% rename from components/Modals/EditCollectionModal.tsx rename to components/ModalContent/EditCollectionModal.tsx diff --git a/components/Modals/EditCollectionSharingModal.tsx b/components/ModalContent/EditCollectionSharingModal.tsx similarity index 100% rename from components/Modals/EditCollectionSharingModal.tsx rename to components/ModalContent/EditCollectionSharingModal.tsx diff --git a/components/Modals/EditLinkModal.tsx b/components/ModalContent/EditLinkModal.tsx similarity index 100% rename from components/Modals/EditLinkModal.tsx rename to components/ModalContent/EditLinkModal.tsx diff --git a/components/Modals/NewCollectionModal.tsx b/components/ModalContent/NewCollectionModal.tsx similarity index 100% rename from components/Modals/NewCollectionModal.tsx rename to components/ModalContent/NewCollectionModal.tsx diff --git a/components/Modals/NewLinkModal.tsx b/components/ModalContent/NewLinkModal.tsx similarity index 100% rename from components/Modals/NewLinkModal.tsx rename to components/ModalContent/NewLinkModal.tsx diff --git a/components/Navbar.tsx b/components/Navbar.tsx index e3f26db..16a03a5 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -11,8 +11,8 @@ import ProfilePhoto from "@/components/ProfilePhoto"; import useWindowDimensions from "@/hooks/useWindowDimensions"; import ToggleDarkMode from "./ToggleDarkMode"; import useLocalSettingsStore from "@/store/localSettings"; -import NewLinkModal from "./Modals/NewLinkModal"; -import NewCollectionModal from "./Modals/NewCollectionModal"; +import NewLinkModal from "./ModalContent/NewLinkModal"; +import NewCollectionModal from "./ModalContent/NewCollectionModal"; import Link from "next/link"; export default function Navbar() { diff --git a/components/NoLinksFound.tsx b/components/NoLinksFound.tsx index 05f4ff1..d6d3810 100644 --- a/components/NoLinksFound.tsx +++ b/components/NoLinksFound.tsx @@ -1,7 +1,7 @@ import { faPlus } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useState } from "react"; -import NewLinkModal from "./Modals/NewLinkModal"; +import NewLinkModal from "./ModalContent/NewLinkModal"; type Props = { text?: string; diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index 2b876d0..dbbc41e 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -15,9 +15,9 @@ import NoLinksFound from "@/components/NoLinksFound"; import useLocalSettingsStore from "@/store/localSettings"; import useAccountStore from "@/store/account"; import getPublicUserData from "@/lib/client/getPublicUserData"; -import EditCollectionModal from "@/components/Modals/EditCollectionModal"; -import EditCollectionSharingModal from "@/components/Modals/EditCollectionSharingModal"; -import DeleteCollectionModal from "@/components/Modals/DeleteCollectionModal"; +import EditCollectionModal from "@/components/ModalContent/EditCollectionModal"; +import EditCollectionSharingModal from "@/components/ModalContent/EditCollectionSharingModal"; +import DeleteCollectionModal from "@/components/ModalContent/DeleteCollectionModal"; export default function Index() { const { settings } = useLocalSettingsStore(); diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx index 02f2506..9b7e88d 100644 --- a/pages/collections/index.tsx +++ b/pages/collections/index.tsx @@ -12,7 +12,7 @@ import { useSession } from "next-auth/react"; import SortDropdown from "@/components/SortDropdown"; import { Sort } from "@/types/global"; import useSort from "@/hooks/useSort"; -import NewCollectionModal from "@/components/Modals/NewCollectionModal"; +import NewCollectionModal from "@/components/ModalContent/NewCollectionModal"; export default function Collections() { const { collections } = useCollectionStore(); diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx index 22ec9e4..ecbe785 100644 --- a/pages/dashboard.tsx +++ b/pages/dashboard.tsx @@ -24,7 +24,7 @@ import useModalStore from "@/store/modals"; import { toast } from "react-hot-toast"; import { MigrationFormat, MigrationRequest } from "@/types/global"; import DashboardItem from "@/components/DashboardItem"; -import NewLinkModal from "@/components/Modals/NewLinkModal"; +import NewLinkModal from "@/components/ModalContent/NewLinkModal"; export default function Dashboard() { const { collections } = useCollectionStore(); diff --git a/pages/public/collections/[id].tsx b/pages/public/collections/[id].tsx index a06276d..18bbde1 100644 --- a/pages/public/collections/[id].tsx +++ b/pages/public/collections/[id].tsx @@ -18,7 +18,7 @@ import FilterSearchDropdown from "@/components/FilterSearchDropdown"; import SortDropdown from "@/components/SortDropdown"; import useLocalSettingsStore from "@/store/localSettings"; import SearchBar from "@/components/SearchBar"; -import EditCollectionSharingModal from "@/components/Modals/EditCollectionSharingModal"; +import EditCollectionSharingModal from "@/components/ModalContent/EditCollectionSharingModal"; const cardVariants: Variants = { offscreen: {