Merge 9a53670 into b64f989

.eslintrc.json

@@ -34,7 +34,8 @@
     "arrow-body-style": "warn",
     "arrow-parens": "off",
     "no-console": "off",
-    "comma-dangle": "off"
+    "comma-dangle": "off",
+    "no-nested-ternary": "off"
   },
   "root": true
 }

package.json

@@ -35,6 +35,7 @@
     "query-string": "^6.8.3",
     "querystring": "^0.2.0",
     "react": "^16.9.0",
+    "react-confirm-alert": "^2.4.1",
     "react-dom": "^16.9.0",
     "react-html-parser": "^2.0.2",
     "react-js-pagination": "^3.0.2",
@@ -55,18 +56,19 @@
     "sass-loader": "^8.0.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.3.2",
+    "@typescript-eslint/parser": "^2.3.2",
     "coveralls": "^3.0.6",
     "cypress": "^3.4.1",
     "eslint": "^6.1.0",
-    "@typescript-eslint/eslint-plugin": "^2.3.2",
-    "@typescript-eslint/parser": "^2.3.2",
     "eslint-config-airbnb": "^18.0.1",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.14.3",
-    "moxios": "^0.4.0",
     "eslint-plugin-react-hooks": "^1.7.0",
+    "history": "^4.10.1",
+    "moxios": "^0.4.0",
     "react-test-renderer": "^16.10.2",
     "redux-mock-store": "^1.5.3",
     "redux-promise-middleware": "^6.1.1",

src/app/App.js

@@ -15,6 +15,7 @@ import UpdateProfile from '../feature/profile/update_profile/UpdateProfileCompon
 import ForgotPassword from '../feature/Reset Password/forgot password/ForgotPasswordComponent';
 import ResetPassword from '../feature/Reset Password/reset password/ResetPasswordComponent';
 import '../../node_modules/font-awesome/css/font-awesome.min.css';
+import comment from '../feature/comment/CommentComponent';
 
 toast.configure();
 function App() {
@@ -37,7 +38,8 @@ function App() {
             <Route path="/signup" component={SignUp} />
             <Route path="/profile" component={Profile} />
             <Route path="/update-profile" component={UpdateProfile} />
-            <Route path="/articles/:slug" component={GetSingleArticle} />
+            <Route exact path="/articles/:slug" component={GetSingleArticle} />
+            <Route exact path="/articles/:slug/comments" component={comment} />
             <ProtectedRoutes path="/create" component={CreateArticle} />
           </section>
         </Switch>

src/app/reducers/index.js

@@ -7,6 +7,8 @@ import forgotPasswordReducer from '../../feature/Reset Password/forgot password/
 import resetPasswordReducer from '../../feature/Reset Password/reset password/resetPasswordReducer';
 import article from '../../feature/articles/createArticle/createArticleReducer';
 import getAllArticles from '../../feature/articles/getArticles/GetAllArticleReducer';
+import commentReducer from '../../feature/comment/CommentReducer';
+
 import socialReducer from '../../feature/auth/socialLogin/SocialReducer';
 import getSingleArticle from '../../feature/articles/getSingleArticle/GetSingleArticleReducer';
 
@@ -21,4 +23,5 @@ export default combineReducers({
   getAllArticles,
   social: socialReducer,
   getSingleArticle,
+  comment: commentReducer,
 });

src/feature/articles/createArticle/createArticleAction.js

@@ -8,7 +8,9 @@ import setAxiosConfig from '../../../app/common/config/axiosConfig';
 config();
 
 const createArticle = (
-  { title, description, tags, category, body },
+  {
+    title, description, tags, category, body
+  },
   props
 ) => async dispatch => {
   let formData = {};

src/feature/articles/getSingleArticle/GetSingleArticleComponent.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { Link, BrowserRouter } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import momemt from 'moment';
 import ReactHtmlParser from 'react-html-parser';
 import GetSingleArticle from './GetSingleArticleAction';
@@ -97,14 +97,12 @@ export class ViewSingleArticle extends Component {
               <span>7 reads</span>
             </div>
             <div className="status__comment">
-              <BrowserRouter>
-                <Link to="#?" className="status__comment">
-                  <CommentCountComponent
-                    className="btn__commentCount"
-                    count={commentCount}
-                  />
-                </Link>
-              </BrowserRouter>
+              <Link to={`/articles/${slug}/comments?title=${title}`} className="status__comment" onlyActiveOnIndex="active">
+                <CommentCountComponent
+                  className="btn__commentCount"
+                  count={commentCount}
+                />
+              </Link>
             </div>
             <div className="status__like">
               <span>