Skip to content

Commit

Permalink
chore: format project with prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
padmajabhol committed Jul 29, 2022
1 parent 2b208a4 commit 2388890
Show file tree
Hide file tree
Showing 42 changed files with 1,074 additions and 1,045 deletions.
File renamed without changes.
106 changes: 58 additions & 48 deletions src/components/AddJournal/AddJournal.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-alert */
import { React, useState } from 'react';
import { Row, Col, Form, Button } from 'react-bootstrap';
import { showSuccessMessage, showErrorMessage } from "../../helpers/alerts"
import { showSuccessMessage, showErrorMessage } from '../../helpers/alerts';
import { JournalValidation } from '../../helpers/validate';

function AddJournal() {
Expand All @@ -15,56 +15,62 @@ function AddJournal() {
const [lastYear, setLastYear] = useState('');
const [policyType, setPolicyType] = useState('');
const [domain, setDomain] = useState('');
const [success,setSuccess] = useState("");
const [error,setError]=useState("");
const [success, setSuccess] = useState('');
const [error, setError] = useState('');

const emptyFields=()=>{
setTitle("");
setUrl("");
setIssn("");
setRating("");
setDate("");
setPolicyTitle("");
setFirstYear("");
setLastYear("");
setPolicyType("");
setDomain("");
}
const emptyFields = () => {
setTitle('');
setUrl('');
setIssn('');
setRating('');
setDate('');
setPolicyTitle('');
setFirstYear('');
setLastYear('');
setPolicyType('');
setDomain('');
};
const handleSubmit = (e) => {
e.preventDefault();
setSuccess("");
setError("");
const check = JournalValidation(title, url, issn, rating, policyTitle, firstYear,
lastYear, policyType, domain, date)
if(check){
const policies = {
title: policyTitle,
first_year: firstYear,
last_year: lastYear,
type: policyType,
};
const journal = { title, url, issn, rating, date, policies, domain };
setSuccess('');
setError('');
const check = JournalValidation(
title,
url,
issn,
rating,
policyTitle,
firstYear,
lastYear,
policyType,
domain,
date,
);
if (check) {
const policies = {
title: policyTitle,
first_year: firstYear,
last_year: lastYear,
type: policyType,
};
const journal = { title, url, issn, rating, date, policies, domain };

try{
window.scrollTo(0,0);
fetch('https://journal-policy-tracker.herokuapp.com/api/journals', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(journal),
})
emptyFields();
setSuccess("Journal Added Successfuly")
}
catch(err)
{
setError("Cannot Add Journal")
try {
window.scrollTo(0, 0);
fetch('https://journal-policy-tracker.herokuapp.com/api/journals', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(journal),
});
emptyFields();
setSuccess('Journal Added Successfuly');
} catch (err) {
setError('Cannot Add Journal');
}
} else {
window.scrollTo(0, 0);
setError('Invalid Input');
}
}
else{
window.scrollTo(0,0);
setError("Invalid Input")
}

};

return (
Expand All @@ -84,8 +90,12 @@ function AddJournal() {
</Form.Group>
<Form.Group className='mb-3' controlId='formBasicUrl'>
<Form.Label>URL</Form.Label>
<Form.Control type='text' placeholder='URL'
onChange={(e) => setUrl(e.target.value)} value={url} />
<Form.Control
type='text'
placeholder='URL'
onChange={(e) => setUrl(e.target.value)}
value={url}
/>
</Form.Group>
<Form.Group className='mb-3' controlId='formBasicIssn'>
<Form.Label>ISSN</Form.Label>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Authentication/FormSuccess.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ const FormSuccess = () => {
);
};

export default FormSuccess;
export default FormSuccess;
83 changes: 45 additions & 38 deletions src/components/Authentication/Login/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,61 +3,68 @@
/* eslint-disable jsx-a11y/label-has-associated-control */
/* eslint-disable react/function-component-definition */
/* eslint-disable jsx-a11y/anchor-is-valid */
import React from 'react'
import React from 'react';
import { Link } from 'react-router-dom';
import useFormLogin from './useFormLogin';
import validateLoginInfo from './validateLoginInfo.js';
import { FormContentRight, FormDiv, FormH1, FormInputs, FormInputsP, FormLabel, FormInput, FormInputBtn, ButtonContainer, FormH2} from './styles';
import {
FormContentRight,
FormDiv,
FormH1,
FormInputs,
FormInputsP,
FormLabel,
FormInput,
FormInputBtn,
ButtonContainer,
FormH2,
} from './styles';
import { signup } from '../../../config/content';


const FormLogin = ({submitForm}) => {
const {handleChange, values, handleSubmit, errors} = useFormLogin(submitForm, validateLoginInfo);
const FormLogin = ({ submitForm }) => {
const { handleChange, values, handleSubmit, errors } = useFormLogin(
submitForm,
validateLoginInfo,
);

return (
<FormContentRight>
<FormDiv onSubmit={handleSubmit}>
<FormDiv onSubmit={handleSubmit}>
<FormH1>{signup.head}</FormH1>
<FormH2>{signup.head2}</FormH2>
<FormInputs>
<FormLabel htmlFor='email'>
{signup.labelEmail}
</FormLabel>
<FormInput
id='email'
type='email'
name='email'
value={values.email}
onChange={handleChange}
/>
{errors.email && <FormInputsP>{errors.email}</FormInputsP>}
<FormLabel htmlFor='email'>{signup.labelEmail}</FormLabel>
<FormInput
id='email'
type='email'
name='email'
value={values.email}
onChange={handleChange}
/>
{errors.email && <FormInputsP>{errors.email}</FormInputsP>}
</FormInputs>
<FormInputs>
<FormLabel htmlFor='password'>
{signup.labelPassword}
</FormLabel>
<FormInput
id='password'
type='password'
name='password'
value={values.password}
onChange={handleChange}
/>
{errors.password && <FormInputsP>{errors.password}</FormInputsP>}
<FormLabel htmlFor='password'>{signup.labelPassword}</FormLabel>
<FormInput
id='password'
type='password'
name='password'
value={values.password}
onChange={handleChange}
/>
{errors.password && <FormInputsP>{errors.password}</FormInputsP>}
</FormInputs>
<ButtonContainer>
<FormInputBtn type='submit'>
{signup.buttonLogin}
</FormInputBtn>
<FormInputBtn primary type="button">
<Link to='/Signup' style={{color: '#EA8900', hover: '#fff' }}>
{signup.button}
<FormInputBtn type='submit'>{signup.buttonLogin}</FormInputBtn>
<FormInputBtn primary type='button'>
<Link to='/Signup' style={{ color: '#EA8900', hover: '#fff' }}>
{signup.button}
</Link>
</FormInputBtn>
</FormInputBtn>
</ButtonContainer>
</FormDiv>
</FormDiv>
</FormContentRight>
);
);
};

export default FormLogin;
export default FormLogin;
10 changes: 3 additions & 7 deletions src/components/Authentication/Login/LoginForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@ const LoginForm = () => {
return (
<>
<FormContainer>
{!isSubmitted ? (
<FormLogin submitForm={submitForm} />
) : (
<FormSuccess />
)}
{!isSubmitted ? <FormLogin submitForm={submitForm} /> : <FormSuccess />}
<FormContentLeft>
<Logo src={signup.logo.src} alt={signup.logo.alt}/>
<Logo src={signup.logo.src} alt={signup.logo.alt} />
<RightH2>{signup.formHead}</RightH2>
<FormImg src={signup.img.src} alt={signup.img.alt} />
</FormContentLeft>
Expand All @@ -33,4 +29,4 @@ const LoginForm = () => {
);
};

export default LoginForm;
export default LoginForm;

0 comments on commit 2388890

Please sign in to comment.