- { walletAddress === comment.from ?
- [
- You commented: , date,
- Edit,
- Delete
- ]:
- [{comment.identity} commented:, date]
- }
-
-
-
- { commentError }
-
-
-
- )
-}
-
-export default Comment
\ No newline at end of file
diff --git a/src/components/comments/CommentEditor.jsx b/src/components/comments/CommentEditor.jsx
deleted file mode 100644
index bda4afa..0000000
--- a/src/components/comments/CommentEditor.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import './comments.css'
-import { useState } from "react";
-import CommentManager from "../../services/CommentManager"
-
-const CommentEditor = ({ commentId, content, toggleEditComment, reloadComments }) => {
- const DEFAULT_BTN_LABEL = 'Comment'
-
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
-
- const [contents, setContents] = useState(content);
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents);
- setBtnEnabled(newContents && newContents.trim().length > 0);
- }
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const cancelEditing = () => {
- setSaving(false);
- setBtnEnabled(false);
- toggleEditComment();
- }
-
- const onFocus = event => {
- const element = event.target;
- element.selectionStart = element.value.length;
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = await window.point.storage.putString({data: contents});
- // Save the post contents storage id in the PoinSocial Smart Contract
- await CommentManager.editComment(commentId, storageId);
- setSaving(false);
- // calling renderCommentsImmediate instead of fetching the comments due to issues with fetching content too soon from Arweave after posting.
- // PD: using a timeout of 1000 apparently works
- reloadComments();
- setContents('');
- toggleEditComment(false);
- } catch (err) {
- setSaving(false);
- console.error('Error: ', err);
- }
- };
-
- return (
- -
{comment.contents}
-
-
-
-
- )
-}
-
-export default CommentEditor
diff --git a/src/components/comments/CommentItem.jsx b/src/components/comments/CommentItem.jsx
index 99598da..db8450b 100644
--- a/src/components/comments/CommentItem.jsx
+++ b/src/components/comments/CommentItem.jsx
@@ -1,44 +1,68 @@
+import clsx from 'clsx';
import { useEffect, useState, useRef } from "react";
import { useAppContext } from '../../context/AppContext';
+
import { makeStyles } from '@material-ui/core/styles';
+import { usePushingGutterStyles } from '@mui-treasury/styles/gutter/pushing';
+import { useLabelIconStyles } from '@mui-treasury/styles/icon/label';
+
+import CircularProgressWithIcon from '../../components/generic/CircularProgressWithIcon';
+import CollapsibleTypography from '../generic/CollapsibleTypography';
+import UserAvatar from '../avatar/UserAvatar';
+import RichTextField from '../generic/RichTextField';
+import TipCard from '../tip/TipCard';
+import ModeCommentOutlinedIcon from '@material-ui/icons/ModeCommentOutlined';
+import ThumbUpOutlinedIcon from '@material-ui/icons/ThumbUpOutlined';
+import ThumbUpIcon from '@material-ui/icons/ThumbUp';
+import ThumbDownOutlinedIcon from '@material-ui/icons/ThumbDownOutlined';
+import ThumbDownIcon from '@material-ui/icons/ThumbDown';
import CancelOutlinedIcon from '@material-ui/icons/CancelOutlined';
import EditOutlinedIcon from '@material-ui/icons/EditOutlined';
import SaveOutlinedIcon from '@material-ui/icons/SaveOutlined';
import DeleteOutlineOutlinedIcon from '@material-ui/icons/DeleteOutlineOutlined';
import MoreHorizOutlinedIcon from '@material-ui/icons/MoreHorizOutlined';
+import CardGiftcardOutlinedIcon from '@material-ui/icons/CardGiftcardOutlined';
+import FlagOutlinedIcon from '@material-ui/icons/FlagOutlined';
+import VisibilityOutlinedIcon from '@material-ui/icons/VisibilityOutlined';
import { format } from "timeago.js";
-import orderBy from 'lodash/orderBy';
import { Link } from "wouter";
+import orderBy from 'lodash/orderBy';
-import CollapsibleTypography from '../generic/CollapsibleTypography';
-import UserAvatar from '../avatar/UserAvatar';
-import RichTextField from '../generic/RichTextField';
-
-import {Button,
- Dialog,
- DialogActions,
- DialogContent,
- DialogContentText,
- DialogTitle,
- IconButton,
- Menu,
- MenuItem,
- ListItem,
- ListItemText,
- ListItemAvatar,
- ListItemIcon,
- ListItemSecondaryAction,
- Typography
- } from '@material-ui/core';
+import { ethers } from "ethers";
+
+import {
+ Backdrop,
+ Button,
+ Collapse,
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogContentText,
+ DialogTitle,
+ IconButton,
+ Menu,
+ MenuItem,
+ ListItem,
+ ListItemText,
+ ListItemAvatar,
+ ListItemIcon,
+ ListItemSecondaryAction,
+ Typography
+} from '@material-ui/core';
import Skeleton from '@material-ui/lab/Skeleton';
+import CommentList from '../comments/CommentList';
+
import point from "../../services/PointSDK";
import UserManager from "../../services/UserManager";
+import ContentManager from "../../services/ContentManager";
import CommentManager from "../../services/CommentManager";
-import EventConstants from "../../events";
+import EventManager from '../../services/EventManager';
+
+import Constants from "../../constants";
const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -46,7 +70,7 @@ const useStyles = makeStyles((theme) => ({
backdrop: {
position: "absolute",
zIndex: theme.zIndex.drawer - 1,
- opacity: 0.9
+ opacity: 1
},
root: {
width: '100%',
@@ -66,104 +90,133 @@ const useStyles = makeStyles((theme) => ({
},
item: {
listStyleType: "none"
- }
-
+ },
+ bottomBar: {
+ display: 'flex',
+ flexDirection: 'row'
+ },
+ warning: {
+ padding: theme.spacing(1, 1),
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'center',
+ justifyContent: 'center',
+ backgroundColor: '#eee',
+ },
}));
-const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
+const CommentItem = ({parentId, comment, setAlert}) => {
const [loading, setLoading] = useState(false);
+ const [isOwner, setIsOwner] = useState(false);
+
+ const [expanded, setExpanded] = useState(false);
+
+ const [reply, setReply] = useState(false);
+
+ const [like, setLike] = useState(false);
+ const [likes, setLikes] = useState(0);
+ const [likeLoading, setLikeLoading] = useState(false);
+
+ const [dislike, setDislike] = useState(false);
+ const [dislikes, setDislikes] = useState(0);
+ const [dislikeLoading, setDislikeLoading] = useState(false);
+
+ const [tip, setTip] = useState(false);
+ const [tips, setTips] = useState(0);
+ const [tipLoading, setTipLoading] = useState(false);
+
+ const [comments, setComments] = useState();
+ const [flagged, setFlagged] = useState(comment.flagged);
const [actionsOpen, setActionsOpen] = useState(false);
const [edit, setEdit] = useState(false);
- const [prompt, showPrompt] = useState(false);
- const [isOwner, setIsOwner] = useState(false);
- const [updatedAt, setUpdatedAt] = useState();
+ const [promptDelete, showPromptDelete] = useState(false);
+ const [promptTip, showPromptTip] = useState(false);
+ const [promptFlag, showPromptFlag] = useState(false);
+
+ const gutterStyles = usePushingGutterStyles({ space: 2, firstExcluded: false });
+ const iconLabelStyles = useLabelIconStyles({ linked: true });
const styles = useStyles();
-
+
const { walletAddress, profile, identity, processing, setProcessing, events } = useAppContext();
const [name, setName] = useState();
+ const [handle, setHandle] = useState();
const [content, setContent] = useState();
+ const [image, setImage] = useState();
const [date, setDate] = useState();
+ const [updatedAt, setUpdatedAt] = useState();
const actionsAnchor = useRef();
const inputRef = useRef();
-
+ const expandButton = useRef();
+ const tipRef = useRef();
+
useEffect(() => {
loadComment();
+ listenEvents();
+ return unlistenEvents;
}, []);
- useEffect(() => {
- if (events.listeners["PointSocial"] &&
- events.listeners["PointSocial"]["StateChange"]) {
- events.listeners["PointSocial"]["StateChange"]
- .on("StateChange", handleEvents, { type: "comment", id: comment.id });
- }
- return () => {
- if (events.listeners["PointSocial"] &&
- events.listeners["PointSocial"]["StateChange"]) {
- events.listeners["PointSocial"]["StateChange"]
- .removeListener("StateChange", handleEvents, { type: "comment", id: comment.id });
- }
- }
- }, []);
+ const listenEvents = async () => {
+ (await events.subscribe("SocialContent", "CommentEvent")).on("CommentEvent", handleCommentEvents, { type: `${parentId}-"comment"-${comment.id}`});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleReactionEvents, { type: `${parentId}-"comment"-${comment.id}`});
+ }
- const handleEvents = async(event) => {
- if (event &&
- (event.component === EventConstants.Component.Comment) &&
- (event.id === comment.id)) {
+ const unlistenEvents = async () => {
+ EventManager.removeListener(events, "SocialContent", "CommentEvent", handleCommentEvents, { type: `${parentId}-"comment"-${comment.id}`});
+ EventManager.removeListener(events, "SocialContent", "ReactionEvent", handleReactionEvents, { type: `${parentId}-"comment"-${comment.id}`});
+ }
+
+ const handleCommentEvents = async(event) => {
+ if (event && (event.commentId === comment.id.toString())) {
switch(event.action) {
- case EventConstants.Action.Edit:
- if (event.from.toLowerCase() !== walletAddress.toLowerCase()) {
- await reloadComment();
- }
+ case Constants.CommentAction.Edit:
+ await reloadCommentContent();
+ break;
+ case Constants.CommentAction.Reply:
+ case Constants.CommentAction.Reaction:
+ await reloadCommentReactions();
break;
default:
break;
}
- }
+ }
+ }
+
+ const handleReactionEvents = async(event) => {
+ if (event &&
+ (event.contentType === Constants.ContentType.Comment) &&
+ (event.contentId === comment.id)
+ ) {
+ await reloadCommentReactions();
+ }
}
- const reloadComment = async () => {
+ const reloadCommentContent = async () => {
setLoading(true);
try {
- let updated;
- const c = await CommentManager.getComment(comment.id);
- if ((parseInt(c[3]) !== 0)) {
- const contents = (c[2] === EMPTY)? "" : await point.getString(c[2], {encoding: 'utf-8'});
+ comment = await ContentManager.mapContent(Constants.ContentType.Comment, await CommentManager.getComment(comment.id));
+ try {
+ const contents =
+ comment.contents === EMPTY
+ ? EMPTY
+ : await point.getString(comment.contents, { encoding: 'utf-8' });
setContent(contents);
+
+ /*if (comment.image !== EMPTY) {
+ setMedia(`/_storage/${comment.image}`);
+ }*/
+
+ setDate(comment.updatedAt);
+ if (comment.updatedAt !== comment.createdAt)
+ setUpdatedAt(comment.updatedAt);
}
-
- const updatedEvents =
- orderBy(
- (await point.contractEvents(window.location.hostname,
- "PointSocial",
- "StateChange",
- {
- id: comment.id,
- component: "2",
- action: "4",
- cursor: "latest"
- })
- ).map(event => {
- const evt = event.data;
- evt.date = parseInt(evt.date);
- return evt;
- }),
- ['date'],
- ['desc']
- );
-
- if (updatedEvents[0]) {
- updated = updatedEvents[0].date * 1000;
+ catch(error) {
+ setAlert(error.message);
}
-
- if (updated)
- setUpdatedAt(updated);
-
- setDate(updated || comment.createdAt);
}
catch(error) {
console.warn(error.message);
@@ -173,14 +226,33 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
}
}
- const loadComment = async () => {
+ const reloadCommentReactions = async () => {
+ try {
+ comment = await ContentManager.mapContent(Constants.ContentType.Comment, await CommentManager.getComment(comment.id));
+ setLike(comment.liked);
+ setDislike(comment.disliked);
+ setFlagged(comment.flagged);
+ setTip(comment.tipped);
+ setLikes(comment.likesCount);
+ setDislikes(comment.dislikesCount);
+ setComments(comment.commentsCount);
+ setTips(comment.tipsCount);
+ setDate(comment.updatedAt);
+ if (comment.updatedAt !== comment.createdAt)
+ setUpdatedAt(comment.updatedAt);
+ }
+ catch(error) {
+ console.log(error);
+ console.warn(error.message);
+ }
+ }
+ const loadComment = async () => {
setLoading(true);
- let updated;
-
if (comment.from.toLowerCase() === walletAddress.toLowerCase()) {
setIsOwner(true);
setName((profile && profile.displayName)||identity);
+ setHandle(`@${identity}`);
}
else {
try {
@@ -188,6 +260,7 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
const { identity } = await point.ownerToIdentity(comment.from);
const name = (profile[0] === EMPTY)? identity : await point.getString(profile[0], {encoding: 'utf-8'});
setName(name);
+ setHandle(`@${identity}`);
}
catch(error) {
setAlert(error.message);
@@ -195,58 +268,42 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
}
try {
- const updatedEvents =
- orderBy(
- (await point.contractEvents(window.location.hostname,
- "PointSocial",
- "StateChange",
- {
- id: comment.id,
- component: "2",
- action: "4",
- cursor: "latest"
- })
- ).map(event => {
- const evt = event.data;
- evt.date = parseInt(evt.date);
- return evt;
- }),
- ['date'],
- ['desc']
- );
-
- if (updatedEvents[0]) {
- updated = updatedEvents[0].date * 1000;
- }
- }
- catch(error) {
- console.warn(error.message);
- }
- finally {
- setDate(updatedAt || comment.createdAt);
- }
-
- if (updated)
- setUpdatedAt(updated);
-
- setDate(updated || comment.createdAt);
-
- try {
- const contents = (comment.contents === EMPTY)? "" : await point.getString(comment.contents, {encoding: 'utf-8'});
+ const contents =
+ comment.contents === EMPTY
+ ? EMPTY
+ : await point.getString(comment.contents, { encoding: 'utf-8' });
setContent(contents);
+
+ /*if (comment.image !== EMPTY) {
+ setMedia(`/_storage/${comment.image}`);
+ }*/
}
catch(error) {
setAlert(error.message);
}
+ setLike(comment.liked);
+ setDislike(comment.disliked);
+ setFlagged(comment.flagged);
+ setTip(comment.tipped);
+ setLikes(comment.likesCount);
+ setDislikes(comment.dislikesCount);
+ setComments(comment.commentsCount);
+ setTips(comment.tipsCount);
+ setDate(comment.updatedAt);
+
+ if (comment.updatedAt !== comment.createdAt)
+ setUpdatedAt(comment.updatedAt);
+
setLoading(false);
};
const handleAction = (action) => {
-
setActionsOpen(false);
-
switch(action) {
+ case 'flag':
+ showPromptFlag(true);
+ break;
case 'edit':
startEdit();
break;
@@ -258,7 +315,7 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
cancelEdit();
break;
case 'delete':
- showPrompt(true);
+ showPromptDelete(true);
break;
}
};
@@ -267,8 +324,7 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
try {
setProcessing(true);
setLoading(true);
- await CommentManager.deleteComment(postId, comment.id);
- parentDeleteComment(comment.id);
+ await CommentManager.deleteComment(parentId, comment.id);
}
catch(error) {
setAlert(error.message);
@@ -279,13 +335,8 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
}
};
- const cancelEdit = function() {
- setEdit(false);
- };
-
- const startEdit = () => {
- setEdit(true);
- };
+ const cancelEdit = () => setEdit(false);
+ const startEdit = () => setEdit(true);
const saveEdit = async () => {
try {
@@ -307,7 +358,7 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
setProcessing(false);
}
};
-
+
const handleActionsOpen = () => {
setActionsOpen(true);
};
@@ -315,7 +366,76 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
const handleActionsClose = () => {
setActionsOpen(false);
};
+
+ const handleExpandClick = () => {
+ setExpanded(!expanded);
+ };
+ const toggleReply = async () => {
+ setReply(!reply);
+ }
+
+ const toggleLike = async () => {
+ try {
+ setProcessing(true);
+ setLikeLoading(true);
+ await CommentManager.addLikeToComment(comment.id);
+ } catch (error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLikeLoading(false);
+ setProcessing(false);
+ }
+ };
+
+ const flagComment = async () => {
+ try {
+ setProcessing(true);
+ showPromptFlag(false);
+ setLoading(true);
+ await CommentManager.flagComment(comment.id);
+ } catch (error) {
+ console.error(error.message);
+ setAlert(error.message);
+ } finally {
+ setLoading(false);
+ setProcessing(false);
+ }
+ };
+
+ const toggleDislike = async () => {
+ try {
+ setProcessing(true);
+ setDislikeLoading(true);
+ await CommentManager.addDislikeToComment(comment.id);
+ } catch (error) {
+ setAlert(error.message);
+ }
+ finally {
+ setDislikeLoading(false);
+ setProcessing(false);
+ }
+ };
+
+ const addTip = async () => {
+ try {
+ const amount = tipRef.current.amount();
+ if (amount <= 0)
+ throw new Error("You cannot send an empty Tip!");
+ setProcessing(true);
+ setTipLoading(true);
+ await CommentManager.tipComment(comment.id, (ethers.utils.parseEther(amount.toString()).toHexString()));
+ } catch (error) {
+ setAlert(error.message);
+ }
+ finally {
+ showPromptTip(false);
+ setTipLoading(false);
+ setProcessing(false);
+ }
+ };
+
const commentActions = <>
-
+
const dialog = <>
+ const tipDialog = <>
+
+
+
+ const flagDialog = (
+ <>
+
+
+ );
+
return (
-
-
+
+
+ {flagged && (
+
+
+
@@ -408,6 +606,7 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
}
+ {loading ?
•
{loading ?
{ updatedAt && [Edited] }
@@ -435,9 +634,137 @@ const CommentItem = ({postId, comment, parentDeleteComment, setAlert}) => {
}
+
- )
-}
+ );
+};
export default CommentItem
\ No newline at end of file
diff --git a/src/components/comments/CommentList.jsx b/src/components/comments/CommentList.jsx
index b7edacb..2e804ee 100644
--- a/src/components/comments/CommentList.jsx
+++ b/src/components/comments/CommentList.jsx
@@ -3,32 +3,27 @@ import { makeStyles } from '@material-ui/core/styles';
import { useAppContext } from '../../context/AppContext';
import CommentItem from './CommentItem';
+import RichTextField from '../generic/RichTextField';
import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
-
-import {Box,
- Divider,
- List,
- Typography,
- } from '@material-ui/core';
+import { Box,
+ Divider,
+ IconButton,
+ List,
+ Typography,
+} from '@material-ui/core';
import Skeleton from '@material-ui/lab/Skeleton';
import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
-import RichTextField from '../generic/RichTextField';
import SendOutlinedIcon from '@material-ui/icons/SendOutlined';
-import IconButton from '@material-ui/core/IconButton';
import SmsOutlinedIcon from '@material-ui/icons/SmsOutlined';
-/*
-import { VariableSizeList } from 'react-window';
-import AutoSizer from "react-virtualized-auto-sizer";
-import InfiniteLoader from "react-window-infinite-loader";
-import { TramRounded } from "@material-ui/icons";*/
-
import point from "../../services/PointSDK";
+import ContentManager from "../../services/ContentManager";
import CommentManager from "../../services/CommentManager";
-import EventConstants from "../../events";
+import EventManager from "../../services/EventManager";
+import Constants from "../../constants";
const useStyles = makeStyles((theme) => ({
backdrop: {
@@ -57,52 +52,38 @@ const useStyles = makeStyles((theme) => ({
alignItems: 'center',
justifyContent: 'center'
},
- virtual: {
- width: '100%',
- height: 400,
- backgroundColor: theme.palette.background.paper,
- },
- list: {
- minHeight: '50vh'
- }
}));
-const CommentList = ({postId, setUpperLoading, setAlert}) => {
+const CommentList = ({postId, replyTo = 0, setAlert}) => {
const [loading, setLoading] = useState(true);
const [comments, setComments] = useState([]);
const {events, processing, setProcessing} = useAppContext();
-
const inputRef = useRef();
-
const styles = useStyles();
useEffect(() => {
loadComments();
+ listenEvents();
+ return unlistenEvents;
}, []);
- useEffect(() => {
- if (events.listeners["PointSocial"] &&
- events.listeners["PointSocial"]["StateChange"]) {
- events.listeners["PointSocial"]["StateChange"]
- .on("StateChange", handleEvents, { type: "comments", id: postId });
- }
- return () => {
- if (events.listeners["PointSocial"] &&
- events.listeners["PointSocial"]["StateChange"]) {
- events.listeners["PointSocial"]["StateChange"]
- .removeListener("StateChange", handleEvents, { type: "comments", id: postId });
- }
- }
- }, []);
+ const listenEvents = async () => {
+ (await events.subscribe("SocialContent", "CommentEvent")).on("CommentEvent", handleEvents, { type: `${postId}-"commentList"-${replyTo}`});
+ }
+
+ const unlistenEvents = async () => {
+ EventManager.removeListener(events, "SocialContent", "CommentEvent", handleEvents, { type: `${postId}-"commentList"-${replyTo}`});
+ }
const handleEvents = async(event) => {
if (event &&
- (event.component === EventConstants.Component.Post) &&
- (event.id === postId)) {
+ (event.postId === postId.toString()) &&
+ (event.replyTo === replyTo.toString())) {
switch(event.action) {
- case EventConstants.Action.Comment:
- await loadComments();
+ case Constants.CommentAction.Create:
+ case Constants.CommentAction.Delete:
+ await loadComments(true);
break;
default:
break;
@@ -110,64 +91,56 @@ const CommentList = ({postId, setUpperLoading, setAlert}) => {
}
}
- // TODO: Set a progressive approach for comment loading // Maybe getting only the indices?
- const loadComments = async () => {
+ const loadComments = async (reload=false) => {
try {
- setLoading(true);
- const comments = await CommentManager.getComments(postId);
- const filtered = comments.filter(r => (parseInt(r[3]) !== 0)).map(([id, from, contents, createdAt]) => ({id, from, contents, createdAt: createdAt*1000}));
- setComments(filtered);
+ if (!reload) setLoading(true);
+ const raw = (
+ await Promise.all(
+ (await CommentManager.getComments(postId))
+ .map(comment => CommentManager.getComment(comment))
+ )
+ )
+ .filter(c => c[5] !== 0) // Filter deleted posts
+ .filter(c => c[9] === replyTo.toString()); // Filter posts that are not from the comment thread
+
+ const comments = (
+ await Promise.all(
+ raw.map(c => ContentManager.mapContent(Constants.ContentType.Comment, c))
+ )
+ );
+ setComments(comments);
}
catch(error) {
setAlert(error.message);
}
finally {
- setLoading(false);
+ if (!reload) setLoading(false);
}
};
-
+
const addComment = async () => {
if (inputRef && inputRef.current && inputRef.current.value && inputRef.current.value.trim()) {
try {
const contents = inputRef.current.value.trim();
setProcessing(true);
- setLoading(true);
const storageId = await point.putString(contents);
- const result = await CommentManager.addComment(postId, storageId);
- console.log(result);
+ await CommentManager.addComment(postId, replyTo, storageId);
setAlert("Your comment was successfully shared!|success");
- // TODO: Fetch only the latest comments using progressive loading
- //await loadComments();
+ reset();
}
catch(error) {
setAlert(error.message);
}
finally {
- setLoading(false);
setProcessing(false);
}
}
}
- /*
- const deleteComment = async (commentId) => {
- setComments((comments) => comments.filter(comment => comment.id !== commentId));
+
+ const reset = () => {
+ inputRef.current.value = null;
}
- */
-
- /*
- //TODO: get this value from the component
- const getItemSize = index => 75
-
- // TODO: Implement the loading
- const isItemLoaded = index => true;
- const loadMoreItems = (startIndex, stopIndex) => {};
-
- const renderRow = ({ index, style }) => {
- return (
-
+ { setFlagged(false) }}
+ >
+
+
+ {' '}
+ Warning: Potentially Sensitive Content
+
+
+ )}
+
+ {likeLoading ? (
+
+ ) : (
+
+ )}
+ {dislikeLoading ? (
+
+ ) : (
+
+ )}
+ {tipLoading ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+
{dialog}
+ {tipDialog}
+ {flagDialog}
{
@@ -179,7 +152,11 @@ const CommentList = ({postId, setUpperLoading, setAlert}) => {
:
+
diff --git a/src/components/comments/Comments.jsx b/src/components/comments/Comments.jsx
deleted file mode 100644
index 1a7cbc6..0000000
--- a/src/components/comments/Comments.jsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import "./comments.css";
-import { useState, useEffect } from "react";
-import { useAppContext } from '../../context/AppContext';
-import Comment from './Comment'
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Box from '@material-ui/core/Box';
-import { makeStyles } from '@material-ui/core/styles';
-import CommentManager from "../../services/CommentManager"
-
-const useStyles = makeStyles((theme) => ({
- root: {
- display: 'flex',
- alignItems: 'center',
- justifyContent: 'center'
- }
-}));
-
-const Comments = ({ postId, commentsCount, setCommentsCount, reloadPostCounters }) => {
- const DEFAULT_BTN_LABEL = 'Comment'
- const [comments, setComments] = useState([])
- const [contents, setContents] = useState()
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
- const [loading, setLoading] = useState(true);
- const { walletAddress } = useAppContext();
- const classes = useStyles();
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents)
- setBtnEnabled(newContents && newContents.trim().length > 0)
- }
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const getComments = async () => {
- setLoading(true);
- const comments = await fetchComments();
- setComments(comments);
- setLoading(false);
- }
-
- const reloadComments = async() => {
- setLoading(true);
- await new Promise((res, rej) => setTimeout(res, 1000));
- await reloadPostCounters();
- await getComments();
- setLoading(false);
- }
-
- useEffect(() => {
- getComments()
- }, [postId])
-
- const fetchComments = async () => {
- const response = await window.point.contract.call({contract: 'PointSocial', method: 'getAllCommentsForPost', params: [postId]});
-
- const comments = response.data.filter(r => (parseInt(r[3]) !== 0)).map(([id, from, contents, createdAt]) => (
- {id, from, contents, createdAt: createdAt*1000}
- )
- )
-
- const commentsContent = await Promise.all(comments.map(async (comment) => {
- const {data: contents} = await window.point.storage.getString({ id: comment.contents, encoding: 'utf-8' });
- const {data: {identity}} = await window.point.identity.ownerToIdentity({owner: comment.from});
- comment.identity = identity;
- comment.contents = contents;
- return comment;
- }))
-
- return commentsContent;
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = await window.point.storage.putString({data: contents});
- // Save the post contents storage id in the PoinSocial Smart Contract
- await CommentManager.addComment(postId, storageId)
- setSaving(false);
- // calling renderCommentsImmediate instead of fetching the comments due to issues with fetching content too soon from Arweave after posting.
- //renderCommentsImmediate(contents);
- reloadComments();
- setContents('');
- // await getComments();
- } catch (err) {
- setSaving(false);
- console.error('Error: ', err);
- }
- };
-
- const loadingBlock =
+ }
+ />
+
+
+ }
+ />
+
+
+ }
+ />
+
+
+
diff --git a/src/components/generic/TipDialog.jsx b/src/components/generic/TipDialog.jsx
new file mode 100644
index 0000000..6a1282e
--- /dev/null
+++ b/src/components/generic/TipDialog.jsx
@@ -0,0 +1,83 @@
+import { useEffect, useState } from 'react';
+
+import { Button,
+ Box,
+ Dialog,
+ DialogContent,
+ DialogActions,
+ Grid,
+ Typography,
+} from '@material-ui/core';
+
+import DialogTitle from './DialogTitle';
+import TipManager from '../../services/TipManager';
+import { ethers } from "ethers";
+
+const TipDialog = ({open, onClose, showDialog, setAlert}) => {
+
+ const [balance, setBalance] = useState(0);
+
+ const loadBalance = async () => {
+ try {
+ setBalance(
+ ethers.utils.formatEther(
+ ethers.BigNumber.from(
+ await TipManager.getBalance()
+ )
+ )
+ );
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ }
+
+ const withdraw = async() => {
+ try {
+ await TipManager.withdraw();
+ await loadBalance();
+ showDialog(false);
+ setAlert('Balance withdrawn successfully|success');
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+
+ }
+ }
+
+ const onEnter = async() => {
+ loadBalance();
+ }
+
+ return (
+
+ )
+}
+
+export default TipDialog;
\ No newline at end of file
diff --git a/src/components/leftbar/LeftBar.jsx b/src/components/leftbar/LeftBar.jsx
new file mode 100644
index 0000000..79ae065
--- /dev/null
+++ b/src/components/leftbar/LeftBar.jsx
@@ -0,0 +1,35 @@
+import { useState } from "react";
+import { useAppContext } from '../../context/AppContext';
+import { makeStyles } from '@material-ui/core/styles';
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ height: "100%",
+ padding: 0,
+ margin: 0,
+ },
+ container: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ minHeight: "100%",
+ flexDirection: "column",
+ justifyContent: "center",
+ maxWidth: '900px',
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ tab: {
+ padding: 0,
+ margin: 0,
+ },
+ tabpanel: {
+ padding: 0,
+ }
+}));
+
+const SideBar = () => {
+
+}
+
+export default SideBar
\ No newline at end of file
diff --git a/src/components/post/Post.jsx b/src/components/post/Post.jsx
deleted file mode 100644
index eb9c692..0000000
--- a/src/components/post/Post.jsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import "./post.css";
-import { useState, useEffect } from "react";
-import { useAppContext } from '../../context/AppContext';
-import { format } from "timeago.js";
-import { Link } from "wouter";
-import likeImg from '../../assets/like.png';
-import profileImg from '../../assets/profile-pic.jpg';
-import Comments from '../comments/Comments'
-import PostEditor from "./PostEditor";
-import CircularProgress from '@material-ui/core/CircularProgress';
-import { makeStyles } from '@material-ui/core/styles';
-
-import Snackbar from '@material-ui/core/Snackbar';
-import MuiAlert from '@material-ui/lab/Alert';
-
-function Alert(props) {
- return 
;
- }else{
- if(!loadVideoError){
- mediaTag = ;
- }else{
- mediaTag = '';
- }
- }
-
- const postedContent =
- const postedMedia = post.image !== EMPTY_MEDIA && mediaTag
- const postEdit = (walletAddress === post.from) && Edit
- const postDelete = (walletAddress === post.from) && Delete
- const postLoading =
-
-
-
-
- @{identity} {!sm && `• ${post.from}`}
-
- }
- />
-
- {/* {(walletAddress === address) &&
-
-
-
-
-
- } */}
-
-
-
-
-
-
- {edit && (
- edit && uploadBannerRef.current && uploadBannerRef.current.click()}
- className={styles.actionButton}
- >
-
- )}
-
-
-
-
- );
+ const handlePostEvents = async(event) => {
+ if (event && (event.postId === post.id.toString())) {
+ switch(event.action) {
+ case Constants.PostAction.Edit:
+ if (event.from.toLowerCase() !== walletAddress.toLowerCase()) {
+ await loadPost();
+ }
+ break;
+ case Constants.PostAction.Comment:
+ await reloadPostReactions();
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ const reloadPostReactions = async () => {
+ const data = await PostManager.getPost(post.id);
+ const update = await ContentManager.mapContent(Constants.ContentType.Post, data);
+
+ post.likesCount = update.likesCount;
+ post.dislikesCount = update.dislikesCount;
+ post.commentsCount = update.commentsCount;
+ post.tipsCount = update.tipsCount;
+ post.flagsCount = update.flagsCount;
+ post.liked = update.liked;
+ post.disliked = update.disliked;
+ post.commented = update.commented;
+ post.tipped = update.tipped;
+ post.flagged = update.flagged;
+
+ setLikes(post.likesCount);
+ setDislikes(post.dislikesCount);
+ setLike(post.liked);
+ setDislike(post.disliked);
- useEffect(() => {
- if (events.listeners['PointSocial'] && events.listeners['PointSocial']['StateChange']) {
- events.listeners['PointSocial']['StateChange'].on('StateChange', handleEvents, {
- type: 'post',
- id: post.id,
- });
- }
- return () => {
- if (events.listeners['PointSocial'] && events.listeners['PointSocial']['StateChange']) {
- events.listeners['PointSocial']['StateChange'].removeListener('StateChange', handleEvents, {
- type: 'post',
- id: post.id,
- });
- }
- };
- }, []);
+ setTips(post.tipsCount);
+ setTip(post.tipped);
+
+ setFlagged(post.flagged || post.flagsCount > 10);
+ }
const loadPost = async () => {
if (post.from.toLowerCase() === walletAddress.toLowerCase()) {
setIsOwner(true);
setName((profile && profile.displayName) || identity);
+ setHandle(`@${identity}`);
+ setAbout(profile.about);
} else {
try {
const profile = await UserManager.getProfile(post.from);
@@ -544,6 +293,8 @@ const PostCard = ({
? identity
: await point.getString(profile[0], { encoding: 'utf-8' });
setName(name);
+ setHandle(`@${identity}`);
+ setAbout(profile[2]);
} catch (error) {
setAlert(error.message);
}
@@ -562,6 +313,8 @@ const PostCard = ({
setLike(post.liked);
setDislike(post.disliked);
+ setFlagged(post.flagged);
+ setTip(post.tipped);
setCountersLoading(false);
} catch (error) {
setAlert(error.message);
@@ -571,68 +324,12 @@ const PostCard = ({
setLikes(post.likesCount);
setDislikes(post.dislikesCount);
setComments(post.commentsCount);
+ setTips(post.tipsCount);
setCountersLoading(false);
setLoading(false);
};
- const handleEvents = async (event) => {
- if (event && event.component === EventConstants.Component.Post && event.id === post.id) {
- switch (event.action) {
- case EventConstants.Action.Like:
- {
- setLikeLoading(true);
- const data = await PostManager.getPost(post.id);
- // console.log(data);
- const [, , , , , _likes, , _dislikes, _liked, _disliked] = data;
- // console.log('like', _likes, _dislikes, _liked, _disliked);
- setLikes(parseInt(_likes, 10));
- setDislikes(parseInt(_dislikes, 10));
- setLike(_liked);
- setDislike(_disliked);
- setLikeLoading(false);
- }
- break;
- case EventConstants.Action.Dislike:
- {
- setLikeLoading(true);
- const data = await PostManager.getPost(post.id);
- // console.log(data);
- const [, , , , , _likes, , _dislikes, _liked, _disliked] = data;
- // console.log('like', _likes, _dislikes, _liked, _disliked);
- setLikes(parseInt(_likes, 10));
- setDislikes(parseInt(_dislikes, 10));
- setLike(_liked);
- setDislike(_disliked);
- setLikeLoading(false);
- }
- break;
- case EventConstants.Action.Edit:
- if (event.from.toLowerCase() !== walletAddress.toLowerCase()) {
- await loadPost();
- }
- break;
- case EventConstants.Action.Comment:
- {
- const p = await PostManager.getPost(post.id);
- if (p && parseInt(p[4]) !== 0) {
- setComments(parseInt(p[6]));
- }
- }
- break;
- case EventConstants.Action.Flag:
- {
- const isFlagged = await PostManager.isFlaggedPost(post.id);
- post.isFlagged = isFlagged;
- setFlagged(isFlagged);
- }
- break;
- default:
- break;
- }
- }
- };
-
const handleAction = (action) => {
switch (action) {
case 'edit':
@@ -682,8 +379,9 @@ const PostCard = ({
} catch (error) {
setAlert(error.message);
setLoading(false);
- } finally {
- setProcessing(false);
+ }
+ finally {
+ setProcessing(false);
}
};
@@ -769,7 +467,8 @@ const PostCard = ({
await PostManager.addLikeToPost(post.id);
} catch (error) {
setAlert(error.message);
- } finally {
+ }
+ finally {
setLikeLoading(false);
setProcessing(false);
}
@@ -782,12 +481,31 @@ const PostCard = ({
await PostManager.addDislikeToPost(post.id);
} catch (error) {
setAlert(error.message);
- } finally {
+ }
+ finally {
setDislikeLoading(false);
setProcessing(false);
}
};
+ const addTip = async () => {
+ try {
+ const amount = tipRef.current.amount();
+ if (amount <= 0)
+ throw new Error("You cannot send an empty Tip!");
+ setProcessing(true);
+ setTipLoading(true);
+ await PostManager.tipPost(post.id, (ethers.utils.parseEther(amount.toString()).toHexString()));
+ } catch (error) {
+ setAlert(error.message);
+ }
+ finally {
+ showPromptTip(false);
+ setTipLoading(false);
+ setProcessing(false);
+ }
+ };
+
const handleActionsOpen = () => {
setActionsOpen(true);
};
@@ -833,6 +551,27 @@ const PostCard = ({
);
+ const tipDialog = <>
+
+
+
const flagPrompt = (
<>
@@ -880,13 +619,13 @@ const PostCard = ({
onClose={handleActionsClose}
open={actionsOpen}
>
- {!edit && deployer && (
+ {!edit && (
)}
@@ -968,12 +707,12 @@ const PostCard = ({
return (
<>
- {loading? loadingBlock:
- [,
-
, - (!loading && comments.length === 0) && 'No comments yet. Be the first!', - comments.filter(c => c.createdAt > 0).map((comment) => ([ -,
]) - )] - } -
- )
-}
-
-export default Comments
diff --git a/src/components/comments/comments.css b/src/components/comments/comments.css
deleted file mode 100644
index 178d5f7..0000000
--- a/src/components/comments/comments.css
+++ /dev/null
@@ -1,79 +0,0 @@
- .commentCorners {
- border-radius: 5px;
- border: 1px solid #B4C1CE;
- padding: 12px 8px;
- width: calc(100% - 100px);
- }
-
- .commentButton{
- border: none;
- margin: 5px;
- padding: 7px;
- border-radius: 5px;
- background-color: #1C385B;
- font-weight: 500;
- cursor: pointer;
- color: white;
- width:80px;
- }
-
- .comment {
- font-size: 14px;
- color: white;
- }
-
- .commentFrom {
- font-weight: 500;
- }
-
- .commentDate {
- margin: 0 5px;
- }
-
- .commentWrapper {
- /* padding: 10px; */
- }
-
- .commentHr {
- margin: 20px 0;
- background:#dce2ea;
- height: 1px;
- border:none;
- }
-
- .commentBottom {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- p {
- white-space: pre-wrap;
- }
-
- .commentText {
- margin: 5px;
- margin-left: 10px;
- font-size: 13px;
- }
-
- .commentEditText {
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkblue;
- font-size: 10px;
- }
-
- .commentDeleteText {
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkred;
- font-size: 10px;
- }
-
- .commentButtons {
- margin: 5px;
- display: block;
- align-items: center;
- justify-content: space-between;
- }
diff --git a/src/components/feed/DiscoverFeed.jsx b/src/components/feed/DiscoverFeed.jsx
new file mode 100644
index 0000000..1254d2f
--- /dev/null
+++ b/src/components/feed/DiscoverFeed.jsx
@@ -0,0 +1,249 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+import orderBy from "lodash/orderBy";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import ContentManager from "../../services/ContentManager";
+import PostManager from '../../services/PostManager';
+import UserManager from "../../services/UserManager";
+
+import constants from "../../constants";
+
+const NUM_POSTS_PER_CALL = 10;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const DiscoverFeed = ({ setAlert, setUpperLoading, threadId=0 }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [renderedPosts, setRenderedPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["SocialContent"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'discover-feed'});
+ events.listeners["SocialContent"]["ReactionEvent"].removeListener("ReactionEvent", handleEvents, { type: 'discover-feed'});
+ events.unsubscribe("SocialContent", "StateChange");
+ events.unsubscribe("SocialContent", "ReactionEvent");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("SocialContent", "StateChange")).on("StateChange", handleEvents, { type: 'discover-feed'});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleEvents, { type: 'discover-feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId(threadId));
+ const lastCurrentId = (posts.length > 0)? posts[posts.length - 1].id : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,0,threadId) : [];
+ const newPosts =
+ await Promise.all(
+ data
+ .filter(p => ContentManager.contentExists(p))
+ .map((p) => ContentManager.mapContent(constants.ContentType.Post, p))
+ );
+
+ return await Promise.all(newPosts.map(async post => {
+ try {
+ post.weight = (await UserManager.isFollowing(walletAddress, post.from))? 1: 0;
+ }
+ catch(error) {
+ console.warn(error.message);
+ }
+ return post;
+ }));
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ //result.sort(compareByTimestamp);
+ console.log("POSTS:");
+ console.log(result);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+ , - (!loading && comments.length === 0) && 'No comments yet. Be the first!', - comments.filter(c => c.createdAt > 0).map((comment) => ([ -
]) - )] - } -
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ orderBy(posts.filter(post => post.createdAt > 0), ['weight', 'likesCount', 'commentsCount', 'dislikesCount', 'createdAt'], ['desc', 'desc', 'desc', 'asc', 'desc'])
+ .map((post) => (
+
+
+
+ );
+
+}
+export default DiscoverFeed
diff --git a/src/components/feed/Feed.jsx b/src/components/feed/Feed.jsx
index 6079fec..fb694c5 100644
--- a/src/components/feed/Feed.jsx
+++ b/src/components/feed/Feed.jsx
@@ -15,8 +15,11 @@ import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
import PostCard from "../post/PostCard";
import EventConstants from "../../events";
+import ContentManager from "../../services/ContentManager";
import PostManager from '../../services/PostManager';
+import constants from "../../constants";
+
const NUM_POSTS_PER_CALL = 5;
const useStyles = makeStyles((theme) => ({
@@ -90,14 +93,14 @@ const Feed = ({ account, setAlert, setUpperLoading, canPost=false }) => {
useEffect(() => {
getEvents();
return () => {
- events.listeners["PointSocial"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'feed'});
- events.unsubscribe("PointSocial", "StateChange");
+ events.listeners["SocialContent"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'feed'});
+ events.unsubscribe("SocialContent", "StateChange");
};
}, []);
const getEvents = async() => {
try {
- (await events.subscribe("PointSocial", "StateChange")).on("StateChange", handleEvents, { type: 'feed'});
+ (await events.subscribe("SocialContent", "StateChange")).on("StateChange", handleEvents, { type: 'feed'});
}
catch(error) {
console.log(error.message);
@@ -152,37 +155,19 @@ const Feed = ({ account, setAlert, setUpperLoading, canPost=false }) => {
const fetchPosts = async (onlyNew = false) => {
try {
setLoading(true);
-
+ const lastId = Number(account? await PostManager.getLastPostIdByOwner(account) : await PostManager.getLastPostId());
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
const data = await (account?
- PostManager.getPaginatedPostsByOwner(account,onlyNew?0:posts.length,NUM_POSTS_PER_CALL) :
- PostManager.getPaginatedPosts(onlyNew?0:posts.length,NUM_POSTS_PER_CALL));
-
- const newPosts = data.filter(r => (parseInt(r[4]) !== 0))
- .map(([id, from, contents, image, createdAt, likesCount, commentsCount, dislikesCount, liked, disliked]) => (
- {
- id,
- from,
- contents,
- image,
- createdAt: createdAt*1000,
- likesCount: parseInt(likesCount, 10),
- dislikesCount: parseInt(dislikesCount, 10),
- commentsCount: parseInt(commentsCount, 10),
- liked,
- disliked,
- }
- )
- );
+ PostManager.getPaginatedPostsByOwner(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,account) :
+ PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL, 2));
- return await Promise.all(newPosts.map(async post => {
- try {
- post.isFlagged = await PostManager.isFlaggedPost(post.id);
- }
- catch(error) {
- console.warn(error.message);
- }
- return post;
- }));
+ const newPosts =
+ await Promise.all(
+ data
+ .filter(p => ContentManager.contentExists(p))
+ .map((p) => ContentManager.mapContent(constants.ContentType.Post, p))
+ );
+ return newPosts;
} catch(error) {
console.log(error.message);
diff --git a/src/components/feed/FollowFeed.jsx b/src/components/feed/FollowFeed.jsx
new file mode 100644
index 0000000..01123b1
--- /dev/null
+++ b/src/components/feed/FollowFeed.jsx
@@ -0,0 +1,253 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import ContentManager from "../../services/ContentManager";
+import PostManager from "../../services/PostManager";
+import UserManager from "../../services/UserManager";
+
+import constants from "../../constants";
+
+const NUM_POSTS_PER_CALL = 5;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const FollowFeed = ({ setAlert, setUpperLoading, threadId=0 }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["SocialContent"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'follow-feed'});
+ events.listeners["SocialContent"]["ReactionEvent"].removeListener("ReactionEvent", handleEvents, { type: 'follow-feed'});
+ events.unsubscribe("SocialContent", "StateChange");
+ events.unsubscribe("SocialContent", "ReactionEvent");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("SocialContent", "StateChange")).on("StateChange", handleEvents, { type: 'follow-feed'});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleEvents, { type: 'follow-feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Feed) {
+ switch(event.action) {
+ case EventConstants.Action.Create:
+ if (await UserManager.isFollowing(walletAddress, event.from)) {
+ setReload(true);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId(threadId));
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,1,threadId) : [];
+ const newPosts =
+ await Promise.all(
+ data
+ .filter(p => ContentManager.contentExists(p))
+ .map((p) => ContentManager.mapContent(constants.ContentType.Post, p))
+ );
+ return newPosts;
+
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {`No posts yet.`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ posts.filter(post => post.createdAt > 0).map((post) => (
+
+
+
+ );
+
+}
+export default FollowFeed
diff --git a/src/components/feed/FreshFeed.jsx b/src/components/feed/FreshFeed.jsx
new file mode 100644
index 0000000..fd22238
--- /dev/null
+++ b/src/components/feed/FreshFeed.jsx
@@ -0,0 +1,256 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import ContentManager from "../../services/ContentManager";
+import PostManager from '../../services/PostManager';
+import EventManager from "../../services/EventManager";
+
+import constants from "../../constants";
+
+const NUM_POSTS_PER_CALL = 5;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const FreshFeed = ({ setAlert, setUpperLoading, canPost=false, threadId=0 }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ listenEvents();
+ return unlistenEvents();
+ }, []);
+
+
+ const listenEvents = async () => {
+ try {
+ (await events.subscribe("SocialContent", "StateChange")).on("StateChange", handleEvents, { type: 'fresh-feed'});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleEvents, { type: 'fresh-feed'});
+ (await events.subscribe("SocialContent", "PostEvent")).on("PostEvent", handleEvents, { type: 'fresh-feed'});
+ }
+ catch(error) {
+ console.error(error.message);
+ }
+ }
+
+ const unlistenEvents = async () => {
+ EventManager.removeListener(events, "SocialContent", "StateChange", handleEvents, { type: 'fresh-feed'});
+ EventManager.removeListener(events, "SocialContent", "ReactionEvent", handleEvents, { type: 'fresh-feed'});
+ EventManager.removeListener(events, "SocialContent", "PostEvent", handleEvents, { type: 'fresh-feed'});
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Feed) {
+ switch(event.action) {
+ case EventConstants.Action.Create:
+ if (event.from.toString().toLowerCase() === walletAddress.toLowerCase()) {
+ // Autoload own posts
+ await reloadPosts();
+ }
+ else {
+ setReload(true);
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ else if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength(threadId);
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId(threadId));
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,2,threadId) : [];
+ const newPosts =
+ await Promise.all(
+ data
+ .filter(p => ContentManager.contentExists(p))
+ .map((p) => ContentManager.mapContent(constants.ContentType.Post, p))
+ );
+ return newPosts;
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {'No posts yet! Start following somebody!'}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ posts.filter(post => post.createdAt > 0).map((post) => (
+
+
+
+ );
+
+}
+export default FreshFeed
diff --git a/src/components/feed/TopFeed.jsx b/src/components/feed/TopFeed.jsx
new file mode 100644
index 0000000..207aba9
--- /dev/null
+++ b/src/components/feed/TopFeed.jsx
@@ -0,0 +1,242 @@
+import "./feed.css";
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import useInView from 'react-cool-inview'
+import { makeStyles } from '@material-ui/core/styles';
+
+import unionWith from "lodash/unionWith";
+import isEqual from "lodash/isEqual";
+import orderBy from "lodash/orderBy";
+
+import { Box, Button, Snackbar, SnackbarContent, Typography } from '@material-ui/core';
+
+import HourglassEmptyOutlinedIcon from '@material-ui/icons/HourglassEmptyOutlined';
+import CircularProgressWithIcon from '../generic/CircularProgressWithIcon';
+import InboxOutlinedIcon from '@material-ui/icons/InboxOutlined';
+import PostCard from "../post/PostCard";
+
+import EventConstants from "../../events";
+import ContentManager from "../../services/ContentManager";
+import PostManager from '../../services/PostManager';
+
+import constants from "../../constants";
+
+const NUM_POSTS_PER_CALL = 20;
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ padding: 0,
+ margin: 0,
+ marginTop: '10px',
+ maxWidth: '900px'
+ },
+ observer: {
+ display: 'flex',
+ justifyContent: 'center'
+ },
+ empty: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ flexDirection: "column",
+ alignItems:"center",
+ justifyContent: "center"
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ container: {
+ display: "flex",
+ height: "100%",
+ minHeight: "50vh",
+ flexDirection: "column",
+ },
+ separator: {
+ marginTop: "20px",
+ marginBottom: "20px",
+ },
+ extendedIcon: {
+ marginRight: theme.spacing(1),
+ },
+}));
+
+const TopFeed = ({ setAlert, setUpperLoading, canPost=false, threadId=0 }) => {
+ const {observe} = useInView({
+ onEnter: async({observe,unobserve}) => {
+ if(length === posts.length) return;
+ unobserve();
+ await getPosts();
+ observe();
+ }
+ });
+ const styles = useStyles();
+ const [posts, setPosts] = useState([])
+ const [length, setLength] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const [reload, setReload] = useState(false);
+
+ const { walletAddress, events } = useAppContext();
+
+ // sorts accending (newest first)
+ const compareByTimestamp = ( post1, post2 ) => {
+ if ( post1.createdAt < post2.createdAt ){
+ return 1;
+ }
+ if ( post1.createdAt > post2.createdAt ){
+ return -1;
+ }
+ return 0;
+ }
+
+ useEffect(()=>{
+ reloadPosts();
+ }, []);
+
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["SocialContent"]["StateChange"].removeListener("StateChange", handleEvents, { type: 'top-feed'});
+ events.listeners["SocialContent"]["ReactionEvent"].removeListener("ReactionEvent", handleEvents, { type: 'top-feed'});
+ events.unsubscribe("SocialContent", "StateChange");
+ events.unsubscribe("SocialContent", "ReactionEvent");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("SocialContent", "StateChange")).on("StateChange", handleEvents, { type: 'top-feed'});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleEvents, { type: 'top-feed'});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event) {
+ if (event.component === EventConstants.Component.Post) {
+ switch(event.action) {
+ case EventConstants.Action.Delete:
+ deletePost(event.id);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ const getPostsLength = async() => {
+ try {
+ setLoading(true);
+ const data = await PostManager.getAllPostsLength();
+ setLength(Number(data));
+ }
+ catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ setLoading(false);
+ }
+
+ const fetchPosts = async (onlyNew = false) => {
+ try {
+ setLoading(true);
+ const lastId = Number(await PostManager.getLastPostId(threadId));
+ const lastCurrentId = (posts.length > 0)? parseInt(posts[posts.length - 1].id) : lastId;
+ const data = (lastId > 0)? await PostManager.getPaginatedPosts(onlyNew?lastId:lastCurrentId,NUM_POSTS_PER_CALL,3,threadId) : [];
+ const newPosts =
+ await Promise.all(
+ data
+ .filter(p => ContentManager.contentExists(p))
+ .map((p) => ContentManager.mapContent(constants.ContentType.Post, p))
+ );
+ return newPosts;
+ } catch(error) {
+ console.log(error.message);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const getPosts = async (loadNew = false) => {
+ try {
+ setLoading(true);
+ const posts = await fetchPosts(loadNew);
+ setPosts(prev => {
+ const result = unionWith(prev, posts, isEqual);
+ result.sort(compareByTimestamp);
+ return result;
+ });
+ }
+ catch(error) {
+ console.log(error);
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const reloadPosts = async () => {
+ await getPostsLength();
+ await getPosts(true);
+ setReload(false);
+ }
+
+ const deletePost = async (postId) => {
+ await getPostsLength();
+ setPosts((posts) => posts.filter(post => post.id !== postId));
+ }
+
+ return (
+ <>
+
+ {`No posts yet.${ canPost? " Be the first!" : "" }`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+
+
+ {
+ (!loading && posts.length === 0)?
+
+
+ :
+ orderBy(posts.filter(post => post.createdAt > 0), ['likesCount', 'commentsCount', 'dislikesCount'], ['desc', 'desc', 'asc'])
+ .map((post) => (
+
+
+
+ );
+
+}
+export default TopFeed
diff --git a/src/components/feed/feed.css b/src/components/feed/feed.css
index a1f16bf..ce572b6 100644
--- a/src/components/feed/feed.css
+++ b/src/components/feed/feed.css
@@ -14,11 +14,10 @@
font-weight: 400;
}
.no-post-to-show{
- background:url(http://neckcode.com/feed-show-ico.svg) no-repeat white;
display: block;
-text-align: center;
-padding: 30px;
-margin: 10px 0;
-border-radius: 6px;
-font-size:13px;
+ text-align: center;
+ padding: 30px;
+ margin: 10px 0;
+ border-radius: 6px;
+ font-size:13px;
}
diff --git a/src/components/generic/RichTextField.jsx b/src/components/generic/RichTextField.jsx
index 2da268e..6780efe 100644
--- a/src/components/generic/RichTextField.jsx
+++ b/src/components/generic/RichTextField.jsx
@@ -75,7 +75,19 @@ const RichTextField = forwardRef(({value, minLength, maxLength, placeholder, dis
autoFocus
disabled={processing}
/>
-
+ {`No posts yet.${ canPost? " Be the first!" : "" }`}
+
+
+
+
+ ))
+ }
+
+ {
+ loading &&
+
+ {post?.contents}
- { loading? postLoading :
-
-
- { postError }
-
-
-
- );
-}
diff --git a/src/components/post/PostCard.jsx b/src/components/post/PostCard.jsx
index 5585776..4ac511a 100644
--- a/src/components/post/PostCard.jsx
+++ b/src/components/post/PostCard.jsx
@@ -7,28 +7,27 @@ import { useLabelIconStyles } from '@mui-treasury/styles/icon/label';
import ModeCommentOutlinedIcon from '@material-ui/icons/ModeCommentOutlined';
import ThumbUpOutlinedIcon from '@material-ui/icons/ThumbUpOutlined';
import ThumbDownOutlinedIcon from '@material-ui/icons/ThumbDownOutlined';
-import Grid from '@material-ui/core/Grid';
-import Chip from '@material-ui/core/Chip';
-import Profile from '../../pages/profile/Profile';
import { Link } from 'wouter';
import RichTextField from '../generic/RichTextField';
-import TextContent from '../generic/TextContent';
-import CircularProgressWithIcon from '../../components/generic/CircularProgressWithIcon';
+import TipCard from '../tip/TipCard';
+import CircularProgressWithIcon from '../../components/generic/CircularProgressWithIcon';
import CancelOutlinedIcon from '@material-ui/icons/CancelOutlined';
import EditOutlinedIcon from '@material-ui/icons/EditOutlined';
import SaveOutlinedIcon from '@material-ui/icons/SaveOutlined';
import DeleteOutlineOutlinedIcon from '@material-ui/icons/DeleteOutlineOutlined';
import FlagOutlinedIcon from '@material-ui/icons/FlagOutlined';
import VisibilityOutlinedIcon from '@material-ui/icons/VisibilityOutlined';
-
import AccountTreeOutlinedIcon from '@material-ui/icons/AccountTreeOutlined';
import LanguageOutlinedIcon from '@material-ui/icons/LanguageOutlined';
-import Box from '@material-ui/core/Box';
+import CardGiftcardOutlinedIcon from '@material-ui/icons/CardGiftcardOutlined';
import EventConstants from '../../events';
+import Constants from '../../constants';
+
+import { ethers } from "ethers";
import { format } from 'timeago.js';
@@ -67,22 +66,8 @@ import CardMediaContainer from '../generic/CardMediaContainer';
import point from '../../services/PointSDK';
import UserManager from '../../services/UserManager';
import PostManager from '../../services/PostManager';
-
-import { Modal } from '@material-ui/core';
-
-/*MODAL WORK*/
-import defaultBanner from '../../assets/header-pic.jpg';
-import Tooltip from '@material-ui/core/Tooltip';
-import CardMedia from '@material-ui/core/CardMedia';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
-import { useTheme } from '@material-ui/core/styles';
-import Fab from '@material-ui/core/Fab';
-import Divider from '@material-ui/core/Divider';
-import Tabs from '@material-ui/core/Tabs';
-import Tab from '@material-ui/core/Tab';
-import TabPanel from '../tabs/TabPanel';
-import Feed from '../feed/Feed';
-import Close from '@material-ui/icons/Close';
+import ContentManager from '../../services/ContentManager';
+import EventManager from '../../services/EventManager';
const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -92,119 +77,9 @@ const useStyles = makeStyles((theme) => ({
zIndex: theme.zIndex.drawer - 1,
opacity: 0.9,
},
- banner: {
- [theme.breakpoints.down('xs')]: {
- height: 150,
- },
- [theme.breakpoints.up('sm')]: {
- height: 180,
- },
- [theme.breakpoints.up('md')]: {
- height: 216,
- },
- [theme.breakpoints.up('lg')]: {
- height: 270,
- },
- [theme.breakpoints.up('xl')]: {
- height: 300,
- },
- },
- cardModal: {
- [theme.breakpoints.down('xs')]: {
- margin: theme.spacing(1),
- width: 250,
- },
- [theme.breakpoints.up('sm')]: {
- margin: theme.spacing(1),
- width: 450,
- },
- [theme.breakpoints.up('md')]: {
- margin: theme.spacing(2),
- width: 720,
- },
- [theme.breakpoints.up('lg')]: {
- margin: theme.spacing(2),
- width: 960,
- },
- [theme.breakpoints.up('xl')]: {
- margin: theme.spacing(2),
- width: 1000,
- },
- },
+ card: {},
avatar: {
- [theme.breakpoints.down('xs')]: {
- width: '96px',
- height: '96px',
- fontSize: '50px',
- },
- [theme.breakpoints.up('sm')]: {
- width: '118px',
- height: '118px',
- fontSize: '56px',
- },
- [theme.breakpoints.up('md')]: {
- width: '141px',
- height: '141px',
- fontSize: '67px',
- },
- [theme.breakpoints.up('lg')]: {
- width: '187px',
- height: '187px',
- fontSize: '87px',
- },
- [theme.breakpoints.up('xl')]: {
- width: '195px',
- height: '195px',
- fontSize: '95px',
- },
- },
- fabAvatar: {
- margin: 0,
- bottom: 0,
- right: 0,
- position: 'relative',
- [theme.breakpoints.down('xs')]: {
- width: '100px',
- height: '100px',
- left: '31%',
- top: -40,
- marginBottom: -40,
- },
- [theme.breakpoints.up('sm')]: {
- width: '120px',
- height: '120px',
- left: '36%',
- top: -50,
- marginBottom: -50,
- },
- [theme.breakpoints.up('md')]: {
- width: '144px',
- height: '144px',
- left: '40%',
- top: -60,
- marginBottom: -60,
- },
- [theme.breakpoints.up('lg')]: {
- width: '192px',
- height: '192px',
- left: '40%',
- top: -75,
- marginBottom: -75,
- },
- [theme.breakpoints.up('xl')]: {
- width: '200px',
- height: '200px',
- left: '40%',
- top: -85,
- marginBottom: -85,
- },
- },
-
- statLabel: {
- fontSize: 12,
- fontWeight: 500,
- margin: 0,
- textAlign: 'center',
+ cursor: 'pointer',
},
media: {
height: 0,
@@ -265,60 +140,17 @@ function DataURIToBlob(dataURI) {
}
const PostCard = ({
- address,
post,
setAlert,
canExpand = true,
startExpanded = false,
singlePost = false,
}) => {
- const theme = useTheme();
- const sm = useMediaQuery(theme.breakpoints.down('sm'));
- const [banner, setBanner] = useState(EMPTY);
- const [tabIndex, setTabIndex] = useState(0);
-
- const handleTabChange = (event, newValue) => {
- setTabIndex(newValue);
- };
-
- const [open, setOpen] = useState(false);
-
- const handleClose = () => setOpen(false);
- const handleOpen = async (post) => {
- try {
- const profile = await UserManager.getProfile(post.from);
- if (profile) {
- const name =
- profile[0] === EMPTY
- ? identity
- : await point.getString(profile[0], { encoding: 'utf-8' });
- setName(name);
- const location =
- profile[1] === EMPTY
- ? 'Point Network'
- : await point.getString(profile[1], { encoding: 'utf-8' });
- setLocation(location);
- const about =
- profile[2] === EMPTY
- ? "Hey I'm using Point Social!"
- : await point.getString(profile[2], { encoding: 'utf-8' });
- setAbout(about);
-
- setAvatar(`/_storage/${profile[3]}`);
- setBanner(profile[4] === EMPTY ? defaultBanner : `/_storage/${profile[4]}`);
- }
- } catch (error) {
- setAlert(error.message);
- }
-
- setOpen(true);
- };
-
const [loading, setLoading] = useState(true);
const [countersLoading, setCountersLoading] = useState(true);
const [expanded, setExpanded] = useState(startExpanded);
- const [flagged, setFlagged] = useState(post.isFlagged);
+ const [flagged, setFlagged] = useState(post.flagged);
const [actionsOpen, setActionsOpen] = useState(false);
const [shareOpen, setShareOpen] = useState(false);
@@ -329,15 +161,17 @@ const PostCard = ({
const styles = useStyles();
const inputRef = useRef();
const mediaRef = createRef();
+ const tipRef = useRef();
const gutterStyles = usePushingGutterStyles({ space: 1, firstExcluded: false });
const iconLabelStyles = useLabelIconStyles({ linked: true });
- const { walletAddress, deployer, identity, processing, setProcessing, goHome, events } =
- useAppContext();
+ const { walletAddress, deployer, profile, identity, processing, setProcessing, goHome, events} = useAppContext();
const [name, setName] = useState();
-
+ const [handle, setHandle ] = useState();
+ const [about, setAbout] = useState();
+
const [content, setContent] = useState();
const [media, setMedia] = useState();
const [date, setDate] = useState();
@@ -352,189 +186,104 @@ const PostCard = ({
const [dislikes, setDislikes] = useState(0);
const [dislikeLoading, setDislikeLoading] = useState(false);
+ const [tip, setTip] = useState(false);
+ const [tips, setTips] = useState(0);
+ const [tipLoading, setTipLoading] = useState(false);
+
const [isOwner, setIsOwner] = useState(false);
+ const [promptTip, showPromptTip] = useState(false);
+
const actionsAnchor = useRef();
const shareAnchor = useRef();
const expandButton = useRef();
useEffect(() => {
loadPost();
+ listenEvents();
+ return unlistenEvents;
}, []);
- // const [name, setName] = useState(EMPTY);
- const [location, setLocation] = useState(EMPTY);
- const [about, setAbout] = useState(EMPTY);
- const [avatar, setAvatar] = useState(EMPTY);
- const [profile, setProfile] = useState();
- useEffect(() => {
- // loadProfile();
- }, []);
- useEffect(() => {
- // renderProfile(profile);
- }, [profile]);
- const loadProfile = async () => {
- try {
- const profile = await UserManager.getProfile(post.from);
- if (profile) {
- console.log('Data: ', profile);
- setProfile({
- displayName: profile[0],
- displayLocation: profile[1],
- displayAbout: profile[2],
- avatar: profile[3],
- banner: profile[4],
- followersCount: 0,
- followingCount: 0,
- });
- }
- } catch (error) {
- setAlert(error.message);
- }
- };
- const renderProfile = async (profile) => {
- if (profile) {
- try {
- // setLoading(true);
- const name =
- profile.displayName === EMPTY
- ? identity
- : await point.getString(profile.displayName, { encoding: 'utf-8' });
- setName(name);
- const location =
- profile.displayLocation === EMPTY
- ? 'Point Network'
- : await point.getString(profile.displayLocation, { encoding: 'utf-8' });
- setLocation(location);
- const about =
- profile.displayLocation === EMPTY
- ? "Hey I'm using Point Social!"
- : await point.getString(profile.displayAbout, { encoding: 'utf-8' });
- setAbout(about);
- setAvatar(`/_storage/${profile.avatar}`);
- setBanner(profile.banner === EMPTY ? defaultBanner : `/_storage/${profile.banner}`);
- // setLoading(false);
- } catch (error) {
- setAlert(error.message);
- }
+ const listenEvents = async () => {
+ (await events.subscribe("SocialContent", "PostEvent")).on("PostEvent", handlePostEvents, { type: `${post.parentId}-"post"-${post.id}`});
+ (await events.subscribe("SocialContent", "ReactionEvent")).on("ReactionEvent", handleReactionEvents, { type: `${post.parentId}-"post"-${post.id}`});
+ }
+
+ const unlistenEvents = async () => {
+ EventManager.removeListener(events, "SocialContent", "PostEvent", handlePostEvents, { type: `${post.parentId}-"post"-${post.id}`});
+ EventManager.removeListener(events, "SocialContent", "ReactionEvent", handleReactionEvents, { type: `${post.parentId}-"post"-${post.id}`});
+ }
+
+ const handleReactionEvents = async (event) => {
+ if (event &&
+ event.contentType === Constants.ContentType.Post &&
+ event.contentId === post.id) {
+ await reloadPostReactions();
+ switch(event.reaction) {
+ case Constants.ReactionType.Like:
+ setLikeLoading(false);
+ break;
+ case Constants.ReactionType.Dislike:
+ setDislikeLoading(false);
+ break;
+ case Constants.ReactionType.Flag:
+ setDislikeLoading(false);
+ break;
+ default:
+ break;
+ }
}
};
- const bannerContent = (
-
-
- }
-
-
-
-
- 
-
- {walletAddress === post.from ? You posted : {post.identity}}
-
-
- {format(post.createdAt)}
-
-
- {
- editPost?
- :
- [postedContent, postedMedia]
- }
-
-
-
-
- 
- {post.likesCount} people like it
-
-
- {commentsCount} comments
- { (parseInt(commentsCount) === 0) && postEdit }
- { (parseInt(commentsCount) === 0) && postDelete }
-
-
- {showComments && }
-
-
-
+
{loading && {
@@ -995,28 +734,26 @@ const PostCard = ({
style={{ filter: flagged ? 'blur(10px)' : 'none' }}
>
handleOpen(post)}
- address={post.from}
- isModal={true}
- upperLoading={loading}
- setAlert={setAlert}
- />
- }
+ avatar={
;
- } else {
- if(!loadVideoError) {
- mediaTag = ;
- } else {
- mediaTag = '';
- }
- }
-
- const postedMedia = (media !== EMPTY_MEDIA) && mediaTag
-
- const setSaving = (saving) => {
- setBtnEnabled(!saving);
- saving ? setBtnLabel('Saving...') : setBtnLabel(DEFAULT_BTN_LABEL);
- }
-
- const cancelEditing = () => {
- setSaving(false);
- setBtnEnabled(false);
- toggleEditPost();
- }
-
- const submitHandler = async (e) => {
- e.preventDefault();
- setSaving(true);
-
- try {
- // Save the post content to the storage layer and keep the storage id
- let {data: storageId} = (contents && contents.trim().length > 0)? await window.point.storage.putString({data: contents}) : { data: EMPTY_CONTENT };
- let imageId = media;
- if(selectedFile){
- const formData = new FormData()
- formData.append("postfile", selectedFile);
- const res = await window.point.storage.postFile(formData);
- imageId = res.data;
- }
- // Save the post contents storage id in the PoinSocial Smart Contract
- await PostManager.editPost(post.id, storageId, imageId);
- setSaving(false);
- setContents('');
- setSelectedFile();
- setBtnEnabled(false);
- try { fileInputRef.current.value = null } catch (error) {}
- reloadPost(contents, imageId);
- } catch (e) {
- console.error('Error sharing post: ', e.message);
- setSaving(false);
- setContents('');
- setSelectedFile();
- setBtnEnabled(false);
- try { fileInputRef.current.value = null } catch (error) {}
- }
- };
-
- return (
-
@@ -448,10 +581,8 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
align="left"
className={styles.actionIcon}>@{identity} { !sm && `• ${address}` }
-
}/>
-
- { (walletAddress === address) &&
+ {
{
ref={actionsAnchor}
onClick={handleActionsOpen}
className={styles.actionButton}
- color="secondary"
- disabled={processing}>
+ color="secondary">
);
@@ -153,11 +162,28 @@ const Appbar = ({setAlert, setLoading, loading}) => {
Profile
-
+
);
+ const addressDialog = (<>
+ showAddress(false)}
+ setAlert={setAlert}>
+
+ );
+
+ const tipDialog = (<>
+ showTips(false)}
+ setAlert={setAlert}>
+
+ );
+
return (
<>
@@ -197,12 +223,8 @@ const Appbar = ({setAlert, setLoading, loading}) => {
{renderMobileMenu}
{renderMenu}
{renderProfileDialog}
- showAddress(false)}
- setAlert={setAlert}>
-
+ {addressDialog}
+ {tipDialog}
);
}
diff --git a/src/components/topbar/Topbar.jsx b/src/components/topbar/Topbar.jsx
deleted file mode 100644
index 6a1996d..0000000
--- a/src/components/topbar/Topbar.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import "./topbar.css";
-import { useAppContext } from '../../context/AppContext';
-import { Link } from "wouter";
-import pointlogo from '../../assets/pointlogowhite.png';
-
-import Avatar from '@material-ui/core/Avatar';
-
-export default function Topbar() {
- const { walletAddress } = useAppContext();
- const { identity } = useAppContext();
- const { profile } = useAppContext();
-
- return (
-
- );
-}
diff --git a/src/components/topbar/topbar.css b/src/components/topbar/topbar.css
deleted file mode 100644
index a4a5435..0000000
--- a/src/components/topbar/topbar.css
+++ /dev/null
@@ -1,100 +0,0 @@
-@import url('https://fonts.googleapis.com/css2?family=Bungee+Inline&display=swap');
-
-.topbarContainer {
- height: 50px;
- width: 100%;
- background-color: #1c385b;
- display: flex;
- align-items: center;
- position: sticky;
- top: 0;
- z-index: 999;
- color:white;
- }
-
- .topbarLeft {
- margin-left: 10px;
- flex: 3;
- }
-
- .logo {
- font-size: 24px;
- margin-left: 5px;
- font-weight: bold;
- color: white;
- cursor: pointer;
- }
-
- .topbarCenter {
- flex: 5;
- }
-
- .searchbar {
- width: 100%;
- height: 30px;
- background-color: white;
- border-radius: 30px;
- display: flex;
- align-items: center;
- }
-
- .searchIcon {
- font-size: 20px !important;
- margin-left: 10px;
- }
-
- .searchInput {
- border: none;
- width: 70%;
- }
-
- .searchInput:focus {
- outline: none;
- }
-
- .topbarRight {
- flex: 4;
- display: flex;
- align-items: center;
- justify-content: space-around;
- color: white;
- }
-
- .topbarLink {
- margin-right: 10px;
- font-size: 14px;
- cursor: pointer;
- }
-
- .topbarIcons {
- display: flex;
- }
-
- .topbarIconItem {
- margin-right: 15px;
- cursor: pointer;
- position: relative;
- }
-
- .topbarIconBadge {
- width: 15px;
- height: 15px;
- background-color: red;
- border-radius: 50%;
- color: white;
- position: absolute;
- top: -5px;
- right: -5px;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 12px;
- }
-
- .topbarImg {
- width: 40px;
- height: 40px;
- border-radius: 50%;
- object-fit: cover;
- cursor: pointer;
- }
diff --git a/src/components/user/UserItem.jsx b/src/components/user/UserItem.jsx
new file mode 100644
index 0000000..c1fcbb4
--- /dev/null
+++ b/src/components/user/UserItem.jsx
@@ -0,0 +1,69 @@
+import { useState, useEffect } from "react";
+import { useAppContext } from '../../context/AppContext';
+import { makeStyles } from '@material-ui/core/styles';
+
+import ListItem from '@material-ui/core/ListItem';
+import Divider from '@material-ui/core/Divider';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListItemAvatar from '@material-ui/core/ListItemAvatar';
+import UserAvatar from "../avatar/UserAvatar";
+
+import point from "../../services/PointSDK";
+import UserManager from "../../services/UserManager";
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ cursor:'pointer',
+ },
+}));
+
+const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
+
+const UserItem = ({address}) => {
+
+ const styles = useStyles();
+ const [loading, setLoading] = useState(false);
+ const [name, setName] = useState('');
+ const [about, setAbout] = useState('');
+
+ const { walletAddress, profile, identity } = useAppContext();
+
+ useEffect(() => {
+ loadUser();
+ }, []);
+
+ const loadUser = async () => {
+ setLoading(true);
+ if (address.toString().toLowerCase() === walletAddress.toString().toLowerCase()) {
+ setName((profile && profile.displayName) || identity);
+ setAbout(profile.displayAbout || "Hey I'm using Point Social!");
+ }
+ else {
+ try {
+ const profile = await UserManager.getProfile(address);
+ const { identity } = await point.ownerToIdentity(address);
+ const name = (profile[0] === EMPTY)? identity : await point.getString(profile[0], { encoding: 'utf-8' });
+ const about = (profile[2] === EMPTY)? "Hey I'm using Point Social!" : await point.getString(profile[2], {encoding: 'utf-8'});
+ setName(name);
+ setAbout(about);
+ }
+ catch(error) {}
+ }
+ setLoading(false);
+ }
+
+ return (
+ <>
+
+
+ window.open(`/profile/${address}`, "_blank") }}/>
+
+
+
+
@@ -143,6 +128,16 @@ const Post = () => {
return (
handleOpen(post)}>
-
- {loading ? (
-
+ <>
+ {loading ?
+
}
subheader={
@@ -1025,158 +762,6 @@ const PostCard = ({
}
/>
-
-
- <>
-
-
-
-
-
- edit && uploadAvatarRef.current && uploadAvatarRef.current.click()
- }
- >
-
-
-
-
- {edit ? (
-
- {loading ?
- )}
- {edit ? (
-
-
- {loading ?
- )}
- {edit ? (
-
- {loading ?
- )}
-
-
-
-
-
-
{edit ? (
loading ? (
@@ -1184,10 +769,10 @@ const PostCard = ({
) : (
+ {loading ?
)}
{loading ? (
@@ -1227,12 +812,7 @@ const PostCard = ({
/>
) : (
-
);
};
-export default PostCard;
+export default PostCard;
\ No newline at end of file
diff --git a/src/components/post/PostEditor.jsx b/src/components/post/PostEditor.jsx
deleted file mode 100644
index 7ba4834..0000000
--- a/src/components/post/PostEditor.jsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import "./postEditor.css";
-import { AttachFileTwoTone } from "@material-ui/icons";
-import { useRef, useState } from "react";
-import PostManager from "../../services/PostManager"
-
-export default function PostEditor({ post, toggleEditPost, reloadPost }) {
- const DEFAULT_BTN_LABEL = 'Save'
- const EMPTY_MEDIA = '0x0000000000000000000000000000000000000000000000000000000000000000';
- const EMPTY_CONTENT = '0x0000000000000000000000000000000000000000000000000000000000000000';
- const [contents, setContents] = useState(post.contents);
- const [media, setMedia] = useState(post.image);
-
- const [selectedFile, setSelectedFile] = useState();
- const [preview, setPreview] = useState(`/_storage/${media}`)
-
- const [btnLabel, setBtnLabel] = useState(DEFAULT_BTN_LABEL);
- const [btnEnabled, setBtnEnabled] = useState(false);
-
- const [loadImgError, setLoadImgError] = useState(false);
- const [loadVideoError, setLoadVideoError] = useState(false);
-
-
- const fileInputRef = useRef()
-
- const onContentsChange = event => {
- let newContents = event.target.value;
- setContents(newContents);
- setBtnEnabled(newContents && newContents.trim().length > 0);
- }
-
- const onFileChange = event => {
- let fileToUpload = event.target.files[0];
- if(fileToUpload.type.startsWith('image') || fileToUpload.type.startsWith('video') ) {
- if (fileToUpload.size > 100 * 1024 * 1024){
- alert('Point Social only supports image and video until 100 MB. Please change to a samller image or video file!')
- }
- setSelectedFile(event.target.files[0]);
- setPreview(URL.createObjectURL(event.target.files[0]));
- setBtnEnabled(true);
- } else {
- alert('Point Social only supports image and video uploads for now. Please change to an image or video file!')
- }
- };
-
- const onFocus = event => {
- const element = event.target;
- element.selectionStart = element.value.length;
- }
-
- const onImgErrorHandler = (e) => {
- setLoadImgError(true);
- }
-
- const onVideoErrorHandler = (e) => {
- setLoadVideoError(true);
- }
-
- let mediaTag;
- if (!loadImgError) {
- mediaTag =
+
+
+ {loading ? (
+
+
+ {loading ?
+
-
- {edit && (
-
- )}
-
-
- { postedMedia }
-
-
- );
-}
diff --git a/src/components/post/post.css b/src/components/post/post.css
deleted file mode 100644
index 3a58d3b..0000000
--- a/src/components/post/post.css
+++ /dev/null
@@ -1,119 +0,0 @@
- .post {
- width: 100%;
- border-radius: 6px;
- -webkit-box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- margin: 12px 0;
- }
-
- .postWrapper {
- padding: 15px;
- }
-
- .postImage {
- padding: 0;
- display: block;
- margin: 0 auto;
- max-height: 100%;
- max-width: 100%;
- }
-
- .postText {
- display: flex;
- margin-top: 10px;
- margin-bottom: 10px;
- }
-
- .postTop {
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .postTopLeft {
- display: flex;
- align-items: center;
- }
-
- .postProfileImg {
- width: 32px;
- height: 32px;
- border-radius: 50%;
- object-fit: cover;
- }
-
- .postUsername {
- font-size: 15px;
- font-weight: 500;
- margin: 0 10px;
- }
-
- .postDate{
- font-size: 12px;
- }
-
- .postCenter{
- margin: 20px 0;
- }
-
- .postImg{
- margin-top: 20px;
- width: 100%;
- max-height: 500px;
- object-fit: contain;
- }
-
- .postBottom{
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
-
- .postBottomLeft{
- display: flex;
- align-items: center;
- }
-
- .likeIcon{
- width: 24px;
- height: 24px;
- margin-right: 5px;
- cursor: pointer;
- }
-
- .postLikeCounter{
- font-size: 15px;
- }
-
- .postCommentText{
- cursor: pointer;
- border-bottom: 1px dashed gray;
- font-size: 15px;
- }
-
- .postEditText{
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkblue;
- font-size: 10px;
- }
-
- .postDeleteText{
- margin-left: 5px;
- cursor: pointer;
- border-bottom: 1px dashed darkred;
- font-size: 10px;
- }
-
- .comments {
- margin-top: 10px;
- }
- .postDate{
- color:rgb(148, 159, 173);
- }
- .posted-id{
- color:#1c385b;
- }
- p {
- white-space: pre-wrap;
- }
\ No newline at end of file
diff --git a/src/components/post/postEditor.css b/src/components/post/postEditor.css
deleted file mode 100644
index 158bde9..0000000
--- a/src/components/post/postEditor.css
+++ /dev/null
@@ -1,65 +0,0 @@
-.postEditor {
- width: 100%;
- border-radius: 6px;
- -webkit-box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
- box-shadow: 0px 0px 16px -8px rgba(172, 173, 181, 0.68);
-}
-
-.editHr {
- margin: 20px 0;
- background:#dce2ea;
- height: 1px;
- border:none;
-}
-
-.editInput {
- border: none;
- width: 100%;
-}
-
-.editInput:focus {
- outline: none;
-}
-
-.editBottom {
- margin-top: 5px;
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- width: 100%;
-}
-
-.editOptions{
- display: flex;
- /* margin-left: 20px; */
-}
-
-.editFilePicker {
- display: flex;
- align-items: center;
- margin-right: 15px;
- cursor: pointer;
-}
-
-.editIcon {
- font-size: 18px;
- margin-right: 3px;
-}
-
-.editOptionText{
- font-size: 14px;
- font-weight: 500;
-}
-
-.editButton {
- border: none;
- border-radius: 5px;
- margin-left: 5px;
- background-color: #1C385B;
- font-weight: 500;
- cursor: pointer;
- color: white;
- width:80px;
-}
-
-
diff --git a/src/components/profile/ProfileCard.jsx b/src/components/profile/ProfileCard.jsx
index f3d5892..52c0ad3 100644
--- a/src/components/profile/ProfileCard.jsx
+++ b/src/components/profile/ProfileCard.jsx
@@ -6,7 +6,6 @@ import { useTheme } from '@material-ui/core/styles';
import { makeStyles } from '@material-ui/core/styles';
import useMediaQuery from '@material-ui/core/useMediaQuery';
-import Avatar from '@material-ui/core/Avatar';
import Backdrop from '@material-ui/core/Backdrop';
import Box from '@material-ui/core/Box';
import Card from '@material-ui/core/Card';
@@ -33,17 +32,24 @@ import CancelOutlinedIcon from '@material-ui/icons/CancelOutlined';
import EditOutlinedIcon from '@material-ui/icons/EditOutlined';
import SaveOutlinedIcon from '@material-ui/icons/SaveOutlined';
import MoreVertIcon from '@material-ui/icons/MoreVert';
-import Close from '@material-ui/icons/Close';
import RoomOutlinedIcon from '@material-ui/icons/RoomOutlined';
import PanoramaOutlinedIcon from '@material-ui/icons/PanoramaOutlined';
+import PersonAddIcon from '@material-ui/icons/PersonAdd';
+import BlockOutlinedIcon from '@material-ui/icons/BlockOutlined';
+import PersonAddDisabledIcon from '@material-ui/icons/PersonAddDisabled';
+import CheckOutlinedIcon from '@material-ui/icons/CheckOutlined';
+import LockOpenOutlinedIcon from '@material-ui/icons/LockOpenOutlined';
+import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
import TabPanel from '../tabs/TabPanel';
import Feed from '../feed/Feed';
import UserAvatar from '../avatar/UserAvatar';
+import UserList from '../user/UserList';
import point from "../../services/PointSDK";
import UserManager from "../../services/UserManager";
-import { Link } from "wouter";
+
+import EventConstants from "../../events";
const MAX_FILE_SIZE = 100 * 1024 * 1024;
const EMPTY = '0x0000000000000000000000000000000000000000000000000000000000000000';
@@ -201,6 +207,13 @@ const useStyles = makeStyles((theme) => ({
justify: "center",
alignItems:"center"
},
+ followBox: {
+ display: 'flex',
+ justifyContent: "end",
+ justify: "end",
+ alignItems:"end",
+ margin: theme.spacing(2)
+ }
}));
const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
@@ -213,12 +226,22 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const [name, setName] = useState(EMPTY);
const [location, setLocation] = useState(EMPTY);
const [about, setAbout] = useState(EMPTY);
+
const [followers, setFollowers] = useState(0);
const [following, setFollowing] = useState(0);
+ const [followersList, setFollowersList] = useState([]);
+ const [followingList, setFollowingList] = useState([]);
+
const [avatar, setAvatar] = useState(EMPTY);
const [banner, setBanner] = useState(EMPTY);
const [profile, setProfile] = useState();
+ const [isOwner, setIsOwner] = useState(false);
+ const [isFollowed, setFollowed] = useState(false);
+ const [isFollower, setFollower] = useState(false);
+ const [isBlocked, setIsBlocked] = useState(false);
+ const [imBlocked, setImBlocked] = useState(false);
+
const [loading, setLoading] = useState(true);
const [actionsOpen, setActionsOpen] = useState(false);
const [edit, setEdit] = useState(false);
@@ -231,7 +254,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const displayAboutRef = useRef();
const actionsAnchor = useRef();
- const { walletAddress, processing, setProcessing, setUserProfile } = useAppContext();
+ const { walletAddress, setUserProfile, events } = useAppContext();
useEffect(() => {
loadProfile();
@@ -241,6 +264,41 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
renderProfile(profile);
}, [profile]);
+ useEffect(() => {
+ getEvents();
+ return () => {
+ events.listeners["SocialContent"]["FollowEvent"].removeListener("FollowEvent", handleEvents, { type: 'profile', id: address});
+ events.unsubscribe("SocialContent", "FollowEvent");
+ };
+ }, []);
+
+ const getEvents = async() => {
+ try {
+ (await events.subscribe("SocialContent", "FollowEvent")).on("FollowEvent", handleEvents, { type: 'profile', id: address});
+ }
+ catch(error) {
+ console.log(error.message);
+ }
+ }
+
+ const handleEvents = async(event) => {
+ if (event && (((event.from.toLowerCase() === walletAddress.toLowerCase()) &&
+ (event.to.toLowerCase() === address.toLowerCase())) ||
+ ((event.to.toLowerCase() === walletAddress.toLowerCase()) &&
+ (event.from.toLowerCase() === address.toLowerCase())))) {
+ switch(event.action) {
+ case EventConstants.FollowAction.Follow:
+ case EventConstants.FollowAction.UnFollow:
+ case EventConstants.FollowAction.Block:
+ case EventConstants.FollowAction.UnBlock:
+ await loadFollowStatus();
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
const renderProfile = async (profile) => {
if (profile) {
try {
@@ -250,11 +308,10 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
const location = (profile.displayLocation === EMPTY)? "Point Network" : await point.getString(profile.displayLocation, { encoding: 'utf-8' });
setLocation(location);
const about = (profile.displayLocation === EMPTY)? "Hey I'm using Point Social!" : await point.getString(profile.displayAbout, { encoding: 'utf-8' });
- setAbout(about);
- setFollowers(profile.followersCount || 0);
- setFollowing(profile.followingCount || 0);
+ setAbout(about);
setAvatar(`/_storage/${profile.avatar}`);
setBanner((profile.banner=== EMPTY)?defaultBanner:`/_storage/${profile.banner}`);
+ await loadFollowStatus();
setLoading(false);
}
catch(error) {
@@ -263,6 +320,36 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
}
}
+ const loadFollowStatus = async () => {
+ setFollowers(await UserManager.followersCount(address) || 0);
+ setFollowing(await UserManager.followingCount(address) || 0);
+
+ try {
+ setFollowersList(await UserManager.followersList(address));
+ }
+ catch(error) {
+ setFollowersList([]);
+ }
+
+ try {
+ setFollowingList(await UserManager.followingList(address));
+ }
+ catch(error) {
+ setFollowingList([]);
+ }
+
+ const owner = address.toLowerCase() === walletAddress.toLowerCase();
+ if (owner) {
+ setIsOwner(true);
+ }
+ else {
+ setFollowed(await UserManager.isFollowing(walletAddress, address));
+ setFollower(await UserManager.isFollowing(address, walletAddress));
+ setIsBlocked(await UserManager.isBlocked(walletAddress, address));
+ setImBlocked(await UserManager.isBlocked(address, walletAddress));
+ }
+ }
+
const loadProfile = async () => {
try {
const profile = await UserManager.getProfile(address);
@@ -276,7 +363,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
followersCount: 0,
followingCount: 0,
});
- }
+ }
}
catch(error) {
setAlert(error.message);
@@ -304,6 +391,10 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
case 'cancel':
cancelEdit();
break;
+ case 'block':
+ case 'unblock':
+ toggleBlock();
+ break;
}
setActionsOpen(false);
@@ -352,7 +443,6 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
};
const saveEdit = async () => {
- setProcessing(true);
setLoading(true);
const newProfile = { ...profile };
@@ -407,7 +497,7 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
followingCount: 0,
};
- const result = await UserManager.setProfile(
+ await UserManager.setProfile(
updatedProfile.displayName,
updatedProfile.displayLocation,
updatedProfile.displayAbout,
@@ -432,10 +522,53 @@ const ProfileCard = ({ address, identity, setUpperLoading, setAlert }) => {
}
finally {
setLoading(false);
- setProcessing(false);
}
};
+ const toggleFollow = async () => {
+ try {
+ setLoading(true);
+ if (isFollowed) {
+ await UserManager.unfollowUser(address);
+ setFollowed(false);
+ setAlert(`You're no longer following to ${name}|success`);
+ }
+ else {
+ await UserManager.followUser(address);
+ setFollowed(true);
+ setAlert(`Now you're following ${name}|success`);
+ }
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
+ const toggleBlock = async () => {
+ try {
+ setLoading(true);
+ if (isBlocked) {
+ await UserManager.unblockUser(address);
+ setIsBlocked(false);
+ setAlert(`You unblocked all activity from ${name}|success`);
+ }
+ else {
+ await UserManager.blockUser(address);
+ setIsBlocked(true);
+ setAlert(`You blocked all activity from ${name}|success`);
+ }
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ }
+
const bannerContent =
+ {
+ (users.length === 0)
+ ?
+
+
+ :
+
+ )
+}
+
+export default UserList
\ No newline at end of file
diff --git a/src/constants.js b/src/constants.js
new file mode 100644
index 0000000..7cfd6fc
--- /dev/null
+++ b/src/constants.js
@@ -0,0 +1,84 @@
+const PSConstants = {
+ ThreadAction : {
+ None :'0',
+ Create :'1',
+ Edit :'2',
+ Delete :'3',
+ Subscribe :'4',
+ Unsubscribe :'5',
+ ModeratorAdded :'6',
+ ModeratorRemoved :'7'
+ },
+ PostType : {
+ Post :'0',
+ Comment :'1'
+ },
+ PostAction : {
+ Create :'0',
+ Edit :'1',
+ Delete :'2',
+ Comment :'3',
+ Reaction :'4'
+ },
+ CommentAction : {
+ Create :'0',
+ Edit :'1',
+ Delete :'2',
+ Reply :'3',
+ Reaction :'4'
+ },
+ ReactionType : {
+ Like :'0',
+ Dislike :'1',
+ Comment :'2',
+ Tip :'3',
+ Flag :'4'
+ },
+ ReactionAction : {
+ Add :'0',
+ Remove :'1'
+ },
+ ReactionSlot : {
+ Like :'0',
+ Dislike :'1',
+ Comment :'2',
+ Tip :'3',
+ Flag :'4'
+ },
+ ContractAction : {
+ Migrator :'0',
+ Create :'1',
+ Like :'2',
+ Comment :'3',
+ Edit :'4',
+ Delete :'5',
+ Dislike :'6',
+ Flag :'7'
+ },
+ ContractComponent : {
+ Contract :'0',
+ Feed :'1',
+ Post :'2',
+ Comment :'3'
+ },
+ ContentType : {
+ Post :'0',
+ Comment :'1',
+ Message :'2',
+ Chat :'3'
+ },
+ FollowAction : {
+ Follow :'0',
+ UnFollow :'1',
+ Block :'2',
+ UnBlock :'3'
+ },
+ FeedType : {
+ Discover :'0',
+ Follow :'1',
+ Fresh :'2',
+ Top :'3'
+ }
+}
+
+export default PSConstants;
diff --git a/src/context/AppContext.js b/src/context/AppContext.js
index 05bd95a..efcf274 100644
--- a/src/context/AppContext.js
+++ b/src/context/AppContext.js
@@ -10,6 +10,7 @@ const events = new EventManager();
const defaultContext = {
walletAddress: undefined,
deployer : false,
+ isGateWay: false,
walletError: undefined,
identity: undefined,
profile: undefined,
@@ -28,18 +29,18 @@ export const useAppContext = () => useContext(AppContext);
export const ProvideAppContext = ({ children }) => {
const [walletAddress, setWalletAddress] = useState();
const [identity, setIdentity] = useState();
- const [walletError, setWallerError] = useState();
+ const [walletError, setWalletError] = useState();
const [, setLocation] = useLocation();
const [profile, setUserProfile] = useState();
const [deployer, setDeployer] = useState(false);
- const [processing, setProcessing] = useState(false);
+ const [processing, setProcessing] = useState(point.isGateway() || false);
useEffect(() => {
(async () => {
try {
const { address } = await point.getWalletAddress();
const { identity } = await point.getIdentity();
- const isDeployer = await point.contractCall("PointSocial", "isDeployer", []);
+ const isDeployer = await point.contractCall("SocialContent", "isDeployer", []);
const profile = await users.getProfile(address);
const name = (profile[0] === EMPTY)? identity : await point.getString(profile[0], { encoding: 'utf-8'});
const location = (profile[1] === EMPTY)? "Point Network" : await point.getString(profile[1], {encoding: 'utf-8'});
@@ -56,13 +57,23 @@ export const ProvideAppContext = ({ children }) => {
setDeployer(isDeployer);
setIdentity(identity);
setWalletAddress(address);
+ await subscribeEvents();
} catch (error) {
console.log(error);
- setWallerError(error);
+ setWalletError(error);
}
})()
+ return unsubscribeEvents;
}, [])
+ const subscribeEvents = async () => {
+ //await events.subscribe("SocialContent", "CommentEvent");
+ }
+
+ const unsubscribeEvents = async () => {
+ await events.unsubscribe("SocialContent", "CommentEvent");
+ }
+
const goHome = useCallback(async () => {
setLocation('/');
}, []);
@@ -70,6 +81,7 @@ export const ProvideAppContext = ({ children }) => {
const context = {
walletAddress,
deployer,
+ isGateway : point.isGateway(),
walletError,
identity,
profile,
diff --git a/src/events.js b/src/events.js
index a27642a..3dc1210 100644
--- a/src/events.js
+++ b/src/events.js
@@ -14,6 +14,12 @@ const EventConstants = {
Feed: "1",
Post: "2",
Comment: "3",
+ },
+ FollowAction: {
+ Follow : "0",
+ UnFollow : "1",
+ Block : "2",
+ UnBlock : "3"
}
}
diff --git a/src/pages/home/Home.jsx b/src/pages/home/Home.jsx
index e621ae7..69bc70c 100644
--- a/src/pages/home/Home.jsx
+++ b/src/pages/home/Home.jsx
@@ -1,81 +1,160 @@
-import Appbar from '../../components/topbar/Appbar';
-import Footer from '../../components/footer/Footer';
+import Appbar from "../../components/topbar/Appbar";
+import Footer from "../../components/footer/Footer";
-import { useState } from 'react';
+import { useState } from "react";
import { useAppContext } from '../../context/AppContext';
import { makeStyles } from '@material-ui/core/styles';
-import { Backdrop, CircularProgress, Snackbar, Container } from '@material-ui/core';
+import { Backdrop,
+ Button,
+ CircularProgress,
+ Container,
+ Grid,
+ Snackbar,
+ SnackbarContent,
+ Tabs,
+ Tab,
+ Tooltip } from '@material-ui/core';
-import CircularProgressWithIcon from '../../components/generic/CircularProgressWithIcon';
-import ShareCard from '../../components/share/ShareCard';
-import Feed from '../../components/feed/Feed';
-import Alert from '../../components/generic/Alert';
+import TabPanel from '../../components/tabs/TabPanel';
+import DiscoverFeed from '../../components/feed/DiscoverFeed';
+import FollowFeed from '../../components/feed/FollowFeed';
+import FreshFeed from '../../components/feed/FreshFeed';
+import TopFeed from '../../components/feed/TopFeed';
+import ShareCard from "../../components/share/ShareCard";
+import Feed from "../../components/feed/Feed";
+import Alert from "../../components/generic/Alert";
+
+import ExploreOutlinedIcon from '@material-ui/icons/ExploreOutlined';
+import PersonPinCircleOutlinedIcon from '@material-ui/icons/PersonPinCircleOutlined';
+import EcoOutlinedIcon from '@material-ui/icons/EcoOutlined';
+import EmojiEventsOutlinedIcon from '@material-ui/icons/EmojiEventsOutlined';
+import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
import AccountBalanceWalletOutlinedIcon from '@material-ui/icons/AccountBalanceWalletOutlined';
+import SideBar from '../../components/sidebar/Sidebar';
+import LeftBar from '../../components/sidebar/Leftbar';
+
const useStyles = makeStyles((theme) => ({
- root: {
- height: '100%',
- padding: 0,
- margin: 0,
- },
- container: {
- padding: theme.spacing(2, 2),
- display: 'flex',
- minHeight: '100%',
- flexDirection: 'column',
- justifyContent: 'center',
- maxWidth: '900px',
- },
- backdrop: {
- zIndex: theme.zIndex.drawer + 1,
- },
+ root: {
+ height: "100%",
+ padding: 0,
+ margin: 0,
+ },
+ container: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ minHeight: "100%",
+ flexDirection: "column",
+ justifyContent: "center",
+ maxWidth: '900px',
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ tab: {
+ padding: 0,
+ margin: 0,
+ },
+ tabpanel: {
+ padding: 0,
+ }
}));
+function a11yProps(index) {
+ return {
+ id: `scrollable-prevent-tab-${index}`,
+ 'aria-controls': `scrollable-prevent-tabpanel-${index}`,
+ };
+}
+
const Home = () => {
- const [loading, setLoading] = useState(false);
- const [alert, setAlert] = useState('');
- const { walletAddress } = useAppContext();
+ const [loading, setLoading] = useState(false);
+ const [alert, setAlert] = useState("");
+ const { walletAddress, isGateway } = useAppContext();
+ const [tabIndex, setTabIndex] = useState(0);
- const styles = useStyles();
+ const styles = useStyles();
+
+ const handleAlert = (event, reason) => {
+ if (reason === 'clickaway') {
+ return;
+ }
+ setAlert("");
+ };
- const handleAlert = (event, reason) => {
- if (reason === 'clickaway') {
- return;
- }
- setAlert('');
- };
+ const handleChange = (event, newIndex) => {
+ setTabIndex(newIndex);
+ };
+
+ return (
+
+ No users yet.
+
+ -
+ {
+ users.map((user) => (
+
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
+
+ {
+ walletAddress?
+
+ {
+ walletAddress &&
+ <>
+
+
+
+ {/*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- return (
-
+ { alert.split("|")[0] }
+
+
+ );
+}
-export default Home;
+export default Home
\ No newline at end of file
diff --git a/src/pages/post/Post.jsx b/src/pages/post/Post.jsx
index 31cdaad..20a0c88 100644
--- a/src/pages/post/Post.jsx
+++ b/src/pages/post/Post.jsx
@@ -4,11 +4,15 @@ import { useEffect, useState } from "react";
import { useAppContext } from '../../context/AppContext';
import { makeStyles } from '@material-ui/core/styles';
+import ContentManager from '../../services/ContentManager';
import PostManager from '../../services/PostManager';
import CircularProgress from '@material-ui/core/CircularProgress';
import Backdrop from '@material-ui/core/Backdrop';
+import Button from '@material-ui/core/Button';
import Snackbar from '@material-ui/core/Snackbar';
+import SnackbarContent from '@material-ui/core/SnackbarContent';
+
import MuiAlert from '@material-ui/lab/Alert';
import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
@@ -23,6 +27,8 @@ import Typography from '@material-ui/core/Typography';
import PostCard from '../../components/post/PostCard';
+import Constants from '../../constants';
+
function Alert(props) {
return
-
- {walletAddress ? (
-
- {walletAddress && (
- <>
-
-
-
-
- )}
-
-
- {alert.split('|')[0]}
-
-
-
- );
-};
+
+
+ }
+
{ walletAddress && }
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
{
walletAddress?
diff --git a/src/pages/profile/Profile.jsx b/src/pages/profile/Profile.jsx
index d790e44..0891f6b 100644
--- a/src/pages/profile/Profile.jsx
+++ b/src/pages/profile/Profile.jsx
@@ -8,7 +8,10 @@ import CircularProgress from '@material-ui/core/CircularProgress';
import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
import Backdrop from '@material-ui/core/Backdrop';
+import Button from '@material-ui/core/Button';
import Snackbar from '@material-ui/core/Snackbar';
+import SnackbarContent from '@material-ui/core/SnackbarContent';
+
import MuiAlert from '@material-ui/lab/Alert';
import Box from '@material-ui/core/Box';
@@ -41,7 +44,7 @@ const Profile = () => {
const [identity, setIdentity] = useState(undefined);
const [address, setAddress] = useState(undefined);
- const { walletAddress } = useAppContext();
+ const { walletAddress, isGateway } = useAppContext();
const styles = useStyles();
@@ -98,6 +101,16 @@ const Profile = () => {
} props={{color : "inherit"}} />
}
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
{walletAddress &&
<> { (address && identity)?
<>
diff --git a/src/pages/thread/Thread.jsx b/src/pages/thread/Thread.jsx
new file mode 100644
index 0000000..8c3e841
--- /dev/null
+++ b/src/pages/thread/Thread.jsx
@@ -0,0 +1,197 @@
+import Appbar from "../../components/topbar/Appbar";
+import Footer from "../../components/footer/Footer";
+import { ethers } from "ethers";
+
+import { useState, useEffect } from "react";
+import { useRoute } from "wouter";
+import { useAppContext } from '../../context/AppContext';
+import { makeStyles } from '@material-ui/core/styles';
+
+import { Backdrop,
+ Box,
+ Button,
+ CircularProgress,
+ Container,
+ Snackbar,
+ SnackbarContent,
+ Typography} from '@material-ui/core';
+
+import Tabs from '@material-ui/core/Tabs';
+import Tab from '@material-ui/core/Tab';
+import TabPanel from '../../components/tabs/TabPanel';
+import Tooltip from '@material-ui/core/Tooltip';
+
+import DiscoverFeed from '../../components/feed/DiscoverFeed';
+import FollowFeed from '../../components/feed/FollowFeed';
+import FreshFeed from '../../components/feed/FreshFeed';
+import TopFeed from '../../components/feed/TopFeed';
+
+import ExploreOutlinedIcon from '@material-ui/icons/ExploreOutlined';
+import PersonPinCircleOutlinedIcon from '@material-ui/icons/PersonPinCircleOutlined';
+import EcoOutlinedIcon from '@material-ui/icons/EcoOutlined';
+import EmojiEventsOutlinedIcon from '@material-ui/icons/EmojiEventsOutlined';
+import SearchOutlinedIcon from '@material-ui/icons/SearchOutlined';
+
+import CircularProgressWithIcon from "../../components/generic/CircularProgressWithIcon";
+import ShareCard from "../../components/share/ShareCard";
+import Feed from "../../components/feed/Feed";
+import Alert from "../../components/generic/Alert";
+import ThreadDialog from "../../components/threads/ThreadDialog";
+
+import ThreadManager from "../../services/ThreadManager";
+import ContentManager from "../../services/ContentManager";
+
+import AccountBalanceWalletOutlinedIcon from '@material-ui/icons/AccountBalanceWalletOutlined';
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ height: "100%",
+ padding: 0,
+ margin: 0,
+ },
+ container: {
+ padding: theme.spacing(2, 2),
+ display: "flex",
+ minHeight: "100%",
+ flexDirection: "column",
+ justifyContent: "center",
+ maxWidth: '900px',
+ },
+ backdrop: {
+ zIndex: theme.zIndex.drawer + 1,
+ },
+ tab: {
+ padding: 0,
+ margin: 0,
+ },
+ tabpanel: {
+ padding: 0,
+ }
+}));
+
+function a11yProps(index) {
+ return {
+ id: `scrollable-prevent-tab-${index}`,
+ 'aria-controls': `scrollable-prevent-tabpanel-${index}`,
+ };
+}
+
+const Thread = () => {
+ const [match, params] = useRoute("/thread/:handle");
+ const [loading, setLoading] = useState(true);
+ const [alert, setAlert] = useState("");
+ const [tabIndex, setTabIndex] = useState(0);
+ const [thread, setThread] = useState();
+ const [handle, setHandle] = useState();
+ const [threadCreate, setThreadCreate] = useState(false);
+ const { walletAddress, isGateway, events } = useAppContext();
+
+ const styles = useStyles();
+
+ const handleAlert = (event, reason) => {
+ if (reason === 'clickaway') {
+ return;
+ }
+ setAlert("");
+ };
+
+ const handleChange = (event, newIndex) => {
+ setTabIndex(newIndex);
+ };
+
+ const getThread = async () => {
+ try {
+ const isThread = (params.handle.length < 31 && params.handle.match(/\w{2,31}/));
+ if (isThread) {
+ const thread = await ThreadManager
+ .getThreadByHandle(
+ ethers.utils.formatBytes32String(
+ params.handle.toLowerCase()
+ )
+ );
+ setHandle(params.handle.toLowerCase());
+ if (thread !== '0' && ContentManager.threadExists(thread)) {
+ setThread(await ContentManager.mapThread(thread));
+ }
+ }
+ }
+ catch(error) {
+ setAlert(error.message);
+ }
+ finally {
+ setLoading(false);
+ }
+ };
+
+ useEffect(() => {
+ getThread();
+ }, []);
+
+ return (
+
+ (thread)?
+
+
+ Nothing here!
+ { handle && {setThreadCreate(true)}} style={{ cursor: "pointer" }}>Maybe you want to create a new topic? }
+
+
+ {setThreadCreate(false)}} showDialog={setThreadCreate} setAlert={setAlert}/>
+
+ }
+
+ );
+}
+
+export default Thread
\ No newline at end of file
diff --git a/src/services/CommentManager.js b/src/services/CommentManager.js
index 7d083b3..4245862 100644
--- a/src/services/CommentManager.js
+++ b/src/services/CommentManager.js
@@ -1,22 +1,75 @@
import point from "./PointSDK"
+import PSConstants from "../constants";
const EMPTY = '0x0000000000000000000000000000000000000000';
class CommentManager {
- static getComment = async (commentId) => point.contractCall("PointSocial", "getCommentById", [commentId]);
- static getComments = async (postId) => point.contractCall("PointSocial", "getAllCommentsForPost", [postId]);
- static addComment = async (postId, storageId) =>
- point.contractCall(
- "PointSocial",
- "addCommentToPost",
- [postId, storageId.startsWith('0x') ? storageId : `0x${storageId}`]
- );
- static deleteComment = async (postId, commentId) => point.contractCall("PointSocial", "deleteCommentForPost", [postId, commentId]);
- static editComment = async (commentId, contentId) =>
- point.contractCall(
- "PointSocial",
- "editCommentForPost",
- [commentId, contentId.startsWith('0x') ? contentId : `0x${contentId}`]);
+ static getComment = async (commentId) =>
+ point.contractCall("SocialContent", "getContentById", [
+ PSConstants.ContentType.Comment,
+ commentId
+ ]);
+
+ static getComments = async (postId) =>
+ point.contractCall("SocialContent", "getContentIdsByParent", [
+ PSConstants.ContentType.Comment,
+ postId
+ ]);
+
+ static addComment = async (postId, replyTo=0, contentId, imageId) =>
+ point.contractCall("SocialContent", "contentCreate", [
+ PSConstants.ContentType.Comment,
+ postId,
+ replyTo,
+ (contentId) ? contentId : EMPTY,
+ (imageId) ? imageId : EMPTY
+ ]);
+
+ static deleteComment = async (postId, commentId) =>
+ point.contractCall("SocialContent", "contentDelete", [
+ PSConstants.ContentType.Comment,
+ commentId
+ ]);
+
+ static editComment = async (commentId, contentId, imageId) =>
+ point.contractCall("SocialContent", "contentEdit", [
+ PSConstants.ContentType.Comment,
+ commentId,
+ (contentId ? contentId : EMPTY),
+ (imageId ? imageId : EMPTY)
+ ]);
+
+ static addLikeToComment = async (commentId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Comment,
+ commentId,
+ PSConstants.ReactionType.Like,
+ EMPTY
+ ]);
+
+ static addDislikeToComment = async (commentId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Comment,
+ commentId,
+ PSConstants.ReactionType.Dislike,
+ EMPTY
+ ]);
+
+ static flagComment = async (commentId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Comment,
+ commentId,
+ PSConstants.ReactionType.Flag,
+ EMPTY
+ ]);
+
+ static tipComment = async (commentId, value) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Comment,
+ commentId,
+ PSConstants.ReactionType.Tip,
+ EMPTY
+ ], value);
}
export default CommentManager
\ No newline at end of file
diff --git a/src/services/ContentManager.js b/src/services/ContentManager.js
new file mode 100644
index 0000000..b1b1e9d
--- /dev/null
+++ b/src/services/ContentManager.js
@@ -0,0 +1,66 @@
+import point from "./PointSDK"
+import constants from "../constants";
+
+const EMPTY = '0x0000000000000000000000000000000000000000';
+
+function _getReactionSlot(reactions, slot) {
+ return parseInt(reactions.split("0x")[1]
+ .substring((parseInt(slot) * 8), (parseInt(slot) * 8) + 8), 16);
+}
+
+class ContentManager {
+
+ static mapContent = async(type, content) => {
+ const [liked, disliked, commented, tipped, flagged] = await ContentManager.getReactions(type, content[0]);
+ return {
+ id: content[0],
+ from: content[1],
+ contents: content[2],
+ image: content[3],
+ createdAt: parseInt(content[5])*1000,
+ updatedAt: parseInt(content[6])*1000,
+ threadId: content[7],
+ parentId: content[8],
+ replyTo: content[9],
+ likesCount: _getReactionSlot(content[4], constants.ReactionSlot.Like),
+ dislikesCount: _getReactionSlot(content[4], constants.ReactionSlot.Dislike),
+ commentsCount: _getReactionSlot(content[4], constants.ReactionSlot.Comment),
+ tipsCount: _getReactionSlot(content[4], constants.ReactionSlot.Tip),
+ flagsCount: _getReactionSlot(content[4], constants.ReactionSlot.Flag),
+ liked,
+ disliked,
+ commented,
+ tipped,
+ flagged
+ }
+ }
+
+ static mapThread = async(thread) => {
+ return {
+ id: thread[0],
+ createdAt: parseInt(thread[1])*1000,
+ updatedAt: parseInt(thread[2])*1000,
+ owner: thread[3],
+ handle: thread[4],
+ thumbnail: thread[5],
+ banner: thread[6],
+ description: thread[7],
+ };
+ }
+
+ static getReactions = async(type, contentId) => point.contractCall("SocialContent", "getContentReactionsByUser", [
+ type,
+ contentId
+ ]);
+
+ static contentExists = (content) => {
+ return content && parseInt(content[5]) !== 0;
+ }
+
+ static threadExists = (thread) => {
+ return thread && parseInt(thread[1]) !== 0;
+ }
+
+}
+
+export default ContentManager
\ No newline at end of file
diff --git a/src/services/EventManager.js b/src/services/EventManager.js
index 91b7062..abc57e5 100644
--- a/src/services/EventManager.js
+++ b/src/services/EventManager.js
@@ -2,7 +2,7 @@ import point from "./PointSDK"
import EventEmitter from "eventemitter3";
-const POLL_INTERVAL = 100;
+const POLL_INTERVAL = 500;
class ContractEvents extends EventEmitter {
@@ -65,6 +65,28 @@ class EventManager {
}
}
+ static async addListener(events, contract, event, handler, data) {
+ if (events.listeners[contract] &&
+ events.listeners[contract][event]) {
+
+ console.log(events.listeners[contract][event]);
+ events.listeners[contract][event]
+ .on(event, handler, data);
+ }
+ }
+
+ static async removeListener(events, contract, event, handler, data) {
+ if (events.listeners[contract] &&
+ events.listeners[contract][event]) {
+ events.listeners[contract][event]
+ .removeListener(event, handler, data);
+ }
+ }
+
+ static async subscriptionExists(events, contract, event) {
+ return (events.listeners[contract] && events.listeners[contract][event]);
+ }
+
}
-export default EventManager
+export default EventManager;
diff --git a/src/services/PointSDK.js b/src/services/PointSDK.js
index c87ddb1..dd378cf 100644
--- a/src/services/PointSDK.js
+++ b/src/services/PointSDK.js
@@ -1,8 +1,8 @@
const POINT_TIMEOUT = 30 * 1000;
const MAX_TIMEOUT = 600 * 1000;
-const DEBUG = false;
-const DISPLAY_ERRORS = false;
+const DEBUG = true;
+const DISPLAY_ERRORS = true;
class PointSDK {
@@ -46,6 +46,10 @@ class PointSDK {
return data;
}
+ static isGateway() {
+ return window.top.IS_GATEWAY;
+ }
+
/************** WALLET FUNCTIONS **************/
static getWalletAddress = async () => PointSDK._callSDKFunction('wallet', 'address'); // OK
@@ -54,7 +58,7 @@ class PointSDK {
static getWalletPublicKey = async () => PointSDK._callSDKFunction('wallet', 'publicKey');
- static getWalletBalance = async () => PointSDK._callSDKFunction('wallet', 'balance');
+ static getWalletBalance = async (network) => PointSDK._callSDKFunction('wallet', 'balance', network);
static encryptData = async (publicKey, encryptData, args) => PointSDK._callSDKFunction('wallet', 'encryptData', { publicKey, encryptData, args });
diff --git a/src/services/PostManager.js b/src/services/PostManager.js
index cb7d38f..82123b8 100644
--- a/src/services/PostManager.js
+++ b/src/services/PostManager.js
@@ -1,31 +1,112 @@
import point from "./PointSDK"
+import PSConstants from "../constants";
const EMPTY = '0x0000000000000000000000000000000000000000';
class PostManager {
- static getPost = async (postId) => point.contractCall("PointSocial", "getPostById", [postId]);
- static isFlaggedPost = async (postId) => point.contractCall("PointSocial", "postIsFlagged", [postId]);
- static addPost = async (contentId, imageId) =>
- point.contractCall("PointSocial", "addPost", [
+
+ static getPost = async (postId) =>
+ point.contractCall("SocialContent", "getContentById", [
+ PSConstants.ContentType.Post, postId
+ ]);
+
+ static addPost = async (threadId = 0, contentId, imageId) =>
+ point.contractCall("SocialContent", "contentCreate", [
+ PSConstants.ContentType.Post,
+ threadId,
+ 0,
(contentId) ? contentId : EMPTY,
(imageId) ? imageId : EMPTY
]);
- static deletePost = async (postId) => point.contractCall("PointSocial", "deletePost", [postId]);
- static editPost = async (postId, contentId, imageId) => {
- return point.contractCall("PointSocial", "editPost", [
+
+ static deletePost = async (postId) =>
+ point.contractCall("SocialContent", "contentDelete", [
+ PSConstants.ContentType.Post, postId
+ ]);
+
+ static editPost = async (postId, contentId, imageId) =>
+ point.contractCall("SocialContent", "contentEdit", [
+ PSConstants.ContentType.Post,
postId,
- (contentId) ? contentId : EMPTY,
- (imageId) ? imageId : EMPTY
+ (contentId ? contentId : EMPTY),
+ (imageId ? imageId : EMPTY)
+ ]);
+
+ static getLastPostId = async (threadId = 0) =>
+ point.contractCall("SocialContent", "getLastPostId", [
+ "0x0000000000000000000000000000000000000000",
+ threadId
+ ]);
+
+ static getLastPostIdByOwner = async (owner, threadId = 0) =>
+ point.contractCall("SocialContent", "getLastPostId", [
+ owner,
+ threadId
+ ]);
+
+ static getPaginatedPosts = async (length, amount, type = 2, thread = 0) =>
+ point.contractCall("SocialContent", "getPaginatedPosts", [
+ length,
+ amount,
+ type,
+ thread,
+ "0x0000000000000000000000000000000000000000"
+ ]);
+
+ static getPaginatedPostsByOwner = async (length, amount, account) =>
+ point.contractCall("SocialContent", "getPaginatedPosts", [
+ length,
+ amount,
+ 2,
+ 0,
+ account
]);
- }
- static flagPost = async (postId) => point.contractCall("PointSocial", "flagPost", [postId]);
- static addLikeToPost = async (postId) => point.contractSend("PointSocial", "addLikeToPost", [postId]);
- static addDislikeToPost = async (postId) => point.contractSend("PointSocial", "addDislikeToPost", [postId]);
- static getAllPostsByOwnerLength = async (account) => point.contractCall("PointSocial", "getAllPostsByOwnerLength", [account]);
- static getAllPostsLength = async () => point.contractCall("PointSocial", "getAllPostsLength", []);
- static getPaginatedPostsByOwner = async (account, length, amount) => point.contractCall("PointSocial", "getPaginatedPostsByOwner", [account, length, amount]);
- static getPaginatedPosts = async (length, amount) => point.contractCall("PointSocial", "getPaginatedPosts", [length, amount]);
- static checkLikeToPost = async (postId) => point.contractCall("PointSocial", "checkLikeToPost", [postId]);
+
+ static getAllPostsLength = async (threadId = 0) =>
+ point.contractCall("SocialContent", "getContentLength", [
+ PSConstants.ContentType.Post,
+ "0x0000000000000000000000000000000000000000",
+ threadId
+ ]);
+
+ static getAllPostsByOwnerLength = async (account, threadId = 0) =>
+ point.contractCall("SocialContent", "getContentLength", [
+ PSConstants.ContentType.Post,
+ account,
+ threadId
+ ]);
+
+ static addLikeToPost = async (postId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Post,
+ postId,
+ PSConstants.ReactionType.Like,
+ EMPTY
+ ]);
+
+ static addDislikeToPost = async (postId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Post,
+ postId,
+ PSConstants.ReactionType.Dislike,
+ EMPTY
+ ]);
+
+ static flagPost = async (postId) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Post,
+ postId,
+ PSConstants.ReactionType.Flag,
+ EMPTY
+ ]);
+
+ static tipPost = async (postId, value) =>
+ point.contractSend("SocialContent", "reactToContent", [
+ PSConstants.ContentType.Post,
+ postId,
+ PSConstants.ReactionType.Tip,
+ EMPTY
+ ], value);
}
export default PostManager
\ No newline at end of file
diff --git a/src/services/ThreadManager.js b/src/services/ThreadManager.js
new file mode 100644
index 0000000..31ce19a
--- /dev/null
+++ b/src/services/ThreadManager.js
@@ -0,0 +1,38 @@
+import point from "./PointSDK"
+import PSConstants from "../constants";
+
+const EMPTY = '0x0000000000000000000000000000000000000000';
+
+class ThreadManager {
+
+ static getThreadById = async (threadId) =>
+ point.contractCall("SocialContent", "threadById", [threadId]);
+
+ static getThreadByHandle = async (handle) =>
+ point.contractCall("SocialContent", "threadByHandle", [handle]);
+
+ static createThread = async (handle, thumbnail, banner, description) =>
+ point.contractCall("SocialContent", "threadCreate", [
+ handle, thumbnail, banner, description
+ ]);
+
+ static editThread = async (threadId, thumbnail, banner, description) =>
+ point.contractCall("SocialContent", "threadEdit", [
+ threadId, thumbnail, banner, description
+ ]);
+
+ static subscribeToThread = async (threadId, subscribe) =>
+ point.contractCall("SocialContent", "threadSubscribe", [
+ threadId,
+ subscribe
+ ]);
+
+ static addModerator = async (threadId, user, include) =>
+ point.contractCall("SocialContent", "threadModerate", [
+ threadId,
+ user,
+ include
+ ]);
+}
+
+export default ThreadManager
\ No newline at end of file
diff --git a/src/services/TipManager.js b/src/services/TipManager.js
new file mode 100644
index 0000000..be1ae2b
--- /dev/null
+++ b/src/services/TipManager.js
@@ -0,0 +1,11 @@
+import point from "./PointSDK"
+import constants from "../constants";
+
+const EMPTY = '0x0000000000000000000000000000000000000000';
+
+class TipManager {
+ static getBalance = async () => point.contractCall("SocialTips", "getBalance", []);
+ static withdraw = async () => point.contractCall("SocialTips", "withdraw", []);
+}
+
+export default TipManager
\ No newline at end of file
diff --git a/src/services/UserManager.js b/src/services/UserManager.js
index 5ae355c..4b5c54c 100644
--- a/src/services/UserManager.js
+++ b/src/services/UserManager.js
@@ -1,8 +1,19 @@
import point from "./PointSDK"
class UserManager {
- static getProfile = async (userAddress) => point.contractCall("PointSocial", "getProfile", [userAddress]);
- static setProfile = async (displayName, displayLocation, displayAbout, avatar, banner) => point.contractCall("PointSocial", "setProfile", [displayName, displayLocation, displayAbout, avatar, banner]);
+ static getProfile = async (userAddress) => point.contractCall("SocialProfile", "getProfile", [userAddress]);
+ static setProfile = async (displayName, displayLocation, displayAbout, avatar, banner) => point.contractCall("SocialProfile", "setProfile", [displayName, displayLocation, displayAbout, avatar, banner]);
+ static isFollowing = async (owner, user) => point.contractCall("SocialContacts", "isFollowing", [owner, user]);
+ static followUser = async (user) => point.contractCall("SocialContacts", "followUser", [user]);
+ static unfollowUser = async (user) => point.contractCall("SocialContacts", "unfollowUser", [user]);
+ static blockUser = async (user) => point.contractCall("SocialContacts", "blockUser", [user]);
+ static unblockUser = async (user) => point.contractCall("SocialContacts", "unBlockUser", [user]);
+ static isBlocked = async (owner, user) => point.contractCall("SocialContacts", "isBlocked", [owner, user]);
+ static blockList = async () => point.contractCall("SocialContacts", "blockList", []);
+ static followingList = async (user) => point.contractCall("SocialContacts", "followingList", [user]);
+ static followersList = async (user) => point.contractCall("SocialContacts", "followersList", [user]);
+ static followingCount = async (user) => point.contractCall("SocialContacts", "followingCount", [user]);
+ static followersCount = async (user) => point.contractCall("SocialContacts", "followersCount", [user]);
}
export default UserManager
diff --git a/tasks/contract-registry.ts b/tasks/contract-registry.ts
new file mode 100644
index 0000000..f953620
--- /dev/null
+++ b/tasks/contract-registry.ts
@@ -0,0 +1,63 @@
+import { task } from "hardhat/config";
+import * as https from 'https'
+import fetch from "node-fetch";
+
+const getContract = async (ethers:any, identityAddress:string,contractName:string,appHandle:string) : Promise => {
+ const identity = await ethers.getContractAt("Identity", identityAddress);
+ const contractAddress = await identity.ikvGet(appHandle, `zweb/contracts/address/${contractName}`);
+ const contractAbi = await identity.ikvGet(appHandle, `zweb/contracts/abi/${contractName}`);
+ https.globalAgent.options.rejectUnauthorized = false;
+ const result = await fetch(`https://${process.env.POINT_NODE || 'localhost'}:${process.env.POINT_NODE_PORT || 8666}/_storage/0x${contractAbi}`);
+ const abi = (await result.json()).abi;
+ const instance = (await ethers.getContractAt(abi, contractAddress)) as any;
+ return { instance, contractAddress};
+}
+
+/**
+ * This task is intented to include external contracts in PointSocial contracts through a internal registry
+ *
+ * Usage:
+ * To pause/unpause using production node, use the following environment variables
+ *
+ * export BLOCKCHAIN_HOST=localhost
+ * export POINT_NODE=localhost
+ * export POINT_NODE_PORT=65501
+ * npx hardhat contract-registry SocialTips 0x57BD87BD93b5377Cf012EC8adFb075E6514256E1 SocialProfile 0xD61e5eFcB183418E1f6e53D0605eed8167F90D4d --network development
+ *
+ * You can specify the handle (social or socialdev) using the --handle flag
+ */
+
+task("contract-registry", "Will add addresses to Point Social registry")
+.addPositionalParam("name", 'Identifier of the contract address')
+.addPositionalParam("address", 'Address of the smartcontract that will be added to the registry')
+.addPositionalParam("deployedContracts","contract address where the registry will be modified")
+.addPositionalParam("identityContract","Identity contract source address")
+.addOptionalParam("handle", "Set the app handle")
+.setAction(async (taskArgs, hre) => {
+ const ethers = hre.ethers;
+ const zappHandle = taskArgs.handle || 'social';
+ if(!ethers.utils.isAddress(taskArgs.identityContract)) {
+ console.log('Identity contract address not valid.');
+ return false;
+ }
+
+ try {
+ const contracts = taskArgs.deployedContracts.split(',')
+ .map(async (contract) => {
+ const { instance } = await getContract(ethers, taskArgs.identityContract, contract, zappHandle);
+ console.log(`Adding ${taskArgs.name}:${taskArgs.address} to ${contract}:${instance.address}...`);
+ await instance.addToRegistry(ethers.utils.keccak256(ethers.utils.toUtf8Bytes(taskArgs.name)), taskArgs.address);
+ });
+
+ for (let i = 0; i < contracts.length; i++) {
+ await contracts[i];
+ }
+
+ //await Promise.all(contracts);
+ }
+ catch(error:any) {
+ console.log(error);
+ }
+
+});
+
diff --git a/tests/unit/smartcontracts/PointSocial.js b/tests/unit/PointSocial.js
similarity index 77%
rename from tests/unit/smartcontracts/PointSocial.js
rename to tests/unit/PointSocial.js
index 034e30e..35588a5 100644
--- a/tests/unit/smartcontracts/PointSocial.js
+++ b/tests/unit/PointSocial.js
@@ -3,28 +3,29 @@ const { ethers, upgrades } = require('hardhat');
describe('PointSocial contract', function () {
let pointSocial;
- let identityContract;
+ let identity;
let owner;
let addr1;
let addr2;
let addr3;
let addrs;
let handle = 'social';
- let postContent = '0x9d6b0f937680809a01639ad1ae4770241c7c8a0ded490d2f023669f18c6d744b';
- let postimage = '0x5f04837d78fa7a656419f98d73fc1ddaac1bfdfca9a244a2ee128737a186da6e';
+ //let postContent = '0x9d6b0f937680809a01639ad1ae4770241c7c8a0ded490d2f023669f18c6d744b';
+ //let postimage = '0x5f04837d78fa7a656419f98d73fc1ddaac1bfdfca9a244a2ee128737a186da6e';
beforeEach(async function () {
[owner, addr1, addr2, addr3, ...addrs] = await ethers.getSigners();
const identityFactory = await ethers.getContractFactory('Identity');
- identityContract = await upgrades.deployProxy(identityFactory, [], { kind: 'uups' });
- await identityContract.deployed();
+ identity = await upgrades.deployProxy(identityFactory, [], { kind: 'uups' });
+ await identity.deployed();
const factory = await ethers.getContractFactory('PointSocial');
- pointSocial = await upgrades.deployProxy(factory, [identityContract.address, handle], {
+ pointSocial = await upgrades.deployProxy(factory, [identity.address, handle], {
kind: 'uups',
});
await pointSocial.deployed();
});
+ /*
describe('Testing deployment functions', function () {
it('Should upgrade the proxy by a deployer', async function () {
await identityContract.setDevMode(true);
@@ -41,24 +42,41 @@ describe('PointSocial contract', function () {
await upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer);
});
- it('Should not upgrade the proxy by a non-deployer', async function () {
- await identityContract.setDevMode(true);
- await identityContract.register(
- handle,
- owner.address,
- '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
- '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb'
- );
-
- const factory = await ethers.getContractFactory('PointSocial');
- let socialFactoryDeployer = factory.connect(addr1);
- await expect(
- upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer)
- ).to.be.revertedWith('ERROR_NOT_DEPLOYER');
+ describe("Testing deployment functions", function () {
+
+ it("Should upgrade the proxy by a deployer", async function () {
+ await identityContract.setDevMode(true);
+ await identityContract.register(
+ handle,
+ owner.address,
+ '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
+ '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb');
+ await identityContract.addIdentityDeployer(handle, addr1.address);
+ const factory = await ethers.getContractFactory("PointSocial");
+ let socialFactoryDeployer = factory.connect(addr1);
+
+ await upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer);
+ });
+
+ it("Should not upgrade the proxy by a non-deployer", async function () {
+ await identityContract.setDevMode(true);
+ await identityContract.register(
+ handle,
+ owner.address,
+ '0xed17268897bbcb67127ed550cee2068a15fdb6f69097eebeb6e2ace46305d1ce',
+ '0xe1e032c91d4c8fe6bab1f198871dbafb8842f073acff8ee9b822f748b180d7eb');
+
+ const factory = await ethers.getContractFactory("PointSocial");
+ let socialFactoryDeployer = factory.connect(addr1);
+ await expect(
+ upgrades.upgradeProxy(pointSocial.address, socialFactoryDeployer)
+ ).to.be.revertedWith('ERROR_NOT_DEPLOYER');
+ });
+
});
});
- /*describe("Testing migrator functions", function () {
+ describe("Testing migrator functions", function () {
it("User can add migrator", async function () {
await pointSocial.addMigrator(
addr1.address
@@ -161,17 +179,37 @@ describe('PointSocial contract', function () {
pointSocial.connect(addr2).addMigrator(addr2.address)
).to.be.revertedWith("Ownable: caller is not the owner");
});
- });*/
+ });
describe('Testing user functions', function () {
- it('User can create post', async function () {
+
+ it('test slice', async function () {
+ expect(await pointSocial.test()).to.equal(0x100020003000400050006000700080009000a000b000c000d010e000f0000001);
+ //TODO: check the values
+ });
+
+ /*
+ it('User can create a post', async function () {
+ let contents = '0x0000000000000000000000000000000000000000000000000000000000000001';
+ let media = '0x0000000000000000000000000000000000000000000000000000000000000002';
+ await expect(pointSocial.postCreate(0, contents, media))
+ .to.emit(pointSocial, "PostEvent")
+ //TODO: check the values
+ });*/
+
+
+ /*it('User can create post', async function () {
await pointSocial.addPost(postContent, postimage);
const post = await pointSocial.getPostById(1);
expect(post.contents).to.be.equal(postContent);
expect(post.image).to.be.equal(postimage);
- });
+ });/*
+
+
+
+ /*
it('Get posts by owner', async function () {
await pointSocial.addPost(postContent, postimage);
const posts = await pointSocial.getAllPostsByOwner(owner.address);
@@ -259,10 +297,16 @@ describe('PointSocial contract', function () {
const postCommentId = await pointSocial.commentIdsByPost(1, 0);
const postComments = await pointSocial.commentById(postCommentId);
- expect(postComments.contents).to.be.equal(
- '0x0090916c0e6846d5dc8d22560e90782ded96e4efdeb53db214f612a54d4f5fbe'
- );
- });
+ const paginatedPosts = await pointSocial.getPaginatedPosts("5", "5", "1");
+
+ expect(paginatedPosts.length).to.be.equal(5);
+ });
+
+ it("Add comments to posts", async function () {
+ await pointSocial.addPost(
+ postContent,
+ postimage
+ )
it('Add dislike to posts', async () => {
await pointSocial.addPost(postContent, postimage);
@@ -352,6 +396,6 @@ describe('PointSocial contract', function () {
expect(postComments[1].contents).to.be.equal(
'0x0090916c0e6846d5dc8d22560e90782ded96e4efdeb53db214f612a54d4f5fbe'
);
- });
+ });*/
});
-});
+});
\ No newline at end of file
diff --git a/tests/unit/smartcontracts/PointSocial.ts b/tests/unit/smartcontracts/PointSocial.ts
new file mode 100644
index 0000000..1673904
--- /dev/null
+++ b/tests/unit/smartcontracts/PointSocial.ts
@@ -0,0 +1,350 @@
+import { expect } from 'chai';
+const { ethers, upgrades } = require("hardhat");
+
+describe('PointSocial', function () {
+
+ describe('PointSocial Threads', async function () {
+
+ const handle = 'social';
+ var identity:any;
+ var social:any;
+ var owner:any;
+ var addr1:any;
+ var addr2:any;
+ var addr3:any;
+ var addrs:any;
+
+ const ContentType = {
+ Post:0,
+ Comment:1,
+ Message:2,
+ Chat:3
+ };
+
+ before(async function () {
+ [owner, addr1, addr2, addr3, ...addrs] = await ethers.getSigners();
+
+ const identityFactory = await ethers.getContractFactory('Identity');
+ identity = await upgrades.deployProxy(identityFactory, [], { kind: 'uups' });
+ await identity.deployed();
+
+ const socialFactory = await ethers.getContractFactory('PointSocial');
+ social = await upgrades.deployProxy(socialFactory, [identity.address, handle], { kind: 'uups' });
+ await social.deployed();
+ });
+
+ it('Should create a new thread', async function () {
+ await expect(social.connect(addr1).threadCreate(
+ '0x7465737400000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'ThreadEvent');
+ });
+
+ it('Should revert creation due to repeated thread handle', async function () {
+ await expect(social.connect(addr1).threadCreate(
+ '0x7465737400000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.be.revertedWith("ERROR_HANDLE_EXISTS");
+ });
+
+ it('Should get thread info using id and handle', async function () {
+ expect(
+ (await social.connect(addr1)
+ .threadById(1))
+ ).to.deep.equal(
+ (await social.connect(addr1)
+ .threadByHandle('0x7465737400000000000000000000000000000000000000000000000000000000'))
+ );
+ });
+
+ it('Should get one thread in thread id array', async function () {
+ expect((await social.connect(addr1).getThreadIds())[0]).to.equal(1);
+ });
+
+ it('Should get an empty array of posts', async function () {
+ expect(await social.connect(addr1).getContentIdsByParent(ContentType.Post, '1')).to.deep.equal([]);
+ });
+
+ it('Should get one thread in thread id array for addr1', async function () {
+ expect(await social.connect(addr1).getThreadsByUser(addr1.address)).to.deep.equal([1]);
+ });
+
+ it('Should get zero elements in thread id array for addr2', async function () {
+ expect(await social.connect(addr1).getThreadsByUser(addr2.address)).to.deep.equal([]);
+ });
+
+ it('Should return one address in thread subscriptors array for thread id 1', async function () {
+ expect(await social.connect(addr1).getSubscriptorsByThread(1)).to.deep.equal([addr1.address]);
+ });
+
+ it('Should revert getSubscriptorsByThread due to inexistent post', async function () {
+ await expect(social.connect(addr1).getSubscriptorsByThread(2)).to.be.revertedWith("ERROR_THREAD_NOT_FOUND");
+ });
+
+ it('Should return empty moderator array for thread id 1 (owner is not counted as moderator)', async function () {
+ expect(await social.connect(addr1).getModeratorsByThread(1)).to.deep.equal([]);
+ });
+
+ it('Should revert when subscribing to unexistent thread', async function () {
+ await expect(social.connect(addr2).threadSubscribe(2, true)).to.be.revertedWith("ERROR_THREAD_NOT_FOUND");
+ });
+
+ it('Should subscribe to thread as addr2', async function () {
+ await expect(social.connect(addr2).threadSubscribe(1, true)).to.emit(social, 'ThreadEvent');
+ });
+
+ it('Should revert when subscribing to already subscribed thread', async function () {
+ await expect(social.connect(addr2).threadSubscribe(1, true)).to.be.revertedWith("ERROR_ALREADY_SUBSCRIBED");
+ });
+
+ it('Should return two addresses in thread subscriptors array for thread id 1', async function () {
+ expect(await social.connect(addr1).getSubscriptorsByThread(1)).to.deep.equal([addr1.address, addr2.address]);
+ });
+
+ it('Should revert when self-registering as moderator', async function () {
+ await expect(social.connect(addr2).threadModerate(1, addr2.address, true)).to.be.revertedWith("ACCESS_DENIED");
+ });
+
+ it('Should revert when trying to edit thread', async function () {
+ await expect(social.connect(addr2)
+ .threadEdit(
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.be.revertedWith("ACCESS_DENIED");
+ });
+
+ it('Should add addr2 as moderator', async function () {
+ await expect(social.connect(addr1).threadModerate(1, addr2.address, true)).to.emit(social, 'ThreadEvent');
+ });
+
+ it('Should allow addr2 to edit the thread', async function () {
+ await expect(social.connect(addr2)
+ .threadEdit(
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'ThreadEvent');
+ });
+
+ });
+
+
+ describe('PointSocial Content', async function () {
+
+ const handle = 'social';
+ var identity:any;
+ var social:any;
+ var owner:any;
+ var addr1:any;
+ var addr2:any;
+ var addr3:any;
+ var addrs:any;
+
+ const ContentType = {
+ Post:0,
+ Comment:1,
+ Message:2,
+ Chat:3
+ };
+
+ before(async function () {
+ [owner, addr1, addr2, addr3, ...addrs] = await ethers.getSigners();
+
+ const identityFactory = await ethers.getContractFactory('Identity');
+ identity = await upgrades.deployProxy(identityFactory, [], { kind: 'uups' });
+ await identity.deployed();
+
+ const socialFactory = await ethers.getContractFactory('PointSocial');
+ social = await upgrades.deployProxy(socialFactory, [identity.address, handle], { kind: 'uups' });
+ await social.deployed();
+ });
+
+ it('Should create a new thread', async function () {
+ await expect(social.connect(addr1).threadCreate(
+ '0x7465737400000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'ThreadEvent');
+ });
+
+ it('Should create a new Post in thread id 0', async function () {
+ await expect(social.connect(addr1).contentCreate(
+ 0,
+ 0,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'PostEvent');
+ });
+
+ it('Should create a new Post in thread id 1', async function () {
+ await expect(social.connect(addr1).contentCreate(
+ 0,
+ 1,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'PostEvent');
+ });
+
+ it('Should revert the creation of new post due to invalid thread', async function () {
+ await expect(
+ social.connect(addr1).contentCreate(
+ 0,
+ 2,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.be.revertedWith("THREAD_NOT_FOUND");
+ });
+
+ it('Should edit a Post', async function () {
+ await expect(social.connect(addr1).contentEdit(
+ 0,
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'PostEvent');
+ });
+
+ it('Should revert the edition of post due to invalid owner', async function () {
+ await expect(
+ social.connect(addr2).contentEdit(
+ 0,
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.be.revertedWith("NOT_OWNER");
+ });
+
+ it('Should revert the deletion of post due to invalid owner', async function () {
+ await expect(
+ social.connect(addr2).contentDelete(
+ 0,
+ 1
+ )
+ ).to.be.revertedWith("NOT_OWNER");
+ });
+
+ it('Should delete a Post', async function () {
+ await expect(
+ social.connect(addr1).contentDelete(
+ 0,
+ 1
+ )
+ ).to.emit(social, 'PostEvent');
+ });
+
+ //TODO: check
+ it('Should return the Posts', async function () {
+ await expect(
+ await social.connect(addr1).getContentIds(ContentType.Post, '0x0000000000000000000000000000000000000000')
+ ).to.deep.equal([0,2]);
+ });
+
+ it('Should create a new Comment in Post id 2', async function () {
+ await expect(social.connect(addr1).contentCreate(
+ 1,
+ 2,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'CommentEvent');
+ });
+
+ it('Should create a new reply for Comment 1 in Post id 2', async function () {
+ await expect(social.connect(addr1).contentCreate(
+ 1,
+ 2,
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )).to.emit(social, 'CommentEvent');
+ });
+
+ it('Should revert a new comment in deleted post id 1', async function () {
+ await expect(
+ social.connect(addr1).contentCreate(
+ 1,
+ 1,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.be.revertedWith("POST_NOT_FOUND");
+ });
+
+ it('Should revert the creation of new comment due to invalid post', async function () {
+ await expect(
+ social.connect(addr1).contentCreate(
+ 1,
+ 3,
+ 0,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.be.revertedWith("POST_NOT_FOUND");
+ });
+
+ it('Should revert the edition of comment due to invalid owner', async function () {
+ await expect(
+ social.connect(addr2).contentEdit(
+ 1,
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.be.revertedWith("NOT_OWNER");
+ });
+
+ it('Should edit a Comment', async function () {
+ await expect(
+ social.connect(addr1).contentEdit(
+ 1,
+ 1,
+ '0x0000000000000000000000000000000000000000000000000000000000000000',
+ '0x0000000000000000000000000000000000000000000000000000000000000000'
+ )
+ ).to.emit(social, 'CommentEvent');
+ });
+
+ it('Should revert the deletion of comment due to invalid owner', async function () {
+ await expect(
+ social.connect(addr2).contentDelete(
+ 1,
+ 1
+ )
+ ).to.be.revertedWith("NOT_OWNER");
+ });
+
+ it('Should revert the deletion of comment due to comment with reply', async function () {
+ await expect(
+ social.connect(addr1).contentDelete(
+ 1,
+ 1
+ )
+ ).to.be.revertedWith("NOT_EMPTY");
+ });
+
+ it('Should delete a Comment', async function () {
+ await expect(
+ social.connect(addr1).contentDelete(
+ 1,
+ 2
+ )
+ ).to.emit(social, 'CommentEvent');
+ });
+
+ });
+
+});
diff --git a/typechain/ERC1967UpgradeUpgradeable.d.ts b/typechain/ERC1967UpgradeUpgradeable.d.ts
deleted file mode 100644
index 329ad08..0000000
--- a/typechain/ERC1967UpgradeUpgradeable.d.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface ERC1967UpgradeUpgradeableInterface extends ethers.utils.Interface {
- functions: {};
-
- events: {
- "AdminChanged(address,address)": EventFragment;
- "BeaconUpgraded(address)": EventFragment;
- "Upgraded(address)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
-}
-
-export type AdminChangedEvent = TypedEvent<
- [string, string] & { previousAdmin: string; newAdmin: string }
->;
-
-export type BeaconUpgradedEvent = TypedEvent<[string] & { beacon: string }>;
-
-export type UpgradedEvent = TypedEvent<[string] & { implementation: string }>;
-
-export class ERC1967UpgradeUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: ERC1967UpgradeUpgradeableInterface;
-
- functions: {};
-
- callStatic: {};
-
- filters: {
- "AdminChanged(address,address)"(
- previousAdmin?: null,
- newAdmin?: null
- ): TypedEventFilter<
- [string, string],
- { previousAdmin: string; newAdmin: string }
- >;
-
- AdminChanged(
- previousAdmin?: null,
- newAdmin?: null
- ): TypedEventFilter<
- [string, string],
- { previousAdmin: string; newAdmin: string }
- >;
-
- "BeaconUpgraded(address)"(
- beacon?: string | null
- ): TypedEventFilter<[string], { beacon: string }>;
-
- BeaconUpgraded(
- beacon?: string | null
- ): TypedEventFilter<[string], { beacon: string }>;
-
- "Upgraded(address)"(
- implementation?: string | null
- ): TypedEventFilter<[string], { implementation: string }>;
-
- Upgraded(
- implementation?: string | null
- ): TypedEventFilter<[string], { implementation: string }>;
- };
-
- estimateGas: {};
-
- populateTransaction: {};
-}
diff --git a/typechain/IBeaconUpgradeable.d.ts b/typechain/IBeaconUpgradeable.d.ts
deleted file mode 100644
index 864f4a0..0000000
--- a/typechain/IBeaconUpgradeable.d.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IBeaconUpgradeableInterface extends ethers.utils.Interface {
- functions: {
- "implementation()": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "implementation",
- values?: undefined
- ): string;
-
- decodeFunctionResult(
- functionFragment: "implementation",
- data: BytesLike
- ): Result;
-
- events: {};
-}
-
-export class IBeaconUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IBeaconUpgradeableInterface;
-
- functions: {
- implementation(overrides?: CallOverrides): Promise<[string]>;
- };
-
- implementation(overrides?: CallOverrides): Promise;
-
- callStatic: {
- implementation(overrides?: CallOverrides): Promise;
- };
-
- filters: {};
-
- estimateGas: {
- implementation(overrides?: CallOverrides): Promise;
- };
-
- populateTransaction: {
- implementation(overrides?: CallOverrides): Promise;
- };
-}
diff --git a/typechain/IERC1822ProxiableUpgradeable.d.ts b/typechain/IERC1822ProxiableUpgradeable.d.ts
deleted file mode 100644
index e45277d..0000000
--- a/typechain/IERC1822ProxiableUpgradeable.d.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IERC1822ProxiableUpgradeableInterface extends ethers.utils.Interface {
- functions: {
- "proxiableUUID()": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "proxiableUUID",
- values?: undefined
- ): string;
-
- decodeFunctionResult(
- functionFragment: "proxiableUUID",
- data: BytesLike
- ): Result;
-
- events: {};
-}
-
-export class IERC1822ProxiableUpgradeable extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IERC1822ProxiableUpgradeableInterface;
-
- functions: {
- proxiableUUID(overrides?: CallOverrides): Promise<[string]>;
- };
-
- proxiableUUID(overrides?: CallOverrides): Promise;
-
- callStatic: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-
- filters: {};
-
- estimateGas: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-
- populateTransaction: {
- proxiableUUID(overrides?: CallOverrides): Promise;
- };
-}
diff --git a/typechain/IIdentity.d.ts b/typechain/IIdentity.d.ts
deleted file mode 100644
index 46c24a1..0000000
--- a/typechain/IIdentity.d.ts
+++ /dev/null
@@ -1,919 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- Overrides,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IIdentityInterface extends ethers.utils.Interface {
- functions: {
- "addIdentityDeployer(string,address)": FunctionFragment;
- "canonical(string)": FunctionFragment;
- "finishMigrations()": FunctionFragment;
- "getCommPublicKeyByIdentity(string)": FunctionFragment;
- "getDevMode()": FunctionFragment;
- "getIdentityByOwner(address)": FunctionFragment;
- "getMaxHandleLength()": FunctionFragment;
- "getOracleAddress()": FunctionFragment;
- "getOwnerByIdentity(string)": FunctionFragment;
- "ikvGet(string,string)": FunctionFragment;
- "ikvImportKV(string,string,string,string)": FunctionFragment;
- "ikvPut(string,string,string,string)": FunctionFragment;
- "isIdentityDeployer(string,address)": FunctionFragment;
- "register(string,address,bytes32,bytes32)": FunctionFragment;
- "registerVerified(string,address,bytes32,bytes32,bytes32,uint8,bytes32,bytes32)": FunctionFragment;
- "removeIdentityDeployer(string,address)": FunctionFragment;
- "setDevMode(bool)": FunctionFragment;
- "setMaxHandleLength(uint256)": FunctionFragment;
- "setOracleAddress(address)": FunctionFragment;
- "transferIdentityOwnership(string,address)": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "addIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "canonical", values: [string]): string;
- encodeFunctionData(
- functionFragment: "finishMigrations",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getCommPublicKeyByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getDevMode",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getIdentityByOwner",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getMaxHandleLength",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOracleAddress",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOwnerByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvGet",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvImportKV",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvPut",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "isIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "register",
- values: [string, string, BytesLike, BytesLike]
- ): string;
- encodeFunctionData(
- functionFragment: "registerVerified",
- values: [
- string,
- string,
- BytesLike,
- BytesLike,
- BytesLike,
- BigNumberish,
- BytesLike,
- BytesLike
- ]
- ): string;
- encodeFunctionData(
- functionFragment: "removeIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "setDevMode", values: [boolean]): string;
- encodeFunctionData(
- functionFragment: "setMaxHandleLength",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "setOracleAddress",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferIdentityOwnership",
- values: [string, string]
- ): string;
-
- decodeFunctionResult(
- functionFragment: "addIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "canonical", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "finishMigrations",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getCommPublicKeyByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "getDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "getIdentityByOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOwnerByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvGet", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ikvImportKV",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvPut", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "isIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "register", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "registerVerified",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "removeIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "setDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "setMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "setOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferIdentityOwnership",
- data: BytesLike
- ): Result;
-
- events: {
- "IKVSet(string,string,string,string)": EventFragment;
- "IdentityDeployerChanged(string,address,bool)": EventFragment;
- "IdentityOwnershipTransferred(string,address,address,uint256)": EventFragment;
- "IdentityRegistered(string,address,tuple)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "IKVSet"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityDeployerChanged"): EventFragment;
- getEvent(
- nameOrSignatureOrTopic: "IdentityOwnershipTransferred"
- ): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityRegistered"): EventFragment;
-}
-
-export type IKVSetEvent = TypedEvent<
- [string, string, string, string] & {
- identity: string;
- key: string;
- value: string;
- version: string;
- }
->;
-
-export type IdentityDeployerChangedEvent = TypedEvent<
- [string, string, boolean] & {
- identity: string;
- deployer: string;
- allowed: boolean;
- }
->;
-
-export type IdentityOwnershipTransferredEvent = TypedEvent<
- [string, string, string, BigNumber] & {
- handle: string;
- oldOwner: string;
- newOwner: string;
- date: BigNumber;
- }
->;
-
-export type IdentityRegisteredEvent = TypedEvent<
- [string, string, [string, string] & { part1: string; part2: string }] & {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
->;
-
-export class IIdentity extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- on, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- once, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeListener, EventArgsObject>(
- eventFilter: TypedEventFilter,
- listener: TypedListener
- ): this;
- removeAllListeners, EventArgsObject>(
- eventFilter: TypedEventFilter
- ): this;
-
- listeners(eventName?: string): Array;
- off(eventName: string, listener: Listener): this;
- on(eventName: string, listener: Listener): this;
- once(eventName: string, listener: Listener): this;
- removeListener(eventName: string, listener: Listener): this;
- removeAllListeners(eventName?: string): this;
-
- queryFilter, EventArgsObject>(
- event: TypedEventFilter,
- fromBlockOrBlockhash?: string | number | undefined,
- toBlock?: string | number | undefined
- ): Promise>>;
-
- interface: IIdentityInterface;
-
- functions: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(
- anyCase: string,
- overrides?: CallOverrides
- ): Promise<[string] & { canonicalCase: string }>;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<
- [[string, string] & { part1: string; part2: string }] & {
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
-
- getDevMode(overrides?: CallOverrides): Promise<[boolean]>;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise<[string] & { identity: string }>;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise<[BigNumber]>;
-
- getOracleAddress(overrides?: CallOverrides): Promise<[string]>;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string] & { owner: string }>;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise<[string] & { value: string }>;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise<[boolean]>;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string, string] & { part1: string; part2: string }>;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(owner: string, overrides?: CallOverrides): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- callStatic: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(overrides?: CallOverrides): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise<[string, string] & { part1: string; part2: string }>;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: CallOverrides
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: CallOverrides
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: CallOverrides
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- setDevMode(value: boolean, overrides?: CallOverrides): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: CallOverrides
- ): Promise;
-
- setOracleAddress(addr: string, overrides?: CallOverrides): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: CallOverrides
- ): Promise;
- };
-
- filters: {
- "IKVSet(string,string,string,string)"(
- identity?: null,
- key?: null,
- value?: null,
- version?: null
- ): TypedEventFilter<
- [string, string, string, string],
- { identity: string; key: string; value: string; version: string }
- >;
-
- IKVSet(
- identity?: null,
- key?: null,
- value?: null,
- version?: null
- ): TypedEventFilter<
- [string, string, string, string],
- { identity: string; key: string; value: string; version: string }
- >;
-
- "IdentityDeployerChanged(string,address,bool)"(
- identity?: null,
- deployer?: null,
- allowed?: null
- ): TypedEventFilter<
- [string, string, boolean],
- { identity: string; deployer: string; allowed: boolean }
- >;
-
- IdentityDeployerChanged(
- identity?: null,
- deployer?: null,
- allowed?: null
- ): TypedEventFilter<
- [string, string, boolean],
- { identity: string; deployer: string; allowed: boolean }
- >;
-
- "IdentityOwnershipTransferred(string,address,address,uint256)"(
- handle?: string | null,
- oldOwner?: string | null,
- newOwner?: string | null,
- date?: null
- ): TypedEventFilter<
- [string, string, string, BigNumber],
- { handle: string; oldOwner: string; newOwner: string; date: BigNumber }
- >;
-
- IdentityOwnershipTransferred(
- handle?: string | null,
- oldOwner?: string | null,
- newOwner?: string | null,
- date?: null
- ): TypedEventFilter<
- [string, string, string, BigNumber],
- { handle: string; oldOwner: string; newOwner: string; date: BigNumber }
- >;
-
- "IdentityRegistered(string,address,tuple)"(
- handle?: null,
- identityOwner?: null,
- commPublicKey?: null
- ): TypedEventFilter<
- [string, string, [string, string] & { part1: string; part2: string }],
- {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
-
- IdentityRegistered(
- handle?: null,
- identityOwner?: null,
- commPublicKey?: null
- ): TypedEventFilter<
- [string, string, [string, string] & { part1: string; part2: string }],
- {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
- >;
- };
-
- estimateGas: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(anyCase: string, overrides?: CallOverrides): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(overrides?: CallOverrides): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-
- populateTransaction: {
- addIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- canonical(
- anyCase: string,
- overrides?: CallOverrides
- ): Promise;
-
- finishMigrations(
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- getCommPublicKeyByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- getDevMode(overrides?: CallOverrides): Promise;
-
- getIdentityByOwner(
- owner: string,
- overrides?: CallOverrides
- ): Promise;
-
- getMaxHandleLength(
- overrides?: CallOverrides
- ): Promise;
-
- getOracleAddress(overrides?: CallOverrides): Promise;
-
- getOwnerByIdentity(
- identity: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvGet(
- identity: string,
- key: string,
- overrides?: CallOverrides
- ): Promise;
-
- ikvImportKV(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- ikvPut(
- identity: string,
- key: string,
- value: string,
- version: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- isIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: CallOverrides
- ): Promise;
-
- register(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- registerVerified(
- handle: string,
- identityOwner: string,
- commPublicKeyPart1: BytesLike,
- commPublicKeyPart2: BytesLike,
- _hashedMessage: BytesLike,
- _v: BigNumberish,
- _r: BytesLike,
- _s: BytesLike,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- removeIdentityDeployer(
- handle: string,
- deployer: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setDevMode(
- value: boolean,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setMaxHandleLength(
- value: BigNumberish,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- setOracleAddress(
- addr: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
-
- transferIdentityOwnership(
- handle: string,
- newOwner: string,
- overrides?: Overrides & { from?: string | Promise }
- ): Promise;
- };
-}
diff --git a/typechain/Identity.d.ts b/typechain/Identity.d.ts
deleted file mode 100644
index 30f4c08..0000000
--- a/typechain/Identity.d.ts
+++ /dev/null
@@ -1,1401 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
- ethers,
- EventFilter,
- Signer,
- BigNumber,
- BigNumberish,
- PopulatedTransaction,
- BaseContract,
- ContractTransaction,
- Overrides,
- PayableOverrides,
- CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface IdentityInterface extends ethers.utils.Interface {
- functions: {
- "addIdentityDeployer(string,address)": FunctionFragment;
- "canonical(string)": FunctionFragment;
- "finishMigrations()": FunctionFragment;
- "getCommPublicKeyByIdentity(string)": FunctionFragment;
- "getDevMode()": FunctionFragment;
- "getIdentityByOwner(address)": FunctionFragment;
- "getMaxHandleLength()": FunctionFragment;
- "getOracleAddress()": FunctionFragment;
- "getOwnerByIdentity(string)": FunctionFragment;
- "identityList(uint256)": FunctionFragment;
- "identityToCommPublicKey(string)": FunctionFragment;
- "identityToOwner(string)": FunctionFragment;
- "ikv(string,string)": FunctionFragment;
- "ikvGet(string,string)": FunctionFragment;
- "ikvImportKV(string,string,string,string)": FunctionFragment;
- "ikvList(string,uint256)": FunctionFragment;
- "ikvPut(string,string,string,string)": FunctionFragment;
- "initialize()": FunctionFragment;
- "isIdentityDeployer(string,address)": FunctionFragment;
- "lowercaseToCanonicalIdentities(string)": FunctionFragment;
- "migrationApplied()": FunctionFragment;
- "owner()": FunctionFragment;
- "ownerToIdentity(address)": FunctionFragment;
- "proxiableUUID()": FunctionFragment;
- "register(string,address,bytes32,bytes32)": FunctionFragment;
- "registerVerified(string,address,bytes32,bytes32,bytes32,uint8,bytes32,bytes32)": FunctionFragment;
- "removeIdentityDeployer(string,address)": FunctionFragment;
- "renounceOwnership()": FunctionFragment;
- "setDevMode(bool)": FunctionFragment;
- "setMaxHandleLength(uint256)": FunctionFragment;
- "setOracleAddress(address)": FunctionFragment;
- "transferIdentityOwnership(string,address)": FunctionFragment;
- "transferOwnership(address)": FunctionFragment;
- "upgradeTo(address)": FunctionFragment;
- "upgradeToAndCall(address,bytes)": FunctionFragment;
- };
-
- encodeFunctionData(
- functionFragment: "addIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(functionFragment: "canonical", values: [string]): string;
- encodeFunctionData(
- functionFragment: "finishMigrations",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getCommPublicKeyByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getDevMode",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getIdentityByOwner",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "getMaxHandleLength",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOracleAddress",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "getOwnerByIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "identityList",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "identityToCommPublicKey",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "identityToOwner",
- values: [string]
- ): string;
- encodeFunctionData(functionFragment: "ikv", values: [string, string]): string;
- encodeFunctionData(
- functionFragment: "ikvGet",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvImportKV",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvList",
- values: [string, BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "ikvPut",
- values: [string, string, string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "initialize",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "isIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "lowercaseToCanonicalIdentities",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "migrationApplied",
- values?: undefined
- ): string;
- encodeFunctionData(functionFragment: "owner", values?: undefined): string;
- encodeFunctionData(
- functionFragment: "ownerToIdentity",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "proxiableUUID",
- values?: undefined
- ): string;
- encodeFunctionData(
- functionFragment: "register",
- values: [string, string, BytesLike, BytesLike]
- ): string;
- encodeFunctionData(
- functionFragment: "registerVerified",
- values: [
- string,
- string,
- BytesLike,
- BytesLike,
- BytesLike,
- BigNumberish,
- BytesLike,
- BytesLike
- ]
- ): string;
- encodeFunctionData(
- functionFragment: "removeIdentityDeployer",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "renounceOwnership",
- values?: undefined
- ): string;
- encodeFunctionData(functionFragment: "setDevMode", values: [boolean]): string;
- encodeFunctionData(
- functionFragment: "setMaxHandleLength",
- values: [BigNumberish]
- ): string;
- encodeFunctionData(
- functionFragment: "setOracleAddress",
- values: [string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferIdentityOwnership",
- values: [string, string]
- ): string;
- encodeFunctionData(
- functionFragment: "transferOwnership",
- values: [string]
- ): string;
- encodeFunctionData(functionFragment: "upgradeTo", values: [string]): string;
- encodeFunctionData(
- functionFragment: "upgradeToAndCall",
- values: [string, BytesLike]
- ): string;
-
- decodeFunctionResult(
- functionFragment: "addIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "canonical", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "finishMigrations",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getCommPublicKeyByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "getDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "getIdentityByOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "getOwnerByIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityList",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityToCommPublicKey",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "identityToOwner",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikv", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "ikvGet", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ikvImportKV",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "ikvList", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "ikvPut", data: BytesLike): Result;
- decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "isIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "lowercaseToCanonicalIdentities",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "migrationApplied",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "ownerToIdentity",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "proxiableUUID",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "register", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "registerVerified",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "removeIdentityDeployer",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "renounceOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "setDevMode", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "setMaxHandleLength",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "setOracleAddress",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferIdentityOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(
- functionFragment: "transferOwnership",
- data: BytesLike
- ): Result;
- decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
- decodeFunctionResult(
- functionFragment: "upgradeToAndCall",
- data: BytesLike
- ): Result;
-
- events: {
- "AdminChanged(address,address)": EventFragment;
- "BeaconUpgraded(address)": EventFragment;
- "IKVSet(string,string,string,string)": EventFragment;
- "IdentityDeployerChanged(string,address,bool)": EventFragment;
- "IdentityOwnershipTransferred(string,address,address,uint256)": EventFragment;
- "IdentityRegistered(string,address,tuple)": EventFragment;
- "OwnershipTransferred(address,address)": EventFragment;
- "Upgraded(address)": EventFragment;
- };
-
- getEvent(nameOrSignatureOrTopic: "AdminChanged"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "BeaconUpgraded"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IKVSet"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityDeployerChanged"): EventFragment;
- getEvent(
- nameOrSignatureOrTopic: "IdentityOwnershipTransferred"
- ): EventFragment;
- getEvent(nameOrSignatureOrTopic: "IdentityRegistered"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
- getEvent(nameOrSignatureOrTopic: "Upgraded"): EventFragment;
-}
-
-export type AdminChangedEvent = TypedEvent<
- [string, string] & { previousAdmin: string; newAdmin: string }
->;
-
-export type BeaconUpgradedEvent = TypedEvent<[string] & { beacon: string }>;
-
-export type IKVSetEvent = TypedEvent<
- [string, string, string, string] & {
- identity: string;
- key: string;
- value: string;
- version: string;
- }
->;
-
-export type IdentityDeployerChangedEvent = TypedEvent<
- [string, string, boolean] & {
- identity: string;
- deployer: string;
- allowed: boolean;
- }
->;
-
-export type IdentityOwnershipTransferredEvent = TypedEvent<
- [string, string, string, BigNumber] & {
- handle: string;
- oldOwner: string;
- newOwner: string;
- date: BigNumber;
- }
->;
-
-export type IdentityRegisteredEvent = TypedEvent<
- [string, string, [string, string] & { part1: string; part2: string }] & {
- handle: string;
- identityOwner: string;
- commPublicKey: [string, string] & { part1: string; part2: string };
- }
->;
-
-export type OwnershipTransferredEvent = TypedEvent<
- [string, string] & { previousOwner: string; newOwner: string }
->;
-
-export type UpgradedEvent = TypedEvent<[string] & { implementation: string }>;
-
-export class Identity extends BaseContract {
- connect(signerOrProvider: Signer | Provider | string): this;
- attach(addressOrName: string): this;
- deployed(): Promise;
-
- listeners, EventArgsObject>(
- eventFilter?: TypedEventFilter
- ): Array>;
- off
+ {
+ !loading &&
+
+ Download
+ }/>
+
+ }
+
+ {
+ walletAddress?
+
+ {
+ walletAddress &&
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+ { alert.split("|")[0] }
+
+
+ :
+ <>
+ { (!loading) &&
+ <>
+