{
@@ -57,7 +50,13 @@ function getNavigation() {
function getMoreNavigation(user?: User | null) {
if (IS_PRIVATE_MANIFOLD) {
- return [{ name: 'Leaderboards', href: '/leaderboards' }]
+ return [
+ {
+ name: 'Sign out',
+ href: '#',
+ onClick: withTracking(firebaseLogout, 'sign out'),
+ },
+ ]
}
if (!user) {
@@ -110,19 +109,9 @@ function getMoreNavigation(user?: User | null) {
const signedOutNavigation = [
{ name: 'Home', href: '/home', icon: HomeIcon },
{ name: 'Explore', href: '/markets', icon: SearchIcon },
- {
- name: 'About',
- href: 'https://docs.manifold.markets/$how-to',
- icon: BookOpenIcon,
- },
]
const signedOutMobileNavigation = [
- {
- name: 'About',
- href: 'https://docs.manifold.markets/$how-to',
- icon: BookOpenIcon,
- },
{ name: 'Charity', href: '/charity', icon: HeartIcon },
{ name: 'Leaderboards', href: '/leaderboards', icon: TrendingUpIcon },
{ name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: ChatIcon },
@@ -132,12 +121,14 @@ const signedInMobileNavigation = [
{ name: 'Leaderboards', href: '/leaderboards', icon: TrendingUpIcon },
...(IS_PRIVATE_MANIFOLD
? []
- : [{ name: 'Get M$', href: '/add-funds', icon: CashIcon }]),
- {
- name: 'About',
- href: 'https://docs.manifold.markets/$how-to',
- icon: BookOpenIcon,
- },
+ : [
+ { name: 'Get M$', href: '/add-funds', icon: CashIcon },
+ {
+ name: 'About',
+ href: 'https://docs.manifold.markets/$how-to',
+ icon: BookOpenIcon,
+ },
+ ]),
]
function getMoreMobileNav() {
@@ -232,7 +223,6 @@ export default function Sidebar(props: { className?: string }) {
const currentPage = router.pathname
const user = useUser()
- const privateUser = usePrivateUser(user?.id)
// usePing(user?.id)
const navigationOptions = !user ? signedOutNavigation : getNavigation()
@@ -240,22 +230,13 @@ export default function Sidebar(props: { className?: string }) {
? signedOutMobileNavigation
: signedInMobileNavigation
- const memberItems = (
- useMemberGroups(
- user?.id,
- { withChatEnabled: true },
- { by: 'mostRecentChatActivityTime' }
- ) ?? []
- ).map((group: Group) => ({
- name: group.name,
- href: `${groupPath(group.slug)}`,
- }))
-
return (
)
}
-
-function GroupsList(props: {
- currentPage: string
- memberItems: Item[]
- privateUser: PrivateUser
-}) {
- const { currentPage, memberItems, privateUser } = props
- const preferredNotifications = useUnseenPreferredNotifications(
- privateUser,
- {
- customHref: '/group/',
- },
- memberItems.length > 0 ? memberItems.length : undefined
- )
-
- const { height } = useWindowSize()
- const [containerRef, setContainerRef] = useState
- {memberItems.map((item) => (
-
- {item.name}
-
- ))}
-
-
- )
-}
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 5e00affe..a8bb962b 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -213,14 +213,20 @@ export async function listAllUsers() {
return docs.map((doc) => doc.data())
}
-export function getTopTraders(period: Period) {
+export async function getTopTraders(period: Period) {
const topTraders = query(
users,
orderBy('profitCached.' + period, 'desc'),
- limit(20)
+ limit(21)
)
- return getValues
Insufficient balance
-
)}
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index b96d6436..bd2e6fba 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -160,7 +160,7 @@ export default function GroupPage(props: {
const privateUser = usePrivateUser(user?.id)
useSaveReferral(user, {
- defaultReferrerUsername: creator.username,
+ defaultReferrerUsername: creator?.username,
groupId: group?.id,
})
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index ab915ae3..541eccb1 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -1,6 +1,4 @@
import React, { useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
-import { PlusSmIcon } from '@heroicons/react/solid'
import { Page } from 'web/components/page'
import { Col } from 'web/components/layout/col'
@@ -10,7 +8,6 @@ import { Contract } from 'common/contract'
import { ContractPageContent } from './[username]/[contractSlug]'
import { getContractFromSlug } from 'web/lib/firebase/contracts'
import { useTracking } from 'web/hooks/use-tracking'
-import { track } from 'web/lib/service/analytics'
import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
import { useSaveReferral } from 'web/hooks/use-save-referral'
@@ -19,7 +16,6 @@ export const getServerSideProps = redirectIfLoggedOut('/')
const Home = () => {
const [contract, setContract] = useContractPage()
- const router = useRouter()
useTracking('view home')
useSaveReferral()
@@ -41,16 +37,6 @@ const Home = () => {
}}
/>
-
{contract && (
diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx
index 45c484c4..d0453ea9 100644
--- a/web/pages/leaderboards.tsx
+++ b/web/pages/leaderboards.tsx
@@ -70,10 +70,9 @@ export default function Leaderboards(_props: {
fetchProps().then((props) => setProps(props))
}, [])
- const { topFollowed } = props
-
const LeaderboardWithPeriod = (period: Period) => {
- const { topTraders, topCreators } = props[period]
+ const { topTraders } = props[period]
+
return (
<>
@@ -88,35 +87,7 @@ export default function Leaderboards(_props: {
},
]}
/>
-
-