-
-
- {this.props.children}
-
+
+
+
+
+ );
+}
- );
- }
-}
\ No newline at end of file
+export default Layout;
\ No newline at end of file
diff --git a/Lesson5/src/app/pages/Main.js b/Lesson5/src/app/pages/Main.js
index f693e87..f63cdcd 100644
--- a/Lesson5/src/app/pages/Main.js
+++ b/Lesson5/src/app/pages/Main.js
@@ -1,12 +1,12 @@
import React from 'react';
-export default class Main extends React.Component {
- render() {
- return (
-
-
Главная страница
-
Добро пожаловать
-
- );
- }
-}
\ No newline at end of file
+const Main = () => {
+ return (
+
+
Главная страница
+
Добро пожаловать
+
+ );
+}
+
+export default Main;
\ No newline at end of file
diff --git a/Lesson5/src/app/pages/PageNotFound.js b/Lesson5/src/app/pages/PageNotFound.js
index 5d9df4f..a7d89cc 100644
--- a/Lesson5/src/app/pages/PageNotFound.js
+++ b/Lesson5/src/app/pages/PageNotFound.js
@@ -1,12 +1,12 @@
import React from 'react';
-export default class PageNotFound extends React.Component {
- render() {
- return (
-
-
Страница не найдена
-
Error 404!
-
- );
- }
-}
\ No newline at end of file
+const PageNotFound = () => {
+ return (
+
+
Страница не найдена
+
Error 404!
+
+ );
+}
+
+export default PageNotFound;
\ No newline at end of file
diff --git a/Lesson5/src/app/pages/User.js b/Lesson5/src/app/pages/User.js
index 9c6349e..3f0d3e3 100644
--- a/Lesson5/src/app/pages/User.js
+++ b/Lesson5/src/app/pages/User.js
@@ -1,27 +1,23 @@
-import React from 'react';
+import React, { useState, useEffect } from "react";
import UserProfile from '../components/User';
import axios from 'axios';
-export default class User extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- user: null
- };
- }
+const User = props => {
+ const [userS, setUserS] = useState({});
- componentDidMount() {
- axios.get(`https://jsonplaceholder.typicode.com/users/${this.props.params.userId}`)
- .then((response) => {
- this.setState({user: response.data});
- });
- }
+ useEffect(() => {
+ axios.get(`https://jsonplaceholder.typicode.com/users/${props.params.userId}`)
+ .then((response) => {
+ setUserS(response.data);
+ console.log(userS);
+ });
+ }, []);
- render() {
- return (
-
- {this.state.user && }
-
- );
- }
-}
\ No newline at end of file
+ return (
+ <>
+ {userS &&
}
+
+ );
+}
+
+export default User;
\ No newline at end of file
diff --git a/Lesson5/src/app/pages/Users.js b/Lesson5/src/app/pages/Users.js
index 30f1817..67da266 100644
--- a/Lesson5/src/app/pages/Users.js
+++ b/Lesson5/src/app/pages/Users.js
@@ -1,17 +1,17 @@
import React from 'react';
import UsersList from '../components/UsersList';
-export default class Users extends React.Component {
- render() {
- return (
-
- {
- (!this.props.children) ?
- ()
+const Users = props => {
+ return (
+ <>
+ {
+ (!props.children) ?
+ ()
:
- (this.props.children)
- }
-
- );
- }
-}
\ No newline at end of file
+ (props.children)
+ }
+
+ );
+}
+
+export default Users;
\ No newline at end of file
diff --git a/Lesson5/src/app/reducers/index.js b/Lesson5/src/app/reducers/index.js
new file mode 100644
index 0000000..3afe22a
--- /dev/null
+++ b/Lesson5/src/app/reducers/index.js
@@ -0,0 +1,10 @@
+
+import { combineReducers } from "redux"
+
+import tweets from "./tweetsReducer"
+import user from "./userReducer"
+
+export default combineReducers({
+ tweets: tweets,
+ user: user,
+})
\ No newline at end of file
diff --git a/Lesson5/src/app/reducers/userReducer.js b/Lesson5/src/app/reducers/userReducer.js
new file mode 100644
index 0000000..9421547
--- /dev/null
+++ b/Lesson5/src/app/reducers/userReducer.js
@@ -0,0 +1,43 @@
+
+export default function reducer(state={
+ user: {
+ id: null,
+ name: null,
+ age: null,
+ },
+ fetching: false,
+ fetched: false,
+ error: null,
+ }, action) {
+
+ switch (action.type) {
+ case "FETCH_USER": {
+ return {...state, fetching: true}
+ }
+ case "FETCH_USER_REJECTED": {
+ return {...state, fetching: false, error: action.payload}
+ }
+ case "FETCH_USER_FULFILLED": {
+ return {
+ ...state,
+ fetching: false,
+ fetched: true,
+ user: action.payload,
+ }
+ }
+ case "SET_USER_NAME": {
+ return {
+ ...state,
+ user: {...state.user, name: action.payload},
+ }
+ }
+ case "SET_USER_AGE": {
+ return {
+ ...state,
+ user: {...state.user, age: action.payload},
+ }
+ }
+ }
+
+ return state
+}
\ No newline at end of file
diff --git a/Lesson5/src/app/store.js b/Lesson5/src/app/store.js
new file mode 100644
index 0000000..e69de29
From 13bb08fa64335a59524f4af6bfe9f19ca3d647fd Mon Sep 17 00:00:00 2001
From: anton1evdokimov <36256052+anton1evdokimov@users.noreply.github.com>
Date: Mon, 22 Apr 2019 11:08:19 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=BE=2022.04.2019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Lesson5/src/app/components/UsersList.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Lesson5/src/app/components/UsersList.js b/Lesson5/src/app/components/UsersList.js
index fbf4d7c..8544a65 100644
--- a/Lesson5/src/app/components/UsersList.js
+++ b/Lesson5/src/app/components/UsersList.js
@@ -14,13 +14,14 @@ const UsersList = () => {
}, []);
return (
- { userL } &&
+ <>
+ { userL.length && (
Пользователи
{userL.map((user, index) => )}
- );
-
+ )}
+
}
-export default UsersList;
\ No newline at end of file
+export default UsersList;
From 0d38dff36d47f2d0a1c8cdb2db6b6e0e635580db Mon Sep 17 00:00:00 2001
From: anton1evdokimov <36256052+anton1evdokimov@users.noreply.github.com>
Date: Mon, 22 Apr 2019 15:30:26 +0300
Subject: [PATCH 3/3] User 22.04.2019
---
Lesson5/src/app/pages/User.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lesson5/src/app/pages/User.js b/Lesson5/src/app/pages/User.js
index 3f0d3e3..fe3f773 100644
--- a/Lesson5/src/app/pages/User.js
+++ b/Lesson5/src/app/pages/User.js
@@ -3,7 +3,7 @@ import UserProfile from '../components/User';
import axios from 'axios';
const User = props => {
- const [userS, setUserS] = useState({});
+ const [userS, setUserS] = useState(null);
useEffect(() => {
axios.get(`https://jsonplaceholder.typicode.com/users/${props.params.userId}`)
@@ -20,4 +20,4 @@ const User = props => {
);
}
-export default User;
\ No newline at end of file
+export default User;