{props.message}
9 | }
10 |
11 | export default Message;
12 |
--------------------------------------------------------------------------------
/src/components/common/FormsControls/FormsControls.module.css:
--------------------------------------------------------------------------------
1 | .formControl.error input,
2 | .formControl.error textarea
3 | {
4 | border: solid red 2px;
5 | }
6 |
7 | .formControl.error span
8 | {
9 | color: red;
10 | }
11 |
12 | .formSummaryError {
13 | border: red 1px solid;
14 | padding: 5px;
15 | color: red;
16 | }
--------------------------------------------------------------------------------
/src/hoc/withSuspense.tsx:
--------------------------------------------------------------------------------
1 | import React from "react"
2 |
3 | export function withSuspense
9 | 
10 |
11 | }
12 |
13 | export default Preloader;
14 |
--------------------------------------------------------------------------------
/src/components/Dialogs/Dialogs.module.css:
--------------------------------------------------------------------------------
1 | .dialogs {
2 | display: grid;
3 | grid-template-columns: 2fr 10fr;
4 | }
5 |
6 | .dialogsItems {
7 | padding: 10px;
8 | color: white;
9 | }
10 |
11 | .dialogsItems .active {
12 | color: gold;
13 | }
14 |
15 | .messages {
16 | padding: 10px;
17 | }
18 |
19 | .messages .message {
20 | color: white;
21 | }
22 |
23 |
--------------------------------------------------------------------------------
/.gitignore:
--------------------------------------------------------------------------------
1 | # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2 |
3 | # dependencies
4 | /node_modules
5 | /.pnp
6 | .pnp.js
7 |
8 | # testing
9 | /coverage
10 |
11 | # production
12 | /build
13 |
14 | # misc
15 | .DS_Store
16 | .env.local
17 | .env.development.local
18 | .env.test.local
19 | .env.production.local
20 |
21 | npm-debug.log*
22 | yarn-debug.log*
23 | yarn-error.log*
24 |
25 | /.idea
26 |
--------------------------------------------------------------------------------
/src/index.css:
--------------------------------------------------------------------------------
1 | body {
2 | margin: 0;
3 | padding: 0;
4 | font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
5 | "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
6 | sans-serif;
7 | -webkit-font-smoothing: antialiased;
8 | -moz-osx-font-smoothing: grayscale;
9 | }
10 |
11 | code {
12 | font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
13 | monospace;
14 | }
15 |
--------------------------------------------------------------------------------
/src/utils/validators/validators.ts:
--------------------------------------------------------------------------------
1 | export type FieldValidatorType = (value: string) => string | undefined
2 |
3 | export const required: FieldValidatorType = (value) => {
4 | if (value) return undefined;
5 |
6 | return "Field is required";
7 | }
8 |
9 | export const maxLengthCreator = (maxLength: number): FieldValidatorType => (value) => {
10 | if (value.length > maxLength) return `Max length is ${maxLength} symbols`;
11 | return undefined;
12 | }
13 |
--------------------------------------------------------------------------------
/src/App.css:
--------------------------------------------------------------------------------
1 | .app-wrapper {
2 | margin: 0 auto;
3 | display: grid;
4 | width: 1200px;
5 | grid-template-areas: "h h" "n c";
6 |
7 | grid-template-rows: 60px 1fr;
8 | grid-template-columns: 2fr 10fr;
9 | /* grid-gap: 10px; */
10 | }
11 |
12 | .app-wrapper-content {
13 | grid-area: c;
14 | background-color: cornflowerblue;
15 | }
16 |
17 |
18 |
19 |
20 |
21 |
22 |
23 |
24 |
25 |
26 | /*
27 |
28 | /messages
29 | /dialogs
30 |
31 | /dialogs/3
32 | /dialogs/2
33 |
34 | */
35 |
--------------------------------------------------------------------------------
/src/components/Dialogs/DialogItem/DialogItem.tsx:
--------------------------------------------------------------------------------
1 | import React from 'react';
2 | import s from './../Dialogs.module.css';
3 | import {NavLink} from "react-router-dom";
4 |
5 |
6 | type PropsType = {
7 | id: number
8 | name: string
9 | }
10 |
11 | const DialogItem: React.FC
15 | {props.name}
16 |
17 | }
18 |
19 | export default DialogItem;
20 |
--------------------------------------------------------------------------------
/src/index.tsx:
--------------------------------------------------------------------------------
1 | import * as serviceWorker from './serviceWorker';
2 |
3 | import React from 'react';
4 | import ReactDOM from 'react-dom';
5 | import './index.css';
6 | import SamuraiJSApp from "./App";
7 |
8 | ReactDOM.render(
12 | 
13 | { props.message }
14 |
18 | )
19 | }
20 |
21 | export default Post;
22 |
--------------------------------------------------------------------------------
/src/components/Users/UsersContainer.tsx:
--------------------------------------------------------------------------------
1 | import React from 'react'
2 | import {useSelector} from 'react-redux'
3 | import Preloader from '../common/Preloader/Preloader'
4 | import {getIsFetching} from '../../redux/users-selectors'
5 | import {Users} from './Users'
6 |
7 | type UsersPagePropsType = {
8 | pageTitle: string
9 | }
10 |
11 | export const UsersPage: React.FC
13 | { props.message }
14 |
15 | like { props.likesCount }
16 |
17 | {props.pageTitle}
15 | {isFetching ?
18 |
24 |
26 | )
27 | }
28 |
29 | export default Profile;
30 |
--------------------------------------------------------------------------------
/src/hoc/withAuthRedirect.tsx:
--------------------------------------------------------------------------------
1 | import React from "react";
2 | import {Redirect} from "react-router-dom";
3 | import {connect} from "react-redux";
4 | import {AppStateType} from '../redux/redux-store';
5 |
6 | let mapStateToPropsForRedirect = (state: AppStateType) => ({
7 | isAuth: state.auth.isAuth
8 | } as MapPropsType);
9 |
10 | type MapPropsType = {
11 | isAuth: boolean
12 | }
13 | type DispatchPropsType = {
14 | }
15 |
16 | export function withAuthRedirect
30 |
32 |
36 | )
37 | }
38 |
39 | const MyPostsMemorized = React.memo(MyPosts);
40 |
41 | export default MyPostsMemorized;
42 |
--------------------------------------------------------------------------------
/src/components/Profile/ProfileInfo/ProfileStatusWithHooks.tsx:
--------------------------------------------------------------------------------
1 | import React, {useState, useEffect, ChangeEvent} from 'react';
2 |
3 | type PropsType = {
4 | status: string
5 | updateStatus: (status: string) => void
6 | }
7 |
8 | const ProfileStatusWithHooks: React.FCMy posts
31 |
33 | {postsElements}
34 |
35 |
32 | {!editMode &&
33 |
44 | )
45 | }
46 |
47 |
48 | export default ProfileStatusWithHooks;
49 |
--------------------------------------------------------------------------------
/src/redux/dialogs-reducer.ts:
--------------------------------------------------------------------------------
1 | import {InferActionsTypes} from './redux-store';
2 |
3 | type DialogType = {
4 | id: number
5 | name: string
6 | }
7 | type MessageType = {
8 | id: number
9 | message: string
10 | }
11 |
12 | let initialState = {
13 | dialogs: [
14 | {id: 1, name: 'Dimych'},
15 | {id: 2, name: 'Andrew'},
16 | {id: 3, name: 'Sveta'},
17 | {id: 4, name: 'Sasha'},
18 | {id: 5, name: 'Viktor'},
19 | {id: 6, name: 'Valera'}
20 | ] as Array
34 | Status: {props.status || "-------"}
35 |
36 | }
37 | {editMode &&
38 |
39 |
41 |
42 | }
43 |
30 |
38 | )
39 | }
40 |
41 | export default Dialogs;
42 |
43 |
44 |
45 |
46 |
47 |
48 |
49 |
50 |
51 |
52 |
53 |
54 |
55 |
56 |
57 |
58 |
59 |
60 |
61 |
62 |
63 |
64 |
65 |
66 |
67 |
--------------------------------------------------------------------------------
/src/redux/users-reducer.thunks.test.ts:
--------------------------------------------------------------------------------
1 | import {actions, follow, unfollow} from './users-reducer'
2 | import {usersAPI} from '../api/users-api'
3 | import {APIResponseType, ResultCodesEnum} from '../api/api'
4 |
5 | jest.mock('../api/users-api')
6 | const userAPIMock = usersAPI as jest.Mocked
31 | { dialogsElements }
32 |
33 |
34 |
36 | { messagesElements }
35 |
50 | {!this.state.editMode &&
51 |
63 | )
64 | }
65 | }
66 |
67 | export default ProfileStatus;
68 |
--------------------------------------------------------------------------------
/src/components/common/Paginator/Paginator.tsx:
--------------------------------------------------------------------------------
1 | import React, {useState} from 'react'
2 | import styles from './Paginator.module.css'
3 | import cn from 'classnames'
4 |
5 | type PropsType = {
6 | totalItemsCount: number
7 | pageSize: number
8 | currentPage?: number
9 | onPageChanged?: (pageNumber: number) => void
10 | portionSize?: number
11 | }
12 |
13 | let Paginator: React.FC
52 | {this.props.status || "-------"}
53 |
54 | }
55 | {this.state.editMode &&
56 |
57 |
60 |
61 | }
62 |
33 | { portionNumber > 1 &&
34 | }
35 |
36 | {pages
37 | .filter(p => p >= leftPortionPageNumber && p<=rightPortionPageNumber)
38 | .map((p) => {
39 | return {
44 | onPageChanged(p);
45 | }}>{p}
46 | })}
47 | { portionCount > portionNumber &&
48 | }
49 |
50 |
51 |
52 | }
53 |
54 | export default Paginator;
55 |
--------------------------------------------------------------------------------
/src/components/common/FormsControls/FormsControls.tsx:
--------------------------------------------------------------------------------
1 | import React from "react"
2 | import styles from "./FormsControls.module.css"
3 | import {FieldValidatorType} from "../../../utils/validators/validators"
4 | import {Field, WrappedFieldProps} from "redux-form"
5 | import {WrappedFieldMetaProps} from 'redux-form/lib/Field'
6 | import {LoginFormValuesType} from '../../Login/LoginPage';
7 |
8 | type FormControlPropsType = {
9 | meta: WrappedFieldMetaProps
10 | }
11 |
12 | const FormControl: React.FC
16 |
21 | )
22 | }
23 |
24 | export const Textarea: React.FC
17 | {children}
18 |
19 | {hasError && {error}}
20 |
42 |
48 | }
49 |
50 | export type GetStringKeys
36 |
42 | {({isSubmitting}) => (
43 |
55 | )}
56 |
57 |
58 | })
59 |
--------------------------------------------------------------------------------
/src/components/Profile/ProfileInfo/ProfileDataForm.tsx:
--------------------------------------------------------------------------------
1 | import React from "react";
2 | import s from './ProfileInfo.module.css';
3 | import {createField, GetStringKeys, Input, Textarea} from "../../common/FormsControls/FormsControls";
4 | import {InjectedFormProps, reduxForm} from "redux-form";
5 | import style from "../../common/FormsControls/FormsControls.module.css";
6 | import {ProfileType} from '../../../types/types';
7 |
8 | type PropsType = {
9 | profile: ProfileType
10 | }
11 | type ProfileTypeKeys = GetStringKeys
53 |
54 |
55 | { props.isAuth
56 | ? Login }
58 |
59 | {props.login} -
57 | :
17 |
18 |
)
51 | }
52 |
53 | export default User
54 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
2 |
3 | ## Available Scripts
4 |
5 | In the project directory, you can run:
6 |
7 | ### `yarn start`
8 |
9 | Runs the app in the development mode.
19 |
20 | 
22 |
23 |
24 |
22 |
25 | {user.followed
26 | ?
32 | : }
37 |
38 |
39 |
40 |
41 |
42 | {user.name}
43 | {user.status}
44 |
45 |
46 | {'user.location.country'}
47 | {'user.location.city'}
48 |
49 |
50 | 10 | Open [http://localhost:3000](http://localhost:3000) to view it in the browser. 11 | 12 | The page will reload if you make edits.
13 | You will also see any lint errors in the console. 14 | 15 | ### `yarn test` 16 | 17 | Launches the test runner in the interactive watch mode.
18 | See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. 19 | 20 | ### `yarn build` 21 | 22 | Builds the app for production to the `build` folder.
23 | It correctly bundles React in production mode and optimizes the build for the best performance. 24 | 25 | The build is minified and the filenames include the hashes.
26 | Your app is ready to be deployed! 27 | 28 | See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. 29 | 30 | ### `yarn eject` 31 | 32 | **Note: this is a one-way operation. Once you `eject`, you can’t go back!** 33 | 34 | If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. 35 | 36 | Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. 37 | 38 | You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. 39 | 40 | ## Learn More 41 | 42 | You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). 43 | 44 | To learn React, check out the [React documentation](https://reactjs.org/). 45 | -------------------------------------------------------------------------------- /src/components/Profile/ProfileInfo/ProfileStatus.test.tsx: -------------------------------------------------------------------------------- 1 | import React from "react"; 2 | import { create } from "react-test-renderer"; 3 | import ProfileStatus from "./ProfileStatus"; 4 | 5 | describe("ProfileStatus component", () => { 6 | test("status from props should be in the state", () => { 7 | const component = create(
62 |
64 |
65 | }
66 |
--------------------------------------------------------------------------------
/src/api/chat-api.ts:
--------------------------------------------------------------------------------
1 | const subcribers = {
2 | 'messages-received': [] as MessagesReceivedSubscriberType[],
3 | 'status-changed': [] as StatusChangedSubscriberType[]
4 | }
5 |
6 | let ws: WebSocket | null = null
7 | type EventsNamesType = 'messages-received' | 'status-changed'
8 |
9 | const closeHandler = () => {
10 | notifySubscribersAboutStatus('pending')
11 | setTimeout(createChannel, 3000)
12 | }
13 | const messageHandler = (e: MessageEvent) => {
14 | const newMessages = JSON.parse(e.data)
15 | subcribers['messages-received'].forEach(s => s(newMessages))
16 | }
17 | const openHandler = () => {
18 | notifySubscribersAboutStatus('ready')
19 | }
20 | const errorHandler = () => {
21 | notifySubscribersAboutStatus('error')
22 | console.error('REFRESH PAGE')
23 | }
24 | const cleanUp = () => {
25 | ws?.removeEventListener('close', closeHandler)
26 | ws?.removeEventListener('message', messageHandler)
27 | ws?.removeEventListener('open', openHandler)
28 | ws?.removeEventListener('error', errorHandler)
29 | }
30 | const notifySubscribersAboutStatus = (status: StatusType) => {
31 | subcribers['status-changed'].forEach(s => s(status))
32 | }
33 |
34 | function createChannel() {
35 | cleanUp()
36 | ws?.close()
37 | ws = new WebSocket('wss://social-network.samuraijs.com/handlers/ChatHandler.ashx')
38 | notifySubscribersAboutStatus('pending')
39 | ws.addEventListener('close', closeHandler)
40 | ws.addEventListener('message', messageHandler)
41 | ws.addEventListener('open', openHandler)
42 | ws.addEventListener('error', errorHandler)
43 | }
44 |
45 |
46 | export const chatAPI = {
47 | start() {
48 | createChannel()
49 | },
50 | stop() {
51 | subcribers['messages-received'] = []
52 | subcribers['status-changed'] = []
53 | cleanUp()
54 | ws?.close()
55 | },
56 | subscribe(eventName: EventsNamesType, callback: MessagesReceivedSubscriberType | StatusChangedSubscriberType) {
57 | // @ts-ignore
58 | subcribers[eventName].push(callback)
59 | return () => {
60 | // @ts-ignore
61 | subcribers[eventName] = subcribers[eventName].filter(s => s !== callback)
62 | }
63 | },
64 | unsubscribe(eventName: EventsNamesType, callback: MessagesReceivedSubscriberType | StatusChangedSubscriberType) {
65 | // @ts-ignore
66 | subcribers[eventName] = subcribers[eventName].filter(s => s !== callback)
67 | },
68 | sendMessage(message: string) {
69 | ws?.send(message)
70 | }
71 | }
72 |
73 | type MessagesReceivedSubscriberType = (messages: ChatMessageAPIType[]) => void
74 | type StatusChangedSubscriberType = (status: StatusType) => void
75 |
76 | export type ChatMessageAPIType = {
77 | message: string
78 | photo: string
79 | userId: number
80 | userName: string
81 | }
82 | export type StatusType = 'pending' | 'ready' | 'error'
83 |
--------------------------------------------------------------------------------
/src/components/Profile/ProfileContainer.tsx:
--------------------------------------------------------------------------------
1 | import React from 'react';
2 | import Profile from "./Profile";
3 | import {connect} from "react-redux";
4 | import {getStatus, getUserProfile, savePhoto, saveProfile, updateStatus} from "../../redux/profile-reducer";
5 | import {withRouter, RouteComponentProps} from "react-router-dom";
6 | import {compose} from "redux";
7 | import {AppStateType} from '../../redux/redux-store';
8 | import {ProfileType} from '../../types/types';
9 |
10 | type MapPropsType = ReturnTypeLogin
63 |
10 |
12 | }
13 |
14 | const Chat: React.FC = () => {
15 |
16 | const dispatch = useDispatch()
17 |
18 |
19 | const status = useSelector((state: AppStateType) => state.chat.status)
20 |
21 | useEffect(() => {
22 | dispatch(startMessagesListening())
23 | return () => {
24 | dispatch(stopMessagesListening())
25 | }
26 | }, [])
27 |
28 | return
29 | {status === 'error' &&
35 | }
36 |
37 | const Messages: React.FC<{}> = ({}) => {
38 | const messages = useSelector((state: AppStateType) => state.chat.messages)
39 | const messagesAnchorRef = useRefSome error occured. Please refresh the page
}
30 | <>
31 |
59 | {messages.map((m, index) => )}
60 |
61 |
62 | }
63 |
64 |
65 | const Message: React.FC<{ message: ChatMessageAPIType }> = React.memo( ({message}) => {
66 | console.log(">>>>>>Message")
67 | return
68 | 
{message.userName}
69 |
70 | {message.message} 71 |
72 |
73 | })
74 |
75 |
76 | const AddMessageForm: React.FC<{}> = () => {
77 | const [message, setMessage] = useState('')
78 | const dispatch = useDispatch()
79 |
80 | const status = useSelector((state: AppStateType) => state.chat.status)
81 |
82 |
83 | const sendMessageHandler = () => {
84 | if (!message) {
85 | return
86 | }
87 | dispatch(sendMessage(message))
88 | setMessage('')
89 | }
90 |
91 | return 70 | {message.message} 71 |
72 |
92 |
99 | }
100 |
101 | export default ChatPage
102 |
--------------------------------------------------------------------------------
/src/assets/images/preloader.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/src/components/Profile/ProfileInfo/ProfileInfo.tsx:
--------------------------------------------------------------------------------
1 | import React, {ChangeEvent, useState} from 'react';
2 | import s from './ProfileInfo.module.css';
3 | import Preloader from "../../common/Preloader/Preloader";
4 | import ProfileStatusWithHooks from "./ProfileStatusWithHooks";
5 | import userPhoto from "../../../assets/images/user.png";
6 | import ProfileDataForm from "./ProfileDataForm";
7 | import {ContactsType, ProfileType} from '../../../types/types';
8 |
9 | type PropsType = {
10 | profile: ProfileType | null
11 | status: string
12 | updateStatus: (status: string) => void
13 | isOwner: boolean
14 | savePhoto: (file: File) => void
15 | saveProfile: (profile: ProfileType) => Promise
93 |
94 |
95 |
96 |
97 |
98 |
43 |
54 | )
55 | }
56 |
57 | type ProfileDataPropsType = {
58 | profile: ProfileType
59 | isOwner: boolean
60 | goToEditMode: () => void
61 | }
62 | const ProfileData: React.FC
44 | 
45 | {isOwner && }
46 |
47 | { editMode
48 | ?
49 | : {setEditMode(true)} } profile={profile} isOwner={isOwner}/> }
50 |
51 |
52 |
53 |
45 | {isOwner && }
46 |
47 | { editMode
48 | ?
64 | {isOwner && }
65 |
89 | }
90 |
91 |
92 | type ContactsPropsType = {
93 | contactTitle: string
94 | contactValue: string
95 | }
96 | const Contact: React.FC
66 | Full name: {profile.fullName}
67 |
68 |
69 | Looking for a job: {profile.lookingForAJob ? "yes" : "no"}
70 |
71 | {profile.lookingForAJob &&
72 |
73 | My professional skills: {profile.lookingForAJobDescription}
74 |
75 | }
76 |
77 |
78 | About me: {profile.aboutMe}
79 |
80 |
81 | Contacts: {
82 | Object
83 | .keys(profile.contacts)
84 | .map((key) => {
85 | return
88 | {contactTitle}: {contactValue}
98 | }
99 |
100 | export default ProfileInfo;
101 |
--------------------------------------------------------------------------------
/src/components/Users/Users.tsx:
--------------------------------------------------------------------------------
1 | import React, {FC, useEffect} from 'react'
2 | import Paginator from '../common/Paginator/Paginator'
3 | import User from './User'
4 | import {UsersSearchForm} from './UsersSearchForm'
5 | import {FilterType, requestUsers} from '../../redux/users-reducer'
6 | import {useDispatch, useSelector} from 'react-redux'
7 | import {
8 | getCurrentPage,
9 | getFollowingInProgress,
10 | getPageSize,
11 | getTotalUsersCount,
12 | getUsers,
13 | getUsersFilter
14 | } from '../../redux/users-selectors'
15 | import {useHistory} from 'react-router-dom'
16 | import * as queryString from 'querystring'
17 |
18 | type PropsType = {}
19 |
20 | type QueryParamsType = { term?: string; page?: string; friend?: string }
21 | export const Users: FC
87 |
88 |
89 |
90 |
92 |
104 | }
105 |
--------------------------------------------------------------------------------
/src/redux/profile-reducer.ts:
--------------------------------------------------------------------------------
1 | import {FormAction, stopSubmit} from "redux-form";
2 | import {PhotosType, PostType, ProfileType} from '../types/types';
3 | import {usersAPI} from '../api/users-api';
4 | import {profileAPI} from '../api/profile-api';
5 | import {BaseThunkType, InferActionsTypes} from './redux-store';
6 |
7 | let initialState = {
8 | posts: [
9 | {id: 1, message: 'Hi, how are you?', likesCount: 12},
10 | {id: 2, message: 'It\'s my first post', likesCount: 11},
11 | {id: 3, message: 'Blabla', likesCount: 11},
12 | {id: 4, message: 'Dada', likesCount: 11}
13 | ] as Array
93 | {
94 | users.map(u =>
103 | 404 NOT FOUND
}/>
115 |
125 |
*/
150 | )
151 | }
152 | }
153 |
154 | const mapStateToProps = (state: AppStateType) => ({
155 | initialized: state.app.initialized
156 | })
157 |
158 | let AppContainer = compose
128 |
129 | }/>
131 |
132 | }/>
140 |
141 |
147 |
148 |
149 | 404 NOT FOUND
}/>
146 |