fix #259 partially converting some of the components from headlessui to shadcn #531

doppedheart · 2024-07-22T15:06:56Z

fix #259
change the faq from disclore to accordian

and also the dropdownproto

vercel · 2024-07-22T15:07:01Z

@doppedheart is attempting to deploy a commit to the mftsio Team on Vercel.

A member of the Team first needs to authorize it.

mfts · 2024-07-23T09:06:44Z

app/(static)/deck/components/DropdownProto.tsx

This should be a select component from shadcn not a popover.

okay will make the changes

mfts · 2024-07-23T09:07:44Z

app/(static)/deck/components/DropdownProto.tsx

-import { Fragment, Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, useState } from "react";
+import { PopoverContent } from "@radix-ui/react-popover";
+import { PopoverTrigger, Popover } from "@/components/ui/popover";

 function classNames(...classes: string[]) {


If you want you can replace this with cn from @/lib/utils. it's a better way to merge tailwind classes then this helper function.

doppedheart · 2024-07-23T11:33:37Z

there is same code written in two different files
DropdownProto.tsx -> app/(static)/deck/components/DropdownProto.tsx
dropdownpropt.tsx -> components/web/alternatives/dropdownproto.tsx

should i make the same changes as removing the headlessui components with shadcn in both
or remove any one file and make the corresponding file import changes related to other

doppedheart · 2024-07-23T15:21:02Z

other than these ui changes there are two more files which contain headlessui ,

pages/ai.tsx
pages/share-notion-page.tsx
both contain the same Faq component (disclosure as dependency) should i import the component over there as that would be much more cleaner approch,
or else do the same as Faq component but it would be code repetition

mfts · 2024-07-26T07:34:19Z

pages/ai.tsx

pages/share-notion-page.tsx
both contain the same Faq component (disclosure as dependency) should i import the component over there as that would be much more cleaner approch,

yes that would be preferred! Thank you for spotting that and suggesting this change :)

Please also merge in the current main branch so that merging becomes easier.

doppedheart · 2024-07-26T21:37:51Z

made changes to all the files and completely removed headlessui

mfts · 2024-07-29T09:56:23Z

app/(static)/deck/components/DropdownProto.tsx

+  const [menuOpen, setMenuOpen] = useState<boolean>(false);
+  const [isFirstClick, setIsFirstClick] = useState<boolean>(false);

-      <Transition
-        as={Fragment}
-        enter="transition ease-out duration-100"
-        enterFrom="transform opacity-0 scale-95"
-        enterTo="transform opacity-100 scale-100"
-        leave="transition ease-in duration-75"
-        leaveFrom="transform opacity-100 scale-100"
-        leaveTo="transform opacity-0 scale-95"
-      >
-        <Menu.Items
-          className="absolute left-0 z-10 mt-2 w-full origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
-          key={option}
-        >
-          <div className="">
-            {options.map((optionItem) => (
-              <Menu.Item key={optionItem}>
-                {({ active }) => (
-                  <button
-                    onClick={() => setOption(optionItem)}
-                    className={classNames(
-                      active ? "bg-gray-100 text-gray-900" : "text-gray-700",
-                      option === optionItem ? "bg-gray-200" : "",
-                      "px-4 py-2 text-sm w-full text-left flex items-center space-x-2 justify-between",
-                    )}
-                  >
-                    <span>{optionItem}</span>
-                    {option === optionItem ? (
-                      <CheckIcon className="w-4 h-4 text-bold" />
-                    ) : null}
-                  </button>
-                )}
-              </Menu.Item>
-            ))}
-          </div>
-        </Menu.Items>
-      </Transition>
-    </Menu>
-  );
+  const handleMenuStateChange = (open: boolean) => {
+    if (isFirstClick) {
+      setMenuOpen(true); // Keep the dropdown open on the first click
+      return;
+    }
+
+    // If the menu is closed, reset the isFirstClick state
+    if (!open) {
+      setIsFirstClick(false);
+      setMenuOpen(false); // Ensure the dropdown is closed
+    } else {
+      setMenuOpen(true); // Open the dropdown
+    }
+  };


This is not needed. This is only to for a double-click delete confirmation

mfts · 2024-07-29T09:56:34Z

app/(static)/deck/components/DropdownProto.tsx

