diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx index 0a3a7dea..da61ce66 100644 --- a/src/components/Article/CommentsTree.tsx +++ b/src/components/Article/CommentsTree.tsx @@ -98,7 +98,7 @@ export const CommentsTree = (props: Props) => {

{t('Comments')} {comments().length.toString() || ''} 0}> -  +{newReactions().length} + {` +${newReactions().length}`}

0}> @@ -150,7 +150,7 @@ export const CommentsTree = (props: Props) => { {t('sign up')} {' '} - {t('or')}  + {t('or')}{' '} {t('sign in')} diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx index 0f679cde..fe444e13 100644 --- a/src/components/Author/AuthorCard/AuthorCard.tsx +++ b/src/components/Author/AuthorCard/AuthorCard.tsx @@ -1,13 +1,14 @@ -import type { Author, Community } from '~/graphql/schema/core.gen' - +import { redirect, useNavigate, useSearchParams } from '@solidjs/router' import { clsx } from 'clsx' import { For, Show, createEffect, createMemo, createSignal, onMount } from 'solid-js' import { Button } from '~/components/_shared/Button' +import stylesButton from '~/components/_shared/Button/Button.module.scss' import { FollowingCounters } from '~/components/_shared/FollowingCounters/FollowingCounters' import { ShowOnlyOnClient } from '~/components/_shared/ShowOnlyOnClient' import { FollowsFilter, useFollowing } from '~/context/following' import { useLocalize } from '~/context/localize' import { useSession } from '~/context/session' +import type { Author, Community } from '~/graphql/schema/core.gen' import { FollowingEntity, Topic } from '~/graphql/schema/core.gen' import { isCyrillic } from '~/intl/translate' import { translit } from '~/intl/translit' @@ -16,9 +17,6 @@ import { Modal } from '../../Nav/Modal' import { TopicBadge } from '../../Topic/TopicBadge' import { AuthorBadge } from '../AuthorBadge' import { Userpic } from '../Userpic' - -import { useNavigate, useSearchParams } from '@solidjs/router' -import stylesButton from '~/components/_shared/Button/Button.module.scss' import styles from './AuthorCard.module.scss' type Props = { @@ -251,7 +249,7 @@ export const AuthorCard = (props: Props) => {
diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx index 2bb79163..27b3b843 100644 --- a/src/components/Nav/Header/Header.tsx +++ b/src/components/Nav/Header/Header.tsx @@ -1,4 +1,4 @@ -import { A, useLocation, useNavigate, useSearchParams } from '@solidjs/router' +import { A, redirect, useLocation, useNavigate, useSearchParams } from '@solidjs/router' import { clsx } from 'clsx' import { For, Show, createEffect, createSignal, onCleanup, onMount } from 'solid-js' import { useLocalize } from '~/context/localize' @@ -120,7 +120,7 @@ export const Header = (props: Props) => { requireAuthentication(() => { ev?.preventDefault() - navigate('/edit/new') + redirect('/edit/new') }, 'create') } @@ -149,13 +149,9 @@ export const Header = (props: Props) => { } const handleToggleMenuByLink = (event: MouseEvent, route: string) => { - console.debug('toggling menu link', fixed(), route) event.preventDefault() - if (loc.pathname === route) { - toggleFixed() - } - - navigate(route) + if (fixed()) toggleFixed() + if (loc.pathname !== route) navigate(route) } return (
{

{t('Participating')}

@@ -312,9 +308,9 @@ export const Header = (props: Props) => {
- {t('Dogma')} - - {t('Principles')} + {t('Dogma')} + {t('Discussion rules')} + {t('Principles')}

{ >

@@ -409,34 +405,37 @@ export const Header = (props: Props) => { > diff --git a/src/components/Views/FeedSettings.tsx b/src/components/Views/FeedSettings.tsx index 34089309..b2faf237 100644 --- a/src/components/Views/FeedSettings.tsx +++ b/src/components/Views/FeedSettings.tsx @@ -35,7 +35,7 @@ export const FeedSettingsView = () => {
- +
- +
- +