From 6f7d41edd0c0d18a600539cbc8f7c593a2c51b9e Mon Sep 17 00:00:00 2001 From: smolgrrr Date: Fri, 16 Aug 2024 14:32:47 +1000 Subject: [PATCH] should fix --- .../Components/Forms/Emojis/emoji-picker.tsx | 57 - client/src/Components/Forms/PostFormCard.tsx | 215 - client/src/Components/Forms/RepostNote.tsx | 86 - .../src/Components/Forms/custom_emojis.json | 133778 --------------- client/src/Components/Forms/handleSubmit.ts | 103 - .../src/Components/Modals/CardContainer.tsx | 9 - .../Modals/CardModals/LinkPreview.tsx | 68 - .../Modals/CardModals/QuoteEmbed.tsx | 61 - .../Modals/CardModals/TextModal.tsx | 102 - .../Modals/CheckMobile/CheckMobile.tsx | 95 - client/src/Components/Modals/Header.tsx | 54 - client/src/Components/Modals/Placeholder.tsx | 24 - client/src/Components/Modals/RepostCard.tsx | 119 - client/src/Components/Routes/HashtagPage.tsx | 57 - client/src/Components/Routes/Hashtags.tsx | 71 - client/src/Components/Routes/Home.tsx | 54 - .../src/Components/Routes/Notifications.tsx | 100 - client/src/Components/Routes/Settings.tsx | 208 - client/src/Components/Routes/Thread.tsx | 195 - .../components/Forms/Emojis/emoji-picker.tsx | 57 - client/src/components/Forms/PostFormCard.tsx | 215 - client/src/components/Forms/RepostNote.tsx | 86 - .../src/components/Forms/custom_emojis.json | 133778 --------------- client/src/components/Forms/handleSubmit.ts | 103 - .../src/components/Modals/CardContainer.tsx | 9 - .../Modals/CardModals/LinkPreview.tsx | 68 - .../Modals/CardModals/QuoteEmbed.tsx | 61 - .../Modals/CardModals/TextModal.tsx | 102 - .../Modals/CheckMobile/CheckMobile.tsx | 95 - client/src/components/Modals/Header.tsx | 54 - client/src/components/Modals/Placeholder.tsx | 24 - client/src/components/Modals/RepostCard.tsx | 119 - 32 files changed, 270227 deletions(-) delete mode 100644 client/src/Components/Forms/Emojis/emoji-picker.tsx delete mode 100644 client/src/Components/Forms/PostFormCard.tsx delete mode 100644 client/src/Components/Forms/RepostNote.tsx delete mode 100644 client/src/Components/Forms/custom_emojis.json delete mode 100644 client/src/Components/Forms/handleSubmit.ts delete mode 100644 client/src/Components/Modals/CardContainer.tsx delete mode 100644 client/src/Components/Modals/CardModals/LinkPreview.tsx delete mode 100644 client/src/Components/Modals/CardModals/QuoteEmbed.tsx delete mode 100644 client/src/Components/Modals/CardModals/TextModal.tsx delete mode 100644 client/src/Components/Modals/CheckMobile/CheckMobile.tsx delete mode 100644 client/src/Components/Modals/Header.tsx delete mode 100644 client/src/Components/Modals/Placeholder.tsx delete mode 100644 client/src/Components/Modals/RepostCard.tsx delete mode 100644 client/src/Components/Routes/HashtagPage.tsx delete mode 100644 client/src/Components/Routes/Hashtags.tsx delete mode 100644 client/src/Components/Routes/Home.tsx delete mode 100644 client/src/Components/Routes/Notifications.tsx delete mode 100644 client/src/Components/Routes/Settings.tsx delete mode 100644 client/src/Components/Routes/Thread.tsx delete mode 100644 client/src/components/Forms/Emojis/emoji-picker.tsx delete mode 100644 client/src/components/Forms/PostFormCard.tsx delete mode 100644 client/src/components/Forms/RepostNote.tsx delete mode 100644 client/src/components/Forms/custom_emojis.json delete mode 100644 client/src/components/Forms/handleSubmit.ts delete mode 100644 client/src/components/Modals/CardContainer.tsx delete mode 100644 client/src/components/Modals/CardModals/LinkPreview.tsx delete mode 100644 client/src/components/Modals/CardModals/QuoteEmbed.tsx delete mode 100644 client/src/components/Modals/CardModals/TextModal.tsx delete mode 100644 client/src/components/Modals/CheckMobile/CheckMobile.tsx delete mode 100644 client/src/components/Modals/Header.tsx delete mode 100644 client/src/components/Modals/Placeholder.tsx delete mode 100644 client/src/components/Modals/RepostCard.tsx diff --git a/client/src/Components/Forms/Emojis/emoji-picker.tsx b/client/src/Components/Forms/Emojis/emoji-picker.tsx deleted file mode 100644 index cd5f8fb..0000000 --- a/client/src/Components/Forms/Emojis/emoji-picker.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import data, { Emoji } from "@emoji-mart/data"; -import Picker from "@emoji-mart/react"; -import { RefObject } from "react"; -import customEmojis from "../custom_emojis.json"; - -interface EmojiPickerProps { - topOffset: number; - leftOffset: number; - onEmojiSelect: (e: Emoji) => void; - onClickOutside: () => void; - height?: number; - ref: RefObject; -} - -export function EmojiPicker({ - topOffset, - leftOffset, - onEmojiSelect, - onClickOutside, - height = 300, - ref, -}: EmojiPickerProps) { - const customEmojiList = customEmojis.map((pack) => { - return { - id: pack.id, - name: pack.name, - emojis: pack.emojis - .filter((e) => !e.static_url.endsWith('.svg')) - .map((e) => { - return { - id: e.shortcode, - name: e.shortcode, - skins: [{ src: e.static_url }], - }; - }), - }; - }); - - return ( - <> -
- -
- - ); -} diff --git a/client/src/Components/Forms/PostFormCard.tsx b/client/src/Components/Forms/PostFormCard.tsx deleted file mode 100644 index 46a55c3..0000000 --- a/client/src/Components/Forms/PostFormCard.tsx +++ /dev/null @@ -1,215 +0,0 @@ -import { - ServerIcon, - CpuChipIcon, - ArrowPathIcon, - PlusCircleIcon -} from "@heroicons/react/24/outline"; -import { XCircleIcon } from "@heroicons/react/24/solid"; -import { useState, useEffect, useRef } from "react"; -import { UnsignedEvent, Event as NostrEvent, nip19 } from "nostr-tools"; -import { renderMedia, attachFile } from "../../utils/FileUpload"; -import EmojiPicker from "@emoji-mart/react"; -import customEmojis from './custom_emojis.json'; -import { useSubmitForm } from "./handleSubmit"; -import "../../styles/Form.css"; - -interface FormProps { - refEvent?: NostrEvent; - tagType?: 'Reply' | 'Quote' | ''; - hashtag?: string; -} - -const NewNoteCard = ({ - refEvent, - tagType, - hashtag, -}: FormProps) => { - const ref = useRef(null); - const [comment, setComment] = useState(""); - const [file, setFile] = useState(""); - const [unsigned, setUnsigned] = useState({ - kind: 1, - tags: [ - [ - "client", - "getwired.app" - ] - ], - content: "", - created_at: Math.floor(Date.now() / 1000), - pubkey: "", - }); - const [difficulty, setDifficulty] = useState( - localStorage.getItem("difficulty") || "21" - ); - const [fileSizeError, setFileSizeError] = useState(false); - const [uploadingFile, setUploadingFile] = useState(false); - - useEffect(() => { - if (hashtag) { - unsigned.tags.push(['t', hashtag as string]); - } - - if (refEvent && tagType) { - unsigned.tags = Array.from(new Set(unsigned.tags.concat(refEvent.tags))); - unsigned.tags.push(['p', refEvent.pubkey]); - - if (tagType === 'Reply') { - unsigned.tags.push(['e', refEvent.id, refEvent.tags.some(tag => tag[0] === 'e') ? 'root' : '']); - } else { - if (tagType === 'Quote') { - setComment(comment + '\nnostr:' + nip19.noteEncode(refEvent.id)); - unsigned.tags.push(['q', refEvent.id]); - } else { - unsigned.tags.push(['e', refEvent.id]); - } - } - } - - const handleDifficultyChange = (event: Event) => { - const customEvent = event as CustomEvent; - const { difficulty } = customEvent.detail; - setDifficulty(difficulty); - }; - - window.addEventListener("difficultyChanged", handleDifficultyChange); - - return () => { - window.removeEventListener("difficultyChanged", handleDifficultyChange); - }; - }, []); - - useEffect(() => { - setUnsigned(prevUnsigned => ({ - ...prevUnsigned, - content: `${comment} ${file}`, - created_at: Math.floor(Date.now() / 1000), - })); - }, [comment, file]); - - const { handleSubmit: originalHandleSubmit, doingWorkProp, doingWorkProgress } = useSubmitForm(unsigned, difficulty); - - const handleSubmit = async (event: React.FormEvent) => { - await originalHandleSubmit(event); - setComment(""); - setFile(""); - setUnsigned(prevUnsigned => ({ - ...prevUnsigned, - content: '', - created_at: Math.floor(Date.now() / 1000) - })); - }; - - //Emoji stuff - const emojiRef = useRef(null); - const [showEmojiPicker, setShowEmojiPicker] = useState(false); - - interface Emoji { - native?: string; - id?: string; - } - - const emojiNames = customEmojis.map(p => p.emojis).flat(); - function getEmojiById(id: string) { - return emojiNames.find(e => e.shortcode === id); - } - - async function onEmojiSelect(emoji: Emoji) { - setShowEmojiPicker(false); - try { - if (emoji.id) { - const e = getEmojiById(emoji.id); - if (e) { - setComment(comment + " :" + e.shortcode + ":"); - unsigned.tags.push(['emoji', e.shortcode, e.url]); - }; - } - } catch { - //ignore - } - } - - const topOffset = ref.current?.getBoundingClientRect().top; - const leftOffset = ref.current?.getBoundingClientRect().left; - - function pickEmoji(e: React.MouseEvent) { - e.stopPropagation(); - setShowEmojiPicker(!showEmojiPicker); - } - - return ( -
- -
-