diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx index e4b7f9cf..af295e46 100644 --- a/web/components/contract-search.tsx +++ b/web/components/contract-search.tsx @@ -387,9 +387,7 @@ function ContractSearchControls(props: { } return ( - + diff --git a/web/components/nav/group-nav-bar.tsx b/web/components/nav/group-nav-bar.tsx index 041d006b..ffa83e54 100644 --- a/web/components/nav/group-nav-bar.tsx +++ b/web/components/nav/group-nav-bar.tsx @@ -1,4 +1,4 @@ -import { BookOpenIcon, HomeIcon } from '@heroicons/react/outline' +import { ClipboardIcon, HomeIcon } from '@heroicons/react/outline' import { Item } from './sidebar' import clsx from 'clsx' @@ -10,7 +10,7 @@ import router from 'next/router' import { userProfileItem } from './nav-bar' const mobileGroupNavigation = [ - { name: 'About', key: 'about', icon: BookOpenIcon }, + { name: 'About', key: 'about', icon: ClipboardIcon }, { name: 'Markets', key: 'markets', icon: HomeIcon }, { name: 'Leaderboard', key: 'leaderboards', icon: TrophyIcon }, ] diff --git a/web/components/nav/group-sidebar.tsx b/web/components/nav/group-sidebar.tsx index 33784194..3735adc7 100644 --- a/web/components/nav/group-sidebar.tsx +++ b/web/components/nav/group-sidebar.tsx @@ -1,4 +1,4 @@ -import { HomeIcon, BookOpenIcon } from '@heroicons/react/outline' +import { ClipboardIcon, HomeIcon } from '@heroicons/react/outline' import clsx from 'clsx' import { useUser } from 'web/hooks/use-user' import { ManifoldLogo } from './manifold-logo' @@ -11,10 +11,12 @@ import NotificationsIcon from '../notifications-icon' import { SidebarItem } from './sidebar' import { buildArray } from 'common/util/array' import { User } from 'common/user' +import { Row } from '../layout/row' +import { Col } from '../layout/col' const groupNavigation = [ - { name: 'About', key: 'about', icon: BookOpenIcon }, { name: 'Markets', key: 'markets', icon: HomeIcon }, + { name: 'About', key: 'about', icon: ClipboardIcon }, { name: 'Leaderboard', key: 'leaderboards', icon: TrophyIcon }, ] @@ -28,7 +30,7 @@ const generalNavigation = (user?: User | null) => } ) -export default function GroupSidebar(props: { +export function GroupSidebar(props: { groupName: string className?: string onClick: (key: string) => void @@ -45,6 +47,16 @@ export default function GroupSidebar(props: { className={clsx('flex max-h-[100vh] flex-col', className)} > + + + + + +
+ {groupName} +
+ +
{user ? ( @@ -54,24 +66,15 @@ export default function GroupSidebar(props: { )}
-
- {groupName} -
- {/* Desktop navigation */} -
- {/* adds a purple CornerDownRightIcon pointing to the sidebaritems */} - - - {groupNavigation.map((item) => ( - - ))} -
+ {groupNavigation.map((item) => ( + + ))} {generalNavigation(user).map((item) => ( @@ -147,6 +148,7 @@ function GroupSection(props: { additionalFilter={{ groupSlug: group.slug }} noControls maxResults={6} + headerClassName="sticky" persistPrefix={`experimental-home-${group.slug}`} /> diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx index 71330ce9..714c9b16 100644 --- a/web/pages/group/[...slugs]/index.tsx +++ b/web/pages/group/[...slugs]/index.tsx @@ -49,9 +49,9 @@ import { Spacer } from 'web/components/layout/spacer' import { usePost } from 'web/hooks/use-post' import { useAdmin } from 'web/hooks/use-admin' import { track } from '@amplitude/analytics-browser' -import GroupSidebar from 'web/components/nav/group-sidebar' import { GroupNavBar } from 'web/components/nav/group-nav-bar' import { ArrowLeftIcon } from '@heroicons/react/solid' +import { GroupSidebar } from 'web/components/nav/group-sidebar' export const getStaticProps = fromPropz(getStaticPropz) export async function getStaticPropz(props: { params: { slugs: string[] } }) { @@ -207,6 +207,7 @@ export default function GroupPage(props: { -
-
-
- - - - -
-
-

- {group.name} -

-
-
-
+
-
{pageContent}
+
+ {pageContent} +
+
+
+ + + + +
+
+

+ {props.group.name} +

+
+
+ + ) +} + function JoinOrAddQuestionsButtons(props: { group: Group user: User | null | undefined @@ -530,6 +539,7 @@ function AddContractButton(props: { group: Group; user: User }) {
{ user={user} persistPrefix="home-search" useQueryUrlParam={true} + headerClassName="sticky" />