From e7b5c792e8ad5cbce0f3611a7ec1c688d296700d Mon Sep 17 00:00:00 2001 From: kleinsea Date: Mon, 31 May 2021 11:33:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20feat:=20=E8=AE=BE=E7=BD=AE=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=B3=A8=E5=86=8C=E6=97=B6=E5=80=99?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B3=A8=E5=86=8C=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- src/component/Login/LoginForm.js | 4 ++-- src/component/Login/Reset.js | 3 ++- src/component/Login/ResetForm.js | 5 +++-- src/component/Login/ResetPwdForm.js | 8 +++++--- src/component/Navbar/Navbar.js | 18 +++++++++++------- src/component/Navbar/UserAvatarPopover.js | 18 +++++++++++------- 7 files changed, 37 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 911e1eef..3810204f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,6 @@ npm-debug.log* yarn-debug.log* yarn-error.log* -dist/ \ No newline at end of file +dist/ + +.vscode \ No newline at end of file diff --git a/src/component/Login/LoginForm.js b/src/component/Login/LoginForm.js index 5a0c3bb8..8411bb92 100644 --- a/src/component/Login/LoginForm.js +++ b/src/component/Login/LoginForm.js @@ -100,9 +100,9 @@ function LoginForm() { const [faCode, setFACode] = useState(""); const loginCaptcha = useSelector((state) => state.siteConfig.loginCaptcha); + const registerEnabled = useSelector((state) => state.siteConfig.registerEnabled); const title = useSelector((state) => state.siteConfig.title); const authn = useSelector((state) => state.siteConfig.authn); - const dispatch = useDispatch(); const ToggleSnackbar = useCallback( (vertical, horizontal, msg, color) => @@ -353,7 +353,7 @@ function LoginForm() { 忘记密码
- 注册账号 + { registerEnabled ? 注册账号 : null }
diff --git a/src/component/Login/Reset.js b/src/component/Login/Reset.js index 9c3fc0a6..e64645d7 100644 --- a/src/component/Login/Reset.js +++ b/src/component/Login/Reset.js @@ -81,6 +81,7 @@ function Reset() { [name]: e.target.value, }); }; + const registerEnabled = useSelector((state) => state.siteConfig.registerEnabled); const { captchaLoading, @@ -162,7 +163,7 @@ function Reset() { 返回登录
- 注册账号 + { registerEnabled ? 注册账号 : null }
diff --git a/src/component/Login/ResetForm.js b/src/component/Login/ResetForm.js index 313d0b21..f940f42b 100644 --- a/src/component/Login/ResetForm.js +++ b/src/component/Login/ResetForm.js @@ -1,5 +1,5 @@ import React, { useCallback, useState } from "react"; -import { useDispatch } from "react-redux"; +import { useDispatch, useSelector } from "react-redux"; import { makeStyles } from "@material-ui/core"; import { toggleSnackbar } from "../../actions/index"; import { useHistory } from "react-router-dom"; @@ -78,6 +78,7 @@ function ResetForm() { [dispatch] ); const history = useHistory(); + const registerEnabled = useSelector((state) => state.siteConfig.registerEnabled); const submit = (e) => { e.preventDefault(); @@ -155,7 +156,7 @@ function ResetForm() { 返回登录
- 注册账号 + { registerEnabled ? 注册账号 : null }
diff --git a/src/component/Login/ResetPwdForm.js b/src/component/Login/ResetPwdForm.js index 04327a77..32841fba 100644 --- a/src/component/Login/ResetPwdForm.js +++ b/src/component/Login/ResetPwdForm.js @@ -63,8 +63,10 @@ const styles = (theme) => ({ }, }, }); -const mapStateToProps = () => { - return {}; +const mapStateToProps = (state) => { + return { + registerEnabled: state.siteConfig.registerEnabled + }; }; const mapDispatchToProps = (dispatch) => { @@ -197,7 +199,7 @@ class ResetPwdFormCompoment extends Component { 返回登录
- 注册账号 + { this.props.registerEnabled ? 注册账号 : null }
diff --git a/src/component/Navbar/Navbar.js b/src/component/Navbar/Navbar.js index 94fbe227..e05c312c 100644 --- a/src/component/Navbar/Navbar.js +++ b/src/component/Navbar/Navbar.js @@ -87,6 +87,7 @@ const mapStateToProps = (state) => { subTitle: state.viewUpdate.subTitle, loadUploader: state.viewUpdate.loadUploader, isLogin: state.viewUpdate.isLogin, + registerEnabled: state.siteConfig.registerEnabled, }; }; @@ -519,16 +520,19 @@ class NavbarCompoment extends Component { - this.props.history.push("/signup")} - > - - - - - + > + + + + + + : null + } )} diff --git a/src/component/Navbar/UserAvatarPopover.js b/src/component/Navbar/UserAvatarPopover.js index 8176559b..acea28fd 100644 --- a/src/component/Navbar/UserAvatarPopover.js +++ b/src/component/Navbar/UserAvatarPopover.js @@ -31,6 +31,7 @@ import pathHelper from "../../utils/page"; const mapStateToProps = (state) => { return { anchorEl: state.viewUpdate.userPopoverAnchorEl, + registerEnabled: state.siteConfig.registerEnabled, }; }; @@ -139,14 +140,17 @@ class UserAvatarPopoverCompoment extends Component { 登录 - this.props.history.push("/signup")} - > - - - - 注册 - + > + + + + 注册 + + : null + } )} {Auth.Check() && ( From 2937520d1b013311ad9f6153fcf975bc9bc97f28 Mon Sep 17 00:00:00 2001 From: kleinsea Date: Wed, 14 Jul 2021 09:57:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9registerEnabled?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Login/LoginForm.js | 2 +- src/component/Login/Reset.js | 2 +- src/component/Login/ResetForm.js | 2 +- src/component/Login/ResetPwdForm.js | 2 +- src/component/Navbar/Navbar.js | 3 +-- src/component/Navbar/UserAvatarPopover.js | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/component/Login/LoginForm.js b/src/component/Login/LoginForm.js index 8411bb92..d862c75a 100644 --- a/src/component/Login/LoginForm.js +++ b/src/component/Login/LoginForm.js @@ -353,7 +353,7 @@ function LoginForm() { 忘记密码
- { registerEnabled ? 注册账号 : null } + { registerEnabled && 注册账号 }
diff --git a/src/component/Login/Reset.js b/src/component/Login/Reset.js index e64645d7..8556eed3 100644 --- a/src/component/Login/Reset.js +++ b/src/component/Login/Reset.js @@ -163,7 +163,7 @@ function Reset() { 返回登录
- { registerEnabled ? 注册账号 : null } + { registerEnabled && 注册账号 }
diff --git a/src/component/Login/ResetForm.js b/src/component/Login/ResetForm.js index f940f42b..7523813c 100644 --- a/src/component/Login/ResetForm.js +++ b/src/component/Login/ResetForm.js @@ -156,7 +156,7 @@ function ResetForm() { 返回登录
- { registerEnabled ? 注册账号 : null } + { registerEnabled && 注册账号 }
diff --git a/src/component/Login/ResetPwdForm.js b/src/component/Login/ResetPwdForm.js index 32841fba..91825b77 100644 --- a/src/component/Login/ResetPwdForm.js +++ b/src/component/Login/ResetPwdForm.js @@ -199,7 +199,7 @@ class ResetPwdFormCompoment extends Component { 返回登录
- { this.props.registerEnabled ? 注册账号 : null } + { this.props.registerEnabled && 注册账号 }
diff --git a/src/component/Navbar/Navbar.js b/src/component/Navbar/Navbar.js index e05c312c..1269d3df 100644 --- a/src/component/Navbar/Navbar.js +++ b/src/component/Navbar/Navbar.js @@ -520,7 +520,7 @@ class NavbarCompoment extends Component { - { this.props.registerEnabled ? + { this.props.registerEnabled && - : null } )} diff --git a/src/component/Navbar/UserAvatarPopover.js b/src/component/Navbar/UserAvatarPopover.js index acea28fd..10c32abc 100644 --- a/src/component/Navbar/UserAvatarPopover.js +++ b/src/component/Navbar/UserAvatarPopover.js @@ -140,7 +140,7 @@ class UserAvatarPopoverCompoment extends Component { 登录 - { this.props.registerEnabled ? + { this.props.registerEnabled && this.props.history.push("/signup")} > @@ -149,7 +149,6 @@ class UserAvatarPopoverCompoment extends Component { 注册 - : null } )}