Skip to content

Commit

Permalink
Merge 3de15cc into af02ada
Browse files Browse the repository at this point in the history
  • Loading branch information
malaba6 committed Oct 31, 2019
2 parents af02ada + 3de15cc commit ddccc7c
Show file tree
Hide file tree
Showing 22 changed files with 1,067 additions and 146 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
269 changes: 137 additions & 132 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added public/download.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/ezgif-2-078cdcb3f1d3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/giphy.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/load.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/app/common/config/appConfig.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable import/prefer-default-export */
export const BACKEND_URL = 'https://codinggeeks-ah-backnd-staging.herokuapp.com/api/v1';
// export const BACKEND_URL = 'http://localhost:4000/api/v1';
// export const BACKEND_URL = 'https://codinggeeks-ah-backnd-staging.herokuapp.com/api/v1';
export const BACKEND_URL = 'http://localhost:4000/api/v1';
Binary file added src/app/common/images/delete-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/common/images/edit-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/app/common/images/placeholder-man.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -21,4 +23,5 @@ export default combineReducers({
getAllArticles,
social: socialReducer,
getSingleArticle,
comment: commentReducer,
});
4 changes: 3 additions & 1 deletion src/feature/articles/createArticle/createArticleAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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>
Expand Down
Loading

0 comments on commit ddccc7c

Please sign in to comment.