Merge branch 'dev' of https://github.com/Discours/discoursio-webapp into fix/all-topics-page
This commit is contained in:
commit
3174c9d83c
2
.github/workflows/node-ci.yml
vendored
2
.github/workflows/node-ci.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
|||
run: npm run typecheck
|
||||
|
||||
- name: Lint with Biome
|
||||
run: npx biome ci .
|
||||
run: npm run check:code
|
||||
|
||||
- name: Lint styles
|
||||
run: npm run lint:styles
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"$schema": "https://biomejs.dev/schemas/1.5.3/schema.json",
|
||||
"files": {
|
||||
"include": ["*.tsx", "*.ts", "*.js", "*.json"],
|
||||
"ignore": ["./dist", "./node_modules", ".husky", "docs", "gen", "*.d.ts"]
|
||||
"ignore": ["./dist", "./node_modules", ".husky", "docs", "gen", "*.gen.ts", "*.d.ts"]
|
||||
},
|
||||
"vcs": {
|
||||
"defaultBranch": "dev",
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
"hygen": "HYGEN_TMPLS=gen hygen",
|
||||
"postinstall": "npm run codegen && npx patch-package",
|
||||
"check:code": "npx @biomejs/biome check src --log-kind=compact --verbose",
|
||||
"check:code:fix": "npx @biomejs/biome check src --log-kind=compact --verbose --apply-unsafe",
|
||||
"check:code:fix": "npx @biomejs/biome check src --log-kind=compact",
|
||||
"lint": "npm run lint:code && stylelint **/*.{scss,css}",
|
||||
"lint:code": "npx @biomejs/biome lint src --log-kind=compact --verbose",
|
||||
"lint:code:fix": "npx @biomejs/biome lint src --apply-unsafe --log-kind=compact --verbose",
|
||||
|
|
|
@ -83,6 +83,7 @@
|
|||
"Coming soon": "Coming soon",
|
||||
"Comment successfully deleted": "Comment successfully deleted",
|
||||
"Commentator": "Commentator",
|
||||
"Commenting": "Commenting",
|
||||
"Comments": "Comments",
|
||||
"CommentsWithCount": "{count, plural, =0 {{count} comments} one {{count} comment} few {{count} comments} other {{count} comments}}",
|
||||
"Communities": "Communities",
|
||||
|
|
|
@ -87,6 +87,7 @@
|
|||
"Comment successfully deleted": "Комментарий успешно удален",
|
||||
"Comment": "Комментировать",
|
||||
"Commentator": "Комментатор",
|
||||
"Commenting": "Комментирование",
|
||||
"Comments": "Комментарии",
|
||||
"CommentsWithCount": "{count, plural, =0 {{count} комментариев} one {{count} комментарий} few {{count} комментария} other {{count} комментариев}}",
|
||||
"Communities": "Сообщества",
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
User-agent: *
|
||||
Allow: /
|
||||
Disallow: /
|
||||
|
|
|
@ -22,6 +22,7 @@ img {
|
|||
.articleContent {
|
||||
img:not([data-disable-lightbox='true']) {
|
||||
cursor: zoom-in;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -54,6 +54,7 @@ type IframeSize = {
|
|||
export type ArticlePageSearchParams = {
|
||||
scrollTo: 'comments'
|
||||
commentId: string
|
||||
slide?: string
|
||||
}
|
||||
|
||||
const scrollTo = (el: HTMLElement) => {
|
||||
|
@ -329,7 +330,7 @@ export const FullArticle = (props: Props) => {
|
|||
width: 1200,
|
||||
})
|
||||
|
||||
const description = getDescription(props.article.description || body())
|
||||
const description = getDescription(props.article.description || body() || media()[0]?.body)
|
||||
const ogTitle = props.article.title
|
||||
const keywords = getKeywords(props.article)
|
||||
const shareUrl = getShareUrl({ pathname: `/${props.article.slug}` })
|
||||
|
|
|
@ -134,7 +134,9 @@ export const AuthorCard = (props: Props) => {
|
|||
)}
|
||||
</For>
|
||||
<div class={styles.subscribersCounter}>
|
||||
{t('SubscriberWithCount', { count: props.followers.length ?? 0 })}
|
||||
{t('SubscriberWithCount', {
|
||||
count: props.followers.length ?? 0,
|
||||
})}
|
||||
</div>
|
||||
</a>
|
||||
</Show>
|
||||
|
@ -169,7 +171,9 @@ export const AuthorCard = (props: Props) => {
|
|||
}}
|
||||
</For>
|
||||
<div class={styles.subscribersCounter}>
|
||||
{t('SubscriptionWithCount', { count: props?.following.length ?? 0 })}
|
||||
{t('SubscriptionWithCount', {
|
||||
count: props?.following.length ?? 0,
|
||||
})}
|
||||
</div>
|
||||
</a>
|
||||
</Show>
|
||||
|
@ -234,7 +238,9 @@ export const AuthorCard = (props: Props) => {
|
|||
title={props.author.name}
|
||||
description={props.author.bio}
|
||||
imageUrl={props.author.pic}
|
||||
shareUrl={getShareUrl({ pathname: `/author/${props.author.slug}` })}
|
||||
shareUrl={getShareUrl({
|
||||
pathname: `/author/${props.author.slug}`,
|
||||
})}
|
||||
trigger={<Button variant="secondary" value={t('Share')} />}
|
||||
/>
|
||||
</div>
|
||||
|
@ -270,13 +276,21 @@ export const AuthorCard = (props: Props) => {
|
|||
<>
|
||||
<h2>{t('Subscriptions')}</h2>
|
||||
<ul class="view-switcher">
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'all' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'all',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('all')}>
|
||||
{t('All')}
|
||||
</button>
|
||||
<span class="view-switcher__counter">{props.following.length}</span>
|
||||
</li>
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'authors' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'authors',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('authors')}>
|
||||
{t('Authors')}
|
||||
</button>
|
||||
|
@ -284,7 +298,11 @@ export const AuthorCard = (props: Props) => {
|
|||
{props.following.filter((s) => 'name' in s).length}
|
||||
</span>
|
||||
</li>
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'topics' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'topics',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('topics')}>
|
||||
{t('Topics')}
|
||||
</button>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
z-index: 10003;
|
||||
|
||||
.wide-container {
|
||||
background: #fff;
|
||||
background: var(--background-color);
|
||||
|
||||
@include media-breakpoint-down(lg) {
|
||||
padding: 0 divide($container-padding-x, 2);
|
||||
|
@ -114,6 +114,11 @@
|
|||
position: absolute;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.control {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
|
||||
.mainNavigationWrapper {
|
||||
|
@ -192,15 +197,8 @@
|
|||
padding: divide($container-padding-x, 2) !important;
|
||||
}
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
span,
|
||||
button {
|
||||
padding: 0 0.4rem;
|
||||
}
|
||||
}
|
||||
|
||||
:global(.view-switcher) {
|
||||
margin: 0 -0.5rem;
|
||||
margin: 0;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
}
|
||||
|
@ -299,9 +297,6 @@
|
|||
.burgerContainer {
|
||||
box-sizing: content-box;
|
||||
display: inline-flex;
|
||||
padding-left: 0;
|
||||
|
||||
// float: right;
|
||||
|
||||
@include media-breakpoint-up(sm) {
|
||||
padding-left: divide($container-padding-x, 2);
|
||||
|
@ -430,12 +425,15 @@
|
|||
width: 100%;
|
||||
|
||||
@include media-breakpoint-up(xl) {
|
||||
right: 2rem;
|
||||
right: 9rem;
|
||||
}
|
||||
|
||||
.control {
|
||||
cursor: pointer;
|
||||
border: 0;
|
||||
cursor: pointer;
|
||||
height: 3.2rem;
|
||||
margin: 0 0.6rem;
|
||||
width: 3.2rem;
|
||||
|
||||
&:hover {
|
||||
background: none;
|
||||
|
@ -451,11 +449,7 @@
|
|||
}
|
||||
|
||||
.control + .control {
|
||||
margin-left: 1.2rem;
|
||||
|
||||
@include media-breakpoint-up(sm) {
|
||||
margin-left: 2rem;
|
||||
}
|
||||
margin: 0 0.6rem;
|
||||
}
|
||||
|
||||
img {
|
||||
|
@ -497,10 +491,15 @@
|
|||
}
|
||||
}
|
||||
|
||||
.settingsControlContainer {
|
||||
margin-left: 1rem !important;
|
||||
margin-right: 2rem !important;
|
||||
}
|
||||
|
||||
.settingsControl {
|
||||
border-radius: 100%;
|
||||
padding: 0.8rem !important;
|
||||
min-width: 4rem !important;
|
||||
padding: 0.8rem !important;
|
||||
|
||||
&:hover {
|
||||
background: var(--background-color-invert);
|
||||
|
@ -516,12 +515,18 @@
|
|||
align-items: center;
|
||||
border-radius: 100%;
|
||||
display: flex;
|
||||
height: 2.4em;
|
||||
height: 2.8rem;
|
||||
justify-content: center;
|
||||
margin-left: 0.3rem;
|
||||
margin: 0 0.4rem;
|
||||
position: relative;
|
||||
transition: margin-left 0.3s;
|
||||
width: 2.4em;
|
||||
width: 2.8rem;
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
height: 3.2rem;
|
||||
margin: 0 0.7rem;
|
||||
width: 3.2rem;
|
||||
}
|
||||
|
||||
@include media-breakpoint-down(sm) {
|
||||
margin-left: 0.4rem !important;
|
||||
|
@ -543,12 +548,13 @@
|
|||
a:link {
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
height: auto;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 100%;
|
||||
|
||||
&:hover {
|
||||
background: none !important;
|
||||
background: none;
|
||||
|
||||
.icon {
|
||||
display: none;
|
||||
|
@ -571,6 +577,20 @@
|
|||
}
|
||||
}
|
||||
|
||||
.userControlItemSearch {
|
||||
margin: 0 1rem 0 2.2rem;
|
||||
}
|
||||
|
||||
.userControlItemUserpic {
|
||||
height: 3.2rem;
|
||||
width: 3.2rem;
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
height: 4rem;
|
||||
width: 4rem;
|
||||
}
|
||||
}
|
||||
|
||||
.userControlItemInbox,
|
||||
.userControlItemSearch {
|
||||
@include media-breakpoint-down(sm) {
|
||||
|
@ -579,7 +599,16 @@
|
|||
}
|
||||
|
||||
.userControlItemVerbose {
|
||||
margin-left: 0.9em !important;
|
||||
align-items: stretch;
|
||||
display: flex;
|
||||
height: 3.2rem;
|
||||
margin-left: 1rem !important;
|
||||
width: 3.2rem;
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
height: 4rem;
|
||||
width: 4rem;
|
||||
}
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0 !important;
|
||||
|
@ -590,6 +619,7 @@
|
|||
|
||||
@include media-breakpoint-up(xl) {
|
||||
background: none;
|
||||
margin-left: 0.8rem !important;
|
||||
}
|
||||
|
||||
.icon {
|
||||
|
@ -611,10 +641,14 @@
|
|||
}
|
||||
|
||||
@include media-breakpoint-up(xl) {
|
||||
margin-left: 0.5em !important;
|
||||
margin-right: 0.5em;
|
||||
margin-left: 3rem !important;
|
||||
margin-right: 0;
|
||||
width: auto;
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.icon {
|
||||
display: none !important;
|
||||
}
|
||||
|
@ -629,6 +663,37 @@
|
|||
}
|
||||
}
|
||||
|
||||
a:link,
|
||||
a:visited,
|
||||
button {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
@include media-breakpoint-up(xl) {
|
||||
border-radius: 2rem;
|
||||
box-shadow: inset 0 0 0 2px #000;
|
||||
padding: 0 2rem;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: var(--link-hover-background);
|
||||
|
||||
&,
|
||||
.textLabel {
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.iconHover {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
@ -636,27 +701,6 @@
|
|||
a::before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a:hover,
|
||||
button:hover {
|
||||
.icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.iconHover {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.textLabel {
|
||||
color: var(--link-hover-color);
|
||||
}
|
||||
}
|
||||
|
||||
a:hover {
|
||||
.textLabel {
|
||||
background-color: var(--link-hover-background);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.subnavigation {
|
||||
|
@ -746,3 +790,65 @@
|
|||
position: relative;
|
||||
top: 0.15em;
|
||||
}
|
||||
|
||||
.editorPopup {
|
||||
border: 1px solid rgb(0 0 0 / 15%) !important;
|
||||
border-radius: 1.6rem;
|
||||
line-height: 1.3;
|
||||
min-width: 28rem;
|
||||
padding: 1.6rem !important;
|
||||
}
|
||||
|
||||
.editorModePopupOpener {
|
||||
display: inline-block;
|
||||
margin-right: 2rem;
|
||||
position: relative;
|
||||
text-align: right;
|
||||
width: 9em;
|
||||
}
|
||||
|
||||
.editorModePopupOpenerIcon {
|
||||
height: 2rem;
|
||||
left: 100%;
|
||||
margin-left: 0.2em;
|
||||
top: 0;
|
||||
transform: rotate(90deg);
|
||||
position: absolute;
|
||||
width: 2rem;
|
||||
}
|
||||
|
||||
.editorModesList {
|
||||
li {
|
||||
cursor: pointer;
|
||||
margin-bottom: 1.6rem;
|
||||
padding-left: 3rem !important;
|
||||
position: relative;
|
||||
|
||||
&:hover {
|
||||
opacity: 0.6;
|
||||
}
|
||||
}
|
||||
|
||||
.editorModesSelected {
|
||||
cursor: default;
|
||||
opacity: 0.6;
|
||||
}
|
||||
}
|
||||
|
||||
.editorModeTitle {
|
||||
color: #000;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.editorModeDescription {
|
||||
color: #696969;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.editorModeIcon {
|
||||
height: 2.4rem;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
top: -0.2em;
|
||||
width: 2.4rem;
|
||||
}
|
||||
|
|
|
@ -14,10 +14,9 @@ import { Icon } from '../_shared/Icon'
|
|||
import { Popover } from '../_shared/Popover'
|
||||
import { ShowOnlyOnClient } from '../_shared/ShowOnlyOnClient'
|
||||
|
||||
import { ProfilePopup } from './ProfilePopup'
|
||||
|
||||
import { useSnackbar } from '../../context/snackbar'
|
||||
import { Popup } from '../_shared/Popup'
|
||||
import styles from './Header/Header.module.scss'
|
||||
import { ProfilePopup } from './ProfilePopup'
|
||||
|
||||
type Props = {
|
||||
setIsProfilePopupVisible: (value: boolean) => void
|
||||
|
@ -51,7 +50,7 @@ export const HeaderAuth = (props: Props) => {
|
|||
const isEditorPage = createMemo(() => page().route === 'edit' || page().route === 'editSettings')
|
||||
const isNotificationsVisible = createMemo(() => isAuthenticated() && !isEditorPage())
|
||||
const isSaveButtonVisible = createMemo(() => isAuthenticated() && isEditorPage())
|
||||
const isCreatePostButtonVisible = createMemo(() => isAuthenticated() && !isEditorPage())
|
||||
const isCreatePostButtonVisible = createMemo(() => !isEditorPage())
|
||||
const isAuthenticatedControlsVisible = createMemo(
|
||||
() => isAuthenticated() && session()?.user?.email_verified,
|
||||
)
|
||||
|
@ -65,6 +64,7 @@ export const HeaderAuth = (props: Props) => {
|
|||
}
|
||||
|
||||
const [width, setWidth] = createSignal(0)
|
||||
const [editorMode, setEditorMode] = createSignal(t('Editing'))
|
||||
|
||||
onMount(() => {
|
||||
const handleResize = () => setWidth(window.innerWidth)
|
||||
|
@ -106,7 +106,7 @@ export const HeaderAuth = (props: Props) => {
|
|||
<Show when={isSessionLoaded()} keyed={true}>
|
||||
<div class={clsx('col-auto col-lg-7', styles.usernav)}>
|
||||
<div class={styles.userControl}>
|
||||
<Show when={isCreatePostButtonVisible()}>
|
||||
<Show when={isCreatePostButtonVisible() && isAuthenticated()}>
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
|
||||
<a href={getPagePath(router, 'create')}>
|
||||
<span class={styles.textLabel}>{t('Create post')}</span>
|
||||
|
@ -117,7 +117,7 @@ export const HeaderAuth = (props: Props) => {
|
|||
</Show>
|
||||
|
||||
<Show when={!isSaveButtonVisible()}>
|
||||
<div class={styles.userControlItem}>
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemSearch)}>
|
||||
<a href="?m=search">
|
||||
<Icon name="search" class={styles.icon} />
|
||||
<Icon name="search" class={clsx(styles.icon, styles.iconHover)} />
|
||||
|
@ -143,13 +143,47 @@ export const HeaderAuth = (props: Props) => {
|
|||
</Show>
|
||||
|
||||
<Show when={isSaveButtonVisible()}>
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
|
||||
{renderIconedButton({
|
||||
value: t('Save'),
|
||||
icon: 'save',
|
||||
action: handleSaveButtonClick,
|
||||
})}
|
||||
</div>
|
||||
<Popup
|
||||
trigger={
|
||||
<span class={styles.editorModePopupOpener}>
|
||||
<Icon name="swiper-r-arr" class={styles.editorModePopupOpenerIcon} />
|
||||
{editorMode()}
|
||||
</span>
|
||||
}
|
||||
variant="bordered"
|
||||
popupCssClass={styles.editorPopup}
|
||||
>
|
||||
<ul class={clsx('nodash', styles.editorModesList)}>
|
||||
<li
|
||||
class={clsx({ [styles.editorModesSelected]: editorMode() === t('Preview') })}
|
||||
onClick={() => setEditorMode(t('Preview'))}
|
||||
>
|
||||
<Icon name="eye" class={styles.editorModeIcon} />
|
||||
<div class={styles.editorModeTitle}>{t('Preview')}</div>
|
||||
<div class={styles.editorModeDescription}>
|
||||
Посмотрите, как материал будет выглядеть при публикации
|
||||
</div>
|
||||
</li>
|
||||
<li
|
||||
class={clsx({ [styles.editorModesSelected]: editorMode() === t('Editing') })}
|
||||
onClick={() => setEditorMode(t('Editing'))}
|
||||
>
|
||||
<Icon name="pencil-outline" class={styles.editorModeIcon} />
|
||||
<div class={styles.editorModeTitle}>{t('Editing')}</div>
|
||||
<div class={styles.editorModeDescription}>Изменяйте текст напрямую в редакторе</div>
|
||||
</li>
|
||||
<li
|
||||
class={clsx({ [styles.editorModesSelected]: editorMode() === t('Commenting') })}
|
||||
onClick={() => setEditorMode(t('Commenting'))}
|
||||
>
|
||||
<Icon name="comment" class={styles.editorModeIcon} />
|
||||
<div class={styles.editorModeTitle}>{t('Commenting')}</div>
|
||||
<div class={styles.editorModeDescription}>
|
||||
Предлагайте правки и комментарии, чтобы сделать материал лучше
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</Popup>
|
||||
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
|
||||
{renderIconedButton({
|
||||
|
@ -159,12 +193,18 @@ export const HeaderAuth = (props: Props) => {
|
|||
})}
|
||||
</div>
|
||||
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
|
||||
<div
|
||||
class={clsx(
|
||||
styles.userControlItem,
|
||||
styles.settingsControlContainer,
|
||||
styles.userControlItemVerbose,
|
||||
)}
|
||||
>
|
||||
<Popover content={t('Settings')}>
|
||||
{(ref) => (
|
||||
<Button
|
||||
ref={ref}
|
||||
value={<Icon name="burger" />}
|
||||
value={<Icon name="ellipsis" />}
|
||||
variant={'light'}
|
||||
onClick={handleBurgerButtonClick}
|
||||
class={styles.settingsControl}
|
||||
|
@ -173,16 +213,29 @@ export const HeaderAuth = (props: Props) => {
|
|||
</Popover>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<Show when={isCreatePostButtonVisible() && !isAuthenticated()}>
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
|
||||
<a href={getPagePath(router, 'create')}>
|
||||
<span class={styles.textLabel}>{t('Create post')}</span>
|
||||
<Icon name="pencil" class={styles.icon} />
|
||||
<Icon name="pencil" class={clsx(styles.icon, styles.iconHover)} />
|
||||
</a>
|
||||
</div>
|
||||
</Show>
|
||||
|
||||
<Show
|
||||
when={isAuthenticatedControlsVisible()}
|
||||
fallback={
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose, 'loginbtn')}>
|
||||
<a href="?m=auth&mode=login">
|
||||
<span class={styles.textLabel}>{t('Enter')}</span>
|
||||
<Icon name="key" class={styles.icon} />
|
||||
{/*<Icon name="user-default" class={clsx(styles.icon, styles.iconHover)} />*/}
|
||||
</a>
|
||||
</div>
|
||||
<Show when={!isAuthenticated()}>
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemVerbose, 'loginbtn')}>
|
||||
<a href="?m=auth&mode=login">
|
||||
<span class={styles.textLabel}>{t('Enter')}</span>
|
||||
<Icon name="key" class={styles.icon} />
|
||||
{/*<Icon name="user-default" class={clsx(styles.icon, styles.iconHover)} />*/}
|
||||
</a>
|
||||
</div>
|
||||
</Show>
|
||||
}
|
||||
>
|
||||
<Show when={!isSaveButtonVisible()}>
|
||||
|
@ -195,28 +248,31 @@ export const HeaderAuth = (props: Props) => {
|
|||
</a>
|
||||
</div>
|
||||
</Show>
|
||||
<ProfilePopup
|
||||
onVisibilityChange={(isVisible) => {
|
||||
props.setIsProfilePopupVisible(isVisible)
|
||||
}}
|
||||
containerCssClass={styles.control}
|
||||
trigger={
|
||||
<div class={styles.userControlItem}>
|
||||
<button class={styles.button}>
|
||||
<div classList={{ entered: page().path === `/${author()?.slug}` }}>
|
||||
<Userpic
|
||||
size={'M'}
|
||||
name={author()?.name}
|
||||
userpic={author()?.pic}
|
||||
class={styles.userpic}
|
||||
/>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
/>
|
||||
</Show>
|
||||
</div>
|
||||
|
||||
<Show when={isAuthenticated()}>
|
||||
<ProfilePopup
|
||||
onVisibilityChange={(isVisible) => {
|
||||
props.setIsProfilePopupVisible(isVisible)
|
||||
}}
|
||||
containerCssClass={styles.control}
|
||||
trigger={
|
||||
<div class={clsx(styles.userControlItem, styles.userControlItemUserpic)}>
|
||||
<button class={styles.button}>
|
||||
<div classList={{ entered: page().path === `/${author()?.slug}` }}>
|
||||
<Userpic
|
||||
size={'L'}
|
||||
name={author()?.name}
|
||||
userpic={author()?.pic}
|
||||
class={styles.userpic}
|
||||
/>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
/>
|
||||
</Show>
|
||||
</div>
|
||||
</Show>
|
||||
</ShowOnlyOnClient>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
.snackbar {
|
||||
min-height: 2px;
|
||||
background-color: var(--default-color);
|
||||
color: #fff;
|
||||
font-size: 2rem;
|
||||
|
|
|
@ -1,7 +1,18 @@
|
|||
import { createFileUploader } from '@solid-primitives/upload'
|
||||
import { clsx } from 'clsx'
|
||||
import deepEqual from 'fast-deep-equal'
|
||||
import { For, Match, Show, Switch, createEffect, createSignal, lazy, onCleanup, onMount } from 'solid-js'
|
||||
import {
|
||||
For,
|
||||
Match,
|
||||
Show,
|
||||
Switch,
|
||||
createEffect,
|
||||
createSignal,
|
||||
lazy,
|
||||
on,
|
||||
onCleanup,
|
||||
onMount,
|
||||
} from 'solid-js'
|
||||
import { createStore } from 'solid-js/store'
|
||||
|
||||
import { useConfirm } from '../../context/confirm'
|
||||
|
@ -156,12 +167,15 @@ export const ProfileSettings = () => {
|
|||
onCleanup(() => window.removeEventListener('beforeunload', handleBeforeUnload))
|
||||
})
|
||||
|
||||
createEffect(() => {
|
||||
if (!deepEqual(form, prevForm)) {
|
||||
setIsFloatingPanelVisible(true)
|
||||
}
|
||||
})
|
||||
|
||||
createEffect(
|
||||
on(
|
||||
() => deepEqual(form, prevForm),
|
||||
() => {
|
||||
setIsFloatingPanelVisible(!deepEqual(form, prevForm))
|
||||
},
|
||||
{ defer: true },
|
||||
),
|
||||
)
|
||||
const handleDeleteSocialLink = (link) => {
|
||||
updateFormField('links', link, true)
|
||||
}
|
||||
|
@ -181,7 +195,7 @@ export const ProfileSettings = () => {
|
|||
<div class="col-md-20 col-lg-18 col-xl-16">
|
||||
<h1>{t('Profile settings')}</h1>
|
||||
<p class="description">{t('Here you can customize your profile the way you want.')}</p>
|
||||
<form enctype="multipart/form-data">
|
||||
<form enctype="multipart/form-data" autocomplete="off">
|
||||
<h4>{t('Userpic')}</h4>
|
||||
<div class="pretty-form__item">
|
||||
<div
|
||||
|
@ -248,14 +262,16 @@ export const ProfileSettings = () => {
|
|||
<div class="pretty-form__item">
|
||||
<input
|
||||
type="text"
|
||||
name="username"
|
||||
id="username"
|
||||
name="nameOfUser"
|
||||
id="nameOfUser"
|
||||
data-lpignore="true"
|
||||
autocomplete="one-time-code"
|
||||
placeholder={t('Name')}
|
||||
onInput={(event) => updateFormField('name', event.currentTarget.value)}
|
||||
value={form.name}
|
||||
ref={(el) => (nameInputRef.current = el)}
|
||||
/>
|
||||
<label for="username">{t('Name')}</label>
|
||||
<label for="nameOfUser">{t('Name')}</label>
|
||||
<Show when={nameError()}>
|
||||
<div
|
||||
style={{ position: 'absolute', 'margin-top': '-4px' }}
|
||||
|
@ -275,6 +291,8 @@ export const ProfileSettings = () => {
|
|||
type="text"
|
||||
name="user-address"
|
||||
id="user-address"
|
||||
data-lpignore="true"
|
||||
autocomplete="one-time-code2"
|
||||
onInput={(event) => updateFormField('slug', event.currentTarget.value)}
|
||||
value={form.slug}
|
||||
ref={(el) => (slugInputRef.current = el)}
|
||||
|
|
|
@ -17,7 +17,7 @@ interface Props {
|
|||
|
||||
const isInViewport = (el: Element): boolean => {
|
||||
const rect = el.getBoundingClientRect()
|
||||
return rect.top <= DEFAULT_HEADER_OFFSET
|
||||
return rect.top <= DEFAULT_HEADER_OFFSET + 24 // default offset + 1.5em (default header margin-top)
|
||||
}
|
||||
const scrollToHeader = (element) => {
|
||||
window.scrollTo({
|
||||
|
|
|
@ -7,6 +7,7 @@ import { For, Match, Show, Switch, createEffect, createMemo, createSignal, onMou
|
|||
|
||||
import { useFollowing } from '../../../context/following'
|
||||
import { useLocalize } from '../../../context/localize'
|
||||
import { useSession } from '../../../context/session'
|
||||
import { apiClient } from '../../../graphql/client/core'
|
||||
import { router, useRouter } from '../../../stores/router'
|
||||
import { loadShouts, useArticlesStore } from '../../../stores/zine/articles'
|
||||
|
@ -30,39 +31,44 @@ import styles from './Author.module.scss'
|
|||
|
||||
type Props = {
|
||||
authorSlug: string
|
||||
shouts?: Shout[]
|
||||
author?: Author
|
||||
}
|
||||
export const PRERENDERED_ARTICLES_COUNT = 12
|
||||
const LOAD_MORE_PAGE_SIZE = 9
|
||||
|
||||
export const AuthorView = (props: Props) => {
|
||||
const { t } = useLocalize()
|
||||
const { loadSubscriptions } = useFollowing()
|
||||
const { sortedArticles } = useArticlesStore()
|
||||
const { authorEntities } = useAuthorsStore()
|
||||
const { subscriptions, followers: myFollowers, loadSubscriptions } = useFollowing()
|
||||
const { session } = useSession()
|
||||
const { sortedArticles } = useArticlesStore({ shouts: props.shouts })
|
||||
const { authorEntities } = useAuthorsStore({ authors: [props.author] })
|
||||
const { page: getPage, searchParams } = useRouter()
|
||||
const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false)
|
||||
const [isBioExpanded, setIsBioExpanded] = createSignal(false)
|
||||
const [followers, setFollowers] = createSignal<Author[]>([])
|
||||
const [following, setFollowing] = createSignal<Array<Author | Topic>>([])
|
||||
const [author, setAuthor] = createSignal<Author>()
|
||||
const [followers, setFollowers] = createSignal([])
|
||||
const [following, setFollowing] = createSignal<Array<Author | Topic>>([]) // flat AuthorFollowsResult
|
||||
const [showExpandBioControl, setShowExpandBioControl] = createSignal(false)
|
||||
const [commented, setCommented] = createSignal<Reaction[]>()
|
||||
const modal = MODALS[searchParams().m]
|
||||
|
||||
// current author
|
||||
const [author, setAuthor] = createSignal<Author>()
|
||||
const [sessionChecked, setSessionChecked] = createSignal(false)
|
||||
createEffect(() => {
|
||||
try {
|
||||
const a = authorEntities()[props.authorSlug]
|
||||
setAuthor(a)
|
||||
} catch (error) {
|
||||
console.debug(error)
|
||||
}
|
||||
})
|
||||
|
||||
createEffect(async () => {
|
||||
if (author()?.id && !author().stat) {
|
||||
const a = await loadAuthor({ slug: '', author_id: author().id })
|
||||
console.debug('[AuthorView] loaded author:', a)
|
||||
if (
|
||||
!sessionChecked() &&
|
||||
props.authorSlug &&
|
||||
session()?.user?.app_data?.profile?.slug === props.authorSlug
|
||||
) {
|
||||
setSessionChecked(true)
|
||||
const appdata = session()?.user.app_data
|
||||
if (appdata) {
|
||||
console.info('preloaded my own profile')
|
||||
const { authors, profile, topics } = appdata
|
||||
setFollowers(myFollowers)
|
||||
setAuthor(profile)
|
||||
setFollowing([...authors, ...topics])
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -71,16 +77,17 @@ export const AuthorView = (props: Props) => {
|
|||
|
||||
const fetchData = async (slug) => {
|
||||
try {
|
||||
const [subscriptionsResult, followersResult] = await Promise.all([
|
||||
const [subscriptionsResult, followersResult, authorResult] = await Promise.all([
|
||||
apiClient.getAuthorFollows({ slug }),
|
||||
apiClient.getAuthorFollowers({ slug }),
|
||||
loadAuthor({ slug }),
|
||||
])
|
||||
|
||||
const { authors, topics } = subscriptionsResult
|
||||
setAuthor(authorResult)
|
||||
setFollowing([...(authors || []), ...(topics || [])])
|
||||
setFollowers(followersResult || [])
|
||||
|
||||
console.info('[components.Author] following data loaded')
|
||||
console.info('[components.Author] data loaded')
|
||||
} catch (error) {
|
||||
console.error('[components.Author] fetch error', error)
|
||||
}
|
||||
|
@ -92,14 +99,6 @@ export const AuthorView = (props: Props) => {
|
|||
}
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
fetchData(props.authorSlug)
|
||||
|
||||
if (!modal) {
|
||||
hideModal()
|
||||
}
|
||||
})
|
||||
|
||||
const loadMore = async () => {
|
||||
saveScrollPosition()
|
||||
const { hasMore } = await loadShouts({
|
||||
|
@ -112,7 +111,9 @@ export const AuthorView = (props: Props) => {
|
|||
}
|
||||
|
||||
onMount(() => {
|
||||
if (!modal) hideModal()
|
||||
checkBioHeight()
|
||||
fetchData(props.authorSlug)
|
||||
|
||||
// pagination
|
||||
if (sortedArticles().length === PRERENDERED_ARTICLES_COUNT) {
|
||||
|
@ -127,7 +128,7 @@ export const AuthorView = (props: Props) => {
|
|||
|
||||
const fetchComments = async (commenter: Author) => {
|
||||
const data = await apiClient.getReactionsBy({
|
||||
by: { comment: false, created_by: commenter.id },
|
||||
by: { comment: true, created_by: commenter.id },
|
||||
})
|
||||
setCommented(data)
|
||||
}
|
||||
|
@ -166,31 +167,53 @@ export const AuthorView = (props: Props) => {
|
|||
<Show when={author()} fallback={<Loading />}>
|
||||
<>
|
||||
<div class={styles.authorHeader}>
|
||||
<AuthorCard author={author()} followers={followers()} following={following()} />
|
||||
<AuthorCard author={author()} followers={followers() || []} following={following() || []} />
|
||||
</div>
|
||||
<div class={clsx(styles.groupControls, 'row')}>
|
||||
<div class="col-md-16">
|
||||
<ul class="view-switcher">
|
||||
<li classList={{ 'view-switcher__item--selected': getPage().route === 'author' }}>
|
||||
<a href={getPagePath(router, 'author', { slug: props.authorSlug })}>
|
||||
<li
|
||||
classList={{
|
||||
'view-switcher__item--selected': getPage().route === 'author',
|
||||
}}
|
||||
>
|
||||
<a
|
||||
href={getPagePath(router, 'author', {
|
||||
slug: props.authorSlug,
|
||||
})}
|
||||
>
|
||||
{t('Publications')}
|
||||
</a>
|
||||
<Show when={author().stat}>
|
||||
<span class="view-switcher__counter">{author().stat.shouts}</span>
|
||||
</Show>
|
||||
</li>
|
||||
<li classList={{ 'view-switcher__item--selected': getPage().route === 'authorComments' }}>
|
||||
<a href={getPagePath(router, 'authorComments', { slug: props.authorSlug })}>
|
||||
<li
|
||||
classList={{
|
||||
'view-switcher__item--selected': getPage().route === 'authorComments',
|
||||
}}
|
||||
>
|
||||
<a
|
||||
href={getPagePath(router, 'authorComments', {
|
||||
slug: props.authorSlug,
|
||||
})}
|
||||
>
|
||||
{t('Comments')}
|
||||
</a>
|
||||
<Show when={author().stat}>
|
||||
<span class="view-switcher__counter">{author().stat.comments}</span>
|
||||
</Show>
|
||||
</li>
|
||||
<li classList={{ 'view-switcher__item--selected': getPage().route === 'authorAbout' }}>
|
||||
<li
|
||||
classList={{
|
||||
'view-switcher__item--selected': getPage().route === 'authorAbout',
|
||||
}}
|
||||
>
|
||||
<a
|
||||
onClick={() => checkBioHeight()}
|
||||
href={getPagePath(router, 'authorAbout', { slug: props.authorSlug })}
|
||||
href={getPagePath(router, 'authorAbout', {
|
||||
slug: props.authorSlug,
|
||||
})}
|
||||
>
|
||||
{t('Profile')}
|
||||
</a>
|
||||
|
|
|
@ -54,6 +54,13 @@ type FeedSearchParams = {
|
|||
visibility: VisibilityMode
|
||||
}
|
||||
|
||||
type Props = {
|
||||
loadShouts: (options: LoadShoutsOptions) => Promise<{
|
||||
hasMore: boolean
|
||||
newShouts: Shout[]
|
||||
}>
|
||||
}
|
||||
|
||||
const getFromDate = (period: FeedPeriod): number => {
|
||||
const now = new Date()
|
||||
let d: Date = now
|
||||
|
@ -74,18 +81,10 @@ const getFromDate = (period: FeedPeriod): number => {
|
|||
return Math.floor(d.getTime() / 1000)
|
||||
}
|
||||
|
||||
type Props = {
|
||||
loadShouts: (options: LoadShoutsOptions) => Promise<{
|
||||
hasMore: boolean
|
||||
newShouts: Shout[]
|
||||
}>
|
||||
}
|
||||
|
||||
export const FeedView = (props: Props) => {
|
||||
const { t } = useLocalize()
|
||||
|
||||
const monthPeriod: PeriodItem = { value: 'month', title: t('This month') }
|
||||
const visibilityAll = { value: 'featured', title: t('All') }
|
||||
|
||||
const periods: PeriodItem[] = [
|
||||
{ value: 'week', title: t('This week') },
|
||||
|
@ -121,7 +120,7 @@ export const FeedView = (props: Props) => {
|
|||
const currentVisibility = createMemo(() => {
|
||||
const visibility = visibilities.find((v) => v.value === searchParams().visibility)
|
||||
if (!visibility) {
|
||||
return visibilityAll
|
||||
return visibilities[0]
|
||||
}
|
||||
return visibility
|
||||
})
|
||||
|
@ -172,6 +171,7 @@ export const FeedView = (props: Props) => {
|
|||
}
|
||||
|
||||
const visibilityMode = searchParams().visibility
|
||||
|
||||
if (visibilityMode === 'all') {
|
||||
options.filters = { ...options.filters }
|
||||
} else if (visibilityMode) {
|
||||
|
@ -185,6 +185,7 @@ export const FeedView = (props: Props) => {
|
|||
const period = searchParams().period || 'month'
|
||||
options.filters = { after: getFromDate(period) }
|
||||
}
|
||||
|
||||
return props.loadShouts(options)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
import { clsx } from 'clsx'
|
||||
import { For, Show, createEffect, createSignal, onMount } from 'solid-js'
|
||||
|
||||
import { useFollowing } from '../../../context/following'
|
||||
import { useLocalize } from '../../../context/localize'
|
||||
import { useSession } from '../../../context/session'
|
||||
import { apiClient } from '../../../graphql/client/core'
|
||||
|
@ -20,41 +21,32 @@ import stylesSettings from '../../../styles/FeedSettings.module.scss'
|
|||
|
||||
export const ProfileSubscriptions = () => {
|
||||
const { t, lang } = useLocalize()
|
||||
const { author } = useSession()
|
||||
const { author, session } = useSession()
|
||||
const { subscriptions } = useFollowing()
|
||||
const [following, setFollowing] = createSignal<Array<Author | Topic>>([])
|
||||
const [filtered, setFiltered] = createSignal<Array<Author | Topic>>([])
|
||||
const [subscriptionFilter, setSubscriptionFilter] = createSignal<SubscriptionFilter>('all')
|
||||
const [searchQuery, setSearchQuery] = createSignal('')
|
||||
|
||||
const fetchSubscriptions = async () => {
|
||||
try {
|
||||
const slug = author()?.slug
|
||||
const authorFollows = await apiClient.getAuthorFollows({ slug })
|
||||
setFollowing([...authorFollows['authors']])
|
||||
setFiltered([...authorFollows['authors'], ...authorFollows['topics']])
|
||||
} catch (error) {
|
||||
console.error('[fetchSubscriptions] :', error)
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
createEffect(() => {
|
||||
if (following()) {
|
||||
const { authors, topics } = subscriptions
|
||||
if (authors || topics) {
|
||||
const fdata = [...(authors || []), ...(topics || [])]
|
||||
setFollowing(fdata)
|
||||
if (subscriptionFilter() === 'authors') {
|
||||
setFiltered(following().filter((s) => 'name' in s))
|
||||
setFiltered(fdata.filter((s) => 'name' in s))
|
||||
} else if (subscriptionFilter() === 'topics') {
|
||||
setFiltered(following().filter((s) => 'title' in s))
|
||||
setFiltered(fdata.filter((s) => 'title' in s))
|
||||
} else {
|
||||
setFiltered(following())
|
||||
setFiltered(fdata)
|
||||
}
|
||||
}
|
||||
if (searchQuery()) {
|
||||
setFiltered(dummyFilter(following(), searchQuery(), lang()))
|
||||
}
|
||||
})
|
||||
|
||||
onMount(async () => {
|
||||
await fetchSubscriptions()
|
||||
createEffect(() => {
|
||||
if (searchQuery()) {
|
||||
setFiltered(dummyFilter(following(), searchQuery(), lang()))
|
||||
}
|
||||
})
|
||||
|
||||
return (
|
||||
|
@ -73,17 +65,29 @@ export const ProfileSubscriptions = () => {
|
|||
<p class="description">{t('Here you can manage all your Discours subscriptions')}</p>
|
||||
<Show when={following()} fallback={<Loading />}>
|
||||
<ul class="view-switcher">
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'all' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'all',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('all')}>
|
||||
{t('All')}
|
||||
</button>
|
||||
</li>
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'authors' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'authors',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('authors')}>
|
||||
{t('Authors')}
|
||||
</button>
|
||||
</li>
|
||||
<li class={clsx({ 'view-switcher__item--selected': subscriptionFilter() === 'topics' })}>
|
||||
<li
|
||||
class={clsx({
|
||||
'view-switcher__item--selected': subscriptionFilter() === 'topics',
|
||||
})}
|
||||
>
|
||||
<button type="button" onClick={() => setSubscriptionFilter('topics')}>
|
||||
{t('Topics')}
|
||||
</button>
|
||||
|
|
|
@ -48,8 +48,6 @@ export const TopicView = (props: Props) => {
|
|||
const [favoriteTopArticles, setFavoriteTopArticles] = createSignal<Shout[]>([])
|
||||
const [reactedTopMonthArticles, setReactedTopMonthArticles] = createSignal<Shout[]>([])
|
||||
|
||||
console.log('%c!!! :', 'color: #bada55', sortedArticles())
|
||||
|
||||
const [topic, setTopic] = createSignal<Topic>()
|
||||
|
||||
createEffect(() => {
|
||||
|
@ -59,7 +57,7 @@ export const TopicView = (props: Props) => {
|
|||
}
|
||||
})
|
||||
|
||||
const loadRandomTopArticles = async (topic: string) => {
|
||||
const loadFavoriteTopArticles = async (topic: string) => {
|
||||
const options: LoadShoutsOptions = {
|
||||
filters: { featured: true, topic: topic },
|
||||
limit: 10,
|
||||
|
@ -69,7 +67,7 @@ export const TopicView = (props: Props) => {
|
|||
setFavoriteTopArticles(result)
|
||||
}
|
||||
|
||||
const loadRandomTopMonthArticles = async (topic: string) => {
|
||||
const loadReactedTopMonthArticles = async (topic: string) => {
|
||||
const now = new Date()
|
||||
const after = getUnixtime(new Date(now.setMonth(now.getMonth() - 1)))
|
||||
|
||||
|
@ -80,16 +78,19 @@ export const TopicView = (props: Props) => {
|
|||
}
|
||||
|
||||
const result = await apiClient.getRandomTopShouts({ options })
|
||||
|
||||
setReactedTopMonthArticles(result)
|
||||
}
|
||||
|
||||
const loadRandom = () => {
|
||||
loadFavoriteTopArticles(topic()?.slug)
|
||||
loadReactedTopMonthArticles(topic()?.slug)
|
||||
}
|
||||
|
||||
createEffect(
|
||||
on(
|
||||
() => topic(),
|
||||
() => {
|
||||
loadRandomTopArticles(topic()?.slug)
|
||||
loadRandomTopMonthArticles(topic()?.slug)
|
||||
},
|
||||
() => loadRandom(),
|
||||
{ defer: true },
|
||||
),
|
||||
)
|
||||
|
@ -118,6 +119,7 @@ export const TopicView = (props: Props) => {
|
|||
}
|
||||
|
||||
onMount(() => {
|
||||
loadRandom()
|
||||
if (sortedArticles().length === PRERENDERED_ARTICLES_COUNT) {
|
||||
loadMore()
|
||||
}
|
||||
|
|
|
@ -10,18 +10,23 @@
|
|||
}
|
||||
|
||||
.notificationsCounter {
|
||||
background-color: #d00820;
|
||||
border: 2px solid #fff;
|
||||
border-radius: 2em;
|
||||
align-items: center;
|
||||
background-color: #E84500;
|
||||
border-radius: 0.8rem;
|
||||
color: #fff;
|
||||
font-size: 1rem;
|
||||
display: flex;
|
||||
font-size: 1.2rem;
|
||||
font-weight: 700;
|
||||
height: 1.6em;
|
||||
left: 1.1em;
|
||||
line-height: 1.25em;
|
||||
height: 2.2rem;
|
||||
justify-content: center;
|
||||
left: 1.6rem;
|
||||
min-width: 2.2rem;
|
||||
padding: 0 0.25em;
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
top: -0.5rem;
|
||||
min-width: 1.5em;
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
left: 1.8rem;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { clsx } from 'clsx'
|
||||
import { For, Show, createEffect, createSignal, on, onCleanup, onMount } from 'solid-js'
|
||||
import SwiperCore from 'swiper'
|
||||
import { Manipulation, Navigation, Pagination } from 'swiper/modules'
|
||||
import { HashNavigation, Manipulation, Navigation, Pagination } from 'swiper/modules'
|
||||
import { throttle } from 'throttle-debounce'
|
||||
|
||||
import { MediaItem } from '../../../pages/types'
|
||||
|
@ -12,6 +12,8 @@ import { Lightbox } from '../Lightbox'
|
|||
|
||||
import { SwiperRef } from './swiper'
|
||||
|
||||
import { useRouter } from '../../../stores/router'
|
||||
import { ArticlePageSearchParams } from '../../Article/FullArticle'
|
||||
import styles from './Swiper.module.scss'
|
||||
|
||||
type Props = {
|
||||
|
@ -31,10 +33,13 @@ export const ImageSwiper = (props: Props) => {
|
|||
const [slideIndex, setSlideIndex] = createSignal(0)
|
||||
const [isMobileView, setIsMobileView] = createSignal(false)
|
||||
const [selectedImage, setSelectedImage] = createSignal('')
|
||||
const { searchParams, changeSearchParams } = useRouter<ArticlePageSearchParams>()
|
||||
|
||||
const handleSlideChange = () => {
|
||||
thumbSwipeRef.current.swiper.slideTo(mainSwipeRef.current.swiper.activeIndex)
|
||||
setSlideIndex(mainSwipeRef.current.swiper.activeIndex)
|
||||
const activeIndex = mainSwipeRef.current.swiper.activeIndex
|
||||
thumbSwipeRef.current.swiper.slideTo(activeIndex)
|
||||
setSlideIndex(activeIndex)
|
||||
changeSearchParams({ slide: `${activeIndex + 1}` })
|
||||
}
|
||||
|
||||
createEffect(
|
||||
|
@ -51,8 +56,19 @@ export const ImageSwiper = (props: Props) => {
|
|||
onMount(async () => {
|
||||
const { register } = await import('swiper/element/bundle')
|
||||
register()
|
||||
SwiperCore.use([Pagination, Navigation, Manipulation])
|
||||
mainSwipeRef.current?.swiper?.on('slideChange', handleSlideChange)
|
||||
SwiperCore.use([Pagination, Navigation, Manipulation, HashNavigation])
|
||||
while (!mainSwipeRef.current || !mainSwipeRef.current.swiper) {
|
||||
await new Promise((resolve) => setTimeout(resolve, 10)) // wait 10 ms
|
||||
}
|
||||
mainSwipeRef.current.swiper.on('slideChange', handleSlideChange)
|
||||
const initialSlide = parseInt(searchParams().slide) - 1
|
||||
if (initialSlide && !Number.isNaN(initialSlide) && initialSlide < props.images.length) {
|
||||
mainSwipeRef.current.swiper.slideTo(initialSlide, 0)
|
||||
} else {
|
||||
changeSearchParams({ slide: '1' })
|
||||
}
|
||||
|
||||
mainSwipeRef.current.swiper.init()
|
||||
})
|
||||
|
||||
onMount(() => {
|
||||
|
@ -103,6 +119,9 @@ export const ImageSwiper = (props: Props) => {
|
|||
watch-slides-visibility={true}
|
||||
direction={'horizontal'}
|
||||
slides-per-group-auto={true}
|
||||
hash-navigation={{
|
||||
watchState: true,
|
||||
}}
|
||||
>
|
||||
<For each={props.images}>
|
||||
{(slide, index) => (
|
||||
|
@ -149,7 +168,7 @@ export const ImageSwiper = (props: Props) => {
|
|||
{(slide, index) => (
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
<swiper-slide lazy="true" virtual-index={index()}>
|
||||
<swiper-slide lazy="true" virtual-index={index()} data-hash={index() + 1}>
|
||||
<div class={styles.image} onClick={handleImageClick}>
|
||||
<Image src={slide.url} alt={slide.title} width={800} />
|
||||
</div>
|
||||
|
|
|
@ -135,9 +135,13 @@
|
|||
.counter {
|
||||
@include font-size(1.2rem);
|
||||
|
||||
@include media-breakpoint-up(sm) {
|
||||
top: 477px;
|
||||
}
|
||||
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
top: 477px;
|
||||
top: 276px;
|
||||
right: 0;
|
||||
font-weight: 600;
|
||||
padding: 0.2rem 0.8rem;
|
||||
|
|
|
@ -2,12 +2,13 @@ import { Accessor, JSX, createContext, createEffect, createSignal, useContext }
|
|||
import { createStore } from 'solid-js/store'
|
||||
|
||||
import { apiClient } from '../graphql/client/core'
|
||||
import { AuthorFollowsResult, FollowingEntity } from '../graphql/schema/core.gen'
|
||||
import { Author, AuthorFollowsResult, FollowingEntity } from '../graphql/schema/core.gen'
|
||||
|
||||
import { useSession } from './session'
|
||||
|
||||
interface FollowingContextType {
|
||||
loading: Accessor<boolean>
|
||||
followers: Accessor<Array<Author>>
|
||||
subscriptions: AuthorFollowsResult
|
||||
setSubscriptions: (subscriptions: AuthorFollowsResult) => void
|
||||
setFollowing: (what: FollowingEntity, slug: string, value: boolean) => void
|
||||
|
@ -31,6 +32,7 @@ const EMPTY_SUBSCRIPTIONS: AuthorFollowsResult = {
|
|||
|
||||
export const FollowingProvider = (props: { children: JSX.Element }) => {
|
||||
const [loading, setLoading] = createSignal<boolean>(false)
|
||||
const [followers, setFollowers] = createSignal<Array<Author>>([])
|
||||
const [subscriptions, setSubscriptions] = createStore<AuthorFollowsResult>(EMPTY_SUBSCRIPTIONS)
|
||||
const { author, session } = useSession()
|
||||
|
||||
|
@ -77,8 +79,17 @@ export const FollowingProvider = (props: { children: JSX.Element }) => {
|
|||
|
||||
createEffect(() => {
|
||||
if (author()) {
|
||||
console.debug('[context.following] author update detect')
|
||||
fetchData()
|
||||
try {
|
||||
const appdata = session()?.user.app_data
|
||||
if (appdata) {
|
||||
const { authors, followers, topics } = appdata
|
||||
setSubscriptions({ authors, topics })
|
||||
setFollowers(followers)
|
||||
if (!authors) fetchData()
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -116,6 +127,7 @@ export const FollowingProvider = (props: { children: JSX.Element }) => {
|
|||
setSubscriptions,
|
||||
isOwnerSubscribed,
|
||||
setFollowing,
|
||||
followers,
|
||||
loadSubscriptions: fetchData,
|
||||
follow,
|
||||
unfollow,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import type { Accessor, JSX, Resource } from 'solid-js'
|
||||
import type { AuthModalSource } from '../components/Nav/AuthModal/types'
|
||||
import type { AuthModalSearchParams, AuthModalSource } from '../components/Nav/AuthModal/types'
|
||||
import type { Author } from '../graphql/schema/core.gen'
|
||||
|
||||
import {
|
||||
|
@ -29,7 +29,6 @@ import {
|
|||
|
||||
import { inboxClient } from '../graphql/client/chat'
|
||||
import { apiClient } from '../graphql/client/core'
|
||||
import { notifierClient } from '../graphql/client/notifier'
|
||||
import { useRouter } from '../stores/router'
|
||||
import { showModal } from '../stores/ui'
|
||||
import { addAuthors } from '../stores/zine/authors'
|
||||
|
@ -136,6 +135,7 @@ export const SessionProvider = (props: {
|
|||
|
||||
const [isSessionLoaded, setIsSessionLoaded] = createSignal(false)
|
||||
const [authError, setAuthError] = createSignal('')
|
||||
const { clearSearchParams } = useRouter<AuthModalSearchParams>()
|
||||
|
||||
// Function to load session data
|
||||
const sessionData = async () => {
|
||||
|
@ -143,7 +143,7 @@ export const SessionProvider = (props: {
|
|||
const s: ApiResponse<AuthToken> = await authorizer().getSession()
|
||||
if (s?.data) {
|
||||
console.info('[context.session] loading session', s)
|
||||
|
||||
clearSearchParams()
|
||||
// Set session expiration time in local storage
|
||||
const expires_at = new Date(Date.now() + s.data.expires_in * 1000)
|
||||
localStorage.setItem('expires_at', `${expires_at.getTime()}`)
|
||||
|
@ -199,6 +199,7 @@ export const SessionProvider = (props: {
|
|||
}
|
||||
|
||||
onCleanup(() => clearTimeout(minuteLater))
|
||||
|
||||
const authorData = async () => {
|
||||
const u = session()?.user
|
||||
return u ? (await apiClient.getAuthorId({ user: u.id.trim() })) || null : null
|
||||
|
@ -217,7 +218,18 @@ export const SessionProvider = (props: {
|
|||
apiClient.connect(token)
|
||||
inboxClient.connect(token)
|
||||
}
|
||||
if (!author()) loadAuthor()
|
||||
|
||||
try {
|
||||
const appdata = session()?.user.app_data
|
||||
if (appdata) {
|
||||
const { profile } = appdata
|
||||
setAuthor(profile)
|
||||
addAuthors([profile])
|
||||
if (!profile) loadAuthor()
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
}
|
||||
|
||||
setIsSessionLoaded(true)
|
||||
}
|
||||
|
@ -263,7 +275,6 @@ export const SessionProvider = (props: {
|
|||
() => {
|
||||
props.onStateChangeCallback(session())
|
||||
},
|
||||
{ defer: true },
|
||||
),
|
||||
)
|
||||
|
||||
|
@ -368,6 +379,7 @@ export const SessionProvider = (props: {
|
|||
}
|
||||
|
||||
const isAuthenticated = createMemo(() => Boolean(author()))
|
||||
|
||||
const actions = {
|
||||
loadSession,
|
||||
requireAuthentication,
|
||||
|
|
|
@ -320,3 +320,14 @@ h5 {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
// disable last pass extention
|
||||
|
||||
div[data-lastpass-icon-root="true"] {
|
||||
opacity: 0 !important;
|
||||
}
|
||||
|
||||
div[data-lastpass-infield="true"] {
|
||||
opacity: 0 !important;
|
||||
}
|
||||
|
||||
|
|
|
@ -114,8 +114,8 @@ const handleClientRouteLinkClick = async (event) => {
|
|||
}
|
||||
|
||||
if (url.hash) {
|
||||
scrollToHash(url.hash)
|
||||
return
|
||||
// scrollToHash(url.hash)
|
||||
// return
|
||||
}
|
||||
|
||||
window.scrollTo({
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { createLazyMemo } from '@solid-primitives/memo'
|
||||
import { createSignal } from 'solid-js'
|
||||
import { createEffect, createSignal } from 'solid-js'
|
||||
|
||||
import { apiClient } from '../../graphql/client/core'
|
||||
import { Author, QueryLoad_Authors_ByArgs } from '../../graphql/schema/core.gen'
|
||||
|
|
|
@ -588,6 +588,7 @@ figure {
|
|||
display: block;
|
||||
max-height: 90vh;
|
||||
margin: auto;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -622,6 +623,10 @@ figure {
|
|||
margin-bottom: 0.6em;
|
||||
white-space: nowrap;
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
margin-right: 2.4rem;
|
||||
}
|
||||
|
||||
.link {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
|
|
@ -1,31 +1,41 @@
|
|||
import { cdnUrl, thumborUrl } from './config'
|
||||
|
||||
const getSizeUrlPart = (options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}) => {
|
||||
const widthString = options.width ? options.width.toString() : ''
|
||||
const heightString = options.height ? options.height.toString() : ''
|
||||
const URL_CONFIG = {
|
||||
cdnUrl: cdnUrl,
|
||||
thumborUrl: `${thumborUrl}/unsafe/`,
|
||||
audioSubfolder: 'audio',
|
||||
imageSubfolder: 'image',
|
||||
productionFolder: 'production/',
|
||||
}
|
||||
|
||||
if (!(widthString || heightString) || options.noSizeUrlPart) {
|
||||
return ''
|
||||
}
|
||||
const AUDIO_EXTENSIONS = new Set(['wav', 'mp3', 'ogg', 'aif', 'flac'])
|
||||
|
||||
return `${widthString}x${heightString}/`
|
||||
const isAudioFile = (filename: string): boolean => {
|
||||
const extension = filename.split('.').pop()?.toLowerCase()
|
||||
return AUDIO_EXTENSIONS.has(extension ?? '')
|
||||
}
|
||||
const getLastSegment = (url: string): string => url.toLowerCase().split('/').pop() || ''
|
||||
|
||||
const buildSizePart = (width?: number, height?: number, includeSize = true): string => {
|
||||
if (!includeSize) return ''
|
||||
const widthPart = width ? width.toString() : ''
|
||||
const heightPart = height ? height.toString() : ''
|
||||
return widthPart || heightPart ? `${widthPart}x${heightPart}/` : ''
|
||||
}
|
||||
|
||||
export const getImageUrl = (
|
||||
src: string,
|
||||
options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {},
|
||||
) => {
|
||||
): string => {
|
||||
if (!src.includes('discours.io') && src.includes('http')) {
|
||||
return src
|
||||
}
|
||||
const filename = src.toLowerCase().split('/').pop()
|
||||
const ext = filename.split('.').pop()
|
||||
const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac']
|
||||
const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/`
|
||||
const suffix = isAudio || options.noSizeUrlPart ? '' : getSizeUrlPart(options)
|
||||
const subfolder = isAudio ? 'audio' : 'image'
|
||||
const filename = getLastSegment(src)
|
||||
const base = isAudioFile(filename) ? URL_CONFIG.cdnUrl : URL_CONFIG.thumborUrl
|
||||
const suffix = options.noSizeUrlPart ? '' : buildSizePart(options.width, options.height)
|
||||
const subfolder = isAudioFile(filename) ? URL_CONFIG.audioSubfolder : URL_CONFIG.imageSubfolder
|
||||
|
||||
return `${base}${suffix}production/${subfolder}/${filename}`
|
||||
return `${base}${suffix}${URL_CONFIG.productionFolder}${subfolder}/${filename}`
|
||||
}
|
||||
|
||||
export const getOpenGraphImageUrl = (
|
||||
|
@ -37,17 +47,16 @@ export const getOpenGraphImageUrl = (
|
|||
width?: number
|
||||
height?: number
|
||||
},
|
||||
) => {
|
||||
const sizeUrlPart = getSizeUrlPart(options)
|
||||
|
||||
): string => {
|
||||
const sizeUrlPart = buildSizePart(options.width, options.height)
|
||||
const filtersPart = `filters:discourstext('${encodeURIComponent(options.topic)}','${encodeURIComponent(
|
||||
options.author,
|
||||
)}','${encodeURIComponent(options.title)}')/`
|
||||
|
||||
if (src.startsWith(thumborUrl)) {
|
||||
const thumborKey = src.replace(`${thumborUrl}/unsafe`, '')
|
||||
return `${thumborUrl}/unsafe/${sizeUrlPart}${filtersPart}${thumborKey}`
|
||||
if (src.startsWith(URL_CONFIG.thumborUrl)) {
|
||||
const thumborKey = src.replace(URL_CONFIG.thumborUrl, '')
|
||||
return `${URL_CONFIG.thumborUrl}${sizeUrlPart}${filtersPart}${thumborKey}`
|
||||
}
|
||||
|
||||
return `${thumborUrl}/unsafe/${sizeUrlPart}${filtersPart}${src}`
|
||||
return `${URL_CONFIG.thumborUrl}${sizeUrlPart}${filtersPart}${src}`
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user