forked from USStateDept/State-TalentMAP
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into staging-merge-sprint-6
* dev: (107 commits) Create BoxShadow component and use with various cards (#106) Add toast notifications for favoriting actions (#114) Test coverage (#117) Handshake ribbon (#113) Track favoriting loading state of individual IDs (#108) Updates to Bid Tracker (#115) Remove post, add grade to bottom section Update ordering for data points on Compare page (#110) Styles, add post to top fix: allow export on edge to run Adjust elements to grow fix: change label. TM-632 (#107) Remove Status component throughout app (#105) Add custom filter for including null language positions (#104) Update empty saved search list text (#101) Add hover to dropdown (#103) Service Needs -> Featured (#100) Make icons consistent throughout profile pages (#102) dev -> staging feature: add bid list button to the favorites cards. TM-512 ... # Conflicts: # src/Components/AccountDropdown/AccountDropdown.jsx # src/Components/BidTracker/BidTrackerCard/__snapshots__/BidTrackerCard.test.jsx.snap # src/Components/BidTracker/BidTrackerCardTop/BidTrackerCardTop.jsx # src/Components/BidTracker/PriorityCards/IsOnStandby/IsOnStandby.jsx # src/Components/BidTracker/PriorityCards/IsOnStandby/__snapshots__/IsOnStandby.test.jsx.snap # src/Components/BidderPortfolio/BidderPortfolioCard/BidderPortfolioCard.jsx # src/Components/CompareDrawer/CompareDrawerContainer.jsx # src/Components/CompareDrawer/CompareDrawerContainer.test.jsx # src/Components/CompareList/CompareList.jsx # src/Components/CompareList/__snapshots__/CompareList.test.jsx.snap # src/Components/FavoritePositions/FavoritePositions.jsx # src/Components/HomePagePositionsList/HomePagePositionsList.jsx # src/Components/ProfileDashboard/ProfileDashboard.jsx # src/Components/ResultsCard/ResultsCard.jsx # src/Components/SearchResultsExportLink/SearchResultsExportLink.jsx # src/Components/SearchResultsExportLink/SearchResultsExportLink.test.jsx # src/Components/SearchResultsExportLink/__snapshots__/SearchResultsExportLink.test.jsx.snap # src/Containers/BidListButton/BidListButton.jsx # src/Containers/Compare/Compare.jsx # src/sass/_compare.scss # src/sass/_condensedCard.scss
- Loading branch information
Showing
90 changed files
with
1,318 additions
and
371 deletions.
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
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
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
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
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
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
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
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
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
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
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
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
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,47 @@ | ||
// forked from https://github.com/lachlanjc/react-box-shadow | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import cssShadow from 'css-box-shadow'; | ||
|
||
const BoxShadow = ({ is, inset, offsetX, offsetY, blurRadius, spreadRadius, color, style, | ||
...props }) => { | ||
const Component = is; | ||
const sx = { | ||
...style, | ||
boxShadow: cssShadow.stringify([ | ||
{ | ||
inset, | ||
offsetX, | ||
offsetY, | ||
blurRadius, | ||
spreadRadius, | ||
color, | ||
}, | ||
]), | ||
}; | ||
return <Component style={sx} {...props} />; | ||
}; | ||
|
||
BoxShadow.propTypes = { | ||
is: PropTypes.oneOfType([PropTypes.string, PropTypes.node]), | ||
inset: PropTypes.bool, | ||
offsetX: PropTypes.number, | ||
offsetY: PropTypes.number, | ||
blurRadius: PropTypes.number, | ||
spreadRadius: PropTypes.number, | ||
color: PropTypes.string, | ||
style: PropTypes.shape({}), | ||
}; | ||
|
||
BoxShadow.defaultProps = { | ||
is: 'div', | ||
inset: false, | ||
offsetX: 3, | ||
offsetY: 2, | ||
blurRadius: 10, | ||
spreadRadius: 1, | ||
color: 'rgba(0,0,0,.15)', | ||
style: {}, | ||
}; | ||
|
||
export default BoxShadow; |
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,33 @@ | ||
import { shallow } from 'enzyme'; | ||
import React from 'react'; | ||
import toJSON from 'enzyme-to-json'; | ||
import BoxShadow from './BoxShadow'; | ||
|
||
describe('BoxShadow', () => { | ||
it('can receive props', () => { | ||
const wrapper = shallow( | ||
<BoxShadow | ||
is="span" | ||
inset | ||
offsetX={23} | ||
offsetY={25} | ||
blurRadius={27} | ||
spreadRadius={29} | ||
color="#f2f2f2" | ||
style={{ backgroundColor: 'red' }} | ||
/>, | ||
); | ||
const output = { | ||
backgroundColor: 'red', | ||
boxShadow: 'inset 23px 25px 27px 29px #f2f2f2', | ||
}; | ||
expect(wrapper.props().style).toEqual(output); | ||
}); | ||
|
||
it('matches snapshot', () => { | ||
const wrapper = shallow( | ||
<BoxShadow />, | ||
); | ||
expect(toJSON(wrapper)).toMatchSnapshot(); | ||
}); | ||
}); |
11 changes: 11 additions & 0 deletions
11
src/Components/BoxShadow/__snapshots__/BoxShadow.test.jsx.snap
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,11 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`BoxShadow matches snapshot 1`] = ` | ||
<div | ||
style={ | ||
Object { | ||
"boxShadow": "3px 2px 10px 1px rgba(0,0,0,.15)", | ||
} | ||
} | ||
/> | ||
`; |
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 @@ | ||
export { default } from './BoxShadow'; |
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
Oops, something went wrong.