Skip to content
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

Jump to bottom

Improve user experience #54

Merged
merged 2 commits into from
Jun 2, 2019
Merged

Improve user experience #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60cc4dd
chore(forms): display error from API endpoint to user
chidimo Jun 2, 2019
26e7d00
chore(UX): display loading circle
chidimo Jun 2, 2019
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
10 changes: 10 additions & 0 deletions UI/authentication.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
</header>

<section class="authentication_section">

<div id="loading_modal" class="modal">
<div class="loader"></div>
</div>

<div id="reg_form_toggle" class="container">
<div id="activate_signin" class="authentication_div selected">
Expand All @@ -41,6 +45,9 @@ <h4>Sign Up</h4>
<div id="signin_form" class="">
<h1 class="authentication_title">Sign in to your account</h1>
<hr>

<div id="sign_in_err"></div>

<form method="POST" class="authentication sign_up" action="http://localhost:3000/auth/signin">
<label for="email"><b>Email</b></label>
<input id="signin_email" type="email" placeholder="Enter email" name="email" required>
Expand All @@ -60,6 +67,9 @@ <h1 class="authentication_title">Sign in to your account</h1>
<h1 class="authentication_title">Create your account</h1>
<p class="form_message">Please fill the form to create an account.</p>
<hr>

<div id="sign_up_err"></div>

<form class="authentication sign_up" action="">
<label for="email"><b>Email</b></label>
<input id="signup_email" type="email" placeholder="Enter email" name="email" required>
Expand Down
31 changes: 30 additions & 1 deletion UI/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,30 @@ ul.base_ul {
opacity:1;
}

.loader {
border: 16px solid #f3f3f3;
border-radius: 50%;
margin: auto;
border-top: 16px solid #3498db;
width: 120px;
height: 120px;
-webkit-animation: spin 5s linear infinite; /* Safari */
animation: spin 2s linear infinite;
}

/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}

@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}

/* END Globals */

/* Showcase */

#showcase {
Expand Down Expand Up @@ -493,6 +517,11 @@ footer {

/* authentication */

p.error-from-api{
text-align: center;
color: #FF0000;
}

.authentication_div {
text-align: center;
cursor: pointer;
Expand Down Expand Up @@ -652,7 +681,7 @@ hr.section_divider {
height: 100%;
overflow: auto;
opacity: 0.97;
padding-top: 50px;
padding-top: 30vh;
background-color: #474e5d;
}

Expand Down
38 changes: 29 additions & 9 deletions UI/js/authentication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { BASE_URL, common_headers, token_name } from './common/constants.js';

const signin_form = document.getElementById('signin_form');
const signup_form = document.getElementById('signup_form');
const loading_modal = document.getElementById('loading_modal');

const activate_signup = document.getElementById('activate_signup');
const activate_signin = document.getElementById('activate_signin');
Expand Down Expand Up @@ -37,6 +38,7 @@ const save_user = async (endpoint, body) => {
'Content-Type': 'application/json',
},
};
loading_modal.style.display = 'block';
try {
const { data, status
} = await axios.post(endpoint, body, config);
Expand All @@ -45,35 +47,53 @@ const save_user = async (endpoint, body) => {
localStorage[token_name()] = user.token;
localStorage.user = JSON.stringify(user);
}
return { user };
}
catch (e) {
const { response } = e;
const { data, status, statusText } = response;
console.log(`
${JSON.stringify(data)}, \n ${status}, \n ${statusText}`);
const { data, status } = response;
if (status === 422) return data.errors[0].msg;
return data.error; // status 404 and 409
}
};

signin_form.addEventListener('submit', async e => {
e.preventDefault();
const email = document.getElementById('signin_email').value;
const password = document.getElementById('signin_password').value;
const sign_in_err = document.getElementById('sign_in_err');

const body = JSON.stringify({ email, password });
await save_user(`${BASE_URL}/auth/signin`, body);
const { id } = JSON.parse(localStorage.user);
await get_user_loans(id);
window.location = './dashboard.html';
const data = await save_user(`${BASE_URL}/auth/signin`, body);
loading_modal.style.display = 'none';

if (data.user) {
const { id } = JSON.parse(localStorage.user);
await get_user_loans(id);
window.location = './dashboard.html';
return;
}
sign_in_err.innerHTML = `<p class='error-from-api'>${data}</p>`;
});

