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

Added noAuthorLink props, restore author links on the main page

Browse Source
This commit is contained in:
kvakazyambra 2023-07-26 23:40:14 +03:00
parent 1f501a971d
commit d1b92a5f11
6 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Feed/ArticleCard.module.scss
View File

@ -457,7 +457,7 @@
}
.shoutTopic a {
&,
&:link,
&:visited {
&:hover {
background: #fff !important;
@ -775,3 +775,7 @@
.shoutTopicTop {
margin-bottom: 0.4rem !important;
}
.shoutCardNoImage {
background: rgb(0 0 0 / 50%);
}

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

@ -38,6 +38,7 @@ interface ArticleCardProps {
isSingle?: boolean
isBeside?: boolean
withViewed?: boolean
noAuthorLink?: boolean
}
article: Shout
}
@ -176,7 +177,7 @@ export const ArticleCard = (props: ArticleCardProps) => {
hideWriteButton={true}
hideFollow={true}
isFeedMode={true}
hasLink={props.settings?.isFeedMode}
hasLink={!props.settings?.noAuthorLink}
/>
)
}}

7
src/components/Feed/Row1.tsx
View File

@ -2,13 +2,16 @@ import { Show } from 'solid-js'
import type { Shout } from '../../graphql/types.gen'
import { ArticleCard } from './ArticleCard'
export const Row1 = (props: { article: Shout; nodate?: boolean }) => (
export const Row1 = (props: { article: Shout; nodate?: boolean; noAuthorLink?: boolean }) => (
<Show when={!!props.article}>
<div class="floor floor--one-article">
<div class="wide-container">
<div class="row">
<div class="col-24">
<ArticleCard article={props.article} settings={{ isSingle: true, nodate: props.nodate }} />
<ArticleCard
article={props.article}
settings={{ isSingle: true, nodate: props.nodate, noAuthorLink: props.noAuthorLink }}
/>
</div>
</div>
</div>

10
src/components/Feed/Row2.tsx
View File

@ -8,7 +8,12 @@ const x = [
['16', '8']
]
export const Row2 = (props: { articles: Shout[]; isEqual?: boolean; nodate?: boolean }) => {
export const Row2 = (props: {
articles: Shout[]
isEqual?: boolean
nodate?: boolean
noAuthorLink?: boolean
}) => {
const [y, setY] = createSignal(0)
createComputed(() => setY(Math.floor(Math.random() * x.length)))
@ -26,7 +31,8 @@ export const Row2 = (props: { articles: Shout[]; isEqual?: boolean; nodate?: boo
article={a}
settings={{
isWithCover: props.isEqual || x[y()][i()] === '16',
nodate: props.isEqual || props.nodate
nodate: props.isEqual || props.nodate,
noAuthorLink: props.noAuthorLink
}}
/>
</div>

12
src/components/Feed/Row3.tsx
View File

@ -3,7 +3,12 @@ import { For } from 'solid-js'
import type { Shout } from '../../graphql/types.gen'
import { ArticleCard } from './ArticleCard'
export const Row3 = (props: { articles: Shout[]; header?: JSX.Element; nodate?: boolean }) => {
export const Row3 = (props: {
articles: Shout[]
header?: JSX.Element
nodate?: boolean
noAuthorLink?: boolean
}) => {
return (
<div class="floor">
<div class="wide-container">
@ -12,7 +17,10 @@ export const Row3 = (props: { articles: Shout[]; header?: JSX.Element; nodate?:
<For each={props.articles}>
{(a) => (
<div class="col-md-8">
<ArticleCard article={a} settings={{ nodate: props.nodate }} />
<ArticleCard
article={a}
settings={{ nodate: props.nodate, noAuthorLink: props.noAuthorLink }}
/>
</div>
)}
</For>

24
src/components/Views/Author/Author.tsx
View File

@ -285,22 +285,22 @@ export const AuthorView = (props: AuthorProps) => {
</div>
</Match>
<Match when={searchParams().by === 'rating'}>
<Row1 article={sortedArticles()[0]} />
<Row2 articles={sortedArticles().slice(1, 3)} isEqual={true} />
<Row1 article={sortedArticles()[3]} />
<Row2 articles={sortedArticles().slice(4, 6)} isEqual={true} />
<Row1 article={sortedArticles()[6]} />
<Row2 articles={sortedArticles().slice(7, 9)} isEqual={true} />
<Row1 article={sortedArticles()[0]} noAuthorLink={true} />
<Row2 articles={sortedArticles().slice(1, 3)} isEqual={true} noAuthorLink={true} />
<Row1 article={sortedArticles()[3]} noAuthorLink={true} />
<Row2 articles={sortedArticles().slice(4, 6)} isEqual={true} noAuthorLink={true} />
<Row1 article={sortedArticles()[6]} noAuthorLink={true} />
<Row2 articles={sortedArticles().slice(7, 9)} isEqual={true} noAuthorLink={true} />
<For each={pages()}>
{(page) => (
<>
<Row1 article={page[0]} />
<Row2 articles={page.slice(1, 3)} isEqual={true} />
<Row1 article={page[3]} />
<Row2 articles={page.slice(4, 6)} isEqual={true} />
<Row1 article={page[6]} />
<Row2 articles={page.slice(7, 9)} isEqual={true} />
<Row1 article={page[0]} noAuthorLink={true} />
<Row2 articles={page.slice(1, 3)} isEqual={true} noAuthorLink={true} />
<Row1 article={page[3]} noAuthorLink={true} />
<Row2 articles={page.slice(4, 6)} isEqual={true} noAuthorLink={true} />
<Row1 article={page[6]} noAuthorLink={true} />
<Row2 articles={page.slice(7, 9)} isEqual={true} noAuthorLink={true} />
</>
)}
</For>