Skip to content

#283 - Front end adapt auth and retrieve user data #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vladyslav-fenchak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#283 - Front end adapt auth and retrieve user data #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions external/front/src/components/auth/login.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ export default class Login extends Component {

render() {
return (
<div className="col-md-12">
<div className="col-md-6 mx-auto mt-5">
<div className="card card-container">
<img
src="//ssl.gstatic.com/accounts/ui/avatar_2x.png"
alt="profile-img"
className="profile-img-card"
className="profile-img-card mt-4"
/>

<Form
Expand All @@ -95,7 +95,7 @@ export default class Login extends Component {
this.form = c;
}}
>
<div className="form-group">
<div className="form-group ml-3 mr-3">
<label htmlFor="username">Username</label>
<Input
type="text"
Expand All @@ -107,7 +107,7 @@ export default class Login extends Component {
/>
</div>

<div className="form-group">
<div className="form-group ml-3 mr-3">
<label htmlFor="password">Password</label>
<Input
type="password"
Expand All @@ -119,7 +119,7 @@ export default class Login extends Component {
/>
</div>

<div className="form-group">
<div className="form-group ml-3 mr-3">
<button
className="btn btn-primary btn-block"
disabled={this.state.loading}
Expand All @@ -132,7 +132,7 @@ export default class Login extends Component {
</div>

{this.state.message && (
<div className="form-group">
<div className="form-group ml-3 mr-3">
<div className="alert alert-danger" role="alert">
{this.state.message}
</div>
Expand Down
76 changes: 69 additions & 7 deletions external/front/src/components/auth/register.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@ const email = value => {
}
};

const vname = value => {
if (value.length < 3 || value.length > 20) {
return (
<div className="alert alert-danger" role="alert">
The name must be between 3 and 20 characters.
</div>
);
}
};

const vsurname = value => {
if (value.length < 3 || value.length > 20) {
return (
<div className="alert alert-danger" role="alert">
The surname must be between 3 and 20 characters.
</div>
);
}
};

const vusername = value => {
if (value.length < 3 || value.length > 20) {
return (
Expand All @@ -50,11 +70,15 @@ export default class Register extends Component {
constructor(props) {
super(props);
this.handleRegister = this.handleRegister.bind(this);
this.onChangeName = this.onChangeName.bind(this);
this.onChangeSurname = this.onChangeSurname.bind(this);
this.onChangeUsername = this.onChangeUsername.bind(this);
this.onChangeEmail = this.onChangeEmail.bind(this);
this.onChangePassword = this.onChangePassword.bind(this);

this.state = {
name: "",
surname: "",
username: "",
email: "",
password: "",
Expand All @@ -63,6 +87,18 @@ export default class Register extends Component {
};
}

onChangeName(e) {
this.setState({
name: e.target.value
});
}

onChangeSurname(e) {
this.setState({
surname: e.target.value
});
}

onChangeUsername(e) {
this.setState({
username: e.target.value
Expand Down Expand Up @@ -93,6 +129,8 @@ export default class Register extends Component {

if (this.checkBtn.context._errors.length === 0) {
AuthService.register(
this.state.name,
this.state.surname,
this.state.username,
this.state.password
).then(
Expand Down Expand Up @@ -121,12 +159,12 @@ export default class Register extends Component {

render() {
return (
<div className="col-md-12">
<div className="card card-container">
<div className="col-md-4 mx-auto mt-5">
<div className="card card-container" style={{"background-color": "#f8fcff"}}>
<img
src="//ssl.gstatic.com/accounts/ui/avatar_2x.png"
alt="profile-img"
className="profile-img-card"
className="profile-img-card mt-4"
/>

<Form
Expand All @@ -137,7 +175,31 @@ export default class Register extends Component {
>
{!this.state.successful && (
<div>
<div className="form-group">
<div className="form-group ml-3 mr-3">
<label htmlFor="name">Name</label>
<Input
type="text"
className="form-control"
name="name"
value={this.state.name}
onChange={this.onChangeName}
validations={[required, vname]}
/>
</div>

<div className="form-group ml-3 mr-3">
<label htmlFor="name">Surname</label>
<Input
type="text"
className="form-control"
name="surname"
value={this.state.surname}
onChange={this.onChangeSurname}
validations={[required, vsurname]}
/>
</div>

<div className="form-group ml-3 mr-3">
<label htmlFor="username">Username</label>
<Input
type="text"
Expand All @@ -149,7 +211,7 @@ export default class Register extends Component {
/>
</div>

<div className="form-group">
<div className="form-group ml-3 mr-3">
<label htmlFor="password">Password</label>
<Input
type="password"
Expand All @@ -161,14 +223,14 @@ export default class Register extends Component {
/>
</div>

<div className="form-group">
<div className="form-group ml-3 mr-3">
<button className="btn btn-primary btn-block">Sign Up</button>
</div>
</div>
)}

{this.state.message && (
<div className="form-group">
<div className="form-group ml-3 mr-3">
<div
className={
this.state.successful
Expand Down
15 changes: 4 additions & 11 deletions external/front/src/services/auth.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class AuthService {
}
})
.then(response => {

if (response.data.length > 100) {
localStorage.setItem("username", username);
localStorage.setItem("user_token", response.data);
Expand All @@ -28,11 +27,10 @@ class AuthService {
localStorage.removeItem("user_token");
}

register(username, password, street, number) {
return axios.post(API_URL + "users", {
username: username,
password: password,
status: "created",
register(name, surname, username, password) {
return axios.post(API_URL + "customer", {
name: name,
surname: surname,
address: {
street: "Green Dolphin Street",
street_no: "42"
Expand All @@ -43,11 +41,6 @@ class AuthService {
'Content-Type': 'application/json'
}
}).then(response => {
if (response.data.uuid) {
localStorage.setItem("user_uuid", response.data.uuid);
localStorage.setItem("username", response.data.username);
}

return this.createLogin(username, password);
});
}
Expand Down