signup_form.addEventListener('submit', async e => {
e.preventDefault();
const email = document.getElementById('signup_email').value;
const password = document.getElementById('signup_password').value;
const confirm_password = document.getElementById('confirm_password').value;
const sign_up_err = document.getElementById('sign_up_err');

const body = JSON.stringify({ email, password, confirm_password });
await save_user(`${BASE_URL}/auth/signup`, body);
window.location = './profile.edit.html';
const data = await save_user(`${BASE_URL}/auth/signup`, body);
loading_modal.style.display = 'none';

if (data.user) {
const { id } = JSON.parse(localStorage.user);
await get_user_loans(id);
window.location = './profile.edit.html';
return;
}
sign_up_err.innerHTML = `<p class='error-from-api'>${data}</p>`;
});

const get_user_loans = async id => {
Expand Down
26 changes: 18 additions & 8 deletions UI/js/profile_edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BASE_URL, token_name } from './common/constants.js';
import { BASE_URL, common_headers } from './common/constants.js';

/* eslint-disable no-undef */
const logout = document.getElementById('logout');
Expand All @@ -16,6 +16,8 @@ const lname = document.querySelector('input[name="last_name"]');
const ph = document.querySelector('input[name="phone_number"]');
const hm = document.querySelector('textarea[name="home_address"]');
const off = document.querySelector('textarea[name="office_address"]');
const profile_err = document.getElementById('profile_err');
const loading_modal = document.getElementById('loading_modal');

fname.value = firstname;
lname.value = lastname;
Expand All @@ -33,29 +35,30 @@ logout.addEventListener('click', e => {

const endpoint = `${BASE_URL}/users/${id}/update`;

const update_profile = async (endpoint, body, redirect_to) => {
const update_profile = async (endpoint, body) => {
const config = {
headers: {
...common_headers,
'Content-Type': 'application/json',
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Methods': 'PATCH',
'x-access-token': localStorage[token_name()],
},
};
loading_modal.style.display = 'block';
try {
const {
data, status
} = await axios.patch(endpoint, body, config);
const user = data.data;
if (status === 200) {
localStorage.user = JSON.stringify(user);
window.location = redirect_to;
}
return { user };
}
catch (e) {
const { response } = e;
const { data, status } = response;
console.log(`${JSON.stringify(data)}, \n ${status}`);
// console.log(`${JSON.stringify(data)}, \n ${status}`);
if (status === 422) return data.errors[0].msg;
return data.error;
}
};

Expand All @@ -68,5 +71,12 @@ profile_edit_form.addEventListener('submit', async e => {
const office = off.value;

const body = JSON.stringify({ firstname, lastname, phone, home, office });
update_profile(endpoint, body, './dashboard.html');
const data = await update_profile(endpoint, body);
loading_modal.style.display = 'none';

if (data.user) {
window.location = './dashboard.html';
return;
}
profile_err.innerHTML = `<p class='error-from-api'>${data}</p>`;
});
7 changes: 5 additions & 2 deletions UI/password-reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@
<div id="reset_password_form" class="">
<h1 class="authentication_title">Reset your password</h1>
<hr>
<p>If you don't remember your password, click submit and your password will be emailed to you.</p>
<p>If you don't remember your password, enter your email and click submit to have your password emailed to you.</p>
<hr>
<form class="authentication reset_password" >
<form class="authentication reset_password">
<label for="email"><b>Email</b></label>
<input id="signin_email" type="email" placeholder="Enter email" name="email" required>

<label for="password"><b>Old password</b></label>
<input id="current_password" type="password" placeholder="Enter password" name="current_password">

Expand Down
5 changes: 5 additions & 0 deletions UI/profile.edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,17 @@
</nav>
</div>
</header>

<div id="loading_modal" class="modal">
<div class="loader"></div>
</div>

<section class="profile_edit">
<div class="container form_wrapper">
<form id="profile_edit_form" action="" method="POST">
<h1>Edit your profile</h1>
<hr>
<div id="profile_err"></div>
<label for="first_name"><b>First Name</b></label>
<input type="text" placeholder="First Name" name="first_name" required>

Expand Down