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

merged

Browse Source
This commit is contained in:
tonyrewin 2022-10-05 11:57:58 +03:00
commit 6bb82d7492
6 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/components/Author/Card.tsx
View File

@ -22,11 +22,8 @@ interface AuthorCardProps {
export const AuthorCard = (props: AuthorCardProps) => {
const { session } = useAuthStore()
const subscribed = createMemo(
() =>
!!session()
?.news?.authors?.filter((u) => u === props.author.slug)
.pop()
const subscribed = createMemo<boolean>(
() => session()?.news?.authors?.some((u) => u === props.author.slug) || false
)
const canFollow = createMemo(() => !props.hideFollow && session()?.user?.slug !== props.author.slug)
const bio = () => props.author.bio || t('Our regular contributor')
@ -37,57 +34,53 @@ export const AuthorCard = (props: AuthorCardProps) => {
}
// TODO: reimplement AuthorCard
return (
<>
<Show when={props.author?.slug}>
<div class="author">
<Userpic user={props.author} hasLink={props.hasLink} />
<div class="author">
<Userpic user={props.author} hasLink={props.hasLink} />
<div class="author__details">
<div class="author__details-wrapper">
<Show when={props.hasLink}>
<a class="author__name text-3xl text-2xl" href={`/author/${props.author.slug}`}>
{name()}
</a>
</Show>
<Show when={!props.hasLink}>
<div class="author__name text-3xl text-2xl">{name()}</div>
</Show>
<div class="author__details">
<div class="author__details-wrapper">
<Show when={props.hasLink}>
<a class="author__name text-3xl text-2xl" href={`/author/${props.author.slug}`}>
{name()}
</a>
</Show>
<Show when={!props.hasLink}>
<div class="author__name text-3xl text-2xl">{name()}</div>
</Show>
<Show when={!props.hideDescription}>
<div class="author__about">{bio()}</div>
</Show>
</div>
<Show when={!props.hideDescription}>
<div class="author__about">{bio()}</div>
</Show>
</div>
<Show when={canFollow()}>
<div class="author__subscribe">
<Show
when={subscribed()}
fallback={
<button onClick={() => follow} class="button button--subscribe">
<Icon name="author-subscribe" />
<span class="button__label">+&nbsp;{t('Follow')}</span>
</button>
}
>
<button onClick={() => unfollow} class="button button--subscribe">
<Icon name="author-unsubscribe" />
<span class="button__label">-&nbsp;{t('Unfollow')}</span>
</button>
</Show>
<Show when={canFollow()}>
<div class="author__subscribe">
<Show
when={subscribed()}
fallback={
<button onClick={() => follow} class="button button--subscribe">
<Icon name="author-subscribe" />
<span class="button__label">+&nbsp;{t('Follow')}</span>
</button>
}
>
<button onClick={() => unfollow} class="button button--subscribe">
<Icon name="author-unsubscribe" />
<span class="button__label">-&nbsp;{t('Unfollow')}</span>
</button>
</Show>
<Show when={!props.compact}>
<button class="button button--write">
<Icon name="edit" />
{t('Write')}
</button>
<Show when={!props.compact}>
<button class="button button--write">
<Icon name="edit" />
{t('Write')}
</button>
<For each={props.author.links}>{(link: string) => <a href={link} />}</For>
</Show>
</div>
<For each={props.author.links}>{(link) => <a href={link} />}</For>
</Show>
</div>
</div>
</Show>
</>
</Show>
</div>
</div>
)
}

12
src/components/Author/Full.tsx
View File

@ -4,14 +4,12 @@ import './Full.scss'
export default (props: { author: Author }) => {
return (
<>
<div class="container">
<div class="row">
<div class="user-details">
<AuthorCard author={props.author} compact={false} />
</div>
<div class="container">
<div class="row">
<div class="user-details">
<AuthorCard author={props.author} compact={false} />
</div>
</div>
</>
</div>
)
}

2
src/graphql/query/articles-for-authors.ts
View File

@ -26,6 +26,8 @@ export default gql`
_id: slug
name
slug
bio
links
userpic
}
createdAt

2
src/layouts/zine.astro
View File

@ -4,7 +4,7 @@ import '../styles/app.scss'
import { t } from '../utils/intl'
const lang = Astro.url.searchParams.get('lang') || 'ru'
console.log('[layout] server locale is', lang)
// console.log('[layout] server locale is', lang)
setLocale(lang)
---

15
src/stores/zine/topics.ts
View File

@ -19,25 +19,26 @@ const [topicsByAuthor, setTopicByAuthor] = createSignal<{ [authorSlug: string]:
const sortedTopics = createLazyMemo<Topic[]>(() => {
const topics = Object.values(topicEntities())
const sortAllByValue = sortAllBy()
switch (sortAllByValue) {
case 'created': {
switch (sortAllBy()) {
case 'created':
// log.debug('sorted by created')
topics.sort(byCreated)
break
}
case 'shouts':
// log.debug(`sorted by shouts`)
topics.sort(byTopicStatDesc('shouts'))
break
case 'authors':
// log.debug(`sorted by ${sortBy}`)
topics.sort(byTopicStatDesc(sortAllByValue))
// log.debug(`sorted by authors`)
topics.sort(byTopicStatDesc('authors'))
break
case 'title':
// log.debug('sorted by title')
topics.sort((a, b) => a.title.localeCompare(b.title))
break
default:
log.error(`Unknown sort: ${sortAllByValue}`)
log.error(`Unknown sort: ${sortAllBy()}`)
}
return topics

11
src/utils/apiClient.ts
View File

@ -221,13 +221,22 @@ export const apiClient = {
},
getAllTopics: async () => {
const response = await publicGraphQLClient.query(topicsAll, {}).toPromise()
if (response.error) {
log.debug('getAllTopics', response.error)
}
return response.data.topicsAll
},
getAllAuthors: async () => {
const response = await publicGraphQLClient.query(authorsAll, {}).toPromise()
if (response.error) {
log.debug('getAllAuthors', response.error)
}
return response.data.authorsAll
},
getAuthor: async ({ slug }: { slug: string }) => {
const response = await publicGraphQLClient.query(authorsBySlugs, { slugs: [slug] }).toPromise()
return response.data.getUsersBySlugs
},
getArticle: async ({ slug }: { slug: string }): Promise<Shout> => {
const response = await publicGraphQLClient.query(articleBySlug, { slug }).toPromise()
return response.data?.getShoutBySlug