discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

fine

Browse Source
This commit is contained in:
Untone 2024-02-16 19:14:15 +03:00
parent 869cf5bb1a
commit f482856cca
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Article/FullArticle.tsx
View File

@ -79,9 +79,9 @@ export const FullArticle = (props: Props) => {
const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000))) const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000)))
const canEdit = createMemo ( () => const canEdit = createMemo(() =>
Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) || Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) ||
(props.article?.created_by.id === author().id) || session()?.user?.roles.includes('editor')) (props.article?.created_by?.id === author().id) || session()?.user?.roles.includes('editor'))
) )
const mainTopic = createMemo(() => { const mainTopic = createMemo(() => {
@ -548,7 +548,7 @@ export const FullArticle = (props: Props) => {
</Show> </Show>
<FeedArticlePopup <FeedArticlePopup
isOwner={canEdit()} canEdit={canEdit()}
containerCssClass={clsx(stylesHeader.control, styles.articlePopupOpener)} containerCssClass={clsx(stylesHeader.control, styles.articlePopupOpener)}
onShareClick={() => showModal('share')} onShareClick={() => showModal('share')}
onInviteClick={() => showModal('inviteMembers')} onInviteClick={() => showModal('inviteMembers')}

6
src/components/Feed/ArticleCard/ArticleCard.tsx
View File

@ -120,9 +120,9 @@ export const ArticleCard = (props: ArticleCardProps) => {
props.article.published_at ? formatDate(new Date(props.article.published_at * 1000)) : '', props.article.published_at ? formatDate(new Date(props.article.published_at * 1000)) : '',
) )
const canEdit = createMemo ( () => const canEdit = createMemo(() =>
Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) || Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) ||
(props.article?.created_by.id === author().id) || session()?.user?.roles.includes('editor')) (props.article?.created_by?.id === author().id) || session()?.user?.roles.includes('editor'))
) )
const scrollToComments = (event) => { const scrollToComments = (event) => {
@ -366,7 +366,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
<div class={styles.shoutCardDetailsItem}> <div class={styles.shoutCardDetailsItem}>
<FeedArticlePopup <FeedArticlePopup
isOwner={canEdit()} canEdit={canEdit()}
containerCssClass={stylesHeader.control} containerCssClass={stylesHeader.control}
onShareClick={() => props.onShare(props.article)} onShareClick={() => props.onShare(props.article)}
onInviteClick={props.onInvite} onInviteClick={props.onInvite}

8
src/components/Feed/FeedArticlePopup/FeedArticlePopup.tsx
View File

@ -10,7 +10,7 @@ import { SoonChip } from '../../_shared/SoonChip'
import styles from './FeedArticlePopup.module.scss' import styles from './FeedArticlePopup.module.scss'
type Props = { type Props = {
isOwner: boolean canEdit: boolean
onInviteClick: () => void onInviteClick: () => void
onShareClick: () => void onShareClick: () => void
} & Omit<PopupProps, 'children'> } & Omit<PopupProps, 'children'>
@ -41,7 +41,7 @@ export const FeedArticlePopup = (props: Props) => {
{t('Share')} {t('Share')}
</button> </button>
</li> </li>
<Show when={!props.isOwner}> <Show when={!props.canEdit}>
<li> <li>
<button <button
class={styles.action} class={styles.action}
@ -67,7 +67,7 @@ export const FeedArticlePopup = (props: Props) => {
{t('Invite experts')} {t('Invite experts')}
</button> </button>
</li> </li>
<Show when={!props.isOwner}> <Show when={!props.canEdit}>
<li> <li>
<button class={clsx(styles.action, styles.soon)} role="button"> <button class={clsx(styles.action, styles.soon)} role="button">
{t('Subscribe to comments')} <SoonChip /> {t('Subscribe to comments')} <SoonChip />
@ -79,7 +79,7 @@ export const FeedArticlePopup = (props: Props) => {
{t('Add to bookmarks')} <SoonChip /> {t('Add to bookmarks')} <SoonChip />
</button> </button>
</li> </li>
{/*<Show when={!props.isOwner}>*/} {/*<Show when={!props.canEdit}>*/}
{/* <li>*/} {/* <li>*/}
{/* <button*/} {/* <button*/}
{/* class={styles.action}*/} {/* class={styles.action}*/}