Skip to content
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

Jump to bottom

Added hashtags in the post container seperately #121

Merged
merged 2 commits into from
May 11, 2024
Merged

Added hashtags in the post container seperately #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17098d0
Added hashtags in the post container seperately
aaaa760 Apr 16, 2024
cd835f2
Modified Container Design
aaaa760 May 9, 2024
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
189 changes: 104 additions & 85 deletions src/components/Posts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { getEventHash, getSignature, nip19, SimplePool } from 'nostr-tools';
import { fetchInvoice, getProfileMetadata, getZapEndpoint } from '../ZapHelper';
import { Link } from 'react-router-dom';
import { useNavigate } from 'react-router-dom';
import React, { useEffect, useState } from 'react';
import ZapModal from '../ZapHelper/ZapModal';
import { ShareModal } from '../Share/modal';
Expand Down Expand Up @@ -94,6 +95,15 @@ export const removeHashtagsAndLinks = text => {
return text.replace(/(https?:\/\/[^\s]+)/g, '');
};

export const removeHashtags = text => {
const withoutHastags = text.replace(/#\w+/g, '');
return withoutHastags.replace(/(https?:\/\/[^\s]+)/g, '');
};

export function extractHashtags(text) {
return text.match(/#\w+/g) || [];
}

export async function upvotePost(noteId, userPublicKey) {
const storedData = localStorage.getItem('memestr');

Expand Down Expand Up @@ -322,6 +332,7 @@ function Posts(props) {
let title = removeHashtagsAndLinks(props.note.content)
.trimLeft()
.trimRight();

if (title.length === 0) {
title = ' ';
}
Expand Down Expand Up @@ -350,33 +361,9 @@ function Posts(props) {
}
}

function convertHashtagsToLinks(text) {
const hashtagRegex = /#(\w+)(?=\s|#|$)/g;
const tokens = [];
let match;
let lastIndex = 0;
while ((match = hashtagRegex.exec(text)) !== null) {
if (match.index > lastIndex) {
tokens.push(text.slice(lastIndex, match.index));
}
tokens.push(
<Link
to={`/search/${match[1]}`}
key={match[1]}
className="text-customBlue hover:text-customBlue-700 hover:decoration-customBlue-700 transition duration-300 ease-in-out hover:scale-112">
{match[0]}
</Link>,
);
lastIndex = match.index + match[0].length;
}
if (lastIndex < text.length) {
tokens.push(text.slice(lastIndex));
}
return tokens;
}

let truncatedTitle = truncateTitle(title, 70);
let titleWithLinks = convertHashtagsToLinks(truncatedTitle);
let hashtags = extractHashtags(truncatedTitle);
let titleWithLinks = removeHashtags(truncatedTitle);

function renderContent(imageLink) {
try {
Expand Down Expand Up @@ -420,79 +407,111 @@ function Posts(props) {
}
});
}
const navigate = useNavigate();
const handleTagClick = suggestions => {
navigate(`/search/${suggestions}`);
};

let postUrl = `/post/${props.note.id}?voteCount=${votesCount}`;
return (
<>
<div className="flex flex-col items-center">
<div className="bg-white mt-4 overflow-hidden rounded-sm w-full max-w-md">
{/* Post Header: Title and Time */}
<div className="py-2 px-1 pb-1 border-t border-x border-gray-300 rounded-t-md">
<div className="flex justify-between items-center">
<h3 className="font-bold font-nunito">
{titleWithLinks}
</h3>
<span className="text-xs text-gray-500">
{timeDifference.duration}
{timeDifference.unit}
</span>
</div>
</div>

{/* Post Media Content */}

<div className="h-max lg:px-1 bg-gray-200 border border-gray-300">
<div className="h-max lg: bg-gray-200 border border-gray-300">
{renderContent(imageLink)}
</div>

<div className="border-t border-grey-100 rounded-b-md "></div>
<div className="border-x border-grey-100 flex flex-col p-3">
<div className="flex justify-between items-centre">
<Link to={postUrl} className="flex items-center ">
<CommentSvg className="h-4 w-4 text-black-600" />
<span className="text-xs text-gray-600 ml-1">
{commentCount > 0 ? commentCount : ''}
</span>
</Link>

<button
onClick={handleZapButton}
className={`flex items-center ${
fillZap
? 'text-yellow-300'
: 'text-black-600'
}`}>
<ZapSvg className="h-4 w-4 text-black-600" />
{processedValue && (
<span className="text-xs ml-1">
{processedValue}
<div className="flex justify-between items-center">
<div className="flex items-center">
<Link
to={postUrl}
className="flex items-center">
<CommentSvg className="h-4 w-4 text-black-600" />
<span className="text-xs text-gray-600 ml-1">
{commentCount > 0 ? commentCount : ''}
</span>
</Link>
</div>

<div className="flex items-center">
<button
onClick={handleZapButton}
className={`flex items-center ${
fillZap
? 'text-yellow-300'
: 'text-black-600'
}`}>
<ZapSvg className="h-4 w-4 text-black-600" />
{processedValue && (
<span className="text-xs ml-1">
{processedValue}
</span>
)}
<ZapModal
isOpenm={isModalOpen}
onConfirm={handleConfirm}
/>
</button>
</div>

<div className="flex items-center">
<button
onClick={handleLikeButtonClick}
disabled={isTodisabled()}
className={`flex items-center ${
fillLike
? 'text-red-600'
: 'text-black-600'
}`}>
<LikeSvg
fill={fillLike ? 'red' : 'none'}
className="h-4 w-4"
/>
<span className="text-xs ml-1 text-black-600">
{votesCount}
</span>
)}
<ZapModal
isOpenm={isModalOpen}
onConfirm={handleConfirm}
/>
</button>

<button
onClick={handleLikeButtonClick}
disabled={isTodisabled()}
className={`flex items-center ${
fillLike ? 'text-red-600' : 'text-black-600'
}`}>
<LikeSvg
fill={fillLike ? 'red' : 'none'}
className="h-4 w-4"
/>
<span className="text-xs ml-1 text-black-600">
{votesCount}
</span>
</button>

<button onClick={openShareModal} className="p-1">
<ShareButtonSvg className="h-4 w-4 text-gray-600" />
</button>
</button>
</div>

<div className="flex items-center">
<button
onClick={openShareModal}
className="p-1">
<ShareButtonSvg className="h-4 w-4 text-gray-600" />
</button>
</div>
</div>
</div>
<div className="border-t border-grey-100 rounded-b-md "></div>

<div className="border-x border-grey-100 flex justify-between items-center px-1 ">
<div className="flex gap-2 py-2">
{hashtags.slice(0, 4).map((tag, index) => (
<button
key={index}
onClick={() =>
handleTagClick(tag.substring(1))
}
className="bg-gray-200 text-black rounded-full px-4 py-1 text-sm focus:outline-none">
{tag.substring(1)}
</button>
))}
</div>

<span className="text-xs text-gray-500">
{timeDifference.duration}
{timeDifference.unit}
</span>
</div>

<div className="border-x border-grey-100">
<h3 className="font-bold font-nunito px-1">
{titleWithLinks}
</h3>
</div>

<div className="border-t border-grey-100 rounded-b-md "></div>
</div>
Expand Down
Loading