made changes

Author: Naveen-HN

src/App.js

@@ -6,7 +6,7 @@ import "bootstrap/dist/css/bootstrap.min.css";
 import Registration from "./components/registration";
 import Login from "./components/login";
 import Facebook from "./components/facebook";
-import User from "./components/user";
+import User from "./components/user/index";
 import CreateArticle from "./components/create-article";
 import ArticleView from "./components/article/article-view";
 import PrivateRoute from "./components/privateRoutes";

src/components/article/Bookmark.js

@@ -10,7 +10,7 @@ const Bookmark = () => {
     (state) => state.userReducer.bookmarks,
     shallowEqual
   );
-  const { _id } = useSelector(
+  const { _id, user } = useSelector(
     (state) => state.articlesReducer.article,
     shallowEqual
   );

src/components/article/article-view.js

@@ -274,6 +274,14 @@ class ArticleView extends Component {
     this.props.dispatch(deleteArticle(this.props.match.params.id));
     window.location = "/";
   };
+  showBookmark = () => {
+    if (
+      this.props.loggedIn &&
+      this.props.user.id !== this.state.articleDetails.user_id
+    ) {
+      return <Bookmark />;
+    }
+  };
 
   render() {
     return (
@@ -289,8 +297,7 @@ class ArticleView extends Component {
         </h6>
 
         <Like />
-        {this.props.loggedIn ? <Bookmark /> : ""}
-
+        {this.showBookmark()}
         {this.editAndDeleArticle()}
 
         <hr />

src/components/article/article.js

@@ -1,6 +1,10 @@
 import React from "react";
 import { Link } from "react-router-dom";
+import { formatDistanceToNow } from "date-fns";
+
 const Article = (props) => {
+  var date = new Date(props.article.createdAt);
+
   return (
     <div className="card">
       <div className="card-body">
@@ -16,7 +20,7 @@ const Article = (props) => {
           {props.article.user.name}
         </Link>
         <br />
-        <b>Created at - </b> {props.article.createdAt.substring(0, 10)}
+        <b>{formatDistanceToNow(date)} ago</b>
         <br />
       </div>
     </div>