Merge branch 'master' into new_style

This commit is contained in:
mrfry 2021-03-06 14:54:49 +01:00
commit 843f0a7dad
6 changed files with 58 additions and 56 deletions

View file

@ -8,7 +8,8 @@ import styles from './newsEntry.module.css'
export default function NewsEntry({
newsItem,
uid,
onReact,
onCommentReact,
onNewsReact,
onComment,
onDelete,
onPostDelete,
@ -19,19 +20,20 @@ export default function NewsEntry({
<div className={styles.newsRoot}>
<div className={`${styles.newsContainer} ${admin && styles.adminPost}`}>
<div className={styles.newsHeader}>
<div
className={styles.newsTitle}
dangerouslySetInnerHTML={{ __html: title }}
/>
<div className={styles.newsTitle}>{title}</div>
<div className={styles.user}>
<div>User #{user}</div>
<div className={styles.newsDate}>{date}</div>
</div>
</div>
<div
className={styles.newsBody}
dangerouslySetInnerHTML={{ __html: content }}
/>
{admin ? (
<div
className={styles.newsBody}
dangerouslySetInnerHTML={{ __html: content }}
/>
) : (
<div className={styles.newsBody}>{content}</div>
)}
</div>
<div className={'actions'}>
{uid === user ? (
@ -47,14 +49,14 @@ export default function NewsEntry({
existingReacts={reacts}
uid={uid}
onClick={(reaction, isDelete) => {
onReact({ type: 'news', reaction, isDelete })
onNewsReact({ reaction, isDelete })
}}
/>
</div>
<Comments
uid={uid}
onReact={(path, reaction, isDelete) => {
onReact({ type: 'comment', path, reaction, isDelete })
onCommentReact({ path, reaction, isDelete })
}}
onComment={onComment}
onDelete={onDelete}