Resolved Conflicts #96
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,21 @@ | ||
| import React, { useState } from 'react'; | ||
| import { makeStyles } from '@material-ui/styles'; | ||
| import DrawerLayout from 'src/layouts/DrawerLayout'; | ||
| import { | ||
| ValidatorForm, | ||
| TextValidator, | ||
| } from 'react-material-ui-form-validator'; | ||
| // import CircularProgress from '@material-ui/core/CircularProgress'; | ||
| import { | ||
| Button, | ||
| Grid, | ||
| Box, | ||
| Typography, | ||
| LinearProgress | ||
| } from '@material-ui/core'; | ||
| import ImageUploader from 'react-images-upload'; | ||
| import { useSelector } from 'react-redux'; | ||
| import firebase from 'firebase'; | ||
| import { useHistory } from 'react-router'; | ||
|
|
||
| const useStyles = makeStyles((theme) => ({ | ||
|
|
@@ -23,14 +26,14 @@ const useStyles = makeStyles((theme) => ({ | |
| borderRadius: '20px', | ||
| fontSize: '16px' | ||
| }, | ||
| speaker: { | ||
| marginBottom: '10px' | ||
| }, | ||
| speakerInput: { | ||
| marginBottom: '16px', | ||
| marginTop: '8px', | ||
| backgroundColor: 'rgb(232, 240, 254)', | ||
| border:'0', | ||
| borderRadius: '20px', | ||
| padding: '20px', | ||
| '& .MuiOutlinedInput-notchedOutline': { | ||
|
|
@@ -62,23 +65,15 @@ const useStyles = makeStyles((theme) => ({ | |
| borderRadius: '20px', | ||
| marginRight: '60px' | ||
| }, | ||
| input1: { | ||
| border: '0', | ||
| font: 'inherit', | ||
| // border: '1px solid #848c83', | ||
| width: '100%', | ||
| backgroundColor: 'rgb(232, 240, 254)', | ||
| borderRadius: '20px', | ||
| outline: '0', | ||
| padding: '12px', | ||
| '& .MuiOutlinedInput-notchedOutline': { | ||
| borderColor: '#F2F7FF', | ||
| borderRadius: '20px', | ||
|
|
@@ -156,16 +151,15 @@ const useStyles = makeStyles((theme) => ({ | |
| }, | ||
| date: { | ||
| marginBottom: '16px', | ||
| backgroundColor: 'rgb(232, 240, 254)', | ||
| borderRadius: '20px', | ||
| padding: '12.5px 14px', | ||
| // border:'1px solid #848c83', | ||
| '&:focus': { | ||
| outline: 'none' | ||
| }, | ||
|
|
||
| '& .MuiOutlinedInput-notchedOutline': { | ||
| borderRadius: '20px' | ||
| }, | ||
| [theme.breakpoints.down('md')]: { | ||
|
|
@@ -175,10 +169,10 @@ const useStyles = makeStyles((theme) => ({ | |
| textField: { | ||
| marginBottom: '16px', | ||
| marginTop: '8px', | ||
| border: '0', | ||
| backgroundColor: 'rgb(232, 240, 254)', | ||
| borderRadius: '20px', | ||
| padding: '20px', | ||
| '& .MuiOutlinedInput-notchedOutline': { | ||
| borderColor: '#F2F7FF', | ||
| borderRadius: '20px' | ||
|
|
@@ -206,19 +200,21 @@ function CreateNewEvent() { | |
| description: '', | ||
| date: '', | ||
| time: '', | ||
| eventLink: '', | ||
| speakerName: '', | ||
| speakerLinkedIn: '', | ||
| }; | ||
| const [formData, setFormData] = useState(initialFieldValues); | ||
| // const [submit, setsubmit] = useState(0); | ||
| const handleChange = (e) => { | ||
| const { name, value } = e.target; | ||
| setFormData({ ...formData, [name]: value }); | ||
| }; | ||
|
|
||
| const handleSpeakerChange = (e) => { | ||
| let { id, name, value } = e.target; | ||
| let s = [...speaker]; | ||
Amishakumari544 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| s[parseInt(id)][name] = value; | ||
|
There was a problem hiding this comment. missing radix parameter take reference here There was a problem hiding this comment. 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, |
||
| setSpeaker(s); | ||
| }; | ||
|
|
||
|
|
@@ -261,10 +257,14 @@ function CreateNewEvent() { | |
| history.push(`/events/${docRef.id}`); | ||
| }); | ||
| }; | ||
| // const handleSubmit = () =>{ | ||
| // console.log('submit'); | ||
| // } | ||
|
|
||
| return ( | ||
| <DrawerLayout> | ||
| <div className={classes.root}> | ||
| <ValidatorForm onSubmit={handleSubmit} onError={errors => console.log(errors)}> | ||
|
|
||
| <Box display="flex" style={{ width: '100%' }}> | ||
| <Box flexGrow={1}> | ||
| <Grid container> | ||
|
|
@@ -276,31 +276,35 @@ function CreateNewEvent() { | |
| </Grid> | ||
| <Grid container className={classes.event}> | ||
| <Grid style={{ width: '100%' }}> | ||
| <TextValidator | ||
| placeholder="Enter name of the event" | ||
| className={classes.textField} | ||
| fullWidth | ||
| name="eventName" | ||
| value={formData.eventName} | ||
| // variant="outlined" | ||
| onChange={handleChange} | ||
| validators={['required']} | ||
| errorMessages={['This is a required field']} | ||
| /> | ||
|
|
||
| <TextValidator | ||
| placeholder="Add Description of the event" | ||
Amishakumari544 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| className={classes.textField} | ||
| multiline | ||
| rows={4} | ||
| fullWidth | ||
| name="description" | ||
| value={formData.description} | ||
| // variant="outlined" | ||
| onChange={handleChange} | ||
| validators={['required']} | ||
| errorMessages={['This is a required field']} | ||
| /> | ||
|
|
||
| <Grid container> | ||
| <Grid item xs={12} sm={12} md={6}> | ||
| <TextValidator | ||
| id="date" | ||
| type="date" | ||
| defaultValue="2017-05-24" | ||
|
|
@@ -312,54 +316,75 @@ function CreateNewEvent() { | |
| shrink: true | ||
| }} | ||
| style={{ marginRight: '30px' }} | ||
| validators={['required']} | ||
| errorMessages={['This is a required field']} | ||
| /> | ||
| </Grid> | ||
| <Grid item xs={12} sm={12} md={6}> | ||
| <TextValidator | ||
| fullWidth | ||
| className={classes.input1} | ||
| type="time" | ||
| name="time" | ||
| value={formData.time} | ||
| id="time" | ||
| defaultValue="07:30" | ||
| // variant="outlined" | ||
| onChange={handleChange} | ||
| validators={['required']} | ||
| errorMessages={['This is a required field']} | ||
| /> | ||
| </Grid> | ||
| </Grid> | ||
|
|
||
| <TextValidator | ||
| fullWidth | ||
| className={classes.textField} | ||
| placeholder="Event link / Registration link" | ||
| name="eventLink" | ||
| value={formData.eventLink} | ||
| // variant="outlined" | ||
| onChange={handleChange} | ||
| validators={[ | ||
| 'required']} | ||
| errorMessages={[ | ||
| 'This is a required field', | ||
| 'Please enter a valid contact number' | ||
| ]} | ||
| /> | ||
| {speaker.map((item, idx) => ( | ||
| <fieldset className={classes.speakerInput}> | ||
| <TextValidator | ||
| className={classes.speaker} | ||
| fullWidth | ||
| id={idx.toString()} | ||
| name="speakerName" | ||
| value={item.speakerName} | ||
| placeholder="Speaker Name" | ||
| onChange={handleSpeakerChange} | ||
| validators={['required']} | ||
| errorMessages={['This is a required field']} | ||
| /> | ||
| <TextValidator | ||
| key="linkedIn" | ||
|
There was a problem hiding this comment. indentation error use preferred code formator to resolve all indent-related errors in one go. There was a problem hiding this comment. I already formatted the code with prettier but ok I am doing changes. |
||
| className={classes.speaker} | ||
| fullWidth | ||
| id={idx.toString()} | ||
| name="speakerLinkedIn" | ||
| value={item.speakerLinkedIn} | ||
| placeholder="Speaker LinkedIn Profile Link" | ||
| onChange={handleSpeakerChange} | ||
| validators={[ | ||
| 'required', | ||
| 'matchRegexp:^(http(s)?://)?([w]+.)?linkedin.com/(pub|in|profile)' | ||
| ]} | ||
| errorMessages={[ | ||
| 'This is a required field', | ||
| 'Please enter a valid URL' | ||
| ]} | ||
| /> | ||
| </fieldset> | ||
| ))} | ||
|
There was a problem hiding this comment. indentation error and no-trailing-spaces allowed acc to preferred code formator |
||
|
|
||
| {speaker.length > 1 && ( | ||
| <Button className={classes.button} onClick={removeSpeaker}> | ||
|
|
@@ -369,7 +394,6 @@ function CreateNewEvent() { | |
| <Button className={classes.button} onClick={addSpeaker}> | ||
| Add Speaker | ||
| </Button> | ||
| </Grid> | ||
| </Grid> | ||
| <div className={classes.createbtn}> | ||
|
|
@@ -379,7 +403,7 @@ function CreateNewEvent() { | |
| > | ||
| Cancel | ||
| </Button> | ||
| <Button className={classes.addbtn} type="submit"> | ||
| Create | ||
| </Button> | ||
| </div> | ||
|
|
@@ -391,7 +415,7 @@ function CreateNewEvent() { | |
| onChange={onDrop} | ||
| withPreview={imageURL !== null} | ||
| singleImage | ||
| imgExtension={['.jpg', '.gif', '.png']} | ||
| maxFileSize={5242880} | ||
| fileContainerStyle={{ | ||
| boxShadow: '2px 2px 3px 1px rgb(0, 0, 0, 0.5)' | ||
|
|
@@ -405,8 +429,9 @@ function CreateNewEvent() { | |
| style={{ marginLeft: '10px', marginTop: '20px' }} | ||
| /> | ||
| </Box> | ||
| </Box> | ||
| </ValidatorForm> | ||
| </div> | ||
| </DrawerLayout> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.