diff --git a/src/app.tsx b/src/app.tsx index 391f1e14..f65f2e08 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -148,10 +148,10 @@ const App = () => ( } /> } /> - } /> - } /> - } /> - } /> + } /> + } /> + } /> + } /> } /> } /> diff --git a/src/components/board-buttons/board-buttons.tsx b/src/components/board-buttons/board-buttons.tsx index e69ecb94..33b5c4ba 100644 --- a/src/components/board-buttons/board-buttons.tsx +++ b/src/components/board-buttons/board-buttons.tsx @@ -39,8 +39,8 @@ const CatalogButton = ({ address, isInAllView, isInSubscriptionsView, isInModVie if (params?.timeFilterName) return `/all/catalog/${params.timeFilterName}`; return `/all/catalog`; } else if (isInSubscriptionsView) { - if (params?.timeFilterName) return `/subscriptions/catalog/${params.timeFilterName}`; - return `/subscriptions/catalog`; + if (params?.timeFilterName) return `/subs/catalog/${params.timeFilterName}`; + return `/subs/catalog`; } else if (isInModView) { if (params?.timeFilterName) return `/mod/catalog/${params.timeFilterName}`; return `/mod/catalog`; @@ -82,8 +82,8 @@ const ReturnButton = ({ address, isInAllView, isInSubscriptionsView, isInModView if (params?.timeFilterName) return `/all/${params.timeFilterName}`; return `/all`; } else if (isInSubscriptionsView) { - if (params?.timeFilterName) return `/subscriptions/${params.timeFilterName}`; - return `/subscriptions`; + if (params?.timeFilterName) return `/subs/${params.timeFilterName}`; + return `/subs`; } else if (isInModView) { if (params?.timeFilterName) return `/mod/${params.timeFilterName}`; return `/mod`; @@ -249,8 +249,8 @@ export const TimeFilter = ({ isInAllView, isInCatalogView, isInSubscriptionsView : `/all/${timeFilterName}` : isInSubscriptionsView ? isInCatalogView - ? `/subscriptions/catalog/${timeFilterName}` - : `/subscriptions/${timeFilterName}` + ? `/subs/catalog/${timeFilterName}` + : `/subs/${timeFilterName}` : isInModView ? isInCatalogView ? `/mod/catalog/${timeFilterName}` @@ -507,8 +507,8 @@ const SearchOPsBar = () => { : `/all/catalog?q=${encodeURIComponent(searchQuery)}`; } else if (isInSubscriptionsView) { catalogUrl = params?.timeFilterName - ? `/subscriptions/catalog/${params.timeFilterName}?q=${encodeURIComponent(searchQuery)}` - : `/subscriptions/catalog?q=${encodeURIComponent(searchQuery)}`; + ? `/subs/catalog/${params.timeFilterName}?q=${encodeURIComponent(searchQuery)}` + : `/subs/catalog?q=${encodeURIComponent(searchQuery)}`; } else if (isInModView) { catalogUrl = params?.timeFilterName ? `/mod/catalog/${params.timeFilterName}?q=${encodeURIComponent(searchQuery)}` diff --git a/src/components/board-header/board-header.tsx b/src/components/board-header/board-header.tsx index 23bf3ecd..8b4ef14c 100644 --- a/src/components/board-header/board-header.tsx +++ b/src/components/board-header/board-header.tsx @@ -43,13 +43,13 @@ const BoardHeader = () => { const defaultSubplebbit = subplebbitAddress ? defaultSubplebbits.find((s) => s.address === subplebbitAddress) : null; const title = isInAllView - ? multisubMetadata?.title || 'all' + ? multisubMetadata?.title || '/all/ - 5chan Directories' : isInSubscriptionsView - ? 'Subscriptions' + ? '/subs/ - Subscriptions' : isInModView ? _.startCase(t('boards_you_moderate')) : defaultSubplebbit?.title || subplebbit?.title; - const subtitle = isInAllView ? 'p/all' : isInSubscriptionsView ? 'p/subscriptions' : isInModView ? 'p/mod' : `p/${address || subplebbitAddress || ''}`; + const subtitle = isInAllView ? '/all/' : isInSubscriptionsView ? '/subs/' : isInModView ? '/mod/' : `${address || subplebbitAddress || ''}`; const { isOffline, isOnlineStatusLoading, offlineIconClass, offlineTitle } = useIsSubplebbitOffline(subplebbit); diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx index bc3a5bbc..223141df 100644 --- a/src/components/topbar/topbar.tsx +++ b/src/components/topbar/topbar.tsx @@ -179,7 +179,7 @@ const TopBarDesktop = () => { return (
- [all / subscriptions + [all / subs {accountSubplebbitAddresses.length > 0 && ( <> {' '} diff --git a/src/lib/utils/url-utils.ts b/src/lib/utils/url-utils.ts index 09a7076b..2443ac45 100644 --- a/src/lib/utils/url-utils.ts +++ b/src/lib/utils/url-utils.ts @@ -59,7 +59,7 @@ export const is5chanLink = (url: string): boolean => { // - /{boardIdentifier}/catalog // - /{boardIdentifier}/description // - /{boardIdentifier}/rules - // - /all, /subscriptions, /mod, /pending/{index} + // - /all, /subs, /mod, /pending/{index} return ( /^\/p\/[^/]+(\/c\/[^/]+)?$/.test(routePath) || /^\/[^/]+(\/thread\/[^/]+|\/catalog|\/description|\/rules)?$/.test(routePath) || diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts index d4d307d9..2048de84 100644 --- a/src/lib/utils/view-utils.ts +++ b/src/lib/utils/view-utils.ts @@ -16,7 +16,7 @@ export const isBoardView = (pathname: string, params: ParamsType): boolean => { // Check if it's a board view (not all, subscriptions, mod, pending, or special routes) if ( pathname.startsWith('/all') || - pathname.startsWith('/subscriptions') || + pathname.startsWith('/subs') || pathname.startsWith('/mod') || pathname.startsWith('/pending') || pathname === '/' || @@ -40,10 +40,10 @@ export const isCatalogView = (pathname: string, params: ParamsType): boolean => decodedPathname === `/all/catalog/settings` || decodedPathname === `/all/catalog/${timeFilterName}` || decodedPathname === `/all/catalog/${timeFilterName}/settings` || - decodedPathname === `/subscriptions/catalog` || - decodedPathname === `/subscriptions/catalog/settings` || - decodedPathname === `/subscriptions/catalog/${timeFilterName}` || - decodedPathname === `/subscriptions/catalog/${timeFilterName}/settings` || + decodedPathname === `/subs/catalog` || + decodedPathname === `/subs/catalog/settings` || + decodedPathname === `/subs/catalog/${timeFilterName}` || + decodedPathname === `/subs/catalog/${timeFilterName}/settings` || decodedPathname === `/mod/catalog` || decodedPathname === `/mod/catalog/settings` || decodedPathname === `/mod/catalog/${timeFilterName}` || @@ -99,14 +99,14 @@ export const isSettingsView = (pathname: string, params: ParamsType): boolean => export const isSubscriptionsView = (pathname: string, params: ParamsType): boolean => { const { timeFilterName } = params; return ( - pathname === '/subscriptions' || - pathname === '/subscriptions/settings' || - pathname === `/subscriptions/${timeFilterName}` || - pathname === `/subscriptions/${timeFilterName}/settings` || - pathname === '/subscriptions/catalog' || - pathname === '/subscriptions/catalog/settings' || - pathname === `/subscriptions/catalog/${timeFilterName}` || - pathname === `/subscriptions/catalog/${timeFilterName}/settings` + pathname === '/subs' || + pathname === '/subs/settings' || + pathname === `/subs/${timeFilterName}` || + pathname === `/subs/${timeFilterName}/settings` || + pathname === '/subs/catalog' || + pathname === '/subs/catalog/settings' || + pathname === `/subs/catalog/${timeFilterName}` || + pathname === `/subs/catalog/${timeFilterName}/settings` ); }; diff --git a/src/views/board/board.tsx b/src/views/board/board.tsx index fc161163..a9ef89dc 100644 --- a/src/views/board/board.tsx +++ b/src/views/board/board.tsx @@ -200,7 +200,7 @@ const Board = () => { showMorePostsSuggestion && (monthlyFeed.length > feed.length || yearlyFeed.length > monthlyFeed.length) && (() => { - const basePath = isInAllView ? '/all' : isInSubscriptionsView ? '/subscriptions' : isInModView ? '/mod' : boardPath ? `/${boardPath}` : ''; + const basePath = isInAllView ? '/all' : isInSubscriptionsView ? '/subs' : isInModView ? '/mod' : boardPath ? `/${boardPath}` : ''; return weeklyFeed.length > feed.length ? (
{ i18nKey='more_threads_last_week' values={{ currentTimeFilterName, count: feed.length }} components={{ - 1: , + 1: , }} />
@@ -388,7 +388,7 @@ const Catalog = () => { i18nKey='more_threads_last_month' values={{ currentTimeFilterName, count: feed.length }} components={{ - 1: , + 1: , }} />
@@ -398,7 +398,7 @@ const Catalog = () => { i18nKey='more_threads_last_year' values={{ currentTimeFilterName, count: feed.length }} components={{ - 1: , + 1: , }} /> diff --git a/src/views/home/boards-list/boards-list.tsx b/src/views/home/boards-list/boards-list.tsx index b4d81661..8bdc4826 100644 --- a/src/views/home/boards-list/boards-list.tsx +++ b/src/views/home/boards-list/boards-list.tsx @@ -603,6 +603,20 @@ const BoardsList = ({ multisub }: { multisub: MultisubSubplebbit[] }) => { )} + + {/* Column 6: Meta */} +
+

Multiboards

+ +
    +
  • + All 5chan Directories +
    • +
  • + Subscriptions +
    • +
+
);