Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typescript issues #281

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"@react-firebase/database": "^0.3.11",
"@reactour/mask": "^1.0.5",
"@reactour/tour": "^3.3.0",
"@sentry/react": "^5.19.1",
"@sentry/react": "^8.28.0",
"@slack/client": "^5.0.2",
"@types/react": "^17.0.30",
"autoprefixer": "9.8.0",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.3.1",
"classnames": "^2.2.6",
"connected-react-router": "^4.2.3",
"connected-react-router": "^6.9.3",
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"firebase": "^7.16.0",
Expand Down
4 changes: 3 additions & 1 deletion src/reducers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { combineReducers } from "redux";
import { firebaseReducer } from "react-redux-firebase";
import { firestoreReducer } from "redux-firestore";
import itemReducer from "./item";
import { connectRouter } from 'connected-react-router'

export default combineReducers({
export default (history) => combineReducers({
router: connectRouter(history),
firebase: firebaseReducer,
firestore: firestoreReducer,
item: itemReducer,
Expand Down
6 changes: 3 additions & 3 deletions src/store.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { createStore, applyMiddleware, compose } from "redux";
import { routerMiddleware, connectRouter } from "connected-react-router";
import { routerMiddleware } from "connected-react-router";
import { createBrowserHistory } from "history";
import { createLogger } from "redux-logger";
import thunkMiddleware from "redux-thunk";
import freeze from "redux-freeze";
import { reactReduxFirebase } from "react-redux-firebase";
import { reduxFirestore } from "redux-firestore";
import firebase from "firebase/app";
import rootReducer from "./reducers/index";
import createRootReducer from "./reducers";
import "firebase/auth";
import "firebase/database";
import "firebase/firestore";
Expand Down Expand Up @@ -47,7 +47,7 @@ if (process.env.NODE_ENV !== "production") {
const middleware = applyMiddleware(...middlewares);

const store = createStoreWithFirebase(
connectRouter(history)(rootReducer),
createRootReducer(history),
middleware,
);

Expand Down
192 changes: 102 additions & 90 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2571,69 +2571,87 @@
resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==

"@sentry/[email protected]":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/browser/-/browser-5.30.0.tgz"
integrity "sha1-wo9J1VHbMXIIDK758YeRp/0547M= sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw=="
dependencies:
"@sentry/core" "5.30.0"
"@sentry/types" "5.30.0"
"@sentry/utils" "5.30.0"
tslib "^1.9.3"

"@sentry/[email protected]":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz"
integrity "sha1-ayA2ZPaedRBu6LWi/h1xc3mzMfM= sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg=="
dependencies:
"@sentry/hub" "5.30.0"
"@sentry/minimal" "5.30.0"
"@sentry/types" "5.30.0"
"@sentry/utils" "5.30.0"
tslib "^1.9.3"

"@sentry/[email protected]":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz"
integrity "sha1-JFO+m5y5A0BDZuGYvTDHynTNwQA= sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ=="
dependencies:
"@sentry/types" "5.30.0"
"@sentry/utils" "5.30.0"
tslib "^1.9.3"

"@sentry/[email protected]":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz"
integrity "sha1-zj06aic0KOAISty4ALwS5y00Y3s= sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw=="
dependencies:
"@sentry/hub" "5.30.0"
"@sentry/types" "5.30.0"
tslib "^1.9.3"

"@sentry/react@^5.19.1":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/react/-/react-5.30.0.tgz"
integrity "sha1-Mg4F92a2om+u+o120RAf1Qxp9UE= sha512-dvn4mqCgbeEuUXEGp5P9PaW5j4GWTFUSdx/yG8f9IxNZv5zM+7otjog9ukrubFZvlxVxD/PrIxK0MhadfFY/Dw=="
dependencies:
"@sentry/browser" "5.30.0"
"@sentry/minimal" "5.30.0"
"@sentry/types" "5.30.0"
"@sentry/utils" "5.30.0"
"@sentry-internal/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.30.0.tgz#eb68c79556ffb864eb5924a53affde52f2b77362"
integrity sha512-pwX+awNWaxSOAsBLVLqc1+Hw+Fm1Nci9mbKFA6Ed5YzCG049PnBVQwugpmx2dcyyCqJpORhcIqb9jHdCkYmCiA==
dependencies:
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry-internal/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.30.0.tgz#6f78a245298502e4cc5ce77313dde6965abfecfe"
integrity sha512-ParFRxQY6helxkwUDmro77Wc5uSIC6rZos88jYMrYwFmoTJaNWf4lDzPyECfdSiSYyzSMZk4dorSUN85Ul7DCg==
dependencies:
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry-internal/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.30.0.tgz#3630eec14d23b1fd368d8c331ee695aa5bb41425"
integrity sha512-y/QqcvchhtMlVA6eOZicIfTxtZarazQZJuFW0018ynPxBTiuuWSxMCLqduulXUYsFejfD8/eKHb3BpCIFdDYjg==
dependencies:
"@sentry-internal/replay" "8.30.0"
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry-internal/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.30.0.tgz#6a4a8bd551a16ea5f77f913acbccd88061868c84"
integrity sha512-/KFre+BrovPCiovgAu5N1ErJtkDVzkJA5hV3Jw011AlxRWxrmPwu6+9sV9/rn3tqYAGyq6IggYqeIOHhLh1Ihg==
dependencies:
"@sentry-internal/browser-utils" "8.30.0"
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.30.0.tgz#3c6d5ef62d7daca2873b47f59b136c33941b56de"
integrity sha512-M+tKqawH9S3CqlAIcqdZcHbcsNQkEa9MrPqPCYvXco3C4LRpNizJP2XwBiGQY2yK+fOSvbaWpPtlI938/wuRZQ==
dependencies:
"@sentry-internal/browser-utils" "8.30.0"
"@sentry-internal/feedback" "8.30.0"
"@sentry-internal/replay" "8.30.0"
"@sentry-internal/replay-canvas" "8.30.0"
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry/[email protected]":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.30.0.tgz#f929e42e9a537bfa3eb6024082714e9ab98d822b"
integrity sha512-CJ/FuWLw0QEKGKXGL/nm9eaOdajEcmPekLuHAuOCxID7N07R9l9laz3vFbAkUZ97GGDv3sYrJZgywfY3Moropg==
dependencies:
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"

"@sentry/react@^8.28.0":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry/react/-/react-8.30.0.tgz#fe24964d3f5e963749d8a11b45332cea85bd9ac4"
integrity sha512-ktQjXs87jdsxW0YrHci3sb6zcSzhMECWnrTVU/KGZF8UoDsk4P4xRCknijd2SSmDIjSkwzUAANR43UkCi4BTQg==
dependencies:
"@sentry/browser" "8.30.0"
"@sentry/core" "8.30.0"
"@sentry/types" "8.30.0"
"@sentry/utils" "8.30.0"
hoist-non-react-statics "^3.3.2"
tslib "^1.9.3"

"@sentry/types@5.30.0":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz"
integrity "sha1-GXCbvhKhoBFbx5C4lCkX2lY29AI= sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw=="
"@sentry/types@8.30.0":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-8.30.0.tgz#5f5011f5b16bafd30a039ca5e8c337e948c703fb"
integrity sha512-kgWW2BCjBmVlSQRG32GonHEVyeDbys74xf9mLPvynwHTgw3+NUlNAlEdu05xnb2ow4bCTHfbkS5G1zRgyv5k4Q==

"@sentry/utils@5.30.0":
version "5.30.0"
resolved "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz"
integrity "sha1-mlvXzP+FzP54VtSTv/pkyrxB6YA= sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww=="
"@sentry/utils@8.30.0":
version "8.30.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-8.30.0.tgz#2343dd8593ea83890b3e0d792ed3fa257955a26b"
integrity sha512-wZxU2HWlzsnu8214Xy7S7cRIuD6h8Z5DnnkojJfX0i0NLooepZQk2824el1Q13AakLb7/S8CHSHXOMnCtoSduw==
dependencies:
"@sentry/types" "5.30.0"
tslib "^1.9.3"
"@sentry/types" "8.30.0"

"@sinclair/typebox@^0.24.1":
version "0.24.51"
Expand Down Expand Up @@ -4929,13 +4947,15 @@ connect-history-api-fallback@^2.0.0:
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==

connected-react-router@^4.2.3:
version "4.5.0"
resolved "https://registry.npmjs.org/connected-react-router/-/connected-react-router-4.5.0.tgz"
integrity "sha1-tvAhzChKJE++5w4W5f8PKkYT49M= sha512-SBBmAZrtmw4y7Rkl2PCct8lN/DuCftl7QSAFLgFyjjuYkeJKAzAvQjzNNNE4R3j2+6a4TUiv8qselxQ4+6H5eA=="
connected-react-router@^6.9.3:
version "6.9.3"
resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972"
integrity sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ==
dependencies:
immutable "^3.8.1"
redux-seamless-immutable "^0.4.0"
lodash.isequalwith "^4.4.0"
prop-types "^15.7.2"
optionalDependencies:
immutable "^3.8.1 || ^4.0.0"
seamless-immutable "^7.1.3"

console-browserify@^1.1.0:
Expand Down Expand Up @@ -7638,10 +7658,10 @@ immutability-helper@^3.0.1:
resolved "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.1.1.tgz"
integrity "sha1-K4ayKG7TsSQcniO3sh4ERPUvd7c= sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="

immutable@^3.8.1:
version "3.8.2"
resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"
integrity "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="
"immutable@^3.8.1 || ^4.0.0":
version "4.3.7"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==

import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.3.0"
Expand Down Expand Up @@ -9227,6 +9247,11 @@ lodash.debounce@^4.0.0, lodash.debounce@^4.0.8:
resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
integrity "sha1-gteb/zCmfEAF/9XiUVMArZyk168= sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="

lodash.isequalwith@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0"
integrity sha512-dcZON0IalGBpRmJBmMkaoV7d3I80R2O+FrzsZyHdNSFrANq/cgDqKQNmAHE8UEj4+QYWwwhkQOVdLHiAopzlsQ==

lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
Expand Down Expand Up @@ -11651,11 +11676,6 @@ react-router-dom@^4.2.2:
react-router "^4.3.1"
warning "^4.0.1"

react-router-redux@^4.0.0:
version "4.0.8"
resolved "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.8.tgz"
integrity "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4= sha512-lzlK+S6jZnn17BZbzBe6F8ok3YAhGAUlyWgRu3cz5mT199gKxfem5lNu3qcgzRiVhNEOFVG0/pdT+1t4aWhoQw=="

react-router@^4.2.0, react-router@^4.3.1:
version "4.3.1"
resolved "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz"
Expand Down Expand Up @@ -11947,14 +11967,6 @@ redux-logger@^3.0.6:
dependencies:
deep-diff "^0.3.5"

redux-seamless-immutable@^0.4.0:
version "0.4.0"
resolved "https://registry.npmjs.org/redux-seamless-immutable/-/redux-seamless-immutable-0.4.0.tgz"
integrity "sha1-tQ+GgOzF7wQCFVEmf3j6H/08+YU= sha512-/oS3fhrize9D3RSHemgJxVllohybRrad5IjccotFy8Ni4IKAPTtX1mqszpiCIl12+7v0dNqBpq6ES6R236AliQ=="
dependencies:
react-router-redux "^4.0.0"
seamless-immutable "^7.1.2"

redux-thunk@^2.2.0:
version "2.4.0"
resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.0.tgz"
Expand Down Expand Up @@ -12446,7 +12458,7 @@ scrollparent@^2.0.1:
resolved "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz"
integrity "sha1-cV1bnMV3YPsivczDvvtb/gaxoxc= sha512-HSdN78VMvFCSGCkh0oYX/tY4R3P1DW61f8+TeZZ4j2VLgfwvw0bpRSOv4PCVKisktIwbzHCfZsx+rLbbDBqIBA=="

seamless-immutable@^7.1.2, seamless-immutable@^7.1.3:
seamless-immutable@^7.1.3:
version "7.1.4"
resolved "https://registry.npmjs.org/seamless-immutable/-/seamless-immutable-7.1.4.tgz"
integrity "sha1-bpU23vCD3cTeoCB9ci4OgNDzcvg= sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A=="
Expand Down Expand Up @@ -12970,8 +12982,8 @@ string-width@^1.0.1, string-width@^1.0.2:

string-width@^4.1.0, string-width@^4.2.0:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity "sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
Expand Down Expand Up @@ -13059,8 +13071,8 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity "sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

Expand Down Expand Up @@ -13558,7 +13570,7 @@ tsconfig-paths@^3.14.1:
minimist "^1.2.6"
strip-bom "^3.0.0"

tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.3:
tslib@^1.11.1, tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
integrity "sha1-zy04vcNKE0vK8QkcQfZhni9nLQA= sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
Expand Down Expand Up @@ -14554,8 +14566,8 @@ wrap-ansi@^6.0.1:

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
integrity "sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
Expand Down