From 4b79b061067c68680a71e59786cf6039e861c2f6 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 6 Nov 2020 18:36:28 +0700 Subject: [PATCH] fixed for nextjs, but it won't work --- pages/index.tsx | 5 +++++ src/components/bars/PlayerBar/index.tsx | 4 ++-- src/components/boris/BorisStatsGitCard/index.tsx | 2 +- src/components/containers/CommentWrapper/index.tsx | 2 +- src/components/containers/PageCover/index.tsx | 2 +- src/components/editors/EditorUploadButton/index.tsx | 4 ++-- .../editors/EditorUploadCoverButton/index.tsx | 2 +- src/components/editors/TextEditor/index.tsx | 2 +- src/components/editors/VideoEditor/index.tsx | 2 +- src/components/flow/FlowGrid/index.tsx | 6 +++--- src/components/main/Header/index.tsx | 4 ++-- src/components/main/Notifications/index.tsx | 2 +- src/components/node/CommentContent/index.tsx | 12 ++++++------ src/components/node/CommentForm/index.tsx | 2 +- src/components/node/NodeAudioImageBlock/index.tsx | 2 +- src/components/node/NodeCommentForm/index.tsx | 2 +- src/components/node/NodeTextBlock/index.tsx | 2 +- src/components/node/NodeVideoBlock/index.tsx | 2 +- src/components/profile/ProfileSettings/index.tsx | 2 +- src/components/tags/Tags/index.tsx | 2 +- src/containers/dialogs/LoginDialog/index.tsx | 2 +- src/containers/dialogs/ProfileDialog/index.tsx | 2 +- .../dialogs/RestorePasswordDialog/index.tsx | 2 +- .../dialogs/RestoreRequestDialog/index.tsx | 2 +- src/containers/flow/FlowLayout/index.tsx | 2 +- src/containers/main/BottomContainer/index.tsx | 2 +- src/containers/node/NodeLayout/index.tsx | 2 +- src/containers/profile/ProfileAvatar/index.tsx | 12 ++++-------- src/containers/profile/ProfileMessages/index.tsx | 2 +- src/redux/boris/reducer.ts | 2 +- src/redux/flow/handlers.ts | 2 +- src/redux/flow/sagas.ts | 2 +- src/redux/node/handlers.ts | 2 +- src/redux/node/sagas.ts | 2 +- src/redux/player/handlers.ts | 2 +- src/redux/uploads/handlers.ts | 4 ++-- src/utils/fn.ts | 10 +++++----- src/utils/node.ts | 2 +- src/utils/player.ts | 8 ++++---- 39 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 pages/index.tsx diff --git a/pages/index.tsx b/pages/index.tsx new file mode 100644 index 00000000..c762302d --- /dev/null +++ b/pages/index.tsx @@ -0,0 +1,5 @@ +import App from "../src/containers/App"; + +const HomePage = () => () + +export default HomePage diff --git a/src/components/bars/PlayerBar/index.tsx b/src/components/bars/PlayerBar/index.tsx index c6b0d5ec..abc7445e 100644 --- a/src/components/bars/PlayerBar/index.tsx +++ b/src/components/bars/PlayerBar/index.tsx @@ -3,11 +3,11 @@ import styles from './styles.module.scss'; import { Icon } from '~/components/input/Icon'; import { PLAYER_STATES } from '~/redux/player/constants'; import { connect } from 'react-redux'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { selectPlayer } from '~/redux/player/selectors'; import * as PLAYER_ACTIONS from '~/redux/player/actions'; import { IPlayerProgress, Player } from '~/utils/player'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { IFile } from '~/redux/types'; const mapStateToProps = state => pick(['status', 'file'], selectPlayer(state)); diff --git a/src/components/boris/BorisStatsGitCard/index.tsx b/src/components/boris/BorisStatsGitCard/index.tsx index 8d416ece..f393b710 100644 --- a/src/components/boris/BorisStatsGitCard/index.tsx +++ b/src/components/boris/BorisStatsGitCard/index.tsx @@ -4,7 +4,7 @@ import styles from './styles.module.scss'; import { getPrettyDate } from '~/utils/dom'; interface IProps { - data: IStatGitRow; + data: Partial; } const BorisStatsGitCard: FC = ({ data: { timestamp, subject } }) => { diff --git a/src/components/containers/CommentWrapper/index.tsx b/src/components/containers/CommentWrapper/index.tsx index 80c84eed..959befea 100644 --- a/src/components/containers/CommentWrapper/index.tsx +++ b/src/components/containers/CommentWrapper/index.tsx @@ -5,7 +5,7 @@ import styles from './styles.module.scss'; import { Card } from '../Card'; import { IUser } from '~/redux/auth/types'; import { getURL } from '~/utils/dom'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { PRESETS } from '~/constants/urls'; type IProps = HTMLAttributes & { diff --git a/src/components/containers/PageCover/index.tsx b/src/components/containers/PageCover/index.tsx index e5154978..9b0380d0 100644 --- a/src/components/containers/PageCover/index.tsx +++ b/src/components/containers/PageCover/index.tsx @@ -3,7 +3,7 @@ import styles from './styles.module.scss'; import { createPortal } from 'react-dom'; import { selectNode } from '~/redux/node/selectors'; import { connect } from 'react-redux'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { getURL } from '~/utils/dom'; import { PRESETS } from '~/constants/urls'; diff --git a/src/components/editors/EditorUploadButton/index.tsx b/src/components/editors/EditorUploadButton/index.tsx index 49dad45e..34e90a44 100644 --- a/src/components/editors/EditorUploadButton/index.tsx +++ b/src/components/editors/EditorUploadButton/index.tsx @@ -5,8 +5,8 @@ import { IFileWithUUID, INode, IFile } from '~/redux/types'; import uuid from 'uuid4'; import { UPLOAD_SUBJECTS, UPLOAD_TARGETS, UPLOAD_TYPES } from '~/redux/uploads/constants'; import * as UPLOAD_ACTIONS from '~/redux/uploads/actions'; -import assocPath from 'ramda/es/assocPath'; -import append from 'ramda/es/append'; +import { assocPath } from 'ramda'; +import { append } from 'ramda'; import { selectUploads } from '~/redux/uploads/selectors'; import { connect } from 'react-redux'; import { NODE_SETTINGS } from '~/redux/node/constants'; diff --git a/src/components/editors/EditorUploadCoverButton/index.tsx b/src/components/editors/EditorUploadCoverButton/index.tsx index a6f410ee..38cf84c3 100644 --- a/src/components/editors/EditorUploadCoverButton/index.tsx +++ b/src/components/editors/EditorUploadCoverButton/index.tsx @@ -3,7 +3,7 @@ import { IFileWithUUID } from '~/redux/types'; import uuid from 'uuid4'; import styles from './styles.module.scss'; import { UPLOAD_SUBJECTS, UPLOAD_TARGETS, UPLOAD_TYPES } from '~/redux/uploads/constants'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { connect } from 'react-redux'; import * as UPLOAD_ACTIONS from '~/redux/uploads/actions'; import { selectUploads } from '~/redux/uploads/selectors'; diff --git a/src/components/editors/TextEditor/index.tsx b/src/components/editors/TextEditor/index.tsx index c183ca9a..2cb1e6fb 100644 --- a/src/components/editors/TextEditor/index.tsx +++ b/src/components/editors/TextEditor/index.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import { INode } from '~/redux/types'; import styles from './styles.module.scss'; import { Textarea } from '~/components/input/Textarea'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; interface IProps { data: INode; diff --git a/src/components/editors/VideoEditor/index.tsx b/src/components/editors/VideoEditor/index.tsx index b0bac6da..443dae4c 100644 --- a/src/components/editors/VideoEditor/index.tsx +++ b/src/components/editors/VideoEditor/index.tsx @@ -1,7 +1,7 @@ import React, { FC, useCallback, useMemo } from 'react'; import { INode } from '~/redux/types'; import styles from './styles.module.scss'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { InputText } from '~/components/input/InputText'; import classnames from 'classnames'; import { getYoutubeThumb } from '~/utils/dom'; diff --git a/src/components/flow/FlowGrid/index.tsx b/src/components/flow/FlowGrid/index.tsx index f0e58c33..98ff4ff3 100644 --- a/src/components/flow/FlowGrid/index.tsx +++ b/src/components/flow/FlowGrid/index.tsx @@ -1,4 +1,4 @@ -import React, { FC } from 'react'; +import React, { FC, Fragment } from 'react'; import { Cell } from '~/components/flow/Cell'; import { IFlowState } from '~/redux/flow/reducer'; @@ -14,7 +14,7 @@ type IProps = Partial & { }; export const FlowGrid: FC = ({ user, nodes, onSelect, onChangeCellView }) => ( - <> + {nodes.map(node => ( = ({ user, nodes, onSelect, onChangeCellView } onChangeCellView={onChangeCellView} /> ))} - + ); diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx index 84d7ca92..43d7646c 100644 --- a/src/components/main/Header/index.tsx +++ b/src/components/main/Header/index.tsx @@ -8,8 +8,8 @@ import { Filler } from '~/components/containers/Filler'; import { selectUser, selectAuthUpdates } from '~/redux/auth/selectors'; import { Group } from '~/components/containers/Group'; import { DIALOGS } from '~/redux/modal/constants'; -import pick from 'ramda/es/pick'; -import path from 'ramda/es/path'; +import { pick } from 'ramda'; +import { path } from 'ramda'; import { UserButton } from '../UserButton'; import { Notifications } from '../Notifications'; import { URLS } from '~/constants/urls'; diff --git a/src/components/main/Notifications/index.tsx b/src/components/main/Notifications/index.tsx index 6d1ac576..2b02db7b 100644 --- a/src/components/main/Notifications/index.tsx +++ b/src/components/main/Notifications/index.tsx @@ -3,7 +3,7 @@ import { Icon } from '~/components/input/Icon'; import styles from './styles.module.scss'; import { connect } from 'react-redux'; import { selectAuthUpdates, selectAuthUser } from '~/redux/auth/selectors'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import classNames from 'classnames'; import * as AUTH_ACTIONS from '~/redux/auth/actions'; import { NotificationBubble } from '../../notifications/NotificationBubble'; diff --git a/src/components/node/CommentContent/index.tsx b/src/components/node/CommentContent/index.tsx index 1accc82c..08e9c49a 100644 --- a/src/components/node/CommentContent/index.tsx +++ b/src/components/node/CommentContent/index.tsx @@ -1,12 +1,12 @@ -import React, { FC, useMemo, memo, createElement, useCallback, useState } from 'react'; +import React, { FC, useMemo, memo, createElement, useCallback, Fragment } from 'react'; import { IComment, IFile } from '~/redux/types'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { formatCommentText, getURL, getPrettyDate } from '~/utils/dom'; import { Group } from '~/components/containers/Group'; import styles from './styles.module.scss'; import { UPLOAD_TYPES } from '~/redux/uploads/constants'; -import assocPath from 'ramda/es/assocPath'; -import append from 'ramda/es/append'; +import { assocPath } from 'ramda'; +import { append } from 'ramda'; import reduce from 'ramda/es/reduce'; import { AudioPlayer } from '~/components/media/AudioPlayer'; import classnames from 'classnames'; @@ -84,7 +84,7 @@ const CommentContent: FC = memo( )} {groupped.audio && groupped.audio.length > 0 && ( - <> + {groupped.audio.map(file => (
{menu} @@ -94,7 +94,7 @@ const CommentContent: FC = memo(
{getPrettyDate(comment.created_at)}
))} - + )} ); diff --git a/src/components/node/CommentForm/index.tsx b/src/components/node/CommentForm/index.tsx index 3481b9b5..c534e261 100644 --- a/src/components/node/CommentForm/index.tsx +++ b/src/components/node/CommentForm/index.tsx @@ -3,7 +3,7 @@ import { Textarea } from '~/components/input/Textarea'; import styles from './styles.module.scss'; import { Filler } from '~/components/containers/Filler'; import { Button } from '~/components/input/Button'; -import assocPath from 'ramda/es/assocPath'; +import { assocPath } from 'ramda'; import { IFile, IFileWithUUID, InputHandler } from '~/redux/types'; import { connect } from 'react-redux'; import * as NODE_ACTIONS from '~/redux/node/actions'; diff --git a/src/components/node/NodeAudioImageBlock/index.tsx b/src/components/node/NodeAudioImageBlock/index.tsx index 57e36d00..ca848b3f 100644 --- a/src/components/node/NodeAudioImageBlock/index.tsx +++ b/src/components/node/NodeAudioImageBlock/index.tsx @@ -2,7 +2,7 @@ import React, { FC, useMemo } from 'react'; import { INode } from '~/redux/types'; import styles from './styles.module.scss'; import { UPLOAD_TYPES } from '~/redux/uploads/constants'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { getURL } from '~/utils/dom'; import { PRESETS } from '~/constants/urls'; import { INodeComponentProps } from '~/redux/node/constants'; diff --git a/src/components/node/NodeCommentForm/index.tsx b/src/components/node/NodeCommentForm/index.tsx index b72c663b..a06939a1 100644 --- a/src/components/node/NodeCommentForm/index.tsx +++ b/src/components/node/NodeCommentForm/index.tsx @@ -4,7 +4,7 @@ import { CommentWrapper } from '~/components/containers/CommentWrapper'; import styles from './styles.module.scss'; import { Filler } from '~/components/containers/Filler'; import { Button } from '~/components/input/Button'; -import assocPath from 'ramda/es/assocPath'; +import { assocPath } from 'ramda'; import { InputHandler, IFileWithUUID, IFile } from '~/redux/types'; import { connect } from 'react-redux'; import * as NODE_ACTIONS from '~/redux/node/actions'; diff --git a/src/components/node/NodeTextBlock/index.tsx b/src/components/node/NodeTextBlock/index.tsx index 9ecbc69d..25f1c2b2 100644 --- a/src/components/node/NodeTextBlock/index.tsx +++ b/src/components/node/NodeTextBlock/index.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { INode } from '~/redux/types'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { formatTextParagraphs } from '~/utils/dom'; import styles from './styles.module.scss'; import { INodeComponentProps } from '~/redux/node/constants'; diff --git a/src/components/node/NodeVideoBlock/index.tsx b/src/components/node/NodeVideoBlock/index.tsx index 406fb256..b4e663fc 100644 --- a/src/components/node/NodeVideoBlock/index.tsx +++ b/src/components/node/NodeVideoBlock/index.tsx @@ -1,6 +1,6 @@ import React, { FC, useMemo } from 'react'; import styles from './styles.module.scss'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { INodeComponentProps } from '~/redux/node/constants'; interface IProps extends INodeComponentProps {} diff --git a/src/components/profile/ProfileSettings/index.tsx b/src/components/profile/ProfileSettings/index.tsx index f119adb2..a1ca67f1 100644 --- a/src/components/profile/ProfileSettings/index.tsx +++ b/src/components/profile/ProfileSettings/index.tsx @@ -7,7 +7,7 @@ import { Button } from '~/components/input/Button'; import { Group } from '~/components/containers/Group'; import { Filler } from '~/components/containers/Filler'; import { InputText } from '~/components/input/InputText'; -import reject from 'ramda/es/reject'; +import { reject } from 'ramda'; import * as AUTH_ACTIONS from '~/redux/auth/actions'; import { ERROR_LITERAL } from '~/constants/errors'; import { ProfileAccounts } from '~/components/profile/ProfileAccounts'; diff --git a/src/components/tags/Tags/index.tsx b/src/components/tags/Tags/index.tsx index 8feec917..5c15f08d 100644 --- a/src/components/tags/Tags/index.tsx +++ b/src/components/tags/Tags/index.tsx @@ -1,7 +1,7 @@ import React, { FC, HTMLAttributes, useCallback, useEffect, useMemo, useState } from 'react'; import { TagField } from '~/components/containers/TagField'; import { ITag } from '~/redux/types'; -import uniq from 'ramda/es/uniq'; +import { uniq } from 'ramda'; import { Tag } from '~/components/tags/Tag'; import { TagInput } from '~/components/tags/TagInput'; import { separateTags } from '~/utils/tag'; diff --git a/src/containers/dialogs/LoginDialog/index.tsx b/src/containers/dialogs/LoginDialog/index.tsx index a2a9c92e..44728a83 100644 --- a/src/containers/dialogs/LoginDialog/index.tsx +++ b/src/containers/dialogs/LoginDialog/index.tsx @@ -14,7 +14,7 @@ import styles from './styles.module.scss'; import * as ACTIONS from '~/redux/auth/actions'; import * as MODAL_ACTIONS from '~/redux/modal/actions'; import { ISocialProvider } from '~/redux/auth/types'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { LoginDialogButtons } from '~/containers/dialogs/LoginDialogButtons'; import { IOAuthEvent, OAUTH_EVENT_TYPES } from '~/redux/types'; import { DialogTitle } from '~/components/dialogs/DialogTitle'; diff --git a/src/containers/dialogs/ProfileDialog/index.tsx b/src/containers/dialogs/ProfileDialog/index.tsx index 4e361af5..23e247b9 100644 --- a/src/containers/dialogs/ProfileDialog/index.tsx +++ b/src/containers/dialogs/ProfileDialog/index.tsx @@ -8,7 +8,7 @@ import { ProfileMessages } from '~/containers/profile/ProfileMessages'; import { ProfileDescription } from '~/components/profile/ProfileDescription'; import * as AUTH_ACTIONS from '~/redux/auth/actions'; import { IAuthState } from '~/redux/auth/types'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { CoverBackdrop } from '~/components/containers/CoverBackdrop'; import { ProfileSettings } from '~/components/profile/ProfileSettings'; import { ProfileAccounts } from '~/components/profile/ProfileAccounts'; diff --git a/src/containers/dialogs/RestorePasswordDialog/index.tsx b/src/containers/dialogs/RestorePasswordDialog/index.tsx index 28928e43..905c6126 100644 --- a/src/containers/dialogs/RestorePasswordDialog/index.tsx +++ b/src/containers/dialogs/RestorePasswordDialog/index.tsx @@ -8,7 +8,7 @@ import { Button } from '~/components/input/Button'; import styles from './styles.module.scss'; import * as AUTH_ACTIONS from '~/redux/auth/actions'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { selectAuthRestore } from '~/redux/auth/selectors'; import { ERROR_LITERAL, ERRORS } from '~/constants/errors'; import { Icon } from '~/components/input/Icon'; diff --git a/src/containers/dialogs/RestoreRequestDialog/index.tsx b/src/containers/dialogs/RestoreRequestDialog/index.tsx index bbe036b9..5a77c6d9 100644 --- a/src/containers/dialogs/RestoreRequestDialog/index.tsx +++ b/src/containers/dialogs/RestoreRequestDialog/index.tsx @@ -8,7 +8,7 @@ import { Button } from '~/components/input/Button'; import styles from './styles.module.scss'; import * as AUTH_ACTIONS from '~/redux/auth/actions'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { selectAuthRestore } from '~/redux/auth/selectors'; import { ERROR_LITERAL } from '~/constants/errors'; import { Icon } from '~/components/input/Icon'; diff --git a/src/containers/flow/FlowLayout/index.tsx b/src/containers/flow/FlowLayout/index.tsx index c9dd09b8..179781b6 100644 --- a/src/containers/flow/FlowLayout/index.tsx +++ b/src/containers/flow/FlowLayout/index.tsx @@ -4,7 +4,7 @@ import { FlowGrid } from '~/components/flow/FlowGrid'; import { selectFlow } from '~/redux/flow/selectors'; import * as NODE_ACTIONS from '~/redux/node/actions'; import * as FLOW_ACTIONS from '~/redux/flow/actions'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { selectUser } from '~/redux/auth/selectors'; import { FlowHero } from '~/components/flow/FlowHero'; import styles from './styles.module.scss'; diff --git a/src/containers/main/BottomContainer/index.tsx b/src/containers/main/BottomContainer/index.tsx index dc93ac3d..51ab510b 100644 --- a/src/containers/main/BottomContainer/index.tsx +++ b/src/containers/main/BottomContainer/index.tsx @@ -3,7 +3,7 @@ import styles from './styles.module.scss'; import { PlayerBar } from '~/components/bars/PlayerBar'; import { SubmitBar } from '~/components/bars/SubmitBar'; import { selectUser } from '~/redux/auth/selectors'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { connect } from 'react-redux'; const mapStateToProps = state => pick(['is_user'], selectUser(state)); diff --git a/src/containers/node/NodeLayout/index.tsx b/src/containers/node/NodeLayout/index.tsx index 88c762ba..12d69f3c 100644 --- a/src/containers/node/NodeLayout/index.tsx +++ b/src/containers/node/NodeLayout/index.tsx @@ -14,7 +14,7 @@ import { NodeComments } from '~/components/node/NodeComments'; import { NodeTags } from '~/components/node/NodeTags'; import { INodeComponentProps, NODE_COMPONENTS, NODE_HEADS, NODE_INLINES, } from '~/redux/node/constants'; import { selectUser } from '~/redux/auth/selectors'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { NodeRelatedPlaceholder } from '~/components/node/NodeRelated/placeholder'; import { NodeDeletedBadge } from '~/components/node/NodeDeletedBadge'; import { NodeCommentForm } from '~/components/node/NodeCommentForm'; diff --git a/src/containers/profile/ProfileAvatar/index.tsx b/src/containers/profile/ProfileAvatar/index.tsx index 46db7d6f..07869b7d 100644 --- a/src/containers/profile/ProfileAvatar/index.tsx +++ b/src/containers/profile/ProfileAvatar/index.tsx @@ -2,18 +2,14 @@ import React, { FC, useCallback, useEffect, useState } from "react"; import styles from "./styles.module.scss"; import { connect } from "react-redux"; import { getURL } from "~/utils/dom"; -import pick from "ramda/es/pick"; -import { selectAuthUser, selectAuthProfile } from "~/redux/auth/selectors"; +import { pick } from "ramda"; +import { selectAuthProfile, selectAuthUser } from "~/redux/auth/selectors"; import { PRESETS } from "~/constants/urls"; import { selectUploads } from "~/redux/uploads/selectors"; import { IFileWithUUID } from "~/redux/types"; import uuid from "uuid4"; -import { - UPLOAD_SUBJECTS, - UPLOAD_TARGETS, - UPLOAD_TYPES -} from "~/redux/uploads/constants"; -import path from "ramda/es/path"; +import { UPLOAD_SUBJECTS, UPLOAD_TARGETS, UPLOAD_TYPES } from "~/redux/uploads/constants"; +import { path } from 'ramda'; import * as UPLOAD_ACTIONS from "~/redux/uploads/actions"; import * as AUTH_ACTIONS from "~/redux/auth/actions"; import { Icon } from "~/components/input/Icon"; diff --git a/src/containers/profile/ProfileMessages/index.tsx b/src/containers/profile/ProfileMessages/index.tsx index 5e601e68..61948d2d 100644 --- a/src/containers/profile/ProfileMessages/index.tsx +++ b/src/containers/profile/ProfileMessages/index.tsx @@ -4,7 +4,7 @@ import { selectAuthProfile, selectAuthUser } from '~/redux/auth/selectors'; import styles from './styles.module.scss'; import * as AUTH_ACTIONS from '~/redux/messages/actions'; import { Message } from '~/components/profile/Message'; -import pick from 'ramda/es/pick'; +import { pick } from 'ramda'; import { NodeNoComments } from '~/components/node/NodeNoComments'; import { selectMessages } from '~/redux/messages/selectors'; diff --git a/src/redux/boris/reducer.ts b/src/redux/boris/reducer.ts index 03bea94c..cb2ff72e 100644 --- a/src/redux/boris/reducer.ts +++ b/src/redux/boris/reducer.ts @@ -30,7 +30,7 @@ export type IStatBackend = { export type IBorisState = Readonly<{ stats: { - git: IStatGitRow[]; + git: Partial[]; backend: IStatBackend; is_loading: boolean; }; diff --git a/src/redux/flow/handlers.ts b/src/redux/flow/handlers.ts index 1ae8f803..be553c57 100644 --- a/src/redux/flow/handlers.ts +++ b/src/redux/flow/handlers.ts @@ -1,4 +1,4 @@ -import assocPath from 'ramda/es/assocPath'; +import { assocPath } from 'ramda'; import { FLOW_ACTIONS } from './constants'; import { flowSetNodes, diff --git a/src/redux/flow/sagas.ts b/src/redux/flow/sagas.ts index ec96a5cc..0929999b 100644 --- a/src/redux/flow/sagas.ts +++ b/src/redux/flow/sagas.ts @@ -17,7 +17,7 @@ import { selectFlowNodes, selectFlow } from './selectors'; import { reqWrapper } from '../auth/sagas'; import { postCellView, getSearchResults } from './api'; import { IFlowState } from './reducer'; -import uniq from 'ramda/es/uniq'; +import { uniq } from 'ramda'; function hideLoader() { document.getElementById('main_loader').style.display = 'none'; diff --git a/src/redux/node/handlers.ts b/src/redux/node/handlers.ts index 5c542b56..65386a00 100644 --- a/src/redux/node/handlers.ts +++ b/src/redux/node/handlers.ts @@ -1,4 +1,4 @@ -import assocPath from 'ramda/es/assocPath'; +import { assocPath } from 'ramda'; import { NODE_ACTIONS } from './constants'; import { nodeSetSaveErrors, diff --git a/src/redux/node/sagas.ts b/src/redux/node/sagas.ts index 7a37a9cb..cf51db12 100644 --- a/src/redux/node/sagas.ts +++ b/src/redux/node/sagas.ts @@ -1,6 +1,6 @@ import { takeLatest, call, put, select, delay, all, takeLeading } from 'redux-saga/effects'; import { push } from 'connected-react-router'; -import omit from 'ramda/es/omit'; +import { omit } from 'ramda'; import { NODE_ACTIONS, diff --git a/src/redux/player/handlers.ts b/src/redux/player/handlers.ts index 4644dfca..34eea2ab 100644 --- a/src/redux/player/handlers.ts +++ b/src/redux/player/handlers.ts @@ -1,5 +1,5 @@ import { PLAYER_ACTIONS } from './constants'; -import assocPath from 'ramda/es/assocPath'; +import { assocPath } from 'ramda'; import { playerSetFile, playerSetStatus, playerSet } from './actions'; const setFile = (state, { file }: ReturnType) => diff --git a/src/redux/uploads/handlers.ts b/src/redux/uploads/handlers.ts index e24fe4f2..fe3140bf 100644 --- a/src/redux/uploads/handlers.ts +++ b/src/redux/uploads/handlers.ts @@ -1,5 +1,5 @@ -import assocPath from 'ramda/es/assocPath'; -import omit from 'ramda/es/omit'; +import { assocPath } from 'ramda'; +import { omit } from 'ramda'; import { UPLOAD_ACTIONS, EMPTY_UPLOAD_STATUS } from './constants'; import { diff --git a/src/utils/fn.ts b/src/utils/fn.ts index d05c8786..def79fbb 100644 --- a/src/utils/fn.ts +++ b/src/utils/fn.ts @@ -1,9 +1,9 @@ -import curry from 'ramda/es/curry'; -import insert from 'ramda/es/insert'; -import nth from 'ramda/es/nth'; -import remove from 'ramda/es/remove'; +import { curry } from 'ramda'; +import { insert } from 'ramda'; +import { nth } from 'ramda'; +import { remove } from 'ramda'; import { ICommentGroup, IComment } from '~/redux/types'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; export const moveArrItem = curry((at, to, list) => insert(to, nth(at, list), remove(at, 1, list))); export const objFromArray = (array: any[], key: string) => diff --git a/src/utils/node.ts b/src/utils/node.ts index 59b0aa3e..f00d006c 100644 --- a/src/utils/node.ts +++ b/src/utils/node.ts @@ -1,7 +1,7 @@ import { USER_ROLES } from '~/redux/auth/constants'; import { ICommentGroup, INode } from '~/redux/types'; import { IUser } from '~/redux/auth/types'; -import path from 'ramda/es/path'; +import { path } from 'ramda'; import { NODE_TYPES } from '~/redux/node/constants'; export const canEditNode = (node: Partial, user: Partial): boolean => diff --git a/src/utils/player.ts b/src/utils/player.ts index 23e5d501..e7d747aa 100644 --- a/src/utils/player.ts +++ b/src/utils/player.ts @@ -17,7 +17,7 @@ export interface IPlayerProgress { export class PlayerClass { public constructor() { - this.element.addEventListener('timeupdate', () => { + this.element?.addEventListener('timeupdate', () => { const { duration: total, currentTime: current } = this.element; const progress = parseFloat(((current / total) * 100).toFixed(2)); @@ -36,7 +36,7 @@ export class PlayerClass { public total: number = 0; - public element: HTMLAudioElement = new Audio(); + public element: HTMLAudioElement = typeof Audio !== 'undefined' ? new Audio() : null; public duration: number = 0; @@ -45,11 +45,11 @@ export class PlayerClass { }; public on = (type: string, callback) => { - this.element.addEventListener(type, callback); + this.element?.addEventListener(type, callback); }; public off = (type: string, callback) => { - this.element.removeEventListener(type, callback); + this.element?.removeEventListener(type, callback); }; public load = () => {