${editFileProperties?.fullDescription}
`; + if (editIssueProperties) { + setTitle(editIssueProperties?.title || ""); + setFiles(editIssueProperties?.files || []); + if (editIssueProperties?.htmlDescription) { + setDescription(editIssueProperties?.htmlDescription); + } else if (editIssueProperties?.fullDescription) { + const paragraph = `${editIssueProperties?.fullDescription}
`; setDescription(paragraph); } + verifyPayment(editIssueProperties).then(isIssuePaid => { + setIsIssuePaid(isIssuePaid); + }); const categoriesFromEditFile = - getCategoriesFromObject(editFileProperties); - setEditCategories(categoriesFromEditFile); + getCategoriesFromObject(editIssueProperties); + setSelectedCategories(categoriesFromEditFile); } - }, [editFileProperties]); + }, [editIssueProperties]); + const onClose = () => { dispatch(setEditFile(null)); setVideoPropertiesToSetToRedux(null); @@ -142,14 +160,22 @@ export const EditIssue = () => { setCoverImage(""); }; - async function publishQDNResource() { + async function publishQDNResource(payFee: boolean) { try { - const categoryList = categoryListRef.current?.getSelectedCategories(); - if (!description) throw new Error("Please enter a description"); - if (!categoryList[0]) throw new Error("Please select a category"); - if (!editFileProperties) return; + if (!categoryListRef.current) throw new Error("No CategoryListRef found"); if (!userAddress) throw new Error("Unable to locate user address"); + if (!description) throw new Error("Please enter a description"); + const allCategoriesSelected = !selectedCategories.includes(""); + if (!allCategoriesSelected) + throw new Error("All Categories must be selected"); + console.log("categories", selectedCategories); + const QappsCategoryID = "3"; + if ( + selectedCategories[0] === QappsCategoryID && + !autocompleteRef?.current?.getSelectedValue() + ) + throw new Error("Select a published Q-App"); let errorMsg = ""; let name = ""; if (username) { @@ -160,7 +186,7 @@ export const EditIssue = () => { "Cannot publish without access to your name. Please authenticate."; } - if (editFileProperties?.user !== username) { + if (editIssueProperties?.user !== username) { errorMsg = "Cannot publish another user's resource"; } @@ -223,9 +249,8 @@ export const EditIssue = () => { filename = alphanumericString; } - let metadescription = - `**${categoryListRef.current?.getCategoriesFetchString()}**` + - fullDescription.slice(0, 150); + const categoryString = `**${categoryListRef.current?.getSelectedCategories()}**`; + let metadescription = categoryString + fullDescription.slice(0, 150); const requestBodyVideo: any = { action: "PUBLISH_QDN_RESOURCE", @@ -248,23 +273,50 @@ export const EditIssue = () => { size: file.size, }); } + const selectedQappName = autocompleteRef?.current?.getSelectedValue(); - const fileObject: any = { + const issueObject: any = { title, - version: editFileProperties.version, + version: editIssueProperties.version, fullDescription, htmlDescription: description, - commentsId: editFileProperties.commentsId, + commentsId: editIssueProperties.commentsId, ...categoryListRef.current?.categoriesToObject(), files: fileReferences, images: imagePublisherRef?.current?.getImageArray(), + QappName: selectedQappName, + feeData: editIssueProperties?.feeData, }; + if (payFee) { + const publishFeeResponse = await payPublishFeeQORT(feeAmountBase); + if (!publishFeeResponse) { + dispatch( + setNotification({ + msg: "Fee publish rejected by user.", + alertType: "error", + }) + ); + return; + } + if (log) console.log("feeResponse: ", publishFeeResponse); - let metadescription = - `**${categoryListRef.current?.getCategoriesFetchString()}**` + - fullDescription.slice(0, 150); + issueObject.feeData = { signature: publishFeeResponse }; + dispatch(updateInHashMap(issueObject)); // shows issue as paid right away? + } - const fileObjectToBase64 = await objectToBase64(fileObject); + const QappNameString = autocompleteRef?.current?.getQappNameFetchString(); + const categoryString = + categoryListRef.current?.getCategoriesFetchString(selectedCategories); + const metaDataString = `**${categoryString + QappNameString}**`; + + let metadescription = metaDataString + fullDescription.slice(0, 150); + if (log) console.log("description is: ", metadescription); + if (log) console.log("description length is: ", metadescription.length); + if (log) console.log("characters left:", 240 - metadescription.length); + if (log) + console.log("% of characters used:", metadescription.length / 240); + + const fileObjectToBase64 = await objectToBase64(issueObject); // Description is obtained from raw data const requestBodyJson: any = { @@ -274,7 +326,7 @@ export const EditIssue = () => { data64: fileObjectToBase64, title: title.slice(0, 50), description: metadescription, - identifier: editFileProperties.id, + identifier: editIssueProperties.id, tag1: QSUPPORT_FILE_BASE, filename: `video_metadata.json`, }; @@ -287,10 +339,13 @@ export const EditIssue = () => { setPublishes(multiplePublish); setIsOpenMultiplePublish(true); setVideoPropertiesToSetToRedux({ - ...editFileProperties, - ...fileObject, + ...editIssueProperties, + ...issueObject, }); } catch (error: any) { + console.log("error is: ", error); + if (error === "User declined request") return; + let notificationObj: any = null; if (typeof error === "string") { notificationObj = { @@ -315,26 +370,15 @@ export const EditIssue = () => { } } - const handleOnchange = (index: number, type: string, value: string) => { - // setFiles((prev) => { - // let formattedValue = value - // console.log({type}) - // if(type === 'title'){ - // formattedValue = value.replace(/[^a-zA-Z0-9\s]/g, "") - // } - // const copyFiles = [...prev]; - // copyFiles[index] = { - // ...copyFiles[index], - // [type]: formattedValue, - // }; - // return copyFiles; - // }); + const isShowQappNameTextField = () => { + const QappID = "3"; + return selectedCategories[0] === QappID; }; return ( <>
- {loading ? (
- 
- )}
-
- )
-}
-
-export default ResponsiveImage
+import React, { useState, useEffect, CSSProperties } from 'react'
+import Skeleton from '@mui/material/Skeleton'
+import { Box } from '@mui/material'
+
+interface ResponsiveImageProps {
+ src: string
+ width: number
+ height: number
+ alt?: string
+ className?: string
+ style?: CSSProperties
+}
+
+const ResponsiveImage: React.FC
+ {loading ? (
+
+ )
+}
+
+export default ResponsiveImage
diff --git a/src/components/StatsData.tsx b/src/components/StatsData.tsx
index a28ba3d..61f29bd 100644
--- a/src/components/StatsData.tsx
+++ b/src/components/StatsData.tsx
@@ -15,14 +15,14 @@ export const StatsData = () => {
}));
const {
- getFiles,
- checkAndUpdateFile,
- getFile,
+ getIssues,
+ checkAndUpdateIssue,
+ getIssue,
hashMapFiles,
- getNewFiles,
- checkNewFiles,
- getFilesFiltered,
- getFilesCount,
+ getNewIssues,
+ checkNewIssues,
+ getIssuesFiltered,
+ getIssuesCount,
} = useFetchIssues();
const totalIssuesPublished = useSelector(
@@ -36,8 +36,8 @@ export const StatsData = () => {
);
useEffect(() => {
- getFilesCount();
- }, [getFilesCount]);
+ getIssuesCount();
+ }, [getIssuesCount]);
return (
totalIssuesPublished > 0 && (
diff --git a/src/components/common/AutocompleteQappNames.tsx b/src/components/common/AutocompleteQappNames.tsx
new file mode 100644
index 0000000..cea649c
--- /dev/null
+++ b/src/components/common/AutocompleteQappNames.tsx
@@ -0,0 +1,135 @@
+import React, { useEffect, useImperativeHandle, useState } from "react";
+import { Autocomplete, SxProps, Theme } from "@mui/material";
+import { CustomInputField } from "../PublishIssue/PublishIssue-styles.tsx";
+import { log } from "../../constants/Misc.ts";
+
+interface AutoCompleteQappNamesProps {
+ namesList?: string[];
+ afterChange?: (selectedName: string) => void;
+ sx?: SxProps
-
- )
-}
-
-export default LazyLoad
+import React, { useState, useEffect, useRef } from 'react'
+import { useInView } from 'react-intersection-observer'
+import CircularProgress from '@mui/material/CircularProgress'
+
+interface Props {
+ onLoadMore: () => Promise
-
-
+
+ )
+}
+
+export default LazyLoad
diff --git a/src/components/common/Notification/Notification.tsx b/src/components/common/Notification/Notification.tsx
index 501f081..a823b85 100644
--- a/src/components/common/Notification/Notification.tsx
+++ b/src/components/common/Notification/Notification.tsx
@@ -1,86 +1,86 @@
-import { useDispatch, useSelector } from 'react-redux'
-import { toast, ToastContainer, Zoom, Slide } from 'react-toastify'
-import { removeNotification } from '../../../state/features/notificationsSlice'
-import 'react-toastify/dist/ReactToastify.css'
-import { RootState } from '../../../state/store'
-
-const Notification = () => {
- const dispatch = useDispatch()
-
- const { alertTypes } = useSelector((state: RootState) => state.notifications)
-
- if (alertTypes.alertError) {
- toast.error(`❌ ${alertTypes?.alertError}`, {
- position: 'bottom-right',
- autoClose: 4000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- icon: false
- })
- dispatch(removeNotification())
- }
- if (alertTypes.alertSuccess) {
- toast.success(`✔️ ${alertTypes?.alertSuccess}`, {
- position: 'bottom-right',
- autoClose: 4000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- icon: false
- })
- dispatch(removeNotification())
- }
- if (alertTypes.alertInfo) {
- toast.info(`${alertTypes?.alertInfo}`, {
- position: 'top-right',
- autoClose: 1300,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: 'light'
- })
- dispatch(removeNotification())
- }
-
- if (alertTypes.alertInfo) {
- return (
-
+
+
-
- {
- dispatch(setVideoPlaying(null))
- }} sx={{
- cursor: 'pointer',
- backgroundColor: 'rgba(0,0,0,.5)'
- }}>
-
-
-
-
+
+ {
+ dispatch(setVideoPlaying(null))
+ }} sx={{
+ cursor: 'pointer',
+ backgroundColor: 'rgba(0,0,0,.5)'
+ }}>
+
+
+
+