From 0e698ae5bffe0fb8f6af5702b41041cd5abff91a Mon Sep 17 00:00:00 2001
From: Muhammad Ilham Peruzzi <ilhamperuzzi@gmail.com>
Date: Sun, 10 Nov 2019 01:37:40 +0700
Subject: [PATCH 1/4] add bracket to CompanyRegisterModal-test.jsx conditional
statement
---
.../components/CompanyRegisterModal-test.jsx | 22 ++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/assets/js/__test__/components/CompanyRegisterModal-test.jsx b/assets/js/__test__/components/CompanyRegisterModal-test.jsx
index 3fc01707..8a47ca63 100755
--- a/assets/js/__test__/components/CompanyRegisterModal-test.jsx
+++ b/assets/js/__test__/components/CompanyRegisterModal-test.jsx
@@ -7,11 +7,23 @@ describe('CompanyRegisterModal', () => {
const lowerCaseLetters = /[a-z]/g;
const upperCaseLetters = /[A-Z]/g;
const numbers = /[0-9]/g;
- if(password.length < 8) return "Password less than 8"; else
- if(!lowerCaseLetters.test(password)) return "Password at least one lowercase letter"; else
- if(!upperCaseLetters.test(password)) return "Password at least one uppercase letter"; else
- if(!numbers.test(password)) return "Password at least one number";
- else return true
+ if(password.length < 8) {
+ return "Password less than 8";
+ } else {
+ if(!lowerCaseLetters.test(password)) {
+ return "Password at least one lowercase letter";
+ }
+
+ if(!upperCaseLetters.test(password)) {
+ return "Password at least one uppercase letter";
+ }
+
+ if(!numbers.test(password)) {
+ return "Password at least one number";
+ }
+
+ return true
+ }
}
it('renders without problem', () => {
--
GitLab
From cf4721be2d888b91d836d3ffd3a0cea296f4a9e3 Mon Sep 17 00:00:00 2001
From: Muhammad Ilham Peruzzi <ilhamperuzzi@gmail.com>
Date: Sun, 10 Nov 2019 01:48:11 +0700
Subject: [PATCH 2/4] add bracket to CompanyRegisterModal.jsx conditional
statement
---
assets/js/components/CompanyRegisterModal.jsx | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/assets/js/components/CompanyRegisterModal.jsx b/assets/js/components/CompanyRegisterModal.jsx
index 45523817..30574cdf 100755
--- a/assets/js/components/CompanyRegisterModal.jsx
+++ b/assets/js/components/CompanyRegisterModal.jsx
@@ -71,12 +71,23 @@ export default class CompanyRegisterModal extends React.Component {
handlePassword = (e) => {
- if (e.target.name === 'password') this.passwordField = e.target; else
- if (e.target.name === 'password-confirm') this.passwordConfirmField = e.target;
+ if (e.target.name === 'password') {
+ this.passwordField = e.target;
+ } else {
+ if (e.target.name === 'password-confirm') {
+ this.passwordConfirmField = e.target;
+ }
+ }
const validatePassword = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}/g;
- if(!validatePassword.test(this.passwordField.value)) this.passwordField.setCustomValidity("Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters");
- else this.passwordField.setCustomValidity("");
+
+ if(!validatePassword.test(this.passwordField.value)) {
+ this.passwordField.setCustomValidity("Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters");
+ } else {
+ this.passwordField.setCustomValidity("");
+ }
+
const isExist = this.passwordField && this.passwordConfirmField;
+
if (isExist) {
if (this.passwordField.value !== this.passwordConfirmField.value) {
this.passwordConfirmField.setCustomValidity("Passwords Don't Match");
--
GitLab
From eaa48fbb468853491171c04cce25391d07a60ae1 Mon Sep 17 00:00:00 2001
From: Muhammad Ilham Peruzzi <ilhamperuzzi@gmail.com>
Date: Sun, 10 Nov 2019 01:53:21 +0700
Subject: [PATCH 3/4] change else and if statement to else if block
---
assets/js/components/CompanyRegisterModal.jsx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/assets/js/components/CompanyRegisterModal.jsx b/assets/js/components/CompanyRegisterModal.jsx
index 30574cdf..3153b97d 100755
--- a/assets/js/components/CompanyRegisterModal.jsx
+++ b/assets/js/components/CompanyRegisterModal.jsx
@@ -73,11 +73,10 @@ export default class CompanyRegisterModal extends React.Component {
handlePassword = (e) => {
if (e.target.name === 'password') {
this.passwordField = e.target;
- } else {
- if (e.target.name === 'password-confirm') {
- this.passwordConfirmField = e.target;
- }
+ } else if (e.target.name === 'password-confirm') {
+ this.passwordConfirmField = e.target;
}
+
const validatePassword = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}/g;
if(!validatePassword.test(this.passwordField.value)) {
--
GitLab
From 526586599eac455e4ec0c9684ab64963ddaffcf3 Mon Sep 17 00:00:00 2001
From: Muhammad Ilham Peruzzi <ilhamperuzzi@gmail.com>
Date: Sun, 10 Nov 2019 01:54:30 +0700
Subject: [PATCH 4/4] seperate if block to new line
---
assets/js/index.jsx | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/assets/js/index.jsx b/assets/js/index.jsx
index 0d09036b..66e3a876 100755
--- a/assets/js/index.jsx
+++ b/assets/js/index.jsx
@@ -24,13 +24,20 @@ export default class App extends React.Component {
const data = Storage.get('user-data');
if (data.is_staff) {
return 'admin';
- } if (data.supervisor) {
+ }
+
+ if (data.supervisor) {
return 'supervisor';
- } if (data.student) {
+ }
+
+ if (data.student) {
return 'student';
- } if (data.company) {
+ }
+
+ if (data.company) {
return 'company';
}
+
return 'error';
}
return 'not-logged-in';
--
GitLab