-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dependabot/npm_and_yarn/tnoodle-ui/ini-1.3.7
- Loading branch information
Showing
15 changed files
with
931 additions
and
1,235 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,123 +1,81 @@ | ||
| import React, { Component } from "react"; | ||
| import React, { useState } from "react"; | ||
| import { | ||
| updatePassword, | ||
| updateCompetitionName, | ||
| updateFileZipBlob, | ||
| } from "../redux/ActionCreators"; | ||
| import { connect } from "react-redux"; | ||
| import { getDefaultCompetitionName } from "../util/competition.name.util"; | ||
| import { FaEye, FaEyeSlash } from "react-icons/fa"; | ||
| import { useSelector, useDispatch } from "react-redux"; | ||
|
|
||
| const mapStateToProps = (store) => ({ | ||
| editingDisabled: store.editingDisabled, | ||
| competitionName: store.wcif.name, | ||
| generatingScrambles: store.generatingScrambles, | ||
| }); | ||
| const EntryInterface = () => { | ||
| const [showPassword, setShowPassword] = useState(false); | ||
|
|
||
| const mapDispatchToProps = { | ||
| updatePassword, | ||
| updateCompetitionName, | ||
| updateFileZipBlob, | ||
| }; | ||
|
|
||
| const EntryInterface = connect( | ||
| mapStateToProps, | ||
| mapDispatchToProps | ||
| )( | ||
| class EntryInterface extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
| const editingDisabled = useSelector((state) => state.editingDisabled); | ||
| const password = useSelector((state) => state.password); | ||
| const competitionName = useSelector((state) => state.wcif.name); | ||
| const generatingScrambles = useSelector( | ||
| (state) => state.generatingScrambles | ||
| ); | ||
|
|
||
| this.state = { | ||
| editingDisabled: props.editingDisabled, | ||
| password: "", | ||
| showPassword: false, | ||
| }; | ||
| } | ||
| const dispatch = useDispatch(); | ||
|
|
||
| componentDidMount() { | ||
| this.props.updateCompetitionName(getDefaultCompetitionName()); | ||
| } | ||
| const handleCompetitionNameChange = (event) => { | ||
| dispatch(updateCompetitionName(event.target.value)); | ||
|
|
||
| handleCompetitionNameChange = (event) => { | ||
| this.props.updateCompetitionName(event.target.value); | ||
| // Require another zip with the new name. | ||
| dispatch(updateFileZipBlob(null)); | ||
| }; | ||
|
|
||
| // Require another zip with the new name. | ||
| this.props.updateFileZipBlob(null); | ||
| }; | ||
| const handlePasswordChange = (evt) => { | ||
| dispatch(updatePassword(evt.target.value)); | ||
|
|
||
| handlePasswordChange = (event) => { | ||
| let state = this.state; | ||
| state.password = event.target.value; | ||
| this.setState(state); | ||
| // Require another zip with the new password, in case there was a zip generated. | ||
| dispatch(updateFileZipBlob(null)); | ||
| }; | ||
|
|
||
| this.props.updatePassword(this.state.password); | ||
| return ( | ||
| <> | ||
| <div className="col-sm-4 text-left form-group"> | ||
| <label className="font-weight-bold" htmlFor="competition-name"> | ||
| Competition Name | ||
| </label> | ||
| <input | ||
| id="competition-name" | ||
| className="form-control" | ||
| placeholder="Competition Name" | ||
| onChange={handleCompetitionNameChange} | ||
| value={competitionName} | ||
| disabled={editingDisabled || generatingScrambles} | ||
| required | ||
| /> | ||
| </div> | ||
|
|
||
| // Require another zip with the new password, in case there was a zip generated. | ||
| this.props.updateFileZipBlob(null); | ||
| }; | ||
|
|
||
| toogleShowPassword = () => { | ||
| let state = this.state; | ||
| state.showPassword = !state.showPassword; | ||
| this.setState(state); | ||
| }; | ||
|
|
||
| render() { | ||
| let competitionName = this.props.competitionName; | ||
| let disabled = this.props.editingDisabled; | ||
| return ( | ||
| <React.Fragment> | ||
| <div className="col-sm-4 text-left form-group"> | ||
| <label | ||
| className="font-weight-bold" | ||
| htmlFor="competition-name" | ||
| > | ||
| Competition Name | ||
| </label> | ||
| <input | ||
| id="competition-name" | ||
| className="form-control" | ||
| placeholder="Competition Name" | ||
| onChange={this.handleCompetitionNameChange} | ||
| value={competitionName} | ||
| disabled={disabled ? "disabled" : ""} | ||
| required | ||
| /> | ||
| <div className="col-sm-4 text-left form-group"> | ||
| <label className="font-weight-bold" htmlFor="password"> | ||
| Password | ||
| </label> | ||
| <div className="input-group"> | ||
| <input | ||
| id="password" | ||
| className="form-control" | ||
| placeholder="Password" | ||
| type={showPassword ? "" : "password"} | ||
| onChange={handlePasswordChange} | ||
| value={password} | ||
| disabled={generatingScrambles} | ||
| /> | ||
| <div | ||
| className="input-group-prepend" | ||
| onClick={() => setShowPassword(!showPassword)} | ||
| > | ||
| <span className="input-group-text"> | ||
| {showPassword ? <FaEye /> : <FaEyeSlash />} | ||
| </span> | ||
| </div> | ||
|
|
||
| <div className="col-sm-4 text-left form-group"> | ||
| <label className="font-weight-bold" htmlFor="password"> | ||
| Password | ||
| </label> | ||
| <div className="input-group"> | ||
| <input | ||
| id="password" | ||
| className="form-control" | ||
| placeholder="Password" | ||
| type={this.state.showPassword ? "" : "password"} | ||
| onChange={this.handlePasswordChange} | ||
| value={this.state.password} | ||
| disabled={this.props.generatingScrambles} | ||
| /> | ||
| <div | ||
| className="input-group-prepend" | ||
| onClick={this.toogleShowPassword} | ||
| > | ||
| <span className="input-group-text"> | ||
| {this.state.showPassword ? ( | ||
| <FaEye /> | ||
| ) : ( | ||
| <FaEyeSlash /> | ||
| )} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </React.Fragment> | ||
| ); | ||
| } | ||
| } | ||
| ); | ||
| </div> | ||
| </div> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default EntryInterface; |
Oops, something went wrong.