Skip to content

Rewrite context and make various fixes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tankakatan merged 5 commits into from
Nov 2, 2022
Merged

Rewrite context and make various fixes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e962349
Rewrite context and make various fixes
Koochr Nov 1, 2022
0f94d22
Add useMemo to posts
Koochr Nov 1, 2022
46e1adf
Make setTheme nonpayable
Koochr Nov 1, 2022
e9a1327
Update routes.json
Koochr Nov 1, 2022
f7a8faa
Fix blog adding and deleting cache
Koochr Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = {
'semi': ['error', 'always'],
'linebreak-style': 'off',
'no-fallthrough': 'off',
'no-console': 'warn', // TODO: replace console with logger in helpers and set to error
'no-console': ['warn', {allow: ['error']}],
'no-debugger': 'error',
'max-len': [
'warn',
Expand Down Expand Up @@ -110,5 +110,15 @@ module.exports = {
// 'import/imports-first': ['error', 'absolute-first'],
// 'import/extensions': ['error', 'never'],
// 'import/no-unresolved': 'off',
}
},
overrides: [
{
files: ['hardhat/**/*', 'watch.docker.js'],
rules: {'no-console': 'off'}
},
{
files: ['*.js'],
rules: {'@typescript-eslint/explicit-module-boundary-types': 'off'}
}
]
};
48 changes: 22 additions & 26 deletions hardhat/contracts/Blog.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
Counters.Counter private numBlogPosts;
Counters.Counter internal commentIds;

struct Theme{
struct Theme {
string background;
string primary;
string text;
}

struct UserInfo {
address walletAddress;
address walletAddress; // @deprecated
string dataStorageHash;
}

Expand Down Expand Up @@ -62,18 +62,14 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
function _authorizeUpgrade(address) internal override onlyOwner {}

// User Info methods
function getUserInfo() public view returns (UserInfo memory) {
return user;
function getUserInfo() public view returns (string memory) {
return user.dataStorageHash;
}

function saveUserInfo(
address _walletAddress,
string calldata _dataStorageHash
) public payable {
user = UserInfo({
walletAddress: _walletAddress,
dataStorageHash: _dataStorageHash
});
string calldata dataStorageHash
) public onlyOwner {
user.dataStorageHash = dataStorageHash;
}

// Blog Post methods
Expand All @@ -95,7 +91,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
bool _isPublished,
string calldata _publishDate,
string calldata _tags
) public payable onlyOwner {
) public onlyOwner {
string[] memory _previousStorageHashes;
numBlogPosts.increment();
BlogPost memory blog = BlogPost({
Expand All @@ -114,7 +110,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
string calldata _storageHash,
string calldata _publishDate,
string calldata _tags
) public payable onlyOwner {
) public onlyOwner {
uint256 index = _getBlogIndexById(id);
blogPosts[index].previousStorageHashes.push(
blogPosts[index].storageHash
Expand All @@ -124,7 +120,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
blogPosts[index].tags = _tags;
}

function deleteBlog(uint256 _id) public payable onlyOwner {
function deleteBlog(uint256 _id) public onlyOwner {
uint256 requiredBlogIndex = _getBlogIndexById(_id);
deletedBlogPosts.push(blogPosts[requiredBlogIndex]);
for (uint256 i = requiredBlogIndex; i < blogPosts.length - 1; i++) {
Expand All @@ -133,13 +129,13 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
blogPosts.pop();
}

function publish(uint256 _id) public payable onlyOwner {
function publish(uint256 _id) public onlyOwner {
uint256 requiredBlogIndex = _getBlogIndexById(_id);
BlogPost storage requiredBlog = blogPosts[requiredBlogIndex];
requiredBlog.isPublished = true;
}

function unpublish(uint256 _id) public payable onlyOwner {
function unpublish(uint256 _id) public onlyOwner {
uint256 requiredBlogIndex = _getBlogIndexById(_id);
BlogPost storage requiredBlog = blogPosts[requiredBlogIndex];
requiredBlog.isPublished = false;
Expand All @@ -154,9 +150,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
return commentsByBlogPostId[_id];
}

function addCommentToBlogPost(uint256 _id, string calldata _comment)
public
payable
function addCommentToBlogPost(uint256 _id, string calldata _comment) public
{
Comment memory comment = Comment({
id: commentIds.current(),
Expand All @@ -171,7 +165,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
uint256 _blogId,
uint256 _commentId,
string calldata _comment
) public payable {
) public {
for (uint256 i = 0; i < commentsByBlogPostId[_blogId].length; i++) {
if (commentsByBlogPostId[_blogId][i].id == _commentId) {
if (
Expand All @@ -185,9 +179,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
}
}

function deleteCommentForBlogPost(uint256 _blogId, uint256 _commentId)
public
payable
function deleteCommentForBlogPost(uint256 _blogId, uint256 _commentId) public
{
uint256 index;
for (uint256 i = 0; i < commentsByBlogPostId[_blogId].length; i++) {
Expand Down Expand Up @@ -222,7 +214,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
return likesByBlogPostId[_id];
}

function likeBlogPost(uint256 _id) public payable {
function likeBlogPost(uint256 _id) public {
for (uint256 i = 0; i < likesByBlogPostId[_id].length; i++) {
if (likesByBlogPostId[_id][i] == msg.sender) {
revert("You have already liked the blog");
Expand All @@ -231,7 +223,7 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
likesByBlogPostId[_id].push(msg.sender);
}

function unlikeBlogPost(uint256 _id) public payable {
function unlikeBlogPost(uint256 _id) public {
uint256 index;
for (uint256 i = 0; i < likesByBlogPostId[_id].length; i++) {
if (likesByBlogPostId[_id][i] == msg.sender) {
Expand Down Expand Up @@ -316,7 +308,11 @@ contract Blog is Initializable, UUPSUpgradeable, OwnableUpgradeable {
return theme;
}

function setTheme(string calldata _background, string calldata _primary, string calldata _text) public payable {
function setTheme(
string calldata _background,
string calldata _primary,
string calldata _text
) public onlyOwner {
theme = Theme({
background: _background,
primary: _primary,
Expand Down
Loading