diff --git a/NodeTalker/build/index.js b/NodeTalker/build/index.js index bd9cb46..919faaf 100644 --- a/NodeTalker/build/index.js +++ b/NodeTalker/build/index.js @@ -28,7 +28,7 @@ app.get('/gettweet/:word', (req, resGeneral) => { let searchWord; searchWord = req.params.word; try { - const params = { q: searchWord + " since:2011-07-11", count: 3 }; + const params = { q: searchWord + " since:2011-07-11", count: 10 }; const res = newTwit.get('/search/tweets', params, function (error, tweets, response) { resGeneral.send(tweets); }); diff --git a/NodeTalker/src/index.ts b/NodeTalker/src/index.ts index a019217..82f2e07 100644 --- a/NodeTalker/src/index.ts +++ b/NodeTalker/src/index.ts @@ -35,11 +35,12 @@ const newTwit = new Twit({ timeout_ms: 60 * 1000, strictSSL: true }) + app.get('/gettweet/:word', (req: Request, resGeneral: Response) => { let searchWord: any searchWord = req.params.word try { - const params = { q: searchWord + " since:2011-07-11", count: 3 } + const params = { q: searchWord + " since:2011-07-11", count: 10 } const res = newTwit.get('/search/tweets', params, function (error: any, tweets: any, response: Response) { diff --git a/twittersearcher/src/Components/TweetList/TweetList.js b/twittersearcher/src/Components/TweetList/TweetList.js index b89b231..7b87f8d 100644 --- a/twittersearcher/src/Components/TweetList/TweetList.js +++ b/twittersearcher/src/Components/TweetList/TweetList.js @@ -1,6 +1,6 @@ import React, { useContext, useEffect } from 'react' import Context from '../../GlobalState/Context' -import { Title, Text, Card, Container } from './TweetList_styles' +import { Title, Text, Card, Container, Welcome } from './TweetList_styles' const TweetList = () => { const { states, setters, requests } = useContext(Context) @@ -11,12 +11,14 @@ const TweetList = () => { }, [states.tweetListVar]) - - - - - - + if (states.searchWord === null || states.searchWord === undefined || states.searchWord === "") { + return( + + Welcome! Please, insert a Word + + ) + } + else { return ( { @@ -34,9 +36,9 @@ const TweetList = () => { } ) - - + + } } export default TweetList \ No newline at end of file diff --git a/twittersearcher/src/Components/TweetList/TweetList_styles.js b/twittersearcher/src/Components/TweetList/TweetList_styles.js index c278dfc..a787ce9 100644 --- a/twittersearcher/src/Components/TweetList/TweetList_styles.js +++ b/twittersearcher/src/Components/TweetList/TweetList_styles.js @@ -30,4 +30,17 @@ display:flex; flex-direction:column; align-items: center; justify-content:center; +` + +export const Welcome = styled.div` +font-size: 12vh; +display:flex; +justify-content:center; +align-items: center; +background-color: #d3e0e3; +border-radius: 15%; +width: 80%; +height: 100%; +margin: 20vh 10vw; +padding: 5vh; ` \ No newline at end of file diff --git a/twittersearcher/src/Pages/MainPage/MainPage.js b/twittersearcher/src/Pages/MainPage/MainPage.js index a7c35fb..12e698e 100644 --- a/twittersearcher/src/Pages/MainPage/MainPage.js +++ b/twittersearcher/src/Pages/MainPage/MainPage.js @@ -25,6 +25,7 @@ const MainPage = () => { + )