From 76d6cb97f3d1ee32a2eb21d5eca717752697d688 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 23 Jul 2021 11:50:50 +0000 Subject: [PATCH 1/2] Restyled by clang-format --- src/services/httpService.js | 9 +-- src/utils/schemas.js | 144 +++++++++++++++++------------------- 2 files changed, 71 insertions(+), 82 deletions(-) diff --git a/src/services/httpService.js b/src/services/httpService.js index 333bea9..a395435 100644 --- a/src/services/httpService.js +++ b/src/services/httpService.js @@ -3,8 +3,8 @@ import logger from './logService'; // import { TimerAlert } from '../components'; axios.interceptors.response.use(null, (error) => { - const expectedErrors = - error.response && error.response.status >= 400 && error.response.status < 500; + const expectedErrors = error.response && error.response.status >= 400 && + error.response.status < 500; if (!expectedErrors) { logger.log(error); // TimerAlert('Error', ' An unexpected error occurred', 'error'); @@ -12,9 +12,8 @@ axios.interceptors.response.use(null, (error) => { return Promise.reject(error); }); -const setJwt = (jwt) => { - axios.defaults.headers.common['x-auth-token'] = jwt; -}; +const setJwt = + (jwt) => { axios.defaults.headers.common['x-auth-token'] = jwt; }; export default { get: axios.get, diff --git a/src/utils/schemas.js b/src/utils/schemas.js index 2dffcfa..e0ea500 100644 --- a/src/utils/schemas.js +++ b/src/utils/schemas.js @@ -2,98 +2,88 @@ import Joi from 'joi-browser'; const LoginSchema = () => { return { - userId: Joi - .number() - .error(() => { - return { - message: 'Please enter a valid enrollment number', - }; - }) - .required(), - password: Joi.string() - .error(() => { - return { - message: 'Password cannot be empty', - }; - }) - .required(), + userId : Joi.number() + .error(() => { + return { + message : 'Please enter a valid enrollment number', + }; + }) + .required(), + password : Joi.string() + .error(() => { + return { + message : 'Password cannot be empty', + }; + }) + .required(), }; }; const SignUpSchema = () => { return { - name: Joi.string().min(5).label('Name').required(), - password: Joi.string() - .min(7) - .error(() => { - return { - message: 'Password should be at least 7 characters long', - }; - }) - .required(), - department: Joi.string().min(2).max(3).required(), - section: Joi.string().length(1).required(), + name : Joi.string().min(5).label('Name').required(), + password : Joi.string() + .min(7) + .error(() => { + return { + message : + 'Password should be at least 7 characters long', + }; + }) + .required(), + department : Joi.string().min(2).max(3).required(), + section : Joi.string().length(1).required(), }; }; const DetailsSchema = () => { return { - contactEmail: Joi.string() - .email() - .allow('') - .trim() - .strict() - .label('Contact Email'), - facebook: Joi.string() - .uri() - .label('Facebook') - .error(() => { - return { - message: 'Please enter a valid Facebook profile URL', - }; - }), - linkedin: Joi.string() - .uri() - .label('Linkedin') - .error(() => { - return { - message: 'Please enter a valid LinkedIn profile URL', - }; - }), - whatsappNo: Joi.string() - .length(10) - .regex(/^\d+$/) - .label('WhatsApp Number') - .error(() => { - return { - message: 'Input should be a number of length 10', - }; - }), - contactNo: Joi.string() - .label('Contact Number') - .length(10) - .regex(/^\d+$/) - .error(() => { - return { - message: 'Input should be a number of length 10', - }; - }), - snapchat: Joi.string().label('Snapchat'), - instagram: Joi.string().label('Instagram'), + contactEmail : + Joi.string().email().allow('').trim().strict().label('Contact Email'), + facebook : Joi.string().uri().label('Facebook').error(() => { + return { + message : 'Please enter a valid Facebook profile URL', + }; + }), + linkedin : Joi.string().uri().label('Linkedin').error(() => { + return { + message : 'Please enter a valid LinkedIn profile URL', + }; + }), + whatsappNo : Joi.string() + .length(10) + .regex(/^\d+$/) + .label('WhatsApp Number') + .error(() => { + return { + message : 'Input should be a number of length 10', + }; + }), + contactNo : Joi.string() + .label('Contact Number') + .length(10) + .regex(/^\d+$/) + .error(() => { + return { + message : 'Input should be a number of length 10', + }; + }), + snapchat : Joi.string().label('Snapchat'), + instagram : Joi.string().label('Instagram'), }; }; const EmailAccess = () => { return { - email: Joi.string() - .email() - .error(() => { - return { - message: 'Please enter a valid Email', - }; - }) - .required(), + email : Joi.string() + .email() + .error(() => { + return { + message : 'Please enter a valid Email', + }; + }) + .required(), }; }; -export { LoginSchema, SignUpSchema, DetailsSchema, EmailAccess }; +export {LoginSchema, SignUpSchema, DetailsSchema, EmailAccess}; From 6bc5bac3c0e7efa65ab9cad2247c9602742448a1 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 23 Jul 2021 11:50:53 +0000 Subject: [PATCH 2/2] Restyled by prettier --- src/pages/private/user/messages/index.jsx | 23 +-- .../user/profile/profileCard/socialCard.jsx | 16 +- src/services/httpService.js | 9 +- src/utils/schemas.js | 143 ++++++++++-------- 4 files changed, 89 insertions(+), 102 deletions(-) diff --git a/src/pages/private/user/messages/index.jsx b/src/pages/private/user/messages/index.jsx index 2335de0..e654fe3 100644 --- a/src/pages/private/user/messages/index.jsx +++ b/src/pages/private/user/messages/index.jsx @@ -51,9 +51,7 @@ class PeopleCards extends Component { filterPeople = (e) => { const people = this.state.persons.filter( (person) => - person.name - .toLowerCase() - .search(e.target.value.trim().toLowerCase()) !== -1, + person.name.toLowerCase().search(e.target.value.trim().toLowerCase()) !== -1, ); this.setState({ people, NoSearchResults: !people.length }); }; @@ -74,10 +72,7 @@ class PeopleCards extends Component { return this.setState({ people: persons.filter((e) => { if (sectionSelect !== 'ALL') { - return ( - e.department === input.value && - e.section === sectionSelect - ); + return e.department === input.value && e.section === sectionSelect; } return e.department === input.value; }), @@ -101,10 +96,7 @@ class PeopleCards extends Component { return this.setState({ people: persons.filter((e) => { if (departmentSelect !== 'ALL') { - return ( - e.section === input.value && - e.department === departmentSelect - ); + return e.section === input.value && e.department === departmentSelect; } return e.section === input.value; }), @@ -113,13 +105,8 @@ class PeopleCards extends Component { }; render() { - const { - ProgressBar, - departments, - sections, - people, - NoSearchResults, - } = this.state; + const { ProgressBar, departments, sections, people, NoSearchResults } = + this.state; return ( <> diff --git a/src/pages/private/user/profile/profileCard/socialCard.jsx b/src/pages/private/user/profile/profileCard/socialCard.jsx index 0c3b541..2f601da 100644 --- a/src/pages/private/user/profile/profileCard/socialCard.jsx +++ b/src/pages/private/user/profile/profileCard/socialCard.jsx @@ -17,14 +17,7 @@ const PersonalCard = () => { snapchat: '', }); - const { - email, - phone, - instagram, - linkedin, - facebook, - snapchat, - } = socialHandles; + const { email, phone, instagram, linkedin, facebook, snapchat } = socialHandles; useEffect(() => { const fetchUserData = async () => { @@ -44,7 +37,7 @@ const PersonalCard = () => { linkedin: data.socialHandles.linkedin, snapchat: data.socialHandles.snapchat, }); - console.log('socialss', data) + console.log('socialss', data); } catch (ex) { if (ex.response && ex.response.status === 400) { TimerAlert('Error', ex.response.data, 'error'); @@ -90,10 +83,7 @@ const PersonalCard = () => {
{email && ( - + )} {phone && ( { - const expectedErrors = error.response && error.response.status >= 400 && - error.response.status < 500; + const expectedErrors = + error.response && error.response.status >= 400 && error.response.status < 500; if (!expectedErrors) { logger.log(error); // TimerAlert('Error', ' An unexpected error occurred', 'error'); @@ -12,8 +12,9 @@ axios.interceptors.response.use(null, (error) => { return Promise.reject(error); }); -const setJwt = - (jwt) => { axios.defaults.headers.common['x-auth-token'] = jwt; }; +const setJwt = (jwt) => { + axios.defaults.headers.common['x-auth-token'] = jwt; +}; export default { get: axios.get, diff --git a/src/utils/schemas.js b/src/utils/schemas.js index e0ea500..a88e2e9 100644 --- a/src/utils/schemas.js +++ b/src/utils/schemas.js @@ -2,88 +2,97 @@ import Joi from 'joi-browser'; const LoginSchema = () => { return { - userId : Joi.number() - .error(() => { - return { - message : 'Please enter a valid enrollment number', - }; - }) - .required(), - password : Joi.string() - .error(() => { - return { - message : 'Password cannot be empty', - }; - }) - .required(), + userId: Joi.number() + .error(() => { + return { + message: 'Please enter a valid enrollment number', + }; + }) + .required(), + password: Joi.string() + .error(() => { + return { + message: 'Password cannot be empty', + }; + }) + .required(), }; }; const SignUpSchema = () => { return { - name : Joi.string().min(5).label('Name').required(), - password : Joi.string() - .min(7) - .error(() => { - return { - message : - 'Password should be at least 7 characters long', - }; - }) - .required(), - department : Joi.string().min(2).max(3).required(), - section : Joi.string().length(1).required(), + name: Joi.string().min(5).label('Name').required(), + password: Joi.string() + .min(7) + .error(() => { + return { + message: 'Password should be at least 7 characters long', + }; + }) + .required(), + department: Joi.string().min(2).max(3).required(), + section: Joi.string().length(1).required(), }; }; const DetailsSchema = () => { return { - contactEmail : - Joi.string().email().allow('').trim().strict().label('Contact Email'), - facebook : Joi.string().uri().label('Facebook').error(() => { - return { - message : 'Please enter a valid Facebook profile URL', - }; - }), - linkedin : Joi.string().uri().label('Linkedin').error(() => { - return { - message : 'Please enter a valid LinkedIn profile URL', - }; - }), - whatsappNo : Joi.string() - .length(10) - .regex(/^\d+$/) - .label('WhatsApp Number') - .error(() => { - return { - message : 'Input should be a number of length 10', - }; - }), - contactNo : Joi.string() - .label('Contact Number') - .length(10) - .regex(/^\d+$/) - .error(() => { - return { - message : 'Input should be a number of length 10', - }; - }), - snapchat : Joi.string().label('Snapchat'), - instagram : Joi.string().label('Instagram'), + contactEmail: Joi.string() + .email() + .allow('') + .trim() + .strict() + .label('Contact Email'), + facebook: Joi.string() + .uri() + .label('Facebook') + .error(() => { + return { + message: 'Please enter a valid Facebook profile URL', + }; + }), + linkedin: Joi.string() + .uri() + .label('Linkedin') + .error(() => { + return { + message: 'Please enter a valid LinkedIn profile URL', + }; + }), + whatsappNo: Joi.string() + .length(10) + .regex(/^\d+$/) + .label('WhatsApp Number') + .error(() => { + return { + message: 'Input should be a number of length 10', + }; + }), + contactNo: Joi.string() + .label('Contact Number') + .length(10) + .regex(/^\d+$/) + .error(() => { + return { + message: 'Input should be a number of length 10', + }; + }), + snapchat: Joi.string().label('Snapchat'), + instagram: Joi.string().label('Instagram'), }; }; const EmailAccess = () => { return { - email : Joi.string() - .email() - .error(() => { - return { - message : 'Please enter a valid Email', - }; - }) - .required(), + email: Joi.string() + .email() + .error(() => { + return { + message: 'Please enter a valid Email', + }; + }) + .required(), }; }; -export {LoginSchema, SignUpSchema, DetailsSchema, EmailAccess}; +export { LoginSchema, SignUpSchema, DetailsSchema, EmailAccess };