From a2023e19ef0b81e9ffc1f1bbf2c32c35431799d5 Mon Sep 17 00:00:00 2001
From: Daniel <daniel31x13@gmail.com>
Date: Mon, 1 May 2023 23:30:23 +0330
Subject: [PATCH] bug fixes + small visual improvements

---
 .../InputSelect/CollectionSelection.tsx       |  2 +-
 components/InputSelect/TagSelection.tsx       |  2 +-
 components/InputSelect/styles.ts              |  4 ++-
 components/LinkList.tsx                       |  6 ++--
 components/Modal/AddCollection.tsx            | 16 +++++----
 components/Modal/AddLink.tsx                  | 30 +++++++++++------
 components/Modal/DeleteCollection.tsx         |  2 +-
 components/Modal/EditCollection.tsx           | 16 +++++----
 components/Modal/EditLink.tsx                 | 33 +++++++++++--------
 components/Modal/index.tsx                    |  2 +-
 components/Navbar.tsx                         |  8 ++---
 components/RequiredBadge.tsx                  | 13 ++++++++
 layouts/AuthRedirect.tsx                      |  2 +-
 .../controllers/collections/postCollection.ts | 12 +++++++
 .../collections/updateCollection.ts           | 12 +++++++
 pages/collections/[id].tsx                    |  4 +--
 pages/collections/index.tsx                   |  4 +--
 store/collections.ts                          |  2 +-
 18 files changed, 117 insertions(+), 53 deletions(-)
 create mode 100644 components/RequiredBadge.tsx

diff --git a/components/InputSelect/CollectionSelection.tsx b/components/InputSelect/CollectionSelection.tsx
index 79957d93..e202d6ec 100644
--- a/components/InputSelect/CollectionSelection.tsx
+++ b/components/InputSelect/CollectionSelection.tsx
@@ -54,7 +54,7 @@ export default function ({ onChange, defaultValue }: Props) {
       options={options}
       styles={styles}
       defaultValue={defaultValue}
-      menuPosition="fixed"
+      // menuPosition="fixed"
     />
   );
 }
diff --git a/components/InputSelect/TagSelection.tsx b/components/InputSelect/TagSelection.tsx
index ca3c7a65..9f277ebe 100644
--- a/components/InputSelect/TagSelection.tsx
+++ b/components/InputSelect/TagSelection.tsx
@@ -37,7 +37,7 @@ export default function ({ onChange, defaultValue }: Props) {
       options={options}
       styles={styles}
       defaultValue={defaultValue}
-      menuPosition="fixed"
+      // menuPosition="fixed"
       isMulti
     />
   );
