muerwre/vault-frontend
1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-24 20:36:40 +07:00
Code Packages Activity Actions

renamed providers to context

Browse source
This commit is contained in:
Fedor Katurov 2021-11-21 16:51:59 +07:00
parent 0dc5ae99a3
commit 7284ed7301
14 changed files with 54 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/boris/BorisComments/index.tsx
View file

@ -5,9 +5,9 @@ import { NodeCommentForm } from '~/components/node/NodeCommentForm';
import { NodeNoComments } from '~/components/node/NodeNoComments';
import { NodeComments } from '~/views/node/NodeComments';
import { Footer } from '~/components/main/Footer';
import { CommentProvider, useCommentContext } from '~/utils/providers/CommentProvider';
import { useUserContext } from '~/utils/providers/UserProvider';
import { useNodeContext } from '~/utils/providers/NodeProvider';
import { CommentContextProvider, useCommentContext } from '~/utils/context/CommentContextProvider';
import { useUserContext } from '~/utils/context/UserContextProvider';
import { useNodeContext } from '~/utils/context/NodeContextProvider';
interface IProps {}
@ -31,7 +31,7 @@ const BorisComments: FC<IProps> = () => {
{isLoading ? (
<NodeNoComments is_loading count={7} />
) : (
<CommentProvider
<CommentContextProvider
comments={comments}
count={count}
onDeleteComment={onDeleteComment}
@ -40,7 +40,7 @@ const BorisComments: FC<IProps> = () => {
isLoading={isLoading}
>
<NodeComments order="ASC" />
</CommentProvider>
</CommentContextProvider>
)}
</Group>

2
src/components/node/NodeTagsBlock/index.tsx
View file

@ -1,6 +1,6 @@
import React, { FC } from 'react';
import { NodeTags } from '~/components/node/NodeTags';
import { useTagContext } from '~/utils/providers/TagProvider';
import { useTagContext } from '~/utils/context/TagsContextProvider';
interface IProps {}

6
src/containers/App.tsx
View file

@ -9,14 +9,14 @@ import { BottomContainer } from '~/containers/main/BottomContainer';
import { MainRouter } from '~/containers/main/MainRouter';
import { DragDetectorProvider } from '~/utils/hooks/useDragDetector';
import { useUser } from '~/utils/hooks/user/userUser';
import { UserProvider } from '~/utils/providers/UserProvider';
import { UserContextProvider } from '~/utils/context/UserContextProvider';
const App: VFC = () => {
const user = useUser();
return (
<ConnectedRouter history={history}>
<UserProvider user={user}>
<UserContextProvider user={user}>
<DragDetectorProvider>
<PageCover />
@ -28,7 +28,7 @@ const App: VFC = () => {
</MainLayout>
<BottomContainer />
</DragDetectorProvider>
</UserProvider>
</UserContextProvider>
</ConnectedRouter>
);
};

2
src/layouts/BorisLayout/index.tsx
View file

@ -8,7 +8,7 @@ import { BorisComments } from '~/components/boris/BorisComments';
import { Card } from '~/components/containers/Card';
import { SidebarRouter } from '~/containers/main/SidebarRouter';
import { BorisSidebar } from '~/components/boris/BorisSidebar';
import { useUserContext } from '~/utils/providers/UserProvider';
import { useUserContext } from '~/utils/context/UserContextProvider';
import { BorisUsageStats } from '~/redux/boris/reducer';
type IProps = {

2
src/layouts/NodeLayout/index.tsx
View file

@ -14,7 +14,7 @@ import { URLS } from '~/constants/urls';
import { EditorEditDialog } from '~/containers/dialogs/EditorEditDialog';
import styles from './styles.module.scss';
import { useNodeContext } from '~/utils/providers/NodeProvider';
import { useNodeContext } from '~/utils/context/NodeContextProvider';
type IProps = {};

6
src/pages/boris.tsx
View file

@ -4,7 +4,7 @@ import { useShallowSelect } from '~/utils/hooks/useShallowSelect';
import { selectNode } from '~/redux/node/selectors';
import { BorisLayout } from '~/layouts/BorisLayout';
import { nodeLoadNode } from '~/redux/node/actions';
import { CommentProvider } from '~/utils/providers/CommentProvider';
import { CommentContextProvider } from '~/utils/context/CommentContextProvider';
import { useImageModal } from '~/utils/hooks/useImageModal';
import { useNodeComments } from '~/utils/hooks/node/useNodeComments';
import { useBoris } from '~/utils/hooks/boris/useBoris';
@ -28,7 +28,7 @@ const BorisPage: VFC = () => {
}, [dispatch, node.is_loading]);
return (
<CommentProvider
<CommentContextProvider
comments={comments}
count={count}
isLoading={isLoadingComments}
@ -42,7 +42,7 @@ const BorisPage: VFC = () => {
isTester={isTester}
stats={stats}
/>
</CommentProvider>
</CommentContextProvider>
);
};

24
src/pages/node/[id].tsx
View file

@ -7,11 +7,11 @@ import { useImageModal } from '~/utils/hooks/useImageModal';
import { useNodeComments } from '~/utils/hooks/node/useNodeComments';
import { useUser } from '~/utils/hooks/user/userUser';
import { useNodeTags } from '~/utils/hooks/node/useNodeTags';
import { NodeProvider } from '~/utils/providers/NodeProvider';
import { CommentProvider } from '~/utils/providers/CommentProvider';
import { TagProvider } from '~/utils/providers/TagProvider';
import { NodeContextProvider } from '~/utils/context/NodeContextProvider';
import { CommentContextProvider } from '~/utils/context/CommentContextProvider';
import { TagsContextProvider } from '~/utils/context/TagsContextProvider';
import { useNodePermissions } from '~/utils/hooks/node/useNodePermissions';
import { NodeRelatedProvider } from '~/utils/providers/NodeRelatedProvider';
import { NodeRelatedContextProvider } from '~/utils/context/NodeRelatedContextProvider';
type Props = RouteComponentProps<{ id: string }> & {};
@ -41,9 +41,9 @@ const NodePage: FC<Props> = ({
useScrollToTop([id, isLoadingComments]);
return (
<NodeProvider node={node} isLoading={isLoading}>
<NodeRelatedProvider related={related} isLoading={isLoading}>
<CommentProvider
<NodeContextProvider node={node} isLoading={isLoading}>
<NodeRelatedContextProvider related={related} isLoading={isLoading}>
<CommentContextProvider
comments={comments}
count={commentsCount}
lastSeenCurrent={lastSeenCurrent}
@ -52,7 +52,7 @@ const NodePage: FC<Props> = ({
onLoadMoreComments={onLoadMoreComments}
onDeleteComment={onDeleteComment}
>
<TagProvider
<TagsContextProvider
tags={node.tags}
canAppend={user.is_user}
canDelete={canEdit}
@ -62,10 +62,10 @@ const NodePage: FC<Props> = ({
onTagDelete={onTagDelete}
>
<NodeLayout />
</TagProvider>
</CommentProvider>
</NodeRelatedProvider>
</NodeProvider>
</TagsContextProvider>
</CommentContextProvider>
</NodeRelatedContextProvider>
</NodeContextProvider>
);
};

2
src/utils/providers/CommentProvider.tsx → src/utils/context/CommentContextProvider.tsx
View file

@ -23,7 +23,7 @@ const CommentContext = createContext<CommentProviderProps>({
onDeleteComment: () => {},
});
export const CommentProvider: FC<CommentProviderProps> = ({ children, ...contextValue }) => {
export const CommentContextProvider: FC<CommentProviderProps> = ({ children, ...contextValue }) => {
return <CommentContext.Provider value={contextValue}>{children}</CommentContext.Provider>;
};

2
src/utils/providers/NodeProvider.tsx → src/utils/context/NodeContextProvider.tsx
View file

@ -12,7 +12,7 @@ export const NodeContext = createContext<NodeContextProps>({
isLoading: false,
});
export const NodeProvider: FC<NodeContextProps> = ({ children, ...contextValue }) => {
export const NodeContextProvider: FC<NodeContextProps> = ({ children, ...contextValue }) => {
return <NodeContext.Provider value={contextValue}>{children}</NodeContext.Provider>;
};

18
src/utils/context/NodeRelatedContextProvider.tsx Normal file
View file

@ -0,0 +1,18 @@
import { INodeRelated } from '~/redux/node/types';
import React, { createContext, FC, useContext } from 'react';
interface NodeRelatedProviderProps {
related: INodeRelated;
isLoading: boolean;
}
const NodeRelatedContext = createContext<NodeRelatedProviderProps>({
related: { albums: {}, similar: [] },
isLoading: false,
});
export const NodeRelatedContextProvider: FC<NodeRelatedProviderProps> = ({ children, ...rest }) => (
<NodeRelatedContext.Provider value={rest}>{children}</NodeRelatedContext.Provider>
);
export const useNodeRelatedContext = () => useContext<NodeRelatedProviderProps>(NodeRelatedContext);

2
src/utils/providers/TagProvider.tsx → src/utils/context/TagsContextProvider.tsx
View file

@ -21,7 +21,7 @@ const TagContext = createContext<TagContextProps>({
onTagDelete: () => {},
});
export const TagProvider: FC<TagContextProps> = ({ children, ...contextValue }) => {
export const TagsContextProvider: FC<TagContextProps> = ({ children, ...contextValue }) => {
return <TagContext.Provider value={contextValue}>{children}</TagContext.Provider>;
};

2
src/utils/providers/UserProvider.tsx → src/utils/context/UserContextProvider.tsx
View file

@ -4,7 +4,7 @@ import { EMPTY_USER } from '~/redux/auth/constants';
const UserContext = createContext<IUser>(EMPTY_USER);
export const UserProvider: FC<{ user: IUser }> = ({ children, user }) => (
export const UserContextProvider: FC<{ user: IUser }> = ({ children, user }) => (
<UserContext.Provider value={user}>{children}</UserContext.Provider>
);

8
src/views/node/NodeBottomBlock/index.tsx
View file

@ -9,12 +9,12 @@ import { NodeTagsBlock } from '~/components/node/NodeTagsBlock';
import StickyBox from 'react-sticky-box/dist/esnext';
import styles from './styles.module.scss';
import { NodeAuthorBlock } from '~/components/node/NodeAuthorBlock';
import { useNodeContext } from '~/utils/providers/NodeProvider';
import { useCommentContext } from '~/utils/providers/CommentProvider';
import { useNodeContext } from '~/utils/context/NodeContextProvider';
import { useCommentContext } from '~/utils/context/CommentContextProvider';
import { NodeNoComments } from '~/components/node/NodeNoComments';
import { NodeComments } from '~/views/node/NodeComments';
import { useUserContext } from '~/utils/providers/UserProvider';
import { useNodeRelatedContext } from '~/utils/providers/NodeRelatedProvider';
import { useUserContext } from '~/utils/context/UserContextProvider';
import { useNodeRelatedContext } from '~/utils/context/NodeRelatedContextProvider';
interface IProps {
commentsOrder: 'ASC' | 'DESC';

4
src/views/node/NodeComments/index.tsx
View file

@ -6,9 +6,9 @@ import { canEditComment } from '~/utils/node';
import { COMMENTS_DISPLAY } from '~/redux/node/constants';
import { plural } from '~/utils/dom';
import { useGrouppedComments } from '~/utils/hooks/node/useGrouppedComments';
import { useCommentContext } from '~/utils/providers/CommentProvider';
import { useCommentContext } from '~/utils/context/CommentContextProvider';
import { Comment } from '~/components/comment/Comment';
import { useUserContext } from '~/utils/providers/UserProvider';
import { useUserContext } from '~/utils/context/UserContextProvider';
interface IProps {
order: 'ASC' | 'DESC';