Fix merge conflicts

2024-08-18 13:03:09 -05:00
parent a1248fe62f 0e47ad9920
commit 898b126231
95 changed files with 3462 additions and 1934 deletions
@@ -9,8 +9,6 @@ import {
 import { useRouter } from "next/router";
 import React, { useEffect, useState } from "react";
 import Head from "next/head";
-import useLinks from "@/hooks/useLinks";
-import useLinkStore from "@/store/links";
 import ProfilePhoto from "@/components/ProfilePhoto";
 import ToggleDarkMode from "@/components/ToggleDarkMode";
 import getPublicUserData from "@/lib/client/getPublicUserData";
@@ -19,21 +17,19 @@ import Link from "next/link";
 import useLocalSettingsStore from "@/store/localSettings";
 import SearchBar from "@/components/SearchBar";
 import EditCollectionSharingModal from "@/components/ModalContent/EditCollectionSharingModal";
-import CardView from "@/components/LinkViews/Layouts/CardView";
-import ListView from "@/components/LinkViews/Layouts/ListView";
-import MasonryView from "@/components/LinkViews/Layouts/MasonryView";
 import { useTranslation } from "next-i18next";
 import getServerSideProps from "@/lib/client/getServerSideProps";
-import useCollectionStore from "@/store/collections";
 import LinkListOptions from "@/components/LinkListOptions";
+import { useCollections } from "@/hooks/store/collections";
+import { usePublicLinks } from "@/hooks/store/publicLinks";
+import Links from "@/components/LinkViews/Links";

 export default function PublicCollections() {
  const { t } = useTranslation();
-  const { links } = useLinkStore();

  const { settings } = useLocalSettingsStore();

-  const { collections } = useCollectionStore();
+  const { data: collections = [] } = useCollections();

  const router = useRouter();

@@ -49,9 +45,11 @@ export default function PublicCollections() {
    textContent: false,
  });

-  const [sortBy, setSortBy] = useState<Sort>(Sort.DateNewestFirst);
+  const [sortBy, setSortBy] = useState<Sort>(
+    Number(localStorage.getItem("sortBy")) ?? Sort.DateNewestFirst
+  );

-  useLinks({
+  const { links, data } = usePublicLinks({
    sort: sortBy,
    searchQueryString: router.query.q
      ? decodeURIComponent(router.query.q as string)
@@ -68,7 +66,13 @@ export default function PublicCollections() {

  useEffect(() => {
    if (router.query.id) {
-      getPublicCollectionData(Number(router.query.id), setCollection);
+      getPublicCollectionData(Number(router.query.id), setCollection).then(
+        (res) => {
+          if (res.status === 400) {
+            router.push("/dashboard");
+          }
+        }
+      );
    }
  }, [collections]);

@@ -86,8 +90,8 @@ export default function PublicCollections() {
  const [editCollectionSharingModal, setEditCollectionSharingModal] =
    useState(false);

-  const [viewMode, setViewMode] = useState<string>(
-    localStorage.getItem("viewMode") || ViewMode.Card
+  const [viewMode, setViewMode] = useState<ViewMode>(
+    (localStorage.getItem("viewMode") as ViewMode) || ViewMode.Card
  );

  const linkView = {
@@ -105,9 +109,8 @@ export default function PublicCollections() {
    <div
      className="h-96"
      style={{
-        backgroundImage: `linear-gradient(${collection?.color}30 10%, ${
-          settings.theme === "dark" ? "#262626" : "#f3f4f6"
-        } 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
+        backgroundImage: `linear-gradient(${collection?.color}30 10%, ${settings.theme === "dark" ? "#262626" : "#f3f4f6"
+          } 13rem, ${settings.theme === "dark" ? "#171717" : "#ffffff"} 100%)`,
      }}
    >
      {collection && (
@@ -178,20 +181,20 @@ export default function PublicCollections() {

              <p className="text-neutral text-sm">
                {collection.members.length > 0 &&
-                collection.members.length === 1
+                  collection.members.length === 1
                  ? t("by_author_and_other", {
+                    author: collectionOwner.name,
+                    count: collection.members.length,
+                  })
+                  : collection.members.length > 0 &&
+                    collection.members.length !== 1
+                    ? t("by_author_and_others", {
                      author: collectionOwner.name,
                      count: collection.members.length,
                    })
-                  : collection.members.length > 0 &&
-                      collection.members.length !== 1
-                    ? t("by_author_and_others", {
-                        author: collectionOwner.name,
-                        count: collection.members.length,
-                      })
                    : t("by_author", {
-                        author: collectionOwner.name,
-                      })}
+                      author: collectionOwner.name,
+                    })}
              </p>
            </div>
          </div>
@@ -215,28 +218,30 @@ export default function PublicCollections() {
              placeholder={
                collection._count?.links === 1
                  ? t("search_count_link", {
-                      count: collection._count?.links,
-                    })
+                    count: collection._count?.links,
+                  })
                  : t("search_count_links", {
-                      count: collection._count?.links,
-                    })
+                    count: collection._count?.links,
+                  })
              }
            />
          </LinkListOptions>

-          {links[0] ? (
-            <LinkComponent
-              links={links
-                .filter((e) => e.collectionId === Number(router.query.id))
-                .map((e, i) => {
-                  const linkWithCollectionData = {
-                    ...e,
-                    collection: collection, // Append collection data
-                  };
-                  return linkWithCollectionData;
-                })}
-            />
-          ) : (
+          <Links
+            links={
+              links?.map((e, i) => {
+                const linkWithCollectionData = {
+                  ...e,
+                  collection: collection, // Append collection data
+                };
+                return linkWithCollectionData;
+              }) as any
+            }
+            layout={viewMode}
+            placeholderCount={1}
+            useData={data}
+          />
+          {!data.isLoading && links && !links[0] && (
            <p>{t("collection_is_empty")}</p>
          )}

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from "react";
-import useLinkStore from "@/store/links";
 import { useRouter } from "next/router";
 import {
  ArchivedFormat,
@@ -7,20 +6,20 @@ import {
 } from "@/types/global";
 import ReadableView from "@/components/ReadableView";
 import getServerSideProps from "@/lib/client/getServerSideProps";
+import { useGetLink, useLinks } from "@/hooks/store/links";

 export default function Index() {
-  const { links, getLink } = useLinkStore();
+  const { links } = useLinks();
+  const getLink = useGetLink();

  const [link, setLink] = useState<LinkIncludingShortenedCollectionAndTags>();

  const router = useRouter();

-  let isPublic = router.pathname.startsWith("/public") ? true : false;
-
  useEffect(() => {
    const fetchLink = async () => {
      if (router.query.id) {
-        await getLink(Number(router.query.id), isPublic);
+        await getLink.mutateAsync(Number(router.query.id));
      }
    };

@@ -28,7 +27,8 @@ export default function Index() {
  }, []);

  useEffect(() => {
-    if (links[0]) setLink(links.find((e) => e.id === Number(router.query.id)));
+    if (links && links[0])
+      setLink(links.find((e) => e.id === Number(router.query.id)));
  }, [links]);

  return (