Change name from newsType to storyType

Author: bhattaraib58

src/components/Pages/PageView/Components/NextPage.js

@@ -13,13 +13,13 @@ import { interpolate } from 'utils/httpUtil';
  * @param {*} props
  * @returns {Component}
  */
-function NextPage({ newsType = '', page = 0, news = [] }) {
+function NextPage({ storyType = '', page = 0, news = [] }) {
  const currentPageNumber = parseInt(page);
  const pagesRemaining = parseInt(news?.length / (currentPageNumber * ITEMS_PER_PAGE)) || 0;
 
  if (pagesRemaining > 0) {
  const nextPageNumber = currentPageNumber + 1;
- const nextPageRoute = interpolate(ROUTES.NEWS_TYPE_WITH_PAGE, { newsType, page: nextPageNumber });
+ const nextPageRoute = interpolate(ROUTES.STORY_TYPE_WITH_PAGE, { storyType, page: nextPageNumber });
 
  return (
  <div className="mt-20 ml-40">
@@ -33,7 +33,7 @@ function NextPage({ newsType = '', page = 0, news = [] }) {
 
 NextPage.propTypes = {
  news: PropTypes.array,
- newsType: PropTypes.string,
+ storyType: PropTypes.string,
  page: PropTypes.number
 };
 

src/components/Pages/PageView/PageView.js

@@ -23,16 +23,16 @@ function PageView({
 
  getAllNews = () => {}
 }) {
- const { newsType = 'top', page = 1 } = match?.params;
+ const { storyType = 'top', page = 1 } = match?.params;
  const currentPageNumber = parseInt(page);
 
  useEffect(() => {
- const newsEndpoint = newsType + 'stories.json';
+ const newsEndpoint = storyType + 'stories.json';
 
  getAllNews({
- newsType: newsEndpoint
+ storyType: newsEndpoint
  });
- }, [newsType, getAllNews]);
+ }, [storyType, getAllNews]);
 
  const stories = useMemo(() => {
  const previousPage = currentPageNumber - 1;
@@ -64,7 +64,7 @@ function PageView({
  <Story key={storyId} storyId={storyId} storyIndex={(currentPageNumber - 1) * ITEMS_PER_PAGE + index + 1} />
  ))}
 
- <NextPage newsType={newsType} page={page} news={news} />
+ <NextPage storyType={storyType} page={page} news={news} />
  </div>
  );
 }

src/components/Router.js

@@ -23,7 +23,7 @@ const Router = () => {
  <Header />
 
  <Switch>
- <Route exact path={[ROUTES.HOME, ROUTES.NEWS_TYPE, ROUTES.NEWS_TYPE_WITH_PAGE]} component={PageView} />
+ <Route exact path={[ROUTES.STORY_TYPE_WITH_PAGE, ROUTES.STORY_TYPE, ROUTES.HOME]} component={PageView} />
  {/* <Route path="/item/:id" component={CommentView} /> */}
 
  <Route path="/" component={PageNotFound} />

src/constants/endpoints.js

@@ -1,5 +1,5 @@
 const endpoints = {
- news: '/:newsType',
+ news: '/:storyType',
  story: '/item/:storyId'
 };
 

src/constants/routes.js

@@ -1,10 +1,11 @@
-const NEWS_TYPE = '/:newsType';
-const NEWS_TYPE_WITH_PAGE = '/:newsType/:page';
+const STORY_TYPE = '/:storyType';
+const STORY_TYPE_WITH_PAGE = '/:storyType/:page';
 
 const ROUTES = {
  HOME: '/',
- NEWS_TYPE,
- NEWS_TYPE_WITH_PAGE
+ STORY_TYPE,
+ STORY_TYPE_WITH_PAGE,
+ STORY_COMMENT: '/item/:storyId'
 };
 
 export default ROUTES;

src/sagas/newsSaga.js

@@ -7,8 +7,8 @@ import { getAllNews, getAllNewsSuccess, getAllNewsFailure } from 'reducers/newsR
 
 function* getAllNewsSaga(action) {
  try {
- const { newsType } = action.payload ?? {};
- const news = yield call(newsService.getAllNews, newsType);
+ const { storyType } = action.payload ?? {};
+ const news = yield call(newsService.getAllNews, storyType);
 
  yield put(getAllNewsSuccess({ news }));
  } catch (error) {

src/services/news.js

@@ -5,12 +5,12 @@ import endpoints from 'constants/endpoints';
 /**
  * Fetch All News By News Type.
  *
- * @param {string} newsType
+ * @param {string} storyType
  *
  * @returns {object}
  */
-export async function getAllNews(newsType) {
- const url = interpolate(endpoints.news, { newsType });
+export async function getAllNews(storyType) {
+ const url = interpolate(endpoints.news, { storyType });
  const { data } = await get(url);
 
  return data;