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.

Sign up for GitHub

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

fix: issue #128 share icon alignment #129

Merged
merged 1 commit into from
Sep 29, 2021
Merged

fix: issue #128 share icon alignment #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 27 additions & 84 deletions src/components/Share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import Dialog from '@material-ui/core/Dialog';
import DialogTitle from '@material-ui/core/DialogTitle';
import Grid from '@material-ui/core/Grid';
import Close from '@material-ui/icons/Close';
import Avatar from '@material-ui/core/Avatar';
import Typography from '@material-ui/core/Typography';
import Email from '@material-ui/icons/Email';
import { makeStyles } from '@material-ui/core/styles';
import Tooltip from '@material-ui/core/Tooltip';
Expand All @@ -19,35 +17,25 @@ import log from 'loglevel';
import { green } from '@material-ui/core/colors';
import TwitterIcon from '@material-ui/icons/Twitter';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import CustomShareIcon from './common/CustomShareIcon';

const useStyles = makeStyles((theme) => ({
DialogTitle: {
[theme.breakpoints.down('xs')]: {
fontSize: '18px',
},
},
icon: {
position: 'absolute',
top: '8px',
left: 'auto',
right: '24px',
height: '32px',
width: '32px',
},
closeIcon: {
width: '32px',
height: '32px',
borderRadius: '4px',
backgroundColor: '#F7FBF7',
backgroundColor: theme.palette.secondary.lightGreen,
},
box1: {
padding: theme.spacing(4),
width: '100%',
},
box2: {
padding: theme.spacing(2),
[theme.breakpoints.down('xs')]: {
width: '25%',
padding: theme.spacing(2),
},
},
code: {
Expand Down Expand Up @@ -97,7 +85,7 @@ function Share(props) {
);
}

const mailString = `mailto:?subject=A tree from Greenstand&body=I want to share this tree from Greenstand with you, please click this linke to check it! ${props.shareUrl}`;
const mailString = `mailto:?subject=A tree from Greenstand&body=I want to share this tree from Greenstand with you, please click this link to check it! ${props.shareUrl}`;

function handleEmbed() {
setIsOpen(false);
Expand Down Expand Up @@ -152,7 +140,15 @@ function Share(props) {
<ShareIcon style={{ color: green[500] }} />
</IconButton>
</Tooltip>
<Dialog open={isOpen} onClose={handleClose}>
<Dialog
open={isOpen}
onClose={handleClose}
PaperProps={{
style: {
margin: '8px',
},
}}
>
<DialogTitle>
<Grid container justify="space-between" alignItems="center">
<Grid item xs={8} className={classes.DialogTitle}>
Expand All @@ -165,73 +161,20 @@ function Share(props) {
</Grid>
</Grid>
</DialogTitle>
<Grid container justify="center" className={classes.box1}>
<Grid item className={classes.box2}>
<Grid container direction="column" alignItems="center">
<Grid item>
<IconButton id="EmbedButton" onClick={handleEmbed}>
<Avatar
style={{
backgroundColor: '#F7FBF7',
}}
>
<Code style={{ color: green[500] }} />
</Avatar>
</IconButton>
</Grid>
</Grid>
</Grid>
<Grid item className={classes.box2}>
<Grid container direction="column" alignItems="center">
<Grid item>
<IconButton onClick={handleFaceBook}>
<Avatar
style={{
backgroundColor: '#F7FBF7',
}}
>
<FontAwesomeIcon
icon={['fab', 'facebook']}
color={green[500]}
size="lg"
/>
</Avatar>
</IconButton>
</Grid>
</Grid>
</Grid>
<Grid item className={classes.box2}>
<Grid container direction="column" alignItems="center">
<Grid item>
<IconButton onClick={handleTwitter}>
<Avatar
style={{
backgroundColor: '#F7FBF7',
}}
>
<TwitterIcon style={{ color: green[500] }} />
</Avatar>
</IconButton>
</Grid>
</Grid>
</Grid>
<Grid item className={classes.box2}>
<Grid container direction="column" alignItems="center">
<Grid item>
<a href={mailString}>
<IconButton>
<Avatar
style={{
backgroundColor: '#F7FBF7',
}}
>
<Email style={{ color: green[500] }} />
</Avatar>
</IconButton>
</a>
</Grid>
</Grid>
</Grid>
<Grid container justifyContent="center" className={classes.box1}>
<CustomShareIcon handleOnClick={handleEmbed}>
<Code />
</CustomShareIcon>
<CustomShareIcon handleOnClick={handleFaceBook}>
<FontAwesomeIcon icon={['fab', 'facebook-f']} />
</CustomShareIcon>
<CustomShareIcon handleOnClick={handleTwitter}>
<TwitterIcon />
</CustomShareIcon>
<CustomShareIcon mailString={mailString}>
<Email />
</CustomShareIcon>

<Grid container justify="space-between" alignItems="center">
<Grid item xs={8} className={classes.linkText}>
Or this link
Expand Down
9 changes: 9 additions & 0 deletions src/components/common/CustomShareIcon.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';
import { mount } from '@cypress/react';
import CustomShareIcon from './CustomShareIcon.js';

describe('CustomShareIcon', () => {
it('CustomShareIcon', () => {
mount(<CustomShareIcon />);
});
});
50 changes: 50 additions & 0 deletions src/components/common/CustomShareIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Grid from '@material-ui/core/Grid';
import IconButton from '@material-ui/core/IconButton';
import Avatar from '@material-ui/core/Avatar';
import { green } from '@material-ui/core/colors';

const useStyles = makeStyles((theme) => ({
box2: {
[theme.breakpoints.down('xs')]: {
width: '25%',
},
},
avatar: {
color: green[500],
backgroundColor: theme.palette.secondary.lightGreen,
width: '64px',
height: '64px',
},
iconButton: {
[theme.breakpoints.down('xs')]: {
paddingLeft: theme.spacing(0),
paddingRight: theme.spacing(0),
},
},
}));

function CustomShareIcon({ handleOnClick, children, mailString }) {
const classes = useStyles();

return (
<Grid item className={classes.box2}>
<Grid container direction="column" alignItems="center">
<Grid item>
<IconButton className={classes.iconButton} onClick={handleOnClick}>
{mailString ? (
<a href={mailString}>
<Avatar className={classes.avatar}>{children}</Avatar>
</a>
) : (
<Avatar className={classes.avatar}>{children}</Avatar>
)}
</IconButton>
</Grid>
</Grid>
</Grid>
);
}

export default CustomShareIcon;