diff --git a/next.config.js b/next.config.js index db37cc68..59f28a7e 100644 --- a/next.config.js +++ b/next.config.js @@ -1,3 +1,5 @@ +const path = require('path'); + /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, @@ -10,6 +12,15 @@ const nextConfig = { }, ], }, + transpilePackages: ['slate-transcript-editor'], + webpack: (config) => { + // Resolve React dependencies for local development of slate-transcript-editor + // This configuration is only necessary when working with a local version of the library + // It prevents "Invalid hook call" errors by ensuring consistent React versions + config.resolve.alias['react'] = path.resolve('./node_modules/react'); + config.resolve.alias['react-dom'] = path.resolve('./node_modules/react-dom'); + return config; + }, }; module.exports = nextConfig; diff --git a/package.json b/package.json index 79fb5a87..1f67c89b 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,14 @@ "match-sorter": "^6.3.1", "next": "^13.4.13", "next-auth": "^4.22.5", + "next-transpile-modules": "^10.0.1", "react": "^18.2.0", "react-datepicker": "^4.16.0", "react-dom": "^18.2.0", "react-icons": "^4.10.1", - "react-markdown-editor-lite": "^1.3.4", "react-youtube": "^10.1.0", "sanitize-html": "^2.11.0", + "slate-transcript-editor": "https://github.com/kouloumos/slate-transcript-editor.git#v0.1.6", "slugify": "^1.6.6", "use-debounce": "^10.0.0" }, diff --git a/src/components/alerts/SubmitTranscriptAlert.tsx b/src/components/alerts/SubmitTranscriptAlert.tsx deleted file mode 100644 index 785f7327..00000000 --- a/src/components/alerts/SubmitTranscriptAlert.tsx +++ /dev/null @@ -1,142 +0,0 @@ -import { TranscriptSubmitOptions } from "@/components/menus/SubmitTranscriptMenu"; -import { - AlertDialog, - AlertDialogBody, - AlertDialogContent, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogOverlay, - Button, - Flex, - Heading, - ListItem, - Text, - UnorderedList, -} from "@chakra-ui/react"; -import { forwardRef, useRef } from "react"; - -type Props = { - isOpen: boolean; - onCancel: () => void; - onSubmit: () => void; - prRepo: TranscriptSubmitOptions; -}; - -type PromptTwoProps = Omit; - -type PromptOneProps = Omit; - -const SubmitTranscriptAlert = ({ - isOpen, - onCancel, - onSubmit, - prRepo, -}: Props) => { - const cancelRef = useRef(null); - - const handleClose = () => { - onCancel(); - }; - - return ( - - - - - - - - - ); -}; - -export default SubmitTranscriptAlert; - -const PromptStepOne = forwardRef( - ({ onCancel }, ref) => { - return ( - <> - - Let's review your edits - - - - Did you make sure the following are accurate? - - - - Title - - - Speaker(s) - - - Date of original presentation - - - Tags for the main topics of discussion - - - - - Did you follow the Review Guidelines? - Please confirm you have corrected AI errors, adopted a clean - verbatim transcription style, maintained structure and organized - chapters effectively, attributed speakers accurately, and - conducted a final coherence check to ensure the transcript - is not only accurate but also readable. - - - - - - ); - } -); - -PromptStepOne.displayName = "PromptStepOne"; - -const PromptStepTwo = forwardRef( - ({ onCancel, prRepo, onSubmit }, ref) => { - return ( - <> - - By hitting submit, this would create a PR on{" "} - - {prRepo === "btc transcript" - ? "the Bitcoin Transcript repo" - : "your repo"} - {" "} - - - - - - ); - } -); -PromptStepTwo.displayName = "PromptStepTwo"; diff --git a/src/components/editTranscript/EditTranscript.tsx b/src/components/editTranscript/EditTranscript.tsx deleted file mode 100644 index 1b22135e..00000000 --- a/src/components/editTranscript/EditTranscript.tsx +++ /dev/null @@ -1,270 +0,0 @@ -import { - Box, - Button, - Flex, - Modal, - ModalBody, - ModalCloseButton, - ModalContent, - ModalFooter, - ModalHeader, - ModalOverlay, - Text, - Tooltip, - useToast, -} from "@chakra-ui/react"; - -import MdEditor from "react-markdown-editor-lite"; -import "react-markdown-editor-lite/lib/index.css"; -import { - Dispatch, - MutableRefObject, - SetStateAction, - useEffect, - useState, -} from "react"; -import MarkdownIt from "markdown-it"; -import { FaBook } from "react-icons/fa"; -import SubmitTranscriptMenu, { - TranscriptSubmitOptions, -} from "../menus/SubmitTranscriptMenu"; -import { TranscriptContent, UserReviewData } from "../../../types"; -import { useUpdateTranscript } from "@/services/api/transcripts"; -import { useHasPermission } from "@/hooks/useHasPermissions"; -// Interfaces for react-markdown-editior -export interface IHandleEditorChange { - text: string; - html: string; -} - -export interface IStateChange { - md: boolean; - html: boolean; - menu: true; -} -const EditTranscript = ({ - mdData, - update, - restoreOriginal, - editorRef, - openGuidelines, - reviewData, - saveTranscript, - getUpdatedTranscript, - onOpen, - prRepo, - setPrRepo, -}: { - mdData: string; - prRepo: TranscriptSubmitOptions; - setPrRepo: Dispatch>; - editorRef: MutableRefObject; - // eslint-disable-next-line no-unused-vars - update: (x: any) => void; - restoreOriginal: () => void; - openGuidelines: () => void; - reviewData: UserReviewData; - saveTranscript: ( - updatedContent: TranscriptContent, - onSuccessCallback?: () => void, - onNoEditsCallback?: () => void - ) => Promise; - getUpdatedTranscript: () => TranscriptContent; - onOpen: () => void; -}) => { - const [isPreviewOnly, setIsPreviewOnly] = useState(false); - const [isModalOpen, setIsModalOpen] = useState(false); - const toast = useToast(); - const mdParser = new MarkdownIt(); - - const reviewSubmissionDisabled = - !!reviewData.branchUrl && !!reviewData.pr_url; - - const canSubmitToOwnRepo = useHasPermission("submitToOwnRepo"); - - const { isLoading: saveLoading } = useUpdateTranscript(); - - const handleSave = async () => { - const onSuccessCallback = () => { - toast({ - status: "success", - title: "Saved successfully", - }); - }; - const onNoEditsCallback = () => { - toast({ - status: "warning", - title: "Unable to save because no edits have been made", - }); - }; - try { - await saveTranscript( - getUpdatedTranscript(), - onSuccessCallback, - onNoEditsCallback - ); - } catch (err: any) { - toast({ - status: "error", - title: "Error while saving", - description: err?.message, - }); - } - }; - - // Finish! - function handleEditorChange({ text }: IHandleEditorChange) { - update(text); - } - // hijack params of mdEditor to change toolbar "preview" function - useEffect(() => { - editorRef.current?.on("viewchange", (state: IStateChange) => { - if (state.md && state.html) { - setIsPreviewOnly(false); - } else if (state.md) { - setIsPreviewOnly(false); - } else { - setIsPreviewOnly(true); - } - }); - }, [editorRef]); - - useEffect(() => { - if (isPreviewOnly) { - editorRef?.current?.setView({ - html: true, - md: false, - menu: true, - }); - } else { - editorRef?.current?.setView({ - html: false, - md: true, - menu: true, - }); - } - }, [editorRef, isPreviewOnly]); - - // restoreOriginal content function - const onClickRestore = () => { - restoreOriginal(); - setIsModalOpen(false); - }; - - return ( - <> - - - - - - - - - - - - - - {canSubmitToOwnRepo && ( - <> - - - )} - - - - - mdParser.render(text)} - onChange={handleEditorChange} - htmlClass={isPreviewOnly ? "hide-editor" : ""} - markdownClass="full" - /> - - - setIsModalOpen(false)}> - - - - - Restore Original - - - - - Are you sure? All changes will be lost. - - - - - - - - - ); -}; - -export default EditTranscript; diff --git a/src/components/home/Queuer.tsx b/src/components/home/Queuer.tsx index d7cbf8f2..991746fb 100644 --- a/src/components/home/Queuer.tsx +++ b/src/components/home/Queuer.tsx @@ -1,10 +1,7 @@ import QueueTable from "@/components/tables/QueueTable"; -import GlobalContainer from "../GlobalContainer"; export default function HomePage() { return ( - - - + ); } diff --git a/src/components/modals/RestoreOriginalModal.tsx b/src/components/modals/RestoreOriginalModal.tsx new file mode 100644 index 00000000..4b6b7007 --- /dev/null +++ b/src/components/modals/RestoreOriginalModal.tsx @@ -0,0 +1,50 @@ +import { + Text, + Modal, + ModalOverlay, + ModalContent, + ModalHeader, + ModalCloseButton, + ModalBody, + ModalFooter, + Button, +} from "@chakra-ui/react"; + +type Props = { + isOpen: boolean; + onClose: () => void; + onClick: () => void; +}; + +const RestoreOriginalModal = ({ + isOpen, + onClose: closeModal, + onClick: Restore, +}: Props) => { + return ( + + + + + + Restore Original + + + + + Are you sure? All changes will be lost. + + + + + + + + ); +}; + +export default RestoreOriginalModal; diff --git a/src/components/modals/SelectSpeakerModal.tsx b/src/components/modals/SelectSpeakerModal.tsx new file mode 100644 index 00000000..26a3b469 --- /dev/null +++ b/src/components/modals/SelectSpeakerModal.tsx @@ -0,0 +1,95 @@ +import { useState } from "react"; +import { + Text, + Modal, + ModalOverlay, + ModalContent, + ModalHeader, + ModalCloseButton, + ModalBody, + ModalFooter, + Button, + Checkbox, + Box, +} from "@chakra-ui/react"; +import { SelectField } from "../sideBarContentEdit/SelectField"; +import { useGetMetadata } from "@/services/api/transcripts/useGetMetadata"; +import { SlateNode } from "../../../types"; + +type Props = { + selectedSpeakerElement: SlateNode; + isOpen: boolean; + onSetSpeakerName: ( + newSpeakerName: string | null, + isUpdateAllSpeakerInstances: boolean + ) => void; + onClose: () => void; +}; + +const SelectSpeakerModal = ({ + selectedSpeakerElement, + onSetSpeakerName, + onClose: closeModal, +}: Props) => { + const oldSpeakerName = selectedSpeakerElement?.speaker || ""; + const [newSpeakerName, setNewSpeakerName] = useState(""); + const [isUpdateAllSpeakerInstances, setIsUpdateAllSpeakerInstances] = + useState(false); + const { data: allMetadata } = useGetMetadata(); + + const handleSave = () => { + onSetSpeakerName(newSpeakerName, isUpdateAllSpeakerInstances); + handleClose(); + }; + + const handleClose = () => { + setNewSpeakerName(""); + setIsUpdateAllSpeakerInstances(false); + closeModal(); + }; + + return ( + + + + + + Change Speaker Name + + + + + + + Speakers + + setNewSpeakerName(speaker)} + autoCompleteList={allMetadata?.speakers ?? []} + userCanAddToList + /> + + setIsUpdateAllSpeakerInstances(e.target.checked)} + mt={4} + > + Replace all occurrences of {oldSpeakerName} + + + + + + + + + ); +}; + +export default SelectSpeakerModal; diff --git a/src/components/modals/SubmitTranscriptModal.tsx b/src/components/modals/SubmitTranscriptModal.tsx index e0e16ffc..6518d896 100644 --- a/src/components/modals/SubmitTranscriptModal.tsx +++ b/src/components/modals/SubmitTranscriptModal.tsx @@ -1,151 +1,239 @@ +import { SubmitReviewParams } from "@/services/api/github"; import { discordInvites } from "@/utils"; import { Box, + Button, Divider, Flex, Heading, Icon, Link, + ListItem, Modal, ModalBody, ModalCloseButton, ModalContent, ModalHeader, ModalOverlay, + ModalFooter, Spinner, Text, + UnorderedList, } from "@chakra-ui/react"; -import { AxiosError } from "axios"; import NextLink from "next/link"; import { BiCheck, BiX } from "react-icons/bi"; - -export type SubmitState = { - stepIdx: number; - steps: string[]; - isLoading: boolean; - isError: boolean; - isModalOpen: boolean; - prResult: null | any; - err: null | AxiosError<{ message: string }>; -}; +import { TranscriptSubmitOptions } from "@/components/menus/SubmitTranscriptMenu"; +import { UseMutationResult } from "@tanstack/react-query"; +import { useRouter } from "next/router"; type Props = { - submitState: SubmitState; + submitReview: UseMutationResult; + isOpen: boolean; onClose: () => void; + onSubmit: () => void; + prRepo: TranscriptSubmitOptions; +}; + +type SubmitContentProps = { + status: string; + data?: string; + error: any; }; -const SubmitTranscriptModal = ({ submitState, onClose }: Props) => { - const { stepIdx, steps, isLoading, isError, isModalOpen, prResult, err } = - submitState; - const errorMessage = err?.response?.data?.message || err?.message; +type ReviewEditsContentProps = Pick; + +const ConfirmSubmitModalContent = ({ + onClose: closeModal, + onSubmit: submitTranscript, + prRepo, +}: ReviewEditsContentProps) => { return ( - - - - Submitting Transcript - - - - {steps.map((step, idx) => { - const stepLoading = stepIdx === idx && !isError; - const stepCompleted = idx < stepIdx; - const stepNotRun = idx > stepIdx; - const stepError = stepIdx === idx && isError; - return ( - - {stepLoading && ( - - )} - {stepNotRun && ( - - )} - {stepCompleted && ( - - )} - {stepError && } - + Let's review your edits + + + Did you make sure the following are accurate? + + + + Title + + + Speaker(s) + + + Date of original presentation + + + Tags for the main topics of discussion + + + + + Did you follow the Review Guidelines? + Please confirm you have corrected AI errors, adopted a clean + verbatim transcription style, maintained structure and organized + chapters effectively, attributed speakers accurately, and conducted + a final coherence check to ensure the transcript is not only + accurate but also readable. + + + + + + By hitting submit, this would create a PR on{" "} + + {prRepo === "btc transcript" + ? "the Bitcoin Transcript repo" + : "your repo"} + {" "} + + + + + + ); +}; + +const SubmitModalContent = ({ + status, + data: prUrl, + error, +}: SubmitContentProps) => { + const errorMessage = error?.response?.data?.message || error?.message; + return ( + <> + Submitting Transcript + + + + {status == "loading" && ( + + )} + {status == "success" && ( + + )} + {status == "error" && } + + Submitting transcript for evaluation + + + + + {status == "error" && ( + + + Unsuccessful + + {error?.message && ( + <> + + {errorMessage} + + )} + + )} + {status == "success" && prUrl && ( + <> + Thanks for your help! + + The edits will be reviewed before publishing. + + You will receive a confirmation on GitHub once it is merged + and live on btctranscripts.com. + + + Corrections and conversations about this transcript will shift + to GitHub on your PR linked{" "} + - {step} - - - ); - })} - - - {isError && !isLoading && ( - - - Unsuccessful + here + + . - {err?.message && ( - <> - - - Error: - - {errorMessage} - - )} - - )} - {!isError && !isLoading && prResult?.data?.html_url && ( - <> - Thanks for your help! - - The edits will be reviewed before publishing. - - You will receive a confirmation on GitHub once it is merged - and live on btctranscripts.com. - - - Corrections and conversations about this transcript will - shift to GitHub on your PR linked - - - here - - . - - - - Help us improve!{" "} - - Tell us about your experience - - . - - - - )} - - + + + Help us improve!{" "} + + Tell us about your experience + + . + + + + )} + + + + ); +}; + +const SubmitTranscriptModal = ({ + isOpen, + onClose: closeModal, + onSubmit, + prRepo, + submitReview, +}: Props) => { + const router = useRouter(); + const handleClose = () => { + submitReview.reset(); + closeModal(); + if (submitReview.status == "success") { + // return to Account page + router.push("/"); + } + }; + return ( + + + + {submitReview.status == "idle" ? ( + + ) : ( + + )} ); diff --git a/src/components/modals/SuggestModal.tsx b/src/components/modals/SuggestModal.tsx index 7d2c365a..80ad1758 100644 --- a/src/components/modals/SuggestModal.tsx +++ b/src/components/modals/SuggestModal.tsx @@ -1,5 +1,4 @@ -import config from "@/config/config.json"; -import { useCreatePR } from "@/services/api/github"; +import { useGithub } from "@/services/api/github"; import { useGetMetadata } from "@/services/api/transcripts/useGetMetadata"; import { compareUrls, getPRRepo } from "@/utils"; import { @@ -16,7 +15,6 @@ import { ModalHeader, ModalOverlay, Text, - useToast, } from "@chakra-ui/react"; import { type FormEvent, useState, ChangeEvent } from "react"; @@ -35,9 +33,8 @@ const defaultFormValues = { url: "", } satisfies FormValues; -export function SuggestModal({ handleClose, isOpen }: SuggestModalProps) { - const toast = useToast(); - const createPR = useCreatePR(); +const SuggestModal = ({ handleClose, isOpen }: SuggestModalProps) => { + const { suggestSource } = useGithub(); const [urlError, setUrlError] = useState(""); const [formValues, setFormValues] = useState(defaultFormValues); const { data: selectableListData } = useGetMetadata(); @@ -49,13 +46,12 @@ export function SuggestModal({ handleClose, isOpen }: SuggestModalProps) { }; const handleUrlChange = (e: ChangeEvent) => { - setFormValues((v) => ({ ...v, url: e.target.value })) + setFormValues((v) => ({ ...v, url: e.target.value })); setUrlError(""); - } + }; const validateUrl = (urlString: string): boolean => { try { - const url = new URL(urlString.trim()); const urlExists = selectableListData?.media.some((mediaUrl) => @@ -77,39 +73,21 @@ export function SuggestModal({ handleClose, isOpen }: SuggestModalProps) { } }; - const handleSubmit = (e: FormEvent) => { + const handleSubmit = async (e: FormEvent) => { e.preventDefault(); const isUrlValid = validateUrl(formValues.url); if (!isUrlValid) return; - createPR.mutate( + await suggestSource.mutateAsync( { - directoryPath: config.defaultDirectoryPath, - fileName: formValues.title, - url: formValues.url, - transcribedText: "", - prRepo: getPRRepo(), - needs: "transcript", + title: formValues.title, + media: formValues.url, + targetRepository: getPRRepo(), }, { - onError: (e) => { - const description = - e instanceof Error - ? e.message - : "An error occurred while submitting suggestion"; - toast({ - status: "error", - title: "Error submitting", - description, - }); - }, onSuccess: () => { - toast({ - status: "success", - title: "Suggestion submitted successfully", - }); - resetAndCloseForm() + resetAndCloseForm(); }, } ); @@ -140,9 +118,8 @@ export function SuggestModal({ handleClose, isOpen }: SuggestModalProps) { fontSize={{ base: "xs", lg: "sm" }} textAlign="center" > - We manually review every suggestion to ensure it meets our - standards for reliable, - technical Bitcoin content. + We manually review every suggestion to ensure it meets our standards + for reliable, technical Bitcoin content.
@@ -158,7 +135,11 @@ export function SuggestModal({ handleClose, isOpen }: SuggestModalProps) { required /> - + Source's URL - + - )} - - ); -}; - -export default SelectField; - -export const OnlySelectField = ({ +export function SelectField({ name, editedData, updateData, autoCompleteList, userCanAddToList, horizontal, -}: Props) => { +}: Props) { + const isSingleSelect = typeof editedData === "string"; + const handleAddItem = (value: string) => { - let updatedList = [...editedData]; - updatedList.push(value); - updateData(updatedList); + if (isSingleSelect) { + updateData(value as T); + } else { + const updatedList = [...(editedData as string[]), value]; + updateData(updatedList as T); + } }; const handleRemoveItem = (idx: number) => { - let updatedList = [...editedData]; - updatedList.splice(idx, 1); - updateData(updatedList); + if (!isSingleSelect) { + const updatedList = [...(editedData as string[])]; + updatedList.splice(idx, 1); + updateData(updatedList as T); + } }; const handleAutoCompleteSelect = (data: AutoCompleteData) => { handleAddItem(data.value); }; - // remove previuosly selected option from list const newAutoCompleteList = autoCompleteList.length > UI_CONFIG.MAX_AUTOCOMPLETE_LENGTH_TO_FILTER ? autoCompleteList - : autoCompleteList.filter((item) => !editedData.includes(item.value)); + : autoCompleteList.filter((item) => + isSingleSelect + ? item.value !== editedData + : !(editedData as string[]).includes(item.value) + ); return ( <> - - {editedData?.map((speaker: string, idx: number) => { - return ( + {!isSingleSelect && + (editedData as string[]).map((item: string, idx: number) => ( - {speaker} + {item} handleRemoveItem(idx)} - aria-label="edit speaker" + aria-label={`remove ${name}`} icon={} /> - ); - })} + ))} ); -}; - -export const SingleSelectField = ({ - name, - editedData, - updateData, - autoCompleteList, -}: Props) => { - const handleSelect = (e: any) => { - const value = e.target.value; - if (!value.trim()) { - updateData([]); - return; - } - updateData([value]); - }; - const prevSelectedDataNotInList = () => { - let newListItems: AutoCompleteData[] = []; - if (!editedData.length) return newListItems; - const flattenedListData = autoCompleteList.map((item) => item.value); - const _newLitsItems = editedData.filter( - (item) => !flattenedListData.includes(item) - ); - _newLitsItems.forEach((item) => { - const slug = slugify(item); - newListItems.push({ slug, value: item }); - }); - return newListItems; - }; - - const newAutoCompleteList = autoCompleteList.concat( - prevSelectedDataNotInList() - ); - return ( - - ); -}; +} diff --git a/src/components/sideBarContentEdit/SidebarContentEdit.tsx b/src/components/sideBarContentEdit/SidebarContentEdit.tsx deleted file mode 100644 index 62a1e183..00000000 --- a/src/components/sideBarContentEdit/SidebarContentEdit.tsx +++ /dev/null @@ -1,242 +0,0 @@ -import { useGetMetadata } from "@/services/api/transcripts/useGetMetadata"; -import { getTimeLeftText } from "@/utils"; -import { Box, Button, Flex, Text } from "@chakra-ui/react"; -import Link from "next/link"; -import { ReactNode, useEffect, useState } from "react"; -import DatePicker from "react-datepicker"; -import "react-datepicker/dist/react-datepicker.css"; -import { MdOutlineAccessTimeFilled } from "react-icons/md"; -import jsonData from "../../../public/static/directoryMetadata.json"; -import { IDir, Review, Transcript, TranscriptContent } from "../../../types"; -import { - sideBarContentUpdateParams, - SideBarData, - SidebarSubType, -} from "../transcript"; -import { OnlySelectField, SingleSelectField } from "./SelectField"; -import styles from "./sidebarContentEdit.module.css"; -import TextField from "./TextField"; -import config from "@/config/config.json"; - -function extractDirFormat(input: Record = {}): IDir[] { - if (Object.keys(input).length === 0) return []; - - return Object.keys(input).map((key: string) => { - const child = input[key]; - return { - slug: key, - value: key, - nestDir: Object.keys(child).map((ck: string) => ({ - value: ck, - slug: `${key}/${ck}`, - nestDir: extractDirFormat(child[ck]), - })), - }; - }); -} - -const SidebarContentEdit = ({ - data, - claimedAt, - children, - sideBarData, - updater, - getUpdatedTranscript, - saveTranscript, -}: { - data: Transcript; - claimedAt: Review["createdAt"]; - children?: ReactNode; - sideBarData: SideBarData; - updater: >({ - data, - type, - name, - }: sideBarContentUpdateParams) => void; - getUpdatedTranscript: () => TranscriptContent; - saveTranscript: (updatedContent: TranscriptContent) => Promise; -}) => { - const [path, setPath] = useState(""); - const [initialCount, setInitialCount] = useState(1); - const { data: selectableListData } = useGetMetadata(); - const [directoryList, setDirectoryList] = useState([]); - const updateTitle = (newTitle: string) => { - const updatedTranscript = getUpdatedTranscript(); - updatedTranscript.title = newTitle; - saveTranscript(updatedTranscript); - - updater({ - data: newTitle, - type: "text", - name: "title", - }); - }; - - const updateSpeaker = (speakers: string[]) => { - const updatedTranscript = getUpdatedTranscript(); - updatedTranscript.speakers = speakers; - saveTranscript(updatedTranscript); - updater({ - data: speakers, - type: "list", - name: "speakers", - }); - }; - - useEffect(() => { - // we want the rootpath to load first before - if (initialCount < 2) { - setPath(`${data.content.loc ?? config.defaultDirectoryPath}`); - setInitialCount(2); - } - }, [data.content.loc, initialCount]); - - useEffect(() => { - if (jsonData) { - const directories = extractDirFormat(jsonData); - setDirectoryList(directories); - } - }, []); - - const updateDate = (date: Date) => { - const updatedTranscript = getUpdatedTranscript(); - updatedTranscript.date = date; - saveTranscript(updatedTranscript); - - updater({ data: date, type: "date", name: "date" }); - }; - const updateCategories = (categories: string[]) => { - const updatedTranscript = getUpdatedTranscript(); - updatedTranscript.categories = categories; - saveTranscript(updatedTranscript); - - updater({ - data: categories, - type: "list", - name: "categories", - }); - }; - const updateTags = (tags: string[]) => { - const updatedTranscript = getUpdatedTranscript(); - const lowerCaseTags = tags.map((tag) => tag.toLowerCase()); - updatedTranscript.tags = lowerCaseTags; - saveTranscript(updatedTranscript); - updater({ - data: lowerCaseTags, - type: "list", - name: "tags", - }); - }; - return ( - - - - - - - {getTimeLeftText(claimedAt)} - - - - Original Media - - - - - - - - Title - - - - - - Speakers - - - - - - Date of Recording - - - YYYY-MM-DD format - - - - - - - Categories - - - - - - - Tags - - - ( - - - What's this? - - - ) - - - - - {children} - - - ); -}; - -export default SidebarContentEdit; diff --git a/src/components/sideBarContentEdit/selectbox.tsx b/src/components/sideBarContentEdit/selectbox.tsx index f0de557e..4c1b625e 100644 --- a/src/components/sideBarContentEdit/selectbox.tsx +++ b/src/components/sideBarContentEdit/selectbox.tsx @@ -5,7 +5,6 @@ import { Flex, FormControl, Icon, - IconButton, Input, Modal, ModalBody, @@ -21,96 +20,19 @@ import { Text, useDisclosure, } from "@chakra-ui/react"; -import { useEffect, useRef, useState } from "react"; -import { BiCheck, BiX } from "react-icons/bi"; +import { useRef, useState } from "react"; import { FaSortDown } from "react-icons/fa"; import AutoComplete from "./autocomplete"; import type { AutoCompleteData, SelectEditState } from "./SelectField"; type SelectBoxProps = { - idx: number; - name: string; - handleUpdateEdit: (idx: number, name?: string) => void; - handleInputChange: (e: React.ChangeEvent) => void; - editState: SelectEditState; - autoCompleteList?: Array; - handleAutoCompleteSelect?: (e: any) => void; -}; - -const SelectBox = ({ - idx, - handleUpdateEdit, - handleInputChange, - editState, - name, - autoCompleteList, - handleAutoCompleteSelect, -}: SelectBoxProps) => { - const inputRef = useRef(null); - - useEffect(() => { - inputRef.current?.focus(); - }, []); - - return ( - <> - - - - - {autoCompleteList && handleAutoCompleteSelect && ( - - )} - - - handleUpdateEdit(idx, "add")} - aria-label="confirm speaker editing" - icon={} - /> - handleUpdateEdit(idx, "cancel")} - aria-label="reject speaker editing" - icon={} - /> - - - - - ); -}; - -export default SelectBox; - -type OnlySelectBoxProps = { idx: number; name: string; addItem?: (_x: string) => void; autoCompleteList: Array; handleAutoCompleteSelect: (data: AutoCompleteData) => void; + // This is for single selection + selectedValue?: string; }; type ConfirmModalState = { @@ -118,13 +40,14 @@ type ConfirmModalState = { data: string; }; -export const OnlySelectBox = ({ +export const SelectBox = ({ idx, name, addItem, autoCompleteList, handleAutoCompleteSelect, -}: OnlySelectBoxProps) => { + selectedValue, +}: SelectBoxProps) => { const inputRef = useRef(null); const { onClose, onOpen, isOpen } = useDisclosure(); const [confirmModal, setConfirmModal] = useState({ @@ -183,6 +106,7 @@ export const OnlySelectBox = ({ > - Add {name} + {selectedValue ? selectedValue : `Add ${name}`} diff --git a/src/components/tables/QueueTable.tsx b/src/components/tables/QueueTable.tsx index f4256e6b..edc3de67 100644 --- a/src/components/tables/QueueTable.tsx +++ b/src/components/tables/QueueTable.tsx @@ -1,11 +1,9 @@ -import { upstreamOwner } from "@/config/default"; import { useHasExceededMaxActiveReviews, useUserMultipleReviews, } from "@/services/api/reviews"; import { useArchiveTranscript, - useClaimTranscript, useTranscripts, } from "@/services/api/transcripts"; import { @@ -13,6 +11,7 @@ import { convertStringToArray, displaySatCoinImage, } from "@/utils"; +import { useGithub } from "@/services/api/github"; import { Button, CheckboxGroup, @@ -22,7 +21,6 @@ import { useToast, } from "@chakra-ui/react"; import { useQueryClient } from "@tanstack/react-query"; -import axios from "axios"; import { signIn, signOut, useSession } from "next-auth/react"; import Image from "next/image"; import { useRouter } from "next/router"; @@ -35,7 +33,7 @@ import React, { } from "react"; import { BiBookAdd } from "react-icons/bi"; import { Transcript } from "../../../types"; -import { SuggestModal } from "../modals/SuggestModal"; +import { SuggestModal } from "@/components/modals"; import BaseTable from "./BaseTable"; import Pagination from "./Pagination"; import { ArchiveButton } from "./TableItems"; @@ -115,7 +113,7 @@ const QueueTable = () => { onOpen: openSuggestModal, } = useDisclosure(); const router = useRouter(); - const claimTranscript = useClaimTranscript(); + const { claimTranscript } = useGithub(); const { data, isLoading, isError, refetch } = useTranscripts(currentPage); const hasExceededActiveReviewLimit = useHasExceededMaxActiveReviews( session?.user?.id @@ -168,60 +166,15 @@ const QueueTable = () => { }); return; } - if (session?.user?.id) { + if (session?.user?.id && transcript) { setSelectedTranscriptId(transcriptId); try { - // Fork repo - const forkResult = await axios.post("/api/github/fork"); - const owner = forkResult.data.owner.login; - - const env_owner = - process.env.NEXT_PUBLIC_VERCEL_ENV === "development" - ? forkResult.data.owner.login - : upstreamOwner; - - let branchUrl; - - if (transcript && transcript.transcriptUrl) { - const result = await axios.post("/api/github/newBranch", { - ghSourcePath: transcript.transcriptUrl, - owner, - env_owner, - }); - branchUrl = result.data.branchUrl; - } - - // Claim transcript - claimTranscript.mutate( - { userId: session.user.id, transcriptId, branchUrl }, - { - onSuccess: async (data) => { - try { - const reviewId = data.id; - if (!reviewId) { - throw new Error("failed to claim transcript"); - } - - if (data instanceof Error) { - await retryLoginAndClaim(transcriptId); - return; - } - if (multipleStatusData.length > 0) { - router.push(`/reviews/${data.id}`); - } else { - router.push(`/reviews/${data.id}?first_review=true`); - } - } catch (err) { - console.error(err); - } - }, - - onError: (err) => { - throw err; - }, - } - ); + await claimTranscript.mutateAsync({ + transcriptUrl: transcript.transcriptUrl, + transcriptId, + userId: session.user.id, + }); } catch (error: any) { // handles all errors from claiming process let errorTitle = error.message; diff --git a/src/components/transcript/components/StatusLabel.tsx b/src/components/transcript/components/StatusLabel.tsx new file mode 100644 index 00000000..512ba399 --- /dev/null +++ b/src/components/transcript/components/StatusLabel.tsx @@ -0,0 +1,59 @@ +import { + MdOutlineAccessTimeFilled, + MdCheckCircleOutline, +} from "react-icons/md"; +import { Box } from "@chakra-ui/react"; + +import { getTimeLeftText } from "@/utils"; +import { Review } from "../../../../types"; + +type Props = Pick; + +const formatTimeDifference = (date: Date) => { + const diffMs = Date.now() - new Date(date).getTime(); + const diffHours = diffMs / (1000 * 60 * 60); + + if (diffHours < 1) { + const diffMinutes = Math.floor(diffMs / (1000 * 60)); + return `Submitted ${diffMinutes} minutes ago`; + } else if (diffHours >= 24) { + const diffDays = Math.floor(diffHours / 24); + return `Submitted ${diffDays} days ago`; + } else { + return `Submitted ${Math.floor(diffHours)} hours ago`; + } +}; + +const StatusLabel = ({ createdAt, submittedAt }: Props) => { + const textColor = submittedAt ? "green.700" : "red.700"; + + return ( + + {submittedAt ? ( + <> + + + + {formatTimeDifference(new Date(submittedAt))} + + ) : ( + <> + + + + {getTimeLeftText(createdAt)} + + )} + + ); +}; + +export default StatusLabel; diff --git a/src/components/transcript/components/index.ts b/src/components/transcript/components/index.ts new file mode 100644 index 00000000..89d2040e --- /dev/null +++ b/src/components/transcript/components/index.ts @@ -0,0 +1 @@ +export { default as StatusLabel } from "./StatusLabel"; diff --git a/src/components/sideBarContentEdit/sidebarContentEdit.module.css b/src/components/transcript/datePicker.module.css similarity index 100% rename from src/components/sideBarContentEdit/sidebarContentEdit.module.css rename to src/components/transcript/datePicker.module.css diff --git a/src/components/transcript/index.tsx b/src/components/transcript/index.tsx index bd2fed81..1952e15a 100644 --- a/src/components/transcript/index.tsx +++ b/src/components/transcript/index.tsx @@ -1,349 +1,286 @@ -import SubmitTranscriptAlert from "@/components/alerts/SubmitTranscriptAlert"; -import EditTranscript from "@/components/editTranscript/EditTranscript"; -import type { TranscriptSubmitOptions } from "@/components/menus/SubmitTranscriptMenu"; -import ReviewGuidelinesModal from "@/components/modals/ReviewGuidelinesModal"; -import type { SubmitState } from "@/components/modals/SubmitTranscriptModal"; -import SubmitTranscriptModal from "@/components/modals/SubmitTranscriptModal"; -import SidebarContentEdit from "@/components/sideBarContentEdit/SidebarContentEdit"; -import config from "@/config/config.json"; -import { useSubmitReview } from "@/services/api/reviews/useSubmitReview"; -import { useUpdateTranscript } from "@/services/api/transcripts"; -import { dateFormatGeneral, formatDataForMetadata, getPRRepo } from "@/utils"; -import { compareTranscriptBetweenSave } from "@/utils/transcript"; -import { Flex, useDisclosure } from "@chakra-ui/react"; -import { useQueryClient } from "@tanstack/react-query"; -import axios, { AxiosError } from "axios"; -import { useSession } from "next-auth/react"; +import { useMemo, useState } from "react"; +import { + Box, + Button, + Flex, + Text, + Tooltip, + useDisclosure, +} from "@chakra-ui/react"; +import Link from "next/link"; import { useRouter } from "next/router"; -import { useEffect, useRef, useState } from "react"; -import MdEditor from "react-markdown-editor-lite"; +import DatePicker from "react-datepicker"; +import "react-datepicker/dist/react-datepicker.css"; +import styles from "./datePicker.module.css"; +import { FaBook } from "react-icons/fa"; +//@ts-ignore +import { SlateTranscriptEditor } from "slate-transcript-editor"; + +import { + ReviewGuidelinesModal, + SubmitTranscriptModal, + RestoreOriginalModal, + SelectSpeakerModal, +} from "@/components/modals"; +import { useGetMetadata } from "@/services/api/transcripts/useGetMetadata"; +import SubmitTranscriptMenu, { + TranscriptSubmitOptions, +} from "@/components/menus/SubmitTranscriptMenu"; +import { compareTranscriptBetweenSave } from "@/utils/transcript"; +import { getPRRepo } from "@/utils"; +import { useHasPermission } from "@/hooks/useHasPermissions"; +import { useGithub } from "@/services/api/github"; import type { - SaveToGHData, - TranscriptContent, - UserReviewData, + SlateNode, + TranscriptMetadata, + TranscriptReview, } from "../../../types"; +import { SelectField } from "../sideBarContentEdit/SelectField"; +import TextField from "../sideBarContentEdit/TextField"; +import { StatusLabel } from "./components"; -const defaultSubmitState = { - stepIdx: 0, - steps: ["saving transcript to review", "fork and create pr"], - isLoading: false, - isError: false, - isModalOpen: false, - prResult: null, - err: null, -}; - -export type SideBarData = { - list: Record & { - speakers: string[]; - categories: string[]; - tags: string[]; - }; - loc: Record & { - loc: string; - }; - text: Record & { - title: string; - }; - date: Record & { - date: Date | null; - }; -}; - -export type SidebarType = keyof SideBarData; - -export type SidebarSubType = keyof SideBarData[T]; - -export type sideBarContentUpdateParams = { - data: string | string[] | Date | null; - type: T; - name: K; -}; - -const getTranscriptMetadata = (content: TranscriptContent) => { - // body, media, and transcript_by are omitted because they are not needed when constructing metadata - // eslint-disable-next-line no-unused-vars - const { body, media, transcript_by, ...metadata } = content; - const { - speakers, - categories, - tags, - title = "", - loc = "", - date, - ...arbitraryMetadata - } = metadata; - const data: SideBarData = { - list: { - speakers, - categories, - tags, - }, - text: { - title, - }, - loc: { - loc, - }, - date: { - date: date ? new Date(date) : null, - }, - }; - - // Iterating over the rest content in order to handle arbitrary fields which can get lost otherwise - for (const field of Object.keys(arbitraryMetadata)) { - const fieldValue = arbitraryMetadata[field]; - - if (Array.isArray(field)) { - data.list[field] = field; - continue; - } - - if (typeof fieldValue === "string") { - data.text[field] = fieldValue; - continue; - } - - if (fieldValue instanceof Date) { - data.date[field] = fieldValue; - continue; - } - } - - return data; -}; - -const Transcript = ({ reviewData }: { reviewData: UserReviewData }) => { - const transcriptData = reviewData.transcript; +const TranscriptEditor = ({ reviewData }: { reviewData: TranscriptReview }) => { const router = useRouter(); - const queryClient = useQueryClient(); - const { mutateAsync } = useUpdateTranscript(); - const { mutateAsync: asyncSubmitReview } = useSubmitReview(); - const { data: userSession } = useSession(); - const [prRepo, setPrRepo] = useState(getPRRepo()); - const isFirstTime = router.query?.first_review === "true" ? true : false; - - const [editedData, setEditedData] = useState( - transcriptData.content?.body ?? "" + const { data: allMetadata } = useGetMetadata(); + const { saveProgress, submitReview } = useGithub(); + const [title, setTitle] = useState(reviewData.transcript.metadata.title); + const [tags, setTags] = useState(reviewData.transcript.metadata.tags); + const [date, setDate] = useState( + new Date(reviewData.transcript.metadata.date) ); - const [sideBarData, setSideBarData] = useState(() => - getTranscriptMetadata(transcriptData.content) - ); - - const sideBarContentUpdater = < - T extends keyof SideBarData, - K extends SidebarSubType, - >({ - name, - data, - type, - }: sideBarContentUpdateParams) => { - setSideBarData((prev) => ({ - ...prev, - [type]: { - ...prev[type], - [name]: data, - }, - })); - }; + const [isContentModified, setIsContentIsModified] = useState(false); + const [prRepo, setPrRepo] = useState(getPRRepo()); - const [submitState, setSubmitState] = - useState(defaultSubmitState); - const editorRef = useRef(null); - const { isOpen, onOpen, onClose } = useDisclosure(); - const transcriptId = reviewData.transcript.id; const { - isOpen: guidelinesIsOpen, - onOpen: guidelinesOnOpen, - onClose: guidelinesOnClose, + isOpen: restoreModalIsOpen, + onOpen: openRestoreModal, + onClose: closeRestoreModal, } = useDisclosure(); - const restoreOriginal = () => { - if (!transcriptData?.originalContent) return; - editorRef.current?.setText(transcriptData.originalContent?.body); - setSideBarData(() => getTranscriptMetadata(transcriptData.originalContent)); - setEditedData(transcriptData.originalContent.body ?? ""); - }; - - const getUpdatedContent = () => { - const { list, text, loc, date } = sideBarData; - const content = transcriptData.content; - const updatedContent = { - ...content, - ...list, - ...text, - ...loc, - ...date, - body: editedData, - }; - - return updatedContent; - }; - - const ghBranchUrl = reviewData.branchUrl; - const ghSourcePath = transcriptData.transcriptUrl; - - useEffect(() => { - if (isFirstTime) { - guidelinesOnOpen(); - } - }, [isFirstTime]); + const { + isOpen: submitModalIsOpen, + onOpen: openSubmitModal, + onClose: closeSubmitModal, + } = useDisclosure(); + const { + isOpen: guidelinesIsOpen, + onOpen: openGuidelines, + onClose: closeGuidelines, + } = useDisclosure({ defaultIsOpen: router.query?.first_review === "true" }); - const saveTranscript = async ( - updatedContent: TranscriptContent, - onSuccessCallback?: () => void, - onNoEditsCallback?: () => void - ) => { - // eslint-disable-next-line no-unused-vars - const { loc, title, date, body, media, transcript_by, ...restContent } = - updatedContent; - // create an awaitable promise for mutation + const canSubmitToOwnRepo = useHasPermission("submitToOwnRepo"); + const reviewSubmissionDisabled = + !!reviewData.branchUrl && !!reviewData.pr_url; - const newImplData: SaveToGHData = { - directoryPath: loc?.trim() ?? "", - fileName: formatDataForMetadata(title), - url: transcriptData.content.media, - date: date && dateFormatGeneral(date, true), - transcribedText: body, - transcript_by: formatDataForMetadata( - userSession?.user?.githubUsername ?? "" - ), - ghSourcePath, - ghBranchUrl, - reviewId: reviewData.id, - ...restContent, + const metadata: TranscriptMetadata = useMemo(() => { + return { + ...reviewData.transcript.metadata, + title, + tags, + date, }; + }, [reviewData.transcript.metadata, title, tags, date]); - const isPreviousHash = compareTranscriptBetweenSave(newImplData); + const saveTranscript = async (edits: SlateNode[], speakers: string[]) => { + // Compare between saves to avoid empty commits + const isPreviousHash = compareTranscriptBetweenSave({ + transcriptSlate: edits, + metadata: { + ...metadata, + speakers, + }, + }); if (isPreviousHash) { - onNoEditsCallback?.(); return; } - try { - await mutateAsync( - { content: updatedContent, transcriptId, newImplData }, - { - onSettled(data) { - if (data?.statusText === "OK") { - queryClient.invalidateQueries(["transcript", transcriptId]); - queryClient.invalidateQueries(["review", reviewData.id]); - } - }, - } - ); - onSuccessCallback?.(); - } catch (error) { - throw error; - } + await saveProgress.mutateAsync({ + transcriptSlate: edits, + transcriptUrl: reviewData.transcript.url, + branchUrl: reviewData.branchUrl, + metadata: { + ...metadata, + speakers, + }, + }); + setIsContentIsModified(false); }; - const handleSubmit = async () => { - const updatedContent = getUpdatedContent(); - // eslint-disable-next-line no-unused-vars - const { loc, title, date, media, transcript_by, ...restContent } = - updatedContent; - setSubmitState((prev) => ({ ...prev, isLoading: true, isModalOpen: true })); - try { - // save transcript - await saveTranscript(updatedContent); - setSubmitState((prev) => ({ ...prev, stepIdx: 1 })); - const oldDirectoryList = localStorage.getItem("oldDirectoryList"); - const directoryList = oldDirectoryList - ? JSON.parse(oldDirectoryList) - : []; + const updateTitle = (title: string) => { + setTitle(title); + setIsContentIsModified(true); + }; - // fork and create pr - const prResult = await axios.post("/api/github/pr", { - directoryPath: loc?.trim() ? loc.trim() : config.defaultDirectoryPath, - oldDirectoryList: directoryList, - fileName: formatDataForMetadata(title), - url: transcriptData?.content.media, - prUrl: reviewData?.pr_url, - date: date && dateFormatGeneral(date, true), - transcribedText: editedData, - transcript_by: formatDataForMetadata( - userSession?.user?.githubUsername ?? "" - ), - prRepo, - ghSourcePath, - ghBranchUrl, - ...restContent, - }); - setSubmitState((prev) => ({ ...prev, stepIdx: 2, prResult })); - localStorage.removeItem("oldDirectoryList"); + const updateTags = (tags: string[]) => { + const lowerCaseTags = tags.map((tag) => tag.toLowerCase()); + setTags(lowerCaseTags); + setIsContentIsModified(true); + }; - // update pr_url - await asyncSubmitReview( - { pr_url: prResult?.data?.html_url, reviewId: reviewData.id }, - { - onSettled(data) { - if (data?.statusText === "OK") { - queryClient.invalidateQueries(["review", reviewData.id]); - } - }, - } - ); - } catch (error) { - const err = error as AxiosError<{ message: string }>; - setSubmitState((prev) => ({ - ...prev, - isLoading: false, - isError: true, - err, - })); - } finally { - setSubmitState((prev) => ({ ...prev, isLoading: false })); - queryClient.invalidateQueries(["review", reviewData.id]); - localStorage.removeItem("oldDirectoryList"); - } + const updateDate = (date: Date) => { + setDate(date); + setIsContentIsModified(true); }; - const onExitModal = () => { - setSubmitState(defaultSubmitState); - router.push("/"); + const restoreOriginalContent = () => { + // TODO: implement logic to restore original content + closeRestoreModal(); + }; + + const handleSubmit = async () => { + if (reviewData?.pr_url) { + // Users cannot re-submit + // If there is already a Pull Request for this submission, + // then it is automatically updated every time the user saves + // their edits because every save is a new commit on the PR. + // TODO: programamtically request a new review from the evaluator + } + // TODO: save before submit + submitReview.mutateAsync({ + reviewId: reviewData.id, + targetRepository: prRepo, + transcriptUrl: reviewData.transcript.url, + branchUrl: reviewData.branchUrl, + metadata, + }); }; return ( <> - - {transcriptData && ( - - )} - + + + + + + + + + + + + + + {canSubmitToOwnRepo && ( + <> + + + )} + + + + + + + + Title + + + + + + Date of Recording + + + YYYY-MM-DD format + + + + + + + + Tags + + + ( + + + What's this? + + + ) + + + + + + - - + ); }; -export default Transcript; +export default TranscriptEditor; diff --git a/src/config/default.ts b/src/config/default.ts index 86ba3884..31fedfa6 100644 --- a/src/config/default.ts +++ b/src/config/default.ts @@ -35,3 +35,4 @@ export const ReviewStatus = { export const upstreamOwner = "bitcointranscripts"; export const upstreamRepo = "bitcointranscripts"; +export const upstreamMetadataRepo = "bitcointranscripts-metadata" diff --git a/src/pages/api/github/fork.ts b/src/pages/api/github/fork.ts index 06e5e8fb..e5633cb8 100644 --- a/src/pages/api/github/fork.ts +++ b/src/pages/api/github/fork.ts @@ -1,17 +1,7 @@ import type { NextApiRequest, NextApiResponse } from "next"; import { Octokit } from "@octokit/core"; -import { upstreamOwner, upstreamRepo } from "@/config/default"; -import { auth } from "../auth/[...nextauth]"; - -export async function createFork(octokit: InstanceType) { - // Fork the repository - const forkResult = await octokit.request("POST /repos/{owner}/{repo}/forks", { - owner: upstreamOwner, - repo: upstreamRepo, - }); - return forkResult; -} +import { auth } from "../auth/[...nextauth]"; export default async function handler( req: NextApiRequest, @@ -23,13 +13,18 @@ export default async function handler( return res.status(401).json({ message: "Unauthorized" }); } + const { owner, repo } = req.body; + // Initialize Octokit with the user's access token const octokit = new Octokit({ auth: session.accessToken }); try { - // Call the createForkAndPR function - const forkResult = await createFork(octokit); - res.status(200).json(forkResult.data); + // Fork the repository + const result = await octokit.request("POST /repos/{owner}/{repo}/forks", { + owner, + repo, + }); + res.status(200).json(result.data); } catch (error) { console.error("fork failed"); console.error(error); diff --git a/src/pages/api/github/newBranch.ts b/src/pages/api/github/newBranch.ts index eab0366b..dadec107 100644 --- a/src/pages/api/github/newBranch.ts +++ b/src/pages/api/github/newBranch.ts @@ -1,68 +1,53 @@ -import { upstreamRepo } from "@/config/default"; -import { constructGithubBranchApiUrl, resolveGHApiUrl } from "@/utils/github"; +import { upstreamOwner } from "@/config/default"; import { Octokit } from "@octokit/core"; import { NextApiRequest, NextApiResponse } from "next"; import { auth } from "../auth/[...nextauth]"; type NewBranchArgs = { octokit: InstanceType; - ghSourcePath: string; + upstreamRepo: string; + baseBranch: string; + branchName: string; owner: string; - env_owner: string; }; export async function createNewBranch({ octokit, - ghSourcePath, + upstreamRepo, + baseBranch, + branchName, owner, - env_owner, }: NewBranchArgs) { - const { srcBranch, srcRepo, srcDirPath, filePath } = - resolveGHApiUrl(ghSourcePath); + // When in development mode, we use the current user's repository as the + // base repository for all github operations + const repositoryOwner = + process.env.NEXT_PUBLIC_VERCEL_ENV === "development" + ? owner + : upstreamOwner; - let baseRefSha = ""; // Get baseBranch sha - try { - const baseBranch = await octokit.request( - "GET /repos/{owner}/{repo}/git/ref/{ref}", - { - owner: env_owner, - repo: srcRepo, - ref: `heads/${srcBranch}`, - } - ); - baseRefSha = baseBranch.data.object.sha; - } catch (err: any) { - throw new Error(err?.message ?? "Cannot find base branch"); - } + const baseRefSha = await octokit + .request("GET /repos/{owner}/{repo}/git/ref/{ref}", { + owner: repositoryOwner, + repo: upstreamRepo, + ref: `heads/${baseBranch}`, + }) + .then((result) => result.data.object.sha) + .catch((err: any) => { + throw new Error(err?.message ?? "Cannot find base branch"); + }); // Create new branch - const timeInSeconds = Math.floor(Date.now() / 1000); - const baseDirName = srcDirPath.replaceAll("/", "--"); - const newBranchName = `${timeInSeconds}-${baseDirName}`; - - const newBranch = await octokit + return await octokit .request("POST /repos/{owner}/{repo}/git/refs", { owner, repo: upstreamRepo, - ref: `refs/heads/${newBranchName}`, + ref: `refs/heads/${branchName}`, sha: baseRefSha, }) - .then(async () => { - // construct branchUrl, used to populate branchUrl column - const newBranchUrl = constructGithubBranchApiUrl({ - owner, - filePath, - newBranchName, - }); - return newBranchUrl; - }) - .catch((_err) => { - throw new Error( - _err.message ? _err.message : "Error creating new branch" - ); + .catch((err) => { + throw new Error(err?.message ?? "Error creating new branch"); }); - return newBranch; } export default async function handler( @@ -75,23 +60,24 @@ export default async function handler( return res.status(401).json({ message: "Unauthorized" }); } - const { ghSourcePath, owner, env_owner } = req.body; + const { upstreamRepo, baseBranch, branchName } = req.body; // Initialize Octokit with the user's access token const octokit = new Octokit({ auth: session.accessToken }); try { // Call the createNewBranch function - const branchUrl = await createNewBranch({ + const result = await createNewBranch({ octokit, - ghSourcePath, - owner, - env_owner, + upstreamRepo, + baseBranch, + branchName, + owner: session.user.githubUsername, }); res.status(200).json({ message: "succesfully created a new branch", - branchUrl, + ...result, }); } catch (error: any) { res.status(500).json({ diff --git a/src/pages/api/github/pr.ts b/src/pages/api/github/pr.ts index 4f327101..cd0b6070 100644 --- a/src/pages/api/github/pr.ts +++ b/src/pages/api/github/pr.ts @@ -1,396 +1,9 @@ -import type { TranscriptSubmitOptions } from "@/components/menus/SubmitTranscriptMenu"; -import { AxiosError } from "axios"; - -import config from "@/config/config.json"; +import type { NextApiRequest, NextApiResponse } from "next"; import { Octokit } from "@octokit/core"; -import { - deriveFileSlug, - extractPullNumber, - Metadata, - newIndexFile, -} from "../../../utils"; -import { - deleteIndexMdIfDirectoryEmpty, - ensureIndexMdExists, - resolveGHApiUrl, - syncForkWithUpstream, -} from "../../../utils/github"; +import { createPullRequest } from "@/utils/github"; import { auth } from "../auth/[...nextauth]"; -import type { NextApiRequest, NextApiResponse } from "next"; -import { upstreamOwner, upstreamRepo } from "@/config/default"; - -async function pullAndUpdatedPR( - octokit: InstanceType, - directoryPath: string, - fileName: string, - transcribedText: string, - metadata: Metadata, - pull_number: number, - prRepo: TranscriptSubmitOptions, - oldDirectoryList: string[] -) { - // To get the owner details - const forkResult = await octokit.request("POST /repos/{owner}/{repo}/forks", { - owner: upstreamOwner, - repo: upstreamRepo, - }); - const forkOwner = forkResult.data.owner.login; - const forkRepo = upstreamRepo; - const owner = prRepo === "user" ? forkOwner : upstreamOwner; - const repo = prRepo === "user" ? forkRepo : upstreamRepo; - - await syncForkWithUpstream({ - octokit, - upstreamOwner, - upstreamRepo, - forkOwner, - forkRepo, - branch: forkResult.data.default_branch, - }); - - // Fetch the pull request details - const pullDetails = await octokit - .request("GET /repos/:owner/:repo/pulls/:pull_number", { - owner, - repo, - pull_number, - }) - .then((data) => data) - .catch((err) => { - console.error(err); - throw new Error("Error in fetching the pull request details"); - }); - - if (pullDetails?.data?.merged) { - throw new Error("Your transcript has been merged!"); - } - - const prBranch = pullDetails.data.head.ref; - - // Ensure _index.md exists in each directory level - await ensureIndexMdExists(octokit, forkOwner, repo, directoryPath, prBranch); - - // Construct the new file path - const newFilePath = `${directoryPath}/${deriveFileSlug(fileName)}.md`; - let oldFilePath; - let oldFileSha; - // loop through the old directory list and get the one that doesn't return a 404 - for (const directory of oldDirectoryList) { - try { - const response = await octokit.request( - "GET /repos/{owner}/{repo}/contents/{path}", - { - owner: forkOwner, - repo, - path: `${directory?.trim()}/${deriveFileSlug(fileName)}.md`, - ref: prBranch, - } - ); - oldFilePath = `${directory?.trim()}/${deriveFileSlug(fileName)}.md`; - const dataWithSha = response.data as { sha: string }; - oldFileSha = dataWithSha.sha; - break; // break out of the loop if the file is found - } catch (error) { - if ((error as AxiosError).status !== 404) { - console.error("err from oldDir", error); - throw error; // If the old file doesn't exist, ignore the error; otherwise, rethrow - } - // If the file doesn't exist, continue to the next directory - } - } - - // If the old directory path is provided and different from the new directory path, handle the file move - if (oldFilePath && oldFileSha) { - // Delete the old file - try { - // Delete the old file using the SHA - await octokit.request("DELETE /repos/{owner}/{repo}/contents/{path}", { - owner: forkOwner, - repo, - path: oldFilePath, - message: `Remove outdated file in old directory path for ${fileName}`, - sha: oldFileSha, - branch: prBranch, - }); - - // check if the old directory is empty - const oldDirectory = oldFilePath.substring( - 0, - oldFilePath.lastIndexOf("/") - ); - // Delete the old _index.md file if the directory is now empty - await deleteIndexMdIfDirectoryEmpty( - octokit, - forkOwner, - repo, - oldDirectory, - prBranch, - deriveFileSlug(fileName) + ".md" - ); - } catch (error) { - console.error(error); - if ((error as AxiosError).status !== 404) { - console.error(error); - throw error; // If the old file doesn't exist, ignore the error; otherwise, rethrow - } - } - } - - const fileContent = Buffer.from(`${metadata}\n${transcribedText}\n`).toString( - "base64" - ); - let finalResult: any; - - // Only update the file in the new directory path if the old directory path is not provided - // or if it's the same as the new directory path - // Get the SHA of the current file to update - try { - const { data: fileData } = await octokit.request( - "GET /repos/{owner}/{repo}/contents/{path}", - { - owner: forkOwner, - repo, - path: newFilePath, - ref: prBranch, - } - ); - const dataWithSha = fileData as { sha: string }; - const fileSha = dataWithSha.sha; // Get the SHA of the existing file - - // Update the file with the new content - finalResult = await octokit.request( - "PUT /repos/{owner}/{repo}/contents/{path}", - { - owner: forkOwner, - repo, - path: newFilePath, - message: `Updated ${fileName}`, - content: fileContent, - branch: prBranch, - sha: fileSha, // Provide the SHA of the existing for the update - } - ); - - if (finalResult.status < 200 || finalResult.status > 299) { - throw new Error("Error updating the file content"); - } - } catch (error) { - // If the file doesn't exist, it needs to be created instead of updated - if ((error as AxiosError).status === 404) { - // Update or create the file in the new directory path - finalResult = await octokit.request( - "PUT /repos/{owner}/{repo}/contents/{path}", - { - owner: forkOwner, - repo, - path: newFilePath, - message: `Updated ${fileName}`, - content: fileContent, - branch: prBranch, - } - ); - if (finalResult.status < 200 || finalResult.status > 299) { - throw new Error("Error updating the file content"); - } - } else { - console.error(error); - throw new Error("Error updating the file content"); - } - } - - if (oldFilePath !== newFilePath) { - // update the pr title - const prTitle = `Add ${deriveFileSlug(fileName)} to ${directoryPath}`; - const prDescription = `This PR adds [${fileName}](${metadata.source}) transcript to the ${directoryPath} directory.`; - const prResult = await octokit.request( - "PATCH /repos/{owner}/{repo}/pulls/{pull_number}", - { - owner, - repo, - pull_number, - title: prTitle, - body: prDescription, - } - ); - if (prResult.status < 200 || prResult.status > 299) { - throw new Error("Error updating pull request title"); - } - } - - return { - data: { - ...finalResult.data, - html_url: pullDetails?.data?.html_url, - }, - }; -} - -// function for creating a PR and Forking -async function createForkAndPR( - octokit: InstanceType, - directoryPath: string, - fileName: string, - transcribedText: string, - metadata: Metadata, - prRepo: TranscriptSubmitOptions -) { - const directoryName = directoryPath.split("/").slice(-1)[0]; - // Fork the repository - const forkResult = await octokit.request("POST /repos/{owner}/{repo}/forks", { - owner: upstreamOwner, - repo: upstreamRepo, - }); - if (forkResult.status < 200 || forkResult.status > 299) { - throw new Error("Error forking the repository"); - } - const forkOwner = forkResult.data.owner.login; - const forkRepo = upstreamRepo; - const baseBranchName = forkResult.data.default_branch; - - // await syncForkWithUpstream({ - // octokit, - // upstreamOwner, - // upstreamRepo, - // forkOwner, - // forkRepo, - // branch: baseBranchName, - // }); - - // recursion, run through path delimited by `/` and create _index.md file if it doesn't exist - async function checkDirAndInitializeIndexFile( - path: string, - branch: string, - currentLevelIdx = 0 - ) { - let pathLevels = path.split("/"); - if (pathLevels.length > config.maximum_nested_directory_depth) { - throw new Error("maximum nested directory depth reached"); - } - const topPathLevel = pathLevels[currentLevelIdx]; - if (!topPathLevel) return; - const currentDirPath = pathLevels.slice(0, currentLevelIdx + 1).join("/"); - - // Check if _index.md exists in file - const pathHasIndexFile = await octokit - .request("GET /repos/:owner/:repo/contents/:path", { - owner: forkOwner, - repo: forkRepo, - path: `${currentDirPath}/_index.md`, - branch, - }) - .then((_data) => true) - .catch((err) => { - if (err?.status === 404) { - return false; - } - throw new Error("Error checking if _index.md exists"); - }); - - // Create new _index.md file in given path on the branch - if (!pathHasIndexFile) { - const indexFile = newIndexFile(topPathLevel); - const indexContent = Buffer.from(indexFile).toString("base64"); - await octokit - .request("PUT /repos/:owner/:repo/contents/:path", { - owner: forkOwner, - repo: forkRepo, - path: `${currentDirPath}/_index.md`, - message: `Initialised _index.md file in ${topPathLevel} directory`, - content: indexContent, - branch, - }) - .then() - .catch((_err) => { - throw new Error("Error creating _index.md file"); - }); - } - await checkDirAndInitializeIndexFile(path, branch, currentLevelIdx + 1); - } - - const baseBranch = await octokit.request( - "GET /repos/{owner}/{repo}/git/ref/{ref}", - { - owner: forkOwner, - repo: forkRepo, - ref: `heads/${baseBranchName}`, - } - ); - - // Create new branch - const timeInSeconds = Math.floor(Date.now() / 1000); - const newBranchName = `${timeInSeconds}-${directoryName}`; - const baseRefSha = baseBranch.data.object.sha; - // check condition for aa pull_number - await octokit - .request("POST /repos/{owner}/{repo}/git/refs", { - owner: forkOwner, - repo: forkRepo, - ref: `refs/heads/${newBranchName}`, - sha: baseRefSha, - }) - .then() - .catch((_err) => { - throw new Error("Error creating new branch"); - }); - - // Create the file to be inserted - const transcriptData = `${metadata.toString()}\n${transcribedText}\n`; - const fileContent = Buffer.from(transcriptData).toString("base64"); - - await checkDirAndInitializeIndexFile(directoryPath, newBranchName); - - // Create new file on the branch - // const _trimmedFileName = fileName.trim(); - const fileSlug = deriveFileSlug(fileName); - - let fileToUpdateSha = ""; - await octokit - .request("GET /repos/{owner}/{repo}/contents/{path}", { - owner: forkOwner, - repo: forkRepo, - path: `${directoryPath}/${fileSlug}.md`, - ref: newBranchName, - }) - .then((res) => { - const data = res.data as { sha: string }; - fileToUpdateSha = data.sha; - }) - .catch((err) => {}); - - await octokit - .request("PUT /repos/:owner/:repo/contents/:path", { - owner: forkOwner, - repo: forkRepo, - path: `${directoryPath}/${fileSlug}.md`, - message: `Added "${metadata.fileTitle}" transcript submitted by ${forkOwner}`, - content: fileContent, - branch: newBranchName, - sha: fileToUpdateSha || undefined, - }) - .then() - .catch((_err) => { - throw new Error("Error creating new file"); - }); - - // Create a pull request - const prTitle = `Add ${fileSlug} to ${directoryPath}`; - const prDescription = `This PR adds [${fileName}](${metadata.source}) transcript to the ${directoryPath} directory.`; - const prResult = await octokit.request("POST /repos/{owner}/{repo}/pulls", { - owner: prRepo === "user" ? forkOwner : upstreamOwner, // update to upstreamOwner once tested - repo: prRepo === "user" ? forkRepo : upstreamRepo, - title: prTitle, - body: prDescription, - head: `${forkOwner}:${newBranchName}`, - base: baseBranchName, - }); - if (prResult.status < 200 || prResult.status > 299) { - throw new Error("Error creating pull request"); - } - return prResult; -} - export default async function handler( req: NextApiRequest, res: NextApiResponse @@ -404,101 +17,25 @@ export default async function handler( // Initialize Octokit with the user's access token const octokit = new Octokit({ auth: session.accessToken }); - // Read directory path and fileName from the request - const { - directoryPath, - oldDirectoryList, - fileName, - url, - date, - tags, - speakers, - categories, - transcribedText, - transcript_by, - prRepo, - prUrl, - ghSourcePath, - ghBranchUrl, - ...otherMetadata - } = req.body; - const pull_number = extractPullNumber(prUrl || ""); + const { owner, repo, title, body, head, base } = req.body; + try { - // Create metadata - const newMetadata = new Metadata({ - fileTitle: fileName, - transcript_by: transcript_by, - url, - date, - tags, - speakers, - categories, - ...otherMetadata, + const prResult = await createPullRequest({ + octokit, + owner, + repo, + title, + body, + head, + base, }); - if (ghBranchUrl) { - // we are already saving to a branch and the branch has a pr no need to create a pr - if (prUrl) { - return res.status(200).json({ html_url: prUrl }); - } - - const { fileNameWithoutExtension, srcBranch } = - resolveGHApiUrl(ghSourcePath); - const { - srcOwner: owner, - srcRepo: repo, - srcBranch: branch, - srcDirPath: dir, - } = resolveGHApiUrl(ghBranchUrl); - - const prTitle = `Add ${fileNameWithoutExtension} review to ${dir}`; - const prDescription = `This PR adds [${fileNameWithoutExtension}](${newMetadata.source}) transcript review to the ${dir} directory.`; - const prResult = await octokit.request( - "POST /repos/{owner}/{repo}/pulls", - { - owner: prRepo === "user" ? owner : upstreamOwner, // update to upstreamOwner once tested - repo: prRepo === "user" ? repo : upstreamRepo, - title: prTitle, - body: prDescription, - head: `${owner}:${branch}`, - base: srcBranch, - } - ); - if (prResult.status < 200 || prResult.status > 299) { - throw new Error("Error creating pull request"); - } - return res.status(200).json(prResult.data); - } - if (!pull_number) { - // Call the createForkAndPR function - const prResult = await createForkAndPR( - octokit, - directoryPath, - fileName, - transcribedText, - newMetadata, - prRepo - ); - // Return the result - res.status(200).json(prResult.data); - } else { - const updatedPR = await pullAndUpdatedPR( - octokit, - directoryPath, - fileName, - transcribedText, - newMetadata, - +pull_number, - prRepo, - oldDirectoryList - ); - res.status(200).json(updatedPR.data); - } + return res.status(200).json(prResult.data); } catch (error: any) { console.error(error); res.status(500).json({ message: - error?.message ?? "Error occurred while creating the fork and PR", + error?.message ?? "Error occurred while creating the Pull Request", }); } } diff --git a/src/pages/api/github/read.ts b/src/pages/api/github/read.ts new file mode 100644 index 00000000..1a022816 --- /dev/null +++ b/src/pages/api/github/read.ts @@ -0,0 +1,38 @@ +import type { NextApiRequest, NextApiResponse } from "next"; +import axios from "axios"; + +import { auth } from "../auth/[...nextauth]"; + +async function handler(req: NextApiRequest, res: NextApiResponse) { + if (req.method !== "POST") { + return res.status(405).json({ message: "Method Not Allowed" }); + } + + // Authenticate the session and retrieve the access token + const session = await auth(req, res); + if (!session || !session.accessToken || !session.user?.githubUsername) { + return res.status(401).json({ message: "Unauthorized" }); + } + + const { branchUrl } = req.body; + if (typeof branchUrl !== "string") { + return res.status(400).json({ message: "Invalid request body" }); + } + + try { + const response = await axios.get(branchUrl, { + headers: { + Accept: "application/vnd.github.v3.raw", + // Use the GitHub access token for authenticated GitHub requests + Authorization: `token ${session.accessToken}`, + }, + }); + res.status(200).json({ content: response.data }); + } catch (error: any) { + res + .status(error.response.status) + .json({ message: "Failed to fetch GitHub file content" }); + } +} + +export default handler; diff --git a/src/pages/api/github/save.ts b/src/pages/api/github/save.ts index 1298a61c..43724835 100644 --- a/src/pages/api/github/save.ts +++ b/src/pages/api/github/save.ts @@ -1,149 +1,19 @@ import type { NextApiRequest, NextApiResponse } from "next"; import { Octokit } from "@octokit/core"; -import { Metadata } from "@/utils"; -import { createFork } from "./fork"; + +import { getFileSha, updateOrCreateFile } from "@/utils/github"; import { auth } from "../auth/[...nextauth]"; -import { Session } from "next-auth"; -import { resolveGHApiUrl } from "@/utils/github"; -import { createNewBranch } from "./newBranch"; -import { upstreamOwner, upstreamRepo } from "@/config/default"; -import endpoints from "@/services/api/endpoints"; -import axios from "axios"; -type SaveEditProps = { - octokit: InstanceType; - transcriptData: { - metadata: Metadata; - body: string; - }; - ghSourcePath: string; - ghBranchUrl?: string; - directoryPath: string; - reviewId: number; - session: Session; +export const config = { + api: { + bodyParser: { + // when saving dpe format we need + // bigger limit than the default 1mb + sizeLimit: "10mb", + }, + }, }; -// this save function handles only the new implementation -async function saveEdits({ - octokit, - transcriptData, - ghSourcePath, - ghBranchUrl, - directoryPath, - reviewId, - session, -}: SaveEditProps) { - const forkResult = await createFork(octokit).catch((err) => { - throw new Error("Repo fork failed"); - }); - - const env_owner = - process.env.NEXT_PUBLIC_VERCEL_ENV === "development" - ? forkResult.data.owner.login - : upstreamOwner; - - const owner = forkResult.data.owner.login; - - const { fileName, filePath, srcDirPath, srcRepo } = - resolveGHApiUrl(ghSourcePath); - - const directoryName = srcDirPath; - const transcriptToSave = `${transcriptData.metadata.toString()}${ - transcriptData.body - }`; - - const ghBranchData = ghBranchUrl ? resolveGHApiUrl(ghBranchUrl) : null; - let ghBranchName = ghBranchData?.srcBranch; - - if (!ghBranchUrl) { - // create new branch and update the branchUrl column in db - await createNewBranch({ - octokit, - ghSourcePath, - owner, - env_owner, - }) - .then(async (branchUrl) => { - // update branchUrl in db - const updateReviewEndpoint = `${ - process.env.NEXT_PUBLIC_APP_QUEUE_BASE_URL - }/${endpoints.REVIEW_BY_ID(reviewId)}`; - - await axios - .put( - updateReviewEndpoint, - { - branchUrl, - }, - { - headers: { - Authorization: `Bearer ${session!.user!.jwt}`, - }, - } - ) - .then((res) => { - if (res.status < 200 || res.status > 299) { - throw new Error("Unable to save branchUrl to db"); - } - }) - .catch((err) => { - console.error("failed to update db", { err }); - const errMessage = - err?.response?.data?.message ?? - err?.message ?? - "Error saving branchUrl to db"; - throw new Error(errMessage); - }); - - // get branchname to update content - const { srcBranch } = resolveGHApiUrl(branchUrl); - ghBranchName = srcBranch; - }) - .catch((err) => { - const errMessage = - err?.response?.data?.message ?? - err?.message ?? - "Error saving branchUrl to db"; - throw new Error(errMessage); - }); - } - - let fileToUpdateSha = ""; - await octokit - .request("GET /repos/{owner}/{repo}/contents/{path}", { - owner, - repo: srcRepo, - path: filePath, - ref: ghBranchName, - }) - .then((res) => { - const data = res.data as { sha: string }; - fileToUpdateSha = data.sha; - }) - .catch((err) => { - throw new Error( - `Cannot find ${fileName} sha ${err?.message && `\n ${err.message}`}` - ); - }); - - const fileContent = Buffer.from(transcriptToSave).toString("base64"); - await octokit - .request("PUT /repos/:owner/:repo/contents/:path", { - owner, - repo: upstreamRepo, - path: `${directoryName}/${fileName}`, - message: `Updated "${transcriptData.metadata.fileTitle}" transcript submitted by ${owner}`, - content: fileContent, - branch: ghBranchName, - sha: fileToUpdateSha, - }) - .then((res) => {}) - .catch((_err) => { - console.error({ _err }); - throw new Error("Error creating new file"); - }); -} - export default async function handler( req: NextApiRequest, res: NextApiResponse @@ -162,48 +32,25 @@ export default async function handler( // Initialize Octokit with the user's access token const octokit = new Octokit({ auth: session.accessToken }); - // Read transcript details and ghSourcePath - const { - fileName, - url, - date, - tags, - speakers, - categories, - transcribedText, - transcript_by, - ghSourcePath, - ghBranchUrl, - directoryPath, - reviewId, - ...otherMetadata - } = req.body; - - const newMetadata = new Metadata({ - fileTitle: fileName, - transcript_by: transcript_by, - url, - date, - tags, - speakers, - categories, - ...otherMetadata, - }); - - const transcriptData = { - metadata: newMetadata, - body: transcribedText, - }; + const { repo, filePath, fileContent, branch } = req.body; try { - await saveEdits({ + const fileSha = await getFileSha({ + octokit, + owner: session.user.githubUsername, + repo, + path: filePath, + branch, + }); + + await updateOrCreateFile({ octokit, - transcriptData, - ghSourcePath, - ghBranchUrl, - directoryPath, - reviewId, - session, + owner: session.user.githubUsername, + repo, + path: filePath, + fileContent, + branch, + sha: fileSha, }); res.status(200).json({ message: "Successfully saved edits" }); diff --git a/src/services/api/github/index.ts b/src/services/api/github/index.ts index a474e284..ce830ccc 100644 --- a/src/services/api/github/index.ts +++ b/src/services/api/github/index.ts @@ -1 +1 @@ -export * from "./useCreatePR"; +export * from "./useGithub"; diff --git a/src/services/api/github/useCreatePR.ts b/src/services/api/github/useCreatePR.ts deleted file mode 100644 index 05a109e7..00000000 --- a/src/services/api/github/useCreatePR.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { useMutation } from "@tanstack/react-query"; -import axios from "axios"; - -import type { TranscriptSubmitOptions } from "@/components/menus/SubmitTranscriptMenu"; - -type CreatePRProps = Record & { - directoryPath: string; - fileName: string; - url: string; - transcribedText: string; - prRepo: TranscriptSubmitOptions; -}; - -const createPR = (props: CreatePRProps) => axios.post("/api/github/pr", props); - -export function useCreatePR() { - return useMutation({ - mutationFn: createPR, - }); -} diff --git a/src/services/api/github/useGithub.ts b/src/services/api/github/useGithub.ts new file mode 100644 index 00000000..4313412e --- /dev/null +++ b/src/services/api/github/useGithub.ts @@ -0,0 +1,341 @@ +import { useMutation, useQueryClient } from "@tanstack/react-query"; +import { useRouter } from "next/router"; +import { useSession } from "next-auth/react"; +import { useToast } from "@chakra-ui/react"; +import yaml from "js-yaml"; +import axios from "axios"; +//@ts-ignore +import { converSlateToDpe, slateToMarkdown } from "slate-transcript-editor"; + +import { + upstreamMetadataRepo, + upstreamOwner, + upstreamRepo, +} from "@/config/default"; +import { + constructDpeUrl, + constructGithubBranchApiUrl, + resolveGHApiUrl, +} from "@/utils/github"; +import { useUserMultipleReviews } from "@/services/api/reviews"; +import config from "@/config/config.json"; +import { deriveFileSlug } from "@/utils"; + +import backendAxios from "../axios"; +import { Review, TranscriptMetadata } from "../../../../types"; +import endpoints from "../endpoints"; + +interface BaseParams { + transcriptUrl: string; +} + +interface ClaimTranscriptParams extends BaseParams { + transcriptId: number; + userId: number; +} + +interface SaveProgressParams extends BaseParams { + branchUrl: string; + metadata: TranscriptMetadata; + transcriptSlate: any; +} + +export interface SubmitReviewParams extends BaseParams { + branchUrl: string; + reviewId: number; + targetRepository: string; + metadata: TranscriptMetadata; +} + +interface SuggestSourceParams + extends Pick { + targetRepository: string; +} + +const githubApi = axios.create({ + baseURL: "/api/github", +}); + +// API methods +const claimTranscript = async ({ + transcriptUrl, + transcriptId, + userId, +}: ClaimTranscriptParams): Promise => { + // Check if the dpe.json file exists on the specific branch of the metadata repository + const dpeUrl = constructDpeUrl(transcriptUrl); + try { + await githubApi.get(dpeUrl); + } catch (error) { + throw new Error(`The DPE file does not exist for this transcript`); + } + + // Fork the main repository + const forkMainRepoResult = await githubApi.post("/fork", { + owner: upstreamOwner, + repo: upstreamRepo, + }); + // Fork the metadata repository + await githubApi.post("/fork", { + owner: upstreamOwner, + repo: upstreamMetadataRepo, + }); + + // Create new branch from the main repository + const { srcBranch, srcRepo, filePath, fileNameWithoutExtension } = + resolveGHApiUrl(transcriptUrl); + const timeInSeconds = Math.floor(Date.now() / 1000); + const branchName = `${timeInSeconds}-${fileNameWithoutExtension}`; + await githubApi.post("/newBranch", { + upstreamRepo: srcRepo, + baseBranch: srcBranch, + branchName, + }); + const newBranchUrl = constructGithubBranchApiUrl({ + owner: forkMainRepoResult.data.owner.login, + filePath, + newBranchName: branchName, + }); + // Create new branch from the metadata repository + await githubApi.post("/newBranch", { + upstreamRepo: upstreamMetadataRepo, + // hacky way to avoid for now to keep extra information about the metadata repo in the db + baseBranch: srcBranch == "master" ? "main" : srcBranch, + branchName, + }); + + // Claim transcript + const result = await backendAxios.put( + endpoints.CLAIM_TRANSCRIPT(transcriptId), + { + claimedBy: userId, + branchUrl: newBranchUrl, + } + ); + + return result.data; +}; + +const saveProgress = async ({ + transcriptUrl, + branchUrl, + metadata, + transcriptSlate, +}: SaveProgressParams) => { + const { srcRepo, srcDirPath, filePath, fileNameWithoutExtension } = + resolveGHApiUrl(transcriptUrl); + const { srcBranch, srcOwner } = resolveGHApiUrl(branchUrl); + // Save main branch + const transcriptMarkdown = + `---\n` + + yaml.dump( + { + ...metadata, + transcript_by: `${srcOwner} via ${config.app_tag}`, + date: metadata["date"].toISOString().split("T")[0], + }, + { + forceQuotes: true, + } + ) + + "---\n" + + `${slateToMarkdown(transcriptSlate)}`; + await githubApi.post("/save", { + repo: srcRepo, + filePath, + fileContent: transcriptMarkdown, + branch: srcBranch, + }); + + // Save metadata branch + const transcriptDpe = converSlateToDpe(transcriptSlate); + await githubApi.post("/save", { + repo: upstreamMetadataRepo, + filePath: `${srcDirPath}/${fileNameWithoutExtension}/dpe.json`, + fileContent: JSON.stringify(transcriptDpe, null, 4), + // hacky way to avoid for now to keep extra information about the metadata repo in the db + branch: srcBranch == "master" ? "main" : srcBranch, + }); +}; + +const submitReview = async ({ + reviewId, + targetRepository, + transcriptUrl, + branchUrl, + metadata, +}: SubmitReviewParams) => { + const { srcBranch: targetBranch } = resolveGHApiUrl(transcriptUrl); + const { srcOwner, srcRepo, srcBranch, srcDirPath } = + resolveGHApiUrl(branchUrl); + const title = `review: "${metadata.title}" of ${srcDirPath}`; + // submit PR on main branch + const prResult = await githubApi.post("/pr", { + owner: targetRepository === "user" ? srcOwner : upstreamOwner, + repo: targetRepository === "user" ? srcRepo : upstreamRepo, + title, + body: `This PR is a review of the [${metadata.title}](${metadata.media}) AI-generated transcript.`, + head: `${srcOwner}:${srcBranch}`, + base: targetBranch, + }); + // submit PR on metadata branch + await githubApi.post("/pr", { + owner: targetRepository === "user" ? srcOwner : upstreamOwner, + // we don't have any other option here for repo because we don't currently + // store information about the metadata branch + repo: upstreamMetadataRepo, + title, + body: `This PR contains the Digital Paper Edit (DPE) format of the transcript and is used as input for the review process. + It is not part of the evaluation process, it updates automatically and will be merged after the [review submission PR](${prResult.data.html_url}) is merged.`, + head: `${srcOwner}:${srcBranch}`, + // hacky way to avoid for now to keep extra information about the metadata repo in the db + base: targetBranch == "master" ? "main" : targetBranch, + }); + // update backend + await backendAxios.put(endpoints.SUBMIT_REVIEW(reviewId), { + pr_url: prResult.data.html_url, + }); + return prResult.data.html_url; +}; + +const suggestSource = async ({ + title, + media, + targetRepository, +}: SuggestSourceParams) => { + // Fork repository + const forkMainRepoResult = await githubApi.post("/fork", { + owner: upstreamOwner, + repo: upstreamRepo, + }); + const owner = forkMainRepoResult.data.owner.login; + + // Create a new branch + const timeInSeconds = Math.floor(Date.now() / 1000); + const fileName = deriveFileSlug(title); + const branchName = `${timeInSeconds}-${fileName}`; + await githubApi.post("/newBranch", { + upstreamRepo, + // TODO: needs better handling of base branch + baseBranch: + process.env.NEXT_PUBLIC_VERCEL_ENV === "production" + ? "master" + : "staging", + branchName, + }); + + // Save file + const transcriptMarkdown = + `---\n` + + yaml.dump( + { + title, + media, + needs: "transcript", + }, + { + forceQuotes: true, + } + ) + + "---\n"; + await githubApi.post("/save", { + repo: upstreamRepo, + // for now misc is the default directory for suggestions + filePath: `misc/${fileName}.md`, + fileContent: transcriptMarkdown, + branch: branchName, + }); + + // Open PR with user's suggestion + const prResult = await githubApi.post("/pr", { + owner: targetRepository === "user" ? owner : upstreamOwner, + // we don't expect that the user will have a different name for their fork + repo: upstreamRepo, + title: `suggest: "${title}"`, + body: `This PR is a suggestion for the transcription of [${title}](${media}).`, + head: `${owner}:${branchName}`, + // TODO: needs better handling of base branch + base: + process.env.NEXT_PUBLIC_VERCEL_ENV === "production" + ? "master" + : "staging", + }); + return prResult.data.html_url; +}; + +export function useGithub() { + const { data: session } = useSession(); + const toast = useToast(); + const queryClient = useQueryClient(); + const router = useRouter(); + const { data: multipleStatusData } = useUserMultipleReviews({ + userId: session?.user?.id, + multipleStatus: ["pending", "active", "inactive"], + }); + const mutationClaimTranscript = useMutation(claimTranscript, { + onSuccess: async (data) => { + try { + if (multipleStatusData.length > 0) { + router.push(`/reviews/${data.id}`); + } else { + router.push(`/reviews/${data.id}?first_review=true`); + } + } catch (err) { + console.error(err); + } + }, + onError: (err) => { + throw err; + }, + }); + const mutationSaveProgress = useMutation(saveProgress, { + onSuccess: () => { + queryClient.invalidateQueries(["review", router.query.id]); + toast({ + title: "Saved successfully", + description: "Your changes have been saved.", + status: "success", + }); + }, + onError: (error: any) => { + toast({ + title: "Error saving changes", + description: + error.response?.data?.message || "An unknown error occurred.", + status: "error", + }); + }, + }); + const mutationSubmitReview = useMutation(submitReview, { + onSettled: () => { + queryClient.invalidateQueries(["review", router.query.id]); + }, + }); + + const mutationSuggestSource = useMutation(suggestSource, { + onSuccess: () => { + toast({ + status: "success", + title: "Suggestion submitted successfully", + }); + }, + onError: (e) => { + const description = + e instanceof Error + ? e.message + : "An error occurred while submitting suggestion"; + toast({ + status: "error", + title: "Error submitting", + description, + }); + }, + }); + + return { + claimTranscript: mutationClaimTranscript, + saveProgress: mutationSaveProgress, + submitReview: mutationSubmitReview, + suggestSource: mutationSuggestSource, + }; +} diff --git a/src/services/api/reviews/useReview.ts b/src/services/api/reviews/useReview.ts index ceb00a4c..47054a17 100644 --- a/src/services/api/reviews/useReview.ts +++ b/src/services/api/reviews/useReview.ts @@ -1,19 +1,112 @@ +import axios from "axios"; +import yaml from "js-yaml"; import { useQuery } from "@tanstack/react-query"; -import type { UserReviewData } from "../../../../types"; -import axios from "../axios"; + +import { constructDpeUrl } from "@/utils/github"; + +import type { + UserReviewData, + TranscriptMetadata, + DigitalPaperEditFormat, + TranscriptReview, +} from "../../../../types"; +import backendAxios from "../axios"; import endpoints from "../endpoints"; -const getReview = async (reviewId: number): Promise => { - return axios - .get(endpoints.REVIEW_BY_ID(reviewId)) - .then((res) => res.data) - .catch((err) => err); +// TODO: move this to a new folder when more endpoints are added +const transcriptionServerAxios = axios.create({ + baseURL: process.env.NEXT_PUBLIC_APP_TRANSCRIPTION_BASE_URL ?? "", +}); + +// Helper function to fetch transcript's metadata +const getMetadata = async (branchUrl: string): Promise => { + const response = await axios.post(`/api/github/read`, { branchUrl }); + const content = response.data.content; + // This regex matches a markdown file with a YAML front matter. + // It captures the YAML header and the body separately. + const matches = /---\n([\s\S]+?)\n---/.exec(content); + if (matches && matches[1]) { + const metadata = yaml.load(matches[1]) as TranscriptMetadata; + + // Check if media is a YouTube link + const youtubeRegex = + /^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.?be)\/.+$/; + if (youtubeRegex.test(metadata.media)) { + try { + // If media is a YouTube link, call the transcription server endpoint + // to get the direct video URL and overwrite the source_file with it. + // We need the direct video URL for media playback and YouTube links + // are not directly usable for that purpose. + const youtubeResponse = await transcriptionServerAxios.post( + `/media/youtube-video-url`, + { + youtube_url: metadata.media, + } + ); + metadata.source_file = youtubeResponse.data.video_url; + } catch (error: any) { + throw new Error( + error.response?.data?.message || + error.message || + "Failed to fetch YouTube video URL" + ); + } + } + + return metadata; + } else { + throw new Error("No metadata found"); + } +}; + +// Helper function to fetch the Digital Paper Edit format of the transcript +const getDPEContent = async ( + branchUrl: string +): Promise => { + const response = await axios.post(`/api/github/read`, { branchUrl }); + return response.data.content; +}; + +// Main function to fetch review details +const getReviewData = async (reviewId: number): Promise => { + try { + const reviewData: UserReviewData = await backendAxios + .get(endpoints.REVIEW_BY_ID(reviewId)) + .then((res) => res.data); + + if (!reviewData.branchUrl) { + throw new Error("No branch has been created for this review"); + } + + // Fetch both metadata and DPE content in parallel + const dpeUrl = constructDpeUrl(reviewData.branchUrl); + const [metadata, dpe] = await Promise.all([ + getMetadata(reviewData.branchUrl), + getDPEContent(dpeUrl), + ]); + + // Combine data and return + // We don't make use of the "transcript" object returned by the backend + // so here we replace it with data that we get directly from GitHub + // TODO: In the future remove this reduntant information from the response + // or fetch the GitHub data in the backend instead of here + return { + ...reviewData, + transcript: { metadata, dpe, url: reviewData.transcript.transcriptUrl }, + }; + } catch (error: any) { + throw new Error( + error.response?.data?.message || + error.message || + "Failed to fetch review data" + ); + } }; -export const useReview = (id: number) => - useQuery({ - queryFn: () => getReview(id), - queryKey: ["review", id], +export const useReview = (reviewId: number) => + useQuery({ + queryFn: () => getReviewData(reviewId), + queryKey: ["review", reviewId], refetchOnWindowFocus: false, - enabled: !!id, + enabled: !!reviewId, }); diff --git a/src/services/api/transcripts/index.ts b/src/services/api/transcripts/index.ts index e314fa7a..7dead3f4 100644 --- a/src/services/api/transcripts/index.ts +++ b/src/services/api/transcripts/index.ts @@ -1,5 +1,3 @@ export * from "./useArchiveTranscript"; -export * from "./useClaimTranscript"; export * from "./useTranscript"; export * from "./useTranscripts"; -export * from "./useUpdateTranscript"; diff --git a/src/services/api/transcripts/useClaimTranscript.ts b/src/services/api/transcripts/useClaimTranscript.ts deleted file mode 100644 index 08e8eb5d..00000000 --- a/src/services/api/transcripts/useClaimTranscript.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { useMutation } from "@tanstack/react-query"; -import type { Review } from "../../../../types"; -import axios from "../axios"; -import endpoints from "../endpoints"; - -const claimTranscript = async (body: { - userId: number; - transcriptId: number; - branchUrl?: string; -}): Promise => { - return axios - .put(endpoints.CLAIM_TRANSCRIPT(body.transcriptId), { - claimedBy: body.userId, - branchUrl: body.branchUrl, - }) - .then((res) => { - return res.data; - }) - .catch((err) => { - const errMessage = - err?.response?.data?.message || "Please try again later"; - throw new Error(errMessage); - }); -}; - -export const useClaimTranscript = () => - useMutation({ mutationFn: claimTranscript }); diff --git a/src/services/api/transcripts/useUpdateTranscript.ts b/src/services/api/transcripts/useUpdateTranscript.ts deleted file mode 100644 index 776d9877..00000000 --- a/src/services/api/transcripts/useUpdateTranscript.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { useMutation } from "@tanstack/react-query"; -import type { SaveToGHData, TranscriptContent } from "../../../../types"; -import axiosInstance from "../axios"; -import axios from "axios"; -import endpoints from "../endpoints"; - -const updateTranscript = async (body: { - content?: TranscriptContent; - originalContent?: TranscriptContent; - pr_url?: string; - transcriptId: number; - newImplData: SaveToGHData; -}) => { - const { content, originalContent, pr_url, newImplData } = body; - // handle new implementation - if (newImplData.ghSourcePath) { - const { - directoryPath, - fileName, - url, - date, - tags, - speakers, - categories, - transcribedText, - transcript_by, - ghSourcePath, - ghBranchUrl, - reviewId, - ...otherMetadata - } = newImplData; - - return axios - .post("/api/github/save", { - directoryPath, - fileName, - url, - date, - tags, - speakers, - categories, - transcribedText, - transcript_by, - ghSourcePath, - ghBranchUrl, - reviewId, - ...otherMetadata, - }) - .then((res) => { - return res; - }) - .catch((err) => { - const errMessage = - err?.response?.data?.message || "Please try again later"; - return errMessage; - }); - } - - // legacy save implementation - return axiosInstance - .put(endpoints.GET_TRANSCRIPTS_BY_ID(body.transcriptId), { - content, - originalContent, - pr_url, - }) - .then((res) => { - return res; - }) - .catch((err) => { - const errMessage = - err?.response?.data?.message || "Please try again later"; - return errMessage; - }); -}; - -export const useUpdateTranscript = () => - useMutation({ mutationFn: updateTranscript }); diff --git a/src/utils/github.ts b/src/utils/github.ts index 786eae55..f3e56320 100644 --- a/src/utils/github.ts +++ b/src/utils/github.ts @@ -1,7 +1,8 @@ import { AxiosError } from "axios"; - import { Octokit } from "@octokit/core"; +import { upstreamMetadataRepo } from "@/config/default"; + import { newIndexFile } from "."; type BranchUrlConstructor = { @@ -10,6 +11,36 @@ type BranchUrlConstructor = { filePath: string; }; +// Base interface for common GitHub repository parameters +interface GitHubRepoParams { + octokit: Octokit; + owner: string; + repo: string; +} + +// Interface for operations on a specific file with branch details +interface GitHubFileParams extends GitHubRepoParams { + path: string; + branch: string; +} + +// Interface for getting a file SHA +interface GetFileShaParams extends GitHubFileParams {} + +// Interface for updating or creating a file with optional SHA +interface UpdateOrCreateFileParams extends GitHubFileParams { + fileContent: string; + sha: string | null; +} + +// Interface for creating a pull request +interface CreatePullRequestParams extends GitHubRepoParams { + title: string; + head: string; // Branch with changes + base: string; // Branch to merge into + body: string; // Description of the pull request +} + export async function deleteIndexMdIfDirectoryEmpty( octokit: InstanceType, owner: string, @@ -103,6 +134,79 @@ export async function ensureIndexMdExists( } } +/** + * Fetches the SHA of a file in a given GitHub repository using named parameters. + */ +export async function getFileSha( + params: GetFileShaParams +): Promise { + const { octokit, owner, repo, path, branch } = params; + try { + const response = await octokit.request( + "GET /repos/{owner}/{repo}/contents/{path}", + { + owner, + repo, + path, + ref: branch, + } + ); + const data = response.data as { sha: string }; + return data.sha; + } catch (err: any) { + return null; + throw new Error(`Cannot find ${path} SHA. Error: ${err.message}`); + } +} + +/** + * Updates or creates a file in a given GitHub repository using named parameters. + */ +export async function updateOrCreateFile(params: UpdateOrCreateFileParams) { + const { octokit, owner, repo, path, fileContent, branch, sha } = params; + const timestamp = new Date().toISOString(); + try { + const response = await octokit.request( + "PUT /repos/:owner/:repo/contents/:path", + { + owner, + repo, + path, + message: `Save Edits (${timestamp})`, + content: Buffer.from(fileContent).toString("base64"), + branch, + sha, + } + ); + return response; + } catch (err) { + console.error({ err }); + throw new Error("Error updating or creating new file"); + } +} + +/** + * Creates a pull request in a specified GitHub repository using named parameters. + */ +export async function createPullRequest(params: CreatePullRequestParams) { + const { octokit, owner, repo, title, head, base, body } = params; + try { + const response = await octokit.request("POST /repos/{owner}/{repo}/pulls", { + owner, + repo, + title, + head, + base, + body, + }); + return response; + } catch (err: any) { + throw new Error( + `Error creating Pull Request: ${err.response.data.errors[0].message}` + ); + } +} + async function fetchLatestCommit( octokit: InstanceType, owner: string, @@ -285,3 +389,12 @@ export function constructGithubBranchApiUrl({ }: BranchUrlConstructor) { return `https://api.github.com/repos/${owner}/bitcointranscripts/contents/${filePath}?ref=${newBranchName}`; } + +export function constructDpeUrl(transcriptUrl: string) { + const { srcOwner, srcBranch, srcDirPath, fileNameWithoutExtension } = + resolveGHApiUrl(transcriptUrl); + const dpeFilePath = `${srcDirPath}/${fileNameWithoutExtension}/dpe.json`; + // hacky way to avoid for now to keep extra information about the metadata repo in the db + const metadataRepoBaseBranch = srcBranch == "master" ? "main" : srcBranch; + return `https://api.github.com/repos/${srcOwner}/${upstreamMetadataRepo}/contents/${dpeFilePath}?ref=${metadataRepoBaseBranch}`; +} diff --git a/src/utils/index.ts b/src/utils/index.ts index 9e0a63ed..b00cc2e3 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,8 +1,6 @@ import { format, hoursToMilliseconds, millisecondsToHours } from "date-fns"; -import yaml from "js-yaml"; import { NextApiRequest } from "next"; import slugify from "slugify"; -import { MetadataProps } from "../../types"; import ClockIcon from "../components/svgs/ClockIcon"; import GithubIcon from "../components/svgs/GithubIcon"; import LaptopIcon from "../components/svgs/LaptopIcon"; @@ -53,7 +51,7 @@ export const getTimeLeftText = (date: Date | null) => { if (!hours) { return "expired"; } - return `${hours} hours to review and submit`; + return `${hours} hours to review and`; }; export const wordsFormat = new Intl.NumberFormat("en-US", { @@ -66,42 +64,6 @@ export const getCount = (item: number | string) => { return wordsFormat.format(formattedItem); }; -export class Metadata { - private metadata: string; - public fileTitle: string; - public source: string; - - constructor({ - fileTitle, - transcript_by, - url, - ...otherMetadata - }: MetadataProps) { - this.fileTitle = fileTitle; - this.source = url; - - const jsonData = { - title: fileTitle, - transcript_by: transcript_by - ? `${transcript_by} via ${config.app_tag}` - : undefined, - media: url, - ...otherMetadata, - }; - - this.metadata = - `---\n` + - yaml.dump(jsonData, { - forceQuotes: true, - }) + - "---\n"; - } - - public toString(): string { - return this.metadata; - } -} - export async function retryApiCall( apiCallFunc: () => Promise, retries: number = 3, diff --git a/src/utils/transcript.ts b/src/utils/transcript.ts index 76a31316..0b90c911 100644 --- a/src/utils/transcript.ts +++ b/src/utils/transcript.ts @@ -1,8 +1,11 @@ import { createHash } from "crypto"; -import { SaveToGHData } from "../../types"; import config from "@/config/config.json"; +import { SlateNode, TranscriptMetadata } from "../../types"; -export const compareTranscriptBetweenSave = (data: SaveToGHData) => { +export const compareTranscriptBetweenSave = (data: { + transcriptSlate: SlateNode[]; + metadata: TranscriptMetadata; +}) => { const transcriptAsString = JSON.stringify(data); const lastSavedReviewHash = localStorage.getItem( config.local_storage_hash_query diff --git a/types.ts b/types.ts index 1058e264..63635545 100644 --- a/types.ts +++ b/types.ts @@ -17,7 +17,7 @@ export type Transcript = { transcriptHash: string; claimedBy: Nullable; contentTotalWords: number; - transcriptUrl: Nullable; + transcriptUrl: string; }; export type TranscriptData = { totalItems: number; @@ -43,7 +43,15 @@ export type Review = { submittedAt: Nullable; mergedAt: Nullable; pr_url: Nullable; - branchUrl: Nullable; + branchUrl: string; +}; + +export type TranscriptReview = Review & { + transcript: { + dpe: DigitalPaperEditFormat; + metadata: TranscriptMetadata; + url: string; + }; }; export type UserReviewData = Review & { @@ -72,18 +80,47 @@ export type TranscriptContent = Record & { loc?: string; }; -type Nullable = T | null; - -export type MetadataProps = Record & { - fileTitle: string; +export type TranscriptMetadata = { + date: Date; + source_file: string; + media: string; + speakers: string[]; + tags: string[]; + title: string; transcript_by: string; - url: string; - date: string; - tags?: string[]; - speakers?: string[]; - categories?: string[]; }; +export type DigitalPaperEditWord = { + id: number; + start: number; + end: number; + text: string; +}; + +export type DigitalPaperEditParagraph = { + id: number; + start: number; + end: number; + speaker: string; +}; + +export type DigitalPaperEditFormat = { + words: DigitalPaperEditWord[]; + paragraphs: DigitalPaperEditParagraph[]; +}; + +export type SlateNode = { + children: { text: string; words: DigitalPaperEditWord[] }; + speaker: string; + start: number; + startTimecode: string; + previousTimings: string; + type: string; + chapter?: string; +}; + +type Nullable = T | null; + export type AbstractedChakraComponentProps = { children: React.ReactNode; } & Omit; @@ -185,28 +222,6 @@ export type TransactionQueryType = export type TransactionQueryStatus = (typeof TransactionStatus)[keyof typeof TransactionStatus]; -export type SaveToGHData = { - directoryPath: string; - fileName?: string; - url: string | null; - date: - | string - | { - day: string; - month: string; - year: string; - } - | null; - tags?: string[]; - speakers?: string[]; - categories?: string[]; - transcribedText: string; - transcript_by?: string; - ghSourcePath: string | null; - ghBranchUrl: string | null; - reviewId: number; -}; - // Reviews for admin; export type ReviewQueryStatus = (typeof ReviewStatus)[keyof typeof ReviewStatus]; diff --git a/yarn.lock b/yarn.lock index 551adc9f..5012a218 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41,13 +41,20 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.6.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682" integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ== dependencies: regenerator-runtime "^0.14.0" +"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7": + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" + integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/types@^7.22.5": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03" @@ -891,6 +898,11 @@ "@emotion/weak-memoize" "^0.3.1" stylis "4.2.0" +"@emotion/hash@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" + integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== + "@emotion/hash@^0.9.1": version "0.9.1" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.1.tgz#4ffb0055f7ef676ebc3a5a91fb621393294e2f43" @@ -1033,6 +1045,77 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@material-ui/core@^4.11.3": + version "4.12.4" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" + integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/styles" "^4.11.5" + "@material-ui/system" "^4.12.2" + "@material-ui/types" "5.1.0" + "@material-ui/utils" "^4.11.3" + "@types/react-transition-group" "^4.2.0" + clsx "^1.0.4" + hoist-non-react-statics "^3.3.2" + popper.js "1.16.1-lts" + prop-types "^15.7.2" + react-is "^16.8.0 || ^17.0.0" + react-transition-group "^4.4.0" + +"@material-ui/icons@^4.11.2": + version "4.11.3" + resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1" + integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA== + dependencies: + "@babel/runtime" "^7.4.4" + +"@material-ui/styles@^4.11.5": + version "4.11.5" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb" + integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== + dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "5.1.0" + "@material-ui/utils" "^4.11.3" + clsx "^1.0.4" + csstype "^2.5.2" + hoist-non-react-statics "^3.3.2" + jss "^10.5.1" + jss-plugin-camel-case "^10.5.1" + jss-plugin-default-unit "^10.5.1" + jss-plugin-global "^10.5.1" + jss-plugin-nested "^10.5.1" + jss-plugin-props-sort "^10.5.1" + jss-plugin-rule-value-function "^10.5.1" + jss-plugin-vendor-prefixer "^10.5.1" + prop-types "^15.7.2" + +"@material-ui/system@^4.12.2": + version "4.12.2" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b" + integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.11.3" + csstype "^2.5.2" + prop-types "^15.7.2" + +"@material-ui/types@5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" + integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== + +"@material-ui/utils@^4.11.3": + version "4.11.3" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942" + integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== + dependencies: + "@babel/runtime" "^7.4.4" + prop-types "^15.7.2" + react-is "^16.8.0 || ^17.0.0" + "@next/env@13.4.13": version "13.4.13" resolved "https://registry.yarnpkg.com/@next/env/-/env-13.4.13.tgz#50250cec7626904b93a4a934933d6a747763259d" @@ -1250,6 +1333,23 @@ dependencies: "@types/node" "*" +"@types/esrever@^0.2.0": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@types/esrever/-/esrever-0.2.3.tgz#f629ed915431f255b9abdcced15e75368289ec42" + integrity sha512-PSpbRcdciHzN6/RgGoS1mTg/jrd6lewP1T7UsX7AoesynrZjsPnN+XpRt9uGzye9PV8mlMtl94lU8S5T1SG54Q== + +"@types/image-size@0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/image-size/-/image-size-0.0.29.tgz#0924d4ec95edc82f615b7f634cba31534b81c351" + integrity sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg== + dependencies: + "@types/node" "*" + +"@types/is-hotkey@^0.1.1": + version "0.1.10" + resolved "https://registry.yarnpkg.com/@types/is-hotkey/-/is-hotkey-0.1.10.tgz#cf440fab9bf75ffba4e1a16e8df28938de0778c9" + integrity sha512-RvC8KMw5BCac1NvRRyaHgMMEtBaZ6wh0pyPTBu7izn4Sj/AX9Y4aXU5c7rX8PnM/knsuUpC1IeoBkANtxBypsQ== + "@types/js-yaml@^4.0.9": version "4.0.9" resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2" @@ -1267,6 +1367,13 @@ dependencies: "@types/node" "*" +"@types/jszip@^3.1.4": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@types/jszip/-/jszip-3.4.1.tgz#e7a4059486e494c949ef750933d009684227846f" + integrity sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A== + dependencies: + jszip "*" + "@types/linkify-it@*": version "3.0.2" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" @@ -1284,6 +1391,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95" integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ== +"@types/lodash@^4.14.149": + version "4.17.7" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.7.tgz#2f776bcb53adc9e13b2c0dfd493dfcbd7de43612" + integrity sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA== + "@types/markdown-it@^13.0.0": version "13.0.0" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-13.0.0.tgz#05e82614aa6d305a4d8efe24056d8879a9042970" @@ -1303,9 +1415,11 @@ integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== "@types/node@*": - version "20.4.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.8.tgz#b5dda19adaa473a9bf0ab5cbd8f30ec7d43f5c85" - integrity sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg== + version "22.1.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.1.0.tgz#6d6adc648b5e03f0e83c78dc788c2b037d0ad94b" + integrity sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw== + dependencies: + undici-types "~6.13.0" "@types/node@^20.4.9": version "20.4.9" @@ -1318,9 +1432,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prop-types@*": - version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" - integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== + version "15.7.12" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" + integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== "@types/react-datepicker@^4.15.0": version "4.15.0" @@ -1339,13 +1453,19 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.2.0": + version "4.4.10" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac" + integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q== + dependencies: + "@types/react" "*" + "@types/react@*", "@types/react@^18.2.19": - version "18.2.19" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.19.tgz#f77cb2c8307368e624d464a25b9675fa35f95a8b" - integrity sha512-e2S8wmY1ePfM517PqCG80CcE48Xs5k0pwJzuDZsfE8IZRRBfOMCF+XqnFxu6mWtyivum1MQm4aco+WIt6Coimw== + version "18.3.3" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" + integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/sanitize-html@^2.9.0": @@ -1355,11 +1475,6 @@ dependencies: htmlparser2 "^8.0.0" -"@types/scheduler@*": - version "0.16.3" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" - integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== - "@typescript-eslint/parser@^5.4.2 || ^6.0.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.3.0.tgz#359684c443f4f848db3c4f14674f544f169c8f46" @@ -1811,6 +1926,11 @@ client-only@0.0.1: resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1" integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA== +clsx@^1.0.4: + version "1.2.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" + integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1847,7 +1967,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -compute-scroll-into-view@1.0.20: +compute-scroll-into-view@1.0.20, compute-scroll-into-view@^1.0.20: version "1.0.20" resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43" integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg== @@ -1874,6 +1994,11 @@ copy-to-clipboard@3.3.3: dependencies: toggle-selection "^1.0.6" +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + cosmiconfig@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" @@ -1912,11 +2037,29 @@ css-box-model@1.2.1: dependencies: tiny-invariant "^1.0.6" -csstype@^3.0.11, csstype@^3.0.2: +css-vendor@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" + integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== + dependencies: + "@babel/runtime" "^7.8.3" + is-in-browser "^1.0.2" + +csstype@^2.5.2: + version "2.6.21" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" + integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== + +csstype@^3.0.11: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== +csstype@^3.0.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + damerau-levenshtein@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" @@ -2011,6 +2154,13 @@ detect-node-es@^1.1.0: resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493" integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ== +difflib@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/difflib/-/difflib-0.2.4.tgz#b5e30361a6db023176d562892db85940a718f47e" + integrity sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w== + dependencies: + heap ">= 0.2.0" + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -2018,6 +2168,11 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +direction@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.4.tgz#2b86fb686967e987088caf8b89059370d4837442" + integrity sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ== + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -2032,6 +2187,26 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +docx@4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/docx/-/docx-4.7.1.tgz#9ce7a5b4eea66d295053651d5def79f5566a3b2c" + integrity sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw== + dependencies: + "@types/image-size" "0.0.29" + "@types/jszip" "^3.1.4" + image-size "^0.6.2" + jszip "^3.1.5" + xml "^1.0.1" + xml-js "^1.6.8" + +dom-helpers@^5.0.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" @@ -2087,6 +2262,14 @@ emoji-regex@^9.2.2: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== +enhanced-resolve@^5.10.0: + version "5.16.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567" + integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enhanced-resolve@^5.12.0: version "5.15.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" @@ -2401,6 +2584,11 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" +esrever@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8" + integrity sha512-1e9YJt6yQkyekt2BUjTky7LZWWVyC2cIpgdnsTAvMcnzXIZvlW/fTMPkxBcZoYhgih4d+EC+iw+yv9GIkz7vrw== + estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -2411,10 +2599,10 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +everpolate@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/everpolate/-/everpolate-0.0.3.tgz#3b1b318465494712aa1eb106144468ea417d0129" + integrity sha512-pz9Y4PD7tQgqgzfvZWSxjX7SIfvu7+44FM15vCGp7iQoomXVfO1lWU4uNvqb9uOcILtrPxyZmKCAM+U+uHdlsg== execa@^5.0.0: version "5.1.1" @@ -2536,6 +2724,11 @@ follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +fontsource-roboto@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fontsource-roboto/-/fontsource-roboto-4.0.0.tgz#35eacd4fb8d90199053c0eec9b34a57fb79cd820" + integrity sha512-zD6L8nvdWRcwSgp4ojxFchG+MPj8kXXQKDEAH9bfhbxy+lkpvpC1WgAK0lCa4dwobv+hvAe0uyHaawcgH7WH/g== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -2793,6 +2986,11 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +"heap@>= 0.2.0": + version "0.2.7" + resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc" + integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg== + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -2802,7 +3000,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.3.1: +hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -2829,11 +3027,31 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== +hyphenate-style-name@^1.0.3: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz#1797bf50369588b47b72ca6d5e65374607cf4436" + integrity sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw== + ignore@^5.2.0, ignore@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +image-size@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" + integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA== + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== + +immer@^5.0.0: + version "5.3.6" + resolved "https://registry.yarnpkg.com/immer/-/immer-5.3.6.tgz#51eab8cbbeb13075fe2244250f221598818cac04" + integrity sha512-pqWQ6ozVfNOUDjrLfm4Pt7q4Q12cGw2HUZgry4Q5+Myxu9nmHRkWBpI0J4+MK0AxbdFtdMTwEGVl7Vd+vEiK+A== + immutable@^4.0.0: version "4.3.2" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.2.tgz#f89d910f8dfb6e15c03b2cae2faaf8c1f66455fe" @@ -2860,7 +3078,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2958,6 +3176,16 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-hotkey@^0.1.6: + version "0.1.8" + resolved "https://registry.yarnpkg.com/is-hotkey/-/is-hotkey-0.1.8.tgz#6b1f4b2d0e5639934e20c05ed24d623a21d36d25" + integrity sha512-qs3NZ1INIS+H+yeo7cD9pDfwYV/jqRh1JG9S9zYrNudkoUQg7OL7ziXqRKu+InFjUIDoP2o6HIkLYMh1pcWgyQ== + +is-in-browser@^1.0.2, is-in-browser@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" + integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== + is-inside-container@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" @@ -2987,6 +3215,11 @@ is-path-inside@^3.0.3: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-plain-object@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" + integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== + is-plain-object@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" @@ -3057,6 +3290,11 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3111,6 +3349,76 @@ jsonwebtoken@^9.0.1: ms "^2.1.1" semver "^7.3.8" +jss-plugin-camel-case@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" + integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== + dependencies: + "@babel/runtime" "^7.3.1" + hyphenate-style-name "^1.0.3" + jss "10.10.0" + +jss-plugin-default-unit@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" + integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.10.0" + +jss-plugin-global@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" + integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.10.0" + +jss-plugin-nested@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" + integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.10.0" + tiny-warning "^1.0.2" + +jss-plugin-props-sort@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" + integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.10.0" + +jss-plugin-rule-value-function@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" + integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.10.0" + tiny-warning "^1.0.2" + +jss-plugin-vendor-prefixer@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" + integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== + dependencies: + "@babel/runtime" "^7.3.1" + css-vendor "^2.0.8" + jss "10.10.0" + +jss@10.10.0, jss@^10.5.1: + version "10.10.0" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" + integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== + dependencies: + "@babel/runtime" "^7.3.1" + csstype "^3.0.2" + is-in-browser "^1.1.3" + tiny-warning "^1.0.2" + "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3: version "3.3.5" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -3121,6 +3429,16 @@ jsonwebtoken@^9.0.1: object.assign "^4.1.4" object.values "^1.1.6" +jszip@*, jszip@^3.1.5: + version "3.10.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" + integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== + dependencies: + lie "~3.3.0" + pako "~1.0.2" + readable-stream "~2.3.6" + setimmediate "^1.0.5" + jwa@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" @@ -3163,6 +3481,13 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +lie@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" + integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== + dependencies: + immediate "~3.0.5" + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -3197,7 +3522,7 @@ lodash.mergewith@4.6.2: resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== -lodash@^4.17.11, lodash@^4.17.21: +lodash@^4.17.11, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3326,11 +3651,16 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -nanoid@^3.3.4, nanoid@^3.3.6: +nanoid@^3.3.4: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -3351,6 +3681,13 @@ next-auth@^4.22.5: preact-render-to-string "^5.1.19" uuid "^8.3.2" +next-transpile-modules@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/next-transpile-modules/-/next-transpile-modules-10.0.1.tgz#1ca2b735b14781f4792f6214f808b600574e0348" + integrity sha512-4VX/LCMofxIYAVV58UmD+kr8jQflpLWvas/BQ4Co0qWLWzVh06FoZkECkrX5eEZT6oJFqie6+kfbTA3EZCVtdQ== + dependencies: + enhanced-resolve "^5.10.0" + next@^13.4.13: version "13.4.13" resolved "https://registry.yarnpkg.com/next/-/next-13.4.13.tgz#8824c5702daa2ef691386871c9158a6324df33d6" @@ -3404,6 +3741,11 @@ npm-run-path@^5.1.0: dependencies: path-key "^4.0.0" +number-to-words@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/number-to-words/-/number-to-words-1.2.4.tgz#e0f124de9628f8d86c4eeb89bac6c07699264501" + integrity sha512-/fYevVkXRcyBiZDg6yzZbm0RuaD6i0qRfn8yr+6D0KgBMOndFPxuW10qCHpzs50nN8qKuv78k8MuotZhcVX6Pw== + oauth@^0.9.15: version "0.9.15" resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" @@ -3542,6 +3884,11 @@ optionator@^0.9.3: prelude-ls "^1.2.1" type-check "^0.4.0" +p-debounce@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/p-debounce/-/p-debounce-3.0.2.tgz#8bc7aa524e512b8572f75c6a41858b7a2222a1ee" + integrity sha512-I5Tswd6ow31zGbudKRtKBlgI85n6BQrXdsuv1cN7MjNP3xCRSVsX8L57SzIegEx+b77LXzvGt5GJcXr7gBsiXA== + p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -3556,6 +3903,11 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +pako@~1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -3608,16 +3960,21 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.0, picocolors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +popper.js@1.16.1-lts: + version "1.16.1-lts" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" + integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== + postcss@8.4.14: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" @@ -3628,13 +3985,13 @@ postcss@8.4.14: source-map-js "^1.0.2" postcss@^8.3.11: - version "8.4.27" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057" - integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== + version "8.4.41" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" + integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" + nanoid "^3.3.7" + picocolors "^1.0.1" + source-map-js "^1.2.0" preact-render-to-string@^5.1.19: version "5.2.6" @@ -3670,6 +4027,11 @@ pretty-format@^3.8.0: resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385" integrity sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew== +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + prop-types@15.8.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" @@ -3753,15 +4115,10 @@ react-is@^16.13.1, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-markdown-editor-lite@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/react-markdown-editor-lite/-/react-markdown-editor-lite-1.3.4.tgz#77992d2389b9427a06595c63d95f52be66e5fea9" - integrity sha512-PhS4HzLzSgCsr8O9CfJX75nAYmZ0NwpfviLxARlT0Tau+APOerDSHSw3u9hub5wd0EqmonWibw0vhXXNu4ldRA== - dependencies: - "@babel/runtime" "^7.6.2" - classnames "^2.2.6" - eventemitter3 "^4.0.0" - uuid "^8.3.2" +"react-is@^16.8.0 || ^17.0.0": + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-onclickoutside@^6.12.2: version "6.13.0" @@ -3804,6 +4161,16 @@ react-style-singleton@^2.2.1: invariant "^2.2.4" tslib "^2.0.0" +react-transition-group@^4.4.0: + version "4.4.5" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" + integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-youtube@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/react-youtube/-/react-youtube-10.1.0.tgz#7e5670c764f12eb408166e8eb438d788dc64e8b5" @@ -3829,6 +4196,19 @@ readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -3837,9 +4217,9 @@ readdirp@~3.6.0: picomatch "^2.2.1" regenerator-runtime@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" - integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0: version "1.5.0" @@ -3932,6 +4312,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + safe-regex-test@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" @@ -3953,6 +4338,18 @@ sanitize-html@^2.11.0: parse-srcset "^1.0.2" postcss "^8.3.11" +sanitize-html@^2.3.2: + version "2.13.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae" + integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^8.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + sass@^1.64.2: version "1.64.2" resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.2.tgz#0d9805ad6acf31c59c3acc725fcfb91b7fcc6909" @@ -3962,6 +4359,18 @@ sass@^1.64.2: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" +sax@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== + +sbd@^1.0.18: + version "1.0.19" + resolved "https://registry.yarnpkg.com/sbd/-/sbd-1.0.19.tgz#5cdcb5e8210e3fc79170b62a61eb85b30a0b87c1" + integrity sha512-b5RyZMGSrFuIB4AHdbv12uYHS8YGEJ36gtuvG3RflbJGY+T0dXmAL0E4vZjQqT2RsX0v+ZwVqhV2zsGr5aFK9w== + dependencies: + sanitize-html "^2.3.2" + scheduler@^0.23.0: version "0.23.0" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" @@ -3969,6 +4378,13 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" +scroll-into-view-if-needed@^2.2.20: + version "2.2.31" + resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz#d3c482959dc483e37962d1521254e3295d0d1587" + integrity sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA== + dependencies: + compute-scroll-into-view "^1.0.20" + secp256k1@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" @@ -3990,6 +4406,11 @@ semver@^7.3.8, semver@^7.5.4: dependencies: lru-cache "^6.0.0" +setimmediate@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== + sha.js@^2.4.0: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -4039,16 +4460,76 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +slate-history@^0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/slate-history/-/slate-history-0.59.0.tgz#3c5ecbe8893ce2ae9523068ccc17c62d52b24a1a" + integrity sha512-LBaVmxA7QKr5faDUt0rjgFH4TwAslyl4rrltpM6PVZYeJ301KkpUTqZf83asDjwgt5pl9nEx4huKL7IlX+rZfA== + dependencies: + immer "^5.0.0" + is-plain-object "^3.0.0" + +slate-react@^0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.59.0.tgz#c8043dce7ea71279f314d9951c32e4f548b1ea0b" + integrity sha512-Fx5vfTi0s1fY5PaXzPH8uA9mW8aevVVYrGGvqX/k363tlPDnQSs/QTibIyFl1Y3MPJ+GdocoyOGjAaZMUIXfIg== + dependencies: + "@types/is-hotkey" "^0.1.1" + "@types/lodash" "^4.14.149" + direction "^1.0.3" + is-hotkey "^0.1.6" + is-plain-object "^3.0.0" + lodash "^4.17.4" + scroll-into-view-if-needed "^2.2.20" + +"slate-transcript-editor@https://github.com/kouloumos/slate-transcript-editor.git#v0.1.6": + version "0.1.6-alpha.19" + resolved "https://github.com/kouloumos/slate-transcript-editor.git#4c2e1e7b47b1af2d1820c181ea2245516b9ffba7" + dependencies: + "@material-ui/core" "^4.11.3" + "@material-ui/icons" "^4.11.2" + docx "4.7.1" + fontsource-roboto "^4.0.0" + lodash "^4.17.20" + p-debounce "^3.0.1" + prop-types "^15.7.2" + sbd "^1.0.18" + slate "^0.59.0" + slate-history "^0.59.0" + slate-react "^0.59.0" + smpte-timecode "^1.2.3" + stt-align-node "^2.0.1" + +slate@^0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/slate/-/slate-0.59.0.tgz#3169daf2f036e84aa149f60e0d12ef2fc4c0839e" + integrity sha512-M4UTMkXExxuq8tCD+knn7BtV2pmY8pepay++EF59rmg/v4RB6X1gNzA0xP3aw2rqYl8TmWdOBdy9InFrm3WyXw== + dependencies: + "@types/esrever" "^0.2.0" + esrever "^0.2.0" + immer "^5.0.0" + is-plain-object "^3.0.0" + tiny-warning "^1.0.3" + slugify@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.6.tgz#2d4ac0eacb47add6af9e04d3be79319cbcc7924b" integrity sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +smpte-timecode@^1.2.3: + version "1.3.6" + resolved "https://registry.yarnpkg.com/smpte-timecode/-/smpte-timecode-1.3.6.tgz#1926d4c8be304a77940c44fba0c43f7efdc28ece" + integrity sha512-Jvp9rfuhntm3AZM9qtcN0FdejzyXSi+pYFqqmpDA/WeyunHst46t2k0byDIbhl996JKk9If+1ZYgDGeztZBdlw== + +"source-map-js@>=0.6.2 <2.0.0": version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.0.2, source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== + source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -4107,6 +4588,13 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -4134,6 +4622,15 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +stt-align-node@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/stt-align-node/-/stt-align-node-2.0.1.tgz#3bff4a8c3ce812ebf5c9963c2154a6bde025dc82" + integrity sha512-d/v4VU8B1yZJmrFv+0V9yo/jszyHcibkFz/EOVYmE1NnNL4KI4R+DsN1R4aeu3HZc8tFJmZ2oV3sLcyPoAig+Q== + dependencies: + difflib "^0.2.4" + everpolate "0.0.3" + number-to-words "^1.2.4" + styled-jsx@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f" @@ -4188,6 +4685,11 @@ tiny-invariant@^1.0.6: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw== +tiny-warning@^1.0.2, tiny-warning@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + titleize@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" @@ -4311,6 +4813,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" + integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg== + universal-user-agent@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" @@ -4353,7 +4860,7 @@ use-sync-external-store@^1.2.0: resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== -util-deprecate@^1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -4419,6 +4926,18 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +xml-js@^1.6.8: + version "1.6.11" + resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" + integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g== + dependencies: + sax "^1.2.4" + +xml@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" + integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"