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.

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

Resolved Conflicts #96

Open
wants to merge 16 commits into
base: development
Choose a base branch
from

Conversation

Amishakumari544
Copy link
Contributor

No description provided.

Copy link

@Abhijay007 Abhijay007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. I suggest you use the code formator preferred in the codebase to indent all styles in one go. if you use VScode simply install mentioned code formator Extention to format it easily. Maybe in this you need to install "prettier" not sure

  2. Review function once you missed adding arrow-parens at some places

  3. Remove unused code as it is mention in the test report that in line no. 215 and 216 you defined id, s, name, value but never reused them.

<div className={classes.root}>
<DrawerLayout>
<div className={classes.root}>
<ValidatorForm onSubmit={handleSubmit} onError={errors => console.log(errors)}>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing arrow-parens onError func

<InputBase
className={classes.social}
<TextValidator
key="linkedIn"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation error use preferred code formator to resolve all indent-related errors in one go.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already formatted the code with prettier but ok I am doing changes.

/>
</fieldset>
))}
))}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation error and no-trailing-spaces allowed acc to preferred code formator

Comment on lines 432 to 435
</Box>
</ValidatorForm>
</div>
</DrawerLayout>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent this too

import {
Box, Button, Grid, makeStyles
} from '@material-ui/core';
import { Box, Button, Grid, makeStyles } from '@material-ui/core';

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

object-curly-newline according to code formator revert this as it is.

import DrawerLayout from 'src/layouts/DrawerLayout';
import { useHistory } from 'react-router-dom';

const useStyles = makeStyles((theme) => ({
const useStyles = makeStyles(theme => ({

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use func arrow-parens properly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all codes are not written by me that's why I am facing more problem.

Copy link

@Abhijay007 Abhijay007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one thing I want to suggest is that please try to cover all the errors in a single commit.

if you want to confirm that all errors are resolved or not simply see your PowerShell window from where you run the `npm start command. if it says that localhost is running on port 3000 after compilation then errors are resolved otherwise it will show you the errors in the PowerShell window with the line number. Other than this method you can also check the console by opening inspect windows on your react application, console also displays all the errors in the console screen with the line number.

@@ -218,7 +211,7 @@ function CreateNewEvent() {
const handleSpeakerChange = (e) => {
const { id, name, value } = e.target;
const s = [...speaker];
s[parseInt(id, 10)][name] = value;
s[parseInt(id)][name] = value;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing radix parameter take reference here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all errors are not from my code someone has added these functions i don't know who is but that person has not resolved all this and i have to face this all issue,

Comment on lines +3 to +6
Box,
Button,
Grid,
makeStyles

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use 2 spaces indentation and Trailing spaces are not allowed according to formator

@Abhishek-kumar09
Copy link
Contributor

@Amishakumari544
Checkout to new branch to work on the latest code. There were too many lint errors generated in the course of development. Which are fixed now.

Just add the things that are necessary for your PR, that is related to adding validators on textFields and no more changes.
It becomes hard to review changes that way.

Please work on the latest branch.
If you havenot setup upstream remote: do it with git remote add upstream https://github.com/codeforcauseorg/causefolio.git

To work on the latest changes do :

git checkout upstream/development
git pull upstream development
git checkout -b my_new_branch
make your changes and create PR

@Amishakumari544
Copy link
Contributor Author

Ok

@Abhishek-kumar09
Copy link
Contributor

@Amishakumari544 Any updates?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants