From c4f9d88447a0432daf4e022a089527895859ef93 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 21 Aug 2020 11:10:07 +0700 Subject: [PATCH] added funny checkbox --- package.json | 3 ++- .../LoginSocialRegisterDialog/index.tsx | 8 +++--- .../LoginSocialRegisterDialog/styles.scss | 13 ++++++++++ yarn.lock | 26 +++++++++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 179d2b4a..39c04b54 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@types/node": "^11.13.22", "@types/ramda": "^0.26.33", "@types/react": "16.9.11", + "@types/react-redux": "^7.1.9", "@types/react-router": "^5.1.2", "autoresponsive-react": "^1.1.31", "awesome-typescript-loader": "^5.2.1", @@ -114,7 +115,7 @@ "tt-react-custom-scrollbars": "latest", "uuid4": "^1.1.4" }, - "resolutions": { + "resolutions": { "**/**/minimist": "^1.2.3", "**/**/acorn": "^6.4.1", "**/**/kind-of": "^6.0.3", diff --git a/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx b/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx index 0fdf7a36..5964f94d 100644 --- a/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx +++ b/src/containers/dialogs/LoginSocialRegisterDialog/index.tsx @@ -23,7 +23,6 @@ type Props = ReturnType & typeof mapDispatchToProps & ID const LoginSocialRegisterDialogUnconnected: FC = ({ onRequestClose, - token, errors, error, @@ -69,8 +68,6 @@ const LoginSocialRegisterDialogUnconnected: FC = ({ Добро пожаловать в семью! - - = ({ type="password" error={errors.password} /> + + diff --git a/src/containers/dialogs/LoginSocialRegisterDialog/styles.scss b/src/containers/dialogs/LoginSocialRegisterDialog/styles.scss index 93c53f64..b67b43e1 100644 --- a/src/containers/dialogs/LoginSocialRegisterDialog/styles.scss +++ b/src/containers/dialogs/LoginSocialRegisterDialog/styles.scss @@ -1,3 +1,16 @@ .wrap { padding: $login_dialog_padding; } + +.check { + padding: $gap 0 0 $gap / 2; + font: $font_12_medium; + display: flex; + align-items: center; + justify-content: flex-start; + + span { + padding-left: $gap; + color: darken(white, 50%); + } +} diff --git a/yarn.lock b/yarn.lock index 52ef08c4..10333913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -755,6 +755,14 @@ resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a" integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw== +"@types/hoist-non-react-statics@^3.3.0": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + "@types/json-schema@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" @@ -797,6 +805,16 @@ dependencies: ts-toolbelt "^4.7.7" +"@types/react-redux@^7.1.9": + version "7.1.9" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.9.tgz#280c13565c9f13ceb727ec21e767abe0e9b4aec3" + integrity sha512-mpC0jqxhP4mhmOl3P4ipRsgTgbNofMRXJb08Ms6gekViLj61v1hOZEKWDCyWsdONr6EjEA6ZHXC446wdywDe0w== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + "@types/react-router@^5.1.2": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.2.tgz#41e5e6aa333a7b9a2bfdac753c04e1ca4b3e0d21" @@ -8226,6 +8244,14 @@ redux-saga@^1.1.1: dependencies: "@redux-saga/core" "^1.1.3" +redux@^4.0.0: + version "4.0.5" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" + integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== + dependencies: + loose-envify "^1.4.0" + symbol-observable "^1.2.0" + redux@^4.0.1, redux@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.4.tgz#4ee1aeb164b63d6a1bcc57ae4aa0b6e6fa7a3796"