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..d862c75a 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 && 注册账号 }
diff --git a/src/component/Login/Reset.js b/src/component/Login/Reset.js index 9c3fc0a6..8556eed3 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 && 注册账号 }
diff --git a/src/component/Login/ResetForm.js b/src/component/Login/ResetForm.js index 313d0b21..7523813c 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 && 注册账号 }
diff --git a/src/component/Login/ResetPwdForm.js b/src/component/Login/ResetPwdForm.js index 04327a77..91825b77 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 && 注册账号 }
diff --git a/src/component/Navbar/Navbar.js b/src/component/Navbar/Navbar.js index 94fbe227..1269d3df 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,18 @@ class NavbarCompoment extends Component { - this.props.history.push("/signup")} - > - - - - - + > + + + + + + } )} diff --git a/src/component/Navbar/UserAvatarPopover.js b/src/component/Navbar/UserAvatarPopover.js index 8176559b..10c32abc 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,16 @@ class UserAvatarPopoverCompoment extends Component { 登录 - this.props.history.push("/signup")} - > - - - - 注册 - + > + + + + 注册 + + } )} {Auth.Check() && (