From 4392faa47aec1ec9e95008c427114e60272f06d0 Mon Sep 17 00:00:00 2001 From: Marshall Polaris Date: Sun, 8 May 2022 23:51:45 -0700 Subject: [PATCH] Convert common imports in web to be absolute --- web/components/add-liquidity-panel.tsx | 4 ++-- web/components/amount-input.tsx | 8 +++---- web/components/answers/answer-bet-panel.tsx | 10 ++++----- web/components/answers/answer-item.tsx | 8 +++---- .../answers/answer-resolve-panel.tsx | 4 ++-- web/components/answers/answers-graph.tsx | 6 ++--- web/components/answers/answers-panel.tsx | 10 ++++----- .../answers/create-answer-panel.tsx | 10 ++++----- web/components/bet-panel.tsx | 13 +++++------ web/components/bet-row.tsx | 2 +- web/components/bets-list.tsx | 6 ++--- web/components/charity/charity-card.tsx | 2 +- web/components/charity/feed-items.tsx | 2 +- web/components/comments-list.tsx | 6 ++--- web/components/contract/contract-card.tsx | 6 ++--- .../contract/contract-description.tsx | 4 ++-- web/components/contract/contract-details.tsx | 4 ++-- .../contract/contract-info-dialog.tsx | 6 ++--- web/components/contract/contract-overview.tsx | 6 ++--- .../contract/contract-prob-graph.tsx | 6 ++--- web/components/contract/contract-tabs.tsx | 6 ++--- web/components/contract/contracts-list.tsx | 2 +- web/components/copy-link-button.tsx | 4 ++-- web/components/feed-create.tsx | 4 ++-- web/components/feed/activity-feed.tsx | 2 +- web/components/feed/activity-items.ts | 17 +++++--------- web/components/feed/contract-activity.tsx | 4 ++-- web/components/feed/feed-items.tsx | 22 +++++++------------ web/components/feed/find-active-contracts.ts | 2 +- web/components/folds/create-fold-button.tsx | 4 ++-- web/components/folds/edit-fold-button.tsx | 6 ++--- web/components/folds/fast-fold-following.tsx | 2 +- web/components/folds/fold-tag.tsx | 2 +- web/components/folds/follow-fold-button.tsx | 2 +- web/components/leaderboard.tsx | 2 +- web/components/nav/manifold-logo.tsx | 2 +- web/components/nav/nav-bar.tsx | 2 +- web/components/nav/profile-menu.tsx | 4 ++-- web/components/outcome-label.tsx | 8 +++---- web/components/resolution-panel.tsx | 8 +++---- web/components/sell-button.tsx | 4 ++-- web/components/sell-modal.tsx | 8 +++---- web/components/sell-row.tsx | 6 ++--- web/components/share-embed-button.tsx | 4 ++-- web/components/tags-input.tsx | 2 +- web/components/use-save-shares.ts | 4 ++-- web/components/user-page.tsx | 4 ++-- web/components/yes-no-selector.tsx | 2 +- web/hooks/use-admin.ts | 2 +- web/hooks/use-algo-feed.ts | 8 +++---- web/hooks/use-answers.ts | 2 +- web/hooks/use-bets.ts | 2 +- web/hooks/use-charity-txns.ts | 2 +- web/hooks/use-fold.ts | 4 ++-- web/hooks/use-has-created-contract-today.ts | 2 +- web/hooks/use-propz.ts | 2 +- web/hooks/use-seen-contracts.ts | 2 +- web/hooks/use-user.ts | 2 +- web/hooks/use-users.ts | 2 +- web/lib/firebase/answers.ts | 2 +- web/lib/firebase/api-call.ts | 8 +++---- web/lib/firebase/bets.ts | 4 ++-- web/lib/firebase/comments.ts | 4 ++-- web/lib/firebase/contracts.ts | 20 ++++++++--------- web/lib/firebase/folds.ts | 2 +- web/lib/firebase/init.ts | 2 +- web/lib/firebase/tracking.ts | 2 +- web/lib/firebase/txns.ts | 2 +- web/lib/firebase/users.ts | 4 ++-- web/lib/service/stripe.ts | 2 +- web/pages/404.tsx | 2 +- web/pages/[username]/[contractSlug].tsx | 8 +++---- web/pages/_document.tsx | 2 +- web/pages/about.tsx | 2 +- web/pages/analytics.tsx | 2 +- web/pages/charity/[charitySlug].tsx | 4 ++-- web/pages/charity/index.tsx | 2 +- web/pages/create.tsx | 8 +++---- web/pages/embed/[username]/[contractSlug].tsx | 11 +++------- web/pages/embed/analytics.tsx | 4 ++-- web/pages/fold/[...slugs]/index.tsx | 10 ++++----- web/pages/folds.tsx | 2 +- web/pages/leaderboards.tsx | 2 +- web/pages/make-predictions.tsx | 6 ++--- web/pages/profile.tsx | 9 +++----- web/pages/server-sitemap.xml.tsx | 2 +- 86 files changed, 199 insertions(+), 221 deletions(-) diff --git a/web/components/add-liquidity-panel.tsx b/web/components/add-liquidity-panel.tsx index f04c2b0a..352f8581 100644 --- a/web/components/add-liquidity-panel.tsx +++ b/web/components/add-liquidity-panel.tsx @@ -1,8 +1,8 @@ import clsx from 'clsx' import { useState } from 'react' -import { Contract } from '../../common/contract' -import { formatMoney } from '../../common/util/format' +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 { AmountInput } from './amount-input' diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx index 76111b6f..d506bb11 100644 --- a/web/components/amount-input.tsx +++ b/web/components/amount-input.tsx @@ -1,13 +1,13 @@ import clsx from 'clsx' import _ from 'lodash' import { useUser } from '../hooks/use-user' -import { formatMoney, formatWithCommas } from '../../common/util/format' +import { formatMoney, formatWithCommas } from 'common/util/format' import { Col } from './layout/col' import { Row } from './layout/row' -import { Bet } from '../../common/bet' +import { Bet } from 'common/bet' import { Spacer } from './layout/spacer' -import { calculateCpmmSale } from '../../common/calculate-cpmm' -import { Binary, CPMM, FullContract } from '../../common/contract' +import { calculateCpmmSale } from 'common/calculate-cpmm' +import { Binary, CPMM, FullContract } from 'common/contract' import { SiteLink } from './site-link' export function AmountInput(props: { diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx index 18fd949d..bb059bfb 100644 --- a/web/components/answers/answer-bet-panel.tsx +++ b/web/components/answers/answer-bet-panel.tsx @@ -3,8 +3,8 @@ import _ from 'lodash' import { useEffect, useRef, useState } from 'react' import { XIcon } from '@heroicons/react/solid' -import { Answer } from '../../../common/answer' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +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' @@ -14,7 +14,7 @@ import { formatMoney, formatPercent, formatWithCommas, -} from '../../../common/util/format' +} from 'common/util/format' import { InfoTooltip } from '../info-tooltip' import { useUser } from '../../hooks/use-user' import { @@ -22,9 +22,9 @@ import { calculateDpmShares, calculateDpmPayoutAfterCorrectBet, getDpmOutcomeProbabilityAfterBet, -} from '../../../common/calculate-dpm' +} from 'common/calculate-dpm' import { firebaseLogin } from '../../lib/firebase/users' -import { Bet } from '../../../common/bet' +import { Bet } from 'common/bet' export function AnswerBetPanel(props: { answer: Answer diff --git a/web/components/answers/answer-item.tsx b/web/components/answers/answer-item.tsx index 96746b62..b6c4565b 100644 --- a/web/components/answers/answer-item.tsx +++ b/web/components/answers/answer-item.tsx @@ -1,14 +1,14 @@ import clsx from 'clsx' import _ from 'lodash' -import { Answer } from '../../../common/answer' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { Answer } from 'common/answer' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { Col } from '../layout/col' import { Row } from '../layout/row' import { Avatar } from '../avatar' import { SiteLink } from '../site-link' -import { formatPercent } from '../../../common/util/format' -import { getDpmOutcomeProbability } from '../../../common/calculate-dpm' +import { formatPercent } from 'common/util/format' +import { getDpmOutcomeProbability } from 'common/calculate-dpm' import { tradingAllowed } from '../../lib/firebase/contracts' import { Linkify } from '../linkify' diff --git a/web/components/answers/answer-resolve-panel.tsx b/web/components/answers/answer-resolve-panel.tsx index 41aa90b2..7b07156b 100644 --- a/web/components/answers/answer-resolve-panel.tsx +++ b/web/components/answers/answer-resolve-panel.tsx @@ -2,13 +2,13 @@ import clsx from 'clsx' import _ from 'lodash' import { useState } from 'react' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { Col } from '../layout/col' import { resolveMarket } from '../../lib/firebase/api-call' import { Row } from '../layout/row' import { ChooseCancelSelector } from '../yes-no-selector' import { ResolveConfirmationButton } from '../confirmation-button' -import { removeUndefinedProps } from '../../../common/util/object' +import { removeUndefinedProps } from 'common/util/object' export function AnswerResolvePanel(props: { contract: FullContract diff --git a/web/components/answers/answers-graph.tsx b/web/components/answers/answers-graph.tsx index df56ab93..38bd931d 100644 --- a/web/components/answers/answers-graph.tsx +++ b/web/components/answers/answers-graph.tsx @@ -4,9 +4,9 @@ import dayjs from 'dayjs' import _ from 'lodash' import { memo } from 'react' -import { Bet } from '../../../common/bet' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' -import { getOutcomeProbability } from '../../../common/calculate' +import { Bet } from 'common/bet' +import { DPM, FreeResponse, FullContract } from 'common/contract' +import { getOutcomeProbability } from 'common/calculate' import { useBets } from '../../hooks/use-bets' import { useWindowSize } from '../../hooks/use-window-size' diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx index f315b514..f490f7bc 100644 --- a/web/components/answers/answers-panel.tsx +++ b/web/components/answers/answers-panel.tsx @@ -1,10 +1,10 @@ import _ from 'lodash' import { useLayoutEffect, useState } from 'react' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { Col } from '../layout/col' import { useUser } from '../../hooks/use-user' -import { getDpmOutcomeProbability } from '../../../common/calculate-dpm' +import { getDpmOutcomeProbability } from 'common/calculate-dpm' import { useAnswers } from '../../hooks/use-answers' import { tradingAllowed } from '../../lib/firebase/contracts' import { AnswerItem } from './answer-item' @@ -13,9 +13,9 @@ import { AnswerResolvePanel } from './answer-resolve-panel' import { Spacer } from '../layout/spacer' import { FeedItems } from '../feed/feed-items' import { ActivityItem } from '../feed/activity-items' -import { User } from '../../../common/user' -import { getOutcomeProbability } from '../../../common/calculate' -import { Answer } from '../../../common/answer' +import { User } from 'common/user' +import { getOutcomeProbability } from 'common/calculate' +import { Answer } from 'common/answer' export function AnswersPanel(props: { contract: FullContract diff --git a/web/components/answers/create-answer-panel.tsx b/web/components/answers/create-answer-panel.tsx index 6a3dd8c6..58fed86f 100644 --- a/web/components/answers/create-answer-panel.tsx +++ b/web/components/answers/create-answer-panel.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import { useState } from 'react' import Textarea from 'react-expanding-textarea' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { BuyAmountInput } from '../amount-input' import { Col } from '../layout/col' import { createAnswer } from '../../lib/firebase/api-call' @@ -12,17 +12,17 @@ import { formatMoney, formatPercent, formatWithCommas, -} from '../../../common/util/format' +} from 'common/util/format' import { InfoTooltip } from '../info-tooltip' import { useUser } from '../../hooks/use-user' import { calculateDpmShares, calculateDpmPayoutAfterCorrectBet, getDpmOutcomeProbabilityAfterBet, -} from '../../../common/calculate-dpm' +} from 'common/calculate-dpm' import { firebaseLogin } from '../../lib/firebase/users' -import { Bet } from '../../../common/bet' -import { MAX_ANSWER_LENGTH } from '../../../common/answer' +import { Bet } from 'common/bet' +import { MAX_ANSWER_LENGTH } from 'common/answer' export function CreateAnswerPanel(props: { contract: FullContract diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx index c4f5c506..75f056c0 100644 --- a/web/components/bet-panel.tsx +++ b/web/components/bet-panel.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import React, { useEffect, useState } from 'react' import { useUser } from '../hooks/use-user' -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' import { Col } from './layout/col' import { Row } from './layout/row' import { Spacer } from './layout/spacer' @@ -11,10 +11,10 @@ import { formatMoney, formatPercent, formatWithCommas, -} from '../../common/util/format' +} from 'common/util/format' import { Title } from './title' import { firebaseLogin, User } from '../lib/firebase/users' -import { Bet } from '../../common/bet' +import { Bet } from 'common/bet' import { placeBet, sellShares } from '../lib/firebase/api-call' import { BuyAmountInput, SellAmountInput } from './amount-input' import { InfoTooltip } from './info-tooltip' @@ -24,13 +24,10 @@ import { calculateShares, getProbability, getOutcomeProbabilityAfterBet, -} from '../../common/calculate' +} from 'common/calculate' import { useFocus } from '../hooks/use-focus' import { useUserContractBets } from '../hooks/use-user-bets' -import { - calculateCpmmSale, - getCpmmProbability, -} from '../../common/calculate-cpmm' +import { calculateCpmmSale, getCpmmProbability } from 'common/calculate-cpmm' import { SellRow } from './sell-row' import { useSaveShares } from './use-save-shares' diff --git a/web/components/bet-row.tsx b/web/components/bet-row.tsx index 3deec388..4f698304 100644 --- a/web/components/bet-row.tsx +++ b/web/components/bet-row.tsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { BetPanelSwitcher } from './bet-panel' import { Row } from './layout/row' import { YesNoSelector } from './yes-no-selector' -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' import { Modal } from './layout/modal' import { SellButton } from './sell-button' import { useUser } from '../hooks/use-user' diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx index 9bad3627..e4f6fc18 100644 --- a/web/components/bets-list.tsx +++ b/web/components/bets-list.tsx @@ -11,7 +11,7 @@ import { formatMoney, formatPercent, formatWithCommas, -} from '../../common/util/format' +} from 'common/util/format' import { Col } from './layout/col' import { Spacer } from './layout/spacer' import { @@ -25,7 +25,7 @@ import { UserLink } from './user-page' import { sellBet } from '../lib/firebase/api-call' import { ConfirmationButton } from './confirmation-button' import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label' -import { filterDefined } from '../../common/util/array' +import { filterDefined } from 'common/util/array' import { LoadingIndicator } from './loading-indicator' import { SiteLink } from './site-link' import { @@ -36,7 +36,7 @@ import { getContractBetMetrics, resolvedPayout, getContractBetNullMetrics, -} from '../../common/calculate' +} from 'common/calculate' import { useTimeSinceFirstRender } from '../hooks/use-time-since-first-render' import { trackLatency } from '../lib/firebase/tracking' diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx index 13a871b1..79dc3ac2 100644 --- a/web/components/charity/charity-card.tsx +++ b/web/components/charity/charity-card.tsx @@ -2,7 +2,7 @@ import { StarIcon } from '@heroicons/react/solid' import _ from 'lodash' import Link from 'next/link' import Image from 'next/image' -import { Charity } from '../../../common/charity' +import { Charity } from 'common/charity' import { useCharityTxns } from '../../hooks/use-charity-txns' import { manaToUSD } from '../../pages/charity/[charitySlug]' import { Row } from '../layout/row' diff --git a/web/components/charity/feed-items.tsx b/web/components/charity/feed-items.tsx index 43d03c7b..82fea3dd 100644 --- a/web/components/charity/feed-items.tsx +++ b/web/components/charity/feed-items.tsx @@ -1,4 +1,4 @@ -import { Txn } from '../../../common/txn' +import { Txn } from 'common/txn' import { Avatar } from '../avatar' import { useUserById } from '../../hooks/use-users' import { UserLink } from '../user-page' diff --git a/web/components/comments-list.tsx b/web/components/comments-list.tsx index 7461c6f1..7a96b099 100644 --- a/web/components/comments-list.tsx +++ b/web/components/comments-list.tsx @@ -1,12 +1,12 @@ -import { Comment } from '../../common/comment' -import { Contract } from '../../common/contract' +import { Comment } from 'common/comment' +import { Contract } from 'common/contract' import { contractPath } from '../lib/firebase/contracts' import { SiteLink } from './site-link' import { Row } from './layout/row' import { Avatar } from './avatar' import { RelativeTimestamp } from './relative-timestamp' import { UserLink } from './user-page' -import { User } from '../../common/user' +import { User } from 'common/user' import { Col } from './layout/col' import { Linkify } from './linkify' diff --git a/web/components/contract/contract-card.tsx b/web/components/contract/contract-card.tsx index 41373679..e7fa4d7e 100644 --- a/web/components/contract/contract-card.tsx +++ b/web/components/contract/contract-card.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import Link from 'next/link' import _ from 'lodash' import { Row } from '../layout/row' -import { formatPercent } from '../../../common/util/format' +import { formatPercent } from 'common/util/format' import { Contract, contractPath, @@ -17,13 +17,13 @@ import { FreeResponse, FreeResponseContract, FullContract, -} from '../../../common/contract' +} from 'common/contract' import { AnswerLabel, BinaryContractOutcomeLabel, FreeResponseOutcomeLabel, } from '../outcome-label' -import { getOutcomeProbability, getTopAnswer } from '../../../common/calculate' +import { getOutcomeProbability, getTopAnswer } from 'common/calculate' import { AbbrContractDetails } from './contract-details' export function ContractCard(props: { diff --git a/web/components/contract/contract-description.tsx b/web/components/contract/contract-description.tsx index dea08c6a..c973ec25 100644 --- a/web/components/contract/contract-description.tsx +++ b/web/components/contract/contract-description.tsx @@ -3,8 +3,8 @@ import dayjs from 'dayjs' import { useState } from 'react' import Textarea from 'react-expanding-textarea' -import { Contract } from '../../../common/contract' -import { parseTags } from '../../../common/util/parse' +import { Contract } from 'common/contract' +import { parseTags } from 'common/util/parse' import { useAdmin } from '../../hooks/use-admin' import { updateContract } from '../../lib/firebase/contracts' import { Row } from '../layout/row' diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx index 8cc27496..020237bc 100644 --- a/web/components/contract/contract-details.tsx +++ b/web/components/contract/contract-details.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import { ClockIcon, DatabaseIcon, PencilIcon } from '@heroicons/react/outline' import { TrendingUpIcon } from '@heroicons/react/solid' import { Row } from '../layout/row' -import { formatMoney } from '../../../common/util/format' +import { formatMoney } from 'common/util/format' import { UserLink } from '../user-page' import { Contract, @@ -17,7 +17,7 @@ import { fromNow } from '../../lib/util/time' import { Avatar } from '../avatar' import { useState } from 'react' import { ContractInfoDialog } from './contract-info-dialog' -import { Bet } from '../../../common/bet' +import { Bet } from 'common/bet' import NewContractBadge from '../new-contract-badge' export function AbbrContractDetails(props: { diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx index 7d94c64a..3425c60b 100644 --- a/web/components/contract/contract-info-dialog.tsx +++ b/web/components/contract/contract-info-dialog.tsx @@ -3,10 +3,10 @@ import clsx from 'clsx' import dayjs from 'dayjs' import _ from 'lodash' import { useState } from 'react' -import { Bet } from '../../../common/bet' +import { Bet } from 'common/bet' -import { Contract } from '../../../common/contract' -import { formatMoney } from '../../../common/util/format' +import { Contract } from 'common/contract' +import { formatMoney } from 'common/util/format' import { contractPath, getBinaryProbPercent, diff --git a/web/components/contract/contract-overview.tsx b/web/components/contract/contract-overview.tsx index 524a1962..17248acd 100644 --- a/web/components/contract/contract-overview.tsx +++ b/web/components/contract/contract-overview.tsx @@ -10,11 +10,11 @@ import { FreeResponseResolutionOrChance, BinaryResolutionOrChance, } from './contract-card' -import { Bet } from '../../../common/bet' -import { Comment } from '../../../common/comment' +import { Bet } from 'common/bet' +import { Comment } from 'common/comment' import BetRow from '../bet-row' import { AnswersGraph } from '../answers/answers-graph' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { ContractDescription } from './contract-description' import { ContractDetails } from './contract-details' import { ShareMarket } from '../share-market' diff --git a/web/components/contract/contract-prob-graph.tsx b/web/components/contract/contract-prob-graph.tsx index 18374f0e..c1ed4082 100644 --- a/web/components/contract/contract-prob-graph.tsx +++ b/web/components/contract/contract-prob-graph.tsx @@ -2,9 +2,9 @@ import { DatumValue } from '@nivo/core' import { ResponsiveLine } from '@nivo/line' import dayjs from 'dayjs' import { memo } from 'react' -import { Bet } from '../../../common/bet' -import { getInitialProbability } from '../../../common/calculate' -import { Binary, CPMM, DPM, FullContract } from '../../../common/contract' +import { Bet } from 'common/bet' +import { getInitialProbability } from 'common/calculate' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' import { useBetsWithoutAntes } from '../../hooks/use-bets' import { useWindowSize } from '../../hooks/use-window-size' diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx index ae1203cf..6df88329 100644 --- a/web/components/contract/contract-tabs.tsx +++ b/web/components/contract/contract-tabs.tsx @@ -1,7 +1,7 @@ -import { Bet } from '../../../common/bet' -import { Contract } from '../../../common/contract' +import { Bet } from 'common/bet' +import { Contract } from 'common/contract' import { Comment } from '../../lib/firebase/comments' -import { User } from '../../../common/user' +import { User } from 'common/user' import { useBets } from '../../hooks/use-bets' import { ContractActivity } from '../feed/contract-activity' import { ContractBetsTable, MyBetsSummary } from '../bets-list' diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx index e84af1ea..ef5b605d 100644 --- a/web/components/contract/contracts-list.tsx +++ b/web/components/contract/contracts-list.tsx @@ -17,7 +17,7 @@ import { Sort, useQueryAndSortParams, } from '../../hooks/use-sort-and-query-params' -import { Answer } from '../../../common/answer' +import { Answer } from 'common/answer' import { LoadingIndicator } from '../loading-indicator' export function ContractsGrid(props: { diff --git a/web/components/copy-link-button.tsx b/web/components/copy-link-button.tsx index d63d3ff2..f273b87c 100644 --- a/web/components/copy-link-button.tsx +++ b/web/components/copy-link-button.tsx @@ -2,10 +2,10 @@ import { Fragment } from 'react' import { LinkIcon } from '@heroicons/react/outline' import { Menu, Transition } from '@headlessui/react' import clsx from 'clsx' -import { Contract } from '../../common/contract' +import { Contract } from 'common/contract' import { copyToClipboard } from '../lib/util/copy' import { contractPath } from '../lib/firebase/contracts' -import { ENV_CONFIG } from '../../common/envs/constants' +import { ENV_CONFIG } from 'common/envs/constants' function copyContractUrl(contract: Contract) { copyToClipboard(`https://${ENV_CONFIG.domain}${contractPath(contract)}`) diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx index 7ce1deb5..e63d6bcc 100644 --- a/web/components/feed-create.tsx +++ b/web/components/feed-create.tsx @@ -5,11 +5,11 @@ import { Spacer } from './layout/spacer' import { NewContract } from '../pages/create' import { firebaseLogin, User } from '../lib/firebase/users' import { ContractsGrid } from './contract/contracts-list' -import { Contract, MAX_QUESTION_LENGTH } from '../../common/contract' +import { Contract, MAX_QUESTION_LENGTH } from 'common/contract' import { Col } from './layout/col' import clsx from 'clsx' import { Row } from './layout/row' -import { ENV_CONFIG } from '../../common/envs/constants' +import { ENV_CONFIG } from 'common/envs/constants' import _ from 'lodash' import { SiteLink } from './site-link' diff --git a/web/components/feed/activity-feed.tsx b/web/components/feed/activity-feed.tsx index 19ec1299..9e02d5fb 100644 --- a/web/components/feed/activity-feed.tsx +++ b/web/components/feed/activity-feed.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import { Contract } from '../../lib/firebase/contracts' import { Comment } from '../../lib/firebase/comments' import { Col } from '../layout/col' -import { Bet } from '../../../common/bet' +import { Bet } from 'common/bet' import { useUser } from '../../hooks/use-user' import { ContractActivity } from './contract-activity' diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts index 71d42621..b4abc7ca 100644 --- a/web/components/feed/activity-items.ts +++ b/web/components/feed/activity-items.ts @@ -1,16 +1,11 @@ import _ from 'lodash' -import { Answer } from '../../../common/answer' -import { Bet } from '../../../common/bet' -import { getOutcomeProbability } from '../../../common/calculate' -import { Comment } from '../../../common/comment' -import { - Contract, - DPM, - FreeResponse, - FullContract, -} from '../../../common/contract' -import { User } from '../../../common/user' +import { Answer } from 'common/answer' +import { Bet } from 'common/bet' +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' export type ActivityItem = diff --git a/web/components/feed/contract-activity.tsx b/web/components/feed/contract-activity.tsx index a0e40916..68bf51c6 100644 --- a/web/components/feed/contract-activity.tsx +++ b/web/components/feed/contract-activity.tsx @@ -1,6 +1,6 @@ import { Contract } from '../../lib/firebase/contracts' import { Comment } from '../../lib/firebase/comments' -import { Bet } from '../../../common/bet' +import { Bet } from 'common/bet' import { useBets } from '../../hooks/use-bets' import { useComments } from '../../hooks/use-comments' import { @@ -9,7 +9,7 @@ import { getSpecificContractActivityItems, } from './activity-items' import { FeedItems } from './feed-items' -import { User } from '../../../common/user' +import { User } from 'common/user' export function ContractActivity(props: { contract: Contract diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx index dbf3ece3..e64ed3f4 100644 --- a/web/components/feed/feed-items.tsx +++ b/web/components/feed/feed-items.tsx @@ -24,8 +24,8 @@ 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 { formatMoney, formatPercent } from '../../../common/util/format' -import { Comment } from '../../../common/comment' +import { formatMoney, formatPercent } from 'common/util/format' +import { Comment } from 'common/comment' import { BinaryResolutionOrChance } from '../contract/contract-card' import { SiteLink } from '../site-link' import { Col } from '../layout/col' @@ -36,27 +36,21 @@ import { JoinSpans } from '../join-spans' import { fromNow } from '../../lib/util/time' import BetRow from '../bet-row' import { Avatar } from '../avatar' -import { Answer } from '../../../common/answer' +import { Answer } from 'common/answer' import { ActivityItem, GENERAL_COMMENTS_OUTCOME_ID } from './activity-items' -import { - Binary, - CPMM, - DPM, - FreeResponse, - FullContract, -} from '../../../common/contract' +import { Binary, CPMM, DPM, FreeResponse, FullContract } from 'common/contract' import { BuyButton } from '../yes-no-selector' -import { getDpmOutcomeProbability } from '../../../common/calculate-dpm' +import { getDpmOutcomeProbability } from 'common/calculate-dpm' import { AnswerBetPanel } from '../answers/answer-bet-panel' import { useSaveSeenContract } from '../../hooks/use-seen-contracts' -import { User } from '../../../common/user' +import { User } from 'common/user' import { Modal } from '../layout/modal' import { trackClick } from '../../lib/firebase/tracking' import { firebaseLogin } from '../../lib/firebase/users' -import { DAY_MS } from '../../../common/util/time' +import { DAY_MS } from 'common/util/time' import NewContractBadge from '../new-contract-badge' import { RelativeTimestamp } from '../relative-timestamp' -import { calculateCpmmSale } from '../../../common/calculate-cpmm' +import { calculateCpmmSale } from 'common/calculate-cpmm' export function FeedItems(props: { contract: Contract diff --git a/web/components/feed/find-active-contracts.ts b/web/components/feed/find-active-contracts.ts index 6f40806f..0892b08b 100644 --- a/web/components/feed/find-active-contracts.ts +++ b/web/components/feed/find-active-contracts.ts @@ -1,7 +1,7 @@ import _ from 'lodash' import { Contract } from '../../lib/firebase/contracts' import { Comment } from '../../lib/firebase/comments' -import { Bet } from '../../../common/bet' +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 0d71fa18..3f158790 100644 --- a/web/components/folds/create-fold-button.tsx +++ b/web/components/folds/create-fold-button.tsx @@ -2,10 +2,10 @@ import clsx from 'clsx' import { useRouter } from 'next/router' import { useState } from 'react' import { PlusCircleIcon } from '@heroicons/react/solid' -import { parseWordsAsTags } from '../../../common/util/parse' +import { parseWordsAsTags } from 'common/util/parse' import { createFold } from '../../lib/firebase/api-call' import { foldPath } from '../../lib/firebase/folds' -import { toCamelCase } from '../../../common/util/format' +import { toCamelCase } from 'common/util/format' import { ConfirmationButton } from '../confirmation-button' import { Col } from '../layout/col' import { Spacer } from '../layout/spacer' diff --git a/web/components/folds/edit-fold-button.tsx b/web/components/folds/edit-fold-button.tsx index d18ab41c..a139e1df 100644 --- a/web/components/folds/edit-fold-button.tsx +++ b/web/components/folds/edit-fold-button.tsx @@ -3,10 +3,10 @@ import _ from 'lodash' import clsx from 'clsx' import { PencilIcon } from '@heroicons/react/outline' -import { Fold } from '../../../common/fold' -import { parseWordsAsTags } from '../../../common/util/parse' +import { Fold } from 'common/fold' +import { parseWordsAsTags } from 'common/util/parse' import { deleteFold, updateFold } from '../../lib/firebase/folds' -import { toCamelCase } from '../../../common/util/format' +import { toCamelCase } from 'common/util/format' import { Spacer } from '../layout/spacer' import { TagsList } from '../tags-list' import { useRouter } from 'next/router' diff --git a/web/components/folds/fast-fold-following.tsx b/web/components/folds/fast-fold-following.tsx index eea1e592..6c5793ba 100644 --- a/web/components/folds/fast-fold-following.tsx +++ b/web/components/folds/fast-fold-following.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx' import { useState } from 'react' import { SearchIcon } from '@heroicons/react/outline' -import { User } from '../../../common/user' +import { User } from 'common/user' import { followFoldFromSlug, unfollowFoldFromSlug, diff --git a/web/components/folds/fold-tag.tsx b/web/components/folds/fold-tag.tsx index 370cd0b8..4e975226 100644 --- a/web/components/folds/fold-tag.tsx +++ b/web/components/folds/fold-tag.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { Fold } from '../../../common/fold' +import { Fold } from 'common/fold' export function FoldTag(props: { fold: Fold }) { const { fold } = props diff --git a/web/components/folds/follow-fold-button.tsx b/web/components/folds/follow-fold-button.tsx index 496cda42..92133efe 100644 --- a/web/components/folds/follow-fold-button.tsx +++ b/web/components/folds/follow-fold-button.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { Fold } from '../../../common/fold' +import { Fold } from 'common/fold' import { useFollowedFoldIds } from '../../hooks/use-fold' import { useUser } from '../../hooks/use-user' import { followFold, unfollowFold } from '../../lib/firebase/folds' diff --git a/web/components/leaderboard.tsx b/web/components/leaderboard.tsx index 5ae3ddd3..fb104060 100644 --- a/web/components/leaderboard.tsx +++ b/web/components/leaderboard.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx' -import { User } from '../../common/user' +import { User } from 'common/user' import { Avatar } from './avatar' import { Row } from './layout/row' import { SiteLink } from './site-link' diff --git a/web/components/nav/manifold-logo.tsx b/web/components/nav/manifold-logo.tsx index c7fc9df3..28973231 100644 --- a/web/components/nav/manifold-logo.tsx +++ b/web/components/nav/manifold-logo.tsx @@ -2,7 +2,7 @@ import Link from 'next/link' import clsx from 'clsx' import { useUser } from '../../hooks/use-user' -import { ENV_CONFIG } from '../../../common/envs/constants' +import { ENV_CONFIG } from 'common/envs/constants' export function ManifoldLogo(props: { className?: string diff --git a/web/components/nav/nav-bar.tsx b/web/components/nav/nav-bar.tsx index 0aded804..08ec1acc 100644 --- a/web/components/nav/nav-bar.tsx +++ b/web/components/nav/nav-bar.tsx @@ -11,7 +11,7 @@ import { Transition, Dialog } from '@headlessui/react' import { useState, Fragment } from 'react' import Sidebar from './sidebar' import { useUser } from '../../hooks/use-user' -import { formatMoney } from '../../../common/util/format' +import { formatMoney } from 'common/util/format' import { Avatar } from '../avatar' // From https://codepen.io/chris__sev/pen/QWGvYbL diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx index 994f8bc1..afab496b 100644 --- a/web/components/nav/profile-menu.tsx +++ b/web/components/nav/profile-menu.tsx @@ -1,7 +1,7 @@ import { firebaseLogout, User } from '../../lib/firebase/users' -import { formatMoney } from '../../../common/util/format' +import { formatMoney } from 'common/util/format' import { Avatar } from '../avatar' -import { IS_PRIVATE_MANIFOLD } from '../../../common/envs/constants' +import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants' import { Row } from '../layout/row' export function getNavigationOptions(user?: User | null) { diff --git a/web/components/outcome-label.tsx b/web/components/outcome-label.tsx index 95403c75..d578247b 100644 --- a/web/components/outcome-label.tsx +++ b/web/components/outcome-label.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx' -import { Answer } from '../../common/answer' -import { getProbability } from '../../common/calculate' +import { Answer } from 'common/answer' +import { getProbability } from 'common/calculate' import { Binary, Contract, @@ -9,8 +9,8 @@ import { FreeResponse, FreeResponseContract, FullContract, -} from '../../common/contract' -import { formatPercent } from '../../common/util/format' +} from 'common/contract' +import { formatPercent } from 'common/util/format' import { ClientRender } from './client-render' export function OutcomeLabel(props: { diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx index 7645f039..acef7aef 100644 --- a/web/components/resolution-panel.tsx +++ b/web/components/resolution-panel.tsx @@ -9,10 +9,10 @@ import { Spacer } from './layout/spacer' import { ResolveConfirmationButton } from './confirmation-button' import { resolveMarket } from '../lib/firebase/api-call' import { ProbabilitySelector } from './probability-selector' -import { DPM_CREATOR_FEE } from '../../common/fees' -import { getProbability } from '../../common/calculate' -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' -import { formatMoney } from '../../common/util/format' +import { DPM_CREATOR_FEE } from 'common/fees' +import { getProbability } from 'common/calculate' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' +import { formatMoney } from 'common/util/format' export function ResolutionPanel(props: { creator: User diff --git a/web/components/sell-button.tsx b/web/components/sell-button.tsx index 0bccb631..0fc186a9 100644 --- a/web/components/sell-button.tsx +++ b/web/components/sell-button.tsx @@ -1,5 +1,5 @@ -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' -import { User } from '../../common/user' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' +import { User } from 'common/user' import { useUserContractBets } from '../hooks/use-user-bets' import { useState } from 'react' import { Col } from './layout/col' diff --git a/web/components/sell-modal.tsx b/web/components/sell-modal.tsx index 19954d7f..28282766 100644 --- a/web/components/sell-modal.tsx +++ b/web/components/sell-modal.tsx @@ -1,10 +1,10 @@ -import { Binary, CPMM, FullContract } from '../../common/contract' -import { Bet } from '../../common/bet' -import { User } from '../../common/user' +import { Binary, CPMM, FullContract } from 'common/contract' +import { Bet } from 'common/bet' +import { User } from 'common/user' import { Modal } from './layout/modal' import { Col } from './layout/col' import { Title } from './title' -import { formatWithCommas } from '../../common/util/format' +import { formatWithCommas } from 'common/util/format' import { OutcomeLabel } from './outcome-label' import { SellPanel } from './bet-panel' diff --git a/web/components/sell-row.tsx b/web/components/sell-row.tsx index c30f799e..8d414bc1 100644 --- a/web/components/sell-row.tsx +++ b/web/components/sell-row.tsx @@ -1,9 +1,9 @@ -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' -import { User } from '../../common/user' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' +import { User } from 'common/user' import { useState } from 'react' import { Col } from './layout/col' import { Row } from './layout/row' -import { formatWithCommas } from '../../common/util/format' +import { formatWithCommas } from 'common/util/format' import { OutcomeLabel } from './outcome-label' import { useUserContractBets } from '../hooks/use-user-bets' import { useSaveShares } from './use-save-shares' diff --git a/web/components/share-embed-button.tsx b/web/components/share-embed-button.tsx index eeed7d44..3ff40f81 100644 --- a/web/components/share-embed-button.tsx +++ b/web/components/share-embed-button.tsx @@ -1,9 +1,9 @@ import { Fragment } from 'react' import { CodeIcon } from '@heroicons/react/outline' import { Menu, Transition } from '@headlessui/react' -import { Contract } from '../../common/contract' +import { Contract } from 'common/contract' import { contractPath } from '../lib/firebase/contracts' -import { DOMAIN } from '../../common/envs/constants' +import { DOMAIN } from 'common/envs/constants' import { copyToClipboard } from '../lib/util/copy' function copyEmbedCode(contract: Contract) { diff --git a/web/components/tags-input.tsx b/web/components/tags-input.tsx index 83c6bbb1..2be5d928 100644 --- a/web/components/tags-input.tsx +++ b/web/components/tags-input.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx' import { useState } from 'react' -import { parseWordsAsTags } from '../../common/util/parse' +import { parseWordsAsTags } from 'common/util/parse' import { Contract, updateContract } from '../lib/firebase/contracts' import { Col } from './layout/col' import { Row } from './layout/row' diff --git a/web/components/use-save-shares.ts b/web/components/use-save-shares.ts index c67ea9c9..6a8b251e 100644 --- a/web/components/use-save-shares.ts +++ b/web/components/use-save-shares.ts @@ -1,5 +1,5 @@ -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' -import { Bet } from '../../common/bet' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' +import { Bet } from 'common/bet' import { useEffect, useState } from 'react' import _ from 'lodash' diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx index 24d58081..3271d9c4 100644 --- a/web/components/user-page.tsx +++ b/web/components/user-page.tsx @@ -10,13 +10,13 @@ import { Linkify } from './linkify' import { Spacer } from './layout/spacer' import { Row } from './layout/row' import { LinkIcon } from '@heroicons/react/solid' -import { genHash } from '../../common/util/random' +import { genHash } from 'common/util/random' 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 { Contract } from '../../common/contract' +import { Contract } from 'common/contract' import { getContractFromId, listContracts } from '../lib/firebase/contracts' import { LoadingIndicator } from './loading-indicator' import { useRouter } from 'next/router' diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx index 4bb7949f..7c175695 100644 --- a/web/components/yes-no-selector.tsx +++ b/web/components/yes-no-selector.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx' import React from 'react' -import { formatMoney } from '../../common/util/format' +import { formatMoney } from 'common/util/format' import { Col } from './layout/col' import { Row } from './layout/row' diff --git a/web/hooks/use-admin.ts b/web/hooks/use-admin.ts index 7c8b8449..a80b3ac4 100644 --- a/web/hooks/use-admin.ts +++ b/web/hooks/use-admin.ts @@ -1,4 +1,4 @@ -import { isAdmin } from '../../common/envs/constants' +import { isAdmin } from 'common/envs/constants' import { usePrivateUser, useUser } from './use-user' export const useAdmin = () => { diff --git a/web/hooks/use-algo-feed.ts b/web/hooks/use-algo-feed.ts index b8cfb7a2..81356da0 100644 --- a/web/hooks/use-algo-feed.ts +++ b/web/hooks/use-algo-feed.ts @@ -1,11 +1,11 @@ import _ from 'lodash' import { useState, useEffect } from 'react' -import { Bet } from '../../common/bet' -import { Comment } from '../../common/comment' -import { Contract } from '../../common/contract' +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 { User } from '../../common/user' +import { User } from 'common/user' import { getUserFeed } from '../lib/firebase/users' import { useUpdatedContracts } from './use-contracts' import { diff --git a/web/hooks/use-answers.ts b/web/hooks/use-answers.ts index efac8db7..5aace2d0 100644 --- a/web/hooks/use-answers.ts +++ b/web/hooks/use-answers.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { Answer } from '../../common/answer' +import { Answer } from 'common/answer' import { listenForAnswers } from '../lib/firebase/answers' export const useAnswers = (contractId: string) => { diff --git a/web/hooks/use-bets.ts b/web/hooks/use-bets.ts index 5ea66e1c..14d07b5c 100644 --- a/web/hooks/use-bets.ts +++ b/web/hooks/use-bets.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { Contract } from '../../common/contract' +import { Contract } from 'common/contract' import { Bet, listenForBets, diff --git a/web/hooks/use-charity-txns.ts b/web/hooks/use-charity-txns.ts index 5636e720..e4948d72 100644 --- a/web/hooks/use-charity-txns.ts +++ b/web/hooks/use-charity-txns.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { Txn } from '../../common/txn' +import { Txn } from 'common/txn' import { listenForCharityTxns } from '../lib/firebase/txns' export const useCharityTxns = (charityId: string) => { diff --git a/web/hooks/use-fold.ts b/web/hooks/use-fold.ts index 2c0230c4..e710bd64 100644 --- a/web/hooks/use-fold.ts +++ b/web/hooks/use-fold.ts @@ -1,7 +1,7 @@ import _ from 'lodash' import { useEffect, useState } from 'react' -import { Fold } from '../../common/fold' -import { User } from '../../common/user' +import { Fold } from 'common/fold' +import { User } from 'common/user' import { listAllFolds, listenForFold, diff --git a/web/hooks/use-has-created-contract-today.ts b/web/hooks/use-has-created-contract-today.ts index 43fe42f9..a22ad0fb 100644 --- a/web/hooks/use-has-created-contract-today.ts +++ b/web/hooks/use-has-created-contract-today.ts @@ -1,6 +1,6 @@ import { listContracts } from '../lib/firebase/contracts' import { useEffect, useState } from 'react' -import { User } from '../../common/user' +import { User } from 'common/user' export const useHasCreatedContractToday = (user: User | null | undefined) => { const [hasCreatedContractToday, setHasCreatedContractToday] = useState(true) diff --git a/web/hooks/use-propz.ts b/web/hooks/use-propz.ts index 5aee4c61..de161e83 100644 --- a/web/hooks/use-propz.ts +++ b/web/hooks/use-propz.ts @@ -1,7 +1,7 @@ import _ from 'lodash' import { useRouter } from 'next/router' import { useState, useEffect } from 'react' -import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants' +import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants' type PropzProps = { // Params from the router query diff --git a/web/hooks/use-seen-contracts.ts b/web/hooks/use-seen-contracts.ts index 58ff1c54..759b4f67 100644 --- a/web/hooks/use-seen-contracts.ts +++ b/web/hooks/use-seen-contracts.ts @@ -1,6 +1,6 @@ import _ from 'lodash' import { useEffect, RefObject, useState } from 'react' -import { Contract } from '../../common/contract' +import { Contract } from 'common/contract' import { trackView } from '../lib/firebase/tracking' import { useIsVisible } from './use-is-visible' diff --git a/web/hooks/use-user.ts b/web/hooks/use-user.ts index 022045b9..9a61c8d5 100644 --- a/web/hooks/use-user.ts +++ b/web/hooks/use-user.ts @@ -1,6 +1,6 @@ import _ from 'lodash' import { useEffect, useState } from 'react' -import { PrivateUser } from '../../common/user' +import { PrivateUser } from 'common/user' import { listenForLogin, listenForPrivateUser, diff --git a/web/hooks/use-users.ts b/web/hooks/use-users.ts index 5d2649b6..4ac55431 100644 --- a/web/hooks/use-users.ts +++ b/web/hooks/use-users.ts @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react' -import { PrivateUser, User } from '../../common/user' +import { PrivateUser, User } from 'common/user' import { getUser, listenForAllUsers, diff --git a/web/lib/firebase/answers.ts b/web/lib/firebase/answers.ts index ab41165b..c7ee5c4f 100644 --- a/web/lib/firebase/answers.ts +++ b/web/lib/firebase/answers.ts @@ -2,7 +2,7 @@ import { collection } from 'firebase/firestore' import { getValues, listenForValues } from './utils' import { db } from './init' -import { Answer } from '../../../common/answer' +import { Answer } from 'common/answer' function getAnswersCollection(contractId: string) { return collection(db, 'contracts', contractId, 'answers') diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts index a71c2752..fa786952 100644 --- a/web/lib/firebase/api-call.ts +++ b/web/lib/firebase/api-call.ts @@ -1,8 +1,8 @@ import { httpsCallable } from 'firebase/functions' -import { Fold } from '../../../common/fold' -import { Txn } from '../../../common/txn' -import { User } from '../../../common/user' -import { randomString } from '../../../common/util/random' +import { Fold } from 'common/fold' +import { Txn } from 'common/txn' +import { User } from 'common/user' +import { randomString } from 'common/util/random' import './init' import { functions } from './init' diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts index 4056e114..b55b0027 100644 --- a/web/lib/firebase/bets.ts +++ b/web/lib/firebase/bets.ts @@ -8,8 +8,8 @@ import { import _ from 'lodash' import { db } from './init' -import { Bet } from '../../../common/bet' -import { Contract } from '../../../common/contract' +import { Bet } from 'common/bet' +import { Contract } from 'common/contract' import { getValues, listenForValues } from './utils' export type { Bet } diff --git a/web/lib/firebase/comments.ts b/web/lib/firebase/comments.ts index e97e6f99..4b7d1b36 100644 --- a/web/lib/firebase/comments.ts +++ b/web/lib/firebase/comments.ts @@ -11,8 +11,8 @@ import _ from 'lodash' import { getValues, listenForValues } from './utils' import { db } from './init' -import { User } from '../../../common/user' -import { Comment } from '../../../common/comment' +import { User } from 'common/user' +import { Comment } from 'common/comment' export type { Comment } diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts index ab408215..72264b72 100644 --- a/web/lib/firebase/contracts.ts +++ b/web/lib/firebase/contracts.ts @@ -17,16 +17,16 @@ import _ from 'lodash' import { app } from './init' import { getValues, listenForValue, listenForValues } from './utils' -import { Binary, Contract, FullContract } from '../../../common/contract' -import { getDpmProbability } from '../../../common/calculate-dpm' -import { createRNG, shuffle } from '../../../common/util/random' -import { getCpmmProbability } from '../../../common/calculate-cpmm' -import { formatMoney, formatPercent } from '../../../common/util/format' -import { DAY_MS } from '../../../common/util/time' -import { MAX_FEED_CONTRACTS } from '../../../common/recommended-contracts' -import { Bet } from '../../../common/bet' -import { Comment } from '../../../common/comment' -import { ENV_CONFIG } from '../../../common/envs/constants' +import { Binary, Contract, FullContract } from 'common/contract' +import { getDpmProbability } from 'common/calculate-dpm' +import { createRNG, shuffle } from 'common/util/random' +import { getCpmmProbability } from 'common/calculate-cpmm' +import { formatMoney, formatPercent } from 'common/util/format' +import { DAY_MS } from 'common/util/time' +import { MAX_FEED_CONTRACTS } from 'common/recommended-contracts' +import { Bet } from 'common/bet' +import { Comment } from 'common/comment' +import { ENV_CONFIG } from 'common/envs/constants' export type { Contract } export function contractPath(contract: Contract) { diff --git a/web/lib/firebase/folds.ts b/web/lib/firebase/folds.ts index 92dc5be0..90268e98 100644 --- a/web/lib/firebase/folds.ts +++ b/web/lib/firebase/folds.ts @@ -11,7 +11,7 @@ import { where, } from 'firebase/firestore' import _ from 'lodash' -import { Fold } from '../../../common/fold' +import { Fold } from 'common/fold' import { Contract, contractCollection } from './contracts' import { db } from './init' import { User } from './users' diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts index 46f14330..379f7cb6 100644 --- a/web/lib/firebase/init.ts +++ b/web/lib/firebase/init.ts @@ -1,6 +1,6 @@ import { getFirestore } from '@firebase/firestore' import { initializeApp, getApps, getApp } from 'firebase/app' -import { FIREBASE_CONFIG } from '../../../common/envs/constants' +import { FIREBASE_CONFIG } from 'common/envs/constants' import { connectFirestoreEmulator } from 'firebase/firestore' import { connectFunctionsEmulator, getFunctions } from 'firebase/functions' diff --git a/web/lib/firebase/tracking.ts b/web/lib/firebase/tracking.ts index 034ad09d..035ef973 100644 --- a/web/lib/firebase/tracking.ts +++ b/web/lib/firebase/tracking.ts @@ -2,7 +2,7 @@ import { doc, collection, setDoc } from 'firebase/firestore' import _ from 'lodash' import { db } from './init' -import { ClickEvent, LatencyEvent, View } from '../../../common/tracking' +import { ClickEvent, LatencyEvent, View } from 'common/tracking' import { listenForLogin, User } from './users' let user: User | null = null diff --git a/web/lib/firebase/txns.ts b/web/lib/firebase/txns.ts index efb98b45..8fc07525 100644 --- a/web/lib/firebase/txns.ts +++ b/web/lib/firebase/txns.ts @@ -1,6 +1,6 @@ import { collection, query, where, orderBy } from 'firebase/firestore' import _ from 'lodash' -import { Txn } from '../../../common/txn' +import { Txn } from 'common/txn' import { db } from './init' import { getValues, listenForValues } from './utils' diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts index 8b8523c6..594786ab 100644 --- a/web/lib/firebase/users.ts +++ b/web/lib/firebase/users.ts @@ -21,10 +21,10 @@ import { import _ from 'lodash' import { app } from './init' -import { PrivateUser, User } from '../../../common/user' +import { PrivateUser, User } from 'common/user' import { createUser } from './api-call' import { getValue, getValues, listenForValue, listenForValues } from './utils' -import { DAY_MS } from '../../../common/util/time' +import { DAY_MS } from 'common/util/time' import { Contract } from './contracts' import { Bet } from './bets' import { Comment } from './comments' diff --git a/web/lib/service/stripe.ts b/web/lib/service/stripe.ts index 6c093483..395f7093 100644 --- a/web/lib/service/stripe.ts +++ b/web/lib/service/stripe.ts @@ -1,4 +1,4 @@ -import { PROJECT_ID } from '../../../common/envs/constants' +import { PROJECT_ID } from 'common/envs/constants' export const checkoutURL = ( userId: string, diff --git a/web/pages/404.tsx b/web/pages/404.tsx index 3d646902..ba173abb 100644 --- a/web/pages/404.tsx +++ b/web/pages/404.tsx @@ -1,4 +1,4 @@ -import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants' +import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants' import { Page } from '../components/page' import { Title } from '../components/title' diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx index 34ed776a..13b8de05 100644 --- a/web/pages/[username]/[contractSlug].tsx +++ b/web/pages/[username]/[contractSlug].tsx @@ -25,13 +25,13 @@ import { AnswersPanel } from '../../components/answers/answers-panel' import { fromPropz, usePropz } from '../../hooks/use-propz' import { Leaderboard } from '../../components/leaderboard' import _ from 'lodash' -import { resolvedPayout } from '../../../common/calculate' -import { formatMoney } from '../../../common/util/format' +import { resolvedPayout } from 'common/calculate' +import { formatMoney } from 'common/util/format' import { FeedBet, FeedComment } from '../../components/feed/feed-items' import { useUserById } from '../../hooks/use-users' import { ContractTabs } from '../../components/contract/contract-tabs' -import { FirstArgument } from '../../../common/util/types' -import { DPM, FreeResponse, FullContract } from '../../../common/contract' +import { FirstArgument } from 'common/util/types' +import { DPM, FreeResponse, FullContract } from 'common/contract' import { contractTextDetails } from '../../components/contract/contract-details' import { useWindowSize } from '../../hooks/use-window-size' import Confetti from 'react-confetti' diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx index 18329b12..461103bd 100644 --- a/web/pages/_document.tsx +++ b/web/pages/_document.tsx @@ -1,5 +1,5 @@ import { Html, Head, Main, NextScript } from 'next/document' -import { ENV_CONFIG } from '../../common/envs/constants' +import { ENV_CONFIG } from 'common/envs/constants' export default function Document() { return ( diff --git a/web/pages/about.tsx b/web/pages/about.tsx index 3f0fcead..d000a3dd 100644 --- a/web/pages/about.tsx +++ b/web/pages/about.tsx @@ -1,5 +1,5 @@ import { cloneElement } from 'react' -import { CREATOR_FEE } from '../../common/fees' +import { CREATOR_FEE } from 'common/fees' import { Page } from '../components/page' import { SEO } from '../components/SEO' import styles from './about.module.css' diff --git a/web/pages/analytics.tsx b/web/pages/analytics.tsx index ef3b89a2..32adc4fd 100644 --- a/web/pages/analytics.tsx +++ b/web/pages/analytics.tsx @@ -1,6 +1,6 @@ import dayjs from 'dayjs' import _ from 'lodash' -import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants' +import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants' import { DailyCountChart, DailyPercentChart, diff --git a/web/pages/charity/[charitySlug].tsx b/web/pages/charity/[charitySlug].tsx index 6869ede8..f91acfa1 100644 --- a/web/pages/charity/[charitySlug].tsx +++ b/web/pages/charity/[charitySlug].tsx @@ -7,11 +7,11 @@ import { Page } from '../../components/page' import { Title } from '../../components/title' import { BuyAmountInput } from '../../components/amount-input' import { Spacer } from '../../components/layout/spacer' -import { User } from '../../../common/user' +import { User } from 'common/user' import { useUser } from '../../hooks/use-user' import { Linkify } from '../../components/linkify' import { transact } from '../../lib/firebase/api-call' -import { charities, Charity } from '../../../common/charity' +import { charities, Charity } from 'common/charity' import { useRouter } from 'next/router' import Custom404 from '../404' import { useCharityTxns } from '../../hooks/use-charity-txns' diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx index bd729571..30d926b7 100644 --- a/web/pages/charity/index.tsx +++ b/web/pages/charity/index.tsx @@ -1,6 +1,6 @@ import _ from 'lodash' import { useState, useMemo } from 'react' -import { charities, Charity as CharityType } from '../../../common/charity' +import { charities, Charity as CharityType } from 'common/charity' import { CharityCard } from '../../components/charity/charity-card' import { Col } from '../../components/layout/col' import { Spacer } from '../../components/layout/spacer' diff --git a/web/pages/create.tsx b/web/pages/create.tsx index 9f4dae84..3642bc00 100644 --- a/web/pages/create.tsx +++ b/web/pages/create.tsx @@ -8,16 +8,16 @@ import { Spacer } from '../components/layout/spacer' import { useUser } from '../hooks/use-user' import { Contract, contractPath } from '../lib/firebase/contracts' import { createContract } from '../lib/firebase/api-call' -import { FIXED_ANTE, MINIMUM_ANTE } from '../../common/antes' +import { FIXED_ANTE, MINIMUM_ANTE } from 'common/antes' import { InfoTooltip } from '../components/info-tooltip' import { Page } from '../components/page' import { Title } from '../components/title' import { ProbabilitySelector } from '../components/probability-selector' -import { parseWordsAsTags } from '../../common/util/parse' +import { parseWordsAsTags } from 'common/util/parse' import { TagsList } from '../components/tags-list' import { Row } from '../components/layout/row' -import { MAX_DESCRIPTION_LENGTH, outcomeType } from '../../common/contract' -import { formatMoney } from '../../common/util/format' +import { MAX_DESCRIPTION_LENGTH, outcomeType } from 'common/contract' +import { formatMoney } from 'common/util/format' import { useHasCreatedContractToday } from '../hooks/use-has-created-contract-today' export default function Create() { diff --git a/web/pages/embed/[username]/[contractSlug].tsx b/web/pages/embed/[username]/[contractSlug].tsx index 11b47149..06e1edbb 100644 --- a/web/pages/embed/[username]/[contractSlug].tsx +++ b/web/pages/embed/[username]/[contractSlug].tsx @@ -1,11 +1,6 @@ -import { Bet } from '../../../../common/bet' -import { - Contract, - DPM, - FreeResponse, - FullContract, -} from '../../../../common/contract' -import { DOMAIN } from '../../../../common/envs/constants' +import { Bet } from 'common/bet' +import { Contract, DPM, FreeResponse, FullContract } from 'common/contract' +import { DOMAIN } from 'common/envs/constants' import { AnswersGraph } from '../../../components/answers/answers-graph' import { BinaryResolutionOrChance, diff --git a/web/pages/embed/analytics.tsx b/web/pages/embed/analytics.tsx index 1441e39e..d33d608c 100644 --- a/web/pages/embed/analytics.tsx +++ b/web/pages/embed/analytics.tsx @@ -1,4 +1,4 @@ -import { FirstArgument } from '../../../common/util/types' +import { FirstArgument } from 'common/util/types' import { Col } from '../../components/layout/col' import { Spacer } from '../../components/layout/spacer' import { fromPropz } from '../../hooks/use-propz' @@ -12,7 +12,7 @@ export const getStaticProps = fromPropz(getStaticPropz) export default function AnalyticsEmbed(props: FirstArgument) { return ( - + diff --git a/web/pages/fold/[...slugs]/index.tsx b/web/pages/fold/[...slugs]/index.tsx index b0d52793..27ad75d9 100644 --- a/web/pages/fold/[...slugs]/index.tsx +++ b/web/pages/fold/[...slugs]/index.tsx @@ -1,7 +1,7 @@ import _ from 'lodash' -import { Fold } from '../../../../common/fold' -import { Comment } from '../../../../common/comment' +import { Fold } from 'common/fold' +import { Comment } from 'common/comment' import { Page } from '../../../components/page' import { Title } from '../../../components/title' import { Bet, listAllBets } from '../../../lib/firebase/bets' @@ -22,9 +22,9 @@ import { useUser } from '../../../hooks/use-user' import { useFold } from '../../../hooks/use-fold' import { SearchableGrid } from '../../../components/contract/contracts-list' import { useRouter } from 'next/router' -import { scoreCreators, scoreTraders } from '../../../../common/scoring' +import { scoreCreators, scoreTraders } from 'common/scoring' import { Leaderboard } from '../../../components/leaderboard' -import { formatMoney } from '../../../../common/util/format' +import { formatMoney } from 'common/util/format' import { EditFoldButton } from '../../../components/folds/edit-fold-button' import Custom404 from '../../404' import { FollowFoldButton } from '../../../components/folds/follow-fold-button' @@ -32,7 +32,7 @@ import { SEO } from '../../../components/SEO' import { useTaggedContracts } from '../../../hooks/use-contracts' import { Linkify } from '../../../components/linkify' import { fromPropz, usePropz } from '../../../hooks/use-propz' -import { filterDefined } from '../../../../common/util/array' +import { filterDefined } from 'common/util/array' import { findActiveContracts } from '../../../components/feed/find-active-contracts' import { Tabs } from '../../../components/layout/tabs' diff --git a/web/pages/folds.tsx b/web/pages/folds.tsx index 4b4b8892..26f9e11d 100644 --- a/web/pages/folds.tsx +++ b/web/pages/folds.tsx @@ -1,7 +1,7 @@ import _ from 'lodash' import Link from 'next/link' import { useEffect, useState } from 'react' -import { Fold } from '../../common/fold' +import { Fold } from 'common/fold' import { CreateFoldButton } from '../components/folds/create-fold-button' import { FollowFoldButton } from '../components/folds/follow-fold-button' import { Col } from '../components/layout/col' diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx index 38e31cd5..acb871d1 100644 --- a/web/pages/leaderboards.tsx +++ b/web/pages/leaderboards.tsx @@ -4,7 +4,7 @@ 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 { formatMoney } from '../../common/util/format' +import { formatMoney } from 'common/util/format' import { fromPropz, usePropz } from '../hooks/use-propz' export const getStaticProps = fromPropz(getStaticPropz) diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx index fa7ef5c7..7fcc03d8 100644 --- a/web/pages/make-predictions.tsx +++ b/web/pages/make-predictions.tsx @@ -4,9 +4,9 @@ import Link from 'next/link' import { useState } from 'react' import Textarea from 'react-expanding-textarea' -import { getProbability } from '../../common/calculate' -import { Binary, CPMM, DPM, FullContract } from '../../common/contract' -import { parseWordsAsTags } from '../../common/util/parse' +import { getProbability } from 'common/calculate' +import { Binary, CPMM, DPM, FullContract } from 'common/contract' +import { parseWordsAsTags } from 'common/util/parse' import { BuyAmountInput } from '../components/amount-input' import { InfoTooltip } from '../components/info-tooltip' import { Col } from '../components/layout/col' diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx index f637a4f2..7998cc87 100644 --- a/web/pages/profile.tsx +++ b/web/pages/profile.tsx @@ -7,16 +7,13 @@ import { Page } from '../components/page' import { SEO } from '../components/SEO' 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 { 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 { Col } from '../components/layout/col' import { Row } from '../components/layout/row' -import { User } from '../../common/user' +import { User } from 'common/user' import { updateUser } from '../lib/firebase/users' import { defaultBannerUrl } from '../components/user-page' import { SiteLink } from '../components/site-link' diff --git a/web/pages/server-sitemap.xml.tsx b/web/pages/server-sitemap.xml.tsx index 9a3cdfe8..d837b26e 100644 --- a/web/pages/server-sitemap.xml.tsx +++ b/web/pages/server-sitemap.xml.tsx @@ -2,7 +2,7 @@ import _ from 'lodash' import { GetServerSideProps } from 'next' import { getServerSideSitemap, ISitemapField } from 'next-sitemap' -import { DOMAIN } from '../../common/envs/constants' +import { DOMAIN } from 'common/envs/constants' import { LiteMarket } from './api/v0/_types' export const getServerSideProps: GetServerSideProps = async (ctx) => {