+    }
+  };
+  return (
+    <Select open={menuOpen} onOpenChange={handleMenuStateChange}>


Suggested change

<Select open={menuOpen} onOpenChange={handleMenuStateChange}>

<Select>

mfts · 2024-07-29T09:57:58Z

components/ui/accordion.tsx

No need to change the accordion behaviour. Let's leave the chevron. This component is used in other places and relies on the chevron.

mfts · 2024-07-29T10:00:27Z

pages/ai.tsx

-const faqs = [
-  {
-    question: "What is Papermark AI?",
-    answer:
-      "Papermark AI is an innovative AI document assistant that enables users to interact with a variety of documents, such as pitch decks, sales decks, and PDFs, in a more efficient and secure manner.",
-  },
-  {
-    question: "How can I use Papermark AI?",
-    answer:
-      "You can use it on shared with you document and on received. You can chat with the document, ask question, find information without checking whole document.",
-  },
-  {
-    question: "Is Papermark AI free?",
-    answer:
-      "Yes, Papermark AI offers an open-source version, giving you the freedom to use and modify it according to your needs, under the terms of our license.",
-  },
-  {
-    question: "How can Papermark AI help me reach more investors?",
-    answer:
-      "Papermark AI provides recommendations and analytics to help you fine-tune your pitch decks, increasing your chances of making a successful connection with potential investors.",
-  },
-  {
-    question: "How I as an investor can use Papermark AI?",
-    answer:
-      "VCs can utilize Papermark AI to efficiently analyze and summarize data from various pitch decks, streamlining their investment decision-making process. Search inside the pitch deck, summarise and turn it into Memo.",
-  },
-  {
-    question: "Can I contribute to the Papermark AI project?",
-    answer:
-      "Definitely! We welcome contributions to Papermark AI. Whether it's improving the code, adding new features, or reporting bugs, your input is highly valued.",
-  },
-  {
-    question: "How to summarise document with Papermark AI?",
-    answer:
-      "You can use one of the starting commands and get the summary of received docuement. If you want that documents shared with you.",
-  },
-  {
-    question: "How to turn Pitch Deck into Memo?",
-    answer:
-      "You can use Papermark AI and ask it to create Memo from Pitch Deck received. You can also uplaod your own Pitch deck there.",
-  },
-
-  // More questions...
-];


You are removing the questions. These are different from the one in the @/components/web/faq component. Ideally we make a FAQ component that takes in props with different questions and answers.

mfts · 2024-07-29T10:01:05Z

components/web/alternatives/dropdownproto.tsx

+  const [menuOpen, setMenuOpen] = useState<boolean>(false);
+  const [isFirstClick, setIsFirstClick] = useState<boolean>(false);

-      <Transition
-        as={Fragment}
-        enter="transition ease-out duration-100"
-        enterFrom="transform opacity-0 scale-95"
-        enterTo="transform opacity-100 scale-100"
-        leave="transition ease-in duration-75"
-        leaveFrom="transform opacity-100 scale-100"
-        leaveTo="transform opacity-0 scale-95"
-      >
-        <Menu.Items
-          className="absolute left-0 z-10 mt-2 w-full origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
-          key={option}
-        >
-          <div className="">
-            {options.map((optionItem) => (
-              <Menu.Item key={optionItem}>
-                {({ active }) => (
-                  <button
-                    onClick={() => setOption(optionItem)}
-                    className={classNames(
-                      active ? "bg-gray-100 text-gray-900" : "text-gray-700",
-                      option === optionItem ? "bg-gray-200" : "",
-                      "flex w-full items-center justify-between space-x-2 px-4 py-2 text-left text-sm",
-                    )}
-                  >
-                    <span>{optionItem}</span>
-                    {option === optionItem ? (
-                      <CheckIcon className="text-bold h-4 w-4" />
-                    ) : null}
-                  </button>
-                )}
-              </Menu.Item>
-            ))}
-          </div>
-        </Menu.Items>
-      </Transition>
-    </Menu>
-  );
+  const handleMenuStateChange = (open: boolean) => {
+    if (isFirstClick) {
+      setMenuOpen(true); // Keep the dropdown open on the first click
+      return;
+    }
+
+    // If the menu is closed, reset the isFirstClick state
+    if (!open) {
+      setIsFirstClick(false);
+      setMenuOpen(false); // Ensure the dropdown is closed
+    } else {
+      setMenuOpen(true); // Open the dropdown
+    }
+  };


No needed. same as above

mfts · 2024-07-29T10:01:14Z

components/web/alternatives/dropdownproto.tsx

+    }
+  };
+  return (
+    <Select open={menuOpen} onOpenChange={handleMenuStateChange}>


Suggested change

<Select open={menuOpen} onOpenChange={handleMenuStateChange}>

<Select>

mfts

Looks great! Thank you for your effort!

vercel · 2024-07-31T09:50:53Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
papermark	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 31, 2024 10:08am

doppedheart added 2 commits July 22, 2024 20:26

replaced some headlessui components to shadcn components

4363fdf

removed unnecessary comments from faq.tx

e670be8

doppedheart requested a review from mfts as a code owner July 22, 2024 15:06

mfts requested changes Jul 23, 2024

View reviewed changes

dropdown changed from popover component to select component

02cb48d

mfts mentioned this pull request Jul 26, 2024

fix #259 Replaced headlessui components with DropdownMenu and Accordion components from the shadcn library. #536

Closed

doppedheart added 4 commits July 27, 2024 03:02

completely removed headlessui

eb9ea8e

Merge branch 'main' of https://github.com/mfts/papermark

2587cec

Merge branch 'mfts:main' into main

18c4b5c

Merge branch 'main' of https://github.com/doppedheart/papermark

f094097

doppedheart requested a review from mfts July 26, 2024 21:36

mfts requested changes Jul 29, 2024

View reviewed changes

doppedheart added 2 commits July 31, 2024 12:53

Merge branch 'main' of https://github.com/mfts/papermark

47de3cd

solving the reviewed issues

05a97ba

doppedheart requested a review from mfts July 31, 2024 07:55

mfts approved these changes Jul 31, 2024

View reviewed changes

vercel bot had a problem deploying to Preview July 31, 2024 09:52 Failure

fix: missing key & formatting

baec826

vercel bot had a problem deploying to Preview July 31, 2024 10:01 Failure

fix: missing key & formatting

514f244

vercel bot deployed to Preview July 31, 2024 10:08 View deployment

mfts merged commit 73e46d1 into mfts:main Jul 31, 2024
1 check passed

	<Select open={menuOpen} onOpenChange={handleMenuStateChange}>
	<Select>

fix #259 partially converting some of the components from headlessui to shadcn #531

fix #259 partially converting some of the components from headlessui to shadcn #531

Uh oh!

Conversation

doppedheart commented Jul 22, 2024

Uh oh!

vercel bot commented Jul 22, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

doppedheart commented Jul 23, 2024

Uh oh!

doppedheart commented Jul 23, 2024

Uh oh!

mfts commented Jul 26, 2024

Uh oh!

doppedheart commented Jul 26, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mfts left a comment

Choose a reason for hiding this comment

Uh oh!

vercel bot commented Jul 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vercel bot commented Jul 31, 2024 •

edited

Loading