-
Notifications
You must be signed in to change notification settings - Fork 30
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
Connects the Google Contact Form #751
Merged
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bdb6f99
Update index.js
maxskewes 509cf7c
Merge branch 'main' into google-contact-form
nrrao c99eb80
centered component
maxskewes 738c243
Merge branch 'main' into google-contact-form
kevinashworth dd4e823
Created ContactForm component
maxskewes 2ccf6c9
Removed unused code, added default export to ContactForm
maxskewes 84db80a
Removed aligncontent and addPad props
maxskewes 25a87f9
Added CardMedia
maxskewes a22ef50
Merge branch 'main' into google-contact-form
nrrao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
---|---|---|
@@ -0,0 +1,154 @@ | ||
import React from 'react'; | ||
import Box from '@material-ui/core/Box'; | ||
import makeStyles from '@material-ui/core/styles/makeStyles'; | ||
import Grid from '@material-ui/core/Grid'; | ||
import Typography from '@material-ui/core/Typography'; | ||
import Container from '@material-ui/core/Container'; | ||
import TextField from '@material-ui/core/TextField'; | ||
import Button from '@material-ui/core/Button'; | ||
import FileUploadIcon from '../../../icons/FileUploadIcon'; | ||
import { GenericHeaderSection } from '../../../components/'; | ||
|
||
const useStyles = makeStyles((theme) => ({ | ||
headerStyle: { | ||
textAlign: 'center', | ||
[theme.breakpoints.down('sm')]: { | ||
padding: '0px 32px', | ||
}, | ||
[theme.breakpoints.up('md')]: { | ||
padding: '0px 100px', | ||
}, | ||
'& h6': { | ||
[theme.breakpoints.down('sm')]: { | ||
fontSize: '20px', | ||
fontWeight: '700', | ||
margin: '0px 0px 71px 0px', | ||
color: theme.palette.text.secondary, | ||
}, | ||
[theme.breakpoints.up('md')]: { | ||
fontSize: '24px', | ||
fontWeight: '700', | ||
margin: '0px 0px 86px 0px', | ||
color: theme.palette.text.secondary, | ||
}, | ||
}, | ||
}, | ||
formStyle: { | ||
textAlign: 'left', | ||
padding: '48px 0px', | ||
justifyContent: 'center', | ||
'& h3': { | ||
fontSize: '20px', | ||
fontWeight: '500', | ||
margin: '32px 0px 8px 0px', | ||
color: theme.palette.text.primary, | ||
}, | ||
'& h4': { | ||
fontSize: '20px', | ||
fontWeight: '500', | ||
margin: '8px 0px 0px 0px', | ||
color: theme.palette.text.primary, | ||
}, | ||
}, | ||
})); | ||
|
||
const ContactForm = () => { | ||
const classes = useStyles(); | ||
return ( | ||
<Box className='containerGray'> | ||
<Container> | ||
<Grid container className={classes.formStyle}> | ||
<Grid item xs={1} md={2} lg={3} /> | ||
<Grid item xs={10} md={8} lg={6} container direction='column'> | ||
<Grid item xs={12}> | ||
<Typography variant='h3'> | ||
Email <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='email-input' placeholder='Your email'></TextField> | ||
|
||
<Typography variant='h3'> | ||
I have a question, comment or feature suggestion. | ||
</Typography> | ||
<TextField id='user-message' placeholder='Your message' multiline='true'></TextField> | ||
|
||
<Typography variant='h3'> | ||
I added the civictechindex tag to my project, please add my logo to your website. | ||
</Typography> | ||
<Button | ||
style={{ width: '200px', height: '48px', margin: '4px 0px' }} | ||
variant='contained' | ||
color='default' | ||
> | ||
<FileUploadIcon /> | ||
Upload File | ||
</Button> | ||
<Typography variant='h4'>[ADD FILE DETAILS (SIZE, TYPE)]</Typography> | ||
|
||
<Typography variant='h3'> | ||
Name <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='name-input' placeholder='Your name'></TextField> | ||
|
||
<Typography variant='h3'> | ||
Organization / Brigade / Affiliation <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField | ||
id='user-affiliation' | ||
placeholder='Name of your organization, brigade, affiliation' | ||
></TextField> | ||
|
||
<Typography variant='h3'> | ||
Your Project or Organization's GitHub URL{''} | ||
<span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='github-url' placeholder='GitHub URL'></TextField> | ||
|
||
<Button | ||
style={{ | ||
width: '105px', | ||
height: '48px', | ||
padding: '10px', | ||
margin: '32px 0px', | ||
}} | ||
variant='contained' | ||
color='secondary' | ||
> | ||
Submit | ||
</Button> | ||
</Grid> | ||
</Grid> | ||
<Grid item xs={1} md={2} lg={3} /> | ||
</Grid> | ||
</Container> | ||
</Box> | ||
); | ||
}; | ||
|
||
const Contact = () => { | ||
const classes = useStyles(); | ||
const breadCrumbLinks = [ | ||
{ name: 'Home', href: '/home' }, | ||
{ name: 'Contact', href: '/about/contact' }, | ||
]; | ||
|
||
return ( | ||
<Box> | ||
<GenericHeaderSection | ||
mainTitle='Contact Us' | ||
breadCrumbLinks={breadCrumbLinks} | ||
> | ||
<Grid container justify='center' className={classes.headerStyle}> | ||
<Grid item xs={12} md={10}> | ||
<Typography variant='h6'> | ||
We would love to hear your thoughts or feedback on how we can | ||
improve your experience with the Civic Tech Index! | ||
</Typography> | ||
</Grid> | ||
</Grid> | ||
</GenericHeaderSection> | ||
<ContactForm /> | ||
</Box> | ||
); | ||
}; | ||
|
||
export default Contact; |
This file contains 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 |
---|---|---|
|
@@ -2,13 +2,9 @@ import React from 'react'; | |
import Box from '@material-ui/core/Box'; | ||
import makeStyles from '@material-ui/core/styles/makeStyles'; | ||
import Grid from '@material-ui/core/Grid'; | ||
import Container from '@material-ui/core/Container'; | ||
import Typography from '@material-ui/core/Typography'; | ||
import TextField from '@material-ui/core/TextField'; | ||
import Button from '@material-ui/core/Button'; | ||
import FileUploadIcon from '../../../icons/FileUploadIcon'; | ||
|
||
import { GenericHeaderSection } from '../../../components/'; | ||
|
||
const useStyles = makeStyles((theme) => ({ | ||
headerStyle: { | ||
textAlign: 'center', | ||
|
@@ -52,78 +48,6 @@ const useStyles = makeStyles((theme) => ({ | |
}, | ||
})); | ||
|
||
const ContactForm = () => { | ||
const classes = useStyles(); | ||
return ( | ||
<Box className='containerGray'> | ||
<Container> | ||
<Grid container className={classes.formStyle}> | ||
<Grid item xs={1} md={2} lg={3} /> | ||
<Grid item xs={10} md={8} lg={6} container direction='column'> | ||
<Grid item xs={12}> | ||
<Typography variant='h3'> | ||
Email <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='email-input' placeholder='Your email'></TextField> | ||
|
||
<Typography variant='h3'> | ||
I have a question, comment or feature suggestion. | ||
</Typography> | ||
<TextField id='user-message' placeholder='Your message' multiline='true'></TextField> | ||
|
||
<Typography variant='h3'> | ||
I added the civictechindex tag to my project, please add my logo to your website. | ||
</Typography> | ||
<Button | ||
style={{ width: '200px', height: '48px', margin: '4px 0px' }} | ||
variant='contained' | ||
color='default' | ||
> | ||
<FileUploadIcon /> | ||
Upload File | ||
</Button> | ||
<Typography variant='h4'>[ADD FILE DETAILS (SIZE, TYPE)]</Typography> | ||
|
||
<Typography variant='h3'> | ||
Name <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='name-input' placeholder='Your name'></TextField> | ||
|
||
<Typography variant='h3'> | ||
Organization / Brigade / Affiliation <span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField | ||
id='user-affiliation' | ||
placeholder='Name of your organization, brigade, affiliation' | ||
></TextField> | ||
|
||
<Typography variant='h3'> | ||
Your Project or Organization's GitHub URL{''} | ||
<span style={{ color: 'red' }}>*</span> | ||
</Typography> | ||
<TextField id='github-url' placeholder='GitHub URL'></TextField> | ||
|
||
<Button | ||
style={{ | ||
width: '105px', | ||
height: '48px', | ||
padding: '10px', | ||
margin: '32px 0px', | ||
}} | ||
variant='contained' | ||
color='secondary' | ||
> | ||
Submit | ||
</Button> | ||
</Grid> | ||
</Grid> | ||
<Grid item xs={1} md={2} lg={3} /> | ||
</Grid> | ||
</Container> | ||
</Box> | ||
); | ||
}; | ||
|
||
const Contact = () => { | ||
const classes = useStyles(); | ||
const breadCrumbLinks = [ | ||
|
@@ -133,18 +57,32 @@ const Contact = () => { | |
|
||
return ( | ||
<Box> | ||
<GenericHeaderSection mainTitle='Contact Us' breadCrumbLinks={breadCrumbLinks}> | ||
<GenericHeaderSection | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Identical blocks of code found in 2 locations. Consider refactoring. |
||
mainTitle='Contact Us' | ||
breadCrumbLinks={breadCrumbLinks} | ||
> | ||
<Grid container justify='center' className={classes.headerStyle}> | ||
<Grid item xs={12} md={10}> | ||
<Typography variant='h6'> | ||
We would love to hear your thoughts or feedback on how we can improve your experience | ||
with the Civic Tech Index! | ||
We would love to hear your thoughts or feedback on how we can | ||
improve your experience with the Civic Tech Index! | ||
</Typography> | ||
</Grid> | ||
</Grid> | ||
</GenericHeaderSection> | ||
|
||
<ContactForm /> | ||
<div style={{ textAlign: 'center' }}> | ||
<iframe | ||
title='googleContactForm' | ||
src='https://docs.google.com/forms/d/e/1FAIpQLSeTVA3JJdzS1Hftq5CmpGVYcn60KRXqu2ajM85NgF2vxEgghg/viewform?embedded=true' | ||
width='640' | ||
height='1179' | ||
frameBorder='0' | ||
marginHeight='0' | ||
marginWidth='0' | ||
> | ||
Loading… | ||
</iframe> | ||
</div> | ||
</Box> | ||
); | ||
}; | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Identical blocks of code found in 2 locations. Consider refactoring.