From a027425d9f3f9583947a837e058737d3390a6d45 Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 16:49:35 +0500 Subject: [PATCH 1/7] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20esLint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1 + package.json | 2 ++ src/index.tsx | 2 +- src/services/reducers/testReducer.ts | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index c4305f4..2a698cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "react-dom": "^18.2.0", "react-redux": "^8.0.5", "react-scripts": "5.0.1", + "redux": "^4.2.1", "typescript": "^4.9.4", "web-vitals": "^2.1.4" }, diff --git a/package.json b/package.json index ce6542e..f25b750 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "react-dom": "^18.2.0", "react-redux": "^8.0.5", "react-scripts": "5.0.1", + "redux": "^4.2.1", "typescript": "^4.9.4", "web-vitals": "^2.1.4" }, @@ -42,6 +43,7 @@ "jsx-a11y/anchor-is-valid": [ "off" ], + "import/prefer-default-export": "off", "react/require-default-props": [ 0 ], diff --git a/src/index.tsx b/src/index.tsx index 81bf174..69697ca 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,9 +1,9 @@ import React from "react"; import ReactDOM from "react-dom/client"; +import { Provider } from "react-redux"; import App from "./App"; import reportWebVitals from "./reportWebVitals"; import { store } from "./services"; -import { Provider } from "react-redux"; const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement); root.render( diff --git a/src/services/reducers/testReducer.ts b/src/services/reducers/testReducer.ts index f8db68a..7ffa6b2 100644 --- a/src/services/reducers/testReducer.ts +++ b/src/services/reducers/testReducer.ts @@ -1,3 +1,5 @@ +/* eslint-disable no-param-reassign */ + import { createSlice } from "@reduxjs/toolkit"; import type { PayloadAction } from "@reduxjs/toolkit"; From 6a33dc3f9a85602b6834671afcfbe5f74bb9f9a6 Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 16:50:22 +0500 Subject: [PATCH 2/7] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20esLint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/reducers/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/reducers/index.ts b/src/services/reducers/index.ts index 0729507..7a3695b 100644 --- a/src/services/reducers/index.ts +++ b/src/services/reducers/index.ts @@ -1,5 +1,7 @@ import { combineReducers } from "redux"; -import { testReducers, testActions } from "./testReducer"; +import { testReducers } from "./testReducer"; + +export { testActions } from "./testReducer"; export const rootReducer = combineReducers({ test: testReducers, From 8d2aa018e5f5e52ec524011c0da9c54405b7a4e3 Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 16:51:17 +0500 Subject: [PATCH 3/7] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20esLint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/reducers/testReducer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/reducers/testReducer.ts b/src/services/reducers/testReducer.ts index 7ffa6b2..79d1eb5 100644 --- a/src/services/reducers/testReducer.ts +++ b/src/services/reducers/testReducer.ts @@ -14,7 +14,7 @@ const testSlice = createSlice({ initialState: testState, reducers: { userAuth(state, action: PayloadAction) { - state.isAuth = true; + state.isAuth = action.payload; }, }, }); From ed10aeefb0bf28440da333f35da35d16e1b3c901 Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 19:50:51 +0500 Subject: [PATCH 4/7] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.css | 7 +++++++ src/index.tsx | 1 + 2 files changed, 8 insertions(+) create mode 100644 src/index.css diff --git a/src/index.css b/src/index.css new file mode 100644 index 0000000..abe6d10 --- /dev/null +++ b/src/index.css @@ -0,0 +1,7 @@ +* { + box-sizing: border-box; +} + +body { + margin: 0; +} diff --git a/src/index.tsx b/src/index.tsx index 69697ca..94fb77e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,5 +1,6 @@ import React from "react"; import ReactDOM from "react-dom/client"; +import "./index.css"; import { Provider } from "react-redux"; import App from "./App"; import reportWebVitals from "./reportWebVitals"; From 4388eb80a13235b4e812fb45c796140d9f8c7d50 Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 20:16:27 +0500 Subject: [PATCH 5/7] =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=20svg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/invisibility.svg | 3 +++ src/icons/logo.svg | 19 +++++++++++++++++++ src/icons/visibility.svg | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 src/icons/invisibility.svg create mode 100644 src/icons/logo.svg create mode 100644 src/icons/visibility.svg diff --git a/src/icons/invisibility.svg b/src/icons/invisibility.svg new file mode 100644 index 0000000..b6fbfe5 --- /dev/null +++ b/src/icons/invisibility.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/logo.svg b/src/icons/logo.svg new file mode 100644 index 0000000..de5606a --- /dev/null +++ b/src/icons/logo.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/visibility.svg b/src/icons/visibility.svg new file mode 100644 index 0000000..b6c0cc6 --- /dev/null +++ b/src/icons/visibility.svg @@ -0,0 +1,3 @@ + + + From 34d4b267a73a34d83c9e1f23828ede36b41f3ead Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 20:16:51 +0500 Subject: [PATCH 6/7] =?UTF-8?q?=D1=84=D0=BE=D0=BD=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.css b/src/index.css index abe6d10..c66b2cd 100644 --- a/src/index.css +++ b/src/index.css @@ -4,4 +4,5 @@ body { margin: 0; + background-color: #e1e1e1; } From de4051c43bee2e1c3ce157b2aaddacc645718f5a Mon Sep 17 00:00:00 2001 From: PavelEgorov-ru Date: Sun, 5 Feb 2023 20:37:30 +0500 Subject: [PATCH 7/7] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=20App?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.module.css | 5 +++++ src/App.tsx | 19 ++----------------- 2 files changed, 7 insertions(+), 17 deletions(-) create mode 100644 src/App.module.css diff --git a/src/App.module.css b/src/App.module.css new file mode 100644 index 0000000..9ac694f --- /dev/null +++ b/src/App.module.css @@ -0,0 +1,5 @@ +.app { + margin: 0 auto; + max-width: 1218px; + border: 1px solid red; +} diff --git a/src/App.tsx b/src/App.tsx index 9302b46..0a3dffa 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,23 +1,8 @@ import React from "react"; +import styles from "./App.module.css"; function App() { - return ( -
-
-

- Edit src/App.tsx and save to reload. -

- - Learn React - -
-
- ); + return
ั‚ะตัั‚
; } export default App;