Skip to content

Commit

Permalink
Sprint 6 -> staging (intermediate merge branch) (#125)
Browse files Browse the repository at this point in the history
* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Use react-linkify to automatically hyperlink URLs and email addresses in position capsule descriptions

* Authorization -> Authentication (#54)

* Authorization -> Authentication

* Rename import

* Update pagination and page size defaults in alignment with designs

* Display link, if available, in the glossary

* Add ability to edit links from Glossary editor; update styling for glossary links

* Reduce code complexity, fix long link styles

* Update snapshot

* Add bundlesize (#69)

* Add bundlsize and command

* Refine glob

* Refine maxSize target

* Chore/linter (#67)

* chore: fix linter is scss file

* fix: linter issue

* End of basic auth (#63)

* Delete login form

* Update actions

* Clean up sagas

* Remove isSAML checks

* Refactor sagas, CodeClimate fixes

* CodeClimate linting

* Upate login screen

* Simplify index

* Change to force external login

* get new custom auth working

* remove rest of the basic auth refs from server

* use env vars for env specific paths

* Bidder role - TM-371 (#68)

* Create permissions wrapper and conditionally render content based on bidder role

* remove default fallback prop

* Fix/mock auth (#70)

* fix: override some routes for the webpack dev server so auth works for local development

* fix: fix the conf so we can use the login.html when running the server in prod mode

* Default to true if can_delete property is not found

* Update snapshots

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* TM-410 - display favorites list as 4 across above the large break point (#66)

* fix: display favorites list as 4 across above the large break point

* fix: display favorites list as 4 across above the large break point

* fix: remove the auth redirect loop (#73)

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* no conditional about url

* dev -> staging (#56) (#75)

* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Remove use of skill cone/code to skill (#76)

* Add Public Profile page - links from CDO portfolio, profile/public/:id route, add Assignments section to public profile, re-use of Profile Dashboard (#71)

## Relies on MetaPhase-Consulting/State-TalentMAP-API#24

* Sort bid cycles alphabetically by name (#78)

* feature: download search results in csv format. Resolves TM-439

* chore: use default variable for sort

* chore: reformat the date before file creation

* Simplified search bar v2 (#81)

*  Make use of the existing simple search bar throughout site

* Offsets for homepage

* Redesign compare page (#82)

* Redesign compare page

* Remove old table styles; handle zero comparisons with route to catch it

* feature: move the download button and use the secondary style. resolves TM-511

* fix: set a width on the cards for the favorite positions profile screen (#80)

* fix: set a width on the cards for the favorite positions profile screen. resolves TM-410

* fix: no responsiveness for bid count and favorite buttons on position card displays

* feature: fixed width for all position cards (homepage, favorites, similar positions). Resolves TM-510

* fix: remove unnecessary class and fix padding on grid for correct wrapping

* chore: fixing the wrapping for the larger width

* Fix search styles from breaking on the bidder portfolio

* Reverting the changes to the glossary card due to the new term dialog breaking

* Add link-container class back in

* Update snapshots

* Trigger circleci build

* Code smells (#86)

* Update CodeClimate exclusions for local dev

* Reduce complexity

* Comparison drawer component, add event listeners where needed, remove old comparison UI from results page

* Track old compare choices to maintain sorting during an update

* Add test coverage, use cancel tokens

* Change dropdown menu link name from "Profile" to "Dashboard"

* Remove How to Bid section from position details (#89)

* Homepage QA (#90)

* Remove Inbox icon

* Fetch notifications from any screen, since we no longer use a /login route

* Remove the BetaHeader

* Conditional rendering of Bid Count on Bid Tracker cards, update Results cards data order and style

* Break out compare elements into their own rows, add Bid List button to comparisons, use Set() for bidListToggleIsLoading

* Remove eslint-disable

* feature: include org info for domestic positions (#92)

* Remove bidListToggleIsLoading since that is handled in BidListButton container

* Display the service needs filter as a pill on the results page (#95)

* Add error handling for position details screen (#93)

* Add error handling for position details screen

* Update call to action

* Update based on design feedback

* feature: add bid list button to the favorites cards. TM-512

* dev -> staging

* Make icons consistent throughout profile pages (#102)

* Service Needs -> Featured (#100)

* Add hover to dropdown (#103)

* Update empty saved search list text (#101)

* Add custom filter for including null language positions (#104)

* Remove Status component throughout app (#105)

* fix: change label. TM-632 (#107)

* Adjust elements to grow

* fix: allow export on edge to run

* Styles, add post to top

* Update ordering for data points on Compare page (#110)

* Remove post, add grade to bottom section

* Updates to Bid Tracker (#115)

* Add opacity to on-hold bids

* "priority" -> "pending"

* Prop to hide the delete button for standby bids

* Track favoriting loading state of individual IDs (#108)

* Track favoriting loading state of individual IDs

* Fix proptypes

* Handshake ribbon (#113)

* Re-usable Ribbon component, use Ribbon component to display if handshake has been offered on position

* Display handshake in condensed card, tests and snapshots

* Test coverage (#117)

* Test coverage for AccountDropdown, CompareDrawer, Compare

* Add tests for SetType

* Add toast notifications for favoriting actions (#114)

* Create BoxShadow component and use with various cards (#106)

* dev -> staging (#98) (#119)

* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Use react-linkify to automatically hyperlink URLs and email addresses in position capsule descriptions

* Authorization -> Authentication (#54)

* Authorization -> Authentication

* Rename import

* Update pagination and page size defaults in alignment with designs

* Display link, if available, in the glossary

* Add ability to edit links from Glossary editor; update styling for glossary links

* Reduce code complexity, fix long link styles

* Update snapshot

* Add bundlesize (#69)

* Add bundlsize and command

* Refine glob

* Refine maxSize target

* Chore/linter (#67)

* chore: fix linter is scss file

* fix: linter issue

* End of basic auth (#63)

* Delete login form

* Update actions

* Clean up sagas

* Remove isSAML checks

* Refactor sagas, CodeClimate fixes

* CodeClimate linting

* Upate login screen

* Simplify index

* Change to force external login

* get new custom auth working

* remove rest of the basic auth refs from server

* use env vars for env specific paths

* Bidder role - TM-371 (#68)

* Create permissions wrapper and conditionally render content based on bidder role

* remove default fallback prop

* Fix/mock auth (#70)

* fix: override some routes for the webpack dev server so auth works for local development

* fix: fix the conf so we can use the login.html when running the server in prod mode

* Default to true if can_delete property is not found

* Update snapshots

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* TM-410 - display favorites list as 4 across above the large break point (#66)

* fix: display favorites list as 4 across above the large break point

* fix: display favorites list as 4 across above the large break point

* fix: remove the auth redirect loop (#73)

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* no conditional about url

* dev -> staging (#56) (#75)

* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Remove use of skill cone/code to skill (#76)

* Add Public Profile page - links from CDO portfolio, profile/public/:id route, add Assignments section to public profile, re-use of Profile Dashboard (#71)

## Relies on MetaPhase-Consulting/State-TalentMAP-API#24

* Sort bid cycles alphabetically by name (#78)

* feature: download search results in csv format. Resolves TM-439

* chore: use default variable for sort

* chore: reformat the date before file creation

* Simplified search bar v2 (#81)

*  Make use of the existing simple search bar throughout site

* Offsets for homepage

* Redesign compare page (#82)

* Redesign compare page

* Remove old table styles; handle zero comparisons with route to catch it

* feature: move the download button and use the secondary style. resolves TM-511

* fix: set a width on the cards for the favorite positions profile screen (#80)

* fix: set a width on the cards for the favorite positions profile screen. resolves TM-410

* fix: no responsiveness for bid count and favorite buttons on position card displays

* feature: fixed width for all position cards (homepage, favorites, similar positions). Resolves TM-510

* fix: remove unnecessary class and fix padding on grid for correct wrapping

* chore: fixing the wrapping for the larger width

* Fix search styles from breaking on the bidder portfolio

* Reverting the changes to the glossary card due to the new term dialog breaking

* Add link-container class back in

* Update snapshots

* Trigger circleci build

* Code smells (#86)

* Update CodeClimate exclusions for local dev

* Reduce complexity

* Comparison drawer component, add event listeners where needed, remove old comparison UI from results page

* Track old compare choices to maintain sorting during an update

* Add test coverage, use cancel tokens

* Change dropdown menu link name from "Profile" to "Dashboard"

* Remove How to Bid section from position details (#89)

* Homepage QA (#90)

* Remove Inbox icon

* Fetch notifications from any screen, since we no longer use a /login route

* Remove the BetaHeader

* Conditional rendering of Bid Count on Bid Tracker cards, update Results cards data order and style

* Break out compare elements into their own rows, add Bid List button to comparisons, use Set() for bidListToggleIsLoading

* Remove eslint-disable

* feature: include org info for domestic positions (#92)

* Remove bidListToggleIsLoading since that is handled in BidListButton container

* Display the service needs filter as a pill on the results page (#95)

* Add error handling for position details screen (#93)

* Add error handling for position details screen

* Update call to action

* Update based on design feedback

* dev -> staging

* Make icons consistent throughout profile pages (#102)

* Service Needs -> Featured (#100)

* Add hover to dropdown (#103)

* Sprint 6 merge conflicts (#120)

* dev -> staging (#98)

* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Use react-linkify to automatically hyperlink URLs and email addresses in position capsule descriptions

* Authorization -> Authentication (#54)

* Authorization -> Authentication

* Rename import

* Update pagination and page size defaults in alignment with designs

* Display link, if available, in the glossary

* Add ability to edit links from Glossary editor; update styling for glossary links

* Reduce code complexity, fix long link styles

* Update snapshot

* Add bundlesize (#69)

* Add bundlsize and command

* Refine glob

* Refine maxSize target

* Chore/linter (#67)

* chore: fix linter is scss file

* fix: linter issue

* End of basic auth (#63)

* Delete login form

* Update actions

* Clean up sagas

* Remove isSAML checks

* Refactor sagas, CodeClimate fixes

* CodeClimate linting

* Upate login screen

* Simplify index

* Change to force external login

* get new custom auth working

* remove rest of the basic auth refs from server

* use env vars for env specific paths

* Bidder role - TM-371 (#68)

* Create permissions wrapper and conditionally render content based on bidder role

* remove default fallback prop

* Fix/mock auth (#70)

* fix: override some routes for the webpack dev server so auth works for local development

* fix: fix the conf so we can use the login.html when running the server in prod mode

* Default to true if can_delete property is not found

* Update snapshots

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* TM-410 - display favorites list as 4 across above the large break point (#66)

* fix: display favorites list as 4 across above the large break point

* fix: display favorites list as 4 across above the large break point

* fix: remove the auth redirect loop (#73)

* fix: remove the auth redirect loop and clean up reamining references to the LOGIN_MODE

* no conditional about url

* dev -> staging (#56) (#75)

* chore: remove unnecessary css file from the build output

* chore: update docs regarding apache compression config

* Update bid list due date to match site-wide format

* Use position id instead of position_number to query for position details

* chore: remove unused props from components

* chore: fix err due to incorrect favicon size in manifest

* chore: remove unused props from the Home container

* chore: remove unused props from the HomePagePositionsContainer component

* fix: update profile page based on qa

* Update styles and content in Position Details page based on QA feedback

* fix: add logo to saved search title

* fix: search page updates from qa

* chore: linter fix

* chore: fix linter issue

* fix: search page updates from qa

* chore: linter fix

* Remove feedback button site-wide

* Use object in state instead of array

* Minor edits to Homepage based on QA

* fix: make the pagination link clickable area larger

* fix: use the correct button style

* fix: better accessibility for active pagination tab selection

* fix: use correct button design

* fix: use lodash get so that non-existent nested property doesn't throw error  (#45)

* Use lodash get so that non-existent nested property doesn't throw error

* Check for details.id so that components don't render with an empty object

* Align bid count with data points in ResultsCondensedCard

* Show "Available" filter to all users, not just CDOs (#46)

* Update dashboard styles and content based on QA

* Fix style for bid list container

* Move Bid Count in-line with data points on ResultsCard

* View More -> View more

* Add disabled state for BidListButton based on proposed API updates

* Use real properties from API PR, combine strings

* Use white for button text color

* feature: add remove bid to the bid tracker for draft and submitted bids

* add additional status to the canDeleteBid function

* Add react-toastify and use with bid list additions/removals (#51)

* Add react-toastify and use with bid list additions/removals

* More tests for toast-related functionality

* Check if bid can be deleted and apply disabled status accordingly; update and optimize utility function

* feature: use the can_delete property from the bid rather than calculate client side

* Add loading spinner to Bid List button (#52)

* Compress us-flag.jpg (#53)

* Remove use of skill cone/code to skill (#76)

* Add Public Profile page - links from CDO portfolio, profile/public/:id route, add Assignments section to public profile, re-use of Profile Dashboard (#71)

## Relies on MetaPhase-Consulting/State-TalentMAP-API#24

* Sort bid cycles alphabetically by name (#78)

* feature: download search results in csv format. Resolves TM-439

* chore: use default variable for sort

* chore: reformat the date before file creation

* Simplified search bar v2 (#81)

*  Make use of the existing simple search bar throughout site

* Offsets for homepage

* Redesign compare page (#82)

* Redesign compare page

* Remove old table styles; handle zero comparisons with route to catch it

* feature: move the download button and use the secondary style. resolves TM-511

* fix: set a width on the cards for the favorite positions profile screen (#80)

* fix: set a width on the cards for the favorite positions profile screen. resolves TM-410

* fix: no responsiveness for bid count and favorite buttons on position card displays

* feature: fixed width for all position cards (homepage, favorites, similar positions). Resolves TM-510

* fix: remove unnecessary class and fix padding on grid for correct wrapping

* chore: fixing the wrapping for the larger width

* Fix search styles from breaking on the bidder portfolio

* Reverting the changes to the glossary card due to the new term dialog breaking

* Add link-container class back in

* Update snapshots

* Trigger circleci build

* Code smells (#86)

* Update CodeClimate exclusions for local dev

* Reduce complexity

* Comparison drawer component, add event listeners where needed, remove old comparison UI from results page

* Track old compare choices to maintain sorting during an update

* Add test coverage, use cancel tokens

* Change dropdown menu link name from "Profile" to "Dashboard"

* Remove How to Bid section from position details (#89)

* Homepage QA (#90)

* Remove Inbox icon

* Fetch notifications from any screen, since we no longer use a /login route

* Remove the BetaHeader

* Conditional rendering of Bid Count on Bid Tracker cards, update Results cards data order and style

* Break out compare elements into their own rows, add Bid List button to comparisons, use Set() for bidListToggleIsLoading

* Remove eslint-disable

* feature: include org info for domestic positions (#92)

* Remove bidListToggleIsLoading since that is handled in BidListButton container

* Display the service needs filter as a pill on the results page (#95)

* Add error handling for position details screen (#93)

* Add error handling for position details screen

* Update call to action

* Update based on design feedback

* dev -> staging

* Make icons consistent throughout profile pages (#102)

* Service Needs -> Featured (#100)

* Add hover to dropdown (#103)

* Remove duplicates
  • Loading branch information
mjoyce91 authored and burgwyn committed Mar 25, 2019
1 parent edea2ce commit 135ddea
Show file tree
Hide file tree
Showing 90 changed files with 1,313 additions and 371 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"babel-polyfill": "^6.26.0",
"body-parser": "^1.18.2",
"bunyan": "^1.8.12",
"css-box-shadow": "^1.0.0-3",
"date-fns": "^1.29.0",
"draft-js": "^0.10.4",
"draft-js-plugins-editor": "^2.0.4",
Expand Down
12 changes: 9 additions & 3 deletions src/Components/AccountDropdown/AccountDropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export class AccountDropdown extends Component {
constructor(props) {
super(props);
this.hideDropdown = this.hideDropdown.bind(this);
this.showDropdown = this.showDropdown.bind(this);
this.logout = this.logout.bind(this);
}

Expand All @@ -23,6 +24,11 @@ export class AccountDropdown extends Component {
this.dropdown.hide();
}

showDropdown() {
// Explicitly show the dropdown using the built-in hide() function from react-simple-dropdown
this.dropdown.show();
}

render() {
const { shouldDisplayName, userProfile } = this.props;
const displayName = userProfile ? userProfile.display_name : '...';
Expand All @@ -42,8 +48,8 @@ export class AccountDropdown extends Component {
className="account-dropdown"
ref={(dropdown) => { this.dropdown = dropdown; }}
removeElement
onMouseEnter={() => this.dropdown.show()}
onMouseLeave={() => this.dropdown.hide()}
onMouseEnter={this.showDropdown}
onMouseLeave={this.hideDropdown}
>
<DropdownTrigger href="/#">
<Avatar className="account-dropdown--avatar" {...avatar} />
Expand All @@ -53,7 +59,7 @@ export class AccountDropdown extends Component {
}
</DropdownTrigger>
<div className="dropdown-content-outer-container">
<DropdownContent onMouseEnter={() => this.dropdown.show()}>
<DropdownContent onMouseEnter={this.showDropdown}>
<div className="account-dropdown--identity account-dropdown--segment">
<div>Signed in as</div>
<strong>{displayName}</strong>
Expand Down
18 changes: 16 additions & 2 deletions src/Components/AccountDropdown/AccountDropdown.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,28 @@ describe('AccountDropdown', () => {
// define the instance
const instance = accountDropdown.instance();
instance.dropdown = { hide: () => {} };
// spy the logout function
// spy the hideDropdown function
const spy = sinon.spy(instance, 'hideDropdown');
// click to logout
// call function
instance.hideDropdown();
// logout function should have been called once
sinon.assert.calledOnce(spy);
});

it('can call the showDropdown function', () => {
const accountDropdown = shallow(<AccountDropdown />);

// define the instance
const instance = accountDropdown.instance();
instance.dropdown = { show: () => {} };
// spy the showDropdown function
const spy = sinon.spy(instance, 'showDropdown');
// click to logout
instance.showDropdown();
// logout function should have been called once
sinon.assert.calledOnce(spy);
});

it('does not display the name when shouldDisplayName is false', () => {
const accountDropdown = shallow(<AccountDropdown shouldDisplayName={false} />);
expect(accountDropdown.find('#account-username').exists()).toBe(false);
Expand Down
5 changes: 3 additions & 2 deletions src/Components/BidTracker/BidTrackerCard/BidTrackerCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import BidSteps from '../BidStep';
import BidTrackerCardBottom from '../BidTrackerCardBottom';
import BidTrackerCardTop from '../BidTrackerCardTop';
import OverlayAlert from '../OverlayAlert';
import BoxShadow from '../../BoxShadow';
import { shouldShowAlert } from '../BidHelpers';
import {
APPROVED_PROP,
Expand All @@ -24,7 +25,7 @@ userProfile }) => {
// add class to container for draft since we need to apply an overflow:hidden for drafts only
const draftClass = bid.status === DRAFT_PROP ? 'bid-tracker-bid-steps-container--draft' : '';
return (
<div className="bid-tracker">
<BoxShadow className="bid-tracker">
<div>
<BidTrackerCardTop
bid={bid}
Expand Down Expand Up @@ -57,7 +58,7 @@ userProfile }) => {
</div>
</div>
}
</div>
</BoxShadow>
);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`BidTrackerCardComponent matches snapshot 1`] = `
<div
<BoxShadow
blurRadius={10}
className="bid-tracker"
color="rgba(0,0,0,.15)"
inset={false}
is="div"
offsetX={3}
offsetY={2}
spreadRadius={1}
style={Object {}}
>
<div>
<BidTrackerCardTop
Expand Down Expand Up @@ -56,6 +64,7 @@ exports[`BidTrackerCardComponent matches snapshot 1`] = `
}
}
deleteBid={[Function]}
hideDelete={false}
showBidCount={true}
showQuestion={true}
/>
Expand Down Expand Up @@ -170,5 +179,5 @@ exports[`BidTrackerCardComponent matches snapshot 1`] = `
/>
</div>
</div>
</div>
</BoxShadow>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class BidTrackerCardTop extends Component {
}

render() {
const { bid, showBidCount, showQuestion } = this.props;
const { bid, hideDelete, showBidCount, showQuestion } = this.props;
const bidStatistics = get(bid, 'position.bid_statistics[0]', {});
const post = get(bid, 'position.post', {});
return (
Expand All @@ -45,7 +45,7 @@ class BidTrackerCardTop extends Component {
</div>
}
<div className="bid-tracker-actions-container">
{ bid.can_delete &&
{ bid.can_delete && !hideDelete &&
<ConfirmLink
className="remove-bid-link"
defaultText="Remove Bid"
Expand All @@ -66,11 +66,13 @@ BidTrackerCardTop.propTypes = {
showQuestion: PropTypes.bool, // Determine whether or not to show the question text
deleteBid: PropTypes.func.isRequired,
showBidCount: PropTypes.bool,
hideDelete: PropTypes.bool,
};

BidTrackerCardTop.defaultProps = {
showQuestion: true,
showBidCount: true,
hideDelete: false,
};

export default BidTrackerCardTop;
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const IsOnStandby = ({ bid, deleteBid }) => {
showQuestion={false}
bid={bid}
deleteBid={deleteBid}
hideDelete
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ exports[`IsOnStandbyComponent matches snapshot 1`] = `
}
}
deleteBid={[Function]}
hideDelete={true}
showBidCount={false}
showQuestion={false}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const IsPriority = ({ children }) => (
<div className="usa-grid-full bid-tracker-priority-wrapper">
<div className="usa-grid-full padded-container-inner priority-banner">
<div className="usa-width-one-half priority-banner-container-left">
Priority Assignment
Pending Assignment
</div>
<div className="usa-width-one-half priority-banner-container-right">
<div className="priority-banner-question-text">
<FontAwesome name="question-circle" /> What is a priority Assignment?
<FontAwesome name="question-circle" /> What is a Pending Assignment?
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`IsPriorityComponent matches snapshot 1`] = `
exports['IsPriorityComponent matches snapshot 1'] = `
<div
className="usa-grid-full bid-tracker-priority-wrapper-container"
>
Expand All @@ -13,7 +13,7 @@ exports[`IsPriorityComponent matches snapshot 1`] = `
<div
className="usa-width-one-half priority-banner-container-left"
>
Priority Assignment
Pending Assignment
</div>
<div
className="usa-width-one-half priority-banner-container-right"
Expand All @@ -24,7 +24,7 @@ exports[`IsPriorityComponent matches snapshot 1`] = `
<FontAwesome
name="question-circle"
/>
What is a priority Assignment?
What is a Pending Assignment?
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import UserProfileGeneralInformation from '../../ProfileDashboard/UserProfile/Us
import UserProfilePersonalInformation from '../../ProfileDashboard/UserProfile/UserProfilePersonalInformation';
import UserProfileBidInformation from '../../ProfileDashboard/UserProfile/UserProfileBidInformation';
import BidderPortfolioViewMore from '../BidderPortfolioViewMore';
import BoxShadow from '../../BoxShadow';

const BidderPortfolioCard = ({ userProfile }) => (
<div className="usa-grid-full current-user bidder-portfolio-card">
<BoxShadow className="usa-grid-full current-user bidder-portfolio-card">
<UserProfileGeneralInformation
userProfile={userProfile}
showEditLink={false}
Expand All @@ -19,7 +20,7 @@ const BidderPortfolioCard = ({ userProfile }) => (
submitted={userProfile.bid_statistics[0] ? userProfile.bid_statistics[0].submitted : 0}
/>
<BidderPortfolioViewMore useLink id={userProfile.id} />
</div>
</BoxShadow>
);

BidderPortfolioCard.propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`BidderPortfolioCardComponent matches snapshot 1`] = `
<div
<BoxShadow
blurRadius={10}
className="usa-grid-full current-user bidder-portfolio-card"
color="rgba(0,0,0,.15)"
inset={false}
is="div"
offsetX={3}
offsetY={2}
spreadRadius={1}
style={Object {}}
>
<UserProfileGeneralInformation
showEditLink={false}
Expand Down Expand Up @@ -128,5 +136,5 @@ exports[`BidderPortfolioCardComponent matches snapshot 1`] = `
onClick={[Function]}
useLink={true}
/>
</div>
</BoxShadow>
`;
47 changes: 47 additions & 0 deletions src/Components/BoxShadow/BoxShadow.jsx
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;
33 changes: 33 additions & 0 deletions src/Components/BoxShadow/BoxShadow.test.jsx
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 src/Components/BoxShadow/__snapshots__/BoxShadow.test.jsx.snap
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)",
}
}
/>
`;
1 change: 1 addition & 0 deletions src/Components/BoxShadow/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './BoxShadow';
2 changes: 1 addition & 1 deletion src/Components/CompareDrawer/CompareDrawerContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import CompareDrawer from './CompareDrawer';
import { COMPARE_LIST } from '../../Constants/PropTypes';
import { getScrollDistanceFromBottom } from '../../utilities';

class Compare extends Component {
export class Compare extends Component {
constructor(props) {
super(props);
this.lsListener = this.lsListener.bind(this);
Expand Down

0 comments on commit 135ddea

Please sign in to comment.