Skip to content
Snippets Groups Projects
Commit db7af896 authored by Karl Söderbäck's avatar Karl Söderbäck
Browse files

FIX: refactored creaote and startscreen a bit

parent c014ccca
No related branches found
No related tags found
2 merge requests!24Develop,!23FIX: refactored creaote and startscreen a bit
......@@ -7,6 +7,7 @@ import { connect } from "react-redux";
import Button from "./button";
import Popup from "reactjs-popup";
import { ClickAwayListener } from "@material-ui/core"
import { sendAuthorizedBackendGET } from "../rest/backendAPI";
......@@ -20,7 +21,7 @@ class CreateCollection extends React.Component {
response: ""
}
this.create = this.create.bind(this);
this.create = this.create.bind(this);
}
create() { // TODO - validate input not empty
......@@ -38,11 +39,16 @@ class CreateCollection extends React.Component {
if(this.props.loggedInUser === this.props.displayUser) {
create =
<div className="createPopup">
<Popup trigger={
<Popup
trigger ={
<Button>
<p>Create New Collection</p>
<p>Create New Collection</p>
</Button>
}
className="createPopup"
position="right center"
closeOnEscape
onClose={this.handleClose}
position="right center">
<div>
<input
......@@ -59,6 +65,7 @@ class CreateCollection extends React.Component {
} else {
create = (null);
}
return (
<div>
{create}
......
input.create {
width: 185px;
}
.viewPopup-content {
background: #262223;
border: #262223;
width: 200px;
}
\ No newline at end of file
......@@ -18,7 +18,8 @@ class Startscreen extends React.Component {
loginUsername: "",
loginPassword: "",
registerUsername: "",
registerPassword: "",
registerPassword: "",
registerPassword2: "",
response: "",
};
......@@ -59,20 +60,24 @@ class Startscreen extends React.Component {
"username": this.state.registerUsername,
"password": this.state.registerPassword
}
sendBackendPOST("user/new", body).then(
data => {
this.setState({response: ""});
this.createNewSession(body);
}).catch(error => {
{this.setState({response: error.message})};
});
if (this.state.registerPassword === this.state.registerPassword2) {
sendBackendPOST("user/new", body).then(
data => {
this.setState({response: ""});
this.createNewSession(body);
}).catch(error => {
{this.setState({response: error.message})};
});
} else {
this.setState({response: "Passwords don't match"});
}
event.preventDefault();
}
render(){
return (
<div className="Startscreen">
<h1 class="title">CineCollections</h1>
<h1 className="title">CineCollections</h1>
<div className="Forms">
<div className="Login">
<form className="loginForm" onSubmit={this.loginSubmit}>
......@@ -99,13 +104,13 @@ class Startscreen extends React.Component {
type="submit"
variant="custom"
>
<p class="formbutton">Login</p>
<p className="formbutton">Login</p>
</Button>
</form>
</div>
<div className="Register">
<form className="registerForm" onSubmit={this.registerSubmit}>
<FormGroup controlId="registerUsername" bssize="large">
<FormGroup controlId="registerUsername" bssize="large">
<FormControl
autoFocus
type="text"
......@@ -122,13 +127,21 @@ class Startscreen extends React.Component {
onChange={e => this.setState({registerPassword: e.target.value})}
/>
</FormGroup>
<FormGroup controlId="registerPassword2" bssize="large">
<FormControl
type="password"
placeholder="Password"
value={this.state.registerPassword2}
onChange={e => this.setState({registerPassword2: e.target.value})}
/>
</FormGroup>
<Button
block bssize="large"
disabled={!this.validateForm(this.state.registerUsername, this.state.registerPassword)}
type="submit"
variant="custom"
>
<p class="formbutton">Register</p>
<p className="formbutton">Register</p>
</Button>
</form>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment