diff --git a/src/components/TrendingTopics.tsx b/src/components/TrendingTopics.tsx index bede088575..dbf9259bd5 100644 --- a/src/components/TrendingTopics.tsx +++ b/src/components/TrendingTopics.tsx @@ -6,7 +6,7 @@ import {atoms as a, useGutters, useTheme, ViewStyleProp} from '#/alf' import {Link as InternalLink, LinkProps} from '#/components/Link' import {Text} from '#/components/Typography' -export function Topic({topic, style}: {topic: string} & ViewStyleProp) { +export function TopicLarge({topic, style}: {topic: string} & ViewStyleProp) { const t = useTheme() return ( - + + {topic} + + + ) +} + +export function TopicSmall({topic, style}: {topic: string} & ViewStyleProp) { + const t = useTheme() + return ( + + {topic} @@ -56,7 +79,7 @@ export function Grid({topics}: {topics: string[]}) { {topics.map(topic => ( {({hovered}) => ( - ) } + +// temp +export const TOPICS = [ + '#atproto', + 'South Korea', + 'Wired', + 'Basket Weaving', + 'Coup', + 'Chappel Roan', + 'the juice', + 'Superman', + '#FCF', + 'Open Web', +] diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 895d160211..052275e204 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -9,8 +9,11 @@ import {useSession} from '#/state/session' import {DesktopFeeds} from '#/view/shell/desktop/Feeds' import {DesktopSearch} from '#/view/shell/desktop/Search' import {atoms as a, useGutters, useTheme, web} from '#/alf' +import {Divider} from '#/components/Divider' +import {Trending2_Stroke2_Corner2_Rounded as Graph} from '#/components/icons/Trending2' import {InlineLinkText} from '#/components/Link' import {ProgressGuideList} from '#/components/ProgressGuide/List' +import * as Trending from '#/components/TrendingTopics' import {Text} from '#/components/Typography' export function DesktopRightNav({routeName}: {routeName: string}) { @@ -19,6 +22,7 @@ export function DesktopRightNav({routeName}: {routeName: string}) { const {hasSession, currentAccount} = useSession() const kawaii = useKawaiiMode() const gutters = useGutters(['base', 0, 'base', 'wide']) + const isSearchScreen = routeName === 'Search' const {isTablet} = useWebMediaQueries() if (isTablet) { @@ -29,6 +33,7 @@ export function DesktopRightNav({routeName}: {routeName: string}) { - {routeName !== 'Search' && ( - - - - )} + {!isSearchScreen && } + {hasSession && ( <> - - - + + + + + )} + + {!isSearchScreen && ( + <> + + + + + Trending + + + + + {Trending.TOPICS.slice(0, 8).map(topic => ( + + {({hovered}) => ( + + )} + + ))} + + )}