diff --git a/components/InputSelect/styles.ts b/components/InputSelect/styles.ts
index 967ce64b..c24357f6 100644
--- a/components/InputSelect/styles.ts
+++ b/components/InputSelect/styles.ts
@@ -29,8 +29,10 @@ export const styles: StylesConfig = {
     width: "15rem",
     border: "1px solid #e0f2fe",
     borderRadius: "0.375rem",
-    fontSize: "0.875rem",
     lineHeight: "1.25rem",
+    // "@media screen and (min-width: 1024px)": {
+    //   fontSize: "0.875rem",
+    // },
   }),
   input: (styles) => ({
     ...styles,
diff --git a/components/LinkList.tsx b/components/LinkList.tsx
index 01ed6c75..a666a7ee 100644
--- a/components/LinkList.tsx
+++ b/components/LinkList.tsx
@@ -58,7 +58,7 @@ export default function ({
         width={32}
         height={32}
         alt=""
-        className="select-none mt-3 z-10 rounded-md shadow"
+        className="select-none mt-3 z-10 rounded-md"
         draggable="false"
         onError={(e) => {
           const target = e.target as HTMLElement;
@@ -70,7 +70,7 @@ export default function ({
         width={80}
         height={80}
         alt=""
-        className="blur-sm absolute left-2 opacity-50 select-none hidden sm:block"
+        className="blur-sm absolute left-2 opacity-40 select-none hidden sm:block"
         draggable="false"
         onError={(e) => {
           const target = e.target as HTMLElement;
@@ -194,7 +194,7 @@ export default function ({
                 const target = e.target as HTMLInputElement;
                 if (target.id !== "edit-dropdown") setExpandDropdown(false);
               }}
-              className="absolute top-9 right-0 w-36"
+              className="absolute top-8 right-0 w-36"
             />
           ) : null}
         </div>
diff --git a/components/Modal/AddCollection.tsx b/components/Modal/AddCollection.tsx
index ef602647..54598450 100644
--- a/components/Modal/AddCollection.tsx
+++ b/components/Modal/AddCollection.tsx
@@ -9,6 +9,7 @@ import { faClose, faPlus } from "@fortawesome/free-solid-svg-icons";
 import useCollectionStore from "@/store/collections";
 import { NewCollection } from "@/types/global";
 import { useSession } from "next-auth/react";
+import RequiredBadge from "../RequiredBadge";
 
 type Props = {
   toggleCollectionModal: Function;
@@ -48,7 +49,10 @@ export default function AddCollection({ toggleCollectionModal }: Props) {
       <p className="font-bold text-sky-300 mb-2 text-center">New Collection</p>
 
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Name</p>
+        <p className="text-sm font-bold text-sky-300">
+          Name
+          <RequiredBadge />
+        </p>
         <input
           value={newCollection.name}
           onChange={(e) =>
@@ -56,7 +60,7 @@ export default function AddCollection({ toggleCollectionModal }: Props) {
           }
           type="text"
           placeholder="e.g. Example Collection"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
@@ -68,8 +72,8 @@ export default function AddCollection({ toggleCollectionModal }: Props) {
             setNewCollection({ ...newCollection, description: e.target.value })
           }
           type="text"
-          placeholder="Collection description (Optional)"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          placeholder="Collection description"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
@@ -120,8 +124,8 @@ export default function AddCollection({ toggleCollectionModal }: Props) {
             }
           }}
           type="text"
-          placeholder="Email (Optional)"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          placeholder="Email"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
diff --git a/components/Modal/AddLink.tsx b/components/Modal/AddLink.tsx
index 7e6941d7..ccdfc77a 100644
--- a/components/Modal/AddLink.tsx
+++ b/components/Modal/AddLink.tsx
@@ -12,6 +12,7 @@ import { ExtendedLink, NewLink } from "@/types/global";
 import useLinkStore from "@/store/links";
 import { useRouter } from "next/router";
 import useCollectionStore from "@/store/collections";
+import RequiredBadge from "../RequiredBadge";
 
 type Props = {
   toggleLinkModal: Function;
@@ -79,34 +80,38 @@ export default function AddLink({ toggleLinkModal }: Props) {
       <p className="font-bold text-sky-300 mb-2 text-center">New Link</p>
 
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Name</p>
+        <p className="text-sm font-bold text-sky-300">
+          Name
+          <RequiredBadge />
+        </p>
         <input
           value={newLink.name}
           onChange={(e) => setNewLink({ ...newLink, name: e.target.value })}
           type="text"
           placeholder="e.g. Example Link"
-          className="w-60 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          className="w-60 rounded-md p-2 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">URL</p>
+        <p className="text-sm font-bold text-sky-300">
+          URL
+          <RequiredBadge />
+        </p>
         <input
           value={newLink.url}
           onChange={(e) => setNewLink({ ...newLink, url: e.target.value })}
           type="text"
           placeholder="e.g. http://example.com/"
-          className="w-60 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          className="w-60 rounded-md p-2 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Tags</p>
-        <TagSelection onChange={setTags} />
-      </div>
-
-      <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Collection</p>
+        <p className="text-sm font-bold text-sky-300">
+          Collection
+          <RequiredBadge />
+        </p>
         <CollectionSelection
           defaultValue={
             newLink.collection.name && newLink.collection.id
@@ -117,6 +122,11 @@ export default function AddLink({ toggleLinkModal }: Props) {
         />
       </div>
 
+      <div className="flex gap-5 items-center justify-between">
+        <p className="text-sm font-bold text-sky-300">Tags</p>
+        <TagSelection onChange={setTags} />
+      </div>
+
       <div
         className="mx-auto mt-2 bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"
         onClick={submit}
diff --git a/components/Modal/DeleteCollection.tsx b/components/Modal/DeleteCollection.tsx
index c643f432..5fb0790d 100644
--- a/components/Modal/DeleteCollection.tsx
+++ b/components/Modal/DeleteCollection.tsx
@@ -48,7 +48,7 @@ export default function AddCollection({
         onChange={(e) => setInputField(e.target.value)}
         type="text"
         placeholder={`Type "${collection.name}" Here.`}
-        className=" w-72 sm:w-96 rounded-md p-3 mx-auto border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+        className=" w-72 sm:w-96 rounded-md p-3 mx-auto border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
       />
 
       <div
diff --git a/components/Modal/EditCollection.tsx b/components/Modal/EditCollection.tsx
index 2b8d1169..3ca2052b 100644
--- a/components/Modal/EditCollection.tsx
+++ b/components/Modal/EditCollection.tsx
@@ -16,6 +16,7 @@ import { useSession } from "next-auth/react";
 import getPublicUserDataByEmail from "@/lib/client/getPublicUserDataByEmail";
 import Modal from "@/components/Modal";
 import DeleteCollection from "@/components/Modal/DeleteCollection";
+import RequiredBadge from "../RequiredBadge";
 
 type Props = {
   toggleCollectionModal: Function;
@@ -56,7 +57,10 @@ export default function EditCollection({
       <p className="font-bold text-sky-300 mb-2 text-center">Edit Collection</p>
 
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Name</p>
+        <p className="text-sm font-bold text-sky-300">
+          Name
+          <RequiredBadge />
+        </p>
         <input
           value={activeCollection.name}
           onChange={(e) =>
@@ -64,7 +68,7 @@ export default function EditCollection({
           }
           type="text"
           placeholder="e.g. Example Collection"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
@@ -79,8 +83,8 @@ export default function EditCollection({
             })
           }
           type="text"
-          placeholder="Collection description (Optional)"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          placeholder="Collection description"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
@@ -135,8 +139,8 @@ export default function EditCollection({
             }
           }}
           type="text"
-          placeholder="Email (Optional)"
-          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          placeholder="Email"
+          className="w-56 sm:w-96 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
         />
       </div>
 
diff --git a/components/Modal/EditLink.tsx b/components/Modal/EditLink.tsx
index 8ce35adc..c0859002 100644
--- a/components/Modal/EditLink.tsx
+++ b/components/Modal/EditLink.tsx
@@ -11,6 +11,7 @@ import { ExtendedLink } from "@/types/global";
 import { faPenToSquare } from "@fortawesome/free-regular-svg-icons";
 import useLinkStore from "@/store/links";
 import { faTrashCan } from "@fortawesome/free-solid-svg-icons";
+import RequiredBadge from "../RequiredBadge";
 
 type Props = {
   toggleLinkModal: Function;
@@ -53,7 +54,10 @@ export default function EditLink({ toggleLinkModal, link }: Props) {
         <b>{shortendURL}</b> | {link.title}
       </p>
       <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Name</p>
+        <p className="text-sm font-bold text-sky-300">
+          Name
+          <RequiredBadge />
+        </p>
         <input
           value={currentLink.name}
           onChange={(e) =>
@@ -61,7 +65,21 @@ export default function EditLink({ toggleLinkModal, link }: Props) {
           }
           type="text"
           placeholder="e.g. Example Link"
-          className="w-60 rounded-md p-3 border-sky-100 border-solid border text-sm outline-none focus:border-sky-500 duration-100"
+          className="w-60 rounded-md p-3 border-sky-100 border-solid border outline-none focus:border-sky-500 duration-100"
+        />
+      </div>
+
+      <div className="flex gap-5 items-center justify-between">
+        <p className="text-sm font-bold text-sky-300">
+          Collection
+          <RequiredBadge />
+        </p>
+        <CollectionSelection
+          onChange={setCollection}
+          defaultValue={{
+            label: link.collection.name,
+            value: link.collection.id,
+          }}
         />
       </div>
 
@@ -75,17 +93,6 @@ export default function EditLink({ toggleLinkModal, link }: Props) {
         />
       </div>
 
-      <div className="flex gap-5 items-center justify-between">
-        <p className="text-sm font-bold text-sky-300">Collection</p>
-        <CollectionSelection
-          onChange={setCollection}
-          defaultValue={{
-            label: link.collection.name,
-            value: link.collection.id,
-          }}
-        />
-      </div>
-
       <div className="flex flex-col justify-center items-center gap-2 mt-2">
         <div
           className="bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"
diff --git a/components/Modal/index.tsx b/components/Modal/index.tsx
index 5f7f01e1..b4938b06 100644
--- a/components/Modal/index.tsx
+++ b/components/Modal/index.tsx
@@ -24,7 +24,7 @@ export default function ({ toggleModal, children }: Props) {
           >
             <FontAwesomeIcon
               icon={faChevronLeft}
-              className="w-4 h-4 text-gray-500"
+              className="w-5 h-5 text-gray-500"
             />
           </div>
           {children}
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 8fe2389d..c1d6c3be 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -68,7 +68,7 @@ export default function () {
           id="search-box"
           type="text"
           placeholder="Search for Links"
-          className="border border-sky-100 rounded-md pr-6 w-60 focus:border-sky-500 sm:focus:w-80 hover:border-sky-500 duration-100 outline-none p-1 text-sm"
+          className="border border-sky-100 rounded-md pr-6 w-60 focus:border-sky-500 sm:focus:w-80 hover:border-sky-500 duration-100 outline-none p-1"
         />
       </div>
       <div className="flex items-center gap-2">
@@ -77,7 +77,7 @@ export default function () {
           title="New Link"
           className="inline-flex gap-1 items-center select-none cursor-pointer p-1 text-sky-500 rounded-md hover:outline-sky-500 outline duration-100 bg-white outline-sky-100 outline-1"
         >
-          <FontAwesomeIcon icon={faPlus} className="w-5 h-5" />
+          <FontAwesomeIcon icon={faPlus} className="w-6 h-6" />
         </div>
 
         {linkModal ? (
@@ -94,7 +94,7 @@ export default function () {
           >
             <FontAwesomeIcon
               icon={faCircleUser}
-              className="h-5 w-5 pointer-events-none"
+              className="h-6 w-6 pointer-events-none"
             />
             <div className="flex items-center gap-1 pointer-events-none">
               <p className="font-bold leading-3 hidden sm:block">
@@ -123,7 +123,7 @@ export default function () {
                 const target = e.target as HTMLInputElement;
                 if (target.id !== "profile-dropdown") setProfileDropdown(false);
               }}
-              className="absolute top-8 right-0 z-20 w-36"
+              className="absolute top-9 right-0 z-20 w-36"
             />
           ) : null}
 
diff --git a/components/RequiredBadge.tsx b/components/RequiredBadge.tsx
new file mode 100644
index 00000000..40eb3e21
--- /dev/null
+++ b/components/RequiredBadge.tsx
@@ -0,0 +1,13 @@
+// Copyright (C) 2022-present Daniel31x13 <daniel31x13@gmail.com>
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export default function RequiredBadge() {
+  return (
+    <span title="Required Field" className="text-sky-500 cursor-help">
+      {" "}
+      *
+    </span>
+  );
+}
diff --git a/layouts/AuthRedirect.tsx b/layouts/AuthRedirect.tsx
index c0c19805..132a2da6 100644
--- a/layouts/AuthRedirect.tsx
+++ b/layouts/AuthRedirect.tsx
@@ -41,5 +41,5 @@ export default function ({ children }: Props) {
   }, [status]);
 
   if (status !== "loading" && !redirect) return <>{children}</>;
-  // else return <Loader />;
+  else return <></>;
 }
diff --git a/lib/api/controllers/collections/postCollection.ts b/lib/api/controllers/collections/postCollection.ts
index 70f1e1a7..3de04787 100644
--- a/lib/api/controllers/collections/postCollection.ts
+++ b/lib/api/controllers/collections/postCollection.ts
@@ -50,6 +50,18 @@ export default async function (collection: NewCollection, userId: number) {
         })),
       },
     },
+    include: {
+      members: {
+        include: {
+          user: {
+            select: {
+              email: true,
+              name: true,
+            },
+          },
+        },
+      },
+    },
   });
 
   const collectionPath = `data/archives/${newCollection.id}`;
diff --git a/lib/api/controllers/collections/updateCollection.ts b/lib/api/controllers/collections/updateCollection.ts
index 4f8519ac..4815fe4d 100644
--- a/lib/api/controllers/collections/updateCollection.ts
+++ b/lib/api/controllers/collections/updateCollection.ts
@@ -41,6 +41,18 @@ export default async function (collection: ExtendedCollection, userId: number) {
           })),
         },
       },
+      include: {
+        members: {
+          include: {
+            user: {
+              select: {
+                email: true,
+                name: true,
+              },
+            },
+          },
+        },
+      },
     });
   });
 
diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx
index 234d18b8..ab8fe6fc 100644
--- a/pages/collections/[id].tsx
+++ b/pages/collections/[id].tsx
@@ -78,7 +78,7 @@ export default function () {
               <FontAwesomeIcon
                 icon={faEllipsis}
                 id="edit-dropdown"
-                className="w-4 h-4 text-gray-500"
+                className="w-5 h-5 text-gray-500"
               />
             </div>
             {expandDropdown ? (
@@ -113,7 +113,7 @@ export default function () {
                   const target = e.target as HTMLInputElement;
                   if (target.id !== "edit-dropdown") setExpandDropdown(false);
                 }}
-                className="absolute top-7 left-0 z-10 w-44"
+                className="absolute top-8 left-0 z-10 w-44"
               />
             ) : null}
 
diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx
index 755b9a81..080e7c1e 100644
--- a/pages/collections/index.tsx
+++ b/pages/collections/index.tsx
@@ -46,7 +46,7 @@ export default function () {
               <FontAwesomeIcon
                 icon={faEllipsis}
                 id="edit-dropdown"
-                className="w-4 h-4 text-gray-500"
+                className="w-5 h-5 text-gray-500"
               />
             </div>
             {expandDropdown ? (
@@ -65,7 +65,7 @@ export default function () {
                   const target = e.target as HTMLInputElement;
                   if (target.id !== "edit-dropdown") setExpandDropdown(false);
                 }}
-                className="absolute top-7 left-0 w-36"
+                className="absolute top-8 left-0 w-36"
               />
             ) : null}
           </div>
diff --git a/store/collections.ts b/store/collections.ts
index 9fd6ca58..67fb8e43 100644
--- a/store/collections.ts
+++ b/store/collections.ts
@@ -61,7 +61,7 @@ const useCollectionStore = create<CollectionStore>()((set) => ({
     if (response.ok)
       set((state) => ({
         collections: state.collections.map((e) =>
-          e.id === collection.id ? collection : e
+          e.id === data.response.id ? data.response : e
         ),
       }));