mirror of
https://github.com/bitsocialnet/5chan.git
synced 2026-08-03 07:41:04 +02:00
feat(board nav): use titles from multisub
This commit is contained in:
@@ -3,14 +3,14 @@ import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { isCatalogView } from '../../lib/utils/view-utils';
|
import { isCatalogView } from '../../lib/utils/view-utils';
|
||||||
import styles from './board-nav.module.css';
|
import styles from './board-nav.module.css';
|
||||||
import { useDefaultSubplebbitAddresses } from '../../hooks/use-default-subplebbits';
|
import useDefaultSubplebbits, { MultisubSubplebbit } from '../../hooks/use-default-subplebbits';
|
||||||
|
|
||||||
interface BoardNavProps {
|
interface BoardNavProps {
|
||||||
subplebbitAddresses: string[];
|
defaultSubplebbits: MultisubSubplebbit[];
|
||||||
subplebbitAddress?: string;
|
subplebbitAddress?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const BoardNavDesktop = ({ subplebbitAddresses }: BoardNavProps) => {
|
const BoardNavDesktop = ({ defaultSubplebbits }: BoardNavProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
|
const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
|
||||||
|
|
||||||
@@ -18,12 +18,14 @@ const BoardNavDesktop = ({ subplebbitAddresses }: BoardNavProps) => {
|
|||||||
<div className={styles.boardNavDesktop}>
|
<div className={styles.boardNavDesktop}>
|
||||||
<span className={styles.boardList}>
|
<span className={styles.boardList}>
|
||||||
[
|
[
|
||||||
{subplebbitAddresses.map((address: string, index: number) => {
|
{defaultSubplebbits.map((subplebbit, index: number) => {
|
||||||
|
const { address, title } = subplebbit || {};
|
||||||
|
const displayAddress = address.includes('.') ? address : address.slice(0, 10).concat('...');
|
||||||
return (
|
return (
|
||||||
<span key={index}>
|
<span key={index}>
|
||||||
{index === 0 ? null : ' '}
|
{index === 0 ? null : ' '}
|
||||||
<Link to={`/p/${address}${isInCatalogView ? '/catalog' : ''}`}>{address.includes('.') ? address : address.slice(0, 10).concat('...')}</Link>
|
<Link to={`/p/${address}${isInCatalogView ? '/catalog' : ''}`}>{title || displayAddress}</Link>
|
||||||
{index !== subplebbitAddresses.length - 1 ? ' /' : null}
|
{index !== defaultSubplebbits.length - 1 ? ' /' : null}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -36,12 +38,13 @@ const BoardNavDesktop = ({ subplebbitAddresses }: BoardNavProps) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const BoardNavMobile = ({ subplebbitAddresses, subplebbitAddress }: BoardNavProps) => {
|
const BoardNavMobile = ({ defaultSubplebbits, subplebbitAddress }: BoardNavProps) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const displaySubplebbitAddress = subplebbitAddress && subplebbitAddress.length > 30 ? subplebbitAddress.slice(0, 30).concat('...') : subplebbitAddress;
|
const displaySubplebbitAddress = subplebbitAddress && subplebbitAddress.length > 30 ? subplebbitAddress.slice(0, 30).concat('...') : subplebbitAddress;
|
||||||
|
|
||||||
const currentSubplebbitIsInList = subplebbitAddresses.some((address: string) => address === subplebbitAddress);
|
const subplebbitAddresses = new Set(defaultSubplebbits.map((sub) => sub.address.toLowerCase()));
|
||||||
|
const currentSubplebbitIsInList = subplebbitAddress && subplebbitAddresses.has(subplebbitAddress.toLowerCase());
|
||||||
|
|
||||||
const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
|
const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
|
||||||
|
|
||||||
@@ -50,11 +53,12 @@ const BoardNavMobile = ({ subplebbitAddresses, subplebbitAddress }: BoardNavProp
|
|||||||
{!currentSubplebbitIsInList && subplebbitAddress && <option value={subplebbitAddress}>{displaySubplebbitAddress}</option>}
|
{!currentSubplebbitIsInList && subplebbitAddress && <option value={subplebbitAddress}>{displaySubplebbitAddress}</option>}
|
||||||
<option value='all'>{t('all')}</option>
|
<option value='all'>{t('all')}</option>
|
||||||
<option value='subscriptions'>{t('subscriptions')}</option>
|
<option value='subscriptions'>{t('subscriptions')}</option>
|
||||||
{subplebbitAddresses.map((address: any, index: number) => {
|
{defaultSubplebbits.map((subplebbit, index) => {
|
||||||
const subplebbitAddress = address?.includes('.') ? address : address?.slice(0, 10).concat('...');
|
const { address, title } = subplebbit || {};
|
||||||
|
const displayAddress = address.includes('.') ? address : address.slice(0, 10).concat('...');
|
||||||
return (
|
return (
|
||||||
<option key={index} value={address}>
|
<option key={index} value={address}>
|
||||||
{subplebbitAddress}
|
{title || displayAddress}
|
||||||
</option>
|
</option>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -122,7 +126,7 @@ if (!window.STICKY_MENU_SCROLL_LISTENER) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const BoardNav = () => {
|
const BoardNav = () => {
|
||||||
const subplebbitAddresses = useDefaultSubplebbitAddresses();
|
const defaultSubplebbits = useDefaultSubplebbits();
|
||||||
|
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
const accountComment = useAccountComment({ commentIndex: params?.accountCommentIndex as any });
|
const accountComment = useAccountComment({ commentIndex: params?.accountCommentIndex as any });
|
||||||
@@ -130,8 +134,8 @@ const BoardNav = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<BoardNavDesktop subplebbitAddresses={subplebbitAddresses} />
|
<BoardNavDesktop defaultSubplebbits={defaultSubplebbits} />
|
||||||
<BoardNavMobile subplebbitAddresses={subplebbitAddresses} subplebbitAddress={subplebbitAddress} />
|
<BoardNavMobile defaultSubplebbits={defaultSubplebbits} subplebbitAddress={subplebbitAddress} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
|
||||||
interface Subplebbit {
|
export interface MultisubSubplebbit {
|
||||||
title?: string;
|
title?: string;
|
||||||
address: string;
|
address: string;
|
||||||
tags?: string[];
|
tags?: string[];
|
||||||
features?: string[];
|
features?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
let cache: Subplebbit[] | null = null;
|
let cache: MultisubSubplebbit[] | null = null;
|
||||||
|
|
||||||
const useDefaultSubplebbits = () => {
|
const useDefaultSubplebbits = () => {
|
||||||
const [subplebbits, setSubplebbits] = useState<Subplebbit[]>([]);
|
const [subplebbits, setSubplebbits] = useState<MultisubSubplebbit[]>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (cache) {
|
if (cache) {
|
||||||
@@ -35,7 +35,7 @@ const useDefaultSubplebbits = () => {
|
|||||||
|
|
||||||
export const useDefaultSubplebbitAddresses = () => {
|
export const useDefaultSubplebbitAddresses = () => {
|
||||||
const defaultSubplebbits = useDefaultSubplebbits();
|
const defaultSubplebbits = useDefaultSubplebbits();
|
||||||
return useMemo(() => defaultSubplebbits.map((subplebbit: Subplebbit) => subplebbit.address), [defaultSubplebbits]);
|
return useMemo(() => defaultSubplebbits.map((subplebbit: MultisubSubplebbit) => subplebbit.address), [defaultSubplebbits]);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default useDefaultSubplebbits;
|
export default useDefaultSubplebbits;
|
||||||
|
|||||||
Reference in New Issue
Block a user