From fc631b3212a5a93c26e20aa1db96ea8edbfbbd9e Mon Sep 17 00:00:00 2001 From: Marshall Polaris Date: Mon, 9 May 2022 00:05:37 -0700 Subject: [PATCH] Convert lib imports in web to be absolute --- web/components/add-funds-button.tsx | 2 +- web/components/add-liquidity-panel.tsx | 2 +- web/components/answers/answer-bet-panel.tsx | 4 ++-- web/components/answers/answer-item.tsx | 2 +- web/components/answers/answer-resolve-panel.tsx | 2 +- web/components/answers/answers-panel.tsx | 2 +- web/components/answers/create-answer-panel.tsx | 4 ++-- web/components/bet-panel.tsx | 4 ++-- web/components/bets-list.tsx | 10 +++++----- web/components/comments-list.tsx | 2 +- web/components/contract/contract-card.tsx | 2 +- web/components/contract/contract-description.tsx | 2 +- web/components/contract/contract-details.tsx | 4 ++-- web/components/contract/contract-info-dialog.tsx | 5 +---- web/components/contract/contract-overview.tsx | 2 +- web/components/contract/contract-tabs.tsx | 2 +- web/components/contract/contracts-list.tsx | 4 ++-- web/components/copy-link-button.tsx | 4 ++-- web/components/feed-create.tsx | 2 +- web/components/feed/activity-feed.tsx | 4 ++-- web/components/feed/activity-items.ts | 2 +- web/components/feed/contract-activity.tsx | 4 ++-- web/components/feed/feed-items.tsx | 12 ++++++------ web/components/feed/find-active-contracts.ts | 4 ++-- web/components/folds/create-fold-button.tsx | 4 ++-- web/components/folds/edit-fold-button.tsx | 2 +- web/components/folds/fast-fold-following.tsx | 2 +- web/components/folds/follow-fold-button.tsx | 2 +- web/components/nav/profile-menu.tsx | 2 +- web/components/nav/sidebar.tsx | 14 +++++++++++--- web/components/relative-timestamp.tsx | 2 +- web/components/resolution-panel.tsx | 4 ++-- web/components/share-embed-button.tsx | 4 ++-- web/components/share-market.tsx | 2 +- web/components/tags-input.tsx | 2 +- web/components/user-page.tsx | 6 +++--- web/hooks/use-algo-feed.ts | 6 +++--- web/hooks/use-answers.ts | 2 +- web/hooks/use-bets.ts | 2 +- web/hooks/use-charity-txns.ts | 2 +- web/hooks/use-comments.ts | 2 +- web/hooks/use-contract.ts | 2 +- web/hooks/use-contracts.ts | 4 ++-- web/hooks/use-fold.ts | 2 +- web/hooks/use-has-created-contract-today.ts | 2 +- web/hooks/use-seen-contracts.ts | 2 +- web/hooks/use-user-bets.ts | 2 +- web/hooks/use-user.ts | 2 +- web/hooks/use-users.ts | 2 +- web/pages/[username]/[contractSlug].tsx | 8 ++++---- web/pages/[username]/index.tsx | 2 +- web/pages/account.tsx | 2 +- web/pages/add-funds.tsx | 2 +- web/pages/admin.tsx | 2 +- web/pages/analytics.tsx | 8 ++++---- web/pages/charity/[charitySlug].tsx | 2 +- web/pages/charity/index.tsx | 2 +- web/pages/create.tsx | 4 ++-- web/pages/embed/[username]/[contractSlug].tsx | 7 ++----- web/pages/fold/[...slugs]/index.tsx | 8 ++++---- web/pages/folds.tsx | 4 ++-- web/pages/index.tsx | 2 +- web/pages/landing-page.tsx | 4 ++-- web/pages/leaderboards.tsx | 2 +- web/pages/make-predictions.tsx | 4 ++-- web/pages/markets.tsx | 2 +- web/pages/profile.tsx | 6 +++--- web/pages/simulator.tsx | 2 +- web/pages/tag/[tag].tsx | 2 +- 69 files changed, 121 insertions(+), 119 deletions(-) diff --git a/web/components/add-funds-button.tsx b/web/components/add-funds-button.tsx index 7ca154ea..04eb7485 100644 --- a/web/components/add-funds-button.tsx +++ b/web/components/add-funds-button.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import { useEffect, useState } from 'react' import { useUser } from '../hooks/use-user' -import { checkoutURL } from '../lib/service/stripe' +import { checkoutURL } from 'web/lib/service/stripe' import { FundsSelector } from './yes-no-selector' export function AddFundsButton(props: { className?: string }) { diff --git a/web/components/add-liquidity-panel.tsx b/web/components/add-liquidity-panel.tsx index 352f8581..2f747b45 100644 --- a/web/components/add-liquidity-panel.tsx +++ b/web/components/add-liquidity-panel.tsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { Contract } from 'common/contract' import { formatMoney } from 'common/util/format' import { useUser } from '../hooks/use-user' -import { addLiquidity } from '../lib/firebase/api-call' +import { addLiquidity } from 'web/lib/firebase/api-call' import { AmountInput } from './amount-input' import { Row } from './layout/row' diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx index bb059bfb..99899d0c 100644 --- a/web/components/answers/answer-bet-panel.tsx +++ b/web/components/answers/answer-bet-panel.tsx @@ -7,7 +7,7 @@ import { Answer } from 'common/answer' import { DPM, FreeResponse, FullContract } from 'common/contract' import { BuyAmountInput } from '../amount-input' import { Col } from '../layout/col' -import { placeBet } from '../../lib/firebase/api-call' +import { placeBet } from 'web/lib/firebase/api-call' import { Row } from '../layout/row' import { Spacer } from '../layout/spacer' import { @@ -23,7 +23,7 @@ import { calculateDpmPayoutAfterCorrectBet, getDpmOutcomeProbabilityAfterBet, } from 'common/calculate-dpm' -import { firebaseLogin } from '../../lib/firebase/users' +import { firebaseLogin } from 'web/lib/firebase/users' import { Bet } from 'common/bet' export function AnswerBetPanel(props: { diff --git a/web/components/answers/answer-item.tsx b/web/components/answers/answer-item.tsx index b6c4565b..55351083 100644 --- a/web/components/answers/answer-item.tsx +++ b/web/components/answers/answer-item.tsx @@ -9,7 +9,7 @@ import { Avatar } from '../avatar' import { SiteLink } from '../site-link' import { formatPercent } from 'common/util/format' import { getDpmOutcomeProbability } from 'common/calculate-dpm' -import { tradingAllowed } from '../../lib/firebase/contracts' +import { tradingAllowed } from 'web/lib/firebase/contracts' import { Linkify } from '../linkify' export function AnswerItem(props: { diff --git a/web/components/answers/answer-resolve-panel.tsx b/web/components/answers/answer-resolve-panel.tsx index 7b07156b..70eb1299 100644 --- a/web/components/answers/answer-resolve-panel.tsx +++ b/web/components/answers/answer-resolve-panel.tsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { DPM, FreeResponse, FullContract } from 'common/contract' import { Col } from '../layout/col' -import { resolveMarket } from '../../lib/firebase/api-call' +import { resolveMarket } from 'web/lib/firebase/api-call' import { Row } from '../layout/row' import { ChooseCancelSelector } from '../yes-no-selector' import { ResolveConfirmationButton } from '../confirmation-button' diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx index f490f7bc..2aa77a61 100644 --- a/web/components/answers/answers-panel.tsx +++ b/web/components/answers/answers-panel.tsx @@ -6,7 +6,7 @@ import { Col } from '../layout/col' import { useUser } from '../../hooks/use-user' import { getDpmOutcomeProbability } from 'common/calculate-dpm' import { useAnswers } from '../../hooks/use-answers' -import { tradingAllowed } from '../../lib/firebase/contracts' +import { tradingAllowed } from 'web/lib/firebase/contracts' import { AnswerItem } from './answer-item' import { CreateAnswerPanel } from './create-answer-panel' import { AnswerResolvePanel } from './answer-resolve-panel' diff --git a/web/components/answers/create-answer-panel.tsx b/web/components/answers/create-answer-panel.tsx index 58fed86f..3a21fdde 100644 --- a/web/components/answers/create-answer-panel.tsx +++ b/web/components/answers/create-answer-panel.tsx @@ -6,7 +6,7 @@ import Textarea from 'react-expanding-textarea' import { DPM, FreeResponse, FullContract } from 'common/contract' import { BuyAmountInput } from '../amount-input' import { Col } from '../layout/col' -import { createAnswer } from '../../lib/firebase/api-call' +import { createAnswer } from 'web/lib/firebase/api-call' import { Row } from '../layout/row' import { formatMoney, @@ -20,7 +20,7 @@ import { calculateDpmPayoutAfterCorrectBet, getDpmOutcomeProbabilityAfterBet, } from 'common/calculate-dpm' -import { firebaseLogin } from '../../lib/firebase/users' +import { firebaseLogin } from 'web/lib/firebase/users' import { Bet } from 'common/bet' import { MAX_ANSWER_LENGTH } from 'common/answer' diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx index 75f056c0..9bad1af2 100644 --- a/web/components/bet-panel.tsx +++ b/web/components/bet-panel.tsx @@ -13,9 +13,9 @@ import { formatWithCommas, } from 'common/util/format' import { Title } from './title' -import { firebaseLogin, User } from '../lib/firebase/users' +import { firebaseLogin, User } from 'web/lib/firebase/users' import { Bet } from 'common/bet' -import { placeBet, sellShares } from '../lib/firebase/api-call' +import { placeBet, sellShares } from 'web/lib/firebase/api-call' import { BuyAmountInput, SellAmountInput } from './amount-input' import { InfoTooltip } from './info-tooltip' import { BinaryOutcomeLabel } from './outcome-label' diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx index e4f6fc18..20fe2740 100644 --- a/web/components/bets-list.tsx +++ b/web/components/bets-list.tsx @@ -5,8 +5,8 @@ import { useEffect, useState } from 'react' import clsx from 'clsx' import { useUserBets } from '../hooks/use-user-bets' -import { Bet } from '../lib/firebase/bets' -import { User } from '../lib/firebase/users' +import { Bet } from 'web/lib/firebase/bets' +import { User } from 'web/lib/firebase/users' import { formatMoney, formatPercent, @@ -19,10 +19,10 @@ import { getContractFromId, contractPath, getBinaryProbPercent, -} from '../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' import { Row } from './layout/row' import { UserLink } from './user-page' -import { sellBet } from '../lib/firebase/api-call' +import { sellBet } from 'web/lib/firebase/api-call' import { ConfirmationButton } from './confirmation-button' import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label' import { filterDefined } from 'common/util/array' @@ -38,7 +38,7 @@ import { getContractBetNullMetrics, } from 'common/calculate' import { useTimeSinceFirstRender } from '../hooks/use-time-since-first-render' -import { trackLatency } from '../lib/firebase/tracking' +import { trackLatency } from 'web/lib/firebase/tracking' type BetSort = 'newest' | 'profit' | 'closeTime' | 'value' type BetFilter = 'open' | 'closed' | 'resolved' | 'all' diff --git a/web/components/comments-list.tsx b/web/components/comments-list.tsx index 7a96b099..bceb2d59 100644 --- a/web/components/comments-list.tsx +++ b/web/components/comments-list.tsx @@ -1,6 +1,6 @@ import { Comment } from 'common/comment' import { Contract } from 'common/contract' -import { contractPath } from '../lib/firebase/contracts' +import { contractPath } from 'web/lib/firebase/contracts' import { SiteLink } from './site-link' import { Row } from './layout/row' import { Avatar } from './avatar' diff --git a/web/components/contract/contract-card.tsx b/web/components/contract/contract-card.tsx index e7fa4d7e..d1c7dd31 100644 --- a/web/components/contract/contract-card.tsx +++ b/web/components/contract/contract-card.tsx @@ -7,7 +7,7 @@ import { Contract, contractPath, getBinaryProbPercent, -} from '../../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' import { Col } from '../layout/col' import { Spacer } from '../layout/spacer' import { diff --git a/web/components/contract/contract-description.tsx b/web/components/contract/contract-description.tsx index c973ec25..f031ab59 100644 --- a/web/components/contract/contract-description.tsx +++ b/web/components/contract/contract-description.tsx @@ -6,7 +6,7 @@ import Textarea from 'react-expanding-textarea' import { Contract } from 'common/contract' import { parseTags } from 'common/util/parse' import { useAdmin } from '../../hooks/use-admin' -import { updateContract } from '../../lib/firebase/contracts' +import { updateContract } from 'web/lib/firebase/contracts' import { Row } from '../layout/row' import { Linkify } from '../linkify' diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx index 020237bc..21849cc4 100644 --- a/web/components/contract/contract-details.tsx +++ b/web/components/contract/contract-details.tsx @@ -9,11 +9,11 @@ import { Contract, contractMetrics, updateContract, -} from '../../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' import { Col } from '../layout/col' import dayjs from 'dayjs' import { DateTimeTooltip } from '../datetime-tooltip' -import { fromNow } from '../../lib/util/time' +import { fromNow } from 'web/lib/util/time' import { Avatar } from '../avatar' import { useState } from 'react' import { ContractInfoDialog } from './contract-info-dialog' diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx index 3425c60b..dca03507 100644 --- a/web/components/contract/contract-info-dialog.tsx +++ b/web/components/contract/contract-info-dialog.tsx @@ -7,10 +7,7 @@ import { Bet } from 'common/bet' import { Contract } from 'common/contract' import { formatMoney } from 'common/util/format' -import { - contractPath, - getBinaryProbPercent, -} from '../../lib/firebase/contracts' +import { contractPath, getBinaryProbPercent } from 'web/lib/firebase/contracts' import { AddLiquidityPanel } from '../add-liquidity-panel' import { CopyLinkButton } from '../copy-link-button' import { Col } from '../layout/col' diff --git a/web/components/contract/contract-overview.tsx b/web/components/contract/contract-overview.tsx index 17248acd..ee9b1dfe 100644 --- a/web/components/contract/contract-overview.tsx +++ b/web/components/contract/contract-overview.tsx @@ -1,4 +1,4 @@ -import { Contract, tradingAllowed } from '../../lib/firebase/contracts' +import { Contract, tradingAllowed } from 'web/lib/firebase/contracts' import { Col } from '../layout/col' import { Spacer } from '../layout/spacer' import { ContractProbGraph } from './contract-prob-graph' diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx index 6df88329..bbb4834a 100644 --- a/web/components/contract/contract-tabs.tsx +++ b/web/components/contract/contract-tabs.tsx @@ -1,6 +1,6 @@ import { Bet } from 'common/bet' import { Contract } from 'common/contract' -import { Comment } from '../../lib/firebase/comments' +import { Comment } from 'web/lib/firebase/comments' import { User } from 'common/user' import { useBets } from '../../hooks/use-bets' import { ContractActivity } from '../feed/contract-activity' diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx index ef5b605d..9c31d703 100644 --- a/web/components/contract/contracts-list.tsx +++ b/web/components/contract/contracts-list.tsx @@ -8,8 +8,8 @@ import { Contract, listContracts, getBinaryProb, -} from '../../lib/firebase/contracts' -import { User } from '../../lib/firebase/users' +} from 'web/lib/firebase/contracts' +import { User } from 'web/lib/firebase/users' import { Col } from '../layout/col' import { SiteLink } from '../site-link' import { ContractCard } from './contract-card' diff --git a/web/components/copy-link-button.tsx b/web/components/copy-link-button.tsx index f273b87c..6ad22893 100644 --- a/web/components/copy-link-button.tsx +++ b/web/components/copy-link-button.tsx @@ -3,8 +3,8 @@ import { LinkIcon } from '@heroicons/react/outline' import { Menu, Transition } from '@headlessui/react' import clsx from 'clsx' import { Contract } from 'common/contract' -import { copyToClipboard } from '../lib/util/copy' -import { contractPath } from '../lib/firebase/contracts' +import { copyToClipboard } from 'web/lib/util/copy' +import { contractPath } from 'web/lib/firebase/contracts' import { ENV_CONFIG } from 'common/envs/constants' function copyContractUrl(contract: Contract) { diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx index e63d6bcc..1f308355 100644 --- a/web/components/feed-create.tsx +++ b/web/components/feed-create.tsx @@ -3,7 +3,7 @@ import { Avatar } from './avatar' import { useEffect, useRef, useState } from 'react' import { Spacer } from './layout/spacer' import { NewContract } from '../pages/create' -import { firebaseLogin, User } from '../lib/firebase/users' +import { firebaseLogin, User } from 'web/lib/firebase/users' import { ContractsGrid } from './contract/contracts-list' import { Contract, MAX_QUESTION_LENGTH } from 'common/contract' import { Col } from './layout/col' diff --git a/web/components/feed/activity-feed.tsx b/web/components/feed/activity-feed.tsx index 9e02d5fb..4486741d 100644 --- a/web/components/feed/activity-feed.tsx +++ b/web/components/feed/activity-feed.tsx @@ -1,7 +1,7 @@ import _ from 'lodash' -import { Contract } from '../../lib/firebase/contracts' -import { Comment } from '../../lib/firebase/comments' +import { Contract } from 'web/lib/firebase/contracts' +import { Comment } from 'web/lib/firebase/comments' import { Col } from '../layout/col' import { Bet } from 'common/bet' import { useUser } from '../../hooks/use-user' diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts index b4abc7ca..21baa322 100644 --- a/web/components/feed/activity-items.ts +++ b/web/components/feed/activity-items.ts @@ -6,7 +6,7 @@ import { getOutcomeProbability } from 'common/calculate' import { Comment } from 'common/comment' import { Contract, DPM, FreeResponse, FullContract } from 'common/contract' import { User } from 'common/user' -import { mapCommentsByBetId } from '../../lib/firebase/comments' +import { mapCommentsByBetId } from 'web/lib/firebase/comments' export type ActivityItem = | DescriptionItem diff --git a/web/components/feed/contract-activity.tsx b/web/components/feed/contract-activity.tsx index 68bf51c6..5d34f426 100644 --- a/web/components/feed/contract-activity.tsx +++ b/web/components/feed/contract-activity.tsx @@ -1,5 +1,5 @@ -import { Contract } from '../../lib/firebase/contracts' -import { Comment } from '../../lib/firebase/comments' +import { Contract } from 'web/lib/firebase/contracts' +import { Comment } from 'web/lib/firebase/comments' import { Bet } from 'common/bet' import { useBets } from '../../hooks/use-bets' import { useComments } from '../../hooks/use-comments' diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx index e64ed3f4..9db712d9 100644 --- a/web/components/feed/feed-items.tsx +++ b/web/components/feed/feed-items.tsx @@ -19,11 +19,11 @@ import { Contract, contractPath, tradingAllowed, -} from '../../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' import { useUser } from '../../hooks/use-user' import { Linkify } from '../linkify' import { Row } from '../layout/row' -import { createComment, MAX_COMMENT_LENGTH } from '../../lib/firebase/comments' +import { createComment, MAX_COMMENT_LENGTH } from 'web/lib/firebase/comments' import { formatMoney, formatPercent } from 'common/util/format' import { Comment } from 'common/comment' import { BinaryResolutionOrChance } from '../contract/contract-card' @@ -31,9 +31,9 @@ import { SiteLink } from '../site-link' import { Col } from '../layout/col' import { UserLink } from '../user-page' import { DateTimeTooltip } from '../datetime-tooltip' -import { Bet } from '../../lib/firebase/bets' +import { Bet } from 'web/lib/firebase/bets' import { JoinSpans } from '../join-spans' -import { fromNow } from '../../lib/util/time' +import { fromNow } from 'web/lib/util/time' import BetRow from '../bet-row' import { Avatar } from '../avatar' import { Answer } from 'common/answer' @@ -45,8 +45,8 @@ import { AnswerBetPanel } from '../answers/answer-bet-panel' import { useSaveSeenContract } from '../../hooks/use-seen-contracts' import { User } from 'common/user' import { Modal } from '../layout/modal' -import { trackClick } from '../../lib/firebase/tracking' -import { firebaseLogin } from '../../lib/firebase/users' +import { trackClick } from 'web/lib/firebase/tracking' +import { firebaseLogin } from 'web/lib/firebase/users' import { DAY_MS } from 'common/util/time' import NewContractBadge from '../new-contract-badge' import { RelativeTimestamp } from '../relative-timestamp' diff --git a/web/components/feed/find-active-contracts.ts b/web/components/feed/find-active-contracts.ts index 0892b08b..51965792 100644 --- a/web/components/feed/find-active-contracts.ts +++ b/web/components/feed/find-active-contracts.ts @@ -1,6 +1,6 @@ import _ from 'lodash' -import { Contract } from '../../lib/firebase/contracts' -import { Comment } from '../../lib/firebase/comments' +import { Contract } from 'web/lib/firebase/contracts' +import { Comment } from 'web/lib/firebase/comments' import { Bet } from 'common/bet' const MAX_ACTIVE_CONTRACTS = 75 diff --git a/web/components/folds/create-fold-button.tsx b/web/components/folds/create-fold-button.tsx index 3f158790..d00964c9 100644 --- a/web/components/folds/create-fold-button.tsx +++ b/web/components/folds/create-fold-button.tsx @@ -3,8 +3,8 @@ import { useRouter } from 'next/router' import { useState } from 'react' import { PlusCircleIcon } from '@heroicons/react/solid' import { parseWordsAsTags } from 'common/util/parse' -import { createFold } from '../../lib/firebase/api-call' -import { foldPath } from '../../lib/firebase/folds' +import { createFold } from 'web/lib/firebase/api-call' +import { foldPath } from 'web/lib/firebase/folds' import { toCamelCase } from 'common/util/format' import { ConfirmationButton } from '../confirmation-button' import { Col } from '../layout/col' diff --git a/web/components/folds/edit-fold-button.tsx b/web/components/folds/edit-fold-button.tsx index a139e1df..d6c296b2 100644 --- a/web/components/folds/edit-fold-button.tsx +++ b/web/components/folds/edit-fold-button.tsx @@ -5,7 +5,7 @@ import { PencilIcon } from '@heroicons/react/outline' import { Fold } from 'common/fold' import { parseWordsAsTags } from 'common/util/parse' -import { deleteFold, updateFold } from '../../lib/firebase/folds' +import { deleteFold, updateFold } from 'web/lib/firebase/folds' import { toCamelCase } from 'common/util/format' import { Spacer } from '../layout/spacer' import { TagsList } from '../tags-list' diff --git a/web/components/folds/fast-fold-following.tsx b/web/components/folds/fast-fold-following.tsx index 6c5793ba..b714e22b 100644 --- a/web/components/folds/fast-fold-following.tsx +++ b/web/components/folds/fast-fold-following.tsx @@ -6,7 +6,7 @@ import { User } from 'common/user' import { followFoldFromSlug, unfollowFoldFromSlug, -} from '../../lib/firebase/folds' +} from 'web/lib/firebase/folds' import { Row } from '../layout/row' import { Spacer } from '../layout/spacer' diff --git a/web/components/folds/follow-fold-button.tsx b/web/components/folds/follow-fold-button.tsx index 92133efe..545b1b9a 100644 --- a/web/components/folds/follow-fold-button.tsx +++ b/web/components/folds/follow-fold-button.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import { Fold } from 'common/fold' import { useFollowedFoldIds } from '../../hooks/use-fold' import { useUser } from '../../hooks/use-user' -import { followFold, unfollowFold } from '../../lib/firebase/folds' +import { followFold, unfollowFold } from 'web/lib/firebase/folds' export function FollowFoldButton(props: { fold: Fold; className?: string }) { const { fold, className } = props diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx index afab496b..b25603d4 100644 --- a/web/components/nav/profile-menu.tsx +++ b/web/components/nav/profile-menu.tsx @@ -1,4 +1,4 @@ -import { firebaseLogout, User } from '../../lib/firebase/users' +import { firebaseLogout, User } from 'web/lib/firebase/users' import { formatMoney } from 'common/util/format' import { Avatar } from '../avatar' import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants' diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx index 4fef69f4..fb7a65ce 100644 --- a/web/components/nav/sidebar.tsx +++ b/web/components/nav/sidebar.tsx @@ -16,7 +16,7 @@ import Link from 'next/link' import { useRouter } from 'next/router' import { useFollowedFolds } from '../../hooks/use-fold' import { useUser } from '../../hooks/use-user' -import { firebaseLogin, firebaseLogout } from '../../lib/firebase/users' +import { firebaseLogin, firebaseLogout } from 'web/lib/firebase/users' import { ManifoldLogo } from './manifold-logo' import { MenuButton } from './menu' import { getNavigationOptions, ProfileSummary } from './profile-menu' @@ -46,8 +46,16 @@ const signedOutNavigation = [ const signedOutMobileNavigation = [ { name: 'Charity', href: '/charity', icon: HeartIcon }, { name: 'Leaderboards', href: '/leaderboards', icon: CakeIcon }, - { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: IconFromUrl("/discord-logo.svg") }, - { name: 'Twitter', href: 'https://twitter.com/ManifoldMarkets', icon: IconFromUrl("/twitter-logo.svg") }, + { + name: 'Discord', + href: 'https://discord.gg/eHQBNBqXuh', + icon: IconFromUrl('/discord-logo.svg'), + }, + { + name: 'Twitter', + href: 'https://twitter.com/ManifoldMarkets', + icon: IconFromUrl('/twitter-logo.svg'), + }, { name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon }, ] diff --git a/web/components/relative-timestamp.tsx b/web/components/relative-timestamp.tsx index cd5ca713..160a665d 100644 --- a/web/components/relative-timestamp.tsx +++ b/web/components/relative-timestamp.tsx @@ -1,5 +1,5 @@ import { DateTimeTooltip } from './datetime-tooltip' -import { fromNow } from '../lib/util/time' +import { fromNow } from 'web/lib/util/time' import React from 'react' export function RelativeTimestamp(props: { time: number }) { diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx index acef7aef..316a5374 100644 --- a/web/components/resolution-panel.tsx +++ b/web/components/resolution-panel.tsx @@ -3,11 +3,11 @@ import React, { useEffect, useState } from 'react' import { Col } from './layout/col' import { Title } from './title' -import { User } from '../lib/firebase/users' +import { User } from 'web/lib/firebase/users' import { YesNoCancelSelector } from './yes-no-selector' import { Spacer } from './layout/spacer' import { ResolveConfirmationButton } from './confirmation-button' -import { resolveMarket } from '../lib/firebase/api-call' +import { resolveMarket } from 'web/lib/firebase/api-call' import { ProbabilitySelector } from './probability-selector' import { DPM_CREATOR_FEE } from 'common/fees' import { getProbability } from 'common/calculate' diff --git a/web/components/share-embed-button.tsx b/web/components/share-embed-button.tsx index 3ff40f81..1023b169 100644 --- a/web/components/share-embed-button.tsx +++ b/web/components/share-embed-button.tsx @@ -2,9 +2,9 @@ import { Fragment } from 'react' import { CodeIcon } from '@heroicons/react/outline' import { Menu, Transition } from '@headlessui/react' import { Contract } from 'common/contract' -import { contractPath } from '../lib/firebase/contracts' +import { contractPath } from 'web/lib/firebase/contracts' import { DOMAIN } from 'common/envs/constants' -import { copyToClipboard } from '../lib/util/copy' +import { copyToClipboard } from 'web/lib/util/copy' function copyEmbedCode(contract: Contract) { const title = contract.question diff --git a/web/components/share-market.tsx b/web/components/share-market.tsx index 0fa425ad..28c0e5ad 100644 --- a/web/components/share-market.tsx +++ b/web/components/share-market.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { Contract, contractUrl } from '../lib/firebase/contracts' +import { Contract, contractUrl } from 'web/lib/firebase/contracts' import { CopyLinkButton } from './copy-link-button' import { Col } from './layout/col' import { Row } from './layout/row' diff --git a/web/components/tags-input.tsx b/web/components/tags-input.tsx index 2be5d928..b52d78e9 100644 --- a/web/components/tags-input.tsx +++ b/web/components/tags-input.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx' import { useState } from 'react' import { parseWordsAsTags } from 'common/util/parse' -import { Contract, updateContract } from '../lib/firebase/contracts' +import { Contract, updateContract } from 'web/lib/firebase/contracts' import { Col } from './layout/col' import { Row } from './layout/row' import { TagsList } from './tags-list' diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx index 3271d9c4..a36f754c 100644 --- a/web/components/user-page.tsx +++ b/web/components/user-page.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { User } from '../lib/firebase/users' +import { User } from 'web/lib/firebase/users' import { CreatorContractsList } from './contract/contracts-list' import { SEO } from './SEO' import { Page } from './page' @@ -15,9 +15,9 @@ import { PencilIcon } from '@heroicons/react/outline' import { Tabs } from './layout/tabs' import { UserCommentsList } from './comments-list' import { useEffect, useState } from 'react' -import { Comment, getUsersComments } from '../lib/firebase/comments' +import { Comment, getUsersComments } from 'web/lib/firebase/comments' import { Contract } from 'common/contract' -import { getContractFromId, listContracts } from '../lib/firebase/contracts' +import { getContractFromId, listContracts } from 'web/lib/firebase/contracts' import { LoadingIndicator } from './loading-indicator' import { useRouter } from 'next/router' import _ from 'lodash' diff --git a/web/hooks/use-algo-feed.ts b/web/hooks/use-algo-feed.ts index 81356da0..e365c88d 100644 --- a/web/hooks/use-algo-feed.ts +++ b/web/hooks/use-algo-feed.ts @@ -4,14 +4,14 @@ import { Bet } from 'common/bet' import { Comment } from 'common/comment' import { Contract } from 'common/contract' import { useTimeSinceFirstRender } from './use-time-since-first-render' -import { trackLatency } from '../lib/firebase/tracking' +import { trackLatency } from 'web/lib/firebase/tracking' import { User } from 'common/user' -import { getUserFeed } from '../lib/firebase/users' +import { getUserFeed } from 'web/lib/firebase/users' import { useUpdatedContracts } from './use-contracts' import { getRecentBetsAndComments, getTopWeeklyContracts, -} from '../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' type feed = { contract: Contract diff --git a/web/hooks/use-answers.ts b/web/hooks/use-answers.ts index 5aace2d0..bcfa6725 100644 --- a/web/hooks/use-answers.ts +++ b/web/hooks/use-answers.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import { Answer } from 'common/answer' -import { listenForAnswers } from '../lib/firebase/answers' +import { listenForAnswers } from 'web/lib/firebase/answers' export const useAnswers = (contractId: string) => { const [answers, setAnswers] = useState() diff --git a/web/hooks/use-bets.ts b/web/hooks/use-bets.ts index 14d07b5c..5cab16a7 100644 --- a/web/hooks/use-bets.ts +++ b/web/hooks/use-bets.ts @@ -5,7 +5,7 @@ import { listenForBets, listenForRecentBets, withoutAnteBets, -} from '../lib/firebase/bets' +} from 'web/lib/firebase/bets' export const useBets = (contractId: string) => { const [bets, setBets] = useState() diff --git a/web/hooks/use-charity-txns.ts b/web/hooks/use-charity-txns.ts index e4948d72..13050fb1 100644 --- a/web/hooks/use-charity-txns.ts +++ b/web/hooks/use-charity-txns.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import { Txn } from 'common/txn' -import { listenForCharityTxns } from '../lib/firebase/txns' +import { listenForCharityTxns } from 'web/lib/firebase/txns' export const useCharityTxns = (charityId: string) => { const [txns, setTxns] = useState([]) diff --git a/web/hooks/use-comments.ts b/web/hooks/use-comments.ts index 37f001dd..e56e8179 100644 --- a/web/hooks/use-comments.ts +++ b/web/hooks/use-comments.ts @@ -3,7 +3,7 @@ import { Comment, listenForComments, listenForRecentComments, -} from '../lib/firebase/comments' +} from 'web/lib/firebase/comments' export const useComments = (contractId: string) => { const [comments, setComments] = useState() diff --git a/web/hooks/use-contract.ts b/web/hooks/use-contract.ts index ebff7dce..ad2f12a2 100644 --- a/web/hooks/use-contract.ts +++ b/web/hooks/use-contract.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { Contract, listenForContract } from '../lib/firebase/contracts' +import { Contract, listenForContract } from 'web/lib/firebase/contracts' import { useStateCheckEquality } from './use-state-check-equality' export const useContract = (contractId: string) => { diff --git a/web/hooks/use-contracts.ts b/web/hooks/use-contracts.ts index 0402613f..ef0fd65f 100644 --- a/web/hooks/use-contracts.ts +++ b/web/hooks/use-contracts.ts @@ -8,8 +8,8 @@ import { listenForHotContracts, listenForInactiveContracts, listenForNewContracts, -} from '../lib/firebase/contracts' -import { listenForTaggedContracts } from '../lib/firebase/folds' +} from 'web/lib/firebase/contracts' +import { listenForTaggedContracts } from 'web/lib/firebase/folds' export const useContracts = () => { const [contracts, setContracts] = useState() diff --git a/web/hooks/use-fold.ts b/web/hooks/use-fold.ts index e710bd64..4333c218 100644 --- a/web/hooks/use-fold.ts +++ b/web/hooks/use-fold.ts @@ -9,7 +9,7 @@ import { listenForFoldsWithTags, listenForFollow, listenForFollowedFolds, -} from '../lib/firebase/folds' +} from 'web/lib/firebase/folds' export const useFold = (foldId: string | undefined) => { const [fold, setFold] = useState() diff --git a/web/hooks/use-has-created-contract-today.ts b/web/hooks/use-has-created-contract-today.ts index a22ad0fb..0b3f4bdd 100644 --- a/web/hooks/use-has-created-contract-today.ts +++ b/web/hooks/use-has-created-contract-today.ts @@ -1,4 +1,4 @@ -import { listContracts } from '../lib/firebase/contracts' +import { listContracts } from 'web/lib/firebase/contracts' import { useEffect, useState } from 'react' import { User } from 'common/user' diff --git a/web/hooks/use-seen-contracts.ts b/web/hooks/use-seen-contracts.ts index 759b4f67..6157f8c7 100644 --- a/web/hooks/use-seen-contracts.ts +++ b/web/hooks/use-seen-contracts.ts @@ -1,7 +1,7 @@ import _ from 'lodash' import { useEffect, RefObject, useState } from 'react' import { Contract } from 'common/contract' -import { trackView } from '../lib/firebase/tracking' +import { trackView } from 'web/lib/firebase/tracking' import { useIsVisible } from './use-is-visible' export const useSeenContracts = () => { diff --git a/web/hooks/use-user-bets.ts b/web/hooks/use-user-bets.ts index c11af097..ead55729 100644 --- a/web/hooks/use-user-bets.ts +++ b/web/hooks/use-user-bets.ts @@ -4,7 +4,7 @@ import { Bet, listenForUserBets, listenForUserContractBets, -} from '../lib/firebase/bets' +} from 'web/lib/firebase/bets' export const useUserBets = (userId: string | undefined) => { const [bets, setBets] = useState(undefined) diff --git a/web/hooks/use-user.ts b/web/hooks/use-user.ts index 9a61c8d5..0b96edc1 100644 --- a/web/hooks/use-user.ts +++ b/web/hooks/use-user.ts @@ -6,7 +6,7 @@ import { listenForPrivateUser, listenForUser, User, -} from '../lib/firebase/users' +} from 'web/lib/firebase/users' import { useStateCheckEquality } from './use-state-check-equality' export const useUser = () => { diff --git a/web/hooks/use-users.ts b/web/hooks/use-users.ts index 4ac55431..1b5656a0 100644 --- a/web/hooks/use-users.ts +++ b/web/hooks/use-users.ts @@ -4,7 +4,7 @@ import { getUser, listenForAllUsers, listenForPrivateUsers, -} from '../lib/firebase/users' +} from 'web/lib/firebase/users' export const useUsers = () => { const [users, setUsers] = useState([]) diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx index 13b8de05..64bbfc70 100644 --- a/web/pages/[username]/[contractSlug].tsx +++ b/web/pages/[username]/[contractSlug].tsx @@ -9,17 +9,17 @@ import { useUser } from '../../hooks/use-user' import { ResolutionPanel } from '../../components/resolution-panel' import { Title } from '../../components/title' import { Spacer } from '../../components/layout/spacer' -import { listUsers, User } from '../../lib/firebase/users' +import { listUsers, User } from 'web/lib/firebase/users' import { Contract, getContractFromSlug, tradingAllowed, getBinaryProbPercent, -} from '../../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' import { SEO } from '../../components/SEO' import { Page } from '../../components/page' -import { Bet, listAllBets } from '../../lib/firebase/bets' -import { Comment, listAllComments } from '../../lib/firebase/comments' +import { Bet, listAllBets } from 'web/lib/firebase/bets' +import { Comment, listAllComments } from 'web/lib/firebase/comments' import Custom404 from '../404' import { AnswersPanel } from '../../components/answers/answers-panel' import { fromPropz, usePropz } from '../../hooks/use-propz' diff --git a/web/pages/[username]/index.tsx b/web/pages/[username]/index.tsx index e1e63260..963f8f82 100644 --- a/web/pages/[username]/index.tsx +++ b/web/pages/[username]/index.tsx @@ -1,7 +1,7 @@ import { useRouter } from 'next/router' import React, { useEffect, useState } from 'react' -import { getUserByUsername, User } from '../../lib/firebase/users' +import { getUserByUsername, User } from 'web/lib/firebase/users' import { UserPage } from '../../components/user-page' import { useUser } from '../../hooks/use-user' import Custom404 from '../404' diff --git a/web/pages/account.tsx b/web/pages/account.tsx index 194e3680..696cd22b 100644 --- a/web/pages/account.tsx +++ b/web/pages/account.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Page } from '../components/page' import { UserPage } from '../components/user-page' import { useUser } from '../hooks/use-user' -import { firebaseLogin } from '../lib/firebase/users' +import { firebaseLogin } from 'web/lib/firebase/users' function SignInCard() { return ( diff --git a/web/pages/add-funds.tsx b/web/pages/add-funds.tsx index 0bf89a3d..8c3a7eb1 100644 --- a/web/pages/add-funds.tsx +++ b/web/pages/add-funds.tsx @@ -4,7 +4,7 @@ import { SEO } from '../components/SEO' import { Title } from '../components/title' import { FundsSelector } from '../components/yes-no-selector' import { useUser } from '../hooks/use-user' -import { checkoutURL } from '../lib/service/stripe' +import { checkoutURL } from 'web/lib/service/stripe' import { Page } from '../components/page' export default function AddFundsPage() { diff --git a/web/pages/admin.tsx b/web/pages/admin.tsx index e71e1cf1..9c6bfbfd 100644 --- a/web/pages/admin.tsx +++ b/web/pages/admin.tsx @@ -8,7 +8,7 @@ import Custom404 from './404' import { useContracts } from '../hooks/use-contracts' import _ from 'lodash' import { useAdmin } from '../hooks/use-admin' -import { contractPath } from '../lib/firebase/contracts' +import { contractPath } from 'web/lib/firebase/contracts' function avatarHtml(avatarUrl: string) { return ` []) diff --git a/web/pages/index.tsx b/web/pages/index.tsx index eb954f3c..af732041 100644 --- a/web/pages/index.tsx +++ b/web/pages/index.tsx @@ -1,7 +1,7 @@ import React from 'react' import Router from 'next/router' -import { Contract, getContractsBySlugs } from '../lib/firebase/contracts' +import { Contract, getContractsBySlugs } from 'web/lib/firebase/contracts' import { Page } from '../components/page' import { FeedPromo } from '../components/feed-create' import { Col } from '../components/layout/col' diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx index 7bf01fa9..4c4d4495 100644 --- a/web/pages/landing-page.tsx +++ b/web/pages/landing-page.tsx @@ -7,11 +7,11 @@ import { ArrowDownIcon, } from '@heroicons/react/outline' -import { firebaseLogin } from '../lib/firebase/users' +import { firebaseLogin } from 'web/lib/firebase/users' import { ContractsGrid } from '../components/contract/contracts-list' import { Col } from '../components/layout/col' import Link from 'next/link' -import { Contract } from '../lib/firebase/contracts' +import { Contract } from 'web/lib/firebase/contracts' export default function LandingPage(props: { hotContracts: Contract[] }) { const { hotContracts } = props diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx index acb871d1..8cbb221a 100644 --- a/web/pages/leaderboards.tsx +++ b/web/pages/leaderboards.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import { Col } from '../components/layout/col' import { Leaderboard } from '../components/leaderboard' import { Page } from '../components/page' -import { getTopCreators, getTopTraders, User } from '../lib/firebase/users' +import { getTopCreators, getTopTraders, User } from 'web/lib/firebase/users' import { formatMoney } from 'common/util/format' import { fromPropz, usePropz } from '../hooks/use-propz' diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx index 7fcc03d8..ff6a9835 100644 --- a/web/pages/make-predictions.tsx +++ b/web/pages/make-predictions.tsx @@ -16,8 +16,8 @@ import { Linkify } from '../components/linkify' import { Page } from '../components/page' import { Title } from '../components/title' import { useUser } from '../hooks/use-user' -import { createContract } from '../lib/firebase/api-call' -import { contractPath } from '../lib/firebase/contracts' +import { createContract } from 'web/lib/firebase/api-call' +import { contractPath } from 'web/lib/firebase/contracts' type Prediction = { question: string diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx index 23ff2adf..ad315b27 100644 --- a/web/pages/markets.tsx +++ b/web/pages/markets.tsx @@ -6,7 +6,7 @@ import { Page } from '../components/page' import { SEO } from '../components/SEO' import { Title } from '../components/title' import { useContracts } from '../hooks/use-contracts' -import { Contract } from '../lib/firebase/contracts' +import { Contract } from 'web/lib/firebase/contracts' // TODO: Rename endpoint to "Explore" export default function Markets() { diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx index 7998cc87..317e2d04 100644 --- a/web/pages/profile.tsx +++ b/web/pages/profile.tsx @@ -9,12 +9,12 @@ import { Title } from '../components/title' import { usePrivateUser, useUser } from '../hooks/use-user' import { formatMoney } from 'common/util/format' import { cleanDisplayName, cleanUsername } from 'common/util/clean-username' -import { changeUserInfo } from '../lib/firebase/api-call' -import { uploadImage } from '../lib/firebase/storage' +import { changeUserInfo } from 'web/lib/firebase/api-call' +import { uploadImage } from 'web/lib/firebase/storage' import { Col } from '../components/layout/col' import { Row } from '../components/layout/row' import { User } from 'common/user' -import { updateUser } from '../lib/firebase/users' +import { updateUser } from 'web/lib/firebase/users' import { defaultBannerUrl } from '../components/user-page' import { SiteLink } from '../components/site-link' import Textarea from 'react-expanding-textarea' diff --git a/web/pages/simulator.tsx b/web/pages/simulator.tsx index 7c48302e..623fea0e 100644 --- a/web/pages/simulator.tsx +++ b/web/pages/simulator.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react' import { DatumValue } from '@nivo/core' import { ResponsiveLine } from '@nivo/line' -import { Entry, makeEntries } from '../lib/simulator/entries' +import { Entry, makeEntries } from 'web/lib/simulator/entries' import { Col } from '../components/layout/col' function TableBody(props: { entries: Entry[] }) { diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx index cabc6c80..f147afb7 100644 --- a/web/pages/tag/[tag].tsx +++ b/web/pages/tag/[tag].tsx @@ -6,7 +6,7 @@ import { Title } from '../../components/title' import { Contract, listTaggedContractsCaseInsensitive, -} from '../../lib/firebase/contracts' +} from 'web/lib/firebase/contracts' export default function TagPage() { const router = useRouter()