header-auth-nav-fix

This commit is contained in:
tony 2024-08-26 15:23:51 +03:00
parent e360cdf1ba
commit 0748aa342c
10 changed files with 58 additions and 48 deletions

View File

@ -37,38 +37,38 @@
"@solidjs/meta": "^0.29.4", "@solidjs/meta": "^0.29.4",
"@solidjs/router": "^0.14.3", "@solidjs/router": "^0.14.3",
"@solidjs/start": "^1.0.6", "@solidjs/start": "^1.0.6",
"@tiptap/core": "^2.6.5", "@tiptap/core": "^2.6.6",
"@tiptap/extension-blockquote": "^2.6.5", "@tiptap/extension-blockquote": "^2.6.6",
"@tiptap/extension-bold": "^2.6.5", "@tiptap/extension-bold": "^2.6.6",
"@tiptap/extension-bubble-menu": "^2.6.5", "@tiptap/extension-bubble-menu": "^2.6.6",
"@tiptap/extension-bullet-list": "^2.6.5", "@tiptap/extension-bullet-list": "^2.6.6",
"@tiptap/extension-character-count": "^2.6.5", "@tiptap/extension-character-count": "^2.6.6",
"@tiptap/extension-collaboration": "^2.6.5", "@tiptap/extension-collaboration": "^2.6.6",
"@tiptap/extension-collaboration-cursor": "^2.6.5", "@tiptap/extension-collaboration-cursor": "^2.6.6",
"@tiptap/extension-document": "^2.6.5", "@tiptap/extension-document": "^2.6.6",
"@tiptap/extension-dropcursor": "^2.6.5", "@tiptap/extension-dropcursor": "^2.6.6",
"@tiptap/extension-floating-menu": "^2.6.5", "@tiptap/extension-floating-menu": "^2.6.6",
"@tiptap/extension-focus": "^2.6.5", "@tiptap/extension-focus": "^2.6.6",
"@tiptap/extension-gapcursor": "^2.6.5", "@tiptap/extension-gapcursor": "^2.6.6",
"@tiptap/extension-hard-break": "^2.6.5", "@tiptap/extension-hard-break": "^2.6.6",
"@tiptap/extension-heading": "^2.6.5", "@tiptap/extension-heading": "^2.6.6",
"@tiptap/extension-highlight": "^2.6.5", "@tiptap/extension-highlight": "^2.6.6",
"@tiptap/extension-history": "^2.6.5", "@tiptap/extension-history": "^2.6.6",
"@tiptap/extension-horizontal-rule": "^2.6.5", "@tiptap/extension-horizontal-rule": "^2.6.6",
"@tiptap/extension-image": "^2.6.5", "@tiptap/extension-image": "^2.6.6",
"@tiptap/extension-italic": "^2.6.5", "@tiptap/extension-italic": "^2.6.6",
"@tiptap/extension-link": "^2.6.5", "@tiptap/extension-link": "^2.6.6",
"@tiptap/extension-list-item": "^2.6.5", "@tiptap/extension-list-item": "^2.6.6",
"@tiptap/extension-ordered-list": "^2.6.5", "@tiptap/extension-ordered-list": "^2.6.6",
"@tiptap/extension-paragraph": "^2.6.5", "@tiptap/extension-paragraph": "^2.6.6",
"@tiptap/extension-placeholder": "^2.6.5", "@tiptap/extension-placeholder": "^2.6.6",
"@tiptap/extension-strike": "^2.6.5", "@tiptap/extension-strike": "^2.6.6",
"@tiptap/extension-text": "^2.6.5", "@tiptap/extension-text": "^2.6.6",
"@tiptap/extension-underline": "^2.6.5", "@tiptap/extension-underline": "^2.6.6",
"@tiptap/extension-youtube": "^2.6.5", "@tiptap/extension-youtube": "^2.6.6",
"@types/cookie": "^0.6.0", "@types/cookie": "^0.6.0",
"@types/cookie-signature": "^1.1.2", "@types/cookie-signature": "^1.1.2",
"@types/node": "^20.16.1", "@types/node": "^22.5.0",
"@types/throttle-debounce": "^5.0.2", "@types/throttle-debounce": "^5.0.2",
"@urql/core": "^5.0.6", "@urql/core": "^5.0.6",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
@ -87,7 +87,7 @@
"patch-package": "^8.0.0", "patch-package": "^8.0.0",
"prosemirror-history": "^1.4.1", "prosemirror-history": "^1.4.1",
"prosemirror-trailing-node": "^2.0.9", "prosemirror-trailing-node": "^2.0.9",
"prosemirror-view": "^1.33.11", "prosemirror-view": "^1.34.0",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"sass": "1.76.0", "sass": "1.76.0",
"solid-js": "^1.8.21", "solid-js": "^1.8.21",
@ -101,7 +101,7 @@
"stylelint-scss": "^6.5.0", "stylelint-scss": "^6.5.0",
"swiper": "^11.1.10", "swiper": "^11.1.10",
"throttle-debounce": "^5.0.2", "throttle-debounce": "^5.0.2",
"tslib": "^2.6.3", "tslib": "^2.7.0",
"typescript": "^5.5.4", "typescript": "^5.5.4",
"typograf": "^7.4.1", "typograf": "^7.4.1",
"uniqolor": "^1.1.1", "uniqolor": "^1.1.1",
@ -109,12 +109,12 @@
"vite-plugin-mkcert": "^1.17.6", "vite-plugin-mkcert": "^1.17.6",
"vite-plugin-node-polyfills": "^0.22.0", "vite-plugin-node-polyfills": "^0.22.0",
"vite-plugin-sass-dts": "^1.3.25", "vite-plugin-sass-dts": "^1.3.25",
"y-prosemirror": "1.2.9", "y-prosemirror": "1.2.12",
"yjs": "13.6.18" "yjs": "13.6.18"
}, },
"overrides": { "overrides": {
"yjs": "13.6.18", "yjs": "13.6.18",
"y-prosemirror": "1.2.9" "y-prosemirror": "1.2.12"
}, },
"engines": { "engines": {
"node": ">= 20" "node": ">= 20"

View File

@ -237,7 +237,7 @@ export const AuthorCard = (props: Props) => {
<div class={styles.authorActions}> <div class={styles.authorActions}>
<Button <Button
variant="secondary" variant="secondary"
onClick={() => redirect('/profile')} onClick={() => redirect('/settings')}
value={ value={
<> <>
<span class={styles.authorActionsLabel}>{t('Edit profile')}</span> <span class={styles.authorActionsLabel}>{t('Edit profile')}</span>

View File

@ -754,6 +754,11 @@
} }
.rightItem {
margin-right: 0;
position: absolute;
right: 0;
top: 0; }
} }
a:link, a:link,
@ -796,6 +801,13 @@
} }
} }
.rightItemIcon {
display: inline-block;
margin-left: 0.3em;
position: relative;
top: 0.15em;
}
.editorPopup { .editorPopup {
border: 1px solid rgb(0 0 0 / 15%) !important; border: 1px solid rgb(0 0 0 / 15%) !important;
border-radius: 1.6rem; border-radius: 1.6rem;

View File

@ -20,7 +20,7 @@ export const ProfilePopup = (props: ProfilePopupProps) => {
<Popup {...props} horizontalAnchor="right" popupCssClass={styles.profilePopup}> <Popup {...props} horizontalAnchor="right" popupCssClass={styles.profilePopup}>
<ul class="nodash"> <ul class="nodash">
<li> <li>
<A class={styles.action} href="/profile"> <A class={styles.action} href={`/@${author().slug}`}>
<Icon name="profile" class={styles.icon} /> <Icon name="profile" class={styles.icon} />
{t('Profile')} {t('Profile')}
</A> </A>
@ -50,7 +50,7 @@ export const ProfilePopup = (props: ProfilePopupProps) => {
</a> </a>
</li> </li>
<li> <li>
<A class={styles.action} href={'/profile'}> <A class={styles.action} href={'/settings'}>
<Icon name="settings" class={styles.icon} /> <Icon name="settings" class={styles.icon} />
{t('Settings')} {t('Settings')}
</A> </A>

View File

@ -12,14 +12,14 @@ export const ProfileSettingsNavigation = () => {
<> <>
<h4 class={styles.navigationHeader}>{t('Settings')}</h4> <h4 class={styles.navigationHeader}>{t('Settings')}</h4>
<ul class={clsx(styles.navigation, 'nodash')}> <ul class={clsx(styles.navigation, 'nodash')}>
<li class={clsx({ [styles.active]: loc?.pathname === '/profile' })}> <li class={clsx({ [styles.active]: loc?.pathname === '/settings' })}>
<a href="/profile">{t('Profile')}</a> <a href="/settings">{t('Profile')}</a>
</li> </li>
<li class={clsx({ [styles.active]: loc?.pathname === '/profile/subs' })}> <li class={clsx({ [styles.active]: loc?.pathname === '/settings/subs' })}>
<a href="/profile/subs">{t('Subscriptions')}</a> <a href="/settings/subs">{t('Subscriptions')}</a>
</li> </li>
<li class={clsx({ [styles.active]: loc?.pathname === '/profile/security' })}> <li class={clsx({ [styles.active]: loc?.pathname === '/settings/security' })}>
<a href="/profile/security">{t('Security')}</a> <a href="/settings/security">{t('Security')}</a>
</li> </li>
</ul> </ul>
</> </>

View File

@ -1,5 +1,5 @@
import { type RouteDefinition, type RouteSectionProps, createAsync } from '@solidjs/router' import { type RouteDefinition, type RouteSectionProps, createAsync } from '@solidjs/router'
import { Suspense, createEffect } from 'solid-js' import { Suspense, createEffect, on } from 'solid-js'
import { AllTopics } from '~/components/Views/AllTopics' import { AllTopics } from '~/components/Views/AllTopics'
import { Loading } from '~/components/_shared/Loading' import { Loading } from '~/components/_shared/Loading'
import { PageLayout } from '~/components/_shared/PageLayout' import { PageLayout } from '~/components/_shared/PageLayout'
@ -19,7 +19,7 @@ export default (props: RouteSectionProps<{ topics: Topic[] }>) => {
const { t } = useLocalize() const { t } = useLocalize()
const topics = createAsync<Topic[]>(async () => props.data.topics || (await fetchData()) || []) const topics = createAsync<Topic[]>(async () => props.data.topics || (await fetchData()) || [])
const { addTopics } = useTopics() const { addTopics } = useTopics()
createEffect(() => addTopics(topics() || [])) createEffect(on(() => topics() || [], (ttt: Topic[]) => ttt && addTopics(ttt), { defer: true}))
return ( return (
<PageLayout <PageLayout
withPadding={true} withPadding={true}

View File

@ -80,9 +80,7 @@ export default function TopicPage(props: RouteSectionProps<TopicPageProps>) {
) )
const cover = createMemo(() => const cover = createMemo(() =>
topic()?.pic topic()?.pic ? getImageUrl(topic()?.pic || '', { width: 1200 }) : '/logo.png'
? getImageUrl(topic()?.pic || '', { width: 1200 })
: getImageUrl('production/image/logo_image.png')
) )
return ( return (