From 924876545f10f869462dfe5dbc5eef1d8e8b5b5d Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:13:50 +0100 Subject: [PATCH 01/27] update headlessui package to 2.1.2 --- package-lock.json | 135 +++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 117 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 583d0ce9..9a4278ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@aws-sdk/client-s3": "^3.614.0", "@aws-sdk/client-ses": "^3.621.0", "@aws-sdk/s3-request-presigner": "^3.614.0", - "@headlessui/react": "^1.7.19", + "@headlessui/react": "^2.1.2", "@heroicons/react": "^2.1.5", "@hookform/resolvers": "^3.9.0", "@js-temporal/polyfill": "^0.4.4", @@ -8725,6 +8725,20 @@ "@floating-ui/utils": "^0.2.4" } }, + "node_modules/@floating-ui/react": { + "version": "0.26.22", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.22.tgz", + "integrity": "sha512-LNv4azPt8SpT4WW7Kku5JNVjLk2GcS0bGGjFTAgqOONRFo9r/aaGHHPpdiIuQbB1t8shmWyWqTTUDmZ9fcNshg==", + "dependencies": { + "@floating-ui/react-dom": "^2.1.1", + "@floating-ui/utils": "^0.2.7", + "tabbable": "^6.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, "node_modules/@floating-ui/react-dom": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.1.tgz", @@ -8739,10 +8753,9 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.4.tgz", - "integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==", - "license": "MIT" + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz", + "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==" }, "node_modules/@graphql-tools/executor": { "version": "0.0.18", @@ -8842,19 +8855,21 @@ } }, "node_modules/@headlessui/react": { - "version": "1.7.19", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.19.tgz", - "integrity": "sha512-Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-2.1.2.tgz", + "integrity": "sha512-Kb3hgk9gRNRcTZktBrKdHhF3xFhYkca1Rk6e1/im2ENf83dgN54orMW0uSKTXFnUpZOUFZ+wcY05LlipwgZIFQ==", "dependencies": { - "@tanstack/react-virtual": "^3.0.0-beta.60", - "client-only": "^0.0.1" + "@floating-ui/react": "^0.26.16", + "@react-aria/focus": "^3.17.1", + "@react-aria/interactions": "^3.21.3", + "@tanstack/react-virtual": "^3.8.1" }, "engines": { "node": ">=10" }, "peerDependencies": { - "react": "^16 || ^17 || ^18", - "react-dom": "^16 || ^17 || ^18" + "react": "^18", + "react-dom": "^18" } }, "node_modules/@heroicons/react": { @@ -10395,6 +10410,83 @@ "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", "license": "MIT" }, + "node_modules/@react-aria/focus": { + "version": "3.18.1", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.18.1.tgz", + "integrity": "sha512-N0Cy61WCIv+57mbqC7hiZAsB+3rF5n4JKabxUmg/2RTJL6lq7hJ5N4gx75ymKxkN8GnVDwt4pKZah48Wopa5jw==", + "dependencies": { + "@react-aria/interactions": "^3.22.1", + "@react-aria/utils": "^3.25.1", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/interactions": { + "version": "3.22.1", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", + "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "dependencies": { + "@react-aria/ssr": "^3.9.5", + "@react-aria/utils": "^3.25.1", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/ssr": { + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.5.tgz", + "integrity": "sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==", + "dependencies": { + "@swc/helpers": "^0.5.0" + }, + "engines": { + "node": ">= 12" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/utils": { + "version": "3.25.1", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", + "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "dependencies": { + "@react-aria/ssr": "^3.9.5", + "@react-stately/utils": "^3.10.2", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-stately/utils": { + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", + "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "dependencies": { + "@swc/helpers": "^0.5.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-types/shared": { + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.24.1.tgz", + "integrity": "sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, "node_modules/@remirror/core-constants": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@remirror/core-constants/-/core-constants-2.0.2.tgz", @@ -11946,11 +12038,11 @@ } }, "node_modules/@tanstack/react-virtual": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.5.0.tgz", - "integrity": "sha512-rtvo7KwuIvqK9zb0VZ5IL7fiJAEnG+0EiFZz8FUOs+2mhGqdGmjKIaT1XU7Zq0eFqL0jonLlhbayJI/J2SA/Bw==", + "version": "3.8.6", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.8.6.tgz", + "integrity": "sha512-YcOQAxccjIqiC8cQ8QQiDU6F+JZtfpKNvYsw/ju5Q6S5/m9KDs5SaJvKz1kLj3RKNAOBMIFA9snN2MDmyT9lBQ==", "dependencies": { - "@tanstack/virtual-core": "3.5.0" + "@tanstack/virtual-core": "3.8.6" }, "funding": { "type": "github", @@ -11962,9 +12054,9 @@ } }, "node_modules/@tanstack/virtual-core": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.5.0.tgz", - "integrity": "sha512-KnPRCkQTyqhanNC0K63GBG3wA8I+D1fQuVnAvcBF8f13akOKeQp1gSbu6f77zCxhEk727iV5oQnbHLYzHrECLg==", + "version": "3.8.6", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.8.6.tgz", + "integrity": "sha512-UJeU4SBrx3hqULNzJ3oC0kgJ5miIAg+FwomxMTlQNxob6ppTInifANHd9ukETvzdzxr6zt3CjQ0rttQpVjbt6Q==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -26635,6 +26727,11 @@ "node": ">= 10" } }, + "node_modules/tabbable": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" + }, "node_modules/table": { "version": "6.8.2", "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", diff --git a/package.json b/package.json index f66d49df..13b2d3da 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@aws-sdk/client-s3": "^3.614.0", "@aws-sdk/client-ses": "^3.621.0", "@aws-sdk/s3-request-presigner": "^3.614.0", - "@headlessui/react": "^1.7.19", + "@headlessui/react": "^2.1.2", "@heroicons/react": "^2.1.5", "@hookform/resolvers": "^3.9.0", "@js-temporal/polyfill": "^0.4.4", From 464f3b6df19bda13334e4be604036526f95c2d82 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:40:10 +0100 Subject: [PATCH 02/27] update alpha/new components --- .../alpha/new/[[...postIdArr]]/_client.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/(app)/alpha/new/[[...postIdArr]]/_client.tsx b/app/(app)/alpha/new/[[...postIdArr]]/_client.tsx index c9ea67c9..d459ac6b 100644 --- a/app/(app)/alpha/new/[[...postIdArr]]/_client.tsx +++ b/app/(app)/alpha/new/[[...postIdArr]]/_client.tsx @@ -2,7 +2,12 @@ import { redirect, useParams } from "next/navigation"; import React, { useEffect, Fragment } from "react"; import { Controller } from "react-hook-form"; -import { Disclosure, Transition } from "@headlessui/react"; +import { + Disclosure, + DisclosureButton, + DisclosurePanel, + Transition, +} from "@headlessui/react"; import { ChevronUpIcon } from "@heroicons/react/20/solid"; import Editor from "@/components/editor/editor"; import RenderPost from "@/components/editor/editor/RenderPost"; @@ -57,7 +62,7 @@ const Create = () => { Preview
- +
- + {dataStatus === "loading" && postId && (
From 2969ccc292d0f813a205f849ff23a5538c2ff1d5 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:00:41 +0100 Subject: [PATCH 03/27] update alpha/settings components --- app/(app)/alpha/settings/_client.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/(app)/alpha/settings/_client.tsx b/app/(app)/alpha/settings/_client.tsx index 1bce13f8..4b08de9c 100644 --- a/app/(app)/alpha/settings/_client.tsx +++ b/app/(app)/alpha/settings/_client.tsx @@ -1,7 +1,7 @@ "use client"; import { useEffect, useState } from "react"; -import { Switch } from "@headlessui/react"; +import { Description, Field, Label, Switch } from "@headlessui/react"; import { zodResolver } from "@hookform/resolvers/zod"; import type { SubmitHandler } from "react-hook-form"; import { useForm } from "react-hook-form"; @@ -357,17 +357,17 @@ const Settings = ({ profile }: { profile: User }) => { aria-labelledby="privacy-heading" className="mt-2 divide-y divide-neutral-200" > -
- + - + + Occasional email notifications from the platform. - +
{ )} /> - - +
- + - + + Opt-in to our weekly newsletter. - +
{ )} /> - +
From 1a5febd3a3e5c9c1e9cd60a7667e3d3772087c97 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:22:57 +0100 Subject: [PATCH 04/27] update create/_client components --- app/(app)/create/[[...paramsArr]]/_client.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/(app)/create/[[...paramsArr]]/_client.tsx b/app/(app)/create/[[...paramsArr]]/_client.tsx index e529b128..85e9d96e 100644 --- a/app/(app)/create/[[...paramsArr]]/_client.tsx +++ b/app/(app)/create/[[...paramsArr]]/_client.tsx @@ -5,7 +5,12 @@ import React, { useState, useEffect, Fragment, useRef } from "react"; import { useForm } from "react-hook-form"; import CustomTextareaAutosize from "@/components/CustomTextareAutosize/CustomTextareaAutosize"; import { toast } from "sonner"; -import { Disclosure, Transition } from "@headlessui/react"; +import { + Disclosure, + DisclosureButton, + DisclosurePanel, + Transition, +} from "@headlessui/react"; import { ChevronUpIcon } from "@heroicons/react/20/solid"; import type { SavePostInput } from "@/schema/post"; import { ConfirmPostSchema } from "@/schema/post"; @@ -363,7 +368,7 @@ const Create = ({ session }: { session: Session }) => { return ( <> - +
- + {dataStatus === "loading" && postId && (
From 72671e3b5058b3e6f63652ce1f03cd246824cea6 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:25:06 +0100 Subject: [PATCH 05/27] update /my-posts components --- app/(app)/my-posts/_client.tsx | 82 +++++++++++++++------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/app/(app)/my-posts/_client.tsx b/app/(app)/my-posts/_client.tsx index 91e1b3f7..49389e0d 100644 --- a/app/(app)/my-posts/_client.tsx +++ b/app/(app)/my-posts/_client.tsx @@ -1,7 +1,13 @@ "use client"; import { useState, Fragment } from "react"; -import { Transition, Menu } from "@headlessui/react"; +import { + Transition, + Menu, + MenuButton, + MenuItems, + MenuItem, +} from "@headlessui/react"; import Link from "next/link"; import { ChevronDownIcon, @@ -167,13 +173,13 @@ const MyPosts = () => { className="relative inline-block text-left" >
- + Options +
{ leaveFrom="transform opacity-100 scale-100" leaveTo="transform opacity-0 scale-95" > - +
- - {({ active }) => ( - - - - - {({ active }) => ( - - )} - + + + + + + +
- +
From f036049a270cf08b47272e86d1f96d9f9f65708f Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:32:34 +0100 Subject: [PATCH 06/27] update /settings components --- app/(app)/settings/_client.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/(app)/settings/_client.tsx b/app/(app)/settings/_client.tsx index c2ff6542..833b70d2 100644 --- a/app/(app)/settings/_client.tsx +++ b/app/(app)/settings/_client.tsx @@ -1,7 +1,7 @@ "use client"; import { useEffect, useState } from "react"; -import { Switch } from "@headlessui/react"; +import { Description, Field, Label, Switch } from "@headlessui/react"; import { zodResolver } from "@hookform/resolvers/zod"; import type { SubmitHandler } from "react-hook-form"; import { useForm } from "react-hook-form"; @@ -357,17 +357,17 @@ const Settings = ({ profile }: { profile: User }) => { aria-labelledby="privacy-heading" className="mt-2 divide-y divide-neutral-200" > -
- + - + + Occasional email notifications from the platform. - +
{ )} /> - - +
- + - + + Opt-in to our weekly newsletter. - +
{ )} /> - +
From c9a8d9ac80b4b64dc42cb798a20c421158b7e5fc Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:40:27 +0100 Subject: [PATCH 07/27] update ArticleMenu component --- components/ArticleMenu/ArticleMenu.tsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/components/ArticleMenu/ArticleMenu.tsx b/components/ArticleMenu/ArticleMenu.tsx index a97aca71..2e4a1448 100644 --- a/components/ArticleMenu/ArticleMenu.tsx +++ b/components/ArticleMenu/ArticleMenu.tsx @@ -1,6 +1,11 @@ "use client"; -import { Popover, Transition } from "@headlessui/react"; +import { + Popover, + PopoverButton, + PopoverPanel, + Transition, +} from "@headlessui/react"; import React, { Fragment, useEffect, useState } from "react"; import { api } from "@/server/trpc/react"; @@ -166,14 +171,14 @@ const ArticleMenu = ({ - Open user menu - + - @@ -223,7 +228,7 @@ const ArticleMenu = ({
- +
From ea021bcf7a0a732e6e950b4dfe2d1cc38f9dfab9 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:47:28 +0100 Subject: [PATCH 08/27] update ArticlePreview componentOA --- components/ArticlePreview/ArticlePreview.tsx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/components/ArticlePreview/ArticlePreview.tsx b/components/ArticlePreview/ArticlePreview.tsx index 4c724ead..766df4af 100644 --- a/components/ArticlePreview/ArticlePreview.tsx +++ b/components/ArticlePreview/ArticlePreview.tsx @@ -8,7 +8,13 @@ import { BookmarkIcon, EllipsisHorizontalIcon, } from "@heroicons/react/20/solid"; -import { Menu, Transition } from "@headlessui/react"; +import { + Menu, + MenuButton, + MenuItem, + MenuItems, + Transition, +} from "@headlessui/react"; import { api } from "@/server/trpc/react"; import { signIn, useSession } from "next-auth/react"; @@ -160,10 +166,10 @@ const ArticlePreview: NextPage = ({ {menuOptions && (
- + Open user menu - +
= ({ leaveFrom="transform opacity-100 scale-100" leaveTo="transform opacity-0 scale-95" > - + {menuOptions.map((item) => ( - + {"href" in item ? ( = ({ {item.label} )} - + ))} - + )} From faf9fc8be92edbbed2ef4bcde326db883839244f Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:58:14 +0100 Subject: [PATCH 09/27] update CommentsArea component --- components/Comments/CommentsArea.tsx | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/components/Comments/CommentsArea.tsx b/components/Comments/CommentsArea.tsx index 86b730f1..e98c7e4c 100644 --- a/components/Comments/CommentsArea.tsx +++ b/components/Comments/CommentsArea.tsx @@ -1,7 +1,13 @@ "use client"; import React, { useEffect } from "react"; -import { Menu, Transition } from "@headlessui/react"; +import { + Menu, + MenuButton, + MenuItem, + MenuItems, + Transition, +} from "@headlessui/react"; import { EllipsisHorizontalIcon } from "@heroicons/react/20/solid"; import { signIn, useSession } from "next-auth/react"; import { useForm } from "react-hook-form"; @@ -249,10 +255,10 @@ const CommentsArea = ({ postId, postOwnerId }: Props) => { {isCurrentUser ? (
- + Open user menu - +
{ leaveFrom="transform opacity-100 scale-100" leaveTo="transform opacity-0 scale-95" > - + <> - + - - + + - + - + ) : null} From dcc400d4ee96d5a37837d9b95979b6610438461b Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:05:58 +0100 Subject: [PATCH 10/27] update ImageDetailsModal component --- components/ImageDetailsModal/ImageDetailsModal.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/ImageDetailsModal/ImageDetailsModal.tsx b/components/ImageDetailsModal/ImageDetailsModal.tsx index bd83cc53..de6b028b 100644 --- a/components/ImageDetailsModal/ImageDetailsModal.tsx +++ b/components/ImageDetailsModal/ImageDetailsModal.tsx @@ -6,7 +6,7 @@ import { XIcon } from "lucide-react"; import { z } from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import { useForm } from "react-hook-form"; -import { Dialog } from "@headlessui/react"; +import { Description, DialogTitle } from "@headlessui/react"; const imageDetailsSchema = z.object({ src: z @@ -62,14 +62,14 @@ export default function ImageDetailsModal(props: Props) { }} > <> - + Image details - + - + Please enter a URL for the image, along with an alt description and a title. - +
From 2f4ba69ec87a52faca5db46d6b3d53d5291de5fb Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:12:00 +0100 Subject: [PATCH 11/27] update Modal component --- components/Modal/Modal.tsx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/components/Modal/Modal.tsx b/components/Modal/Modal.tsx index 72f5d751..701d950b 100644 --- a/components/Modal/Modal.tsx +++ b/components/Modal/Modal.tsx @@ -1,5 +1,10 @@ import React, { Fragment } from "react"; -import { Dialog, Transition } from "@headlessui/react"; +import { + Dialog, + DialogPanel, + Transition, + TransitionChild, +} from "@headlessui/react"; interface Props { open: boolean; @@ -9,9 +14,9 @@ interface Props { export function Modal({ open, onClose, children }: Props) { return ( - + -
- +
- - + {children} - - + +
- + ); } From f9bae0a5c202398f796594d7091c329d1c29cf5b Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:18:32 +0100 Subject: [PATCH 12/27] update MobileNav component --- components/Nav/MobileNav.tsx | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/components/Nav/MobileNav.tsx b/components/Nav/MobileNav.tsx index e1717527..2bfa83c4 100644 --- a/components/Nav/MobileNav.tsx +++ b/components/Nav/MobileNav.tsx @@ -1,5 +1,10 @@ import { type UserNavigationItem } from "@/types/types"; -import { Disclosure, Transition } from "@headlessui/react"; +import { + Disclosure, + DisclosureButton, + DisclosurePanel, + Transition, +} from "@headlessui/react"; import { type Session } from "next-auth"; import { PromptLink as Link } from "../PromptService/PromptLink"; import { type MutableRefObject, useRef, type FunctionComponent } from "react"; @@ -27,7 +32,7 @@ const MobileNav: FunctionComponent = ({ enterTo="transform translate-y-0 opacity-100" className="absolute z-10 w-screen bg-neutral-100 dark:bg-black" > - +
{navigation.map((item) => ( @@ -69,12 +74,12 @@ const MobileNav: FunctionComponent = ({ ) : ( - {item.name} - + ), )} @@ -82,7 +87,7 @@ const MobileNav: FunctionComponent = ({
)} - + ); }; @@ -99,7 +104,7 @@ interface NavItemProps { const NavItem: FunctionComponent = ({ item }) => { return item.href.includes("http") ? ( - = ({ item }) => { className="nav-button flex w-full items-center text-sm font-medium lg:text-base" > {item.name} - + ) : ( - {item.name} - + ); }; @@ -140,7 +145,7 @@ const SubNav: FunctionComponent = ({ session, close }) => { <> {data.map((item) => ( - = ({ session, close }) => { )} > {item.name} - + ))} From f5eeab110970ff32ef6982b3f0af70f81e657b77 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:28:30 +0100 Subject: [PATCH 13/27] update Nav component --- components/Nav/Nav.tsx | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx index 80534b76..e376b641 100644 --- a/components/Nav/Nav.tsx +++ b/components/Nav/Nav.tsx @@ -1,6 +1,14 @@ "use client"; import { api } from "@/server/trpc/react"; -import { Disclosure, Menu, Transition } from "@headlessui/react"; +import { + Disclosure, + DisclosureButton, + Menu, + MenuButton, + MenuItem, + MenuItems, + Transition, +} from "@headlessui/react"; import { BellIcon, PlusIcon } from "@heroicons/react/20/solid"; import { signIn, signOut } from "next-auth/react"; import { PromptLink as Link } from "../PromptService/PromptLink"; @@ -139,7 +147,7 @@ const Nav = ({
- + Open user menu {session.user?.image ? ( )} - +
- + {userNavigation.map((item) => ( - + {item.onClick ? ( @@ -208,10 +216,10 @@ const Nav = ({ )} {/* Mobile menu button */} - + Open main menu - + From 0ba60b90be848dad2af00dfc3f4416197a3f26fa Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:30:55 +0100 Subject: [PATCH 14/27] update PromptDialog component --- components/PromptService/PromptDialog.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/PromptService/PromptDialog.tsx b/components/PromptService/PromptDialog.tsx index 29beced3..ea4d3d70 100644 --- a/components/PromptService/PromptDialog.tsx +++ b/components/PromptService/PromptDialog.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Modal } from "../Modal/Modal"; import { ExclamationCircleIcon, XMarkIcon } from "@heroicons/react/20/solid"; -import { Dialog } from "@headlessui/react"; +import { DialogTitle } from "@headlessui/react"; export interface serviceProps { confirm: () => void; @@ -42,12 +42,12 @@ export const PromptDialog = ({ />
- {title} - +

{subTitle}

{content && ( From ed95e326e1bfdb1ac86712666dcd6d0236aa8bc3 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:35:09 +0100 Subject: [PATCH 15/27] update ReportModal component --- components/ReportModal/ReportModal.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/components/ReportModal/ReportModal.tsx b/components/ReportModal/ReportModal.tsx index b1b96695..bb956e4f 100644 --- a/components/ReportModal/ReportModal.tsx +++ b/components/ReportModal/ReportModal.tsx @@ -3,7 +3,12 @@ import { XMarkIcon, FlagIcon } from "@heroicons/react/20/solid"; import { toast } from "sonner"; import { signIn, useSession } from "next-auth/react"; import { api } from "@/server/trpc/react"; -import { Dialog } from "@headlessui/react"; +import { + Description, + Dialog, + DialogPanel, + DialogTitle, +} from "@headlessui/react"; type Props = Post | Comment; @@ -109,13 +114,13 @@ export const ReportModal = (props: Props) => { >