diff --git a/src/js/components/Friends/AskFriendsModal.jsx b/src/js/components/Friends/AskFriendsModal.jsx index 540553fe4..1074fe907 100644 --- a/src/js/components/Friends/AskFriendsModal.jsx +++ b/src/js/components/Friends/AskFriendsModal.jsx @@ -10,7 +10,7 @@ import withStyles from '@mui/styles/withStyles'; import withTheme from '@mui/styles/withTheme'; import PropTypes from 'prop-types'; import React, { Component, Suspense } from 'react'; -import SearchBar from '../Search/SearchBar'; +import SearchBar2024 from '../Search/SearchBar2024'; import FriendList from './FriendList'; import FriendActions from '../../actions/FriendActions'; import apiCalming from '../../common/utils/apiCalming'; @@ -22,6 +22,7 @@ import { ModalTitleType1 } from '../Style/ModalType1Styles'; import BallotStore from '../../stores/BallotStore'; import FriendStore from '../../stores/FriendStore'; import sortFriendListByMutualFriends from '../../utils/friendFunctions'; +import NoSearchResult from '../Search/NoSearchResult'; const MessageToFriendInputField = React.lazy(() => import(/* webpackChunkName: 'MessageToFriendInputField' */ './MessageToFriendInputField')); const SuggestedContacts = React.lazy(() => import(/* webpackChunkName: 'SuggestedContacts' */ './SuggestedContacts')); @@ -226,7 +227,7 @@ class AskFriendsModal extends Component {
{totalCurrentFriendListCount > 10 && ( <> - { (searchFilterOn && currentFriendList.length === 0) && ( -

- " - {searchTerm} - " not found -

+ )} 10 && ( <> - import(/* webpackChunkName: 'ShowMoreItems' */ '../Widgets/ShowMoreItems')); - class OrganizationList extends Component { constructor (props) { super(props); @@ -21,7 +21,6 @@ class OrganizationList extends Component { } componentDidMount () { - // console.log('OrganizationList componentDidMount'); this.onOrganizationListChange(); window.addEventListener('scroll', this.onScroll); } @@ -44,6 +43,7 @@ class OrganizationList extends Component { onOrganizationListChange = () => { const { incomingOrganizationList } = this.props; const organizationListToDisplay = this.sortOrganizations(incomingOrganizationList); + let organizationListToDisplayCount = 0; if (organizationListToDisplay) { organizationListToDisplayCount = organizationListToDisplay.length; @@ -116,24 +116,23 @@ class OrganizationList extends Component { return null; } - // console.log('OrganizationList organizationListToDisplay: ', organizationListToDisplayCount, organizationListToDisplayCount, loadingMoreItems); let numberOfItemsDisplayed = 0; - if (!organizationListToDisplay) { + + if (!(organizationListToDisplayCount)) { return ( -
-
-
- No results found. -
- + + -
-
+ buttonText="Endorse organization" + text="" + /> + ); } return ( @@ -147,7 +146,6 @@ class OrganizationList extends Component { } numberOfItemsDisplayed += 1; } - // console.log('OrganizationList render organization:', organization); return ( + {this.props.title} +

+ {this.props.subtitle} +

+ + ); + } +} + +const NoSearchResultWrapper = styled.div` + margin-top: 70px; + color: ${colors.darkGrey}; + text-align: center; + font-size: 22px; + font-weight: 600; + line-height: normal; + +p{ + margin-top: 10px; + color: ${colors.darkGrey}; + text-align: center; + font-size: 16px; + font-weight: 400; + line-height: normal; +} +`; + +NoSearchResult.propTypes = { + title: PropTypes.string, + subtitle: PropTypes.string, +}; + +export default NoSearchResult; diff --git a/src/js/components/Search/SearchGuidesToFollowBox.jsx b/src/js/components/Search/SearchGuidesToFollowBox.jsx index e718ee3b6..a35172275 100644 --- a/src/js/components/Search/SearchGuidesToFollowBox.jsx +++ b/src/js/components/Search/SearchGuidesToFollowBox.jsx @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import VoterGuideActions from '../../actions/VoterGuideActions'; import VoterStore from '../../stores/VoterStore'; import { renderLog } from '../../common/utils/logging'; -import SearchBar from './SearchBar'; +import SearchBar2024 from './SearchBar2024'; export default class SearchGuidesToFollowBox extends Component { constructor (props) { @@ -37,7 +37,7 @@ export default class SearchGuidesToFollowBox extends Component { render () { renderLog('SearchGuidesToFollowBox'); // Set LOG_RENDER_EVENTS to log all renders return ( - import(/* webpackChunkName: 'DelayedLoad' */ '../../common/components/Widgets/DelayedLoad')); @@ -164,7 +164,7 @@ class VoterGuideListSearchResults extends Component {
- )} - {/* ********** */} - {/* Search Box */} {voterGuideFollowersList && voterGuideFollowersList.length > 0 && ( - )} - {/* ***************** */} - {/* Results Not Found */} {(searchTerm && (voterGuideFollowersListFilteredBySearch && voterGuideFollowersListFilteredBySearch.length === 0)) && ( " diff --git a/src/js/components/VoterGuide/VoterGuideFollowing.jsx b/src/js/components/VoterGuide/VoterGuideFollowing.jsx index 384d68045..2915a2074 100755 --- a/src/js/components/VoterGuide/VoterGuideFollowing.jsx +++ b/src/js/components/VoterGuide/VoterGuideFollowing.jsx @@ -12,7 +12,7 @@ import { renderLog } from '../../common/utils/logging'; import OrganizationStore from '../../stores/OrganizationStore'; import VoterGuideStore from '../../stores/VoterGuideStore'; import VoterStore from '../../stores/VoterStore'; -import SearchBar from '../Search/SearchBar'; +import SearchBar2024 from '../Search/SearchBar2024'; import GuideList from './GuideList'; const DelayedLoad = React.lazy(() => import(/* webpackChunkName: 'DelayedLoad' */ '../../common/components/Widgets/DelayedLoad')); @@ -239,7 +239,7 @@ class VoterGuideFollowing extends Component { {/* Search Box */} {voterGuideFollowedList && voterGuideFollowedList.length > 0 && ( - import(/* webpackChunkName: 'ShowMoreItems' */ '../Widgets/ShowMoreItems')); const VoterGuidePositionItem = React.lazy(() => import(/* webpackChunkName: 'VoterGuidePositionItem' */ './VoterGuidePositionItem')); @@ -466,7 +466,7 @@ class VoterGuidePositionList extends Component { )} {((positionList && (positionList.length > 10)) || isSearching) && ( - import(/* webpackChunkName: 'CandidateListRoot' */ '../../components/CandidateListRoot/CandidateListRoot')); const CampaignListRoot = React.lazy(() => import(/* webpackChunkName: 'CampaignListRoot' */ '../../common/components/Campaign/CampaignListRoot')); @@ -664,7 +664,7 @@ class CampaignsHome extends Component {  }> {((this.state.hideIfNoResults)) && ( - - No Candidate Found -

- Please ensure the accuracy of the candidate's name and try your search again -

-
+ )} {(nextReleaseFeaturesEnabled && pigCanFly) && ( @@ -711,7 +710,7 @@ class CampaignsHome extends Component { }> }> }> }> }> See friend requests you've received - -
{ (searchFilterOn && friendListForDisplay.length === 0) && ( -

- " - {searchTerm} - " not found -

+ )} )} diff --git a/src/js/pages/OpinionsFollowed.jsx b/src/js/pages/OpinionsFollowed.jsx index 95f742f34..474642fac 100755 --- a/src/js/pages/OpinionsFollowed.jsx +++ b/src/js/pages/OpinionsFollowed.jsx @@ -8,7 +8,7 @@ import apiCalming from '../common/utils/apiCalming'; import { renderLog } from '../common/utils/logging'; import OpinionsFollowedList from '../components/Organization/OpinionsFollowedList'; -import SearchBar from '../components/Search/SearchBar'; +import SearchBar2024 from '../components/Search/SearchBar2024'; export default class OpinionsFollowed extends Component { constructor (props) { @@ -90,7 +90,7 @@ export default class OpinionsFollowed extends Component { We will never sell your email .

- 0) { let modifiedOrganization; const searchTextLowercase = searchText.toLowerCase();