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.

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

Sprint 6 merge conflicts #120

Merged
merged 3 commits into from
Mar 25, 2019
Merged

Sprint 6 merge conflicts #120

merged 3 commits into from
Mar 25, 2019

Commits on Mar 11, 2019

  1. 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)
    mjoyce91 authored and burgwyn committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    edea2ce View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. Merge branch 'staging' into dev-sprint-6-merge-conflicts

    * staging:
      dev -> staging (#98)
    
    # 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
    mjoyce91 committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    b923152 View commit details
    Browse the repository at this point in the history
  2. Remove duplicates

    mjoyce91 committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    424157d View commit details
    Browse the repository at this point in the history