-
Notifications
You must be signed in to change notification settings - Fork 166
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
Add notification button components #302
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4d0b2e6
Add notification button components
AndrewLester 894517c
Fix popper positioning
AndrewLester ea93f8b
Add popper arrow and inner content
AndrewLester 901e80c
Give dropdown box shadow
AndrewLester 2695554
Add mobile view
AndrewLester 2c9988e
Fix box shadow on arrow for dropdown panel
AndrewLester 74ac45a
Fix coloring of unread notifications text
AndrewLester 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
7 changes: 7 additions & 0 deletions
7
...nd/zubhub/src/assets/js/styles/components/notification_button/notificationButtonStyles.js
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,7 @@ | ||
const styles = theme => ({ | ||
notificationButtonStyle: { | ||
minWidth: '0px !important', | ||
}, | ||
}); | ||
|
||
export default styles; |
18 changes: 18 additions & 0 deletions
18
...ubhub/src/assets/js/styles/components/notification_panel/notificationPanelButtonStyles.js
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,18 @@ | ||
const styles = theme => ({ | ||
buttonStyle: { | ||
borderRadius: '30px', | ||
padding: '5px 15px', | ||
color: '#757575', | ||
backgroundColor: '#E4E4E4', | ||
outline: 'none', | ||
border: 'none', | ||
cursor: 'pointer', | ||
fontSize: '15px', | ||
}, | ||
selectedButtonStyle: { | ||
backgroundColor: '#00B8C4', | ||
color: 'white', | ||
}, | ||
}); | ||
|
||
export default styles; |
18 changes: 18 additions & 0 deletions
18
...ubhub/src/assets/js/styles/components/notification_panel/notificationPanelPopperStyles.js
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,18 @@ | ||
const styles = theme => ({ | ||
popperContainerStyle: { | ||
top: '56px !important', | ||
}, | ||
popperArrowStyle: { | ||
width: '50px', | ||
height: '50px', | ||
top: '-19px', | ||
background: 'white', | ||
position: 'absolute', | ||
transform: 'scaleX(0.7) rotate(45deg)', | ||
transformOrigin: 'center', | ||
borderRadius: '200px 0px 1000px 0px', | ||
zIndex: '2000', | ||
}, | ||
}); | ||
|
||
export default styles; |
39 changes: 39 additions & 0 deletions
39
...tend/zubhub/src/assets/js/styles/components/notification_panel/notificationPanelStyles.js
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,39 @@ | ||
const styles = theme => ({ | ||
popperContainerStyle: { | ||
top: '48px !important', | ||
}, | ||
popperStyle: { | ||
backgroundColor: 'white', | ||
zIndex: 20, | ||
padding: '20px', | ||
borderRadius: '20px', | ||
boxShadow: '0px 4px 4px 0px rgb(0 0 0 / 25%)', | ||
}, | ||
fullscreenPopperStyle: { | ||
width: '100vw', | ||
height: '100vh', | ||
borderRadius: '0px', | ||
}, | ||
panelHeaderStyle: { | ||
display: 'flex', | ||
flexFlow: 'row nowrap', | ||
alignItems: 'center', | ||
gap: '10px', | ||
color: '#00B8C4', | ||
}, | ||
panelHeaderTextStyle: { | ||
margin: '0px', | ||
marginRight: '30px', | ||
fontWeight: '600', | ||
}, | ||
panelSubheadingTextStyle: { | ||
margin: '5px 0px', | ||
fontWeight: '600', | ||
color: '#00B8C4', | ||
}, | ||
fullWidth: { | ||
width: '100%', | ||
}, | ||
}); | ||
|
||
export default styles; |
37 changes: 37 additions & 0 deletions
37
zubhub_frontend/zubhub/src/components/notification_button/NotificationButton.jsx
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,37 @@ | ||
import React, { useRef, useState } from 'react'; | ||
import NotificationPanel from '../notification_panel/NotificationPanel'; | ||
import NotificationsIcon from '@material-ui/icons/Notifications'; | ||
import CustomButton from '../button/Button'; | ||
import ClickAwayListener from '@material-ui/core/ClickAwayListener'; | ||
import cn from 'classnames'; | ||
import styles from '../../assets/js/styles/components/notification_button/notificationButtonStyles'; | ||
import { makeStyles } from '@material-ui/core/styles'; | ||
|
||
const useStyles = makeStyles(styles); | ||
|
||
const NotificationButton = ({ className }) => { | ||
const classes = useStyles(); | ||
const [dropdownOpen, setDropdownOpen] = useState(false); | ||
const buttonRef = useRef(); | ||
|
||
return ( | ||
<ClickAwayListener onClickAway={() => setDropdownOpen(false)}> | ||
<div> | ||
<CustomButton | ||
className={cn(className, classes.notificationButtonStyle)} | ||
variant="contained" | ||
primaryButtonStyle | ||
customButtonStyle | ||
size="small" | ||
onClick={() => setDropdownOpen(!dropdownOpen)} | ||
ref={buttonRef} | ||
> | ||
<NotificationsIcon /> | ||
</CustomButton> | ||
<NotificationPanel open={dropdownOpen} anchorEl={buttonRef} /> | ||
</div> | ||
</ClickAwayListener> | ||
); | ||
}; | ||
|
||
export default NotificationButton; |
76 changes: 76 additions & 0 deletions
76
zubhub_frontend/zubhub/src/components/notification_panel/NotificationPanel.jsx
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,76 @@ | ||
import React, { useState } from 'react'; | ||
import styles from '../../assets/js/styles/components/notification_panel/notificationPanelStyles'; | ||
import { makeStyles } from '@material-ui/core/styles'; | ||
import NotificationPanelButton from './NotificationPanelButton'; | ||
import cn from 'classnames'; | ||
import NotificationPanelPopper from './NotificationPanelPopper'; | ||
import { useMediaQuery } from '@material-ui/core'; | ||
|
||
const useStyles = makeStyles(styles); | ||
|
||
const NOTIFICATION_VIEW_TYPE = { | ||
ALL: 'ALL', | ||
UNREAD: 'UNREAD', | ||
}; | ||
|
||
const NotificationPanel = ({ open, anchorEl }) => { | ||
const classes = useStyles(); | ||
const mediaQuery = useMediaQuery('(max-width: 600px)'); | ||
const [notificationViewType, setNotificationViewType] = useState( | ||
NOTIFICATION_VIEW_TYPE.ALL, | ||
); | ||
|
||
const getAllNotificationView = () => { | ||
const newNotificationsLength = 1; | ||
const earlierNotificationsLength = 1; | ||
|
||
return ( | ||
<div> | ||
{newNotificationsLength > 0 && ( | ||
<h2 className={classes.panelSubheadingTextStyle}>New</h2> | ||
)} | ||
{earlierNotificationsLength > 0 && ( | ||
<h2 className={classes.panelSubheadingTextStyle}>Earlier</h2> | ||
)} | ||
</div> | ||
); | ||
}; | ||
|
||
const getUnreadNotificationView = () => ( | ||
<div>Unread notifications here...</div> | ||
); | ||
|
||
return ( | ||
<NotificationPanelPopper open={open} anchorEl={anchorEl}> | ||
<div | ||
className={cn( | ||
classes.popperStyle, | ||
mediaQuery ? classes.fullscreenPopperStyle : '', | ||
)} | ||
> | ||
<div className={classes.panelHeaderStyle}> | ||
<h1 className={classes.panelHeaderTextStyle}>Notifications</h1> | ||
<NotificationPanelButton | ||
selected={notificationViewType === NOTIFICATION_VIEW_TYPE.ALL} | ||
onClick={() => setNotificationViewType(NOTIFICATION_VIEW_TYPE.ALL)} | ||
> | ||
All | ||
</NotificationPanelButton> | ||
<NotificationPanelButton | ||
selected={notificationViewType === NOTIFICATION_VIEW_TYPE.UNREAD} | ||
onClick={() => | ||
setNotificationViewType(NOTIFICATION_VIEW_TYPE.UNREAD) | ||
} | ||
> | ||
Unread | ||
</NotificationPanelButton> | ||
</div> | ||
{notificationViewType === NOTIFICATION_VIEW_TYPE.ALL | ||
? getAllNotificationView() | ||
: getUnreadNotificationView()} | ||
</div> | ||
</NotificationPanelPopper> | ||
); | ||
}; | ||
|
||
export default NotificationPanel; |
25 changes: 25 additions & 0 deletions
25
zubhub_frontend/zubhub/src/components/notification_panel/NotificationPanelButton.jsx
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,25 @@ | ||
import React from 'react'; | ||
import styles from '../../assets/js/styles/components/notification_panel/notificationPanelButtonStyles'; | ||
import { makeStyles } from '@material-ui/core/styles'; | ||
import cn from 'classnames'; | ||
|
||
const useStyles = makeStyles(styles); | ||
|
||
const NotificationPanelButton = ({ selected, children, ...rest }) => { | ||
const classNames = useStyles(); | ||
|
||
const selectedButtonClassName = selected | ||
? classNames.selectedButtonStyle | ||
: ''; | ||
|
||
return ( | ||
<button | ||
className={cn(classNames.buttonStyle, selectedButtonClassName)} | ||
{...rest} | ||
> | ||
{children} | ||
</button> | ||
); | ||
}; | ||
|
||
export default NotificationPanelButton; |
43 changes: 43 additions & 0 deletions
43
zubhub_frontend/zubhub/src/components/notification_panel/NotificationPanelPopper.jsx
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,43 @@ | ||
import { useMediaQuery } from '@material-ui/core'; | ||
import React from 'react'; | ||
import Popper from '@material-ui/core/Popper'; | ||
import { makeStyles } from '@material-ui/core/styles'; | ||
|
||
import styles from '../../assets/js/styles/components/notification_panel/notificationPanelPopperStyles'; | ||
|
||
const useStyles = makeStyles(styles); | ||
|
||
const modifiers = { | ||
offset: { | ||
enabled: true, | ||
offset: '20px, 30px', | ||
}, | ||
arrow: { | ||
enabled: true, | ||
}, | ||
}; | ||
|
||
const fullscreenModifiers = {}; | ||
|
||
const NotificationPanelPopper = ({ open, anchorEl, children }) => { | ||
const classes = useStyles(); | ||
const mediaQuery = useMediaQuery('(max-width: 600px)'); | ||
|
||
return ( | ||
<Popper | ||
open={open} | ||
anchorEl={mediaQuery ? undefined : anchorEl.current} | ||
disablePortal={!mediaQuery} | ||
modifiers={mediaQuery ? fullscreenModifiers : modifiers} | ||
placement="bottom-end" | ||
className={mediaQuery ? classes.popperContainerStyle : ''} | ||
> | ||
{!mediaQuery && ( | ||
<div x-arrow="true" className={classes.popperArrowStyle}></div> | ||
)} | ||
{children} | ||
</Popper> | ||
); | ||
}; | ||
|
||
export default NotificationPanelPopper; |
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 |
---|---|---|
|
@@ -56,16 +56,17 @@ import styles from '../assets/js/styles/views/page_wrapper/pageWrapperStyles'; | |
import commonStyles from '../assets/js/styles'; | ||
|
||
import languageMap from '../assets/js/languageMap.json'; | ||
import NotificationButton from '../components/notification_button/NotificationButton'; | ||
|
||
const useStyles = makeStyles(styles); | ||
const useCommonStyles = makeStyles(commonStyles); | ||
|
||
/** | ||
* @function PageWrapper View | ||
* @author Raymond Ndibe <[email protected]> | ||
* | ||
* @todo - describe function's signature | ||
*/ | ||
* @function PageWrapper View | ||
* @author Raymond Ndibe <[email protected]> | ||
* | ||
* @todo - describe function's signature | ||
*/ | ||
function PageWrapper(props) { | ||
const backToTopEl = React.useRef(null); | ||
const classes = useStyles(); | ||
|
@@ -325,6 +326,9 @@ function PageWrapper(props) { | |
> | ||
<SearchIcon /> | ||
</IconButton> | ||
<NotificationButton | ||
className={clsx(common_classes.marginRight1em)} | ||
/> | ||
<Avatar | ||
className={classes.avatarStyle} | ||
aria-label={`${props.auth.username}' Avatar`} | ||
|
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.
Small thing but this doesn't show up under the Unread tab for the desktop view. It does show up under mobile though.