From b95f258763959177ba74b9cdd7769b1854821f93 Mon Sep 17 00:00:00 2001 From: James Grugett Date: Tue, 1 Feb 2022 12:59:51 -0600 Subject: [PATCH] Add package.json to common directory, and lodash dependency --- common/.gitignore | 13 +++++++++++++ common/package.json | 11 +++++++++++ {web/lib/firebase => common}/scoring.ts | 6 +++--- common/yarn.lock | 13 +++++++++++++ web/pages/fold/[...slugs]/index.tsx | 2 +- 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 common/.gitignore create mode 100644 common/package.json rename {web/lib/firebase => common}/scoring.ts (92%) create mode 100644 common/yarn.lock diff --git a/common/.gitignore b/common/.gitignore new file mode 100644 index 00000000..e0ba0181 --- /dev/null +++ b/common/.gitignore @@ -0,0 +1,13 @@ +# Compiled JavaScript files +lib/**/*.js +lib/**/*.js.map + +# TypeScript v1 declaration files +typings/ + +# Node.js dependency directory +node_modules/ + +package-lock.json +ui-debug.log +firebase-debug.log \ No newline at end of file diff --git a/common/package.json b/common/package.json new file mode 100644 index 00000000..1219c8f0 --- /dev/null +++ b/common/package.json @@ -0,0 +1,11 @@ +{ + "name": "mantic-common", + "private": true, + "scripts": {}, + "dependencies": { + "lodash": "4.17.21" + }, + "devDependencies": { + "@types/lodash": "4.14.178" + } +} diff --git a/web/lib/firebase/scoring.ts b/common/scoring.ts similarity index 92% rename from web/lib/firebase/scoring.ts rename to common/scoring.ts index fa09d1c3..a3422fec 100644 --- a/web/lib/firebase/scoring.ts +++ b/common/scoring.ts @@ -1,7 +1,7 @@ import _ from 'lodash' -import { Contract } from '../../../common/contract' -import { getPayouts } from '../../../common/payouts' -import { Bet } from './bets' +import { Contract } from './contract' +import { getPayouts } from './payouts' +import { Bet } from '../web/lib/firebase/bets' export function scoreCreators(contracts: Contract[], bets: Bet[][]) { const creatorScore = _.mapValues( diff --git a/common/yarn.lock b/common/yarn.lock new file mode 100644 index 00000000..797bd1e8 --- /dev/null +++ b/common/yarn.lock @@ -0,0 +1,13 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@types/lodash@4.14.178": + version "4.14.178" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" + integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== + +lodash@4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== diff --git a/web/pages/fold/[...slugs]/index.tsx b/web/pages/fold/[...slugs]/index.tsx index 7fb2d8a2..30a7edba 100644 --- a/web/pages/fold/[...slugs]/index.tsx +++ b/web/pages/fold/[...slugs]/index.tsx @@ -26,7 +26,7 @@ import { SearchableGrid } from '../../../components/contracts-list' import { useQueryAndSortParams } from '../../../hooks/use-sort-and-query-params' import { useRouter } from 'next/router' import clsx from 'clsx' -import { scoreCreators, scoreTraders } from '../../../lib/firebase/scoring' +import { scoreCreators, scoreTraders } from '../../../../common/scoring' import { Leaderboard } from '../../../components/leaderboard' import { formatMoney, toCamelCase } from '../../../../common/util/format' import { EditFoldButton } from '../../../components/edit-fold-button'