diff --git a/package.json b/package.json index 07e86739..296b94c4 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "react-firebase-hooks": "^5.1.1", "react-google-charts": "^4.0.1", "react-image-crop": "^11.0.5", + "react-intersection-observer": "^9.13.1", "react-joyride": "^2.7.2", "react-loading-skeleton": "^3.2.0", "react-markdown": "^9.0.1", diff --git a/src/components/onboarding/DataAsk.jsx b/src/components/onboarding/DataAsk.jsx index d64393cf..821a9cc6 100644 --- a/src/components/onboarding/DataAsk.jsx +++ b/src/components/onboarding/DataAsk.jsx @@ -262,6 +262,7 @@ export function DataAsk(props) {

+
- {results.length > 0 ? ( - results - .filter((challenge) => { - if ( - difficulty.toLowerCase() !== 'all' && - challenge.difficulty.toLowerCase() !== difficulty.toLowerCase() - ) { - return false; - } - if ( - filter !== '' && - challenge.category.includes(filter.toLowerCase()) - ) { + {displayedResults.length > 0 ? ( + <> + {displayedResults + .filter((challenge) => { + if ( + difficulty.toLowerCase() !== 'all' && + challenge.difficulty.toLowerCase() !== difficulty.toLowerCase() + ) { + return false; + } + if ( + filter !== '' && + challenge.category.includes(filter.toLowerCase()) + ) { + return true; + } + if ( + filter !== '' && + !( + challenge.title + .toLowerCase() + .includes(filter.toLowerCase()) || + challenge.content + .toLowerCase() + .includes(filter.toLowerCase()) + ) + ) { + return false; + } return true; - } - if ( - filter !== '' && - !( - challenge.title - .toLowerCase() - .includes(filter.toLowerCase()) || - challenge.content - .toLowerCase() - .includes(filter.toLowerCase()) - ) - ) { - return false; - } - return true; - }) - .map((challenge) => ( - - )) + }) + .map((challenge) => ( + + ))} +
+ ) : ( // kinda hacky but it works challenges.length != 0 && ( diff --git a/src/pages/users/[user].jsx b/src/pages/users/[user].jsx index 759c886c..3cee5238 100644 --- a/src/pages/users/[user].jsx +++ b/src/pages/users/[user].jsx @@ -995,12 +995,7 @@ export default function Create() {

- {user && points && ( - - Points: {points} - - )} - + {' '} {(user && user.location) || (